diff --git a/calendar/csv_import.php b/calendar/csv_import.php
index e77d19f1e4..d90eccee6a 100644
--- a/calendar/csv_import.php
+++ b/calendar/csv_import.php
@@ -1,60 +1,58 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - Calendar: CSV - Import                                      *
-  * http://www.egroupware.org                                                *
-  * Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* eGroupWare - Calendar: CSV - Import                                      *
+	* http://www.egroupware.org                                                *
+	* Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
 
-	$GLOBALS['phpgw_info']['flags'] = array(
+	$GLOBALS['egw_info']['flags'] = array(
 		'currentapp' => 'calendar',
 		'noheader'   => True
 	);
 	include('../header.inc.php');
 
-	if (!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) ||
-	    !$GLOBALS['phpgw_info']['user']['apps']['admin'])		// no admin
-	{
-		$GLOBALS['phpgw']->redirect_link('/home.php');
-	}
+	$is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
+
 	if (isset($_FILES['csvfile']['tmp_name']))
 	{
-		$csvfile = tempnam($GLOBALS['phpgw_info']['server']['temp_dir'],$GLOBALS['phpgw_info']['flags']['currentapp']."_");
-		$GLOBALS['phpgw']->session->appsession('csvfile','',$csvfile);
+		$csvfile = tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
+		$GLOBALS['egw']->session->appsession('csvfile','',$csvfile);
 		$_POST['action'] = move_uploaded_file($_FILES['csvfile']['tmp_name'],$csvfile) ?
 			'download' : '';
 	}
 	else
 	{
-		$csvfile = $GLOBALS['phpgw']->session->appsession('csvfile');
+		$csvfile = $GLOBALS['egw']->session->appsession('csvfile');
 	}
 	if ($_POST['cancel'])
 	{
 		@unlink($csvfile);
-		$GLOBALS['phpgw']->redirect_link('/admin/index.php');
+		$GLOBALS['egw']->redirect_link('/admin/index.php');
 	}
-	$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File');
-	$GLOBALS['phpgw']->common->phpgw_header();
+	$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File');
+	$uical =& CreateObject('calendar.uical',true);
+	$GLOBALS['egw']->common->egw_header();
 
-	$GLOBALS['phpgw']->template->set_file(array('import_t' => 'csv_import.tpl'));
-	$GLOBALS['phpgw']->template->set_block('import_t','filename','filenamehandle');
-	$GLOBALS['phpgw']->template->set_block('import_t','fheader','fheaderhandle');
-	$GLOBALS['phpgw']->template->set_block('import_t','fields','fieldshandle');
-	$GLOBALS['phpgw']->template->set_block('import_t','ffooter','ffooterhandle');
-	$GLOBALS['phpgw']->template->set_block('import_t','imported','importedhandle');
-	$GLOBALS['phpgw']->template->set_block('import_t','import','importhandle');
+	$GLOBALS['egw']->template->set_file(array('import_t' => 'csv_import.tpl'));
+	$GLOBALS['egw']->template->set_block('import_t','filename','filenamehandle');
+	$GLOBALS['egw']->template->set_block('import_t','fheader','fheaderhandle');
+	$GLOBALS['egw']->template->set_block('import_t','fields','fieldshandle');
+	$GLOBALS['egw']->template->set_block('import_t','ffooter','ffooterhandle');
+	$GLOBALS['egw']->template->set_block('import_t','imported','importedhandle');
+	$GLOBALS['egw']->template->set_block('import_t','import','importhandle');
 
 	if(($_POST['action'] == 'download' || $_POST['action'] == 'continue') && (!$_POST['fieldsep'] || !$csvfile || !($fp=fopen($csvfile,'rb'))))
 	{
 		$_POST['action'] = '';
 	}
-	$GLOBALS['phpgw']->template->set_var("action_url",$GLOBALS['phpgw']->link("/calendar/csv_import.php"));
+	$GLOBALS['egw']->template->set_var("action_url",$GLOBALS['egw']->link("/calendar/csv_import.php"));
 
 	$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
 	$ASep = '|>'; // Assignment-Separator, separats pattern and replacesment
@@ -64,7 +62,7 @@
 
 	function addr_id( $n_family,$n_given,$org_name )
 	{		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
-		$contacts = createobject('phpgwapi.contacts');
+		$contacts =& CreateObject('phpgwapi.contacts');
 
 		$addrs = $contacts->read(0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name");
 		if(!count($addrs))
@@ -101,73 +99,68 @@
 			}
 			else
 			{
-				if (!is_object($GLOBALS['phpgw']->categories))
+				if (!is_object($GLOBALS['egw']->categories))
 				{
-					$GLOBALS['phpgw']->categories = createobject('phpgwapi.categories');
+					$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories','','calendar');
 				}
-				if (is_numeric($cat) && $GLOBALS['phpgw']->categories->id2name($cat) != '--')
+				if (is_numeric($cat) && $GLOBALS['egw']->categories->id2name($cat) != '--')
 				{
 					$cat2id[$cat] = $ids[$cat] = $cat;
 				}	
-				elseif ($id = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) ))
+				elseif ($id = $GLOBALS['egw']->categories->name2id( addslashes($cat) ))
 				{	// cat exists
 					$cat2id[$cat] = $ids[$cat] = $id;
 				}
 				else
 				{	// create new cat
-					$GLOBALS['phpgw']->categories->add( array('name' => $cat,'descr' => $cat ));
-					$cat2id[$cat] = $ids[$cat] = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) );
+					$GLOBALS['egw']->categories->add( array('name' => $cat,'descr' => $cat ));
+					$cat2id[$cat] = $ids[$cat] = $GLOBALS['egw']->categories->name2id( addslashes($cat) );
 				}
 			}
 		}
-		$id_str = implode( ',',$ids );
-
-		if (count($ids) > 1)		// multiple cats need to be in ','
-		{
-			$id_str = ",$id_str,";
-		}
-		return  $id_str;
+		return implode( ',',$ids );
 	}
 
-	if (!is_object($GLOBALS['phpgw']->html))
+	if (!is_object($GLOBALS['egw']->html))
 	{
-		$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
+		$GLOBALS['egw']->html =& CreateObject('phpgwapi.html');
 	}
 
 	if ($_POST['next']) $_POST['action'] = 'next';
 	switch ($_POST['action'])
 	{
 	case '':	// Start, ask Filename
-		$GLOBALS['phpgw']->template->set_var('lang_csvfile',lang('CSV-Filename'));
-		$GLOBALS['phpgw']->template->set_var('lang_fieldsep',lang('Fieldseparator'));
-		$GLOBALS['phpgw']->template->set_var('lang_charset',lang('Charset of file'));
-		$GLOBALS['phpgw']->template->set_var('select_charset',
-			$GLOBALS['phpgw']->html->select('charset','',
-			$GLOBALS['phpgw']->translation->get_installed_charsets()+
+		$GLOBALS['egw']->template->set_var('lang_csvfile',lang('CSV-Filename'));
+		$GLOBALS['egw']->template->set_var('lang_fieldsep',lang('Fieldseparator'));
+		$GLOBALS['egw']->template->set_var('lang_charset',lang('Charset of file'));
+		$GLOBALS['egw']->template->set_var('lang_help',lang('Please note: You can configure the field assignments AFTER you uploaded the file.'));
+		$GLOBALS['egw']->template->set_var('select_charset',
+			$GLOBALS['egw']->html->select('charset','',
+			$GLOBALS['egw']->translation->get_installed_charsets()+
 			array('utf-8' => 'utf-8 (Unicode)'),True));
-		$GLOBALS['phpgw']->template->set_var('fieldsep',$_POST['fieldsep'] ? $_POST['fieldsep'] : ',');
-		$GLOBALS['phpgw']->template->set_var('submit',lang('Import'));
-		$GLOBALS['phpgw']->template->set_var('enctype','ENCTYPE="multipart/form-data"');
+		$GLOBALS['egw']->template->set_var('fieldsep',$_POST['fieldsep'] ? $_POST['fieldsep'] : ';');
+		$GLOBALS['egw']->template->set_var('submit',lang('Import'));
+		$GLOBALS['egw']->template->set_var('enctype','ENCTYPE="multipart/form-data"');
 
-		$GLOBALS['phpgw']->template->parse('rows','filename');
+		$GLOBALS['egw']->template->parse('rows','filename');
 		break;
 
 	case 'continue':
 	case 'download':
-		$GLOBALS['phpgw']->preferences->read_repository();
-		$defaults = $GLOBALS['phpgw_info']['user']['preferences']['calendar']['cvs_import'];
+		$GLOBALS['egw']->preferences->read_repository();
+		$defaults = $GLOBALS['egw_info']['user']['preferences']['calendar']['cvs_import'];
 		if (!is_array($defaults))
 		{
 			$defaults = array();
 		}
-		$GLOBALS['phpgw']->template->set_var('lang_csv_fieldname',lang('CSV-Fieldname'));
-		$GLOBALS['phpgw']->template->set_var('lang_info_fieldname',lang('calendar-Fieldname'));
-		$GLOBALS['phpgw']->template->set_var('lang_translation',lang("Translation").' <a href="#help">'.lang('help').'</a>');
-		$GLOBALS['phpgw']->template->set_var('submit',
-			$GLOBALS['phpgw']->html->submit_button('convert','Import') . '&nbsp;'.
-			$GLOBALS['phpgw']->html->submit_button('cancel','Cancel'));
-		$GLOBALS['phpgw']->template->set_var('lang_debug',lang('Test Import (show importable records <u>only</u> in browser)'));
-		$GLOBALS['phpgw']->template->parse('rows','fheader');
+		$GLOBALS['egw']->template->set_var('lang_csv_fieldname',lang('CSV-Fieldname'));
+		$GLOBALS['egw']->template->set_var('lang_info_fieldname',lang('calendar-Fieldname'));
+		$GLOBALS['egw']->template->set_var('lang_translation',lang("Translation").' <a href="#help">'.lang('help').'</a>');
+		$GLOBALS['egw']->template->set_var('submit',
+			$GLOBALS['egw']->html->submit_button('convert','Import') . '&nbsp;'.
+			$GLOBALS['egw']->html->submit_button('cancel','Cancel'));
+		$GLOBALS['egw']->template->set_var('lang_debug',lang('Test Import (show importable records <u>only</u> in browser)'));
+		$GLOBALS['egw']->template->parse('rows','fheader');
 
 		$cal_names = array(
 			'title'		=> 'Title varchar(80)',
@@ -180,18 +173,18 @@
 			'priority'  => 'Priority: 1=Low, 2=Normal, 3=High',
 			'public'	=> 'Access: 1=public, 0=private',
 			'owner'		=> 'Owner: int(11) user-id/-name',
-			'modtime'	=> 'Modification date',
-//			'groups'	=> 'Groups (dont know what this field is for)',
-//			'cal_type'	=> 'cal_type: single_event=E (default) else M',
+			'modified'	=> 'Modification date',
+			'non_blocking' => '0=Event blocks time, 1=Event creates no conflicts',
+			'uid'       => 'Unique Id, allows multiple import to update identical entries',
+//			'recur_type'=> 'Type of recuring event',
 		);
-		$custom_fields = CreateObject('calendar.bocustom_fields');
+		$config =& CreateObject('phpgwapi.config','calendar');
+		$custom_fields = $config->read_repository();
+		unset($config);
 		//echo "custom-fields=<pre>".print_r($custom_fields,True)."</pre>";
-		foreach ($custom_fields->fields as $name => $data)
+		foreach ($custom_fields as $name => $data)
 		{
-			if ($name[0] == '#')	// a custom field ?
-			{
-				$cal_names[$name] = $data['name'].': Custom field, varchar('.$data['length'].')';
-			}
+			$cal_names['#'.$name] = $data['label'].': Custom field ('.$data['type'].')';
 		}
 
 		// the next line is used in the help-text too
@@ -200,41 +193,41 @@
 		$cal_name_options = "<option value=\"\">none\n";
 		foreach($cal_names as $field => $name)
 		{
-			$cal_name_options .= "<option value=\"$field\">".$GLOBALS['phpgw']->strip_html($name)."\n";
+			$cal_name_options .= "<option value=\"$field\">".$GLOBALS['egw']->strip_html($name)."\n";
 		}
 		$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-		$csv_fields = $GLOBALS['phpgw']->translation->convert($csv_fields,$_POST['charset']);
+		$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
 		$csv_fields[] = 'no CSV 1';					// eg. for static assignments
 		$csv_fields[] = 'no CSV 2';
 		$csv_fields[] = 'no CSV 3';
 		foreach($csv_fields as $csv_idx => $csv_field)
 		{
-			$GLOBALS['phpgw']->template->set_var('csv_field',$csv_field);
-			$GLOBALS['phpgw']->template->set_var('csv_idx',$csv_idx);
+			$GLOBALS['egw']->template->set_var('csv_field',$csv_field);
+			$GLOBALS['egw']->template->set_var('csv_idx',$csv_idx);
 			if ($def = $defaults[$csv_field])
 			{
 				list( $info,$trans ) = explode($PSep,$def,2);
-				$GLOBALS['phpgw']->template->set_var('trans',$trans);
-				$GLOBALS['phpgw']->template->set_var('cal_fields',str_replace('="'.$info.'">','="'.$info.'" selected>',$cal_name_options));
+				$GLOBALS['egw']->template->set_var('trans',$trans);
+				$GLOBALS['egw']->template->set_var('cal_fields',str_replace('="'.$info.'">','="'.$info.'" selected>',$cal_name_options));
 			}
 			else
 			{
-				$GLOBALS['phpgw']->template->set_var('trans','');
-				$GLOBALS['phpgw']->template->set_var('cal_fields',$cal_name_options);
+				$GLOBALS['egw']->template->set_var('trans','');
+				$GLOBALS['egw']->template->set_var('cal_fields',$cal_name_options);
 			}
-			$GLOBALS['phpgw']->template->parse('rows','fields',True);
+			$GLOBALS['egw']->template->parse('rows','fields',True);
 		}
-		$GLOBALS['phpgw']->template->set_var('lang_start',lang('Startrecord'));
-		$GLOBALS['phpgw']->template->set_var('start',get_var('start',array('POST'),1));
+		$GLOBALS['egw']->template->set_var('lang_start',lang('Startrecord'));
+		$GLOBALS['egw']->template->set_var('start',get_var('start',array('POST'),1));
 		$msg = ($safe_mode = ini_get('safe_mode') == 'On') ? lang('to many might exceed your execution-time-limit'):
 			lang('empty for all');
-		$GLOBALS['phpgw']->template->set_var('lang_max',lang('Number of records to read (%1)',$msg));
-		$GLOBALS['phpgw']->template->set_var('max',get_var('max',array('POST'),$safe_mode ? 200 : ''));
-		$GLOBALS['phpgw']->template->set_var('debug',get_var('debug',array('POST'),True)?' checked':'');
-		$GLOBALS['phpgw']->template->parse('rows','ffooter',True);
+		$GLOBALS['egw']->template->set_var('lang_max',lang('Number of records to read (%1)',$msg));
+		$GLOBALS['egw']->template->set_var('max',get_var('max',array('POST'),$safe_mode ? 200 : ''));
+		$GLOBALS['egw']->template->set_var('debug',get_var('debug',array('POST'),True)?' checked':'');
+		$GLOBALS['egw']->template->parse('rows','ffooter',True);
 		fclose($fp);
 
-		$hiddenvars = $GLOBALS['phpgw']->html->input_hidden(array(
+		$hiddenvars = $GLOBALS['egw']->html->input_hidden(array(
 			'action'  => 'import',
 			'fieldsep'=> $_POST['fieldsep'],
 			'charset' => $_POST['charset']
@@ -247,8 +240,8 @@
 			"First example: <b>1${ASep}private${PSep}public</b><br>".
 			"This will translate a '1' in the CVS field to 'privat' and everything else to 'public'.<p>".
 			"Patterns as well as the replacement can be regular expressions (the replacement is done via ereg_replace). ".
-			"If, after all replacements, the value starts with an '@' the whole value is eval()'ed, so you ".
-			"may use all php, phpgw plus your own functions. This is quiet powerfull, but <u>circumvents all ACL</u>.<p>".
+			"If, after all replacements, the value starts with an '@' AND you have admin rights the whole value is eval()'ed, so you ".
+			"may use php, eGroupWare or your own functions. This is quiet powerfull, but <u>circumvents all ACL</u>.<p>".
 			"Example using regular expressions and '@'-eval(): <br><b>$mktime_lotus</b><br>".
 			"It will read a date of the form '2001-05-20 08:00:00.00000000000000000' (and many more, see the regular expr.). ".
 			"The&nbsp;[&nbsp;.:-]-separated fields are read and assigned in different order to @mktime(). Please note to use ".
@@ -269,9 +262,9 @@
 			"with the addressbook.<br>".
 			"<b>@cat_id(Cat1,...,CatN)</b> returns a (','-separated) list with the cat_id's. If a category isn't found, it ".
 			"will be automaticaly added. This function is automaticaly called if the category is not numerical!<p>".
-			"I hope that helped to understand the features, if not <a href='mailto:RalfBecker@outdoor-training.de'>ask</a>.";
+			"I hope that helped to understand the features, if not <a href='mailto:egroupware-users@lists.sf.net'>ask</a>.";
 
-		$GLOBALS['phpgw']->template->set_var('help_on_trans',lang($help_on_trans));	// I don't think anyone will translate this
+		$GLOBALS['egw']->template->set_var('help_on_trans',lang($help_on_trans));	// I don't think anyone will translate this
 		break;
 
 	case 'next':
@@ -279,7 +272,7 @@
 		$_POST['trans']       = unserialize(stripslashes($_POST['trans']));
 		// fall-through
 	case 'import':
-		$hiddenvars = $GLOBALS['phpgw']->html->input_hidden(array(
+		$hiddenvars = $GLOBALS['egw']->html->input_hidden(array(
 			'action'  => 'continue',
 			'fieldsep'=> $_POST['fieldsep'],
 			'charset' => $_POST['charset'],
@@ -292,7 +285,7 @@
 		@set_time_limit(0);
 		$fp=fopen($csvfile,'r');
 		$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
-		$csv_fields = $GLOBALS['phpgw']->translation->convert($csv_fields,$_POST['charset']);
+		$csv_fields = $GLOBALS['egw']->translation->convert($csv_fields,$_POST['charset']);
 		$csv_fields[] = 'no CSV 1';						// eg. for static assignments
 		$csv_fields[] = 'no CSV 2';
 		$csv_fields[] = 'no CSV 3';
@@ -309,11 +302,11 @@
 			}
 		}
 
-		$GLOBALS['phpgw']->preferences->read_repository();
-		$GLOBALS['phpgw']->preferences->add('calendar','cvs_import',$defaults);
-		$GLOBALS['phpgw']->preferences->save_repository(True);
+		$GLOBALS['egw']->preferences->read_repository();
+		$GLOBALS['egw']->preferences->add('calendar','cvs_import',$defaults);
+		$GLOBALS['egw']->preferences->save_repository(True);
 
-		$log = "<table border=1>\n\t<tr><td>#</td>\n";
+		$log = '<table border="1" style="border: 1px dotted black; border-collapse: collapse;">'."\n\t<tr><td>#</td>\n";
 
 		foreach($cal_fields as $csv_idx => $info)
 		{	// convert $trans[$csv_idx] into array of pattern => value
@@ -342,12 +335,12 @@
 		{
 			$log .= "\t\t<td><b>isPublic</b></td>\n";
 		}
-/* maybe later ;-)
-		if (!in_array('cal_type',$cal_fields))	// autocreate single event if not set by user
+/*		if (!in_array('recur_type',$cal_fields))	// autocreate single event if not set by user
 		{
 			$log .= "\t\t<td><b>recureing</b></td>\n";
-		}
-*/
+		}*/
+		$log .= "\t\t<td><b>Imported</b></td>\n\t</tr>\n";
+
 		$start = $_POST['start'] < 1 ? 1 : $_POST['start'];
 
 		// ignore empty lines, is_null($fields[0]) is returned on empty lines !!!
@@ -362,9 +355,9 @@
 			{
 				break;	// EOF
 			}
-			$fields = $GLOBALS['phpgw']->translation->convert($fields,$_POST['charset']);
+			$fields = $GLOBALS['egw']->translation->convert($fields,$_POST['charset']);
 
-			$log .= "\t</tr><tr><td>".($start+$anz)."</td>\n";
+			$log .= "\t<tr>\n\t\t<td>".($start+$anz)."</td>\n";
 
 			$values = array();
 			foreach($cal_fields as $csv_idx => $info)
@@ -387,7 +380,7 @@
 								$val = str_replace($CPre.$vars[1].$CPos,$val[0] == '@' ? "'".addslashes($fields[array_search($vars[1],$csv_fields)])."'" : $fields[array_search($vars[1],$csv_fields)],$val);
 							}
 							//echo "='$val'</p>";
-							if ($val[0] == '@')
+							if ($val[0] == '@' && is_admin)
 							{
 								// removing the $ to close security hole of showing vars, which contain eg. passwords
 								$val = 'return '.substr(str_replace('$','',$val),1).';';
@@ -409,37 +402,23 @@
 				$values['public'] = 1;	// public access if not set by user
 				$log .= "\t\t<td>".$values['public']."</td>\n";
 			}
-/* maybe later ;-)
-			if (!in_array('cal_type',$cal_fields))
+			if (!in_array('recur_type',$cal_fields))
 			{
-				$values['cal_type'] = 'E';	// single event if not set by user
-				$log .= "\t\t<td>".$values['cal_type']."</td>\n";
+				$values['recur_type'] = MCAL_RECUR_NONE;	// single event if not set by user
+//				$log .= "\t\t<td>".$values['recure_type']."</td>\n";
 			}
-*/
+
 			if(!$_POST['debug'] && count($values))	// dont import empty contacts
 			{
 				//echo "values=<pre>".print_r($values,True)."</pre>\n";
 				if (!is_numeric($values['owner']))
 				{
-					$values['owner'] = $GLOBALS['phpgw']->accounts->name2id($values['owner']);
+					$values['owner'] = $GLOBALS['egw']->accounts->name2id($values['owner']);
 				}
-				if (!$values['owner'] || !$GLOBALS['phpgw']->accounts->exists($values['owner']))
+				if (!$values['owner'] || !$GLOBALS['egw']->accounts->exists($values['owner']))
 				{
-					$values['owner'] = $GLOBALS['phpgw_info']['user']['account_id'];
+					$values['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 				}
-				if (!is_object($calendar))
-				{
-					$calendar = createobject('calendar.socalendar',array());
-					$cal_owner = False;
-				}
-				if ($cal_owner != $values['owner'])
-				{
-					$calendar->open_box($cal_owner = $values['owner']);
-				}
-				// echo "<p>adding: ".dump_array($values)."</p>\n";
-				$calendar->event_init();		// set some reasonable defaults
-				$calendar->set_recur_none();
-
 				if ($values['priority'] < 1 || $values['priority'] > 3)
 				{
 					$values['priority'] = 2;
@@ -453,14 +432,9 @@
 				{
 					$values['title'] = '('.lang('none').')';
 				}
-				foreach(array('owner','title','description','location','category','priority','public') as $name)
-				{
-					$calendar->add_attribute($name,$values[$name]);
-				}
 
-				if (!isset($values['modtime'])) $values['modtime'] = $values['start'];
 				// convert dates to timestamps
-				foreach(array('start','end','modtime') as $date)
+				foreach(array('start','end','modified') as $date)
 				{
 					if (isset($values[$date]) && !is_numeric($date))
 					{
@@ -470,58 +444,64 @@
 						if (ereg('(.*)\.[0-9]+',$values[$date],$parts)) $values[$date] = $parts[1];
 						$values[$date] = strtotime($values[$date]);
 					}
-					$datearr = $GLOBALS['phpgw']->datetime->localdates($values[$date]);
-					$calendar->set_date($date,$datearr['year'],$datearr['month'],$datearr['day'],
-						$datearr['hour'],$datearr['minute'],$datearr['second']);
 				}
 				// convert participants-names to user-id's
-				$participants = 0;
-				foreach(split('[,;]',$values['participants']) as $part_status)
+				$parts = $values['participants'] ? split('[,;]',$values['participants']) : array();
+				$values['participants'] = array();
+				foreach($parts as $part_status)
 				{
 					list($part,$status) = explode('=',$part_status);
 					$valid_status = array('U'=>'U','u'=>'U','A'=>'A','a'=>'A','R'=>'R','r'=>'R','T'=>'T','t'=>'T');
 					$status = isset($valid_status[$status]) ? $valid_status[$status] : 'U';
-					if ($GLOBALS['phpgw']->accounts->exists($part))
+					if ($GLOBALS['egw']->accounts->exists($part))
 					{
-						$part = $GLOBALS['phpgw']->accounts->name2id($part);
+						$part = $GLOBALS['egw']->accounts->name2id($part);
 					}
 					if ($part && is_numeric($part))
 					{
-						$calendar->add_attribute('participants',$status,$part);
-						$participants++;
+						$values['participants'][$part] = $status;
 					}
 				}
-				if (!$participants)		// no valid participants so far --> add the importing user/owner
+				if (!count($values['participants']))		// no valid participants so far --> add the importing user/owner
 				{
-					$calendar->add_attribute('participants','A',$values['owner']);
+					$values['participants'][$values['owner']] = 'A';
 				}
-				// add custom-fields
-				foreach($values as $name => $val)
+				if ($values['uid'])
 				{
-					if ($name[0] == '#')
+					if (is_numeric($values['uid']))		// to not conflict with our own id's
 					{
-						$calendar->add_attribute($name,$values[$name]);
+						$values['uid'] = 'cal-csv-import-'.$values['uid'].'-'.$GLOBALS['egw_info']['server']['install_id'];
+					}
+					if (($event = $uical->bo->read($values['uid'],null,$is_admin)))	// no ACL check for admins
+					{
+						//echo "updating existing event"; _debug_array($event);
+						$values['id'] = $event['id'];
 					}
 				}
-				//echo "add_entry(<pre>".print_r($calendar->cal->event,True).")</pre>\n";
-				$calendar->add_entry( $calendar->cal->event );
+				$action = $values['id'] ? 'updating' : 'adding';
+				//echo $action.'<pre>'.print_r($values,True)."</pre>\n";
+				$cal_id = $uical->bo->update($values,true,!$values['modified'],$is_admin);	// ignoring conflicts and ACL (for admins) on import
+				
+				$log .= "\t\t".'<td align="center">'.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."</td>\n\t</tr>\n";
+			}
+			else
+			{
+				$log .= "\t\t".'<td align="center">only test</td>'."\n\t</tr>\n";
 			}
 		}
-		$log .= "\t</tr>\n</table>\n";
+		$log .= "</table>\n";
 
-		$GLOBALS['phpgw']->template->set_var('anz_imported',($_POST['debug'] ?
+		$GLOBALS['egw']->template->set_var('anz_imported',($_POST['debug'] ?
 			lang('%1 records read (not yet imported, you may go back and uncheck Test Import)',
 			$anz,'','') :
 			lang('%1 records imported',$anz)). '&nbsp;'.
-			(!$_POST['debug'] && $fields ? $GLOBALS['phpgw']->html->submit_button('next','Import next set') . '&nbsp;':'').
-			$GLOBALS['phpgw']->html->submit_button('continue','Back') . '&nbsp;'.
-			$GLOBALS['phpgw']->html->submit_button('cancel','Cancel'));
-		$GLOBALS['phpgw']->template->set_var('log',$log);
-		$GLOBALS['phpgw']->template->parse('rows','imported');
+			(!$_POST['debug'] && $fields ? $GLOBALS['egw']->html->submit_button('next','Import next set') . '&nbsp;':'').
+			$GLOBALS['egw']->html->submit_button('continue','Back') . '&nbsp;'.
+			$GLOBALS['egw']->html->submit_button('cancel','Cancel'));
+		$GLOBALS['egw']->template->set_var('log',$log);
+		$GLOBALS['egw']->template->parse('rows','imported');
 		break;
 	}
-	$GLOBALS['phpgw']->template->set_var('hiddenvars',str_replace('{','&#x7B;',$hiddenvars));
-	$GLOBALS['phpgw']->template->pfp('phpgw_body','import');
-	$GLOBALS['phpgw']->common->phpgw_footer();
-
-?>
+	$GLOBALS['egw']->template->set_var('hiddenvars',str_replace('{','&#x7B;',$hiddenvars));
+	$GLOBALS['egw']->template->pfp('phpgw_body','import');
+	$GLOBALS['egw']->common->egw_footer();
diff --git a/calendar/egroupware.org/accept_holiday.php b/calendar/egroupware.org/accept_holiday.php
index d4fc4504ce..13df4df60a 100644
--- a/calendar/egroupware.org/accept_holiday.php
+++ b/calendar/egroupware.org/accept_holiday.php
@@ -17,17 +17,50 @@
 		Header('Location: '.$send_back_to);
 	}
 
+	function _holiday_cmp($a,$b)
+	{
+		if (($year_diff = ($a['occurence'] <= 0 ? 0 : $a['occurence']) - ($b['occurence'] <= 0 ? 0 : $b['occurence'])))
+		{
+			return $year_diff;
+		}
+		return $a['month'] - $b['month'] ? $a['month'] - $b['month'] : $a['day'] - $b['day'];
+	}
+
 	$send_back_to = str_replace('&locale='.$_POST['locale'],'',$send_back_to);
 	$file = './holidays.'.$_POST['locale'].'.csv';
-	if(!file_exists($file))
+	if(!file_exists($file) || filesize($file) < 300)	// treat very small files as not existent
 	{
 		if (count($_POST['name']))
 		{
-			$c_holidays = count($_POST['name']);
 			$fp = fopen($file,'w');
-			for($i=0;$i<$c_holidays;$i++)
+			if ($_POST['charset']) fwrite($fp,"charset\t".$_POST['charset']."\n");
+
+			$holidays = array();
+			foreach($_POST['name'] as $i => $name)
 			{
-				fwrite($fp,$_POST['locale']."\t".$_POST['name'][$i]."\t".$_POST['day'][$i]."\t".$_POST['month'][$i]."\t".$_POST['occurence'][$i]."\t".$_POST['dow'][$i]."\t".$_POST['observance'][$i]."\n");
+				$holidays[] = array(
+					'locale' => $_POST['locale'],
+					'name'   => str_replace('\\','',$name),
+					'day'    => $_POST['day'][$i],
+					'month'  => $_POST['month'][$i],
+					'occurence' => $_POST['occurence'][$i],
+					'dow'    => $_POST['dow'][$i],
+					'observance_rule' => $_POST['observance'][$i],
+				);
+			}
+			// sort holidays by year / occurence:
+			usort($holidays,'_holiday_cmp');
+			
+			$last_year = -1;
+			foreach($holidays as $holiday)
+			{
+				$year = $holiday['occurence'] <= 0 ? 0 : $holiday['occurence'];
+				if ($year != $last_year)
+				{
+					fwrite($fp,"\n".($year ? $year : 'regular (year=0)').":\n");
+					$last_year = $year;
+				}
+				fwrite($fp,"$holiday[locale]\t$holiday[name]\t$holiday[day]\t$holiday[month]\t$holiday[occurence]\t$holiday[dow]\t$holiday[observance_rule]\n");
 			}
 			fclose($fp);
 		}
diff --git a/calendar/egroupware.org/holidays.AT.csv b/calendar/egroupware.org/holidays.AT.csv
index d4b1ca1b41..611e22020f 100644
--- a/calendar/egroupware.org/holidays.AT.csv
+++ b/calendar/egroupware.org/holidays.AT.csv
@@ -1,3 +1,4 @@
+charset	iso-8859-1
 AT	Neujahr	1	1	0	0	0
 AT	Hl. Drei Könige	6	1	0	0	0
 AT	Ostersonntag	27	3	2005	0	0
diff --git a/calendar/egroupware.org/holidays.CH.csv b/calendar/egroupware.org/holidays.CH.csv
index a205a8d2d0..c3fd009ff0 100644
--- a/calendar/egroupware.org/holidays.CH.csv
+++ b/calendar/egroupware.org/holidays.CH.csv
@@ -1,3 +1,5 @@
+charset	iso-8859-1
+
 CH	Neujahr	1	1	0	0	0
 CH	Berchtoldstag (kantonal)	2	1	0	0	0
 CH	Basler Fasnacht	11	2	2008	0	0
diff --git a/calendar/egroupware.org/holidays.DE.csv b/calendar/egroupware.org/holidays.DE.csv
index 51b1ec6c33..b67859f301 100644
--- a/calendar/egroupware.org/holidays.DE.csv
+++ b/calendar/egroupware.org/holidays.DE.csv
@@ -1,3 +1,5 @@
+charset	iso-8859-1
+
 Regelmässig:
 DE	Sylvester	31	12	0	0	0
 DE	Neujahr	1	1	0	0	0
diff --git a/calendar/egroupware.org/holidays.DK.csv b/calendar/egroupware.org/holidays.DK.csv
index 5d8c4fc50f..400851a9dc 100644
--- a/calendar/egroupware.org/holidays.DK.csv
+++ b/calendar/egroupware.org/holidays.DK.csv
@@ -1,3 +1,4 @@
+charset	iso-8859-1
 DK	Nytårsdag	1	1	0	0	0
 DK	Palmesøndag	20	3	2005	0	0
 DK	Skærtorsdag	24	3	2005	0	0
diff --git a/calendar/egroupware.org/holidays.ES.csv b/calendar/egroupware.org/holidays.ES.csv
index 3de8f249c6..93813b74a4 100644
--- a/calendar/egroupware.org/holidays.ES.csv
+++ b/calendar/egroupware.org/holidays.ES.csv
@@ -1,3 +1,4 @@
+charset	iso-8859-1
 ES	Año Nuevo	1	1	0	0	0
 ES	Epifanía del Señor	6	1	0	0	0
 ES	San Jose	19	3	2004	0	0
diff --git a/calendar/egroupware.org/holidays.FI.csv b/calendar/egroupware.org/holidays.FI.csv
index 7819561013..e5e3128848 100644
--- a/calendar/egroupware.org/holidays.FI.csv
+++ b/calendar/egroupware.org/holidays.FI.csv
@@ -1,3 +1,4 @@
+charset	utf-8
 FI	Uudenvuodenpäivä	1	1	0	0	0
 FI	Loppiainen	6	1	0	0	0
 FI	Pitkäperjantai	9	4	2004	0	0
diff --git a/calendar/egroupware.org/holidays.FR.csv b/calendar/egroupware.org/holidays.FR.csv
index ff0b17df9c..8e060dfde6 100644
--- a/calendar/egroupware.org/holidays.FR.csv
+++ b/calendar/egroupware.org/holidays.FR.csv
@@ -1,3 +1,4 @@
+charset	iso-8859-1
 FR	Jour de l'an	1	1	0	0	0
 FR	Lundi de Pâques	24	3	2008	0	0
 FR	Lundi de Pâques	28	3	2005	0	0
diff --git a/calendar/egroupware.org/holidays.IT.csv b/calendar/egroupware.org/holidays.IT.csv
index 52451a6765..624813069b 100644
--- a/calendar/egroupware.org/holidays.IT.csv
+++ b/calendar/egroupware.org/holidays.IT.csv
@@ -1,15 +1,16 @@
-IT;Capodanno;1;1;0;0;0
-IT;Epifania;6;1;0;0;0
-IT;Pasqua;27;3;2005;0;0
-IT;Lunedì di Pasqua;28;3;2005;0;0
-IT;Pasqua;12;4;2004;0;0
-IT;Lunedì di Pasqua;13;4;2004;0;0
-IT;Liberazione;25;4;0;0;0
-IT;Festa del Lavoro;1;5;0;0;0
-IT;Pentecoste;15;5;2005;0;0
-IT;Festa della Repubblica;2;6;0;0;0
-IT;Ferragosto;15;8;0;0;0
-IT;Ognisanti;1;11;0;0;0
-IT;Festa dell'Immacolata;8;12;0;0;0
-IT;Natale;25;12;0;0;0
-IT;S. Stefano;26;12;0;0;0
+charset	iso-8859-1
+IT	Capodanno	1	1	0	0	0
+IT	Epifania	6	1	0	0	0
+IT	Pasqua	27	3	2005	0	0
+IT	Luned�di Pasqua	28	3	2005	0	0
+IT	Pasqua	12	4	2004	0	0
+IT	Luned�di Pasqua	13	4	2004	0	0
+IT	Liberazione	25	4	0	0	0
+IT	Festa del Lavoro	1	5	0	0	0
+IT	Pentecoste	15	5	2005	0	0
+IT	Festa della Repubblica	2	6	0	0	0
+IT	Ferragosto	15	8	0	0	0
+IT	Ognisanti	1	11	0	0	0
+IT	Festa dell'Immacolata	8	12	0	0	0
+IT	Natale	25	12	0	0	0
+IT	S. Stefano	26	12	0	0	0
diff --git a/calendar/egroupware.org/holidays.NL.csv b/calendar/egroupware.org/holidays.NL.csv
index 34871aa380..9f1718191d 100644
--- a/calendar/egroupware.org/holidays.NL.csv
+++ b/calendar/egroupware.org/holidays.NL.csv
@@ -1,3 +1,4 @@
+charset	iso-8859-1
 NL	Nieuwjaarsdag	1	1	0	0	0
 NL	Valentijnsdag	14	2	0	0	0
 NL	Pasen	23	3	2008	0	0
diff --git a/calendar/egroupware.org/holidays.NO.csv b/calendar/egroupware.org/holidays.NO.csv
index 62406672b7..6939fd67c4 100644
--- a/calendar/egroupware.org/holidays.NO.csv
+++ b/calendar/egroupware.org/holidays.NO.csv
@@ -1,16 +1,30 @@
-NO	1. Nyttårsdag	1	1	0	0	0
-NO	Palmesøndag	9	4	2006	0	0
-NO	Skjærtorsdag	13	4	2006	0	0
-NO	Langfredag	14	4	2006	0	0
-NO	Påskedag	16	4	2006	0	0
-NO	2. påskedag	17	4	2006	0	0
-NO	1. Mai - Arbeidernes dag (Offentlig Høytidsdag)	1	5	0	0	0
-NO	Frigjøringsdagen 1945	8	5	0	0	0
-NO	Grunnlovsdagen 17. mai	17	5	0	0	0
-NO	Kristi Himmelfartsdag	25	5	2006	0	0
-NO	Pinsedag	4	6	2006	0	0
-NO	2. pinsedag	5	6	2006	0	0
-NO	Julaften	24	12	0	0	0
-NO	1. Juledag	25	12	0	0	0
-NO	2. Juledag	26	12	0	0	0
-NO	Nyttårsaften	31	12	0	0	0
+charset	iso-8859-1
+regular holidays (year=0):
+NO	Nyttårsdag	1	1	0	0	0
+NO	1. mai	1	5	0	0	0
+NO	1. juledag	25	12	0	0	0
+NO	2. juledag	26	12	0	0	0
+
+2005:
+NO	Palmesøndag	4	4	2004	0	0
+NO	Skjærtorsdag	8	4	2004	0	0
+NO	Langfredag	9	4	2004	0	0
+NO	1. påskedag	11	4	2004	0	0
+NO	2. påskedag	12	4	2004	0	0
+NO	Grunnlovsdag	17	5	2004	0	0
+NO	Kr. himmelfartsdag	20	5	2004	0	0
+NO	1. pinsedag	30	5	2004	0	0
+NO	2. pinsedag	31	5	2004	0	0
+
+2005:
+NO	Palmesøndag	20	3	2005	0	0
+NO	Skjærtorsdag	24	3	2005	0	0
+NO	Langfredag	25	3	2005	0	0
+NO	1. påskedag	27	3	2005	0	0
+NO	2. påskedag	28	3	2005	0	0
+NO	Kr. himmelfartsdag	5	5	2005	0	0
+NO	1. pinsedag	15	5	2005	0	0
+NO	2. pinsedag	16	5	2005	0	0
+NO	Grunnlovsdag	17	5	2005	0	0
+
+2006:
diff --git a/calendar/inc/class.boalarm.inc.php b/calendar/inc/class.boalarm.inc.php
deleted file mode 100755
index 83528d2e8e..0000000000
--- a/calendar/inc/class.boalarm.inc.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Modified by Mark Peters <milosch@phpwhere.org>                           *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	define('PHPGW_ACL_DELETEALARM',PHPGW_ACL_DELETE);	// for now
-	define('PHPGW_ACL_SETALARM',PHPGW_ACL_EDIT);
-	define('PHPGW_ACL_READALARM',PHPGW_ACL_READ);
-
-	class boalarm
-	{
-		var $so;
-		var $cal;
-		var $cal_id;
-
-		var $tz_offset;
-
-		var $debug = False;
-//		var $debug = True;
-
-		var $public_functions = array(
-			'add'       => True,
-			'delete'    => True
-		);
-
-		function boalarm()
-		{
-			$cal_id = (isset($_POST['cal_id'])?(int)$_POST['cal_id']:'');
-			if($cal_id)
-			{
-				$this->cal_id = $cal_id;
-			}
-			$this->bo = CreateObject('calendar.bocalendar',1);
-			$this->so = CreateObject('calendar.socalendar',1);
-			$this->tz_offset = $GLOBALS['phpgw']->datetime->tz_offset;
-
-			if($this->debug)
-			{
-				echo "BO Owner : ".$this->bo->owner."<br>\n";
-			}
-
-			if($this->bo->use_session)
-			{
-				$this->save_sessiondata();
-			}
-		}
-
-		function save_sessiondata()
-		{
-			$data = array(
-				'filter' => $this->bo->filter,
-				'cat_id' => $this->bo->cat_id,
-				'owner'  => $this->bo->owner,
-				'year'   => $this->bo->year,
-				'month'  => $this->bo->month,
-				'day'    => $this->bo->day
-			);
-			$this->bo->save_sessiondata($data);
-		}
-
-		function read_entry($cal_id)
-		{
-			return $this->bo->read_entry((int)$cal_id);
-		}
-
-		/*!
-		@function add
-		@abstract adds a new alarm to an event
-		@syntax add(&$event,$time,$login_id)
-		@param &$event event to add the alarm too
-		@param $time for the alarm in sec before the starttime of the event
-		@param $login_id user to alarm
-		@returns the alarm or False
-		*/
-		function add(&$event,$time,$owner)
-		{
-			//echo "<p>boalarm::add(event="; print_r($event); ",time=$time,owner=$owner)</p>\n";
-			if (!$this->check_perms(PHPGW_ACL_SETALARM,$owner) || !($cal_id = $event['id']))
-			{
-				return False;
-			}
-			$alarm = Array(
-				'time'    => ($etime=$this->bo->maketime($event['start'])) - $time,
-				'offset'  => $time,
-				'owner'   => $owner,
-				'enabled' => 1
-			);
-			$alarm['id'] = $this->so->save_alarm($cal_id,$alarm);
-			$event['alarm'][$alarm['id']] = $alarm;
-			$event['alarm'][$alarm['id']]['time'] = $alarm['time'] - $this->tz_offset;	// allows viewing alarm time in users timezone
-
-			return $alarm;
-		}
-
-		/*!
-		@function check_perms
-		@abstract checks if user has a certain grant from the owner of an alarm or event
-		@syntax check_perms($grant,$owner)
-		@param $grant PHPGW_ACL_{SET|READ|DELETE}ALARM (defined at the top of this file)
-		*/
-		function check_perms($grant,$owner)
-		{
-			return $this->bo->check_perms($grant,0,$owner);
-		}
-
-		/*!
-		@function participants
-		@abstract get the participants of an event, the user has grants to alarm
-		@syntax participants($event,$fullnames=True)
-		@param $event or cal_id of an event
-		@param $fullnames if true return array with fullnames as values
-		@returns array with account_ids as keys
-		*/
-		function participants($event,$fullnames=True)
-		{
-			if (!is_array($event))
-			{
-				$event = $this->read_entry($event);
-			}
-			if (!$event)
-			{
-				return False;
-			}
-			$participants = array();
-			foreach ($event['participants'] as $uid => $status)
-			{
-				if ($this->check_perms(PHPGW_ACL_SETALARM,$uid))
-				{
-					$participants[$uid] = $fullnames ? $GLOBALS['phpgw']->common->grab_owner_name($uid) : True;
-				}
-			}
-			return $participants;
-		}
-
-		/*!
-		@function enable
-		@abstract enable or disable one or more alarms identified by its ids
-		@syntax enable($ids,$enable=True)
-		@param $ids array with alarm ids as keys (!)
-		@returns the number of alarms enabled or -1 for insuficent permission to do so
-		@note Not found alarms or insuficent perms stop the enableing of multiple alarms
-		*/
-		function enable($alarms,$enable=True)
-		{
-			$enabled = 0;
-			foreach ($alarms as $id => $field)
-			{
-				if (!($alarm = $this->so->read_alarm($id)))
-				{
-					return 0;	// alarm not found
-				}
-				if (!$alarm['enabled'] == !$enable)
-				{
-					continue;	// nothing to do
-				}
-				if ($enable && !$this->check_perms(PHPGW_ACL_SETALARM,$alarm['owner']) ||
-					!$enable && !$this->check_perms(PHPGW_ACL_DELETEALARM,$alarm['owner']))
-				{
-					return -1;
-				}
-				$alarm['enabled'] = (int)(!$alarm['enabled']);
-				if ($this->so->save_alarm($alarm['cal_id'],$alarm))
-				{
-					++$enabled;
-				}
-			}
-			return $enabled;
-		}
-
-		/*!
-		@function delete
-		@abstract delete one or more alarms identified by its ids
-		@syntax delete($ids)
-		@param $ids array with alarm ids as keys (!)
-		@returns the number of alarms deleted or -1 for insuficent permission to do so
-		@note Not found alarms or insuficent perms stop the deleting of multiple alarms
-		*/
-		function delete($alarms)
-		{
-			$deleted = 0;
-			foreach ($alarms as $id => $field)
-			{
-				if (!($alarm = $this->so->read_alarm($id)))
-				{
-					return 0;	// alarm not found
-				}
-				if (!$this->check_perms(PHPGW_ACL_DELETEALARM,$alarm['owner']))
-				{
-					return -1;
-				}
-				if ($this->so->delete_alarm($id))
-				{
-					++$deleted;
-				}
-			}
-			return $deleted;
-		}
-	}
-?>
diff --git a/calendar/inc/class.bocal.inc.php b/calendar/inc/class.bocal.inc.php
index 91f613f168..a8f6a6cccc 100644
--- a/calendar/inc/class.bocal.inc.php
+++ b/calendar/inc/class.bocal.inc.php
@@ -1,8 +1,8 @@
 <?php
 /**************************************************************************\
-* eGroupWare - Calendar's "new" BO-layer (buisness-object)                 *
+* eGroupWare - Calendar's buisness-object - access only                    *
 * http://www.egroupware.org                                                *
-* Written and (c) 2004 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* Written and (c) 2004/5 by Ralf Becker <RalfBecker@outdoor-training.de>   *
 * --------------------------------------------                             *
 *  This program is free software; you can redistribute it and/or modify it *
 *  under the terms of the GNU General Public License as published by the   *
@@ -12,35 +12,7 @@
 
 /* $Id$ */
 
-/**
- * Class to access and manipulate all calendar data
- *
- * At the moment this class partialy uses the "old" socalendar class.
- * As the calendar rewrite proceeds, these references will be removed.
- *
- * Note: All new code should only access this class and not bocalendar!!!
- *
- * If you need a function not already available in bocal, please ask RalfBecker@outdoor-training.de
- *
- * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
- *  UI only operates in user-time, so there have to be no conversation at all !!!
- *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
- *  SO operates only in server-time (please note, this is not the case with the socalendar*-classes used atm.)
- *
- * As this BO class deals with dates/times of several types and timezone, each variable should have a postfix
- * appended, telling with type it is: _s = seconds, _su = secs in user-time, _ss = secs in server-time, _h = hours
- * The dates returned by this class are always arrays with the following keys (subset of the array used by datetime):
- * year, month, day (not mday!), hour, minute (not min!), second (not sec!), raw (timestamp) and full (Ymd-string)
- *
- * All new BO code (should be true for eGW in general) NEVER use any $_REQUEST ($_POST or $_GET) vars itself.
- * Nor does it store the state of any UI-elements (eg. cat-id selectbox). All this is the task of the UI class !!!
- *
- * All permanent debug messages of the calendar-code should done via the debug-message method of the class !!!
- *
- * @package calendar
- * @author RalfBecker@outdoor-training.de
- * @license GPL
- */
+require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.socal.inc.php');
 
 if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
 {
@@ -51,6 +23,30 @@ define('HOUR_s',60*60);
 define('DAY_s',24*HOUR_s);
 define('WEEK_s',7*DAY_s);
 
+/**
+ * Class to access all calendar data
+ *
+ * For updating calendar data look at the bocalupdate class, which extends this class.
+ *
+ * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
+ *  UI only operates in user-time, so there have to be no conversation at all !!!
+ *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
+ *  SO operates only in server-time
+ *
+ * As this BO class deals with dates/times of several types and timezone, each variable should have a postfix
+ * appended, telling with type it is: _s = seconds, _su = secs in user-time, _ss = secs in server-time, _h = hours
+ *
+ * All new BO code (should be true for eGW in general) NEVER use any $_REQUEST ($_POST or $_GET) vars itself.
+ * Nor does it store the state of any UI-elements (eg. cat-id selectbox). All this is the task of the UI class(es) !!!
+ *
+ * All permanent debug messages of the calendar-code should done via the debug-message method of this class !!!
+ *
+ * @package calendar
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2004/5 by RalfBecker-At-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ */
+
 class bocal
 {
 	/**
@@ -103,6 +99,44 @@ class bocal
 		'T' => 'Tentative',
 		'U' => 'No Response',
 	);
+	/**
+	 * @var array recur_types translates MCAL recur-types to verbose labels
+	 */
+	var $recur_types = Array(
+		MCAL_RECUR_NONE         => 'None',
+		MCAL_RECUR_DAILY        => 'Daily',
+		MCAL_RECUR_WEEKLY       => 'Weekly',
+		MCAL_RECUR_MONTHLY_WDAY => 'Monthly (by day)',
+		MCAL_RECUR_MONTHLY_MDAY => 'Monthly (by date)',
+		MCAL_RECUR_YEARLY       => 'Yearly'
+	);
+	/**
+	 * @var array recur_days translates MCAL recur-days to verbose labels
+	 */
+	var $recur_days = array(
+		MCAL_M_MONDAY    => 'Monday',
+		MCAL_M_TUESDAY   => 'Tuesday',
+		MCAL_M_WEDNESDAY => 'Wednesday',
+		MCAL_M_THURSDAY  => 'Thursday',
+		MCAL_M_FRIDAY    => 'Friday',
+		MCAL_M_SATURDAY  => 'Saturday',
+		MCAL_M_SUNDAY    => 'Sunday',
+	);
+	var $so,$datetime;
+	/**
+	 * @var array $resources registered scheduling resources of the calendar (gets chached in the session for performance reasons)
+	 */
+	var $resources;
+	/**
+	 * @internal 
+	 * @var array $cached_event here we do some caching to read single events only once
+	 */
+	var $cached_event = array();
+	var $cached_event_date_format = false;
+	/**
+	 * @var array $cached_holidays holidays plus birthdays (gets cached in the session for performance reasons)
+	 */
+	var $cached_holidays;
 
 	/**
 	 * Constructor
@@ -112,47 +146,57 @@ class bocal
 		if ($this->debug > 0) $this->debug_message('bocal::bocal() started',True,$param);
 
 		foreach(array(
-			'old_so'    => 'calendar.socalendar',
 			'so'    	=> 'calendar.socal',
 			'datetime'  => 'phpgwapi.datetime',
 		) as $my => $app_class)
 		{
 			list(,$class) = explode('.',$app_class);
 
-			if (!is_object($GLOBALS['phpgw']->$class))
+			if (!is_object($GLOBALS['egw']->$class))
 			{
 				//echo "<p>calling CreateObject($app_class)</p>\n".str_repeat(' ',4096);
-				$GLOBALS['phpgw']->$class = CreateObject($app_class);
+				$GLOBALS['egw']->$class = CreateObject($app_class);
 			}
-			$this->$my = &$GLOBALS['phpgw']->$class;
+			$this->$my = &$GLOBALS['egw']->$class;
 		}
-		$this->common_prefs = $GLOBALS['phpgw_info']['user']['preferences']['common'];
-		$this->cal_prefs = $GLOBALS['phpgw_info']['user']['preferences']['calendar'];
+		$this->common_prefs =& $GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->cal_prefs =& $GLOBALS['egw_info']['user']['preferences']['calendar'];
+		$this->check_set_default_prefs();
 
 		$this->tz_offset_s = $this->datetime->tz_offset;
 
 		$this->now_su = time() + $this->tz_offset_s;
 
-		$this->user = $GLOBALS['phpgw_info']['user']['account_id'];
+		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-		$this->grants = $GLOBALS['phpgw']->acl->get_grants('calendar');
+		$this->grants = $GLOBALS['egw']->acl->get_grants('calendar');
 
 		foreach($this->verbose_status as $status => $text)
 		{
 			$this->verbose_status[$status] = lang($text);
 		}
+		if (!is_array($this->resources = $GLOBALS['egw']->session->appsession('resources','calendar')))
+		{
+			$this->resources = array();
+			foreach($GLOBALS['egw']->hooks->process('calendar_resources') as $app => $data)
+			{
+				if ($data && $data['type'])
+				{
+					$this->resources[$data['type']] = $data + array('app' => $app);
+				}
+			}
+			$GLOBALS['egw']->session->appsession('resources','calendar',$this->resources);
+		}	
+		//echo "registered resources="; _debug_array($this->resources);
+
+		$config =& CreateObject('phpgwapi.config','calendar');
+		$this->config =& $config->read_repository();
+		unset($config);
 	}
 
 	/**
 	 * Searches / lists calendar entries, including repeating ones
 	 *
-	 * As said earlier the new bo-class operates to the outside only in user-time and to the so-class only in server-time.
-	 * The existing old_so-class (socalendar*) still has a mixed approach, values are mostly (!) returned in user-time
-	 * and arguments are sometimes (!) expected in server-time ;-)
-	 * We need to kope with that, til the so-class gets re-written !!!
-	 * The arguments to the list_*events* functions are in user-time (they take only year,month,day) and they return id's.
-	 * The events, fetched with there id's via old_so::read_entry are also in user-time.
-	 *
 	 * @param params array with the following keys
 	 *	start date startdate of the search/list, defaults to today
 	 *	end   date enddate of the search/list, defaults to start + one day
@@ -165,124 +209,94 @@ class bocal
 	 *	dayswise boolean on True it returns an array with YYYYMMDD strings as keys and an array with events
 	 *		(events spanning multiple days are returned each day again (!)) otherwise it returns one array with
 	 *		the events (default), not honored in a search ==> always returns an array of events !
+	 *	date_format string date-formats: 'ts'=timestamp (default), 'array'=array, or string with format for date
+	 *  offset boolean/int false (default) to return all entries or integer offset to return only a limited result
+	 *  enum_recuring boolean if true or not set (default) or daywise is set, each recurence of a recuring events is returned,
+	 *		otherwise the original recuring event (with the first start- + enddate) is returned
+	 *  num_rows int number of entries to return, default or if 0, max_entries from the prefs
+	 *  order column-names plus optional DESC|ASC separted by comma
+	 *  show_rejected if set rejected invitation are shown only when true, otherwise it depends on the cal-pref or a running query
+	 *  ignore_acl if set and true no check_perms for a general EGW_ACL_READ grants is performed
 	 * @return array of events or array with YYYYMMDD strings / array of events pairs (depending on $daywise param)
 	 */
-	function search($params)
+	function &search($params)
 	{
 		$params_in = $params;
 
 		if (!isset($params['users']) || !$params['users'])
 		{
-			$params['users'] = $this->user;
+			// for a search use all account you have read grants from
+			$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
 		}
 		if (!is_array($params['users']))
 		{
-			$params['users'] = array((int) $params['users']);
+			$params['users'] = array($params['users']);
 		}
 		// only query calendars of users, we have READ-grants from
 		$users = array();
 		foreach($params['users'] as $user)
 		{
-			if ($this->check_perms(PHPGW_ACL_READ,0,$user))
+			if ($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ,0,$user))
 			{
 				$users[] = $user;
+				
+				// for groups we have to include the members
+				if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
+				{
+					$members = $GLOBALS['egw']->accounts->member($user);
+					if (is_array($members))
+					{
+						foreach($members as $member)
+						{
+							// use only members which gave the user a read-grant
+							if (!in_array($member['account_id'],$users) && 
+								($params['ignore_acl'] || $this->check_perms(EGW_ACL_READ,0,$member['account_id'])))
+							{
+								$users[] = $member['account_id'];
+							}
+						}
+					}
+				}
 			}
 		}
-		$start = $this->date2ts($params['start']);
-		$end   = isset($params['end']) ? $this->date2ts($params['end']) : $start + DAY_s-1;
+		// if we have no grants from the given user(s), we directly return no events / an empty array, 
+		// as calling the so-layer without users would give the events of all users (!)
+		if (!count($users))
+		{
+			return array();
+		}
+		if (isset($params['start'])) $start = $this->date2ts($params['start']);
+
+		if (isset($params['end']))
+		{
+			$end = $this->date2ts($params['end']);
+			$this->check_move_horizont($end);
+		}
 		$daywise = !isset($params['daywise']) ? False : !!$params['daywise'];
+		$enum_recuring = $daywise || !isset($params['enum_recuring']) || !!$params['enum_recuring'];
 		$cat_id = isset($params['cat_id']) ? $params['cat_id'] : 0;
 		$filter = isset($params['filter']) ? $params['filter'] : 'all';
+		$offset = isset($params['offset']) && $params['offset'] !== false ? (int) $params['offset'] : false;
+		$show_rejected = isset($params['show_rejected']) ? $params['show_rejected'] : $this->cal_prefs['show_rejected'] || $params['query'];
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
 		{
-			$this->debug_message('bocal::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6',True,
-				$params,$start,$end,$daywise,$cat_id,$filter);
+			$this->debug_message('bocal::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, show_rejected=%11)',
+				True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
 		}
-		// some of the params need to be set as class vars in the old so-class
-		$this->old_so->cat_id = $cat_id;
-		$this->old_so->filter = $filter;
-
-		if (!isset($params['query']) || empty($params['query']))
+		// date2ts(,true) converts to server time, db2data converts again to user-time
+		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
+			$users,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$show_rejected);
+		$this->total = $this->so->total;
+		$this->db2data($events,isset($params['date_format']) ? $params['date_format'] : 'ts');
+		
+		foreach($events as $id => $event)
 		{
-			$start = $this->date2array($start);
-			$end   = $this->date2array($end);
-
-			$event_ids = $this->old_so->list_events($start['year'],$start['month'],$start['day'],
-				$end['year'],$end['month'],$end['day'],$users);
-
-			if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
+			if (!$this->check_perms(EGW_ACL_READ,$event))
 			{
-				$this->debug_message('socalendar::list_events(start=%1,end=%2,users=%3)=%4',False,
-					$start,$end,$users,$event_ids);
-			}
-			$rep_event_ids = $this->old_so->list_repeated_events($start['year'],$start['month'],$start['day'],
-				$end['year'],$end['month'],$end['day'],$users);
-			if ($this->debug > 1) $this->debug_message('socalendar::list_repeated_events(start=%1,end=%2,users=%3)=%4',False,$start,$end,$users,$rep_event_ids);
-		}
-		else
-		{
-			$daywise = False;
-			$event_ids = $this->old_so->list_events_keyword($params['query'],$users);
-
-			if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
-			{
-				$this->debug_message('socalendar::list_events_keyword(query=%1,users=%2)=%3',False,
-					$params['query'],$users,$event_ids);
-			}
-			$rep_event_ids = array();	// not used in search
-		}
-		// To build the list of events from returned id's, we need go through the $event_ids, read each event
-		// and put it in the cached_events for each day it's running, if it's NO repeating event.
-		// Then we need to go through $rep_event_ids, fetch the event and add each event with ALL it's occurences
-		// within the reported timespan, if there is no recur-exception-event already in the list of events.
-		// If daywise is True each event need to be added in the array of each day it's running.
-		// Please note: as we use the old SO class, all returned dates are already in user-time !!!
-
-		$events = $recur_exceptions = Array();
-		$events_sorted = True;
-
-		if(count($event_ids) || count($rep_event_ids))
-		{
-			$db_events = (array) $this->read($event_ids+$rep_event_ids,true);
-			
-			foreach($db_events as $id => $event)
-			{
-				if ($event['recur_type']) continue;	// done in 2. step, we need the exceptions first
-
-				// recur-exceptions have a reference to the original event
-				// we remember they are their for a certain date and id, to not insert their regular recurrence
-				if ($event['reference'])
-				{
-					for($ts = $event['start']['raw']; $ts < $event['end']['raw']; $ts += DAY_s)
-					{
-						$recur_exceptions[$event['reference']][(int)$this->date2string((int)$ts)] = True;
-					}
-					$recur_exceptions[$event['reference']][$event['end']['full']] = True;
-				}
-				$events[] = &$db_events[$id];
-				unset($db_events[$id]);
-			}
-			foreach($db_events as $id => $event)
-			{
-				$this->insert_all_repetitions($event,$start,$end,$events,$recur_exceptions[$id]);
-				$events_sorted = False;
-			}
-			unset($db_events);
-
-			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
-			{
-				$this->debug_message('socalendar::search processed event_ids=%1, events=%2',False,$event_ids+$rep_event_ids,$events);
-			}
-		}
-		if (!$events_sorted)
-		{
-			// sort the events by start-date
-			usort($events,create_function('$e1,$e2',"return \$e1['start']['raw']-\$e2['start']['raw'];"));
-			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
-			{
-				$this->debug_message('socalendar::search usort(events)=%1',False,$events);
+				$this->clear_private_infos($events[$id],$users);
 			}
 		}
+
 		if ($daywise)
 		{
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
@@ -290,73 +304,259 @@ class bocal
 				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
 			}
 			// create empty entries for each day in the reported time
-			for($ts = $start['raw']; $ts <= $end['raw']; $ts += DAY_s)
+			for($ts = $start; $ts <= $end; $ts += DAY_s)
 			{
 				$daysEvents[$this->date2string($ts)] = array();
 			}
-			foreach($events as $event)
+			foreach($events as $k => $event)
 			{
-				$e_start = max($event['start']['raw'],$start['raw']);
+				$e_start = max($this->date2ts($event['start']),$start);
 				// $event['end']['raw']-1 to allow events to end on a full hour/day without the need to enter it as minute=59
-				$e_end   = min($event['end']['raw']-1,$end['raw']);
+				$e_end   = min($this->date2ts($event['end'])-1,$end);
 
 				// add event to each day in the reported time
 				for($ts = $e_start; $ts <= $e_end; $ts += DAY_s)
 				{
-					$daysEvents[$this->date2string($ts)][] = $event;
+					$daysEvents[$ymd = $this->date2string($ts)][] =& $events[$k];
 				}
+				if ($ymd != ($last = $this->date2string($e_end)))
+				{
+					$daysEvents[$last][] =& $events[$k];
+				}					
 			}
-			$events = $daysEvents;
+			$events =& $daysEvents;
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
 			{
 				$this->debug_message('socalendar::search daywise events=%1',False,$events);
 			}
 		}
+		elseif(!$enum_recuring)
+		{
+			$recur_ids = array();
+			foreach($events as $k => $event)
+			{
+				if ($event['recur_type'] != MCAL_RECUR_NONE)
+				{
+					if (!in_array($event['id'],$recur_ids))
+					{
+						$recur_ids[] = $event['id'];
+					}
+					unset($events[$k]);
+				}
+			}
+			if (count($recur_ids))
+			{
+				$events = array_merge($this->read($recur_ids),$events);
+			}
+		}
 		if ($this->debug && ($this->debug > 0 || $this->debug == 'search'))
 		{
 			$this->debug_message('bocal::search(%1)=%2',True,$params,$events);
 		}
 		return $events;
 	}
+	
+	/**
+	 * Clears all non-private info from a privat event
+	 *
+	 * That function only returns the infos allowed to be viewed by people without EGW_ACL_PRIVATE grants
+	 *
+	 * @param array &$event
+	 * @param array $allowed_participants ids of the allowed participants, eg. the ones the search is over or eg. the owner of the calendar
+	 */
+	function clear_private_infos(&$event,$allowed_participants = array())
+	{
+		$event = array(
+			'id'    => $event['id'],
+			'start' => $event['start'],
+			'end'   => $event['end'],
+			'title' => lang('private'),
+			'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
+			'public'=> 0,
+		);
+	}
+	
+	/**
+	 * check and evtl. move the horizont (maximum date for unlimited recuring events) to a new date
+	 *
+	 * @internal automaticaly called by search
+	 * @param mixed $new_horizont time to set the horizont to (user-time)
+	 */
+	function check_move_horizont($new_horizont)
+	{
+		if ((int) $this->debug >= 2 || $this->debug == 'check_move_horizont')
+		{
+			$this->debug_message('bocal::check_move_horizont(%1) horizont=%2',true,$new_horizont,$this->config['horizont']);
+		}
+		$new_horizont = $this->date2ts($new_horizont,true);	// now we are in server-time, where this function operates
+
+		if ($new_horizont <= $this->config['horizont'])	// no move necessary
+		{
+			if ($this->debug == 'check_move_horizont') $this->debug_message('bocal::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do',true,$new_horizont,$this->config['horizont']);
+			return;
+		}
+		if ($new_horizont < time()+31*DAY_s)
+		{
+			$new_horizont = time()+31*DAY_s;
+		}
+		$old_horizont = $this->config['horizont'];
+		$this->config['horizont'] = $new_horizont;
+
+		// create further recurances for all recuring and not yet (at the old horizont) ended events
+		if (($recuring = $this->so->unfinished_recuring($old_horizont)))
+		{
+			foreach($this->read(array_keys($recuring)) as $cal_id => $event)
+			{
+				if ($this->debug == 'check_move_horizont')
+				{
+					$this->debug_message('bocal::check_move_horizont(%1): calling set_recurrences(%2,%3)',true,$new_horizont,$event,$old_horizont);
+				}
+				// insert everything behind max(cal_start), which can be less then $old_horizont because of bugs in the past
+				$this->set_recurrences($event,$recuring[$cal_id]+1+$this->tz_offset_s);	// set_recurences operates in user-time!
+			}
+		}
+		// update the horizont
+		$config =& CreateObject('phpgwapi.config','calendar');
+		$config->save_value('horizont',$this->config['horizont'],'calendar');
+		
+		if ($this->debug == 'check_move_horizont') $this->debug_message('bocal::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,$this->config['horizont']);
+	}
+
+	/**
+	 * set all recurances for an event til the defined horizont $this->config['horizont']
+	 *
+	 * @param array $event
+	 * @param mixed $start=0 minimum start-time for new recurances or !$start = since the start of the event
+	 */
+	function set_recurrences($event,$start=0)
+	{
+		if ($this->debug && ((int) $this->debug >= 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont'))
+		{
+			$this->debug_message('bocal::set_recurrences(%1,%2)',true,$event,$start);
+		}
+		if (!$start) $start = $event['start'];
+		
+		$events = array();
+		$this->insert_all_repetitions($event,$start,$this->date2ts($this->config['horizont'],true),$events,null);
+
+		foreach($events as $event)
+		{
+			$this->so->recurrence($event['id'],$this->date2ts($event['start'],true),$this->date2ts($event['end'],true),$event['participants']);
+		}
+	}
+	
+	/**
+	 * convert data read from the db, eg. convert server to user-time
+	 *
+	 * @param array &$events array of event-arrays (reference)
+	 * @param $date_format='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
+	 */
+	function db2data(&$events,$date_format='ts')
+	{
+		if (!is_array($events)) echo "<p>bocal::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
+		foreach($events as $id => $event)
+		{
+			// we convert here from the server-time timestamps to user-time and (optional) to a different date-format!
+			foreach(array('start','end','modified','recur_enddate') as $ts)
+			{
+				if (empty($event[$ts])) continue;
+
+				$events[$id][$ts] = $this->date2usertime($event[$ts],$date_format);
+			}
+			// same with the recur exceptions
+			if (isset($event['recur_exception']) && is_array($event['recur_exception']))
+			{
+				foreach($event['recur_exception'] as $n => $date)
+				{
+					$events[$id]['recur_exception'][$n] = $this->date2usertime($date,$date_format);
+				}
+			}
+			// same with the alarms
+			if (isset($event['alarm']) && is_array($event['alarm']))
+			{
+				foreach($event['alarm'] as $n => $alarm)
+				{
+					$events[$id]['alarm'][$n]['time'] = $this->date2usertime($alarm['time'],$date_format);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * convert a date from server to user-time
+	 *
+	 * @param int $date timestamp in server-time
+	 * @param $date_format='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
+	 */
+	function date2usertime($ts,$date_format='ts')
+	{
+		if (empty($ts)) return $ts;
+		
+		switch ($date_format)
+		{
+			case 'ts':
+				return $ts + $this->tz_offset_s;
+
+			case 'server':
+				return $ts;
+
+			case 'array':
+				return $this->date2array((int) $ts,true);
+
+			case 'string':
+				return $this->date2string($ts,true);
+		}
+		return $this->date2string($ts,true,$date_format);
+	}
 
 	/**
 	 * Reads a calendar-entry
 	 *
-	 * @param $ids array/int id(s) of the entry
-	 * @param $ignore_acl boolean should we ignore the acl, default False for a single id, true for multiple id's
+	 * @param int/array/string $ids id or array of id's of the entries to read, or string with a single uid
+	 * @param mixed $date=null date to specify a single event of a series
+	 * @param boolean $ignore_acl should we ignore the acl, default False for a single id, true for multiple id's
+	 * @param string $date_format='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in servertime, 'array'=array, or string with date-format
 	 * @return boolean/array event or array of id => event pairs or False if the acl-check went wrong
 	 */
-	function read($ids,$ignore_acl=False)
+	function read($ids,$date=null,$ignore_acl=False,$date_format='ts')
 	{
-		$event = False;
+		if ($date) $date = $this->date2ts($date);
 
-		if($ignore_acl || is_array($ids) || $this->check_perms(PHPGW_ACL_READ,$ids))
+		$return = false;
+		if ($ignore_acl || is_array($ids) || $this->check_perms(EGW_ACL_READ,$ids,0,$date_format))
 		{
-			// some minimal cacheing to re-use the event already read in check_perms
-			static $event = array();
-
-			if (is_array($ids) || !isset($event['id']) || $event['id'] != $ids)
+			if (is_array($ids) || !isset($this->cached_event['id']) || $this->cached_event['id'] != $ids || 
+				$this->cached_event_date_format != $date_format ||
+				!is_null($date) && $this->cached_event['start'] < $date && $this->cached_event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$events = $this->so->read($ids);
-
-				foreach($events as $id => $event)
+				$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0);
+				
+				if ($events)
 				{
-					// we run all dates through date2array, to get the new keys (day,minute,second,full,raw)
-					foreach(array('starttime' => 'start','endtime' => 'end','modified' => 'modtime','recur_enddate' => 'recur_enddate') as $ts => $date)
+					$this->db2data($events,$date_format);
+	
+					if (is_array($ids))
 					{
-						unset($events[$id][$ts]);
-						// we convert here from the server-time timestamps to an array in user-time!
-						$events[$id][$date] = $event[$ts] ? $this->date2array((int) $event[$ts],true) : false;
+						$return =& $events;
+					}
+					else
+					{
+						$this->cached_event = array_shift($events);
+						$this->cached_event_date_format = $date_format;
+						$return =& $this->cached_event;
 					}
 				}
-				if (!is_array($ids)) $event = $events[$ids];
+			}
+			else
+			{
+				$return =& $this->cached_event;
 			}
 		}
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'read'))
 		{
-			$this->debug_message('bocal::read(%1,%2)=%3',True,$ids,$ignore_acl,is_array($ids) ? $events : $event);
+			$this->debug_message('bocal::read(%1,%2,%3,%4)=%5',True,$ids,$date,$ignore_acl,$date_format,$return);
 		}
-		return is_array($ids) ? $events : $event;
+		return $return;
 	}
 
 	/**
@@ -373,23 +573,33 @@ class bocal
 	 *	of the used recur-type and add all events in one simple for-loop. Daylightsaving changes need to be taken into Account.
 	 *
 	 * @param $event array repeating event whos repetions should be inserted
-	 * @param $start array start-date
-	 * @param $end array end-date
+	 * @param $start mixed start-date
+	 * @param $end mixed end-date
 	 * @param $events array where the repetions get inserted
 	 * @param $recur_exceptions array with date (in Ymd) as key (and True as values)
 	 */
 	function insert_all_repetitions($event,$start,$end,&$events,$recur_exceptions)
 	{
+		if ((int) $this->debug >= 3 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions')
+		{
+			$this->debug_message('bocal::insert_all_repitions(%1,%2,%3,&$event,%4)',true,$event,$start,$end,$recur_exceptions);
+		}
 		$start_in = $start; $end_in = $end;
+		
+		$start = $this->date2ts($start);
+		$end   = $this->date2ts($end);
+		$event_start_ts = $this->date2ts($event['start']);
+		$event_end_ts   = $this->date2ts($event['end']);
 
-		if ($this->debug && ($this->debug > 3 || $this->debug == 'insert_all_repetions'))
+		if ($this->debug && ((int) $this->debug > 3 || $this->debug == 'insert_all_repetions' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions'))
 		{
 			$this->debug_message('bocal::insert_all_repetions(%1,start=%2,end=%3,,%4) starting...',True,$event,$start_in,$end_in,$recur_exceptions);
 		}
 		$id = $event['id'];
+		$event_start_arr = $this->date2array($event['start']);
 		// to be able to calculate the repetitions as difference to the start-date, 
 		// both need to be calculated without daylight saving: mktime(,,,,,,0)
-		$event_start_daybegin_ts = mktime(0,0,0,$event['start']['month'],$event['start']['day'],$event['start']['year'],0);
+		$event_start_daybegin_ts = adodb_mktime(0,0,0,$event_start_arr['month'],$event_start_arr['day'],$event_start_arr['year'],0);
 
 		if($event['recur_enddate'])
 		{
@@ -397,16 +607,16 @@ class bocal
 		}
 		else
 		{
-			$recur_end_ymd = $this->date2string(mktime(0,0,0,1,1,5+date('Y')));	// go max. 5 years from now
+			$recur_end_ymd = $this->date2string(adodb_mktime(0,0,0,1,1,5+adodb_date('Y')));	// go max. 5 years from now
 		}
 
 		// We only need to compute the intersection between our reported time-span and the live-time of the event
 		// To catch all multiday repeated events (eg. second days), we need to start the length of the even earlier
 		// then our original report-starttime
-		$event_length = $event['end']['raw']-$event['start']['raw'];
-		$start_ts = max($event['start']['raw'],$start['raw']-$event_length);
+		$event_length = $event_end_ts - $event_start_ts;
+		$start_ts = max($event_start_ts,$start-$event_length);
 		// we need to add 26*60*60-1 to the recur_enddate as its hour+minute are 0
-		$end_ts   = $event['recur_enddate'] ? min($event['recur_enddate']['raw']+DAY_s-1,$end['raw']) : $end['raw'];
+		$end_ts   = $event['recur_enddate'] ? min($this->date2ts($event['recur_enddate'])+DAY_s-1,$end) : $end;
 
 		for($ts = $start_ts; $ts < $end_ts; $ts += DAY_s)
 		{
@@ -416,12 +626,12 @@ class bocal
 			
 			if (!$have_exception)	// no execption by an edited event => check the deleted ones
 			{
-				foreach($event['recur_exception'] as $exception_ts)
+				foreach((array)$event['recur_exception'] as $exception_ts)
 				{
 					$have_exception = $search_date_ymd == (int)$this->date2string($exception_ts);
 				}
 			}
-			if ($this->debug && ($this->debug > 3 || $this->debug == 'insert_all_repetions'))
+			if ($this->debug && ((int) $this->debug > 3 || $this->debug == 'insert_all_repetions' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions'))
 			{
 				$this->debug_message('bocal::insert_all_repetions(...,%1) checking recur_exceptions[%2] and event[recur_exceptions]=%3 ==> %4',False,
 					$recur_exceptions,$search_date_ymd,$event['recur_exception'],$have_exception);
@@ -430,15 +640,15 @@ class bocal
 			{
 				continue;	// we already have an exception for that date
 			}
-			$search_date_year = date('Y',$ts);
-			$search_date_month = date('m',$ts);
-			$search_date_day = date('d',$ts);
-			$search_date_dow = date('w',$ts);
+			$search_date_year = adodb_date('Y',$ts);
+			$search_date_month = adodb_date('m',$ts);
+			$search_date_day = adodb_date('d',$ts);
+			$search_date_dow = adodb_date('w',$ts);
 			// to be able to calculate the repetitions as difference to the start-date, 
 			// both need to be calculated without daylight saving: mktime(,,,,,,0)
-			$search_beg_day = mktime(0,0,0,$search_date_month,$search_date_day,$search_date_year,0);
+			$search_beg_day = adodb_mktime(0,0,0,$search_date_month,$search_date_day,$search_date_year,0);
 
-			if ($search_date_ymd == $event['start']['full'])	// first occurence
+			if ($search_date_ymd == $event_start_arr['full'])	// first occurence
 			{
 				$this->add_adjusted_event($events,$event,$search_date_ymd);
 				continue;
@@ -452,7 +662,7 @@ class bocal
 					{
 						echo '<!-- check_repeating_events - MCAL_RECUR_DAILY - '.$id.' -->'."\n";
 					}
-					if ($freq == 1 && $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['day'] != 0 && $event['recur_enddate']['year'] != 0 && $search_date_ymd <= $recur_end_ymd)
+					if ($freq == 1 && $event['recur_enddate'] && $search_date_ymd <= $recur_end_ymd)
 					{
 						$this->add_adjusted_event($events,$event,$search_date_ymd);
 					}
@@ -501,40 +711,40 @@ class bocal
 					}
 					break;
 				case MCAL_RECUR_MONTHLY_WDAY:
-					if ((($search_date_year - $event['start']['year']) * 12 + $search_date_month - $event['start']['month']) % $freq)
+					if ((($search_date_year - $event_start_arr['year']) * 12 + $search_date_month - $event_start_arr['month']) % $freq)
 					{
 						continue;
 					}
 
-					if (($GLOBALS['phpgw']->datetime->day_of_week($event['start']['year'],$event['start']['month'],$event['start']['day']) == $GLOBALS['phpgw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day)) &&
-						(ceil($event['start']['day']/7) == ceil($search_date_day/7)))
+					if (($GLOBALS['egw']->datetime->day_of_week($event_start_arr['year'],$event_start_arr['month'],$event_start_arr['day']) == $GLOBALS['egw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day)) &&
+						(ceil($event_start_arr['day']/7) == ceil($search_date_day/7)))
 					{
 						$this->add_adjusted_event($events,$event,$search_date_ymd);
 					}
 					break;
 				case MCAL_RECUR_MONTHLY_MDAY:
-					if ((($search_date_year - $event['start']['year']) * 12 + $search_date_month - $event['start']['month']) % $freq)
+					if ((($search_date_year - $event_start_arr['year']) * 12 + $search_date_month - $event_start_arr['month']) % $freq)
 					{
 						continue;
 					}
-					if ($search_date_day == $event['start']['day'])
+					if ($search_date_day == $event_start_arr['day'])
 					{
 						$this->add_adjusted_event($events,$event,$search_date_ymd);
 					}
 					break;
 				case MCAL_RECUR_YEARLY:
-					if (($search_date_year - $event['start']['year']) % $freq)
+					if (($search_date_year - $event_start_arr['year']) % $freq)
 					{
 						continue;
 					}
-					if (date('dm',$ts) == date('dm',$event_start_daybegin_ts))
+					if (adodb_date('dm',$ts) == adodb_date('dm',$event_start_daybegin_ts))
 					{
 						$this->add_adjusted_event($events,$event,$search_date_ymd);
 					}
 					break;
 			} // switch(recur-type)
 		} // for($date = ...)
-		if ($this->debug && ($this->debug > 2 || $this->debug == 'insert_all_repetions'))
+		if ($this->debug && ((int) $this->debug > 2 || $this->debug == 'insert_all_repetions' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_repitions'))
 		{
 			$this->debug_message('bocal::insert_all_repetions(%1,start=%2,end=%3,events,exections=%4) events=%5',True,$event,$start_in,$end_in,$recur_exceptions,$events);
 		}
@@ -551,18 +761,16 @@ class bocal
 	{
 		$event_in = $event;
 		// calculate the new start- and end-time
-		$length_s = $event['end']['raw'] - $event['start']['raw'];
+		$length_s = $this->date2ts($event['end']) - $this->date2ts($event['start']);
+		$event_start_arr = $this->date2array($event['start']);
 
 		$date_arr = $this->date2array((string) $date_ymd);
-		$date_arr['hour'] = $event['start']['hour'];
-		$date_arr['minute'] = $event['start']['minute'];
-		$date_arr['second'] = $event['start']['second'];
+		$date_arr['hour'] = $event_start_arr['hour'];
+		$date_arr['minute'] = $event_start_arr['minute'];
+		$date_arr['second'] = $event_start_arr['second'];
 		unset($date_arr['raw']);	// else date2ts would use it
-		$date_arr['raw'] = $this->date2ts($date_arr);
-		$date_arr['full'] = (int) $date_ymd;
-
-		$event['start'] = $date_arr;
-		$event['end'] = $this->date2array($date_arr['raw']+$length_s);
+		$event['start'] = $this->date2ts($date_arr);
+		$event['end'] = $event['start'] + $length_s;
 
 		$events[] = $event;
 
@@ -580,13 +788,21 @@ class bocal
 	 * Note: Participating in an event is considered as haveing read-access on that event,
 	 *	even if you have no general read-grant from that user.
 	 *
-	 * @param $needed int necessary ACL right: PHPGW_ACL_{READ|EDIT|DELETE}
-	 * @param $event mixed event as array or the event-id or 0 for a general check
-	 * @param $other int uid to check (if event==0) or 0 to check against $this->user
+	 * @param int $needed necessary ACL right: EGW_ACL_{READ|EDIT|DELETE}
+	 * @param mixed $event event as array or the event-id or 0 for a general check
+	 * @param int $other uid to check (if event==0) or 0 to check against $this->user
+	 * @param string $date_format='ts' date-formats: 'ts'=timestamp, 'array'=array, 'string'=iso8601 string for xmlrpc
+	 * @return boolean true permission granted or false for permission denied
 	 */
-	function check_perms($needed,$event=0,$other=0)
+	function check_perms($needed,$event=0,$other=0,$date_format='ts')
 	{
 		$event_in = $event;
+		if ($other && !is_numeric($other))
+		{
+			$resource = ExecMethod($this->resources[$other{0}]['info'],substr($other,1));
+
+			return $needed & $resource[0]['rights'];
+		}
 		if (is_int($event) && $event == 0)
 		{
 			$owner = $other > 0 ? $other : $this->user;
@@ -595,7 +811,7 @@ class bocal
 		{
 			if (!is_array($event))
 			{
-				$event = $this->read((int) $event,True);	// = no ACL check !!!
+				$event = $this->read($event,null,True,$date_format);	// = no ACL check !!!
 			}
 			if (!is_array($event))
 			{
@@ -608,10 +824,10 @@ class bocal
 			$owner = $event['owner'];
 			$private = !$event['public'];
 		}
-		$user = $GLOBALS['phpgw_info']['user']['account_id'];
+		$user = $GLOBALS['egw_info']['user']['account_id'];
 		$grants = $this->grants[$owner];
-
-		if (is_array($event) && $needed == PHPGW_ACL_READ)
+		
+		if (is_array($event) && $needed == EGW_ACL_READ)
 		{
 			// Check if the $user is one of the participants or has a read-grant from one of them
 			// in that case he has an implicite READ grant for that event
@@ -621,25 +837,31 @@ class bocal
 				if ($uid == $user) 
 				{
 					// if we are a participant, we have an implicite READ and PRIVAT grant
-					$grants |= PHPGW_ACL_READ | PHPGW_ACL_PRIVATE;
+					$grants |= EGW_ACL_READ | EGW_ACL_PRIVATE;
 					break;
 				}
-				elseif ($this->grants[$uid] & PHPGW_ACL_READ)
+				elseif ($this->grants[$uid] & EGW_ACL_READ)
 				{
 					// if we have a READ grant from a participant, we dont give an implicit privat grant too
-					$grants |= PHPGW_ACL_READ;
+					$grants |= EGW_ACL_READ;
 					// we cant break here, as we might be a participant too, and would miss the privat grant 
+				}
+				elseif (!is_numeric($uid))
+				{
+					// if we have a resource as participant
+					$resource = ExecMethod($this->resources[$uid{0}]['info'],substr($uid,1));
+					$grants = $resource[0]['rights'];
 				}	
 			}
 		}
 
-		if ($GLOBALS['phpgw']->accounts->get_type($owner) == 'g' && $needed == PHPGW_ACL_ADD)
+		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == EGW_ACL_ADD)
 		{
 			$access = False;	// a group can't be the owner of an event
 		}
 		else
 		{
-			$access = $user == $owner || $grants & $needed && (!$private || $grants & PHPGW_ACL_PRIVATE);
+			$access = $user == $owner || $grants & $needed && (!$private || $grants & EGW_ACL_PRIVATE);
 		}
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'check_perms'))
 		{
@@ -652,7 +874,7 @@ class bocal
 	 * Converts several date-types to a timestamp and optionaly converts user- to server-time
 	 *
 	 * @param $date mixed date to convert, should be one of the following types
-	 *	string (!) in form YYYYMMDD or iso8601 YYYY-MM-DDThh:mm:ss
+	 *	string (!) in form YYYYMMDD or iso8601 YYYY-MM-DDThh:mm:ss or YYYYMMDDThhmmss
 	 *	int already a timestamp
 	 *	array with keys 'second', 'minute', 'hour', 'day' or 'mday' (depricated !), 'month' and 'year'
 	 * @param $user2server_time boolean conversation between user- and server-time default False == Off
@@ -670,41 +892,32 @@ class bocal
 					$date = (int) $date;	// this is already as timestamp
 					break;
 				}
-				if ($date[10] == 'T')
-				{
-					$date = array(
-						'year'   => (int) substr($date,0,4),
-						'month'  => (int) substr($date,5,2),
-						'day'    => (int) substr($date,8,2),
-						'hour'   => (int) substr($date,11,2),
-						'minute' => (int) substr($date,14,2),
-						'second' => (int) substr($date,17,2),
-					);
-				}
-				else
-				{
-					$date = array(
-						'year'  => (int) substr($date,0,4),
-						'month' => (int) substr($date,4,2),
-						'day'   => (int) substr($date,6,2),
-					);
-				}
+				// ToDo: evaluate evtl. added timezone
+
+				// removing all non-nummerical chars, gives YYYYMMDDhhmmss, independent of the iso8601 format
+				$date = str_replace(array('-',':','T','Z',' '),'',$date);
+				$date = array(
+					'year'   => (int) substr($date,0,4),
+					'month'  => (int) substr($date,4,2),
+					'day'    => (int) substr($date,6,2),
+					'hour'   => (int) substr($date,8,2),
+					'minute' => (int) substr($date,10,2),
+					'second' => (int) substr($date,12,2),
+				);
 				// fall-through
-			case 'array':	// day or mday, month and year keys
+			case 'array':	// day, month and year keys
 				if (isset($date['raw']) && $date['raw'])	// we already have a timestamp
 				{
 					$date = $date['raw'];
 					break;
 				}
-				foreach(array('mday'=>'day','min'=>'minute','sec'=>'second') as $old => $new)
+				if (!isset($date['year']) && isset($date['full']))
 				{
-					if (!isset($date[$new]) && isset($date[$old]))	// support the old format too
-					{
-						$date[$new] = $date[$old];
-						unset($date[$old]);
-					}
+					$date['year']  = (int) substr($date['full'],0,4);
+					$date['month'] = (int) substr($date['full'],4,2);
+					$date['day']   = (int) substr($date['full'],6,2);
 				}
-				$date = mktime((int)$date['hour'],(int)$date['minute'],(int)$date['second'],(int)$date['month'],(int)$date['day'],(int)$date['year']);
+				$date = adodb_mktime((int)$date['hour'],(int)$date['minute'],(int)$date['second'],(int)$date['month'],(int)$date['day'],(int)$date['year']);
 				break;
 			case 'integer':		// already a timestamp
 				break;
@@ -747,7 +960,7 @@ class bocal
 			$arr = array();
 			foreach(array('second'=>'s','minute'=>'i','hour'=>'H','day'=>'d','month'=>'m','year'=>'Y','full'=>'Ymd') as $key => $frmt)
 			{
-				$arr[$key] = (int) date($frmt,$date);
+				$arr[$key] = (int) adodb_date($frmt,$date);
 			}
 			$arr['raw'] = $date;
 		}
@@ -761,36 +974,64 @@ class bocal
 	/**
 	 * Converts a date as timestamp or array to a date-string and optionaly converts server- to user-time
 	 *
-	 * @param $date mixed integer timestamp or array with ('year','month',..,'second') to convert
-	 * @param $server2user_time boolean conversation between user- and server-time default False == Off
-	 * @param $iso8601 boolean return a iso8601 date (YYYY-MM-DDThh:ii:ss), default False == Off
-	 * @return YYYYMMDD or iso8601 date as string
+	 * @param mixed $date integer timestamp or array with ('year','month',..,'second') to convert
+	 * @param boolean $server2user_time conversation between user- and server-time default False == Off, not used if $format ends with \Z
+	 * @param string $format='Ymd' format of the date to return, eg. 'Y-m-d\TH:i:sO' (2005-11-01T15:30:00+0100)
+	 * @return string date formatted according to $format
 	 */
-	function date2string($date,$server2user=False,$iso8601=False)
+	function date2string($date,$server2user=False,$format='Ymd')
 	{
 		$date_in = $date;
 
-		if (is_array($date) && isset($date['full']) && !$server2user && !$iso8601)
+		if (!$format) $format = 'Ymd';
+
+		if (is_array($date) && isset($date['full']) && !$server2user && $format == 'Ymd')
 		{
 			$date = $date['full'];
 		}
 		else
 		{
 			$date = $this->date2ts($date,False);
-
-			if ($server2user)
+			
+			// if timezone is requested, we dont need to convert to user-time
+			if (($tz_used = substr($format,-1)) == 'O' || $tz_used == 'Z') $server2user = false;
+			
+			if ($server2user && substr($format,-1) )
 			{
 				$date += $this->tz_offset_s;
 			}
-			$date = date(($iso8601 ? 'Y-m-d\TH:i:s' : 'Ymd'),$date);
+			if (substr($format,-2) == '\\Z')	// GMT aka. Zulu time
+			{
+				$date = adodb_gmdate($format,$date);
+			}
+			else
+			{
+				$date = adodb_date($format,$date);
+			}
 		}
 		if ($this->debug && ($this->debug > 3 || $this->debug == 'date2string'))
 		{
-			$this->debug_message('bocal::date2string(%1,server2user=%2,iso8601=%3)=%4)',False,$date_in,$server2user,$iso8601,$date);
+			$this->debug_message('bocal::date2string(%1,server2user=%2,format=%3)=%4)',False,$date_in,$server2user,$format,$date);
 		}
 		return $date;
 	}
 
+	/**
+	 * Formats a date given as timestamp or array
+	 *
+	 * @param mixed $date integer timestamp or array with ('year','month',..,'second') to convert
+	 * @param string $format='' default common_prefs[dateformat], common_prefs[timeformat]
+	 * @return string the formated date (incl. time)
+	 */
+	function format_date($date,$format='')
+	{
+		if (!$format)
+		{
+			$format = $this->common_prefs['dateformat'].', '.($this->common_prefs['timeformat'] != '12' ? 'H:i' : 'h:i a');
+		}
+		return adodb_date($format,$this->date2ts($date,False));
+	}
+
 	/**
 	 * Gives out a debug-message with certain parameters
 	 *
@@ -813,12 +1054,12 @@ class bocal
 	function debug_message($msg,$backtrace=True)
 	{
 		static $acl2string = array(
-			0                 => 'ACL-UNKNOWN',
-			PHPGW_ACL_READ    => 'ACL_READ',
-			PHPGW_ACL_WRITE   => 'ACL_WRITE',
-			PHPGW_ACL_ADD     => 'ACL_ADD',
-			PHPGW_ACL_DELETE  => 'ACL_DELETE',
-			PHPGW_ACL_PRIVATE => 'ACL_PRIVATE',
+			0               => 'ACL-UNKNOWN',
+			EGW_ACL_READ    => 'ACL_READ',
+			EGW_ACL_WRITE   => 'ACL_WRITE',
+			EGW_ACL_ADD     => 'ACL_ADD',
+			EGW_ACL_DELETE  => 'ACL_DELETE',
+			EGW_ACL_PRIVATE => 'ACL_PRIVATE',
 		);
 		for($i = 2; $i < func_num_args(); ++$i)
 		{
@@ -853,7 +1094,7 @@ class bocal
 						$param = $param ? 'True' : 'False';
 						break;
 					case 'integer':
-						if ($param >= mktime(0,0,0,1,1,2000)) $param = date('Y-m-d H:i:s',$param)." ($param)";
+						if ($param >= mktime(0,0,0,1,1,2000)) $param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
 						break;
 				}
 			}
@@ -863,13 +1104,14 @@ class bocal
 	}
 
 	/**
-	 * Formats one or two dates (range) as long date (full monthname)
+	 * Formats one or two dates (range) as long date (full monthname), optionaly with a time
 	 *
-	 * @param $first mixed first date
-	 * @param $last mixed last date if != 0 (default)
+	 * @param mixed $first first date
+	 * @param mixed $last last date if != 0 (default)
+	 * @param boolean $display_time should a time be displayed too
 	 * @return string with formated date
 	 */
-	function long_date($first,$last=0)
+	function long_date($first,$last=0,$display_time=false)
 	{
 		$first = $this->date2array($first);
 		if ($last)
@@ -877,6 +1119,7 @@ class bocal
 			$last = $this->date2array($last);
 		}
 		$datefmt = $this->common_prefs['dateformat'];
+		$timefmt = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
 		$month_before_day = strtolower($datefmt[0]) == 'm' ||
 			strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
@@ -897,6 +1140,10 @@ class bocal
 						{
 							$range .= ($datefmt[0] != 'd' ? ', ' : ' ') . $first['year'];
 						}
+						if ($display_time)
+						{
+							$range .= ' '.adodb_date($timefmt,$first['raw']);
+						}
 						if (!$last)
 						{
 							return $range;
@@ -915,6 +1162,10 @@ class bocal
 					}
 					else
 					{
+						if ($display_time)
+						{
+							$range .= ' '.adodb_date($timefmt,$first['raw']);
+						}
 						$range .= ' - ';
 					}
 					$range .= ' ' . $last['day'] . ($datefmt[1] == '.' ? '.' : '');
@@ -928,21 +1179,61 @@ class bocal
 					break;
 			}
 		}
+		if ($display_time && $last)
+		{
+			$range .= ' '.adodb_date($timefmt,$last['raw']);
+		}
 		return $range;
 	}
 
+	/**
+	* Converts a participant into a (readable) user- or resource-name
+	*
+	* @param $id string/int id of user or resource
+	* @return string with name
+	*/
+	function participant_name($id,$use_type=false)
+	{
+		static $id2lid = array();
+		
+		if (!isset($id2lid[$id]))
+		{
+			if (!is_numeric($id) || $use_type && $use_type != 'u')
+			{
+				$type = $use_type ? $use_type : $id[0];
+				$res_id = $use_type ? $id : (int) substr($id,1);
+
+				if (isset($this->resources[$type]) && isset($this->resources[$type]['info']))
+				{
+					list($data) = ExecMethod($this->resources[$type]['info'],$res_id);
+					//echo "$type$res_id: "; _debug_array($data);
+					$id2lid[$id] = $data['name'];
+				}
+				else
+				{
+					$id2lid[$id] = "resource($id)";
+				}
+			}
+			else
+			{
+				$id2lid[$id] = $GLOBALS['egw']->common->grab_owner_name($id);
+			}
+		}
+		return $id2lid[$id];
+	}
+
 	/**
 	* Converts participants array of an event into array of (readable) participant-names with status
 	*
-	* @param $parts array participants array of an event
+	* @param $event array of an event
 	* @param $long_status boolean should the long/verbose status or only the one letter shortcut be used
 	* @return array with id / names with status pairs
 	*/
-	function participants($parts,$long_status=False)
+	function participants($event,$long_status=False,$use_type=false)
 	{
-		static $id2lid = array();
-
-		foreach($parts as $id => $status)
+ 		//_debug_array($event);
+ 		$names = array();
+		foreach($event['participants'] as $id => $status)
 		{
 			$status = $this->verbose_status[$status];
 
@@ -950,11 +1241,7 @@ class bocal
 			{
 				$status = $status[0];
 			}
-			if (!isset($id2lid[$id]))
-			{
-				$id2lid[$id] = $GLOBALS['phpgw']->common->grab_owner_name($id);
-			}
-			$names[$id] = $id2lid[$id]." ($status)";
+			$names[$id] = $this->participant_name($id).' ('.$status.')';
 		}
 		return $names;
 	}
@@ -971,10 +1258,9 @@ class bocal
 		static $id2cat = array();
 		$cats = array();
 		$color = 0;
-		if (!isset($this->cat))
+		if (!is_object($this->cats))
 		{
-			$this->cat = $GLOBALS['phpgw']->categories;
-			$this->cat->categories($this->owner,'calendar');
+			$this->cats =& CreateObject('phpgwapi.categories','','calendar');
 		}
 		foreach(explode(',',$category) as $cat_id)
 		{
@@ -982,7 +1268,7 @@ class bocal
 
 			if (!isset($id2cat[$cat_id]))
 			{
-				list($id2cat[$cat_id]) = $this->cat->return_single($cat_id);
+				list($id2cat[$cat_id]) = $this->cats->return_single($cat_id);
 				$id2cat[$cat_id]['data'] = unserialize($id2cat[$cat_id]['data']);
 			}
 			$cat = $id2cat[$cat_id];
@@ -999,8 +1285,8 @@ class bocal
 	/* This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4 */
 	function _list_cals_add($id,&$users,&$groups)
 	{
-		$name = $GLOBALS['phpgw']->common->grab_owner_name($id);
-		if (($type = $GLOBALS['phpgw']->accounts->get_type($id)) == 'g')
+		$name = $GLOBALS['egw']->common->grab_owner_name($id);
+		if (($type = $GLOBALS['egw']->accounts->get_type($id)) == 'g')
 		{
 			$arr = &$groups;
 		}
@@ -1026,13 +1312,13 @@ class bocal
 		{
 			$this->_list_cals_add($id,$users,$groups);
 		}
-		if ($memberships = $GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']))
+		if ($memberships = $GLOBALS['egw']->accounts->membership($GLOBALS['egw_info']['user']['account_id']))
 		{
 			foreach($memberships as $group_info)
 			{
 				$this->_list_cals_add($group_info['account_id'],$users,$groups);
 
-				if ($account_perms = $GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar'))
+				if ($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group_info['account_id'],EGW_ACL_READ,'calendar'))
 				{
 					foreach($account_perms as $id)
 					{
@@ -1050,28 +1336,201 @@ class bocal
 	/**
 	 * Read the holidays for a given $year
 	 *
-	 * @param $year integer defaults to 0
+	 * The holidays get cached in the session (performance), so changes in holidays or birthdays do NOT affect a current session!!!
+	 *
+	 * @param integer $year=0 year, defaults to 0 = current year
 	 * @return array indexed with Ymd of array of holidays. A holiday is an array with the following fields:
-	 *	index: numerica unique id
+	 *	index: numerical unique id
 	 *	locale: string, 2-char short for the nation
 	 *	name: string
 	 *	day: numerical day in month
 	 *	month: numerical month
-	 *	occurence:
+	 *	occurence: numerical year or 0 for every year
 	 *	dow: day of week, 0=sunday, .., 6= saturday
 	 *	observande_rule: boolean
 	 */
 	function read_holidays($year=0)
 	{
+		if (!$year) $year = (int) date('Y',$this->now_su);
+
+		if (!$this->cached_holidays)	// try reading the holidays from the session
+		{
+			$this->cached_holidays = $GLOBALS['egw']->session->appsession('holidays','calendar');
+		}
 		if (!isset($this->cached_holidays[$year]))
 		{
 			if (!is_object($this->holidays))
 			{
-				$this->holidays = CreateObject('calendar.boholiday');
+				$this->holidays =& CreateObject('calendar.boholiday');
 			}
 			$this->holidays->prepare_read_holidays($year);
 			$this->cached_holidays[$year] = $this->holidays->read_holiday();
+			
+			// search for birthdays
+			$contacts =& CreateObject('phpgwapi.contacts');
+			$bdays =& $contacts->read(0,0,array('id','n_family','n_given','n_prefix','n_middle','bday'),'',"bday=!'',n_family=!''",'ASC','bday');
+			if ($bdays)
+			{
+				// sort by month and day only
+				usort($bdays,create_function('$a,$b','return (int) $a[\'bday\'] == (int) $b[\'bday\'] ? strcmp($a[\'bday\'],$b[\'bday\']) : (int) $a[\'bday\'] - (int) $b[\'bday\'];'));
+				foreach($bdays as $pers)
+				{
+					list($m,$d,$y) = explode('/',$pers['bday']);
+					if ($y > $year) continue; 	// not yet born
+					$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
+						'day'       => $d,
+						'month'     => $m,
+						'occurence' => 0,
+						'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
+							$pers['n_family'].($y ? ' ('.$y.')' : ''),
+						'birthyear' => $y,	// this can be used to identify birthdays from holidays
+					);
+				}
+			}
+			// store holidays and birthdays in the session		
+			$this->cached_holidays = $GLOBALS['egw']->session->appsession('holidays','calendar',$this->cached_holidays);
+		}
+		if ((int) $this->debug >= 2 || $this->debug == 'read_holidays')
+		{
+			$this->debug_message('bocal::read_holidays(%1)=%2',true,$year,$this->cached_holidays[$year]);
 		}
 		return $this->cached_holidays[$year];
 	}
+	
+	/**
+	 * get title for an event identified by $event
+	 * 
+	 * Is called as hook to participate in the linking
+	 *
+	 * @param int/array $entry int cal_id or array with event
+	 * @param string the title
+	 */
+	function link_title($event)
+	{
+		if (!is_array($event) && (int) $event > 0)
+		{
+			$event = $this->read($event);
+		}
+		if (!is_array($event))
+		{
+			return False;
+		}
+		return $this->format_date($event['start']) . ': ' . $event['title'];
+	}
+
+	/**
+	 * query calendar for events matching $pattern
+	 *
+	 * Is called as hook to participate in the linking
+	 *
+	 * @param string $pattern pattern to search
+	 * @return array with pm_id - title pairs of the matching entries
+	 */
+	function link_query($pattern)
+	{
+		$result = array();
+		foreach((array) $this->search(array('query' => $pattern)) as $event)
+		{
+			$result[$event['id']] = $this->link_title($event);
+		}
+		return $result;
+	}
+	
+	/**
+	 * Hook called by link-class to include projectmanager in the appregistry of the linkage
+	 *
+	 * @param array/string $location location and other parameters (not used)
+	 * @return array with method-names
+	 */
+	function search_link($location)
+	{
+		return array(
+			'query' => 'calendar.bocal.link_query',
+			'title' => 'calendar.bocal.link_title',
+			'view'  => array(
+				'menuaction' => 'calendar.uiforms.view',
+				'no_popup'   => 1,
+			),
+			'view_id' => 'cal_id',
+//			'view_popup' => '750x400',
+			'add' => array(
+				'menuaction' => 'calendar.uiforms.edit',
+				'no_popup'   => 1,
+			),
+			'add_app'    => 'link_app',
+			'add_id'     => 'link_id',	
+//			'add_popup' => '750x400',
+		);
+	}
+
+	/**
+	 * sets the default prefs, if they are not already set (on a per pref. basis)
+	 *
+	 * It sets a flag in the app-session-data to be called only once per session
+	 */
+	function check_set_default_prefs()
+	{
+		if (($set = $GLOBALS['egw']->session->appsession('default_prefs_set','calendar')))
+		{
+			return;
+		}
+		$GLOBALS['egw']->session->appsession('default_prefs_set','calendar','set');
+
+		$default_prefs =& $GLOBALS['egw']->preferences->default['calendar'];
+
+		$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
+		$defaults = array(
+			'defaultcalendar' => 'week',
+			'mainscreen_showevents' => '0',
+			'summary'         => 'no',
+			'receive_updates' => 'no',
+			'update_format'   => 'extended',
+			'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
+			'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
+			'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
+			'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
+			'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
+			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
+			'show_rejected'   => '0',
+			'display_status'  => '1',
+			'weekdaystarts'   => 'Monday',
+			'workdaystarts'   => '9',
+			'workdayends'     => '17',
+			'interval'        => '30',
+			'defaultlength'   => '60',
+			'planner_start_with_group' => $GLOBALS['egw']->accounts->name2id('Default'),
+			'defaultfilter'   => 'all',
+			'default_private' => '0',
+		);
+		foreach($defaults as $var => $default)
+		{
+			if (!isset($default_prefs[$var]) || $default_prefs[$var] == '')
+			{
+				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');
+				$this->cal_prefs[$var] = $default;
+				$need_save = True;
+			}
+		}
+		if ($need_save)
+		{
+			$GLOBALS['egw']->preferences->save_repository(False,'default');
+		}
+	}
+}
+
+if (!function_exists('array_intersect_key'))	// php5.1 function
+{
+	function array_intersect_key($array1,$array2)
+	{
+		$intersection = $keys = array();
+		foreach(func_get_args() as $arr)
+		{
+			$keys[] = array_keys($arr);
+		}
+		foreach(call_user_func_array('array_intersect',$keys) as $key)
+		{
+			$intersection[$key] = $array1[$key];
+		}
+		return $intersection;
+	}
 }
diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
deleted file mode 100755
index d32d6fbd71..0000000000
--- a/calendar/inc/class.bocalendar.inc.php
+++ /dev/null
@@ -1,3323 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.eGroupWare.org                                                *
-  * Maintained and further developed by RalfBecker@outdoor-training.de       *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Originaly modified by Mark Peters <skeeter@phpgroupware.org>             *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	/**
-	* Depricated BO class of the calendar app.
-	*
-	* Note: All new code should only access the bocal class and NOT this class !!!
-	*
-	* If you need a function not already available in bocal, please ask RalfBecker@outdoor-training.de
-	*/
-
-	class bocalendar
-	{
-		var $public_functions = Array(
-			'read_entry'      => True,
-			'delete_entry'    => True,
-			'delete_calendar' => True,
-			'change_owner'    => True,
-			'update'          => True,
-			'check_set_default_prefs' => True,
-			'store_to_cache'  => True,
-			'export_event'    => True,
-			'send_alarm'      => True,
-			'reinstate'       => True
-		);
-
-		var $soap_functions = Array(
-			'read_entry' => Array(
-				'in' => Array(
-					'int'
-				),
-				'out' => Array(
-					'SOAPStruct'
-				)
-			),
-			'delete_entry' => Array(
-				'in' => Array(
-					'int'
-				),
-				'out' => Array(
-					'int'
-				)
-			),
-			'delete_calendar' => Array(
-				'in' => Array(
-					'int'
-				),
-				'out' => Array(
-					'int'
-				)
-			),
-			'change_owner' => Array(
-				'in' => Array(
-					'array'
-				),
-				'out' => Array(
-					'int'
-				)
-			),
-			'update' => Array(
-				'in' => Array(
-					'array',
-					'array',
-					'array',
-					'array',
-					'array'
-				),
-				'out' => Array(
-					'array'
-				)
-			),
-			'store_to_cache'	=> Array(
-				'in' => Array(
-					'struct'
-				),
-				'out' => Array(
-					'SOAPStruct'
-				)
-			),
-			'store_to_cache'	=> Array(
-				'in' => Array(
-					'array'
-				),
-				'out' => Array(
-					'string'
-				)
-			),
-			'categories' => array(
-				'in'  => array('bool'),
-				'out' => array('array')
-			),
-		);
-
-		var $debug = False;
-//		var $debug = True;
-
-		var $so;
-		var $cached_events;
-		var $repeating_events;
-		var $day;
-		var $month;
-		var $year;
-		var $prefs;
-
-		var $owner;
-		var $grants;
-		var $holiday_color;
-		var $printer_friendly = False;
-
-		var $cached_holidays;
-
-		var $g_owner = 0;
-
-		var $filter;
-		var $cat_id;
-		var $users_timeformat;
-
-		var $modified;
-		var $deleted;
-		var $added;
-
-		var $is_group = False;
-
-		var $soap = False;
-
-		var $use_session = False;
-
-		var $today;
-		var $debug_string;
-
-		var $sortby;
-		var $num_months;
-		var $xmlrpc = False;	// not called via xmlrpc
-
-		function bocalendar($session=0)
-		{
-			$this->cat = CreateObject('phpgwapi.categories');
-			$this->grants = $GLOBALS['phpgw']->acl->get_grants('calendar');
-			@reset($this->grants);
-			if(DEBUG_APP)
-			{
-				if(floor(phpversion()) >= 4)
-				{
-					$this->debug_string = '';
-					ob_start();
-				}
-
-				foreach($this->grants as $grantor => $rights)
-				{
-					print_debug('Grantor',$grantor);
-					print_debug('Rights',$rights);
-				}
-			}
-
-			print_debug('Read use_session',$session);
-
-			if($session)
-			{
-				$this->read_sessiondata();
-				$this->use_session = True;
-			}
-			print_debug('BO Filter',$this->filter);
-			print_debug('Owner',$this->owner);
-
-			$this->prefs['calendar']    = $GLOBALS['phpgw_info']['user']['preferences']['calendar'];
-			$this->check_set_default_prefs();
-
-			$owner = get_var('owner',array('GET','POST'),$GLOBALS['owner']);
-
-			ereg('menuaction=([a-zA-Z.]+)',$_SERVER['HTTP_REFERER'],$regs);
-			$from = $regs[1];
-			if ((substr($_SERVER['PHP_SELF'],-8) == 'home.php' && substr($this->prefs['calendar']['defaultcalendar'],0,7) == 'planner'
-				|| $_GET['menuaction'] == 'calendar.uicalendar.planner' &&
-				$from  != 'calendar.uicalendar.planner' && !$this->save_owner)
-				&& (int)$this->prefs['calendar']['planner_start_with_group'] > 0)
-			{
-				// entering planner for the first time ==> saving owner in save_owner, setting owner to default
-				//
-				$this->save_owner = $this->owner;
-				$owner = 'g_'.$this->prefs['calendar']['planner_start_with_group'];
-			}
-			elseif ($_GET['menuaction'] != 'calendar.uicalendar.planner' &&
-				$this->save_owner)
-			{
-				// leaving planner with an unchanged user/owner ==> setting owner back to save_owner
-				//
-				$owner = (int)(isset($_GET['owner']) ? $_GET['owner'] : $this->save_owner);
-				unset($this->save_owner);
-			}
-			elseif (!empty($owner) && $owner != $this->owner && $from == 'calendar.uicalendar.planner')
-			{
-				// user/owner changed within planner ==> forgetting save_owner
-				//
-				unset($this->save_owner);
-			}
-
-			if(isset($owner) && substr($owner,0,2) == 'g_')
-			{
-				$this->set_owner_to_group((int) substr($owner,2));
-			}
-			elseif(isset($owner) && $owner)
-			{
-				$this->owner = (int) $owner;
-			}
-			if(!@isset($this->owner) || !@$this->owner)
-			{
-				$this->owner = (int) $GLOBALS['phpgw_info']['user']['account_id'];
-			}
-			elseif(isset($this->owner) && $GLOBALS['phpgw']->accounts->get_type($this->owner) == 'g')
-			{
-				$this->set_owner_to_group((int)$this->owner);
-			}
-
-			$this->prefs['common']    = $GLOBALS['phpgw_info']['user']['preferences']['common'];
-
-			if ($this->prefs['common']['timeformat'] == '12')
-			{
-				$this->users_timeformat = 'h:ia';
-			}
-			else
-			{
-				$this->users_timeformat = 'H:i';
-			}
-			$this->holiday_color = (substr($GLOBALS['phpgw_info']['theme']['bg07'],0,1)=='#'?'':'#').$GLOBALS['phpgw_info']['theme']['bg07'];
-
-			$friendly = (int) get_var('friendly',array('GET','POST'),0);
-
-			$this->printer_friendly = ((int)$friendly == 1?True:False);
-
-			if(isset($_POST['filter']) && ($_POST['filter'] == ' all ' || $_POST['filter'] == ' private '))
-			{ 
-				$this->filter = $_POST['filter']; 
-			}
-			else
-			{
-				$this->filter = ' '.$this->prefs['calendar']['defaultfilter'].' ';
-			}
-			if(isset($_REQUEST['sortby']) && ($_REQUEST['sortby'] == 'user' || $_REQUEST['sortby'] == 'category')) 
-			{ 
-				$this->sortby = $_REQUEST['sortby']; 
-			}
-			else
-			{
-				$this->sortby = $this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 'category';
-			}
-			if(isset($_POST['cat_id'])) { $this->cat_id = (int) $_POST['cat_id']; }
-
-			if($GLOBALS['phpgw']->accounts->get_type($this->owner)=='g')
-			{
-				$this->filter = ' all ';
-			}
-
-			$this->so = CreateObject('calendar.socalendar',
-				Array(
-					'owner'		=> $this->owner,
-					'filter'	=> $this->filter,
-					'category'	=> $this->cat_id,
-					'g_owner'	=> $this->g_owner
-				)
-			);
-			$this->rpt_day = array(	// need to be after creation of socalendar
-				MCAL_M_SUNDAY    => 'Sunday',
-				MCAL_M_MONDAY    => 'Monday',
-				MCAL_M_TUESDAY   => 'Tuesday',
-				MCAL_M_WEDNESDAY => 'Wednesday',
-				MCAL_M_THURSDAY  => 'Thursday',
-				MCAL_M_FRIDAY    => 'Friday',
-				MCAL_M_SATURDAY  => 'Saturday'
-			);
-			if($this->bo->prefs['calendar']['weekdaystarts'] != 'Sunday')
-			{
-				$mcals = array_keys($this->rpt_day);
-				$days  = array_values($this->rpt_day);
-				$this->rpt_day = array();
-				list($n) = $found = array_keys($days,$this->prefs['calendar']['weekdaystarts']);
-				for ($i = 0; $i < 7; ++$i,++$n)
-				{
-					$this->rpt_day[$mcals[$n % 7]] = $days[$n % 7];
-				}
-			}
-			$this->rpt_type = Array(
-				MCAL_RECUR_NONE		=> 'None',
-				MCAL_RECUR_SECONDLY	=> 'Secondly',
-				MCAL_RECUR_MINUTELY	=> 'Minutely',
-				MCAL_RECUR_HOURLY	=> 'Hourly',
-				MCAL_RECUR_DAILY	=> 'Daily',
-				MCAL_RECUR_WEEKLY	=> 'Weekly',
-				MCAL_RECUR_MONTHLY_WDAY	=> 'Monthly (by day)',
-				MCAL_RECUR_MONTHLY_MDAY	=> 'Monthly (by date)',
-				MCAL_RECUR_YEARLY	=> 'Yearly'
-			);
-
-			$localtime = $GLOBALS['phpgw']->datetime->users_localtime;
-
-			$this->num_months = (int) get_var('num_months',array('GET','POST'),1);
-			
-			$this->date = (int) get_var('date',array('GET','POST'));
-			if($this->date)
-			{
-				$this->year  = (int) substr($this->date,0,4);
-				$this->month = (int) substr($this->date,4,2);
-				$this->day   = (int) substr($this->date,6,2);
-			}
-			else
-			{
-				foreach(array('year' => 'Y','month' => 'm','day' => 'd') as $var => $pat)
-				{
-					$this->$var = (int) get_var($var,array('POST','GET'),date($pat,$localtime));
-				}
-				$this->date = sprintf('%04d%02d%02d',$this->year,$this->month,$this->day);
-			}
-			$this->today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
-
-			if(DEBUG_APP)
-			{
-				print_debug('BO Filter','('.$this->filter.')');
-				print_debug('Owner',$this->owner);
-				print_debug('Today',$this->today);
-				if(floor(phpversion()) >= 4)
-				{
-					$this->debug_string .= ob_get_contents();
-					ob_end_clean();
-				}
-			}
-			$this->xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method;
-		}
-
-		function list_methods($_type='xmlrpc')
-		{
-			/*
-			  This handles introspection or discovery by the logged in client,
-			  in which case the input might be an array.  The server always calls
-			  this function to fill the server dispatch map using a string.
-			*/
-			if (is_array($_type))
-			{
-				$_type = $_type['type'];
-			}
-			switch($_type)
-			{
-				case 'xmlrpc':
-					$xml_functions = array(
-						'list_methods' => array(
-							'function'  => 'list_methods',
-							'signature' => array(array(xmlrpcStruct,xmlrpcString)),
-							'docstring' => lang('Read this list of methods.')
-						),
-						'read' => array(
-							'function'  => 'read_entry',
-							'signature' => array(array(xmlrpcStruct,xmlrpcInt)),
-							'docstring' => lang('Read a single entry by passing the id and fieldlist.')
-						),
-						'read_entry' => array(	// deprecated, use read
-							'function'  => 'read_entry',
-							'signature' => array(array(xmlrpcStruct,xmlrpcInt)),
-							'docstring' => lang('Read a single entry by passing the id and fieldlist.')
-						),
-						'write' => array(
-							'function'  => 'update',
-							'signature' => array(array(xmlrpcStruct,xmlrpcStruct)),
-							'docstring' => lang('Add or update a single entry by passing the fields.')
-						),
-						'add_entry' => array(	// deprecated, use write
-							'function'  => 'update',
-							'signature' => array(array(xmlrpcStruct,xmlrpcStruct)),
-							'docstring' => lang('Add a single entry by passing the fields.')
-						),
-						'update_entry' => array(	// deprecated, use write
-							'function'  => 'update',
-							'signature' => array(array(xmlrpcStruct,xmlrpcStruct)),
-							'docstring' => lang('Update a single entry by passing the fields.')
-						),
-						'delete' => array(
-							'function'  => 'delete_entry',
-							'signature' => array(array(xmlrpcInt,xmlrpcInt)),
-							'docstring' => lang('Delete a single entry by passing the id.')
-						),
-						'delete_entry' => array(	// deprecated, use delete
-							'function'  => 'delete_entry',
-							'signature' => array(array(xmlrpcInt,xmlrpcInt)),
-							'docstring' => lang('Delete a single entry by passing the id.')
-						),
-						'delete_calendar' => array(
-							'function'  => 'delete_calendar',
-							'signature' => array(array(xmlrpcInt,xmlrpcInt)),
-							'docstring' => lang('Delete an entire users calendar.')
-						),
-						'change_owner' => array(
-							'function'  => 'change_owner',
-							'signature' => array(array(xmlrpcInt,xmlrpcStruct)),
-							'docstring' => lang('Change all events for $params[\'old_owner\'] to $params[\'new_owner\'].')
-						),
-						'search' => array(
-							'function'  => 'store_to_cache',
-							'signature' => array(array(xmlrpcStruct,xmlrpcStruct)),
-							'docstring' => lang('Read a list of entries.')
-						),
-						'store_to_cache' => array(	// deprecated, use search
-							'function'  => 'store_to_cache',
-							'signature' => array(array(xmlrpcStruct,xmlrpcStruct)),
-							'docstring' => lang('Read a list of entries.')
-						),
-						'export_event' => array(
-							'function'  => 'export_event',
-							'signature' => array(array(xmlrpcString,xmlrpcStruct)),
-							'docstring' => lang('Export a list of entries in iCal format.')
-						),
-						'categories' => array(
-							'function'  => 'categories',
-							'signature' => array(array(xmlrpcStruct,xmlrpcStruct)),
-							'docstring' => lang('List all categories.')
-						),
-					);
-					return $xml_functions;
-					break;
-				case 'soap':
-					return $this->soap_functions;
-					break;
-				default:
-					return array();
-					break;
-			}
-		}
-
-		function set_owner_to_group($owner)
-		{
-			print_debug('calendar::bocalendar::set_owner_to_group:owner',$owner);
-			$this->owner = (int)$owner;
-			$this->is_group = True;
-			$this->g_owner = Array();
-			$members = $GLOBALS['phpgw']->accounts->member($owner);
-			if (is_array($members))
-			{
-				foreach($members as $user)
-				{
-					// use only members which gave the user a read-grant
-					if ($this->check_perms(PHPGW_ACL_READ,0,$user['account_id']))
-					{
-						$this->g_owner[] = $user['account_id'];
-					}
-				}
-			}
-			//echo "<p>".function_backtrace().": set_owner_to_group($owner) = ".print_r($this->g_owner,True)."</p>\n";
-		}
-
-		function member_of_group($owner=0)
-		{
-			$owner = ($owner==0?$GLOBALS['phpgw_info']['user']['account_id']:$owner);
-			$group_owners = $GLOBALS['phpgw']->accounts->membership();
-			while($group_owners && list($index,$group_info) = each($group_owners))
-			{
-				if($this->owner == $group_info['account_id'])
-				{
-					return True;
-				}
-			}
-			return False;
-		}
-
-		function save_sessiondata($data='')
-		{
-			if ($this->use_session)
-			{
-				if (!is_array($data))
-				{
-					$data = array(
-						'filter'     => $this->filter,
-						'cat_id'     => $this->cat_id,
-						'owner'      => $this->owner,
-						'save_owner' => $this->save_owner,
-						'year'       => $this->year,
-						'month'      => $this->month,
-						'day'        => $this->day,
-						'date'       => $this->date,
-						'sortby'     => $this->sortby,
-						'num_months' => $this->num_months,
-						'return_to'  => $this->return_to
-					);
-				}
-				if($this->debug)
-				{
-					if(floor(phpversion()) >= 4)
-					{
-						ob_start();
-					}
-					echo '<!-- '."\n".'Save:'."\n"._debug_array($data,False)."\n".' -->'."\n";
-					if(floor(phpversion()) >= 4)
-					{
-						$this->debug_string .= ob_get_contents();
-						ob_end_clean();
-					}
-				}
-				$GLOBALS['phpgw']->session->appsession('session_data','calendar',$data);
-			}
-		}
-
-		function read_sessiondata()
-		{
-			$data = $GLOBALS['phpgw']->session->appsession('session_data','calendar');
-			print_debug('Read',_debug_array($data,False));
-
-			$this->filter = $data['filter'];
-			$this->cat_id = $data['cat_id'];
-			$this->sortby = $data['sortby'];
-			$this->owner  = (int)$data['owner'];
-			$this->save_owner = (int)$data['save_owner'];
-			$this->year   = (int)$data['year'];
-			$this->month  = (int)$data['month'];
-			$this->day    = (int)$data['day'];
-			$this->num_months = (int)$data['num_months'];
-			$this->return_to = $data['return_to'];
-		}
-
-		function read_entry($id,$ignore_acl=False)
-		{
-			if (is_array($id) && count($id) == 1)
-			{
-				list(,$id) = each($id);
-			}
-			if($ignore_acl || $this->check_perms(PHPGW_ACL_READ,$id))
-			{
-				$event = $this->so->read_entry($id);
-		
-				if (isset($GLOBALS['phpgw_info']['apps']['infolog']))	// check if infolog is installed
-				{
-					$bolink = createObject('infolog.bolink');
-					$linkIDs = $bolink->get_links('calendar', $id);
-					if(is_array($linkIDs))
-					{
-						foreach($linkIDs as $linkData)
-						{
-							//$event['projectID'] = 8;
-							if($linkData['app'] == 'projects')
-							{
-								$event['projectID'] = $linkData['id'];
-								continue;
-							}
-						}
-					}
-				}
-				if(!isset($event['participants'][$this->owner]) && $this->user_is_a_member($event,$this->owner))
-				{
-					$this->so->add_attribute('participants','U',(int)$this->owner);
-					$this->so->add_entry($event);
-					$event = $this->get_cached_event();
-				}
-				return $this->xmlrpc ? $this->xmlrpc_prepare($event) : $event;
-			}
-			if ($this->xmlrpc)
-			{
-				$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['no_access'],$GLOBALS['xmlrpcstr']['no_access']);
-			}
-			return False;
-		}
-
-		function delete_single($param)
-		{
-			if($this->check_perms(PHPGW_ACL_DELETE,(int)$param['id']))
-			{
-				$temp_event = $this->get_cached_event();
-				$event = $this->read_entry((int)$param['id']);
-//				if($this->owner == $event['owner'])
-//				{
-				$exception_time = mktime($event['start']['hour'],$event['start']['min'],0,$param['month'],$param['day'],$param['year']) - $GLOBALS['phpgw']->datetime->tz_offset;
-				$event['recur_exception'][] = (int)$exception_time;
-				$this->so->cal->event = $event;
-//				print_debug('exception time',$event['recur_exception'][count($event['recur_exception']) -1]);
-//				print_debug('count event exceptions',count($event['recur_exception']));
-				$this->so->add_entry($event);
-				$cd = 16;
-
-				$this->so->cal->event = $temp_event;
-				unset($temp_event);
-			}
-			else
-			{
-				$cd = 60;
-			}
-//			}
-			return $cd;
-		}
-
-		function delete_entry($id)
-		{
-			if (is_array($id) && count($id) == 1)
-			{
-				list(,$id) = each($id);
-			}
-			if($this->check_perms(PHPGW_ACL_DELETE,$id))
-			{
-				$this->so->delete_entry($id);
-				$GLOBALS['phpgw']->contenthistory->updateTimeStamp('calendar', $id, 'delete', time());
-
-				if ($this->xmlrpc)
-				{
-					$this->so->expunge($id);
-				}
-				return $this->xmlrpc ? True : 16;
-			}
-			if ($this->xmlrpc)
-			{
-				$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['no_access'],$GLOBALS['xmlrpcstr']['no_access']);
-			}
-			return 60;
-		}
-
-		function reinstate($params='')
-		{
-			if($this->check_perms(PHPGW_ACL_EDIT,$params['cal_id']) && isset($params['reinstate_index']))
-			{
-				$event = $this->so->read_entry($params['cal_id']);
-				@reset($params['reinstate_index']);
-				print_debug('Count of reinstate_index',count($params['reinstate_index']));
-				if(count($params['reinstate_index']) > 1)
-				{
-					while(list($key,$value) = each($params['reinstate_index']))
-					{
-						print_debug('reinstate_index ['.$key.']',(int)$value);
-						print_debug('exception time',$event['recur_exception'][(int)$value]);
-						unset($event['recur_exception'][(int)$value]);
-						print_debug('count event exceptions',count($event['recur_exception']));
-					}
-				}
-				else
-				{
-					print_debug('reinstate_index[0]',(int)$params['reinstate_index'][0]);
-					print_debug('exception time',$event['recur_exception'][(int)$params['reinstate_index'][0]]);
-					unset($event['recur_exception'][(int)$params['reinstate_index'][0]]);
-					print_debug('count event exceptions',count($event['recur_exception']));
-				}
-				$this->so->cal->event = $event;
-				$this->so->add_entry($event);
-				return 42;
-			}
-			else
-			{
-				return 43;
-			}
-		}
-
-		function delete_calendar($owner)
-		{
-			if($GLOBALS['phpgw_info']['user']['apps']['admin'])
-			{
-				$this->so->delete_calendar($owner);
-			}
-		}
-
-		function change_owner($params='')
-		{
-			if($GLOBALS['phpgw_info']['server']['calendar_type'] == 'sql')
-			{
-				if(is_array($params))
-				{
-					$this->so->change_owner($params['old_owner'],$params['new_owner']);
-				}
-			}
-		}
-
-		function expunge()
-		{
-			reset($this->so->cal->deleted_events);
-			while(list($i,$event_id) = each($this->so->cal->deleted_events))
-			{
-				$event = $this->so->read_entry($event_id);
-				if($this->check_perms(PHPGW_ACL_DELETE,$event))
-				{
-					$this->send_update(MSG_DELETED,$event['participants'],$event);
-				}
-				else
-				{
-					unset($this->so->cal->deleted_events[$i]);
-				}
-			}
-			$this->so->expunge();
-		}
-
-		function search_keywords($keywords)
-		{
-			$type = $GLOBALS['phpgw']->accounts->get_type($this->owner);
-
-			if($type == 'g')
-			{
-				$members = $GLOBALS['phpgw']->acl->get_ids_for_location($this->owner, 1, 'phpgw_group');
-			}
-			else
-			{
-				$members = array_keys($this->grants);
-
-				if (!in_array($this->owner,$members))
-				{
-					$members[] = $this->owner;
-				}
-			}
-			foreach($members as $n => $uid)
-			{
-				if (!($this->grants[$uid] & PHPGW_ACL_READ))
-				{
-					unset($members[$n]);
-				}
-			}
-			return $this->so->list_events_keyword($keywords,$members);
-		}
-
-		function update($params='')
-		{
-			$l_cal = (@isset($params['cal']) && $params['cal']?$params['cal']:$_POST['cal']);
-			$l_participants = (@$params['participants']?$params['participants']:$_POST['participants']);
-			$l_categories = (@$params['categories']?$params['categories']:$_POST['categories']);
-			$l_start = (@isset($params['start']) && $params['start']?$params['start']:$_POST['start']);
-			$l_end = (@isset($params['end']) && $params['end']?$params['end']:$_POST['end']);
-			$l_recur_enddate = (@isset($params['recur_enddate']) && $params['recur_enddate']?$params['recur_enddate']:$_POST['recur_enddate']);
-
-			$send_to_ui = True;
-			//if ((!is_array($l_start) || !is_array($l_end)) && !isset($_GET['readsess']))	// xmlrpc call
-			if ($this->xmlrpc)	// xmlrpc call
-			{
-				$send_to_ui = False;
-
-				$l_cal = $params;	// no extra array
-
-				foreach(array('start','end','recur_enddate') as $name)
-				{
-					$var = 'l_'.$name;
-					$$var = $GLOBALS['server']->iso86012date($params[$name]);
-					unset($l_cal[$name]);
-				}
-				if (!is_array($l_participants) || !count($l_participants))
-				{
-					$l_participants = array($GLOBALS['phpgw_info']['user']['account_id'] /*.'A'*/);
-				}
-				else
-				{
-					$l_participants = array();
-					foreach($params['participants'] as $user => $data)
-					{
-						if (!is_numeric($user))
-						{
-							$user = $GLOBALS['phpgw']->accounts->name2id($user,'account_email');
-						}
-						$l_participants[] = $user /*.$data['status']*/;
-					}
-				}
-				unset($l_cal['participants']);
-
-				if (!is_object($GLOBALS['phpgw']->categories))
-				{
-					$GLOBALS['phpgw']->categories = CreateObject('phpgwapi.categories');
-				}
-				$l_categories = $GLOBALS['server']->xmlrpc2cats($params['category']);
-				unset($l_cal['category']);
-
-				// using access={public|private} in all modules via xmlrpc
-				$l_cal['public'] = $params['access'] != 'private';
-				unset($l_cal['access']);
-/*
-				$fp = fopen('/tmp/xmlrpc.log','a+');
-				ob_start();
-				echo "\nbocalendar::update("; print_r($params); echo ")\n";
-				//echo "\nl_start="; print_r($l_start);
-				//echo "\nl_end="; print_r($l_end);
-				fwrite($fp,ob_get_contents());
-				ob_end_clean();
-				fclose($fp);
-*/
-			}
-			print_debug('ID',$l_cal['id']);
-
-			// don't wrap to the next day for no time
-			if ($l_end['hour'] == 24 && $l_end['min'] == 0)
-			{
-				$l_end['hour'] = 23;
-				$l_end['min'] = 59;
-			}
-
-			if(isset($_GET['readsess']))
-			{
-				$event = $this->restore_from_appsession();
-				$event['title'] = stripslashes($event['title']);
-				$event['description'] = stripslashes($event['description']);
-				$datetime_check = $this->validate_update($event);
-				if($datetime_check)
-				{
-					ExecMethod('calendar.uicalendar.edit',
-						Array(
-							'cd'		=> $datetime_check,
-							'readsess'	=> 1
-						)
-					);
-					$GLOBALS['phpgw']->common->phpgw_exit(True);
-				}
-				$overlapping_events = False;
-			}
-			else
-			{
-				if((!$l_cal['id'] && !$this->check_perms(PHPGW_ACL_ADD)) ||
-				   ($l_cal['id'] && !$this->check_perms(PHPGW_ACL_EDIT,$l_cal['id'])))
-				{
-					if ($this->xmlrpc)
-					{
-						$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['no_access'],$GLOBALS['xmlrpcstr']['no_access']);
-					}
-					if (!$send_to_ui)
-					{
-						return array(($l_cal['id']?1:2) => 'permission denied');
-					}
-					ExecMethod('calendar.uicalendar.index');
-					$GLOBALS['phpgw']->common->phpgw_exit();
-				}
-				// reading the old event-state, to preserver the participant status
-				$old_event = $l_cal['id'] ? $this->so->read_entry((int) $l_cal['id']) : False;
-
-				print_debug('Prior to fix_update_time()');
-				$this->fix_update_time($l_start);
-				$this->fix_update_time($l_end);
-
-				if(!isset($l_cal['private']))
-				{
-					$l_cal['private'] = 'public';
-				}
-
-				if(!isset($l_categories))
-				{
-					$l_categories = 0;
-				}
-
-				$is_public = (int)(isset($l_cal['public']) ? $l_cal['public'] : $l_cal['private'] == 'public');
-				$this->so->event_init();
-				$this->add_attribute('uid',$l_cal['uid']);
-				if(count($l_categories) >= 2)
-				{
-					$this->so->set_category(implode(',',$l_categories));
-				}
-				else
-				{
-					$this->so->set_category(strval($l_categories[0]));
-				}
-				foreach(array('title','description','location') as $name)
-				{
-					$l_cal[$name] = strip_tags($l_cal[$name]);
-				}
-				$this->so->set_title($l_cal['title']);
-				$this->so->set_description($l_cal['description']);
-				$this->so->set_start($l_start['year'],$l_start['month'],$l_start['mday'],$l_start['hour'],$l_start['min'],0);
-				$this->so->set_end($l_end['year'],$l_end['month'],$l_end['mday'],$l_end['hour'],$l_end['min'],0);
-				$this->so->set_class($is_public);
-				$this->so->add_attribute('reference',(@isset($l_cal['reference']) && $l_cal['reference']?$l_cal['reference']:0));
-				$this->so->add_attribute('location',(@isset($l_cal['location']) && $l_cal['location']?$l_cal['location']:''));
-				if($l_cal['id'])
-				{
-					$this->so->add_attribute('id',$l_cal['id']);
-				}
-
-				if( ($l_cal['rpt_use_end'] != 'y') && !$this->xmlrpc )
-				{
-					$l_recur_enddate['year'] = 0;
-					$l_recur_enddate['month'] = 0;
-					$l_recur_enddate['mday'] = 0;
-				}
-				elseif (isset($l_recur_enddate['str']))
-				{
-					$l_recur_enddate = $this->jscal->input2date($l_recur_enddate['str'],False,'mday');
-				}
-
-				switch((int)$l_cal['recur_type'])
-				{
-					case MCAL_RECUR_NONE:
-						$this->so->set_recur_none();
-						break;
-					case MCAL_RECUR_SECONDLY:
-						$this->so->set_recur_secondly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
-						break;
-					case MCAL_RECUR_MINUTELY:
-						$this->so->set_recur_minutely((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
-						break;
-					case MCAL_RECUR_HOURLY:
-						$this->so->set_recur_hourly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
-						break;
-					case MCAL_RECUR_DAILY:
-						$this->so->set_recur_daily((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
-						break;
-					case MCAL_RECUR_WEEKLY:
-						foreach(array('rpt_sun','rpt_mon','rpt_tue','rpt_wed','rpt_thu','rpt_fri','rpt_sat') as $rpt_day)
-						{
-							$l_cal['recur_data'] += (int)$l_cal[$rpt_day];
-						}
-						if (is_array($l_cal['rpt_day']))
-						{
-							foreach ($l_cal['rpt_day'] as $mask)
-							{
-								$l_cal['recur_data'] |= (int)$mask;
-							}
-						}
-						if (!$l_cal['recur_data'])	// no day set ==> use the day of the startdate
-						{
-							$l_cal['recur_data'] = array_search(date('l',$this->maketime($l_start)-$GLOBALS['phpgw']->datetime->tz_offset),$this->rpt_day);
-						}
-						$this->so->set_recur_weekly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval'],$l_cal['recur_data']);
-						break;
-					case MCAL_RECUR_MONTHLY_MDAY:
-						$this->so->set_recur_monthly_mday((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
-						break;
-					case MCAL_RECUR_MONTHLY_WDAY:
-						$this->so->set_recur_monthly_wday((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
-						break;
-					case MCAL_RECUR_YEARLY:
-						$this->so->set_recur_yearly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
-						break;
-				}
-				// restoring the recur-exceptions from the old event
-				if ($l_cal['recur_type'] != MCAL_RECUR_NONE && $old_event && count($old_event['recur_exception']))
-				{
-					$this->so->add_attribute('recur_exception',$old_event['recur_exception']);
-				}
-
-				if($l_participants)
-				{
-					$parts = $l_participants;
-					$minparts = min($l_participants);
-					$part = Array();
-					for($i=0;$i<count($parts);$i++)
-					{
-						// fetching the accept-type from the old version of the event
-						$accept_type = $old_event && isset($old_event['participants'][$parts[$i]]) ? $old_event['participants'][$parts[$i]] : 'U';
-
-						$acct_type = $GLOBALS['phpgw']->accounts->get_type((int)$parts[$i]);
-						if($acct_type == 'u')
-						{
-							$part[(int)$parts[$i]] = $accept_type;
-						}
-						elseif($acct_type == 'g')
-						{
-							$part[(int)$parts[$i]] = $accept_type;
-							$groups[] = $parts[$i];
-							/* This pulls ALL users of a group and makes them as participants to the event */
-							/* I would like to turn this back into a group thing. */
-							$acct = CreateObject('phpgwapi.accounts',(int)$parts[$i]);
-							$members = $acct->member((int)$parts[$i]);
-							unset($acct);
-							if($members == False)
-							{
-								continue;
-							}
-							while($member = each($members))
-							{
-								$part[$member[1]['account_id']] = $accept_type;
-							}
-						}
-					}
-				}
-				else
-				{
-					$part = False;
-				}
-
-				if($part)
-				{
-					@reset($part);
-					while(list($key,$accept_type) = each($part))
-					{
-						$this->so->add_attribute('participants',$accept_type,(int)$key);
-					}
-				}
-
-				if($groups)
-				{
-					@reset($groups);
-					$this->so->add_attribute('groups',(int)$group_id);
-				}
-
-				$event = $this->get_cached_event();
-				if(!is_int($minparts))
-				{
-					$minparts = $this->owner;
-				}
-				if(!@isset($event['participants'][$l_cal['owner']]))
-				{
-					$this->so->add_attribute('owner',$minparts);
-				}
-				else
-				{
-					$this->so->add_attribute('owner',$l_cal['owner']);
-				}
-				$this->so->add_attribute('priority',$l_cal['priority']);
-
-				foreach($l_cal as $name => $value)
-				{
-					if ($name[0] == '#')	// Custom field
-					{
-						$this->so->add_attribute($name,stripslashes($value));
-					}
-				}
-				if (isset($_POST['preserved']) && is_array($preserved = unserialize(stripslashes($_POST['preserved']))))
-				{
-					foreach($preserved as $name => $value)
-					{
-						switch($name)
-						{
-							case 'owner':
-								$this->so->add_attribute('participants',$value,$l_cal['owner']);
-								break;
-							default:
-								$this->so->add_attribute($name,str_replace(array('&amp;','&quot;','&lt;','&gt;'),array('&','"','<','>'),$value));
-						}
-					}
-				}
-				$event = $this->get_cached_event();
-
-				if ($l_cal['alarmdays'] > 0 || $l_cal['alarmhours'] > 0 ||
-						$l_cal['alarmminutes'] > 0)
-				{
-					$offset = ($l_cal['alarmdays'] * 24 * 3600) +
-						($l_cal['alarmhours'] * 3600) + ($l_cal['alarmminutes'] * 60);
-
-					$time = $this->maketime($event['start']) - $offset;
-
-					$event['alarm'][] = Array(
-						'time'    => $time,
-						'offset'  => $offset,
-						'owner'   => $this->owner,
-						'enabled' => 1
-					);
-				}
-
-				$this->store_to_appsession($event);
-				$datetime_check = $this->validate_update($event);
-				print_debug('bo->validated_update() returnval',$datetime_check);
-				if($datetime_check)
-				{
-					if (!$send_to_ui)
-					{
-						return array($datetime_check => 'invalid input data');
-					}
-					ExecMethod('calendar.uicalendar.edit',
-						Array(
-							'cd'		=> $datetime_check,
-							'readsess'	=> 1
-						)
-					);
-					$GLOBALS['phpgw']->common->phpgw_exit(True);
-				}
-
-				if($event['id'])
-				{
-					$event_ids[] = $event['id'];
-				}
-				if($event['reference'])
-				{
-					$event_ids[] = $event['reference'];
-				}
-
-				$overlapping_events = $this->overlap(
-					$this->maketime($event['start']),
-					$this->maketime($event['end']),
-					$event['participants'],
-					$event['owner'],
-					$event_ids
-				);
-			}
-			if($overlapping_events)
-			{
-				if($send_to_ui)
-				{
-					unset($GLOBALS['phpgw_info']['flags']['noheader']);
-					unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-					ExecMethod('calendar.uicalendar.overlap',
-						Array(
-							'o_events'	=> $overlapping_events,
-							'this_event'	=> $event
-						)
-					);
-					$GLOBALS['phpgw']->common->phpgw_exit(True);
-				}
-				else
-				{
-					return $overlapping_events;
-				}
-			}
-			else
-			{
-				if(!$event['id'])
-				{
-					$this->so->add_entry($event);
-					$this->send_update(MSG_ADDED,$event['participants'],'',$this->get_cached_event());
-					$GLOBALS['phpgw']->contenthistory->updateTimeStamp('calendar', $event['id'], 'add', time());
-					print_debug('New Event ID',$event['id']);
-					
-					// set a new recur_exception
-					if ($event['reference'] && (int) $l_cal['new_exception'])
-					{
-						$recur_event = $this->read_entry($event['reference']);
-						$recur_event['recur_exception'][] = (int) $l_cal['new_exception'];
-						$this->so->add_entry($recur_event);
-					}
-				}
-				else
-				{
-					print_debug('Updating Event ID',$event['id']);
-					$new_event = $event;
-					$old_event = $this->read_entry($event['id']);
-					// if old event has alarm and the start-time changed => update them
-					//echo "<p>checking ".count($old_event['alarm'])." alarms of event #$event[id] start moved from ".print_r($old_event['start'],True)." to ".print_r($event['start'],True)."</p>\n";
-					if ($old_event['alarm'] &&
-						$this->maketime($old_event['start']) != $this->maketime($event['start']))
-					{
-						$this->so->delete_alarms($old_event['id']);
-						foreach($old_event['alarm'] as $id => $alarm)
-						{
-							$alarm['time'] = $this->maketime($event['start']) - $alarm['offset'];
-							$event['alarm'][] = $alarm;
-						}
-						//echo "updated alarms<pre>".print_r($event['alarm'],True)."</pre>\n";
-					}
-					$this->so->cal->event = $event;
-					$this->so->add_entry($event);
-					$GLOBALS['phpgw']->contenthistory->updateTimeStamp('calendar', $event['id'], 'modify', time());
-					$this->prepare_recipients($new_event,$old_event);
-				}
-
-				// check if infolog is availible
-				if(isset($GLOBALS['phpgw_info']['apps']['infolog']) && isset($l_cal['project']))
-				{
-					$bolink = createObject('infolog.bolink');
-					$bolink->unlink(0,'calendar',$event['id']);
-					if($l_cal['project'] != 'no_project')
-					{
-						$bolink->link('calendar',$event['id'],'projects',$l_cal['project']);
-					}
-				}
-				
-				// just a hook
-				$singleHookValues = array
-				(
-					'location'	=> 'updateevent',
-					'hookValues'	=> $event
-				);
-				$GLOBALS['phpgw']->hooks->process($singleHookValues);
-				
-				if($send_to_ui)
-				{
-					$this->read_sessiondata();
-					if ($this->return_to)
-					{
-						$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->return_to);
-						$GLOBALS['phpgw']->common->phpgw_exit();
-					}
-					Execmethod('calendar.uicalendar.index');
-				}
-				else
-				{
-					return (int)$event['id'];
-				}
-			}
-			return True;
-		}
-
-		/* Private functions */
-		function read_holidays($year=0)
-		{
-			if(!$year)
-			{
-				$year = $this->year;
-			}
-			$holiday = CreateObject('calendar.boholiday');
-			$holiday->prepare_read_holidays($year,$this->owner);
-			$this->cached_holidays = $holiday->read_holiday();
-			unset($holiday);
-		}
-
-		function user_is_a_member($event,$user)
-		{
-			@reset($event['participants']);
-			$uim = False;
-			$security_equals = $GLOBALS['phpgw']->accounts->membership($user);
-			while(!$uim && $event['participants'] && $security_equals && list($participant,$status) = each($event['participants']))
-			{
-				if($GLOBALS['phpgw']->accounts->get_type($participant) == 'g')
-				{
-					@reset($security_equals);
-					while(list($key,$group_info) = each($security_equals))
-					{
-						if($group_info['account_id'] == $participant)
-						{
-							return True;
-							$uim = True;
-						}
-					}
-				}
-			}
-			return $uim;
-		}
-
-		function maketime($time)
-		{
-			return mktime($time['hour'],$time['min'],$time['sec'],$time['month'],$time['mday'],$time['year']);
-		}
-
-		/*!
-		@function time2array
-		@abstract returns a date-array suitable for the start- or endtime of an event from a timestamp
-		@syntax time2array($time,$alarm=0)
-		@param $time the timestamp for the values of the array
-		@param $alarm (optional) alarm field of the array, defaults to 0
-		@author ralfbecker
-		*/
-		function time2array($time,$alarm = 0)
-		{
-			return array(
-				'year'  => (int)(date('Y',$time)),
-				'month' => (int)(date('m',$time)),
-				'mday'  => (int)(date('d',$time)),
-				'hour'  => (int)(date('H',$time)),
-				'min'   => (int)(date('i',$time)),
-				'sec'   => (int)(date('s',$time)),
-				'raw'   => $time,
-				'alarm' => (int)($alarm)
-			);
-		}
-
-		/*!
-		@function set_recur_date
-		@abstract set the start- and enddates of a recuring event for a recur-date
-		@syntax set_recur_date(&$event,$date)
-		@param $event the event which fields to set (has to be the original event for start-/end-times)
-		@param $date  the recuring date in form 'Ymd', eg. 20030226
-		@author ralfbecker
-		*/
-		function set_recur_date(&$event,$date)
-		{
-			$org_start = $this->maketime($event['start']);
-			$org_end   = $this->maketime($event['end']);
-			$start = mktime($event['start']['hour'],$event['start']['min'],0,substr($date,4,2),substr($date,6,2),substr($date,0,4));
-			$end   = $org_end + $start - $org_start;
-			$event['start'] = $this->time2array($start);
-			$event['end']   = $this->time2array($end);
-		}
-
-		function fix_update_time(&$time_param)
-		{
-			if (isset($time_param['str']))
-			{
-				if (!is_object($this->jscal))
-				{
-					if (!is_object($GLOBALS['phpgw']->jscalendar))
-					{
-						$GLOBALS['phpgw']->jscalendar = CreateObject('phpgwapi.jscalendar');
-					}
-					$this->jscal = &$GLOBALS['phpgw']->jscalendar;
-				}
-				$time_param += $this->jscal->input2date($time_param['str'],False,'mday');
-				unset($time_param['str']);
-			}
-			if ($this->prefs['common']['timeformat'] == '12')
-			{
-				if ($time_param['ampm'] == 'pm')
-				{
-					if ($time_param['hour'] <> 12)
-					{
-						$time_param['hour'] += 12;
-					}
-				}
-				elseif ($time_param['ampm'] == 'am')
-				{
-					if ($time_param['hour'] == 12)
-					{
-						$time_param['hour'] -= 12;
-					}
-				}
-
-				if($time_param['hour'] > 24)
-				{
-					$time_param['hour'] -= 12;
-				}
-			}
-		}
-
-		function validate_update($event)
-		{
-			$error = 0;
-			// do a little form verifying
-			if (!count($event['participants']))
-			{
-				$error = 43;
-			}
-			elseif ($event['title'] == '')
-			{
-				$error = 40;
-			}
-			elseif (($GLOBALS['phpgw']->datetime->time_valid($event['start']['hour'],$event['start']['min'],0) == False) || ($GLOBALS['phpgw']->datetime->time_valid($event['end']['hour'],$event['end']['min'],0) == False))
-			{
-				$error = 41;
-			}
-			elseif (($GLOBALS['phpgw']->datetime->date_valid($event['start']['year'],$event['start']['month'],$event['start']['mday']) == False) || ($GLOBALS['phpgw']->datetime->date_valid($event['end']['year'],$event['end']['month'],$event['end']['mday']) == False) || ($GLOBALS['phpgw']->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday']) == 1))
-			{
-				$error = 42;
-			}
-			elseif ($GLOBALS['phpgw']->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday']) == 0)
-			{
-				if ($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0) == 1)
-				{
-					$error = 42;
-				}
-			}
-			return $error;
-		}
-
-		/*!
-		@function participants_not_rejected($participants,$event)
-		@abstract checks if any of the $particpants participates in $event and has not rejected it
-		*/
-		function participants_not_rejected($participants,$event)
-		{
-			//echo "participants_not_rejected()<br>participants =<pre>"; print_r($participants); echo "</pre><br>event[participants]=<pre>"; print_r($event['participants']); echo "</pre>\n";
-			foreach($participants as $uid => $status)
-			{
-				//echo "testing event[participants][uid=$uid] = '".$event['participants'][$uid]."'<br>\n";
-				if (isset($event['participants'][$uid]) && $event['participants'][$uid] != 'R' &&
-					$status != 'R')
-				{
-					return True;	// found not rejected participant in event
-				}
-			}
-			return False;
-		}
-		
-		/**
-		 * Checks if two timespans overlap, starting at the exact time where the other span ends is Ok
-		 *
-		 * @param int $start1 start 1. timespan
-		 * @param int $end1 end 1. timespan
-		 * @param int $start2 start 2. timespan
-		 * @param int $end2 end 2. timespan
-		 * @param int > 0 if there is an overlap, 0 otherwise
-		 */
-		function overlaps($start1,$end1,$start2,$end2)
-		{
-			//echo "bocalendar::overlaps($start1=".date('Y-m-d H:i:s',$start1).", $end1=".date('Y-m-d H:i:s',$end1).", $start2=".date('Y-m-d H:i:s',$start2).", $end2=".date('Y-m-d H:i:s',$end2).")<br>\n";
-			
-			if ($start1 <= $start2 && $end2 <= $end1)	// 1 contains 2 complete
-			{
-				//echo "==> 1 contains 2 complete<br>\n";
-				return 1;
-			}
-			if ($start2 <= $start1 && $end1 <= $end2)	// 2 contains 1 complete
-			{
-				//echo "==> 2 contains 1 complete<br>\n";
-				return 2;
-			}
-			if ($start1 < $start2 && $start2 < $end1)	// start of 2 is in 1
-			{
-				//echo "==> start of 2 is in 1<br>\n";
-				return 3;
-			}
-			if ($start1 < $end2 && $end2 < $end1)			// end of 2 is in 1
-			{
-				//echo "==> end of 2 is in 1<br>\n";
-				return 4;
-			}
-			return 0;
-		}
-
-		function overlap($starttime,$endtime,$participants,$owner=0,$ids=0,$restore_cache=False)
-		{
-			$retval = False;
-
-			if($restore_cache)
-			{
-				$temp_cache_events = $this->cached_events;
-			}
-
-			$temp_start = (int)(date('Ymd',$starttime));
-			$temp_end = (int)(date('Ymd',$endtime));
-			if($this->debug)
-			{
-				echo '<!-- Temp_Start: '.$temp_start.' -->'."\n";
-				echo '<!-- Temp_End: '.$temp_end.' -->'."\n";
-			}
-
-			$users = Array();
-			if(count($participants))
-			{
-				foreach($participants as $user => $status)
-				{
-					$users[] = $user;
-				}
-			}
-			else
-			{
-				$users[] = $this->owner;
-			}
-
-			$possible_conflicts = $this->store_to_cache(
-				Array(
-					'smonth'	=> substr(strval($temp_start),4,2),
-					'sday'	=> substr(strval($temp_start),6,2),
-					'syear'	=> substr(strval($temp_start),0,4),
-					'emonth'	=> substr(strval($temp_end),4,2),
-					'eday'	=> substr(strval($temp_end),6,2),
-					'eyear'	=> substr(strval($temp_end),0,4),
-					'owner'	=> $users
-				)
-			);
-
-			for($ts = $starttime; $ts <= $endtime; $ts += 24*60*60)
-			{
-				$check_ymd = (int) date('Ymd',$ts);
-				if (isset($possible_conflicts[$check_ymd]) && is_array($possible_conflicts[$check_ymd]) &&
-					count($possible_conflicts[$check_ymd]))
-				{
-					if($this->debug)
-					{
-						echo '<!-- Found '.count($possible_conflicts[$check_ymd]).' possible conflicts for date '.$check_ymd.' -->'."\n";
-					}
-					foreach($possible_conflicts[$check_ymd] as $event)
-					{
-						$found = False;
-						if(is_array($ids))
-						{
-							foreach($ids as $event_id)
-							{
-								if($this->debug)
-								{
-									echo '<!-- Checking '.$event['id'].' == '.$event_id.' -->'."\n";
-								}
-								if($event['id'] == $event_id)
-								{
-									$found = True;	// conflict with original event, is no conflict
-									break;
-								}
-							}
-						}
-						if (!$found)
-						{
-							if($this->debug)
-							{
-								echo '<!-- conflict with a different event: '.($found?'No':'Yes').' -->'."<br>\n";
-							}
-							if($this->debug)
-							{
-								echo '<!-- Checking event id #'.$event['id'];
-							}
-							$event_start = $this->maketime($event['start']);
-							$event_end   = $this->maketime($event['end']);
-							if ($this->overlaps($starttime,$endtime,$event_start,$event_end) &&
-								$this->participants_not_rejected($participants,$event))
-							{
-								if($this->debug)
-								{
-									echo ' Conflicts';
-								}
-								if (!is_array($retval) || !in_array($event['id'],$retval)) $retval[] = $event['id'];
-							}
-							if($this->debug)
-							{
-								echo ' -->'."\n";
-							}
-						}					
-					}
-				}
-			}
-			if($restore_cache)
-			{
-				$this->cached_events = $temp_cache_events;
-			}
-			return $retval;
-		}
-
-		/*!
-		@function check_perms( )
-		@syntax check_perms($needed,$event=0,$other=0)
-		@abstract Checks if the current user has the necessary ACL rights
-		@author ralfbecker
-		@discussion The check is performed on an event or general on the cal of an other user
-		@param $needed necessary ACL right: PHPGW_ACL_{READ|EDIT|DELETE}
-		@param $event event as array or the event-id or 0 for general check
-		@param $other uid to check (if event==0) or 0 to check against $this->owner
-		@note Participating in an event is considered as haveing read-access AND private-access on that event, \
-			even if you have no general read- or private-grant from that user.
-		*/
-		function check_perms($needed,$event=0,$other=0)
-		{
-			$event_in = $event;
-			if (is_int($event) && $event == 0)
-			{
-				$owner = $other > 0 ? $other : $this->owner;
-			}
-			else
-			{
-				if (!is_array($event))
-				{
-					$event = $this->so->read_entry((int) $event);
-				}
-				if (!is_array($event))
-				{
-					if ($this->xmlrpc)
-					{
-						$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['not_exist'],$GLOBALS['xmlrpcstr']['not_exist']);
-					}
-					return False;
-				}
-				$owner = $event['owner'];
-				$private = $event['public'] == False || $event['public'] == 0;
-			}
-			$user = $GLOBALS['phpgw_info']['user']['account_id'];
-			$grants = $this->grants[$owner];
-
-			if (is_array($event) && $needed == PHPGW_ACL_READ)
-			{
-				// Check if the $user is one of the participants or has a read-grant from one of them
-				// in that case he has an implicite READ grant for that event
-				//
-				if (isset($event['participants']) && is_array($event['participants']))
-				{
-					foreach($event['participants'] as $uid => $accept)
-					{
-						if ($uid == $user) 
-						{
-							// if we are a participant, we have an implicite READ and PRIVAT grant
-							$grants |= PHPGW_ACL_READ | PHPGW_ACL_PRIVATE;
-							break;
-						}
-						elseif ($this->grants[$uid] & PHPGW_ACL_READ)
-						{
-							// if we have a READ grant from a participant, we dont give an implicit privat grant too
-							$grants |= PHPGW_ACL_READ;
-							// we cant break here, as we might be a participant too, and would miss the privat grant 
-						}	
-					}
-				}
-			}
-
-			if ($GLOBALS['phpgw']->accounts->get_type($owner) == 'g' && $needed == PHPGW_ACL_ADD)
-			{
-				$access = False;	// a group can't be the owner of an event
-			}
-			else
-			{
-				$access = $user == $owner || $grants & $needed && (!$private || $grants & PHPGW_ACL_PRIVATE);
-			}
-			//echo "<p>".function_backtrace()." check_perms($needed,$event_id,$other) for user $user and needed_acl $needed: event='$event[title]': owner=$owner, private=$private, grants=$grants ==> access=$access</p>\n";
-
-			return $access;
-		}
-
-
-		function display_status($user_status)
-		{
-			if(@$this->prefs['calendar']['display_status'] && $user_status)
-			{
-				$user_status = substr($this->get_long_status($user_status),0,1);
-
-				return ' ('.$user_status.')';
-			}
-			else
-			{
-				return '';
-			}
-		}
-
-		function get_long_status($status_short)
-		{
-			switch ($status_short)
-			{
-				case 'A':
-					$status = lang('Accepted');
-					break;
-				case 'R':
-					$status = lang('Rejected');
-					break;
-				case 'T':
-					$status = lang('Tentative');
-					break;
-				case 'U':
-					$status = lang('No Response');
-					break;
-			}
-			return $status;
-		}
-
-		function is_private($event,$owner)
-		{
-			if($owner == 0)
-			{
-				$owner = $this->owner;
-			}
-			if ($owner == $GLOBALS['phpgw_info']['user']['account_id'] || ($event['public']==1) || ($this->check_perms(PHPGW_ACL_PRIVATE,$event) && $event['public']==0) || $event['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
-			{
-				return False;
-			}
-			elseif($event['public'] == 0)
-			{
-				return True;
-			}
-			elseif($event['public'] == 2)
-			{
-				$is_private = True;
-				$groups = $GLOBALS['phpgw']->accounts->membership($owner);
-				while (list($key,$group) = each($groups))
-				{
-					if (strpos(' '.implode(',',$event['groups']).' ',$group['account_id']))
-					{
-						return False;
-					}
-				}
-			}
-			else
-			{
-				return False;
-			}
-
-			return $is_private;
-		}
-
-		function get_short_field($event,$is_private=True,$field='')
-		{
-			if($is_private)
-			{
-				return lang('private');
-			}
-
-// cut off too long titles
-			elseif(strlen($event[$field]) > 19 && !$this->printer_friendly && $field=="title")
-//			elseif(strlen($event[$field]) > 19 && $this->printer_friendly)
-			{
-// we dont use currently 160304
-//				return substr($event[$field], 0 , 19) . '&nbsp;...';
-				return $event[$field];
-			}
-			else
-			{
-				return $event[$field];
-			}
-		}
-
-		function long_date($first,$last=0)
-		{
-			if (!is_array($first))
-			{
-				$first = $this->time2array($raw = $first);
-				$first['raw'] = $raw;
-				$first['day'] = $first['mday'];
-			}
-			if ($last && !is_array($last))
-			{
-				$last = $this->time2array($raw = $last);
-				$last['raw'] = $raw;
-				$last['day'] = $last['mday'];
-			}
-			$datefmt = $this->prefs['common']['dateformat'];
-
-			$month_before_day = strtolower($datefmt[0]) == 'm' ||
-				strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
-
-			for ($i = 0; $i < 5; $i += 2)
-			{
-				switch($datefmt[$i])
-				{
-					case 'd':
-						$range .= $first['day'] . ($datefmt[1] == '.' ? '.' : '');
-						if ($first['month'] != $last['month'] || $first['year'] != $last['year'])
-						{
-							if (!$month_before_day)
-							{
-								$range .= ' '.lang(strftime('%B',$first['raw']));
-							}
-							if ($first['year'] != $last['year'] && $datefmt[0] != 'Y')
-							{
-								$range .= ($datefmt[0] != 'd' ? ', ' : ' ') . $first['year'];
-							}
-							if (!$last)
-							{
-								return $range;
-							}
-							$range .= ' - ';
-
-							if ($first['year'] != $last['year'] && $datefmt[0] == 'Y')
-							{
-								$range .= $last['year'] . ', ';
-							}
-
-							if ($month_before_day)
-							{
-								$range .= lang(strftime('%B',$last['raw']));
-							}
-						}
-						else
-						{
-							$range .= ' - ';
-						}
-						$range .= ' ' . $last['day'] . ($datefmt[1] == '.' ? '.' : '');
-						break;
-					case 'm':
-					case 'M':
-						$range .= ' '.lang(strftime('%B',$month_before_day ? $first['raw'] : $last['raw'])) . ' ';
-						break;
-					case 'Y':
-						$range .= ($datefmt[0] == 'm' ? ', ' : ' ') . ($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
-						break;
-				}
-			}
-			return $range;
-		}
-
-		function get_week_label()
-		{
-			$first = $GLOBALS['phpgw']->datetime->gmtdate($GLOBALS['phpgw']->datetime->get_weekday_start($this->year, $this->month, $this->day));
-			$last = $GLOBALS['phpgw']->datetime->gmtdate($first['raw'] + 518400);
-
-			return ($this->long_date($first,$last));
-		}
-
-		function normalizeminutes(&$minutes)
-		{
-			$hour = 0;
-			$min = (int)$minutes;
-			if($min >= 60)
-			{
-				$hour += $min / 60;
-				$min %= 60;
-			}
-			settype($minutes,'integer');
-			$minutes = $min;
-			return $hour;
-		}
-
-		function splittime($time,$follow_24_rule=True)
-		{
-			$temp = array('hour','minute','second','ampm');
-			$time = strrev($time);
-			$second = (int)(strrev(substr($time,0,2)));
-			$minute = (int)(strrev(substr($time,2,2)));
-			$hour   = (int)(strrev(substr($time,4)));
-			$hour += $this->normalizeminutes($minute);
-			$temp['second'] = $second;
-			$temp['minute'] = $minute;
-			$temp['hour']   = $hour;
-			$temp['ampm']   = '  ';
-			if($follow_24_rule == True)
-			{
-				if ($this->prefs['common']['timeformat'] == '24')
-				{
-					return $temp;
-				}
-
-				$temp['ampm'] = 'am';
-
-				if ((int)$temp['hour'] > 12)
-				{
-					$temp['hour'] = (int)((int)$temp['hour'] - 12);
-					$temp['ampm'] = 'pm';
-				}
-				elseif ((int)$temp['hour'] == 12)
-				{
-					$temp['ampm'] = 'pm';
-				}
-			}
-			return $temp;
-		}
-
-		function get_exception_array($exception_str='')
-		{
-			$exception = Array();
-			if(strpos(' '.$exception_str,','))
-			{
-				$exceptions = explode(',',$exception_str);
-				for($exception_count=0;$exception_count<count($exceptions);$exception_count++)
-				{
-					$exception[] = (int)$exceptions[$exception_count];
-				}
-			}
-			elseif($exception_str != '')
-			{
-				$exception[] = (int)$exception_str;
-			}
-			return $exception;
-		}
-
-		function build_time_for_display($fixed_time)
-		{
-			$time = $this->splittime($fixed_time);
-			$str = $time['hour'].':'.((int)$time['minute']<=9?'0':'').$time['minute'];
-
-			if ($this->prefs['common']['timeformat'] == '12')
-			{
-				$str .= ' ' . $time['ampm'];
-			}
-
-			return $str;
-		}
-
-		/**
-		 * Inserts $event in $this->cached_events, if its not already there, because of a recur-expection
-		 * Note: It maintains the sorting after starttime in the cached_events !!!
-		 */
-		function sort_event($event,$date)
-		{
-			$inserted = False;
-			if(isset($event['recur_exception']))
-			{
-				$event_time = mktime($event['start']['hour'],$event['start']['min'],0,(int)(substr($date,4,2)),(int)(substr($date,6,2)),(int)(substr($date,0,4))) - $GLOBALS['phpgw']->datetime->tz_offset;
-				while($inserted == False && list($key,$exception_time) = each($event['recur_exception']))
-				{
-					if($this->debug)
-					{
-						echo '<!-- checking exception datetime '.$exception_time.' to event datetime '.$event_time.' -->'."\n";
-					}
-					if($exception_time == $event_time)
-					{
-						$inserted = True;
-					}
-				}
-			}
-			if($this->cached_events[$date] && $inserted == False)
-			{
-
-				if($this->debug)
-				{
-					echo '<!-- Cached Events found for '.$date.' -->'."\n";
-				}
-				$year = substr($date,0,4);
-				$month = substr($date,4,2);
-				$day = substr($date,6,2);
-
-				if($this->debug)
-				{
-					echo '<!-- Date : '.$date.' Count : '.count($this->cached_events[$date]).' -->'."\n";
-				}
-
-				for($i=0;$i<count($this->cached_events[$date]);$i++)
-				{
-					if($this->cached_events[$date][$i]['id'] == $event['id'] || $this->cached_events[$date][$i]['reference'] == $event['id'])
-					{
-						if($this->debug)
-						{
-							echo '<!-- Item already inserted! -->'."\n";
-						}
-						$inserted = True;
-						break;
-					}
-					/* This puts all spanning events across multiple days up at the top. */
-					if($this->cached_events[$date][$i]['recur_type'] == MCAL_RECUR_NONE)
-					{
-						if($this->cached_events[$date][$i]['start']['mday'] != $day && $this->cached_events[$date][$i]['end']['mday'] >= $day)
-						{
-							continue;
-						}
-					}
-					if(date('Hi',mktime($event['start']['hour'],$event['start']['min'],$event['start']['sec'],$month,$day,$year)) < date('Hi',mktime($this->cached_events[$date][$i]['start']['hour'],$this->cached_events[$date][$i]['start']['min'],$this->cached_events[$date][$i]['start']['sec'],$month,$day,$year)))
-					{
-						for($j=count($this->cached_events[$date]);$j>=$i;$j--)
-						{
-							$this->cached_events[$date][$j] = $this->cached_events[$date][$j-1];
-						}
-						if($this->debug)
-						{
-							echo '<!-- Adding event ID: '.$event['id'].' to cached_events -->'."\n";
-						}
-						$inserted = True;
-						$this->cached_events[$date][$i] = $event;
-						break;
-					}
-				}
-			}
-			if(!$inserted)
-			{
-				if($this->debug)
-				{
-					echo '<!-- Adding event ID: '.$event['id'].' to cached_events -->'."\n";
-				}
-				$this->cached_events[$date][] = $event;
-			}
-		}
-
-		/**
-		 * Creates copies of each repeating event in $this->repeating_events in $this->cached_events (via sort_event)
-		 */
-		function check_repeating_events($datetime)
-		{
-			@reset($this->repeating_events);
-			$search_date_full = date('Ymd',$datetime);
-			$search_date_year = date('Y',$datetime);
-			$search_date_month = date('m',$datetime);
-			$search_date_day = date('d',$datetime);
-			$search_date_dow = date('w',$datetime);
-			$search_beg_day = mktime(0,0,0,$search_date_month,$search_date_day,$search_date_year,0);
-			if($this->debug)
-			{
-				echo '<!-- Search Date Full = '.$search_date_full.' -->'."\n";
-			}
-			$repeated = $this->repeating_events;
-			$r_events = count($repeated);
-			for ($i=0;$i<$r_events;$i++)
-			{
-				$rep_events = $this->repeating_events[$i];
-				$id = $rep_events['id'];
-				$event_beg_day = mktime(0,0,0,$rep_events['start']['month'],$rep_events['start']['mday'],$rep_events['start']['year'],0);
-				if($rep_events['recur_enddate']['month'] != 0 && $rep_events['recur_enddate']['mday'] != 0 && $rep_events['recur_enddate']['year'] != 0)
-				{
-					$event_recur_time = $this->maketime($rep_events['recur_enddate']);
-				}
-				else
-				{
-					$event_recur_time = mktime(0,0,0,1,1,2030);
-				}
-				$end_recur_date = date('Ymd',$event_recur_time);
-				$full_event_date = date('Ymd',$event_beg_day);
-
-				if($this->debug)
-				{
-					echo '<!-- check_repeating_events - Processing ID - '.$id.' -->'."\n";
-					echo '<!-- check_repeating_events - Recurring End Date - '.$end_recur_date.' -->'."\n";
-				}
-
-				// only repeat after the beginning, and if there is an rpt_end before the end date
-				if (($search_date_full > $end_recur_date) || ($search_date_full < $full_event_date))
-				{
-					continue;
-				}
-
-				if ($search_date_full == $full_event_date)
-				{
-					$this->sort_event($rep_events,$search_date_full);
-					continue;
-				}
-				else
-				{
-					$freq = $rep_events['recur_interval'];
-					$type = $rep_events['recur_type'];
-					switch($type)
-					{	// FIXME: need to add secondly, minutely, and hourly
-						case MCAL_RECUR_DAILY:
-							if($this->debug)
-							{
-								echo '<!-- check_repeating_events - MCAL_RECUR_DAILY - '.$id.' -->'."\n";
-							}
-							if ($freq == 1 && $rep_events['recur_enddate']['month'] != 0 && $rep_events['recur_enddate']['mday'] != 0 && $rep_events['recur_enddate']['year'] != 0 && $search_date_full <= $end_recur_date)
-							{
-								$this->sort_event($rep_events,$search_date_full);
-							}
-							elseif (floor(($search_beg_day - $event_beg_day)/86400) % $freq)
-							{
-								continue;
-							}
-							else
-							{
-								$this->sort_event($rep_events,$search_date_full);
-							}
-							break;
-						case MCAL_RECUR_WEEKLY:
-							if (floor(($search_beg_day - $event_beg_day)/604800) % $freq)
-							{
-								continue;
-							}
-							$check = 0;
-							switch($search_date_dow)
-							{
-								case 0:
-									$check = MCAL_M_SUNDAY;
-									break;
-								case 1:
-									$check = MCAL_M_MONDAY;
-									break;
-								case 2:
-									$check = MCAL_M_TUESDAY;
-									break;
-								case 3:
-									$check = MCAL_M_WEDNESDAY;
-									break;
-								case 4:
-									$check = MCAL_M_THURSDAY;
-									break;
-								case 5:
-									$check = MCAL_M_FRIDAY;
-									break;
-								case 6:
-									$check = MCAL_M_SATURDAY;
-									break;
-							}
-							if ($rep_events['recur_data'] & $check)
-							{
-								$this->sort_event($rep_events,$search_date_full);
-							}
-							break;
-						case MCAL_RECUR_MONTHLY_WDAY:
-							if ((($search_date_year - $rep_events['start']['year']) * 12 + $search_date_month - $rep_events['start']['month']) % $freq)
-							{
-								continue;
-							}
-
-							if (($GLOBALS['phpgw']->datetime->day_of_week($rep_events['start']['year'],$rep_events['start']['month'],$rep_events['start']['mday']) == $GLOBALS['phpgw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day)) &&
-								(ceil($rep_events['start']['mday']/7) == ceil($search_date_day/7)))
-							{
-								$this->sort_event($rep_events,$search_date_full);
-							}
-							break;
-						case MCAL_RECUR_MONTHLY_MDAY:
-							if ((($search_date_year - $rep_events['start']['year']) * 12 + $search_date_month - $rep_events['start']['month']) % $freq)
-							{
-								continue;
-							}
-							if ($search_date_day == $rep_events['start']['mday'])
-							{
-								$this->sort_event($rep_events,$search_date_full);
-							}
-							break;
-						case MCAL_RECUR_YEARLY:
-							if (($search_date_year - $rep_events['start']['year']) % $freq)
-							{
-								continue;
-							}
-							if (date('dm',$datetime) == date('dm',$event_beg_day))
-							{
-								$this->sort_event($rep_events,$search_date_full);
-							}
-							break;
-					}
-				}
-			}	// end for loop
-		}	// end function
-
-		function store_to_cache($params)
-		{
-			if(!is_array($params))
-			{
-				return False;
-			}
-			if (isset($params['start']) && ($datearr = $GLOBALS['server']->iso86012date($params['start'])))
-			{
-				$syear = $datearr['year'];
-				$smonth = $datearr['month'];
-				$sday = $datearr['mday'];
-				$this->xmlrpc = True;
-			}
-			else
-			{
-				$syear = $params['syear'];
-				$smonth = $params['smonth'];
-				$sday = $params['sday'];
-			}
-			if (isset($params['end']) && ($datearr = $GLOBALS['server']->iso86012date($params['end'])))
-			{
-				$eyear = $datearr['year'];
-				$emonth = $datearr['month'];
-				$eday = $datearr['mday'];
-				$this->xmlrpc = True;
-			}
-			else
-			{
-				$eyear = (isset($params['eyear'])?$params['eyear']:0);
-				$emonth = (isset($params['emonth'])?$params['emonth']:0);
-				$eday = (isset($params['eday'])?$params['eday']:0);
-			}
-			if (!isset($params['owner']) && @$this->xmlrpc)
-			{
-				$owner_id = $GLOBALS['phpgw_info']['user']['account_id'];
-			}
-			else
-			{
-				$owner_id = (isset($params['owner'])?$params['owner']:0);
-				if($owner_id==0 && $this->is_group)
-				{
-					unset($owner_id);
-					$owner_id = $this->g_owner;
-					if($this->debug)
-					{
-						echo '<!-- owner_id in ('.implode(',',$owner_id).') -->'."\n";
-					}
-				}
-			}
-
-			if(!$eyear && !$emonth && !$eday)
-			{
-				$edate = mktime(23,59,59,$smonth + 1,$sday + 1,$syear);
-				$eyear = date('Y',$edate);
-				$emonth = date('m',$edate);
-				$eday = date('d',$edate);
-			}
-			else
-			{
-				if(!$eyear)
-				{
-					$eyear = $syear;
-				}
-				if(!$emonth)
-				{
-					$emonth = $smonth + 1;
-					if($emonth > 12)
-					{
-						$emonth = 1;
-						$eyear++;
-					}
-				}
-				if(!$eday)
-				{
-					$eday = $sday + 1;
-				}
-				$edate = mktime(23,59,59,$emonth,$eday,$eyear);
-			}
-			if (isset($params['modified']) && @$this->xmlrpc)
-			{
-				$params['modified'] = $GLOBALS['server']->iso86012date($params['modified'],true);
-			}
-			//echo "<p>bocalendar::store_to_cache(".print_r($params,True).") syear=$syear, smonth=$smonth, sday=$sday, eyear=$eyear, emonth=$emonth, eday=$eday, xmlrpc='$param[xmlrpc]'</p>\n";
-			if($this->debug)
-			{
-				echo '<!-- Start Date : '.sprintf("%04d%02d%02d",$syear,$smonth,$sday).' -->'."\n";
-				echo '<!-- End   Date : '.sprintf("%04d%02d%02d",$eyear,$emonth,$eday).' -->'."\n";
-			}
-
-			$cached_event_ids = $this->so->list_events($syear,$smonth,$sday,$eyear,$emonth,$eday,(int)$owner_id,(int)$params['modified']);
-			$cached_event_ids_repeating = $this->so->list_repeated_events($syear,$smonth,$sday,$eyear,$emonth,$eday,(int)$owner_id,(int)$params['modified']);
-
-			$c_cached_ids = count($cached_event_ids);
-			$c_cached_ids_repeating = count($cached_event_ids_repeating);
-
-			if($this->debug)
-			{
-				echo '<!-- events cached : '.$c_cached_ids.' : for : '.sprintf("%04d%02d%02d",$syear,$smonth,$sday).' -->'."\n";
-				echo '<!-- repeating events cached : '.$c_cached_ids_repeating.' : for : '.sprintf("%04d%02d%02d",$syear,$smonth,$sday).' -->'."\n";
-			}
-
-			$this->cached_events = Array();
-
-			if($c_cached_ids == 0 && $c_cached_ids_repeating == 0)
-			{
-				return;
-			}
-
-			$cache_start = (int)(sprintf("%04d%02d%02d",$syear,$smonth,$sday));
-			$cached_event=$this->get_cached_event();
-			if($c_cached_ids)
-			{
-				for($i=0;$i<$c_cached_ids;$i++)
-				{
-					$event = $this->so->read_entry($cached_event_ids[$i]);
-					if ($event['recur_type'])
-					{
-						continue;	// fetch recuring events only in 2. loop
-					}
-					$startdate = (int)(date('Ymd',$this->maketime($event['start'])));
-					// maketime($event['end'][)-1 to allow events to end on a full hour/day without the need to enter it as minute=59
-					$enddate = (int)(date('Ymd',$this->maketime($event['end'])-1));
-					$this->cached_events[$startdate][] = $event;
-					if($startdate != $enddate)
-					{
-						$start['year'] = (int)(substr($startdate,0,4));
-						$start['month'] = (int)(substr($startdate,4,2));
-						$start['mday'] = (int)(substr($startdate,6,2));
-						for($j=$startdate,$k=0;$j<=$enddate;$k++,$j=(int)(date('Ymd',mktime(0,0,0,$start['month'],$start['mday'] + $k,$start['year']))))
-						{
-							$c_evt_day = count($this->cached_events[$j]) - 1;
-							if($c_evt_day < 0)
-							{
-								$c_evt_day = 0;
-							}
-							if($this->debug)
-							{
-								echo '<!-- Date: '.$j.' Count : '.$c_evt_day.' -->'."\n";
-							}
-							if($this->cached_events[$j][$c_evt_day]['id'] != $event['id'])
-							{
-								if($this->debug)
-								{
-									echo '<!-- Adding Event for Date: '.$j.' -->'."\n";
-								}
-								$this->cached_events[$j][] = $event;
-							}
-							if ($j >= $cache_start && (@$params['no_doubles'] || @$this->xmlrpc))
-							{
-								break;	// add event only once on it's startdate
-							}
-						}
-					}
-				}
-			}
-			
-			$this->repeating_events = Array();
-			if($c_cached_ids_repeating)
-			{
-				for($i=0;$i<$c_cached_ids_repeating;$i++)
-				{
-					$this->repeating_events[$i] = $this->so->read_entry($cached_event_ids_repeating[$i]);
-					if($this->debug)
-					{
-						echo '<!-- Cached Events ID: '.$cached_event_ids_repeating[$i].' ('.sprintf("%04d%02d%02d",$this->repeating_events[$i]['start']['year'],$this->repeating_events[$i]['start']['month'],$this->repeating_events[$i]['start']['mday']).') -->'."\n";
-					}
-				}
-				for($date=mktime(0,0,0,$smonth,$sday,$syear);$date<=$edate;$date += 86400)
-				{
-					if($this->debug)
-					{
-						$search_date = date('Ymd',$date);
-						echo '<!-- Calling check_repeating_events('.$search_date.') -->'."\n";
-					}
-					$this->check_repeating_events($date);
-					if($this->debug)
-					{
-						echo '<!-- Total events found matching '.$search_date.' = '.count($this->cached_events[$search_date]).' -->'."\n";
-						for($i=0;$i<count($this->cached_events[$search_date]);$i++)
-						{
-							echo '<!-- Date: '.$search_date.' ['.$i.'] = '.$this->cached_events[$search_date][$i]['id'].' -->'."\n";
-						}
-					}
-				}
-			}
-
-			$retval = Array();
-			for($j=date('Ymd',mktime(0,0,0,$smonth,$sday,$syear)),$k=0;$j<=date('Ymd',mktime(0,0,0,$emonth,$eday,$eyear));$k++,$j=date('Ymd',mktime(0,0,0,$smonth,$sday + $k,$syear)))
-			{
-				if(is_array($this->cached_events[$j]))
-				{
-					if ($this->xmlrpc)
-					{
-						foreach($this->cached_events[$j] as $event)
-						{
-							$retval[] = $this->xmlrpc_prepare($event);
-						}
-					}
-					else
-					{
-						$retval[$j] = $this->cached_events[$j];
-					}
-				}
-			}
-			//echo "store_to_cache(".print_r($params,True).")=<pre>".print_r($retval,True)."</pre>\n";
-			$this->so->cal->event = $cached_event;
-			return $retval;
-		}
-
-		function xmlrpc_prepare(&$event)
-		{
-			$event['rights'] = $this->grants[$event['owner']];
-
-			foreach(array('start','end','modtime','recur_enddate') as $name)
-			{
-				if (isset($event[$name]))
-				{
-					$event[$name] = $GLOBALS['server']->date2iso8601($event[$name]);
-				}
-			}
-			if (is_array($event['recur_exception']))
-			{
-				foreach($event['recur_exception'] as $key => $timestamp)
-				{
-					$event['recur_exception'][$key] = $GLOBALS['server']->date2iso8601($timestamp);
-				}
-			}
-			static $user_cache = array();
-
-			if (!is_object($GLOBALS['phpgw']->perferences))
-			{
-				$GLOBALS['phpgw']->perferences = CreateObject('phpgwapi.preferences');
-			}
-			foreach($event['participants'] as $user_id => $status)
-			{
-				if (!isset($user_cache[$user_id]))
-				{
-					$user_cache[$user_id] = array(
-						'name'   => $GLOBALS['phpgw']->common->grab_owner_name($user_id),
-						'email'  => $GLOBALS['phpgw']->accounts->id2name($user_id,'account_email')
-					);
-				}
-				$event['participants'][$user_id] = $user_cache[$user_id] + array(
-					'status' => $status,
-				);
-			}
-			if (is_array($event['alarm']))
-			{
-				foreach($event['alarm'] as $id => $alarm)
-				{
-					$event['alarm'][$id]['time'] = $GLOBALS['server']->date2iso8601($alarm['time']);
-					if ($alarm['owner'] != $GLOBALS['phpgw_info']['user']['account_id'])
-					{
-						unset($event['alarm'][$id]);
-					}
-				}
-			}
-			$event['category'] = $GLOBALS['server']->cats2xmlrpc(explode(',',$event['category']));
-
-			// using access={public|privat} in all modules via xmlrpc
-			$event['access'] = $event['public'] ? 'public' : 'privat';
-			unset($event['public']);
-
-			return $event;
-		}
-
-		/* Begin Appsession Data */
-		function store_to_appsession($event)
-		{
-			$GLOBALS['phpgw']->session->appsession('entry','calendar',$event);
-		}
-
-		function restore_from_appsession()
-		{
-			$this->event_init();
-			$event = $GLOBALS['phpgw']->session->appsession('entry','calendar');
-			$this->so->cal->event = $event;
-			return $event;
-		}
-		/* End Appsession Data */
-
-		/* Begin of SO functions */
-		function get_cached_event()
-		{
-			return $this->so->get_cached_event();
-		}
-
-		function add_attribute($var,$value,$index='**(**')
-		{
-			$this->so->add_attribute($var,$value,$index);
-		}
-
-		function event_init()
-		{
-			$this->so->event_init();
-		}
-
-		function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->so->set_start($year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->so->set_end($year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_title($title='')
-		{
-			$this->so->set_title($title);
-		}
-
-		function set_description($description='')
-		{
-			$this->so->set_description($description);
-		}
-
-		function set_class($class)
-		{
-			$this->so->set_class($class);
-		}
-
-		function set_category($category='')
-		{
-			$this->so->set_category($category);
-		}
-
-		function set_alarm($alarm)
-		{
-			$this->so->set_alarm($alarm);
-		}
-
-		function set_recur_none()
-		{
-			$this->so->set_recur_none();
-		}
-
-		function set_recur_daily($year,$month,$day,$interval)
-		{
-			$this->so->set_recur_daily($year,$month,$day,$interval);
-		}
-
-		function set_recur_weekly($year,$month,$day,$interval,$weekdays)
-		{
-			$this->so->set_recur_weekly($year,$month,$day,$interval,$weekdays);
-		}
-
-		function set_recur_monthly_mday($year,$month,$day,$interval)
-		{
-			$this->so->set_recur_monthly_mday($year,$month,$day,$interval);
-		}
-
-		function set_recur_monthly_wday($year,$month,$day,$interval)
-		{
-			$this->so->set_recur_monthly_wday($year,$month,$day,$interval);
-		}
-
-		function set_recur_yearly($year,$month,$day,$interval)
-		{
-			$this->so->set_recur_yearly($year,$month,$day,$interval);
-		}
-		/* End of SO functions */
-
-		function prepare_matrix($interval,$increment,$part,$fulldate)
-		{
-			for($h=0;$h<24;$h++)
-			{
-				for($m=0;$m<$interval;$m++)
-				{
-					$index = (($h * 10000) + (($m * $increment) * 100));
-					$time_slice[$index]['marker'] = '&nbsp';
-					$time_slice[$index]['description'] = '';
-				}
-			}
-			foreach($this->cached_events[$fulldate] as $event)
-			{
-				if ($event['participants'][$part] == 'R')
-				{
-					continue;	// dont show rejected invitations, as they are free time
-				}
-				$eventstart = $GLOBALS['phpgw']->datetime->localdates($this->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset);
-				$eventend = $GLOBALS['phpgw']->datetime->localdates($this->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset);
-				$start = ($eventstart['hour'] * 10000) + ($eventstart['minute'] * 100);
-				$starttemp = $this->splittime("$start",False);
-				$subminute = 0;
-				for($m=0;$m<$interval;$m++)
-				{
-					$minutes = $increment * $m;
-					if((int)$starttemp['minute'] > $minutes && (int)$starttemp['minute'] < ($minutes + $increment))
-					{
-						$subminute = ($starttemp['minute'] - $minutes) * 100;
-					}
-				}
-				$start -= $subminute;
-				$end =  ($eventend['hour'] * 10000) + ($eventend['minute'] * 100);
-				$endtemp = $this->splittime("$end",False);
-				$addminute = 0;
-				for($m=0;$m<$interval;$m++)
-				{
-					$minutes = ($increment * $m);
-					if($endtemp['minute'] < ($minutes + $increment) && $endtemp['minute'] > $minutes)
-					{
-						$addminute = ($minutes + $increment - $endtemp['minute']) * 100;
-					}
-				}
-				$end += $addminute;
-				$starttemp = $this->splittime("$start",False);
-				$endtemp = $this->splittime("$end",False);
-
-				for($h=$starttemp['hour'];$h<=$endtemp['hour'];$h++)
-				{
-					$startminute = 0;
-					$endminute = $interval;
-					$hour = $h * 10000;
-					if($h == (int)$starttemp['hour'])
-					{
-						$startminute = ($starttemp['minute'] / $increment);
-					}
-					if($h == (int)$endtemp['hour'])
-					{
-						$endminute = ($endtemp['minute'] / $increment);
-					}
-					$private = $this->is_private($event,$part);
-					$time_display = $GLOBALS['phpgw']->common->show_date($eventstart['raw'],$this->users_timeformat).'-'.$GLOBALS['phpgw']->common->show_date($eventend['raw'],$this->users_timeformat);
-					$time_description = '('.$time_display.') '.$this->get_short_field($event,$private,'title').$this->display_status($event['participants'][$part]);
-					for($m=$startminute;$m<$endminute;$m++)
-					{
-						$index = ($hour + (($m * $increment) * 100));
-						$time_slice[$index]['marker'] = '-';
-						$time_slice[$index]['description'] = $time_description;
-						$time_slice[$index]['id'] = $event['id'];
-					}
-				}
-			}
-			return $time_slice;
-		}
-
-		/*!
-		@function set_status
-		@abstract set the participant response $status for event $cal_id and notifies the owner of the event
-		*/
-		function set_status($cal_id,$status)
-		{
-			$status2msg = array(
-				REJECTED  => MSG_REJECTED,
-				TENTATIVE => MSG_TENTATIVE,
-				ACCEPTED  => MSG_ACCEPTED
-			);
-			if (!isset($status2msg[$status]))
-			{
-				return False;
-			}
-			$this->so->set_status($cal_id,$status);
-			$event = $this->so->read_entry($cal_id);
-			$this->send_update($status2msg[$status],$event['participants'],$event);
-
-			return True;
-		}
-
-		/*!
-		@function update_requested
-		@abstract checks if $userid has requested (in $part_prefs) updates for $msg_type
-		@syntax update_requested($userid,$part_prefs,$msg_type,$old_event,$new_event)
-		@param $userid numerical user-id
-		@param $part_prefs preferces of the user $userid
-		@param $msg_type type of the notification: MSG_ADDED, MSG_MODIFIED, MSG_ACCEPTED, ...
-		@param $old_event Event before the change
-		@param $new_event Event after the change
-		@returns 0 = no update requested, > 0 update requested
-		*/
-		function update_requested($userid,$part_prefs,$msg_type,$old_event,$new_event)
-		{
-			if ($msg_type == MSG_ALARM)
-			{
-				return True;	// always True for now
-			}
-			$want_update = 0;
-
-			// the following switch fall-through all cases, as each included the following too
-			//
-			$msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE;
-
-			switch($ru = $part_prefs['calendar']['receive_updates'])
-			{
-				case 'responses':
-					if ($msg_is_response)
-					{
-						++$want_update;
-					}
-				case 'modifications':
-					if ($msg_type == MSG_MODIFIED)
-					{
-						++$want_update;
-					}
-				case 'time_change_4h':
-				case 'time_change':
-					$diff = max(abs($this->maketime($old_event['start'])-$this->maketime($new_event['start'])),
-						abs($this->maketime($old_event['end'])-$this->maketime($new_event['end'])));
-					$check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
-					if ($msg_type == MSG_MODIFIED && $diff > $check)
-					{
-						++$want_update;
-					}
-				case 'add_cancel':
-					if ($old_event['owner'] == $userid && $msg_is_response ||
-						$msg_type == MSG_DELETED || $msg_type == MSG_ADDED)
-					{
-						++$want_update;
-					}
-					break;
-				case 'no':
-					break;
-			}
-			//echo "<p>bocalendar::update_requested(user=$userid,pref=".$part_prefs['calendar']['receive_updates'] .",msg_type=$msg_type,".($old_event?$old_event['title']:'False').",".($old_event?$old_event['title']:'False').") = $want_update</p>\n";
-			return $want_update > 0;
-		}
-
-		/*!
-		@function send_update
-		@abstract sends update-messages to certain participants of an event
-		@syntax send_update($msg_type,$to_notify,$old_event,$new_event=False)
-		@param $msg_type type of the notification: MSG_ADDED, MSG_MODIFIED, MSG_ACCEPTED, ...
-		@param $to_notify array with numerical user-ids as keys (!) (value is not used)
-		@param $old_event Event before the change
-		@param $new_event Event after the change
-		*/
-		function send_update($msg_type,$to_notify,$old_event,$new_event=False,$user=False)
-		{
-			print_debug('bocalendar::send_update()');
-			print_debug('type',$msg_type);
-			print_debug('to_notify',$to_notify);
-			print_debug('old_event',$old_event);
-			print_debug('new_event',$new_event);
-			print_debug('user',$user);
-
-			if (!is_array($to_notify))
-			{
-				$to_notify = array();
-			}
-			$owner = $old_event ? $old_event['owner'] : $new_event['owner'];
-			if ($owner && !isset($to_notify[$owner]) && $msg_type != MSG_ALARM)
-			{
-				$to_notify[$owner] = 'owner';	// always include the event-owner
-			}
-			$version = $GLOBALS['phpgw_info']['apps']['calendar']['version'];
-
-			$sender = $GLOBALS['phpgw_info']['user']['email'];
-
-			$temp_tz_offset = $this->prefs['common']['tz_offset'];
-			$temp_timeformat = $this->prefs['common']['timeformat'];
-			$temp_dateformat = $this->prefs['common']['dateformat'];
-
-			$tz_offset = ((60 * 60) * (int)$temp_tz_offset);
-
-			if($old_event != False)
-			{
-				$t_old_start_time = $this->maketime($old_event['start']);
-				if($t_old_start_time < (time() - 86400))
-				{
-					return False;
-				}
-			}
-
-			$temp_user = $GLOBALS['phpgw_info']['user'];
-
-			if (!$user)
-			{
-				$user = $this->owner;
-			}
-			if ($GLOBALS['phpgw']->preferences->account_id != $user)
-			{
-				$GLOBALS['phpgw']->preferences->preferences($user);
-				$GLOBALS['phpgw_info']['user']['preferences'] = $GLOBALS['phpgw']->preferences->read_repository();
-			}
-
-			$event = $msg_type == MSG_ADDED || $msg_type == MSG_MODIFIED ? $new_event : $old_event;
-			if($old_event != False)
-			{
-				$old_starttime = $t_old_start_time - $GLOBALS['phpgw']->datetime->tz_offset;
-			}
-			$starttime = $this->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$endtime   = $this->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
-
-			switch($msg_type)
-			{
-				case MSG_DELETED:
-					$action = lang('Canceled');
-					$msg = 'Canceled';
-					$msgtype = '"calendar";';
-					$method = 'cancel';
-					break;
-				case MSG_MODIFIED:
-					$action = lang('Modified');
-					$msg = 'Modified';
-					$msgtype = '"calendar"; Version="'.$version.'"; Id="'.$new_event['id'].'"';
-					$method = 'request';
-					break;
-				case MSG_ADDED:
-					$action = lang('Added');
-					$msg = 'Added';
-					$msgtype = '"calendar"; Version="'.$version.'"; Id="'.$new_event['id'].'"';
-					$method = 'request';
-					break;
-				case MSG_REJECTED:
-					$action = lang('Rejected');
-					$msg = 'Response';
-					$msgtype = '"calendar";';
-					$method = 'reply';
-					break;
-				case MSG_TENTATIVE:
-					$action = lang('Tentative');
-					$msg = 'Response';
-					$msgtype = '"calendar";';
-					$method = 'reply';
-					break;
-				case MSG_ACCEPTED:
-					$action = lang('Accepted');
-					$msg = 'Response';
-					$msgtype = '"calendar";';
-					$method = 'reply';
-					break;
-				case MSG_ALARM:
-					$action = lang('Alarm');
-					$msg = 'Alarm';
-					$msgtype = '"calendar";';
-					$method = 'publish';	// duno if thats right
-					break;
-				default:
-					$method = 'publish';
-			}
-			$notify_msg = $this->prefs['calendar']['notify'.$msg];
-			if (empty($notify_msg))
-			{
-				$notify_msg = $this->prefs['calendar']['notifyAdded'];	// use a default
-			}
-			$details = array(			// event-details for the notify-msg
-				'id'          => $msg_type == MSG_ADDED ? $new_event['id'] : $old_event['id'],
-				'action'      => $action,
-			);
-			$event_arr = $this->event2array($event);
-			foreach($event_arr as $key => $val)
-			{
-				$details[$key] = $val['data'];
-			}
-			$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
-
-			$details['link'] = $GLOBALS['phpgw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.uicalendar.view&cal_id='.$event['id'];
-			// if url is only a path, try guessing the rest ;-)
-			if ($GLOBALS['phpgw_info']['server']['webserver_url'][0] == '/')
-			{
-				$details['link'] = ($GLOBALS['phpgw_info']['server']['enforce_ssl'] || $_SERVER['HTTPS'] ? 'https://' : 'http://').
-					($GLOBALS['phpgw_info']['server']['hostname'] ? $GLOBALS['phpgw_info']['server']['hostname'] : 'localhost').
-					$details['link'];
-			}
-
-			if(!is_object($GLOBALS['phpgw']->send))
-			{
-				$GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
-			}
-			$send = &$GLOBALS['phpgw']->send;
-
-			foreach($to_notify as $userid => $statusid)
-			{
-				$userid = (int)$userid;
-
-				if ($statusid == 'R' || $GLOBALS['phpgw']->accounts->get_type($userid) == 'g')
-				{
-					continue;	// dont notify rejected participants or groups
-				}
-				if($userid != $GLOBALS['phpgw_info']['user']['account_id'] ||  $msg_type == MSG_ALARM)
-				{
-					print_debug('Msg Type',$msg_type);
-					print_debug('UserID',$userid);
-
-					$preferences = CreateObject('phpgwapi.preferences',$userid);
-					$part_prefs = $preferences->read_repository();
-
-					if (!$this->update_requested($userid,$part_prefs,$msg_type,$old_event,$new_event))
-					{
-						continue;
-					}
-					$GLOBALS['phpgw']->accounts->get_account_name($userid,$lid,$details['to-firstname'],$details['to-lastname']);
-					$details['to-fullname'] = $GLOBALS['phpgw']->common->display_fullname('',$details['to-firstname'],$details['to-lastname']);
-
-					$to = $GLOBALS['phpgw']->accounts->id2name($userid,'account_email');
-
-					$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'] = $part_prefs['common']['tz_offset'];
-					$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] = $part_prefs['common']['timeformat'];
-					$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] = $part_prefs['common']['dateformat'];
-
-					$GLOBALS['phpgw']->datetime->tz_offset = ((60 * 60) * (int)$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']);
-
-					if($old_starttime)
-					{
-						$details['olddate'] = $GLOBALS['phpgw']->common->show_date($old_starttime);
-					}
-					$details['startdate'] = $GLOBALS['phpgw']->common->show_date($starttime);
-					$details['enddate']   = $GLOBALS['phpgw']->common->show_date($endtime);
-
-					list($subject,$body) = split("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);
-					$subject = $send->encode_subject($subject);
-
-					switch($part_prefs['calendar']['update_format'])
- 					{
-						case  'extended':
-							$body .= "\n\n".lang('Event Details follow').":\n";
-							foreach($event_arr as $key => $val)
-							{
-								if ($key != 'access' && $key != 'priority' && strlen($details[$key]))
-								{
-									$body .= sprintf("%-20s %s\n",$val['field'].':',$details[$key]);
-								}
-							}
-							$send->ClearAddresses();
-							$send->ClearAttachments();
-							$send->IsHTML(False);
-							$send->AddAddress($to);
-							$send->Body = $body;
-							$send->From = $sender;
-							$send->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
-							$send->Subject = $subject;
-							$returncode = $send->Send();
-							break;
-
-						case  'ical':
-							$ics = ExecMethod('calendar.boicalendar.export',array(
-								'l_event_id'  => $event['id'],
-								'method'      => $method,
-								'chunk_split' => False
-							));
-							$send->ClearAddresses();
-							$send->ClearAttachments();
-							$send->IsHTML(False);
-							$send->AddAddress($to);
-							$send->Body = $body;
-						        if ($method == "request") {
-                                                            $send->AddStringAttachment($ics, "cal.ics", "8bit", "text/calendar; method=$method");
-                                                        }
-							$send->From = $sender;
-							$send->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
-							$send->Subject = $subject;
-							$returncode = $send->Send();
-							break;
-					}
-					print_debug('update_format',$part_prefs['calendar']['update_format']);
-					print_debug('to',$to);
-					print_debug('sender',$sender);
-					print_debug('subject',$subject);
-					print_debug('returncode',$returncode);
-					print_debug('body',$body);
-				}
-			}
-			unset($send);
-
-			if((is_int($this->user) && $this->user != $temp_user['account_id']) ||
-				(is_string($this->user) && $this->user != $temp_user['account_lid']))
-			{
-				$GLOBALS['phpgw_info']['user'] = $temp_user;
-			}
-
-			$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'] = $temp_tz_offset;
-			$GLOBALS['phpgw']->datetime->tz_offset = ((60 * 60) * $temp_tz_offset);
-			$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] = $temp_timeformat;
-			$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] = $temp_dateformat;
-
-			return $returncode;
-		}
-
-		function send_alarm($alarm)
-		{
-			//echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n";
-			$GLOBALS['phpgw_info']['user']['account_id'] = $this->owner = $alarm['owner'];
-
-			if (!$alarm['enabled'] || !$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->so->read_entry($alarm['cal_id'])))
-			{
-				return False;	// event not found
-			}
-			if ($alarm['all'])
-			{
-				$to_notify = $event['participants'];
-			}
-			elseif ($this->check_perms(PHPGW_ACL_READ,$event))	// checks agains $this->owner set to $alarm[owner]
-			{
-				$to_notify[$alarm['owner']] = 'A';
-			}
-			else
-			{
-				return False;	// no rights
-			}
-			return $this->send_update(MSG_ALARM,$to_notify,$event,False,$alarm['owner']);
-		}
-
-		function get_alarms($event_id)
-		{
-			return $this->so->get_alarm($event_id);
-		}
-
-		function alarm_today($event,$today,$starttime)
-		{
-			$found = False;
-			@reset($event['alarm']);
-			$starttime_hi = $GLOBALS['phpgw']->common->show_date($starttime,'Hi');
-			$t_appt['month'] =$GLOBALS['phpgw']->common->show_date($today,'m');
-			$t_appt['mday'] = $GLOBALS['phpgw']->common->show_date($today,'d');
-			$t_appt['year'] = $GLOBALS['phpgw']->common->show_date($today,'Y');
-			$t_appt['hour'] = $GLOBALS['phpgw']->common->show_date($starttime,'H');
-			$t_appt['min']  = $GLOBALS['phpgw']->common->show_date($starttime,'i');
-			$t_appt['sec']  = 0;
-			$t_time = $this->maketime($t_appt) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$y_time = $t_time - 86400;
-			$tt_time = $t_time + 86399;
-			print_debug('T_TIME',$t_time.' : '.$GLOBALS['phpgw']->common->show_date($t_time));
-			print_debug('Y_TIME',$y_time.' : '.$GLOBALS['phpgw']->common->show_date($y_time));
-			print_debug('TT_TIME',$tt_time.' : '.$GLOBALS['phpgw']->common->show_date($tt_time));
-			while(list($key,$alarm) = each($event['alarm']))
-			{
-				if($alarm['enabled'])
-				{
-					print_debug('TIME',$alarm['time'].' : '.$GLOBALS['phpgw']->common->show_date($alarm['time']).' ('.$event['id'].')');
-					if($event['recur_type'] != MCAL_RECUR_NONE)   /* Recurring Event */
-					{
-						print_debug('Recurring Event');
-						if($alarm['time'] > $y_time && $GLOBALS['phpgw']->common->show_date($alarm['time'],'Hi') < $starttime_hi && $alarm['time'] < $t_time)
-						{
-							$found = True;
-						}
-					}
-					elseif($alarm['time'] > $y_time && $alarm['time'] < $t_time)
-					{
-						$found = True;
-					}
-				}
-			}
-			print_debug('Found',$found);
-			return $found;
-		}
-
-		function prepare_recipients(&$new_event,$old_event)
-		{
-			// Find modified and deleted users.....
-			while(list($old_userid,$old_status) = each($old_event['participants']))
-			{
-				if(isset($new_event['participants'][$old_userid]))
-				{
-					print_debug('Modifying event for user',$old_userid);
-					$this->modified[(int)$old_userid] = $new_status;
-				}
-				else
-				{
-					print_debug('Deleting user from the event',$old_userid);
-					$this->deleted[(int)$old_userid] = $old_status;
-				}
-			}
-			// Find new users.....
-			while(list($new_userid,$new_status) = each($new_event['participants']))
-			{
-				if(!isset($old_event['participants'][$new_userid]))
-				{
-					print_debug('Adding event for user',$new_userid);
-					$this->added[$new_userid] = 'U';
-					$new_event['participants'][$new_userid] = 'U';
-				}
-			}
-
-			if(count($this->added) > 0 || count($this->modified) > 0 || count($this->deleted) > 0)
-			{
-				if(count($this->added) > 0)
-				{
-					$this->send_update(MSG_ADDED,$this->added,'',$new_event);
-				}
-				if(count($this->modified) > 0)
-				{
-					$this->send_update(MSG_MODIFIED,$this->modified,$old_event,$new_event);
-				}
-				if(count($this->deleted) > 0)
-				{
-					$this->send_update(MSG_DELETED,$this->deleted,$old_event);
-				}
-			}
-		}
-
-		function remove_doubles_in_cache($firstday,$lastday)
-		{
-			$already_moved = Array();
-			for($v=$firstday;$v<=$lastday;$v++)
-			{
-				if (!$this->cached_events[$v])
-				{
-					continue;
-				}
-				$cached = $this->cached_events[$v];
-				$this->cached_events[$v] = array();
-				while (list($g,$event) = each($cached))
-				{
-					$end = date('Ymd',$this->maketime($event['end']));
-					print_debug('EVENT',_debug_array($event,False));
-					print_debug('start',$start);
-					print_debug('v',$v);
-
-					if (!isset($already_moved[$event['id']]) || $event['recur_type'] && $v > $end)
-					{
-						$this->cached_events[$v][] = $event;
-						$already_moved[$event['id']] = 1;
-						print_debug('Event moved');
-					}
-				}
-			}
-		}
-
-		function get_dirty_entries($lastmod=-1)
-		{
-			$events = false;
-			$event_ids = $this->so->cal->list_dirty_events($lastmod);
-			if(is_array($event_ids))
-			{
-				foreach($event_ids as $key => $id)
-				{
-					$events[$id] = $this->so->cal->fetch_event($id);
-				}
-			}
-			unset($event_ids);
-
-			$rep_event_ids = $this->so->cal->list_dirty_events($lastmod,$true);
-			if(is_array($rep_event_ids))
-			{
-				foreach($rep_event_ids as $key => $id)
-				{
-					$events[$id] = $this->so->cal->fetch_event($id);
-				}
-			}
-			unset($rep_event_ids);
-
-			return $events;
-		}
-
-		function _debug_array($data)
-		{
-			echo '<br>UI:';
-			_debug_array($data);
-		}
-
-		/*!
-		@function rejected_no_show
-		@abstract checks if event is rejected from user and he's not the owner and dont want rejected
-		@param $event to check
-		@returns True if event should not be shown
-		*/
-		function rejected_no_show($event)
-		{
-			$ret = !$this->prefs['calendar']['show_rejected'] &&
-				$event['owner'] != $this->owner &&
-				$event['participants'][$this->owner] == 'R';
-			//echo "<p>rejected_no_show($event[title])='$ret': user=$this->owner, event-owner=$event[owner], status='".$event['participants'][$this->owner]."', show_rejected='".$this->prefs['calendar']['show_rejected']."'</p>\n";
-			return $ret;
-		}
-
-		/* This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4 */
-		function list_cals_add($id,&$users,&$groups)
-		{
-			$name = $GLOBALS['phpgw']->common->grab_owner_name($id);
-			if (($type = $GLOBALS['phpgw']->accounts->get_type($id)) == 'g')
-			{
-				$arr = &$groups;
-			}
-			else
-			{
-				$arr = &$users;
-			}
-			$arr[$name] = Array(
-				'grantor' => $id,
-				'value'   => ($type == 'g' ? 'g_' : '') . $id,
-				'name'    => $name
-			);
-		}
-
-		/*!
-		@function list_cals
-		@abstract generate list of user- / group-calendars for the selectbox in the header
-		@returns alphabeticaly sorted array with groups first and then users
-		*/
-		function list_cals()
-		{
-			$users = $groups = array();
-			foreach($this->grants as $id => $rights)
-			{
-				$this->list_cals_add($id,$users,$groups);
-			}
-			if ($memberships = $GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']))
-			{
-				foreach($memberships as $group_info)
-				{
-					$this->list_cals_add($group_info['account_id'],$users,$groups);
-
-					if ($account_perms = $GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar'))
-					{
-						foreach($account_perms as $id)
-						{
-							$this->list_cals_add($id,$users,$groups);
-						}
-					}
-				}
-			}
-			uksort($users,'strnatcasecmp');
-			uksort($groups,'strnatcasecmp');
-
-			return $users + $groups;	// users first and then groups, both alphabeticaly
-		}
-
-		/*!
-		@function event2array
-		@abstract create array with name, translated name and readable content of each attributes of an event
-		@syntax event2array($event,$sep='<br>')
-		@param $event event to use
-		@returns array of attributes with fieldname as key and array with the 'field'=translated name \
-			'data' = readable content (for participants this is an array !)
-		*/
-		function event2array($event)
-		{
-			$ownerApps = $GLOBALS['phpgw']->acl->get_user_applications($event['owner']);
-
-			$var['title'] = Array(
-				'field'		=> lang('Title'),
-				'data'		=> $event['title']
-			);
-
-			// Some browser add a \n when its entered in the database. Not a big deal
-			// this will be printed even though its not needed.
-			$var['description'] = Array(
-				'field'	=> lang('Description'),
-				'data'	=> $event['description']
-			);
-
-			$cats = Array();
-			$this->cat->categories($this->bo->owner,'calendar');
-			if(strpos($event['category'],','))
-			{
-				$cats = explode(',',$event['category']);
-			}
-			else
-			{
-				$cats[] = $event['category'];
-			}
-			foreach($cats as $cat_id)
-			{
-				list($cat) = $this->cat->return_single($cat_id);
-				$cat_string[] = stripslashes($cat['name']);
-			}
-			$var['category'] = Array(
-				'field'	=> lang('Category'),
-				'data'	=> implode(', ',$cat_string)
-			);
-
-			$var['location'] = Array(
-				'field'	=> lang('Location'),
-				'data'	=> $event['location']
-			);
-
-			$var['startdate'] = Array(
-				'field'	=> lang('Start Date/Time'),
-				'data'	=> $GLOBALS['phpgw']->common->show_date($this->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset),
-			);
-
-			$var['enddate'] = Array(
-				'field'	=> lang('End Date/Time'),
-				'data'	=> $GLOBALS['phpgw']->common->show_date($this->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset)
-			);
-
-			$pri = Array(
-				1	=> lang('Low'),
-				2	=> lang('Normal'),
-				3	=> lang('High')
-			);
-			$var['priority'] = Array(
-				'field'	=> lang('Priority'),
-				'data'	=> $pri[$event['priority']]
-			);
-
-			$var['owner'] = Array(
-				'field'	=> lang('Created By'),
-				'data'	=> $GLOBALS['phpgw']->common->grab_owner_name($event['owner'])
-			);
-
-			$var['updated'] = Array(
-				'field'	=> lang('Updated'),
-				'data'	=> $GLOBALS['phpgw']->common->show_date($this->maketime($event['modtime']))
-			);
-
-			$var['access'] = Array(
-				'field'	=> lang('Access'),
-				'data'	=> $event['public'] ? lang('Public') : lang('Private')
-			);
-
-			if($ownerApps['projects'] && $event['projectID'])
-			{
-				$boprojects = createObject('projects.boprojects');
-				$projectData = $boprojects->read_single_project($event['projectID']);
-				$var['project'] = Array
-				(
-					'field' => lang('Project'),
-					'data'  => $projectData['title'].'&nbsp;['.$projectData['number'].']'
-				);
-			}
-			if(@isset($event['groups'][0]))
-			{
-				$cal_grps = '';
-				for($i=0;$i<count($event['groups']);$i++)
-				{
-					if($GLOBALS['phpgw']->accounts->exists($event['groups'][$i]))
-					{
-						$cal_grps .= ($i>0?'<br>':'').$GLOBALS['phpgw']->accounts->id2name($event['groups'][$i]);
-					}
-				}
-
-				$var['groups'] = Array(
-					'field'	=> lang('Groups'),
-					'data'	=> $cal_grps
-				);
-			}
-
-			if (isset($event['participants']) && is_array($event['participants']))
-			{
-				$participants = array();
-				foreach($event['participants'] as $user => $short_status)
-				{
-					if($GLOBALS['phpgw']->accounts->exists($user))
-					{
-						$participants[$user] = $GLOBALS['phpgw']->common->grab_owner_name($user).' ('.$this->get_long_status($short_status).')';
-					}
-				}
-			}
-			$var['participants'] = Array(
-				'field'	=> lang('Participants'),
-				'data'	=> $participants
-			);
-
-			// Repeated Events
-			if($event['recur_type'] != MCAL_RECUR_NONE)
-			{
-				$str = lang($this->rpt_type[$event['recur_type']]);
-
-				$str_extra = array();
-				if ($event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['year'] != 0)
-				{
-					$recur_end = $this->maketime($event['recur_enddate']);
-					if($recur_end != 0)
-					{
-						$recur_end -= $GLOBALS['phpgw']->datetime->tz_offset;
-						$str_extra[] = lang('ends').': '.lang($GLOBALS['phpgw']->common->show_date($recur_end,'l')).', '.$this->long_date($recur_end).' ';
-					}
-				}
-				// only weekly uses the recur-data (days) !!!
-				if($event['recur_type'] == MCAL_RECUR_WEEKLY)
-				{
-					$repeat_days = array();
-					foreach ($this->rpt_day as $mcal_mask => $dayname)
-					{
-						if ($event['recur_data'] & $mcal_mask)
-						{
-							$repeat_days[] = lang($dayname);
-						}
-					}
-					if(count($repeat_days))
-					{
-						$str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
-					}
-				}
-				if($event['recur_interval'] != 0)
-				{
-					$str_extra[] = lang('Interval').': '.$event['recur_interval'];
-				}
-
-				if(count($str_extra))
-				{
-					$str .= ' ('.implode(', ',$str_extra).')';
-				}
-
-				$var['recur_type'] = Array(
-					'field'	=> lang('Repetition'),
-					'data'	=> $str,
-				);
-			}
-
-			if (!isset($this->fields))
-			{
-				$this->custom_fields = CreateObject('calendar.bocustom_fields');
-				$this->fields = &$this->custom_fields->fields;
-				$this->stock_fields = &$this->custom_fields->stock_fields;
-			}
-// projects
-			if($ownerApps['projects'])
-				$this->fields['project']['disabled'] = false;
-				
-			foreach($this->fields as $field => $data)
-			{
-				if (!$data['disabled'])
-				{
-					if (isset($var[$field]))
-					{
-						$sorted[$field] = $var[$field];
-					}
-					elseif (!isset($this->stock_fields[$field]) && strlen($event[$field]))	// Custom field
-					{
-						$lang = lang($name = substr($field,1));
-						$sorted[$field] = array(
-							'field' => $lang == $name.'*' ? $name : $lang,
-							'data'  => $event[$field]
-						);
-					}
-				}
-				unset($var[$field]);
-			}
-			foreach($var as $name => $v)
-			{
-				$sorted[$name] = $v;
-
-			}
-			return $sorted;
-		}
-
-		/*!
-		@function check_set_default_prefs
-		@abstract sets the default prefs, if they are not already set (on a per pref. basis)
-		@note It sets a flag in the app-session-data to be called only once per session
-		*/
-		function check_set_default_prefs()
-		{
-			if (($set = $GLOBALS['phpgw']->session->appsession('default_prefs_set','calendar')))
-			{
-				return;
-			}
-			$GLOBALS['phpgw']->session->appsession('default_prefs_set','calendar','set');
-
-			$default_prefs = $GLOBALS['phpgw']->preferences->default['calendar'];
-
-			$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
-			$defaults = array(
-				'defaultcalendar' => 'week',
-				'mainscreen_showevents' => '0',
-				'summary'         => 'no',
-				'receive_updates' => 'no',
-				'update_format'   => 'extended',
-				'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
-				'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
-				'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
-				'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
-				'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
-				'show_rejected'   => '0',
-				'display_status'  => '1',
-				'weekdaystarts'   => 'Monday',
-				'workdaystarts'   => '9',
-				'workdayends'     => '17',
-				'interval'        => '30',
-				'defaultlength'   => '60',
-				'planner_start_with_group' => $GLOBALS['phpgw']->accounts->name2id('Default'),
-				'planner_intervals_per_day'=> '4',
-				'defaultfilter'   => 'all',
-				'default_private' => '0',
-				'display_minicals'=> '1',
-				'print_black_white'=>'0'
-			);
-			foreach($defaults as $var => $default)
-			{
-				if (!isset($default_prefs[$var]) || $default_prefs[$var] == '')
-				{
-					$GLOBALS['phpgw']->preferences->add('calendar',$var,$default,'default');
-					$need_save = True;
-				}
-			}
-			if ($need_save)
-			{
-				$prefs = $GLOBALS['phpgw']->preferences->save_repository(False,'default');
-				$this->prefs['calendar'] = $prefs['calendar'];
-			}
-			if ($this->prefs['calendar']['send_updates'] && !isset($this->prefs['calendar']['receive_updates']))
-			{
-				$this->prefs['calendar']['receive_updates'] = $this->prefs['calendar']['send_updates'];
-				$GLOBALS['phpgw']->preferences->add('calendar','receive_updates',$this->prefs['calendar']['send_updates']);
-				$GLOBALS['phpgw']->preferences->delete('calendar','send_updates');
-				$prefs = $GLOBALS['phpgw']->preferences->save_repository();
-			}
-		}
-
-		// return array with all infolog categories (for xmlrpc)
-		function categories($complete = False)
-		{
-			return $GLOBALS['server']->categories($complete);
-		}
-	}
-?>
diff --git a/calendar/inc/class.bocalupdate.inc.php b/calendar/inc/class.bocalupdate.inc.php
index a50f7b86d6..62a72a5af0 100644
--- a/calendar/inc/class.bocalupdate.inc.php
+++ b/calendar/inc/class.bocalupdate.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**************************************************************************\
-* eGroupWare - Calendar's "new" BO-layer (buisness-object) access + update *
+* eGroupWare - Calendar's buisness-object: access + update                 *
 * http://www.egroupware.org                                                *
 * Written and (c) 2005 by Ralf Becker <RalfBecker@outdoor-training.de>     *
 * --------------------------------------------                             *
@@ -14,31 +14,47 @@
 
 require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocal.inc.php');
 
+// types of messsages send by bocalupdate::send_update
+define('MSG_DELETED',0);
+define('MSG_MODIFIED',1);
+define('MSG_ADDED',2);
+define('MSG_REJECTED',3);
+define('MSG_TENTATIVE',4);
+define('MSG_ACCEPTED',5);
+define('MSG_ALARM',6);
+define('MSG_DISINVITE',7);
+
 /**
- * Class to access AND manipulate all calendar data
- *
- * Note: All new code should only access this class or bocal and NOT bocalendar!!!
+ * Class to access AND manipulate all calendar data (business object)
  *
  * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
  *  UI only operates in user-time, so there have to be no conversation at all !!!
  *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
- *  SO operates only in server-time (please note, this is not the case with the socalendar*-classes used atm.)
+ *  SO operates only on server-time
  *
  * As this BO class deals with dates/times of several types and timezone, each variable should have a postfix
  * appended, telling with type it is: _s = seconds, _su = secs in user-time, _ss = secs in server-time, _h = hours
  *
  * All new BO code (should be true for eGW in general) NEVER use any $_REQUEST ($_POST or $_GET) vars itself.
- * Nor does it store the state of any UI-elements (eg. cat-id selectbox). All this is the task of the UI class !!!
+ * Nor does it store the state of any UI-elements (eg. cat-id selectbox). All this is the task of the UI class(es) !!!
  *
- * All permanent debug messages of the calendar-code should done via the debug-message method of the class !!!
+ * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
  *
  * @package calendar
- * @author RalfBecker@outdoor-training.de
- * @license GPL
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005 by RalfBecker-At-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
 class bocalupdate extends bocal
 {
+	var $debug=false;
+	
+	/**
+	 * @var string/boolean $log_file filename to enable the login or false for no update-logging
+	 */
+	var $log_file = false;
+
 	/**
 	 * Constructor
 	 */
@@ -47,6 +63,12 @@ class bocalupdate extends bocal
 		if ($this->debug > 0) $this->debug_message('bocalupdate::bocalupdate() started',True);
 
 		$this->bocal();	// calling the parent constructor
+		
+		if (!is_object($GLOBALS['egw']->link))
+		{
+			$GLOBALS['egw']->link =& CreateObject('phpgwapi.bolink');
+		}
+		$this->link =& $GLOBALS['egw']->link;
 
 		if ($this->debug > 0) $this->debug_message('bocalupdate::bocalupdate() finished',True);
 	}
@@ -57,10 +79,17 @@ class bocalupdate extends bocal
 	 * @param array &$event event-array, on return some values might be changed due to set defaults
 	 * @param boolean $ignore_conflicts=false just ignore conflicts or do a conflict check and return the conflicting events
 	 * @param boolean $touch_modified=true touch modificatin time and set modifing user, default true=yes
+	 * @param boolean $ignore_acl=flase should we ignore the acl
 	 * @return mixed on success: int $cal_id > 0, on error false or array with conflicting events (only if $check_conflicts)
+	 * 		Please note: the events are not garantied to be readable by the user (no read grant or private)!
 	 */
-	function update(&$event,$ignore_conflicts=false,$touch_modified=true)
+	function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false)
 	{
+		if ($this->debug > 1 || $this->debug == 'update')
+		{
+			$this->debug_message('bocalupdate::update(%1,ignore_conflict=%2,touch_modified=%3,ignore_acl=%4)',
+				false,$event,$ignore_conflicts,$touch_modified,$ignore_acl);
+		}
 		// check some minimum requirements:
 		// - new events need start, end and title
 		// - updated events cant set start, end or title to empty
@@ -84,8 +113,14 @@ class bocalupdate extends bocal
 				$event['participants'][$this->user] = 'A';
 			}
 		}
+		// check if user has the permission to update / create the event
+		if (!$ignore_acl && ($event['id'] && !$this->check_perms(EGW_ACL_EDIT,$event['id']) ||
+			!$event['id'] && !$this->check_perms(EGW_ACL_EDIT,0,$event['owner'])))
+		{
+			return false;
+		}
 		// check for conflicts only happens !$ignore_conflicts AND if start + end date are given
-		if (!$ignore_conflicts && $event['non_blocking'] && isset($event['start']) && isset($event['end']))
+		if (!$ignore_conflicts && !$event['non_blocking'] && isset($event['start']) && isset($event['end']))
 		{
 			$types_with_quantity = array();
 			foreach($this->resources as $type => $data)
@@ -108,12 +143,24 @@ class bocalupdate extends bocal
 				'start' => $event['start'],
 				'end'   => $event['end'],
 				'users' => $users,
-				'query' => array('cal_non_blocking != 1'),	// ignore non-blocking events
+				'ignore_acl' => true,	// otherwise we get only events readable by the user
 			));
+			if ($this->debug > 2 || $this->debug == 'update')
+			{
+				$this->debug_message('bocalupdate::update() checking for potential overlapping events for users %1 from %2 to %3',false,$users,$event['start'],$event['end']);
+			}
 			$max_quantity = $possible_quantity_conflicts = $conflicts = array();
 			foreach((array) $overlapping_events as $k => $overlap)
 			{
-				echo "checking overlaping event"; _debug_array($overlap);
+				if ($overlap['id'] == $event['id'] ||	// that's the event itself
+					$overlap['non_blocking'])			// that's a non_blocking event
+				{
+					continue;
+				}
+				if ($this->debug > 3 || $this->debug == 'update')
+				{
+					$this->debug_message('bocalupdate::update() checking overlapping event %1',false,$overlap);
+				}
 				// check if the overlap is with a rejected participant or within the allowed quantity
 				$common_parts = array_intersect($users,array_keys($overlap['participants']));
 				foreach($common_parts as $n => $uid)
@@ -142,9 +189,13 @@ class bocalupdate extends bocal
 					}
 					// now we have a quantity conflict for $uid
 				}
-				if (!count($common_parts))
+				if (count($common_parts))
 				{
-					$conflicts[$overlap['id']-$this->bo->date2ts($overlap['start'])] =& $overlapping_events[$k];
+					if ($this->debug > 3 || $this->debug == 'update')
+					{
+						$this->debug_message('bocalupdate::update() conflicts with the following participants found %1',false,$common_parts);
+					}
+					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] =& $overlapping_events[$k];
 				}
 			}
 			// check if we are withing the allowed quantity and if not add all events using that resource
@@ -154,7 +205,7 @@ class bocalupdate extends bocal
 				{
 					foreach($possible_quantity_conflicts[$uid] as $conflict)
 					{
-						$conflicts[$conflict['id']-$this->bo->date2ts($conflict['start'])] =& $possible_quantity_conflicts[$k];
+						$conflicts[$conflict['id'].'-'.$this->bo->date2ts($conflict['start'])] =& $possible_quantity_conflicts[$k];
 					}
 				}
 			}
@@ -162,66 +213,781 @@ class bocalupdate extends bocal
 			
 			if (count($conflicts))
 			{
+				foreach($conflicts as $key => $conflict)
+				{
+					if (!$this->check_perms(EGW_ACL_READ,$conflict))
+					{
+						$conflicts[$key] = array(
+							'id'    => $conflict['id'],
+							'title' => lang('busy'),
+							'participants' => array_intersect_key($conflict['participants'],$event['participants']),
+							'start' => $conflict['start'],
+							'end'   => $conflict['end'],
+						);
+					}
+				}
+				if ($this->debug > 2 || $this->debug == 'update')
+				{
+					$this->debug_message('bocalupdate::update() %1 conflicts found %2',false,count($conflicts),$conflicts);
+				}
 				return $conflicts;
 			}						
 		}
 		// save the event to the database
 		if ($touch_modified)
 		{
-			$event['modified'] = time() + $this->tz_offset_s;	// we are still in user-time
+			$event['modified'] = $this->now_su;	// we are still in user-time
 			$event['modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		}
+		if (!($new_event = !(int)$event['id']))
+		{
+			$old_event = $this->read((int)$event['id'],null,$ignore_acl);
+			//echo "old $event[id]="; _debug_array($old_event);
+		}
+		//echo "saving $event[id]="; _debug_array($event);
+		$event2save = $event;
+
 		if (!($cal_id = $this->save($event)))
 		{
 			return $cal_id;
 		}
-		$event['id'] = $cal_id;
+		$event = $this->read($cal_id);	// we re-read the event, in case only partial information was update and we need the full info for the notifies
+		//echo "new $cal_id="; _debug_array($event);
+
+		if ($this->log_file)
+		{
+			$this->log2file($event2save,$event,$old_event);
+		}
+		// send notifications
+		if ($new_event)
+		{
+			$this->send_update(MSG_ADDED,$event['participants'],'',$event);
+		}
+		else // update existing event
+		{
+			$this->check4update($event,$old_event);
+		}
+		// notify the link-class about the update, as other apps may be subscribt to it
+		$this->link->notify_update('calendar',$cal_id,$event);
 
-		// TODO send update messages
-		
 		return $cal_id;
 	}
 
+	/**
+	 * Check for added, modified or deleted participants
+	 *
+	 * @param array $new_event the updated event
+	 * @param array $old_event the event before the update
+	 */ 
+	function check4update($new_event,$old_event)
+	{
+		$modified = $added = $deleted = array();
+		
+		//echo "<p>bocalupdate::check4update() new participants = ".print_r($new_event['participants'],true).", old participants =".print_r($old_event['participants'],true)."</p>\n";
+
+		// Find modified and deleted participants ...
+		foreach($old_event['participants'] as $old_userid => $old_status)
+		{
+			if(isset($new_event['participants'][$old_userid]))
+			{
+				$modified[$old_userid] = $new_event['participants'][$old_userid];
+			}
+			else
+			{
+				$deleted[$old_userid] = $old_status;
+			}
+		}
+		// Find new participatns ...
+		foreach($new_event['participants'] as $new_userid => $new_status)
+		{
+			if(!isset($old_event['participants'][$new_userid]))
+			{
+				$added[$new_userid] = 'U';
+			}
+		}
+		//echo "<p>bocalupdate::check4update() added=".print_r($added,true).", modified=".print_r($modified,true).", deleted=".print_r($deleted,true)."</p>\n";
+		if(count($added) || count($modified) || count($deleted))
+		{
+			if(count($added))
+			{
+				$this->send_update(MSG_ADDED,$added,$old_event,$new_event);
+			}
+			if(count($modified))
+			{
+				$this->send_update(MSG_MODIFIED,$modified,$old_event,$new_event);
+			}
+			if(count($deleted))
+			{
+				$this->send_update(MSG_DISINVITE,$deleted,$new_event);
+			}
+		}
+	}
+
+	/**
+	 * checks if $userid has requested (in $part_prefs) updates for $msg_type
+	 *
+	 * @param int $userid numerical user-id
+	 * @param array $part_prefs preferces of the user $userid
+	 * @param int $msg_type type of the notification: MSG_ADDED, MSG_MODIFIED, MSG_ACCEPTED, ...
+	 * @param array $old_event Event before the change
+	 * @param array $new_event Event after the change
+	 * @return boolean true = update requested, flase otherwise
+	 */
+	function update_requested($userid,$part_prefs,$msg_type,$old_event,$new_event)
+	{
+		if ($msg_type == MSG_ALARM)
+		{
+			return True;	// always True for now
+		}
+		$want_update = 0;
+
+		// the following switch falls through all cases, as each included the following too
+		//
+		$msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE;
+
+		switch($ru = $part_prefs['calendar']['receive_updates'])
+		{
+			case 'responses':
+				if ($msg_is_response)
+				{
+					++$want_update;
+				}
+			case 'modifications':
+				if ($msg_type == MSG_MODIFIED)
+				{
+					++$want_update;
+				}
+			case 'time_change_4h':
+			case 'time_change':
+				$diff = max(abs($this->date2ts($old_event['start'])-$this->date2ts($new_event['start'])),
+					abs($this->date2ts($old_event['end'])-$this->date2ts($new_event['end'])));
+				$check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
+				if ($msg_type == MSG_MODIFIED && $diff > $check)
+				{
+					++$want_update;
+				}
+			case 'add_cancel':
+				if ($old_event['owner'] == $userid && $msg_is_response ||
+					$msg_type == MSG_DELETED || $msg_type == MSG_ADDED || $msg_type == MSG_DISINVITE)
+				{
+					++$want_update;
+				}
+				break;
+			case 'no':
+				break;
+		}
+		//echo "<p>bocalupdate::update_requested(user=$userid,pref=".$part_prefs['calendar']['receive_updates'] .",msg_type=$msg_type,".($old_event?$old_event['title']:'False').",".($old_event?$old_event['title']:'False').") = $want_update</p>\n";
+		return $want_update > 0;
+	}
+
+	/**
+	 * sends update-messages to certain participants of an event
+	 *
+	 * @param int $msg_type type of the notification: MSG_ADDED, MSG_MODIFIED, MSG_ACCEPTED, ...
+	 * @param array $to_notify numerical user-ids as keys (!) (value is not used)
+	 * @param array $old_event Event before the change
+	 * @param array $new_event Event after the change
+	 */
+	function send_update($msg_type,$to_notify,$old_event,$new_event=False,$user=False)
+	{
+		if (!is_array($to_notify))
+		{
+			$to_notify = array();
+		}
+		$disinvited = $msg_type == MSG_DISINVITE ? array_keys($to_notify) : array();
+
+		$owner = $old_event ? $old_event['owner'] : $new_event['owner'];
+		if ($owner && !isset($to_notify[$owner]) && $msg_type != MSG_ALARM)
+		{
+			$to_notify[$owner] = 'owner';	// always include the event-owner
+		}
+		$version = $GLOBALS['egw_info']['apps']['calendar']['version'];
+
+		// ignore events in the past
+		if($old_event != False && $this->date2ts($old_event['start']) < $this->now_su)
+		{
+			return False;
+		}
+		$temp_user = $GLOBALS['egw_info']['user'];	// save user-date of the enviroment to restore it after
+
+		if (!$user)
+		{
+			$user = $temp_user['account_id'];
+		}
+		if ($GLOBALS['egw']->preferences->account_id != $user)
+		{
+			$GLOBALS['egw']->preferences->preferences($user);
+			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
+		}
+		$sender = $GLOBALS['egw_info']['user']['email'];
+		$sender_fullname = $GLOBALS['egw_info']['user']['fullname'];
+
+		$event = $msg_type == MSG_ADDED || $msg_type == MSG_MODIFIED ? $new_event : $old_event;
+
+		switch($msg_type)
+		{
+			case MSG_DELETED:
+				$action = lang('Canceled');
+				$msg = 'Canceled';
+				$msgtype = '"calendar";';
+				$method = 'cancel';
+				break;
+			case MSG_MODIFIED:
+				$action = lang('Modified');
+				$msg = 'Modified';
+				$msgtype = '"calendar"; Version="'.$version.'"; Id="'.$new_event['id'].'"';
+				$method = 'request';
+				break;
+			case MSG_DISINVITE:
+				$action = lang('Disinvited');
+				$msg = 'Disinvited';
+				$msgtype = '"calendar";';
+				$method = 'cancel';
+				break;
+			case MSG_ADDED:
+				$action = lang('Added');
+				$msg = 'Added';
+				$msgtype = '"calendar"; Version="'.$version.'"; Id="'.$new_event['id'].'"';
+				$method = 'request';
+				break;
+			case MSG_REJECTED:
+				$action = lang('Rejected');
+				$msg = 'Response';
+				$msgtype = '"calendar";';
+				$method = 'reply';
+				break;
+			case MSG_TENTATIVE:
+				$action = lang('Tentative');
+				$msg = 'Response';
+				$msgtype = '"calendar";';
+				$method = 'reply';
+				break;
+			case MSG_ACCEPTED:
+				$action = lang('Accepted');
+				$msg = 'Response';
+				$msgtype = '"calendar";';
+				$method = 'reply';
+				break;
+			case MSG_ALARM:
+				$action = lang('Alarm');
+				$msg = 'Alarm';
+				$msgtype = '"calendar";';
+				$method = 'publish';	// duno if thats right
+				break;
+			default:
+				$method = 'publish';
+		}
+		$notify_msg = $this->cal_prefs['notify'.$msg];
+		if (empty($notify_msg))
+		{
+			$notify_msg = $this->cal_prefs['notifyAdded'];	// use a default
+		}
+		$details = $this->_get_event_details($event,$action,$event_arr,$disinvited);
+
+		if(!is_object($GLOBALS['egw']->send))
+		{
+			$GLOBALS['egw']->send =& CreateObject('phpgwapi.send');
+		}
+		$send = &$GLOBALS['egw']->send;
+
+		foreach($to_notify as $userid => $statusid)
+		{
+			if (!is_numeric($userid)) continue;	// eg. a resource, ToDo notify the responsible of the resource
+
+			$userid = (int)$userid;
+
+			if ($statusid == 'R' || $GLOBALS['egw']->accounts->get_type($userid) == 'g')
+			{
+				continue;	// dont notify rejected participants or groups
+			}
+			if($userid != $GLOBALS['egw_info']['user']['account_id'] ||  $msg_type == MSG_ALARM)
+			{
+				$preferences =& CreateObject('phpgwapi.preferences',$userid);
+				$part_prefs = $preferences->read_repository();
+
+				if (!$this->update_requested($userid,$part_prefs,$msg_type,$old_event,$new_event))
+				{
+					continue;
+				}
+				$GLOBALS['egw']->accounts->get_account_name($userid,$lid,$details['to-firstname'],$details['to-lastname']);
+				$details['to-fullname'] = $GLOBALS['egw']->common->display_fullname('',$details['to-firstname'],$details['to-lastname']);
+
+				$to = $GLOBALS['egw']->accounts->id2name($userid,'account_email');
+				if (!$to || !strstr($to,'@'))
+				{
+					// ToDo: give an error-message
+					echo '<p>'.lang('Invalid email-address "%1" for user %2',$to,$GLOBALS['egw']->common->grab_owner_name($userid))."</p>\n";
+					continue;
+				}
+				$GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'] = $part_prefs['common']['tz_offset'];
+				$GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] = $part_prefs['common']['timeformat'];
+				$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] = $part_prefs['common']['dateformat'];
+					
+				$GLOBALS['egw']->datetime->tz_offset = 3600 * (int) $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
+
+				// event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account
+				$tz_diff = $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'] - $this->common_prefs['tz_offset'];
+				if($old_event != False) $details['olddate'] = $this->format_date($old_event['start']+$tz_diff);
+				$details['startdate'] = $this->format_date($event['start']+$tz_diff);
+				$details['enddate']   = $this->format_date($event['end']+$tz_diff);
+
+				list($subject,$body) = explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+
+				$send->ClearAddresses();
+				$send->ClearAttachments();
+				$send->IsHTML(False);
+				$send->AddAddress($to);
+				$send->AddCustomHeader('X-eGroupWare-type: calendarupdate');
+
+				switch($part_prefs['calendar']['update_format'])
+				{
+					case  'extended':
+						$body .= "\n\n".lang('Event Details follow').":\n";
+						foreach($event_arr as $key => $val)
+						{
+							if ($key != 'access' && $key != 'priority' && strlen($details[$key]))
+							{
+								$body .= sprintf("%-20s %s\n",$val['field'].':',$details[$key]);
+							}
+						}
+						break;
+
+					case  'ical':
+						$ics = ExecMethod('calendar.boicalendar.export',array(
+							'l_event_id'  => array($event),
+							'method'      => $method,
+							'chunk_split' => False
+						));
+						if ($method == "request") 
+						{
+							$send->AddStringAttachment($ics, "cal.ics", "8bit", "text/calendar; method=$method");
+						}
+						break;
+				}
+				$send->From = $sender;
+				$send->FromName = $sender_fullname;
+				$send->Subject = $send->encode_subject($subject);
+				$send->Body = $body;
+				if ($this->debug)
+				{
+					echo "<hr /><p>to: $to<br>from: $sender_fullname &lt;$sender&gt;<br>Subject: $subject<br>".nl2br($body)."</p><hr />\n";
+				}
+				$returncode = $send->Send();
+				
+				// ToDo: give error-messages for all all failed sendings
+			}
+		}
+		// restore the enviroment
+		$GLOBALS['egw_info']['user'] = $temp_user;
+		$GLOBALS['egw']->datetime->tz_offset = 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
+
+		return $returncode;
+	}
+
+	function get_update_message($event,$added)
+	{
+		$details = $this->_get_event_details($event,$added ? lang('Added') : lang('Modified'),$nul);
+
+		$notify_msg = $this->cal_prefs[$added || empty($this->cal_prefs['notifyModified']) ? 'notifyAdded' : 'notifyModified'];
+
+		return explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+	}
+
+	function send_alarm($alarm)
+	{
+		//echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n";
+		$GLOBALS['egw_info']['user']['account_id'] = $this->owner = $alarm['owner'];
+
+		if (!$alarm['enabled'] || !$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'])))
+		{
+			return False;	// event not found
+		}
+		if ($alarm['all'])
+		{
+			$to_notify = $event['participants'];
+		}
+		elseif ($this->check_perms(EGW_ACL_READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		{
+			$to_notify[$alarm['owner']] = 'A';
+		}
+		else
+		{
+			return False;	// no rights
+		}
+		return $this->send_update(MSG_ALARM,$to_notify,$event,False,$alarm['owner']);
+	}
+
 	/**
 	 * saves an event to the database, does NOT do any notifications, see bocalupdate::update for that
 	 *
 	 * This methode converts from user to server time and handles the insertion of users and dates of repeating events
 	 *
 	 * @param array $event
-	 * @return int/boolean $cal_id > 0 or false on error
+	 * @return int/boolean $cal_id > 0 or false on error (eg. permission denied)
 	 */
 	function save($event)
 	{
+		// check if user has the permission to update / create the event
+		if ($event['cal_id'] && !$this->check_perms(EGW_ACL_EDIT,$event['cal_id']) ||
+			!$event['cal_id'] && !$this->check_perms(EGW_ACL_EDIT,0,$event['owner']))
+		{
+			return false;
+		}
+		// invalidate the read-cache if it contains the event we store now
+		if ($event['id'] && $event['id'] == $this->cached_event['id']) $this->cached_event = array();
+
 		$save_event = $event;
-		// we run all dates through date2array, to adjust to server-time and get the new keys (day,minute,second,full,raw)
+		// we run all dates through date2ts, to adjust to server-time and the possible date-formats
 		foreach(array('start','end','modified','recur_enddate') as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
 			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
 		}
+		// same with the recur exceptions
+		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
+		{
+			foreach($event['recur_exception'] as $n => $date)
+			{
+				$event['recur_exception'][$n] = $this->date2ts($date,true);
+			}
+		}
+		// same with the alarms
+		if (isset($event['alarm']) && is_array($event['alarm']))
+		{
+			foreach($event['alarm'] as $id => $alarm)
+			{
+				$event['alarm'][$id]['time'] = $this->date2ts($alarm['time'],true);
+			}
+		}
 		if (($cal_id = $this->so->save($event,$set_recurrences)) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
 		{
 			$save_event['id'] = $cal_id;
 			$this->set_recurrences($save_event);
 		}
-		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,$event['cal_id'] ? 'modify' : 'add',time());
+		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,$event['id'] ? 'modify' : 'add',time());
 
 		return $cal_id;
 	}
 	
 	/**
-	 * deletes an event
+	 * set the status of one participant for a given recurrence or for all recurrences since now (includes recur_date=0)
 	 *
 	 * @param int $cal_id
-	 * @return boolean true on success, flase on error (usually permission denied)
+	 * @param char $user_type 'u' regular user
+	 * @param int $user_id
+	 * @param int/char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
+	 * @param int $recur_date=0 date to change, or 0 = all since now
+	 * @return int number of changed recurrences
 	 */
-	function delete($cal_id)
+	function set_status($cal_id,$user_type,$user_id,$status,$recur_date=0)
 	{
-		if (!$this->check_perms(EGW_ACL_DELETE,$cal_id)) return false;
+		//echo "<p>bocalupdate::set_status($cal_id,$user_type,$user_id,$status,$recur_date)</p>\n";
+		if (!$cal_id || $user_type == 'u' && !$this->check_perms(EGW_ACL_EDIT,0,$user_id))
+			// ToDo: check for bookingpermission of resources !!!
+		{
+			return false;
+		}
+		if (($Ok = $this->so->set_status($cal_id,$user_type,$user_id,$status,$recur_date ? $this->date2ts($recur_date,true) : 0)))
+		{
+			$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,'modify',time());
+
+			static $status2msg = array(
+				'R' => MSG_REJECTED,
+				'T' => MSG_TENTATIVE,
+				'A' => MSG_ACCEPTED,
+			);
+			if (isset($status2msg[$status]))
+			{
+				$event = $this->read($cal_id);
+				$this->send_update($status2msg[$status],$event['participants'],$event);
+			}
+		}
+		return Ok;
+	}
+
+	/**
+	 * deletes an event
+	 *
+	 * @param int $cal_id id of the event to delete
+	 * @param int $recur_date=0 if a single event from a series should be deleted, its date
+	 * @return boolean true on success, false on error (usually permission denied)
+	 */
+	function delete($cal_id,$recur_date=0)
+	{
+		$event = $this->read($cal_id,$recur_date);
 		
-		$this->so->delete($cal_id);
-		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,'delete',time());
+		if (!($event = $this->read($cal_id,$recur_date)) ||
+			!$this->check_perms(EGW_ACL_DELETE,$event))
+		{
+			return false;
+		}
+		$this->send_update(MSG_DELETED,$event['participants'],$event);
 		
+		if (!$recur_date || $event['recur_type'] == MCAL_RECUR_NONE)
+		{
+			$this->so->delete($cal_id);
+			$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,'delete',time());
+						
+			// delete all links to the event
+			$this->link->unlink(0,'calendar',$cal_id);
+		}
+		else
+		{
+			$event['recur_exception'][] = $recur_date = $this->date2ts($event['start']);
+			unset($event['start']);
+			unset($event['end']);
+			$this->save($event);	// updates the content-history
+		}
 		return true;
 	}
+
+	/**
+	 * helper for send_update and get_update_message
+	 * @internal
+	 */
+	function _get_event_details($event,$action,&$event_arr,$disinvited=array())
+	{
+		$details = array(			// event-details for the notify-msg
+			'id'          => $event['id'],
+			'action'      => $action,
+		);
+		$event_arr = $this->event2array($event);
+		foreach($event_arr as $key => $val)
+		{
+			$details[$key] = $val['data'];
+		}
+		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
+		$details['groups'] = $details['groups'] ? implode("\n",$details['groups']) : '';
+
+		$details['link'] = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.uiforms.view&cal_id='.$event['id'];
+		// if url is only a path, try guessing the rest ;-)
+		if ($GLOBALS['egw_info']['server']['webserver_url'][0] == '/')
+		{
+			$details['link'] = ($GLOBALS['egw_info']['server']['enforce_ssl'] || $_SERVER['HTTPS'] ? 'https://' : 'http://').
+				($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : 'localhost').
+				$details['link'];
+		}
+		$dis = array();
+		foreach($disinvited as $uid)
+		{
+			$dis[] = $this->participant_name($uid);
+		}
+		$details['disinvited'] = implode(', ',$dis);
+
+		return $details;
+	}
+
+	/**
+	 * create array with name, translated name and readable content of each attributes of an event
+	 *
+	 * old function, so far only used by send_update (therefor it's in bocalupdate and not bocal)
+	 *
+	 * @param array $event event to use
+	 * @returns array of attributes with fieldname as key and array with the 'field'=translated name 'data' = readable content (for participants this is an array !)
+	 */
+	function event2array($event)
+	{
+		$var['title'] = Array(
+			'field'		=> lang('Title'),
+			'data'		=> $event['title']
+		);
+
+		$var['description'] = Array(
+			'field'	=> lang('Description'),
+			'data'	=> $event['description']
+		);
+
+		if (!is_object($GLOBALS['egw']->categories))
+		{
+			$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories');
+		}
+		foreach(explode(',',$event['category']) as $cat_id)
+		{
+			list($cat) = $GLOBALS['egw']->categories->return_single($cat_id);
+			$cat_string[] = stripslashes($cat['name']);
+		}
+		$var['category'] = Array(
+			'field'	=> lang('Category'),
+			'data'	=> implode(', ',$cat_string)
+		);
+
+		$var['location'] = Array(
+			'field'	=> lang('Location'),
+			'data'	=> $event['location']
+		);
+
+		$var['startdate'] = Array(
+			'field'	=> lang('Start Date/Time'),
+			'data'	=> $this->format_date($event['start']),
+		);
+
+		$var['enddate'] = Array(
+			'field'	=> lang('End Date/Time'),
+			'data'	=> $this->format_date($event['end']),
+		);
+
+		$pri = Array(
+			0   => '',
+			1	=> lang('Low'),
+			2	=> lang('Normal'),
+			3	=> lang('High')
+		);
+		$var['priority'] = Array(
+			'field'	=> lang('Priority'),
+			'data'	=> $pri[$event['priority']]
+		);
+
+		$var['owner'] = Array(
+			'field'	=> lang('Owner'),
+			'data'	=> $GLOBALS['egw']->common->grab_owner_name($event['owner'])
+		);
+
+		$var['updated'] = Array(
+			'field'	=> lang('Updated'),
+			'data'	=> $this->format_date($event['modtime']).', '.$GLOBALS['egw']->common->grab_owner_name($event['modifier'])
+		);
+
+		$var['access'] = Array(
+			'field'	=> lang('Access'),
+			'data'	=> $event['public'] ? lang('Public') : lang('Private')
+		);
+
+		if(is_array($event['groups']))
+		{
+			$cal_grps = '';
+			foreach($event['groups'] as $group)
+			{
+				if(($name = $GLOBALS['egw']->accounts->id2name($group)))
+				{
+					$cal_grps[] = $name;
+				}
+			}
+
+			$var['groups'] = Array(
+				'field'	=> lang('Groups'),
+				'data'	=> $cal_grps,
+			);
+		}
+
+		if (isset($event['participants']) && is_array($event['participants']))
+		{
+			$participants = $this->participants($event,true);
+		}
+		$var['participants'] = Array(
+			'field'	=> lang('Participants'),
+			'data'	=> $participants
+		);
+
+		// Repeated Events
+		if($event['recur_type'] != MCAL_RECUR_NONE)
+		{
+			$str = lang($this->rpt_type[$event['recur_type']]);
+
+			$str_extra = array();
+			if ($event['recur_enddate'])
+			{
+				$str_extra[] = lang('ends').': '.lang($this->format_date($event['recur_enddate'],'l')).', '.$this->long_date($event['recur_enddate']).' ';
+			}
+			// only weekly uses the recur-data (days) !!!
+			if($event['recur_type'] == MCAL_RECUR_WEEKLY)
+			{
+				$repeat_days = array();
+				foreach ($this->recur_days as $mcal_mask => $dayname)
+				{
+					if ($event['recur_data'] & $mcal_mask)
+					{
+						$repeat_days[] = lang($dayname);
+					}
+				}
+				if(count($repeat_days))
+				{
+					$str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
+				}
+			}
+			if($event['recur_interval'])
+			{
+				$str_extra[] = lang('Interval').': '.$event['recur_interval'];
+			}
+
+			if(count($str_extra))
+			{
+				$str .= ' ('.implode(', ',$str_extra).')';
+			}
+
+			$var['recur_type'] = Array(
+				'field'	=> lang('Repetition'),
+				'data'	=> $str,
+			);
+		}
+		return $var;
+	}
+
+	/**
+	 * log all updates to a file
+	 *
+	 * @param array $event2save event-data before calling save
+	 * @param array $event_saved event-data read back from the DB
+	 * @param array $old_event=null event-data in the DB before calling save
+	 * @param string $type='update'
+	 */
+	function log2file($event2save,$event_saved,$old_event=null,$type='update')
+	{
+		if (!($f = fopen($this->log_file,'a')))
+		{
+			echo "<p>error opening '$this->log_file' !!!</p>\n";
+			return false;
+		}
+		fwrite($f,$type.': '.$GLOBALS['egw']->common->grab_owner_name($this->user).': '.date('r')."\n");
+		fwrite($f,"Time: time to save / saved time read back / old time before save\n");
+		foreach(array('start','end') as $name)
+		{
+			fwrite($f,$name.': '.(isset($event2save[$name]) ? $this->format_date($event2save[$name]) : 'not set').' / '.
+				$this->format_date($event_saved[$name]) .' / '.
+				(is_null($old_event) ? 'no old event' : $this->format_date($old_event[$name]))."\n");
+		}
+		foreach(array('event2save','event_saved','old_event') as $name)
+		{
+			fwrite($f,$name.' = '.print_r($$name,true));
+		}
+		fwrite($f,"\n");
+		fclose($f);
+
+		return true;
+	}
+
+	/**
+	 * saves a new or updated alarm
+	 *
+	 * @param int $cal_id Id of the calendar-entry
+	 * @param array $alarm array with fields: text, owner, enabled, ..
+	 * @return string id of the alarm, or false on error (eg. no perms)
+	 */
+	function save_alarm($cal_id,$alarm)
+	{
+		if (!$cal_id || !$this->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		{
+			//$this->debug='check_perms'; echo "<p>no rights to save the alarm=".print_r($alarm,true)." to event($cal_id)</p>";
+			return false;	// no rights to add the alarm
+		}
+		$alarm['time'] = $this->date2ts($alarm['time'],true);	// user to server-time
+
+		return $this->so->save_alarm($cal_id,$alarm);
+	}
+
+	/**
+	 * delete one alarms identified by its id
+	 *
+	 * @param string $id alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
+	 * @return int number of alarms deleted, false on error (eg. no perms)
+	 */
+	function delete_alarm($id)
+	{
+		list(,$cal_id) = explode(':',$id);
+
+		if (!($alarm = $this->so->read_alarm($id)) || !$cal_id || !$this->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		{
+			return false;	// no rights to delete the alarm
+		}
+		return $this->so->delete_alarm($id);
+	}
 }
diff --git a/calendar/inc/class.bocustom_fields.inc.php b/calendar/inc/class.bocustom_fields.inc.php
deleted file mode 100644
index cd0717dc48..0000000000
--- a/calendar/inc/class.bocustom_fields.inc.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar - Custom fields and sorting                        *
-  * http://www.egroupware.org                                                *
-  * Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	class bocustom_fields
-	{
-		var $stock_fields = array(
-			'title' => array(
-				'label' => 'Title',
-				'title' => True
-			),
-			'description' => 'Description',
-			'category'    => 'Category',
-			'location'    => 'Location',
-			'project'     => array(
-				'label'		=> 'Project',
-				'disabled'	=> true,
-			),
-			'startdate'   => 'Start Date/Time',
-			'enddate'     => 'End Date/Time',
-			'priority'    => 'Priority',
-			'access'      => 'Access',
-			'participants'=> 'Participants',
-			'owner'       => 'Created By',
-			'updated'     => 'Updated',
-			'alarm'       => 'Alarm',
-			'recur_type'  => 'Repetition'
-		);
-
-		function bocustom_fields()
-		{
-			$this->config = CreateObject('phpgwapi.config','calendar');
-			$this->config->read_repository();
-
-			$this->fields = &$this->config->config_data['fields'];
-
-			if (!is_array($this->fields)) {
-				$this->fields = array();
-			}
-
-			foreach ($this->fields as $field => $data)	// this can be removed after a while
-			{
-				if (!isset($this->stock_fields[$field]) && $field[0] != '#')
-				{
-					unset($this->fields[$field]);
-					$this->fields['#'.$field] = $data;
-				}
-			}
-
-			foreach($this->stock_fields as $field => $data)
-			{
-				if (!is_array($data))
-				{
-					$data = array('label' => $data);
-				}
-				if (!isset($this->fields[$field]))
-				{
-					$this->fields[$field] = array(
-						'name'     => $field,
-						'title'    => $data['title'],
-						'disabled' => $data['disabled']
-					);
-				}
-				$this->fields[$field]['label']  = $data['label'];
-				$this->fields[$field]['length'] = $data['length'];
-				$this->fields[$field]['shown']  = $data['shown'];
-			}
-		}
-
-		function set($data)
-		{
-			if (is_array($data) && strlen($data['name']) > 0)
-			{
-				if (!isset($this->stock_fields[$name = $data['name']]))
-				{
-					$name = '#'.$name;
-				}
-				$this->fields[$name] = $data;
-			}
-		}
-
-		function save($fields=False)
-		{
-			if ($fields)
-			{
-				$this->fields = $fields;
-			}
-			//echo "<pre>"; print_r($this->config->config_data); echo "</pre>\n";
-			$this->config->save_repository();
-		}
-	}
diff --git a/calendar/inc/class.boholiday.inc.php b/calendar/inc/class.boholiday.inc.php
index 50f2c6d990..34362ccef6 100755
--- a/calendar/inc/class.boholiday.inc.php
+++ b/calendar/inc/class.boholiday.inc.php
@@ -1,17 +1,24 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - Holiday                                                     *
-  * http://www.egroupware.org                                                *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* eGroupWare - Holiday                                                     *
+	* http://www.egroupware.org                                                *
+	* Written by Mark Peters <skeeter@phpgroupware.org>                        *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
 	/* $Id$ */
 
+	/**
+	 * Business object for calendar holidays
+	 *
+	 * @package calendar
+	 * @author Mark Peters <skeeter@phpgroupware.org>
+	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+	 */
 	class boholiday
 	{
 		var $public_functions = Array(
@@ -26,7 +33,7 @@
 			'update_entry'	=> True
 		);
 
-		var $debug = False;
+		var $debug = false;
 		var $base_url = '/index.php';
 
 		var $ui;
@@ -46,7 +53,7 @@
 
 		function boholiday()
 		{
-			$this->so = CreateObject('calendar.soholiday');
+			$this->so =& CreateObject('calendar.soholiday');
 
 			$this->start  = (int)get_var('start',array('POST','GET'));
 			$this->query  = get_var('query',array('POST','GET'));
@@ -101,7 +108,7 @@
 				}
 			}
 
-			$this->ui = CreateObject('calendar.uiholiday');
+			$this->ui =& CreateObject('calendar.uiholiday');
 			if($id)
 			{
 				$this->so->delete_holiday($id);
@@ -127,7 +134,7 @@
 			{
 				$this->so->delete_locale($locale);
 			}
-			$this->ui = CreateObject('calendar.uiholiday');
+			$this->ui =& CreateObject('calendar.uiholiday');
 			$this->ui->admin();
 		}
 
@@ -143,11 +150,35 @@
 			$file = './holidays.'.$this->locales[0];
 			if(!file_exists($file) && count($_POST['name']))
 			{
-				$c_holidays = count($_POST['name']);
 				$fp = fopen($file,'w');
-				for($i=0;$i<$c_holidays;$i++)
+				fwrite($fp,"charset\t".$GLOBALS['egw']->translation->charset()."\n");
+
+				$holidays = array();
+				foreach($_POST['name'] as $i => $name)
 				{
-					fwrite($fp,$this->locales[0]."\t".$_POST['name'][$i]."\t".$_POST['day'][$i]."\t".$_POST['month'][$i]."\t".$_POST['occurence'][$i]."\t".$_POST['dow'][$i]."\t".$_POST['observance'][$i]."\n");
+					$holiday = array(
+						'locale' => $_POST['locale'],
+						'name'   => str_replace('\\','',$name),
+						'day'    => $_POST['day'][$i],
+						'month'  => $_POST['month'][$i],
+						'occurence' => $_POST['occurence'][$i],
+						'dow'    => $_POST['dow'][$i],
+						'observance' => $_POST['observance'][$i],
+					);
+				}
+				// sort holidays by year / occurence:
+				usort($holidays,'_holiday_cmp');
+				
+				$last_year = -1;
+				foreach($holidays as $holiday)
+				{
+					$year = $holiday['occurence'] <= 0 ? 0 : $holiday['occurence'];
+					if ($year != $last_year)
+					{
+						echo "\n".($year ? $year : 'regular (year=0)').":\n";
+						$last_year = $year;
+					}
+					fwrite($fp,"$holiday[locale]\t$holiday[name]\t$holiday[day]\t$holiday[month]\t$holiday[occurence]\t$holiday[dow]\t$holiday[observance_rule]\n");
 				}
 				fclose($fp);
 			}
@@ -174,30 +205,30 @@
 
 		function prepare_read_holidays($year=0,$owner=0)
 		{
-			$this->year = (isset($year) && $year > 0?$year:$GLOBALS['phpgw']->common->show_date(time() - $GLOBALS['phpgw']->datetime->tz_offset,'Y'));
-			$this->owner = ($owner?$owner:$GLOBALS['phpgw_info']['user']['account_id']);
+			$this->year = (isset($year) && $year > 0?$year:$GLOBALS['egw']->common->show_date(time() - $GLOBALS['egw']->datetime->tz_offset,'Y'));
+			$this->owner = ($owner?$owner:$GLOBALS['egw_info']['user']['account_id']);
 
 			if($this->debug)
 			{
 				echo 'Setting Year to : '.$this->year.'<br>'."\n";
 			}
 
-			if(@$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
+			if(@$GLOBALS['egw_info']['user']['preferences']['common']['country'])
 			{
-				$this->locales[] = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
+				$this->locales[] = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 			}
-			elseif(@$GLOBALS['phpgw_info']['user']['preferences']['calendar']['locale'])
+			elseif(@$GLOBALS['egw_info']['user']['preferences']['calendar']['locale'])
 			{
-				$this->locales[] = $GLOBALS['phpgw_info']['user']['preferences']['calendar']['locale'];
+				$this->locales[] = $GLOBALS['egw_info']['user']['preferences']['calendar']['locale'];
 			}
 			else
 			{
 				$this->locales[] = 'US';
 			}
 
-			if($this->owner != $GLOBALS['phpgw_info']['user']['account_id'])
+			if($this->owner != $GLOBALS['egw_info']['user']['account_id'])
 			{
-				$owner_pref = CreateObject('phpgwapi.preferences',$owner);
+				$owner_pref =& CreateObject('phpgwapi.preferences',$owner);
 				$owner_prefs = $owner_pref->read_repository();
 				if(@$owner_prefs['common']['country'])
 				{
@@ -210,12 +241,11 @@
 				unset($owner_pref);
 			}
 
-			@reset($this->locales);
-			if($GLOBALS['phpgw_info']['server']['auto_load_holidays'] == True)
+			if($GLOBALS['egw_info']['server']['auto_load_holidays'] == True && $this->locales)
 			{
-				while(list($key,$value) = each($this->locales))
+				foreach($this->locales as $local)
 				{
-					$this->auto_load_holidays($value);
+					$this->auto_load_holidays($local);
 				}
 			}
 		}
@@ -228,14 +258,14 @@
 
 				/* get the file that contains the calendar events for your locale */
 				/* "http://www.egroupware.org/cal/holidays.US.csv";                 */
-				$network = CreateObject('phpgwapi.network');
-				if(isset($GLOBALS['phpgw_info']['server']['holidays_url_path']) && $GLOBALS['phpgw_info']['server']['holidays_url_path'] != 'localhost')
+				$network =& CreateObject('phpgwapi.network');
+				if(isset($GLOBALS['egw_info']['server']['holidays_url_path']) && $GLOBALS['egw_info']['server']['holidays_url_path'] != 'localhost')
 				{
-					$load_from = $GLOBALS['phpgw_info']['server']['holidays_url_path'];
+					$load_from = $GLOBALS['egw_info']['server']['holidays_url_path'];
 				}
 				else
 				{
-					$pos = strpos(' '.$GLOBALS['phpgw_info']['server']['webserver_url'],$_SERVER['HTTP_HOST']);
+					$pos = strpos(' '.$GLOBALS['egw_info']['server']['webserver_url'],$_SERVER['HTTP_HOST']);
 					if($pos == 0)
 					{
 						switch($_SERVER['SERVER_PORT'])
@@ -247,29 +277,40 @@
 								$http_protocol = 'https://';
 								break;
 						}
-						$server_host = $http_protocol.$_SERVER['HTTP_HOST'].$GLOBALS['phpgw_info']['server']['webserver_url'];
+						$server_host = $http_protocol.$_SERVER['HTTP_HOST'].$GLOBALS['egw_info']['server']['webserver_url'];
 					}
 					else
 					{
-						$server_host = $GLOBALS['phpgw_info']['server']['webserver_url'];
+						$server_host = $GLOBALS['egw_info']['server']['webserver_url'];
 					}
 					$load_from = $server_host.'/calendar/egroupware.org';
 				}
 //				echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale).'.csv'."<br>\n";
-				$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
+				if($GLOBALS['egw_info']['server']['holidays_url_path'] == 'localhost')
+				{
+					$lines = file(EGW_SERVER_ROOT.'/calendar/egroupware.org/holidays.'.strtoupper($locale).'.csv');
+				}
+				else
+					$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
+
 				if (!$lines)
 				{
 					return false;
 				}
+				$charset = split("[\t\n ]+",$lines[0]);		// give a bit flexibility in the syntax AND remove the lineend (\n)
+				if (strstr($charset[0],'charset') && $charset[1])
+				{
+					$lines = $GLOBALS['egw']->translation->convert($lines,$charset[1]);
+				}
 				$c_lines = count($lines);
-				for($i=0;$i<$c_lines;$i++)
+				foreach ($lines as $i => $line)
 				{
 //					echo 'Line #'.$i.' : '.$lines[$i]."<br>\n";
-					$holiday = explode("\t",$lines[$i]);
+					$holiday = explode("\t",$line);
 					if(count($holiday) == 7)
 					{
 						$holiday['locale'] = $holiday[0];
-						$holiday['name'] = $GLOBALS['phpgw']->db->db_addslashes($holiday[1]);
+						$holiday['name'] = $GLOBALS['egw']->db->db_addslashes($holiday[1]);
 						$holiday['mday'] = (int)$holiday[2];
 						$holiday['month_num'] = (int)$holiday[3];
 						$holiday['occurence'] = (int)$holiday[4];
@@ -328,7 +369,7 @@
 
 	// Still need to put some validation in here.....
 
-				$this->ui = CreateObject('calendar.uiholiday');
+				$this->ui =& CreateObject('calendar.uiholiday');
 
 				if (is_array($errors))
 				{
@@ -386,9 +427,8 @@
 				return $holidays;
 			}
 
-			$temp_locale = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
+			$temp_locale = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 			foreach($holidays as $i => $holiday)
-			//for($i=0;$i<count($holidays);$i++)
 			{
 				if($i == 0 || $holidays[$i]['locale'] != $holidays[$i - 1]['locale'])
 				{
@@ -396,24 +436,24 @@
 					{
 						unset($holidaycalc);
 					}
-					$GLOBALS['phpgw_info']['user']['preferences']['common']['country'] = $holidays[$i]['locale'];
-					$holidaycalc = CreateObject('calendar.holidaycalc');
+					$GLOBALS['egw_info']['user']['preferences']['common']['country'] = $holidays[$i]['locale'];
+					$holidaycalc =& CreateObject('calendar.holidaycalc');
 				}
 				$holidays[$i]['date'] = $holidaycalc->calculate_date($holiday, $holidays, $this->year);
 			}
 			unset($holidaycalc);
 			$this->holidays = $this->sort_holidays_by_date($holidays);
 			$this->cached_holidays = $this->set_holidays_to_date($this->holidays);
-			$GLOBALS['phpgw_info']['user']['preferences']['common']['country'] = $temp_locale;
+			$GLOBALS['egw_info']['user']['preferences']['common']['country'] = $temp_locale;
 			return $this->cached_holidays;
 		}
 		/* End Calendar functions */
 
 		function check_admin()
 		{
-			if(!@$GLOBALS['phpgw_info']['user']['apps']['admin'])
+			if(!@$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
-				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php'));
+				Header('Location: ' . $GLOBALS['egw']->link('/index.php'));
 			}
 		}
 
@@ -423,7 +463,7 @@
 			{
 				return false;
 			}
-			$sbox = CreateObject('phpgwapi.sbox');
+			$sbox =& CreateObject('phpgwapi.sbox');
 			$month = $holiday['month'] ? lang($sbox->monthnames[$holiday['month']]) : '';
 			unset($sbox);
 
@@ -438,7 +478,7 @@
 			}
 			else
 			{
-				$str = $GLOBALS['phpgw']->common->dateformatorder($holiday['occurence']>1900?$holiday['occurence']:'',$month,$holiday[day]);
+				$str = $GLOBALS['egw']->common->dateformatorder($holiday['occurence']>1900?$holiday['occurence']:'',$month,$holiday[day]);
 			}
 			if ($holiday['observance_rule'])
 			{
@@ -447,4 +487,12 @@
 			return $str;
 		}
 	}
-?>
+
+	function _holiday_cmp($a,$b)
+	{
+		if (($year_diff = ($a['occurence'] <= 0 ? 0 : $a['occurence']) - ($b['occurence'] <= 0 ? 0 : $b['occurence'])))
+		{
+			return $year_diff;
+		}
+		return $a['month'] - $b['month'] ? $a['month'] - $b['month'] : $a['day'] - $b['day'];
+	}
diff --git a/calendar/inc/class.boical.inc.php b/calendar/inc/class.boical.inc.php
new file mode 100644
index 0000000000..bf43e05985
--- /dev/null
+++ b/calendar/inc/class.boical.inc.php
@@ -0,0 +1,577 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare - iCalendar Parser                                            *
+	* http://www.egroupware.org                                                *
+	* Written by Lars Kneschke <lkneschke@egroupware.org>                      *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License.              *
+	\**************************************************************************/
+
+	/* $Id$ */
+
+	require_once EGW_SERVER_ROOT.'/calendar/inc/class.bocalupdate.inc.php';
+	require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php';
+
+	/**
+	 * iCal import and export via Horde iCalendar classes
+	 *
+	 * @package calendar
+	 * @author Lars Kneschke <lkneschke@egroupware.org>
+	 * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+	 */
+	class boical extends bocalupdate
+	{
+		/**
+		 * @var array $supportedFields array containing the supported fields of the importing device
+		 */
+		var $supportedFields;
+		
+		/**
+		 * @var array $status_egw2ical conversation of the participant status egw => ical
+		 */
+		var $status_egw2ical = array(
+			'U' => 'NEEDS-ACTION',
+			'A' => 'ACCEPTED',
+			'R' => 'DECLINED',
+			'T' => 'TENTATIVE',
+		);
+		/**
+		 * @var array conversation of the participant status ical => egw
+		 */
+		var $status_ical2egw = array(
+			'NEEDS-ACTION' => 'U',
+			'ACCEPTED'     => 'A',
+			'DECLINED'     => 'R',
+			'TENTATIVE'    => 'T',
+		);
+		
+		/**
+		 * @var array $status_ical2egw conversation of the priority egw => ical
+		 */
+		var $priority_egw2ical = array(
+			0 => 0,		// undefined
+			1 => 9,		// low
+			2 => 5,		// normal
+			3 => 1,		// high
+		);
+		/**
+		 * @var array $status_ical2egw conversation of the priority ical => egw
+		 */
+		var $priority_ical2egw = array(
+			0 => 0,		// undefined
+			9 => 1,	8 => 1, 7 => 1, 6 => 1,	// low
+			5 => 2,		// normal
+			4 => 3, 3 => 3, 2 => 3, 1 => 3,	// high
+		);
+		
+		/**
+		 * @var array $recur_egw2ical converstaion of egw recur-type => ical FREQ
+		 */
+		var $recur_egw2ical = array(
+			MCAL_RECUR_DAILY        => 'DAILY',
+			MCAL_RECUR_WEEKLY       => 'WEEKLY',
+			MCAL_RECUR_MONTHLY_MDAY => 'MONTHLY',	// BYMONHTDAY={1..31}
+			MCAL_RECUR_MONTHLY_WDAY => 'MONTHLY',	// BYDAY={1..5}{MO..SO}
+			MCAL_RECUR_YEARLY       => 'YEARLY',
+		);
+
+		/**
+		 * Exports one calendar event to an iCalendar item
+		 *
+		 * @param int/array $events (array of) cal_id or array of the events
+		 * @param string $method='PUBLISH'
+		 * @return string/boolean string with vCal or false on error (eg. no permission to read the event)
+		 */
+		function &exportVCal($events,$method='PUBLISH')
+		{
+			$egwSupportedFields = array(
+				'CLASS'		=> array('dbName' => 'public'),
+				'SUMMARY'	=> array('dbName' => 'title'),
+				'DESCRIPTION'	=> array('dbName' => 'description'),
+				'LOCATION'	=> array('dbName' => 'location'),
+				'DTSTART'	=> array('dbName' => 'start'),
+				'DTEND'		=> array('dbName' => 'end'),
+				'ORGANIZER'	=> array('dbName' => 'owner'),
+				'ATTENDEE'	=> array('dbName' => 'participants'),
+				'RRULE'     => array('dbName' => 'recur_type'),
+				'EXDATE'    => array('dbName' => 'recur_exception'),
+ 				'PRIORITY'  => array('dbName' => 'priority'),
+ 				'TRANSP'    => array('dbName' => 'non_blocking'),
+				'CATEGORIES'=> array('dbName' => 'category'),
+			);
+			if(!is_array($this->supportedFields))
+			{
+				$this->setSupportedFields();
+			}
+			$vcal = &new Horde_iCalendar;
+			$vcal->setAttribute('PRODID','-//eGroupWare//NONSGML eGroupWare Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+				strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
+			$vcal->setAttribute('VERSION','2.0');
+			$vcal->setAttribute('METHOD',$method);
+
+			if (!is_array($events)) $events = array($events);
+			
+			foreach($events as $event)
+			{
+				if (!is_array($event) && !($event = $this->read($event,null,false,'server')))	// server = timestamp in server-time(!)
+				{
+					return false;	// no permission to read $cal_id
+				}
+				//_debug_array($event);
+				
+				$eventGUID = $GLOBALS['egw']->common->generate_uid('calendar',$event['id']);
+				
+				$vevent = Horde_iCalendar::newComponent('VEVENT',$vcal);
+				$parameters = $attributes = array();
+				
+				foreach($egwSupportedFields as $icalFieldName => $egwFieldInfo)
+				{
+					if($this->supportedFields[$egwFieldInfo['dbName']])
+					{
+						switch($icalFieldName)
+						{
+							case 'ATTENDEE':
+								foreach((array)$event['participants'] as $uid => $status)
+								{
+									// ToDo, this needs to deal with resources too!!!
+									if (!is_numeric($uid)) continue;
+	
+									$mailto = $GLOBALS['egw']->accounts->id2name($uid,'account_email');
+									$cn = trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
+										$GLOBALS['egw']->accounts->id2name($uid,'account_lastname'));
+									$attributes['ATTENDEE'][]	= $mailto ? 'MAILTO:'.$mailto : '';
+									// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT} NOT used by eGW atm.
+									$role = $uid == $event['owner'] ? 'CHAIR' : 'REQ-PARTICIPANT';
+									// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
+									$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
+									// PARTSTAT={NEEDS-ACTION|ACCEPTED|DECLINED|TENTATIVE|DELEGATED|COMPLETED|IN-PROGRESS} everything from delegated is NOT used by eGW atm.
+									$status = $this->status_egw2ical[$status];
+									// CUTYPE={INDIVIDUAL|GROUP|RESOURCE|ROOM|UNKNOWN}
+									$cutype = $GLOBALS['egw']->accounts->get_type($uid) == 'g' ? 'GROUP' : 'INDIVIDUAL';
+									$parameters['ATTENDEE'][] = array(
+										'CN'       => $cn, 
+										'ROLE'     => $role, 
+										'PARTSTAT' => $status, 
+										'CUTYPE'   => $cutype,
+										'RSVP'     => $rsvp,
+									);
+								}
+								break;
+	            			case 'CLASS':
+	            				$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
+	            				break;
+	            			case 'ORGANIZER':	// according to iCalendar standard, ORGANIZER not used for events in the own calendar
+	            				if (!isset($event['participants'][$event['owner']]) || count($event['participants']) > 1)
+	            				{
+									$mailtoOrganizer = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+									$attributes['ORGANIZER'] = $mailtoOrganizer ? 'MAILTO:'.$mailtoOrganizer : '';
+									$parameters['ORGANIZER']['CN'] = trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname').' '.
+										$GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname'));
+	            				}
+								break;
+							case 'DTEND':
+								if(date('H:i:s',$event['end']) == '23:59:59') $event['end']++;
+	            				$attributes[$icalFieldName]	= $event['end'];
+	            				break;
+	            			case 'RRULE':
+	            				if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+	            				$rrule = array('FREQ' => $this->recur_egw2ical[$event['recur_type']]);
+	            				switch ($event['recur_type'])
+	            				{
+	            					case MCAL_RECUR_WEEKLY:
+	            						$days = array();
+	            						foreach($this->recur_days as $id => $day)
+	            						{
+	            							if ($event['recur_data'] & $id) $days[] = strtoupper(substr($day,0,2));
+	            						}
+	            						$rrule['BYDAY'] = implode(',',$days);
+	            						break;
+	            					case MCAL_RECUR_MONTHLY_MDAY:	// date of the month: BYMONTDAY={1..31}
+	            						$rrule['BYMONTHDAY'] = (int) date('d',$event['start']);
+	            						break;
+	             					case MCAL_RECUR_MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}{MO..SO}
+	             						$rrule['BYDAY'] = (1 + (int) ((date('d',$event['start'])-1) / 7)).
+	             							strtoupper(substr(date('l',$event['start']),0,2));
+	            						break;
+	            				}
+	             				if ($event['recur_interval'] > 1) $rrule['INTERVAL'] = $event['recur_interval'];
+	            				if ($event['recur_enddate']) $rrule['UNTIL'] = date('Ymd',$event['recur_enddate']);	// only day is set in eGW
+	            				// no idea how to get the Horde parser to produce a standard conformant
+	            				// RRULE:FREQ=... (note the double colon after RRULE, we cant use the $parameter array)
+	            				// so we create one value manual ;-)
+	            				foreach($rrule as $name => $value)
+	            				{
+	             					$attributes['RRULE'][] = $name . '=' . $value;
+	            				}
+	            				$attributes['RRULE'] = implode(';',$attributes['RRULE']);
+	             				break;
+	             			case 'EXDATE':
+	             				if ($event['recur_exception'])
+	             				{
+	             					$days = array();
+	             					foreach($event['recur_exception'] as $day)
+	             					{
+	             						$days[] = date('Ymd',$day);
+	             					}
+	             					$attributes['EXDATE'] = implode(',',$days);
+	             					$parameters['EXDATE']['VALUE'] = 'DATE';
+	             				}
+	           					break;
+	           				case 'PRIORITY':
+	 							$attributes['PRIORITY'] = (int) $this->priority_egw2ical[$event['priority']];
+	 							break;
+	 						case 'TRANSP':
+								$attributes['TRANSP'] = $event['non_blocking'] ? 'TRANSPARENT' : 'OPAQUE';
+								break;
+							case 'CATEGORIES':
+								if ($event['category'])
+								{
+									$attributes['CATEGORIES'] = implode(',',$this->categories($event['category'],$nul));
+								}
+								break;
+	           				default:
+	           					if ($event[$egwFieldInfo['dbName']])	// dont write empty fields
+	           					{
+	            					$attributes[$icalFieldName]	= $event[$egwFieldInfo['dbName']];
+	           					}
+	            				break;
+	            		}
+	            	}
+	            }
+				$modified = $GLOBALS['egw']->contenthistory->getTSforAction($eventGUID,'modify');
+				$created = $GLOBALS['egw']->contenthistory->getTSforAction($eventGUID,'add');
+				if (!$created && !$modified) $created = $event['modified'];
+				if ($created) $attributes['CREATED'] = $created;
+				if (!$modified) $modified = $event['modified'];
+				if ($modified) $attributes['LAST-MODIFIED'] = $modified;
+	
+				$attributes['UID'] = $eventGUID;
+	
+				foreach($attributes as $key => $value)
+				{
+					foreach(is_array($value) ? $value : array($value) as $valueID => $valueData)
+					{
+						$valueData = $GLOBALS['egw']->translation->convert($valueData,$GLOBALS['egw']->translation->charset(),'UTF-8');
+						$paramData = (array) $GLOBALS['egw']->translation->convert(is_array($value) ? $parameters[$key][$valueID] : $parameters[$key],
+							$GLOBALS['egw']->translation->charset(),'UTF-8');
+						//echo "$key:$valueID: value=$valueData, param=".print_r($paramDate,true)."\n";
+						$vevent->setAttribute($key, $valueData, $paramData);
+						$options = array();
+						if($key != 'RRULE' && preg_match('/([\000-\012\015\016\020-\037\075])/',$valueData))
+						{
+							$options['ENCODING'] = 'QUOTED-PRINTABLE';
+						}
+						if(preg_match('/([\177-\377])/',$valueData))
+						{
+							$options['CHARSET'] = 'UTF-8';
+						}
+						$vevent->setParameter($key, $options);
+					}
+				}
+				$vcal->addComponent($vevent);
+			}
+			//_debug_array($vcal->exportvCalendar());
+			
+			return $vcal->exportvCalendar();
+		}
+		
+		function importVCal(&$_vcalData, $cal_id=-1)
+		{
+			$vcal = &new Horde_iCalendar;
+			if(!$vcal->parsevCalendar($_vcalData))
+			{
+				return FALSE;
+			}
+			
+			if(!is_array($this->supportedFields))
+			{
+				$this->setSupportedFields();
+			}
+			//echo "supportedFields="; _debug_array($this->supportedFields);
+
+			$Ok = false;	// returning false, if file contains no components
+			foreach($vcal->getComponents() as $component)
+			{
+				if(is_a($component, 'Horde_iCalendar_vevent'))
+				{
+					$supportedFields = $this->supportedFields;
+					$event = array();
+					$vcardData = array('recur_type' => 0);
+					
+					// lets see what we can get from the vcard
+					foreach($component->_attributes as $attributes)
+					{
+						$attributes['value'] = $GLOBALS['egw']->translation->convert($attributes['value'],'UTF-8');
+						//echo "$attributes[name] = '$attributes[value]'<br />\n";
+
+						switch($attributes['name'])
+						{
+							case 'CLASS':
+								$vcardData['public']		= (int)(strtolower($attributes['value']) == 'public');
+								break;
+							case 'DESCRIPTION':
+								$vcardData['description']	= $attributes['value'];
+								break;
+							case 'DTEND':
+								if(date('H:i:s',$attributes['value']) == '00:00:00')
+									$attributes['value']--;
+								$vcardData['end']		= $attributes['value'];
+								break;
+							case 'DTSTART':
+								$vcardData['start']		= $attributes['value'];
+								break;
+							case 'LOCATION':
+								$vcardData['location']	= $attributes['value'];
+								break;
+							case 'RRULE':
+								$recurence 			= $attributes['value'];
+								switch(substr($recurence,0,1))
+								{
+									case 'W':
+										if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))
+										{
+											$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+											foreach(explode(' ',trim($recurenceMatches[2])) as $recurenceDay)
+											{
+												switch($recurenceDay)
+												{
+													case 'SU':
+														$vcardData['recur_data'][] = MCAL_M_SUNDAY;
+														break;
+													case 'MO':
+														$vcardData['recur_data'][] = MCAL_M_MONDAY;
+														break;
+													case 'TU':
+														$vcardData['recur_data'][] = MCAL_M_TUESDAY;
+														break;
+													case 'WE':
+														$vcardData['recur_data'][] = MCAL_M_WEDNESDAY;
+														break;
+													case 'TH':
+														$vcardData['recur_data'][] = MCAL_M_THURSDAY;
+														break;
+													case 'FR':
+														$vcardData['recur_data'][] = MCAL_M_FRIDAY;
+														break;
+													case 'SA':
+														$vcardData['recur_data'][] = MCAL_M_SATURDAY;
+														break;
+												}
+											}
+										}
+										break;
+									
+									case 'D':
+										if(preg_match('/D(\d+) (.*)/',$recurence, $recurenceMatches))
+										{
+											$vcardData['recur_type'] = MCAL_RECUR_DAILY;
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
+								
+										}
+										break;
+									case 'M':
+										if(preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches))
+										{
+											$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+										}
+										elseif(preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
+										{
+											$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+										}
+										
+										break;
+									case 'Y':
+										if(preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches))
+										{
+											$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+										}
+										break;
+								}
+								break;
+	             			case 'EXDATE':
+	             				// ToDo: $vcardData['recur_exception'] = ...
+	           					break;
+							case 'SUMMARY':
+								$vcardData['title']		= $attributes['value'];
+								break;
+							case 'UID':
+								$event['uid'] = $vcardData['uid'] = $attributes['value'];
+								if ($cal_id <= 0 && !empty($vcardData['uid']) && ($uid_event = $this->read($vcardData['uid'])))
+								{
+									$event['id'] = $uid_event['id'];
+									unset($uid_event);
+								}
+								break;
+	 						case 'TRANSP':
+								$vcardData['non_blocking'] = $attributes['value'] == 'TRANSPARENT';
+								break;
+	           				case 'PRIORITY':
+	 							$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+	 							break;
+	 						case 'CATEGORIES':
+	 							$vcardData['category'] = array();
+	 							if ($attributes['value'])
+	 							{
+									if (!is_object($this->cat))
+									{
+										if (!is_object($GLOBALS['egw']->categories))
+										{
+											$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories',$this->owner,'calendar');
+										}
+										$this->cat =& $GLOBALS['egw']->categories;
+									}
+	 								foreach(explode(',',$attributes['value']) as $cat_name)
+	 								{
+	 									if (!($cat_id = $this->cat->name2id($cat_name)))
+	 									{
+	 										$cat_id = $this->cat->add( array('name' => $cat,'descr' => $cat ));
+	 									}
+ 										$vcardData['category'][] = $cat_id;
+	 								}
+	 							}
+	 							break;	
+	 						case 'ATTENDEE':
+	 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
+	 								($uid = $GLOBALS['egw']->accounts->name2id($matches[1])))
+	 							{
+	 								$event['participants'][$uid] = preg_match('/PARTSTAT=([a-z-]+)/i',$attributes['value'],$matches) ?
+	 									$this->status_ical2egw[strtoupper($matches[1])] : ($uid == $event['owner'] ? 'A' : 'U');
+	 							}
+	 							break;
+	 						case 'ORGANIZER':	// will be written direct to the event
+	 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
+	 								($uid = $GLOBALS['egw']->accounts->name2id($matches[1])))
+	 							{
+	 								$event['owner'] = $uid;
+	 							}
+	 							break;
+	 						case 'CREATED':		// will be written direct to the event
+	 							if ($event['modified']) break;
+	 							// fall through
+	 						case 'LAST-MODIFIED':	// will be written direct to the event
+								$event['modified'] = $attributes['value'];
+								break;
+						}
+					}
+					#_debug_array($vcardData);exit;
+					
+					// now that we know what the vard provides, we merge that data with the information we have about the device
+					$event['priority']		= 2;
+					if($cal_id > 0)
+					{
+						$event['id'] = $cal_id;
+					}
+					while($fieldName = array_shift($supportedFields))
+					{
+						switch($fieldName)
+						{
+							case 'recur_type':
+								$event['recur_type'] = $vcardData['recur_type'];
+								if ($event['recur_type'] != MCAL_RECUR_NONE)
+								{
+									foreach(array('recur_interval','recur_enddate','recur_data','recur_exception') as $r)
+									{
+										if(isset($vcardData[$f]))
+										{
+											$event[$r] = $vcardData[$r];
+										}
+									}
+								}
+								unset($supportedFields['recur_type']);
+								unset($supportedFields['recur_interval']);
+								unset($supportedFields['recur_enddate']);
+								unset($supportedFields['recur_data']);
+								break;
+							default:
+								if (isset($vcardData[$fieldName]))
+								{
+									$event[$fieldName] = $vcardData[$fieldName];
+								}
+								unset($supportedFields[$fieldName]);
+								break;
+						}
+					}
+					
+					// add ourself to new events as participant
+	 				if($cal_id == -1 && !isset($this->supportedFields['participants']))
+	 				{
+						$event['participants'] = array($GLOBALS['egw_info']['user']['account_id'] => 'A');
+	 				}
+					#foreach($event as $key => $value)
+					#{
+					#	error_log("KEY: $key  VALUE: $value");
+					#}
+					//_debug_array($event); exit;
+					
+					if (!($Ok = $this->update($event, TRUE))) break;	// stop with the first error
+				}
+			}
+			return $Ok;
+		}
+
+		function setSupportedFields(&$_productManufacturer='file', &$_productName='')
+		{
+			$defaultFields = array('public' => 'public', 'description' => 'description', 'end' => 'end',
+				'start' => 'start', 'location' => 'location', 'recur_type' => 'recur_type',
+				'recur_interval' => 'recur_interval', 'recur_data' => 'recur_data', 'recur_enddate' => 'recur_enddate',
+				'title' => 'title',	'priority' => 'priority',
+
+			);
+			
+			switch(strtolower($_productManufacturer))
+			{
+				case 'nexthaus corporation':
+					switch(strtolower($_productName))
+					{
+						default:
+							$this->supportedFields = $defaultFields + array('participants' => 'participants');
+							break;
+					}
+					break;
+
+				// multisync does not provide anymore information then the manufacturer
+				// we suppose multisync with evolution
+				case 'the multisync project':
+					switch(strtolower($_productName))
+					{
+						default:
+							$this->supportedFields = $defaultFields;
+							break;
+					}
+					break;
+
+				case 'synthesis ag':
+					switch(strtolower($_productName))
+					{
+						default:
+							$this->supportedFields = $defaultFields;
+							break;
+					}
+					break;
+					
+				case 'file':	// used outside of SyncML, eg. by the calendar itself ==> all possible fields
+					$this->supportedFields = $defaultFields + array(
+						'participants' => 'participants',
+						'owner'        => 'owner',
+						'non_blocking' => 'non_blocking',
+						'category'     => 'category',
+					);
+					break;
+
+				// the fallback for SyncML
+				default:
+					error_log("Client not found: $_productManufacturer $_productName");
+					$this->supportedFields = $defaultFields;
+					break;
+			}
+		}
+	}
+?>
diff --git a/calendar/inc/class.boicalendar.inc.php b/calendar/inc/class.boicalendar.inc.php
deleted file mode 100755
index 1c61488ed3..0000000000
--- a/calendar/inc/class.boicalendar.inc.php
+++ /dev/null
@@ -1,3654 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - iCalendar Parser                                            *
-  * http://www.egroupware.org                                                *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	define('FOLD_LENGTH',75);
-
-	define('VEVENT',1);
-	define('VTODO',2);
-
-	define('NONE',0);
-	define('CHAIR',1);
-	define('REQ_PARTICIPANT',2);
-	define('OPT_PARTICIPANT',3);
-	define('NON_PARTICIPANT',4);
-
-	define('INDIVIDUAL',1);
-	define('GROUP',2);
-	define('RESOURCE',4);
-	define('ROOM',8);
-	define('UNKNOWN',16);
-
-	/* event status */
-	define('NEEDS_ACTION',0);
-	define('ACCEPTED',1);
-	define('DECLINED',2);
-	define('TENTATIVE',3);
-	define('DELEGATED',4);
-	define('COMPLETED',5);
-	define('IN_PROCESS',6);
-
-	/* class */
-	define('PRIVATECAL',0);
-	define('PUBLICCAL',1);
-	define('CONFIDENTIAL',3);
-
-	/* transparency */
-	define('TRANSPARENT',0);
-	define('OPAQUE',1);
-
-	/* frequency */
-	define('SECONDLY',1);
-	define('MINUTELY',2);
-	define('HOURLY',3);
-	define('DAILY',4);
-	define('WEEKLY',5);
-	define('MONTHLY',6);
-	define('YEARLY',7);
-
-	define('FREE',0);
-	define('BUSY',1);
-	define('BUSY_UNAVAILABLE',2);
-	define('BUSY_TENTATIVE',3);
-
-	define('THISANDPRIOR',0);
-	define('THISANDFUTURE',1);
-
-	define('START',0);
-	define('END',1);
-
-	define('_8BIT',0);
-	define('_BASE64',1);
-
-	define('OTHER',99);
-
-	class boicalendar
-	{
-		var $public_functions = array(
-			'import' => True,
-			'export' => True,
-			'freebusy' => True,
-		);
-
-		var $ical;
-		var $line = 0;
-		var $event = Array();
-		var $todo = Array();
-		var $journal = Array();
-		var $freebusy = Array();
-		var $timezone = Array();
-		var $property = Array();
-		var $parameter = Array();
-		var $debug_str = False;
-		var $api = True;
-		var $chunk_split = True;
-
-		/*
-		* Base Functions
-		*/
-
-		function boicalendar()
-		{
-			$this->property = Array(
-				'action' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'valarm' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'attach' => Array(
-					'type'		=> 'uri',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'valarm' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'attendee' => Array(
-					'type'		=> 'cal-address',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'valarm' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vfreebusy'		=> Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'categories' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'class' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'comment' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'daylight' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'standard' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'valarm' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'completed' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'contact' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'created' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal'		=> Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'description' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'valarm' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'dtend'	 => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'dtstamp' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo'	=> Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'dtstart' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'daylight' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'standard' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'due' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'duration' => Array(
-					'type'		=> 'duration',
-					'to_text'	=> False,
-					'valarm' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'exdate' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'exrule' => Array(
-					'type'		=> 'recur',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'freebusy' => Array(
-					'type'		=> 'text',
-					'to_text'	=> False,
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'geo' => Array(
-					'type'		=> 'float',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'last_modified' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtimezone' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'location' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'method' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'ical' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'organizer' => Array(
-					'type'		=> 'cal-address',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'percent_complete' => Array(
-					'type'		=> 'integer',
-					'to_text'	=> False,
-					'vtodo'	=> Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'priority' => Array(
-					'type'		=> 'integer',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'prodid' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'ical'	=> Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'rdate' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'daylight' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'standard' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'recurrence_id' => Array(
-					'type'		=> 'date-time',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo'	=> Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'related_to' => Array(
-					'type'		=> 'text',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'request_status' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'resources' => Array(
-					'type'		=> 'text',
-					'to_text'	=> False,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'rrule' => Array(
-					'type'		=> 'recur',
-					'to_text'	=> False,
-					'daylight' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'standard' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'sequence' => Array(
-					'type'		=> 'integer',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'status' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'summary' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'valarm' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'transp' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'trigger' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'valarm' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'tzid' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vtimezone' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'tzname' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'daylight' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					),
-					'standard' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> True
-					)
-				),
-				'tzoffsetfrom' => Array(
-					'type'		=> 'utc-offset',
-					'to_text'	=> True,
-					'daylight' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'standard' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'tzoffsetto' => Array(
-					'type'		=> 'utc-offset',
-					'to_text'	=> True,
-					'daylight' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'standard' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'tzurl'	=> Array(
-					'type'		=> 'uri',
-					'to_text'	=> True,
-					'vtimezone' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					)
-				),
-				'uid' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'vtodo' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'url' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'vevent' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'vfreebusy' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					),
-					'vjournal' => Array(
-						'state'		=> 'optional',
-						'multiples'	=> False
-					),
-					'vtodo'	=> Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				),
-				'version' => Array(
-					'type'		=> 'text',
-					'to_text'	=> True,
-					'ical' => Array(
-						'state'		=> 'required',
-						'multiples'	=> False
-					)
-				)
-			);
-			$this->parameter = Array(
-				'altrep' => Array(
-					'type'		=> 'uri',
-					'quoted'		=> True,
-					'to_text'	=> True,
-					'properties' => Array(
-						'comment'	=> True,
-						'description'	=> True,
-						'location'	=> True,
-						'prodid'	=> True,
-						'resources'	=> True,
-						'summary'	=> True,
-						'contact'	=> True
-					)
-				),
-				'byday' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'byhour' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule' => True
-					)
-				),
-				'byminute' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'bymonth' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'bymonthday' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'bysecond' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'bysetpos' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule' => True
-					)
-				),
-				'byweekno' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'byyearday' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'class' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_class',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'class'	=> True
-					)
-				),
-				'cn' => Array(
-					'type'		=> 'text',
-					'quoted'	=> True,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True,
-						'organizer'	=> True
-					)
-				),
-				'count' => Array(
-					'type'		=> 'integer',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'cu' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_cu',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True
-					)
-				),
-				'delegated_from' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_mailto',
-					'quoted'	=> True,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True
-					)
-				),
-				'delegated_to' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_mailto',
-					'quoted'	=> True,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True
-					)
-				),
-				'dir' => Array(
-					'type'		=> 'dir',
-					'quoted'	=> True,
-					'to_text'	=> True,
-					'properties' => Array(
-						'attendee'	=> True,
-						'organizer'	=> True
-					)
-				),
-				'dtend' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_date',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'dtend'	=> True
-					)
-				),
-				'dtstamp' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_date',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'dtstamp'	=> True
-					)
-				),
-				'dtstart' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_date',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'dtstart'	=> True
-					)
-				),
-				'encoding' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_encoding',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attach'	=> True
-					)
-				),
-				'fmttype' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attach'	=> True
-					)
-				),
-				'fbtype' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_fbtype',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attach'	=> True
-					)
-				),
-				'freebusy' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'freebusy'	=> True
-					)
-				),
-				'freq' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_freq',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'	=> True
-					)
-				),
-				'interval' => Array(
-					'type'		=> 'integer',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'		=> True
-					)
-				),
-				'language' => Array(
-					'type'	=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'categories'	=> True,
-						'comment'	=> True,
-						'description'	=> True,
-						'location'	=> True,
-						'resources'	=> True,
-						'summary'	=> True,
-						'tzname'	=> True,
-						'attendee'	=> True,
-						'contact'	=> True,
-						'organizer'	=> True,
-						'x-type'	=> True
-					)
-				),
-				'last_modified' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_date',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'last_modified'	=> True
-					)
-				),
-				'mailto' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_mailto',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True,
-						'organizer'	=> True
-					)
-				),
-				'member' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_mailto',
-					'quoted'	=> True,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True
-					)
-				),
-				'partstat' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_partstat',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True,
-						'organizer'	=> True
-					)
-				),
-				'range' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_range',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'recurrence_id'	=> True
-					)
-				),
-				'related' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_related',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'related_to'	=> True
-					)
-				),
-				'role' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_role',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True,
-						'organizer'	=> True
-					)
-				),
-				'rsvp' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_rsvp',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True
-					)
-				),
-				'sent_by' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_mailto',
-					'quoted'	=> True,
-					'to_text'	=> False,
-					'properties' => Array(
-						'attendee'	=> True,
-						'organizer'	=> True
-					)
-				),
-				'tzid' => Array(
-					'type'		=> 'text',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'dtend'	=> True,
-						'due'	=> True,
-						'dtstart'	=> True,
-						'exdate'	=> True,
-						'rdate'		=> True,
-						'recurrence_id'	=> True
-					)
-				),
-				'until' => Array(
-					'type'		=> 'function',
-					'function'	=> 'switch_date',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'		=> True
-					)
-				),
-				'value' => Array(
-					'type'		=> 'value',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'calscale'	=> True,
-						'prodid'	=> True,
-						'method'	=> True,
-						'version'	=> True,
-						'attach'	=> True,
-						'categories'	=> True,
-						'class'		=> True,
-						'comment'	=> True,
-						'description'	=> True,
-						'geo'		=> True,
-						'location'	=> True,
-						'percent'	=> True,
-						'priority'	=> True,
-						'resources'	=> True,
-						'status'	=> True,
-						'summary'	=> True,
-						'completed'	=> True,
-						'dtend'		=> True,
-						'due'		=> True,
-						'dtstart'	=> True,
-						'duration'	=> True,
-						'freebusy'	=> True,
-						'transp'	=> True,
-						'tzid'		=> True,
-						'tzname'	=> True,
-						'tzoffsetfrom'	=> True,
-						'tzoffsetto'	=> True,
-						'tzurl'		=> True,
-						'attendee'	=> True,
-						'contact'	=> True,
-						'organizer'	=> True,
-						'recurrence_id'	=> True,
-						'url'		=> True,
-						'uid'		=> True,
-						'exdate'	=> True,
-						'exrule'	=> True,
-						'rdate'		=> True,
-						'rrule'		=> True,
-						'action'	=> True,
-						'repeat'	=> True,
-						'trigger'	=> True,
-						'created'	=> True,
-						'dtstamp'	=> True,
-						'last_modified'	=> True,
-						'sequence'	=> True,
-						'x_type'	=> True,
-						'request_status'=> True
-					)
-				),
-				'wkst' => Array(
-					'type'		=> 'string',
-					'quoted'		=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'rrule'		=> True
-					)
-				),
-				'x_type' => Array(
-					'type'		=> 'x_type',
-					'quoted'	=> False,
-					'to_text'	=> False,
-					'properties' => Array(
-						'calscale'	=> True,
-						'method'	=> True,
-						'prodid'	=> True,
-						'version'	=> True,
-						'attach'	=> True,
-						'categories'	=> True,
-						'class'		=> True,
-						'comment'	=> True,
-						'description'	=> True,
-						'geo'		=> True,
-						'location'	=> True,
-						'percent'	=> True,
-						'priority'	=> True,
-						'resources'	=> True,
-						'status'	=> True,
-						'summary'	=> True,
-						'completed'	=> True,
-						'dtend'		=> True,
-						'due'		=> True,
-						'dtstart'	=> True,
-						'duration'	=> True,
-						'freebusy'	=> True,
-						'transp'	=> True,
-						'tzid'		=> True,
-						'tzname'	=> True,
-						'tzoffsetfrom'	=> True,
-						'tzoffsetto'	=> True,
-						'tzurl'		=> True,
-						'attendee'	=> True,
-						'contact'	=> True,
-						'organizer'	=> True,
-						'recurrence_id'	=> True,
-						'url'		=> True,
-						'uid'		=> True,
-						'exdate'	=> True,
-						'exrule'	=> True,
-						'rdate'		=> True,
-						'rrule'		=> True,
-						'action'	=> True,
-						'repeat'	=> True,
-						'trigger'	=> True,
-						'created'	=> True,
-						'dtstamp'	=> True,
-						'last_modified'	=> True,
-						'sequence'	=> True,
-						'x_type'	=> True,
-						'request_status'=> True
-					)
-				)
-			);
-			if(!is_object($GLOBALS['phpgw']->datetime))
-			{
-				$GLOBALS['phpgw']->datetime = createobject('phpgwapi.datetime');
-			}
-		}
-
-		function set_var(&$event,$type,$value)
-		{
-			$type = strtolower(str_replace('-','_',$type));
-			$event[$type] = $value;
-			if(is_string($value))
-			{
-				$this->debug("Setting ".$type." = ".$value);
-			}
-			else
-			{
-				$this->debug("Setting ".$type." = "._debug_array($value,False));
-			}
-		}
-
-		function read_line_unfold($ical_text)
-		{
-			if($this->line < count($ical_text))
-			{
-				$str = str_replace("\r\n",'',$ical_text[$this->line]);
-				$this->line = $this->line + 1;
-				while(ereg("^[[:space:]]",$ical_text[$this->line]))
-				{
-					$str .= substr(str_replace("\r\n",'',$ical_text[$this->line]),1);
-					$this->line = $this->line + 1;
-				}
-				$this->debug("LINE : ".$str);
-				return $str;
-			}
-			else
-			{
-				return False;
-			}
-		}
-
-		function fold($str)
-		{
-			return $this->chunk_split==True ? chunk_split($str,FOLD_LENGTH,"\r\n") : $str."\r\n";
-		}
-
-		function strip_quotes($str)
-		{
-			return str_replace('"','',$str);
-		}
-
-		function from_text($str)
-		{
-			$str = str_replace("\\,",",",$str);
-			$str = str_replace("\\;",";",$str);
-			$str = str_replace("\\N","\n",$str);
-			$str = str_replace("\\n","\n",$str);
-			$str = str_replace("\\\\","\\",$str);
-			return "$str";
-		}
-
-		function to_text($str)
-		{
-			$str = str_replace("\\","\\\\",$str);
-			$str = str_replace(",","\\,",$str);
-			$str = str_replace(";","\\;",$str);
-			$str = str_replace("\n","\\n",$str);
-			return "$str";
-		}
-
-		function from_dir($str)
-		{
-			return str_replace('=3D','=',str_replace('%20',' ',$str));
-		}
-
-		function to_dir($str)
-		{
-			return str_replace('=','=3D',str_replace(' ','%20',$str));
-		}
-
-		/**
-		 * Searches all parameters allowed for a certain property
-		 *
-		 * @param string $property, every key from the $this->property
-		 * @return array with allowed parameters (keys from $this->parameters which list $property under 'properties'
-		 */
-		function find_parameters($property)
-		{
-			static  $cached_returns;
-
-			if(isset($cached_returns[$property]))
-			{
-				reset($cached_returns[$property]);
-				return $cached_returns[$property];
-			}
-
-			reset($this->parameter);
-			while(list($key,$param_array) = each($this->parameter))
-			{
-				if($param_array['properties'][$property])
-				{
-					$param[] = $key;
-					$this->debug('Property : '.$property.' = Parameter : '.$key);
-				}
-			}
-			reset($param);
-			$cached_returns[$property] = $param;
-			return $param;
-		}
-
-		function find_properties($ical_type)
-		{
-			static  $cached_returns;
-
-			if(isset($cached_returns[$ical_type]))
-			{
-				reset($cached_returns[$ical_type]);
-				return $cached_returns[$ical_type];
-			}
-
-			reset($this->property);
-			while(list($key,$param_array) = each($this->property))
-			{
-				if($param_array[$ical_type])
-				{
-					$prop[] = $key;
-				}
-			}
-			reset($prop);
-			$cached_returns[$ical_type] = $prop;
-			return $prop;
-		}
-
-		function new_ical()
-		{
-			return Array();
-		}
-
-		/*
-		* Parse Functions
-		*/
-
-		function parse_geo(&$event,$value)
-		{
-			if(count($return_value) == 2)
-			{
-				$event['lat'] = $return_value[0];
-				$event['lon'] = $return_value[1];
-			}
-		}
-
-		function parse_xtype(&$event,$majortype,$value)
-		{
-			$temp_x_type['name'] = strtoupper(substr($majortype,2));
-			$temp_x_type['value'] = $value;
-			$event['x_type'][] = $temp_x_type;
-		}
-
-		function parse_parameters(&$event,$majortype,$value)
-		{
-			if(!ereg('[\=\;]',$value) || $majortype == 'url')
-			{
-				$return_value[] = Array(
-					'param'	=> $majortype,
-					'value'	=> $value
-				);
-				$value = '';
-			}
-			elseif(ereg('(.*(\:\\\\)?.*):(.*)',$value,$temp))
-			{
-				$this->debug('Value : '._debug_array($temp,False));
-				$this->debug('Param '.$majortype.' Value : '.$temp[3]);
-				if($temp[3])
-				{
-					$return_value[] = Array(
-						'param'	=> $majortype,
-						'value'	=> $temp[3]
-					);
-					$value = str_replace(':MAILTO','',$temp[1]);
-				}
-				while(ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)',$value,$temp))
-				{
-					$this->debug('Value : '._debug_array($temp,False));
-					$this->debug('Param '.$temp[2].' Value : '.$temp[3]);
-					$return_value[] = Array(
-						'param'	=> $temp[2],
-						'value'	=> $temp[3]
-					);
-					$value = chop($temp[5]);
-					$this->debug('Value would be = '.$value);
-				}
-			}
-			else
-			{
-				while(ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)',$value,$temp))
-				{
-					$this->debug('Value : '._debug_array($temp,False));
-					$this->debug('Param '.$temp[2].' Value : '.$temp[3]);
-					$return_value[] = Array(
-						'param'	=> $temp[2],
-						'value'	=> $temp[3]
-					);
-					$value = chop($temp[5]);
-					$this->debug('Value would be = '.$value);
-				}
-			}
-
-			for($i=0;$i<count($return_value);$i++)
-			{
-				$name = strtolower($return_value[$i]['param']);
-				$value = $this->strip_quotes($return_value[$i]['value']);
-				if(substr($name,0,2) == 'x-')
-				{
-					$param = 'x_type';
-					$name = str_replace('-','_',$return_value[$i]['param']);
-				}
-				else
-				{
-					$param = str_replace('-','_',strtolower($name));
-					if(!isset($this->parameter[$param]) || $majortype == 'tzid')
-					{
-						if($majortype == 'attendee' || $majortype == 'organizer')
-						{
-							$param = 'mailto';
-							$name = $param;
-						}
-						else
-						{
-							$param = 'value';
-						}
-					}
-				}
-				// hack to write freebusy as value (freebusy:<value>) and not as param (freebusy:freebusy=<value>)
-				if ($name == 'freebusy') $name = 'value';
-
-				$this->debug('name : '.$name.' : Param = '.$param);
-				if(@$this->parameter[$param]['properties'][$majortype])
-				{
-					
-					switch(@$this->parameter[$param]['type'])
-					{
-						case 'dir':
-							$this->set_var($event,$name,$this->from_dir($value));
-							break;
-						case 'text':
-							$this->set_var($event,$name,$value);
-							break;
-						case 'x_type':
-							$this->parse_xtype($event,$name,$value);
-							break;
-						case 'function':
-							$function = $this->parameter[$param]['function'];
-							$this->set_var($event,$name,$this->$function($value));
-							break;
-						case 'uri':
-							if(@$this->parameter[$param]['to_text'])
-							{
-								$value = $this->to_text($value);
-							}
-							$this->set_var($event,$name,$value);
-							break;
-						case 'integer':
-							$this->set_var($event,$name,(int)$value);
-							break;
-						case 'value':
-							if(@$this->property[$majortype]['type'] == 'date-time')
-							{
-								$this->set_var($event,$param,$this->switch_date($name));
-							}
-							elseif($majortype == 'url')
-							{
-								$this->set_var($event,$param,$value);
-							}
-							elseif($value <> "\\n" && $value)
-							{
-								$this->set_var($event[$majortype],$param,$value);
-							}
-							$this->debug('Event : '._debug_array($event,False));
-							break;
-					}
-				}
-			}
-		}
-
-		function parse_value(&$event,$majortype,$value,$mode)
-		{
-			$var = Array();
-			$this->debug('Mode : '.$mode.' Majortype : '.$majortype);
-			$this->parse_parameters($var,$majortype,$value);
-			if($this->property[$majortype][$mode]['multiples'])
-			{
-				$this->debug(_debug_array($var,False));
-				$event[$majortype][] = $var;
-			}
-			else
-			{
-				$this->debug('Majortype : '.$majortype);
-				$this->debug('Property : '.$this->property[$majortype]['type']);
-				if($this->property[$majortype]['type'] == 'date-time')
-				{
-					$this->debug('Got a DATE-TIME type!');
-					$t_var = $var[$majortype];
-					unset($var[$majortype]);
-					@reset($t_var);
-					while(list($key,$val) = @each($t_var))
-					{
-						$var[$key] = $val;
-					}
-					$this->debug($majortype.' : '._debug_array($var,False));
-				}
-				$this->set_var($event,$majortype,$var);
-			}
-		}
-
-		/*
-		 * Build-Card Functions
-		 */
-
-		function build_xtype($x_type,$seperator='=')
-		{
-			$quote = '';
-			if($seperator == '=')
-			{
-				$quote = '"';
-			}
-
-			$return_value = $this->fold('X-'.$x_type['name'].$seperator.$quote.$x_type['value'].$quote);
-			if($seperator == '=')
-			{
-				return str_replace("\r\n",'',$return_value);
-			}
-			else
-			{
-				return $return_value;
-			}
-		}
-
-		function build_parameters($event,$property)
-		{
-			$str = '';
-			$include_mailto = False;
-			$include_datetime = False;
-			$param = $this->find_parameters($property);
-			if($property == 'exdate')
-			{
-				while(list($key,$value) = each($event))
-				{
-					$exdates[] = $this->switch_date($value);
-				}
-				return ':'.implode($exdates,',');
-			}
-			else
-			{
-				while(list($dumb_key,$key) = each($param))
-				{
-					if($key == 'value')
-					{
-						continue;
-					}
-					if($key == 'mailto')
-					{
-						$include_mailto = True;
-						continue;
-					}
-					$param_array = @$this->parameter[$key];
-					$type = @$this->parameter[$key]['type'];
-					if($type == 'date-time')
-					{
-						$include_datetime = True;
-						continue;
-					}
-					$quote = (@$this->parameter[$key]['quoted']?'"':'');
-					if(isset($event[$key]) && @$this->parameter[$key]['properties'][$property])
-					{
-						$change_text = @$this->parameter[$key]['to_text'];
-						$value = $event[$key];
-						if($change_text && $type == 'text')
-						{
-							$value = $this->to_text($value);
-						}
-						switch($type)
-						{
-							case 'dir':
-								$str .= ';'.str_replace('_','-',strtoupper($key)).'='.$quote.$this->to_dir($value).$quote;
-								break;
-							case 'function':
-								$str .= ';'.str_replace('_','-',strtoupper($key)).'=';
-								$function = $this->parameter[$key]['function'];
-								$this->debug($key.' Function Param : '.$value);
-								$str .= $quote.$this->$function($value).$quote;
-								break;
-							case 'text':
-							case 'string':
-								$str .= ';'.strtoupper($key).'='.$quote.$value.$quote;
-								break;
-							case 'date-time':
-								$str .= ($key=='until'?':':';UNTIL=').date('Ymd\THis',mktime($event['hour'],$event['min'],$event['sec'],$event['month'],$event['mday'],$event['year'])).(!@isset($event['tzid'])?'Z':'');
-								break;
-						}
-						unset($value);
-					}
-				}
-
-				if(!empty($event['x_type']))
-				{
-					$c_x_type = count($event['x_type']);
-					for($j=0;$j<$c_x_type;$j++)
-					{
-						$str .= ';'.$this->build_xtype($event['x_type'][$j],'=');
-					}
-				}
-				if(!empty($event['value']))
-				{
-					if($property == 'trigger')
-					{
-						$seperator = ';';
-					}
-					else
-					{
-						$seperator = ':';
-					}
-					$str .= $seperator.($this->parameter['value']['to_text']?$this->to_text($event['value']):$event['value']);
-				}
-				if($include_mailto == True)
-				{
-					$key = 'mailto';
-					$function = $this->parameter[$key]['function'];
-					$ret_value = $this->$function($event[$key]);
-					$str .= ($ret_value?':'.$ret_value:'');
-				}
-				if($include_datetime == True || @$this->property[$property]['type'] == 'date-time')
-				{
-					$str .= ':'.date('Ymd\THis',mktime($event['hour'],$event['min'],$event['sec'],$event['month'],$event['mday'],$event['year'])).(!@isset($event['tzid'])?'Z':'');
-				}
-				return ($property=='rrule'?':'.substr($str,1):$str);
-			}
-		}
-
-		function build_text($event,$property)
-		{
-			$str = '';
-			$param = $this->find_parameters($property);
-			while(list($dumb_key,$key) = each($param))
-			{
-				if(!empty($event[$key]) && $key != 'value')
-				{
-					$type = @$this->parameter[$key]['type'];
-					$quote = @$this->parameter[$key]['quote'];
-					if(@$this->parameter[$key]['to_text'] == True)
-					{
-						$value = $this->to_text($event[$key]);
-					}
-					else
-					{
-						$value = $event[$key];
-					}
-					switch($type)
-					{
-						case 'text':
-						$str .= ';'.strtoupper($key).'='.$quote.$value.$quote;
-						break;
-					}
-				}
-			}
-			if(!empty($event['x_type']))
-			{
-				$c_x_type = count($event['x_type']);
-				for($j=0;$j<$c_x_type;$j++)
-				{
-					$str .= ';'.$this->build_xtype($event['x_type'][$j],'=');
-				}
-			}
-			if(!empty($event['value']))
-			{
-				$str .= ':'.($this->parameter['value']['to_text']?$this->to_text($event['value']):$event['value']);
-			}
-			return $str;
-		}
-
-		function build_card_internals($ical_item,$event)
-		{
-			foreach($this->find_properties($ical_item) as $value)
-			{
-				$varray = $this->property[$value];
-
-				$type   = $varray['type'];
-				$to_text = $varray['to_text'];
-				$state  = @$varray[$ical_item]['state'];
-				$multiples  = @$varray[$ical_item]['multiples'];
-				switch($type)
-				{
-					case 'date-time':
-						if(!empty($event[$value]))
-						{
-							if($multiples && $value != 'exdate')
-							{
-								for($i=0;$i<count($event[$value]);$i++)
-								{
-									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
-								}
-							}
-							else
-							{
-								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
-							}
-						}
-						elseif($value == 'dtstamp' || $value == 'created')
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.gmdate('Ymd\THis\Z'));
-						}
-						break;
-					case 'uri':
-						if(!empty($event[$value]))
-						{
-							for($i=0;$i<count($event[$value]);$i++)
-							{
-								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$to_text));
-							}
-						}
-						break;
-					case 'recur':
-						if(!empty($event[$value]))
-						{
-							if($multiples)
-							{
-								for($i=0;$i<count($event[$value]);$i++)
-								{
-									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
-								}
-							}
-							else
-							{
-								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
-							}
-						}
-						break;
-					case 'integer':
-						if(!empty($event[$value]))
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$event[$value]);
-						}
-						elseif($value == 'sequence' || $value == 'percent_complete')
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':0');
-						}
-						break;
-					case 'function':
-						$str .= ';'.str_replace('_','-',strtoupper($value)).'=';
-						$function = @$this->parameter[$key]['function'];
-						$str .= (@$this->parameter[$key]['quoted']?'"':'').$this->$function($event[$key]).(@$this->parameter[$key]['quoted']?'"':'');
-						break;
-					case 'float':
-						if(!empty($event[$value]))
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$event[$value]['lat'].';'.$event[$value]['lon']);
-						}
-						break;
-					case 'text':
-						if(isset($event[$value]))
-						{
-							if(@$this->parameter[$key]['type'] != 'function')
-							{
-								if($multiples && count($event[$value]) > 1)
-								{
-									for($i=0;$i<count($event[$value]);$i++)
-									{
-										$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
-									}
-								}
-								else
-								{
-									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
-								}
-							}
-							else
-							{
-								$function = $this->parameter[$value]['function'];
-								if($multiples)
-								{
-									for($i=0;$i<count($event[$value]);$i++)
-									{
-										$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$this->$function($event[$value][$i]));
-									}
-								}
-								else
-								{
-									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$this->$function($event[$value]));
-								}
-							}
-						}
-						break;
-					case 'cal-address':
-						if(is_array($event[$value][0]))
-						{
-							for($j=0;$j<count($event[$value]);$j++)
-							{
-								$temp_output = $this->build_parameters($event[$value][$j],$value);
-								if($temp_output)
-								{
-									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$temp_output);
-								}
-							}
-						}
-						else
-						{
-							$temp_output = $this->build_parameters($event[$value],$value);
-							if($temp_output)
-							{
-								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$temp_output);
-							}
-						}
-						break;
-				}
-			}
-			if(!empty($event['x_type']))
-			{
-				for($i=0;$i<count($event['x_type']);$i++)
-				{
-					$str .= $this->build_xtype($event['x_type'][$i],':');
-				}
-			}
-
-			if($ical_item == 'vtimezone')
-			{
-				if($event['tzdata'])
-				{
-					for($k=0;$k<count($event['tzdata']);$k++)
-					{
-						$str .= 'BEGIN:'.strtoupper($event['tzdata'][$k]['type'])."\r\n";
-						$str .= $this->build_card_internals(strtolower($event['tzdata'][$k]['type']),$event['tzdata'][$k]);
-						$str .= 'END:'.strtoupper($event['tzdata'][$k]['type'])."\r\n";
-					}
-				}
-			}
-			elseif($event['alarm'])
-			{
-				for($k=0;$k<count($event['alarm']);$k++)
-				{
-					$str .= 'BEGIN:VALARM'."\r\n";
-					$str .= $this->build_card_internals('valarm',$event['alarm'][$k]);
-					$str .= 'END:VALARM'."\r\n";
-				}
-			}
-			return $str;
-		}
-
-		/*
-		* Switching Functions
-		*/
-
-		function switch_class($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'PRIVATE':
-						return PRIVATECAL;
-						break;
-					case 'PUBLIC':
-						return PUBLICCAL;
-						break;
-					case 'CONFIDENTIAL':
-						return CONFIDENTIAL;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch((int)$var)
-				{
-					case PRIVATECAL:
-						return 'PRIVATE';
-						break;
-					case PUBLICCAL:
-						return 'PUBLIC';
-						break;
-					case CONFIDENTIAL:
-						return 'CONFIDENTIAL';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_cu($var)
-		{
-			if(gettype($var) == 'string')
-			{
-				switch($var)
-				{
-					case 'INDIVIDUAL':
-						return INDIVIDUAL;
-						break;
-					case 'GROUP':
-						return GROUP;
-						break;
-					case 'RESOURCE':
-						return RESOURCE;
-						break;
-					case 'ROOM':
-						return ROOM;
-						break;
-					case 'UNKNOWN':
-						return UNKNOWN;
-						break;
-					default:
-						return OTHER;
-						break;
-				}
-			}
-			elseif(gettype($var) == 'integer')
-			{
-				switch($var)
-				{
-					case INDIVIDUAL:
-						return 'INDIVIDUAL';
-						break;
-					case GROUP:
-						return 'GROUP';
-						break;
-					case RESOURCE:
-						return 'RESOURCE';
-						break;
-					case ROOM:
-						return 'ROOM';
-						break;
-					case UNKNOWN:
-						return 'UNKNOWN';
-						break;
-					default:
-						return 'X-OTHER';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_date($var)
-		{
-		$this->debug('SWITCH_DATE: gettype = '.gettype($var));
-			if(is_string($var))
-			{
-				$dtime = Array();
-				if(strpos($var,':'))
-				{
-					$pos = explode(':',$var);
-					$var = $pos[1];
-				}
-				$this->set_var($dtime,'year',(int)(substr($var,0,4)));
-				$this->set_var($dtime,'month',(int)(substr($var,4,2)));
-				$this->set_var($dtime,'mday',(int)(substr($var,6,2)));
-				if(substr($var,8,1) == 'T')
-				{
-					$this->set_var($dtime,'hour',(int)(substr($var,9,2)));
-					$this->set_var($dtime,'min',(int)(substr($var,11,2)));
-					$this->set_var($dtime,'sec',(int)(substr($var,13,2)));
-					if(strlen($var) > 14)
-					{
-						if(substr($var,14,1) != 'Z')
-						{
-							if($this->api)
-							{
-								$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
-								if($dtime['hour'] < 0)
-								{
-									$dtime['mday'] -= 1;
-									$dtime['hour'] = 24 - $dtime['hour'];
-								}
-								elseif($dtime['hour'] >= 24)
-								{
-									$dtime['mday'] += 1;
-									$dtime['hour'] = $dtime['hour'] - 24;
-								}
-							}
-						}
-					}
-				}
-				else
-				{
-					$this->set_var($dtime,'hour',0);
-					$this->set_var($dtime,'min',0);
-					$this->set_var($dtime,'sec',0);
-					if($this->api)
-					{
-						$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
-						if($dtime['hour'] < 0)
-						{
-							$dtime['mday'] -= 1;
-							$dtime['hour'] = 24 - $dtime['hour'];
-						}
-						elseif($dtime['hour'] >= 24)
-						{
-							$dtime['mday'] += 1;
-							$dtime['hour'] = $dtime['hour'] - 24;
-						}
-					}
-				}
-				$this->debug('DATETIME : '._debug_array($dtime,False));
-				return $dtime;
-			}
-			elseif(is_array($var))
-			{
-				return date('Ymd\THis\Z',mktime($var['hour'],$var['min'],$var['sec'],$var['month'],$var['mday'],$var['year']));
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_encoding($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case '8BIT':
-						return _8BIT;
-						break;
-					case 'BASE64':
-						return _BASE64;
-						break;
-					default:
-						return OTHER;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case _8BIT:
-						return '8BIT';
-						break;
-					case _BASE64:
-						return 'BASE64';
-						break;
-					case OTHER:
-						return 'OTHER';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_fbtype($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'FREE':
-						return FREE;
-						break;
-					case 'BUSY':
-						return BUSY;
-						break;
-					case 'BUSY-UNAVAILABLE':
-						return BUSY_UNAVAILABLE;
-						break;
-					case 'BUSY-TENTATIVE':
-						return BUSY_TENTATIVE;
-						break;
-					default:
-						return OTHER;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case FREE:
-						return 'FREE';
-						break;
-					case BUSY:
-						return 'BUSY';
-						break;
-					case BUSY_UNAVAILABLE:
-						return 'BUSY-UNAVAILABLE';
-						break;
-					case BUSY_TENTATIVE:
-						return 'BUSY-TENTATIVE';
-						break;
-					default:
-						return 'OTHER';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_freq($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'SECONDLY':
-						return SECONDLY;
-						break;
-					case 'MINUTELY':
-						return MINUTELY;
-						break;
-					case 'HOURLY':
-						return HOURLY;
-						break;
-					case 'DAILY':
-						return DAILY;
-						break;
-					case 'WEEKLY':
-						return WEEKLY;
-						break;
-					case 'MONTHLY':
-						return MONTHLY;
-						break;
-					case 'YEARLY':
-						return YEARLY;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case SECONDLY:
-						return 'SECONDLY';
-						break;
-					case MINUTELY:
-						return 'MINUTELY';
-						break;
-					case HOURLY:
-						return 'HOURLY';
-						break;
-					case DAILY:
-						return 'DAILY';
-						break;
-					case WEEKLY:
-						return 'WEEKLY';
-						break;
-					case MONTHLY:
-						return 'MONTHLY';
-						break;
-					case YEARLY:
-						return 'YEARLY';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_mailto($var)
-		{
-			if(is_string($var))
-			{
-				if(strpos(' '.$var,':'))
-				{
-					$parts = explode(':',$var);
-					$var = $parts[1];
-				}
-
-				$parts = explode('@',$var);
-				$this->debug("Count of mailto parts : ".count($parts));
-				if(count($parts) == 2)
-				{
-					$this->debug("Splitting ".$parts[0]." @ ".$parts[1]);
-					$temp_address = Array();
-					$temp_address['user'] = $parts[0];
-					$temp_address['host'] = $parts[1];
-					return $temp_address;
-				}
-				else
-				{
-					return False;
-				}
-			}
-			elseif(is_array($var))
-			{
-				return $var['user'].'@'.$var['host'];
-			}
-		}
-
-		function switch_partstat($var)
-		{
-			$this->debug('PARTSTAT = '.$var);
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'NEEDS-ACTION':
-						return NEEDS_ACTION;
-						break;
-					case 'ACCEPTED':
-						return ACCEPTED;
-						break;
-					case 'DECLINED':
-						return DECLINED;
-						break;
-					case 'TENTATIVE':
-						return TENTATIVE;
-						break;
-					case 'DELEGATED':
-						return DELEGATED;
-						break;
-					case 'COMPLETED':
-						return COMPLETED;
-						break;
-					case 'IN-PROCESS':
-						return IN_PROCESS;
-						break;
-					default:
-						return OTHER;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch((int)$var)
-				{
-					case NEEDS_ACTION:
-						return 'NEEDS-ACTION';
-						break;
-					case ACCEPTED:
-						return 'ACCEPTED';
-						break;
-					case DECLINED:
-						return 'DECLINED';
-						break;
-					case TENTATIVE:
-						return 'TENTATIVE';
-						break;
-					case DELEGATED:
-						return 'DELEGATED';
-						break;
-					case COMPLETED:
-						return 'COMPLETED';
-						break;
-					case IN_PROCESS:
-						return 'IN-PROCESS';
-						break;
-					default:
-						return 'X-OTHER';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_range($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'THISANDPRIOR':
-						return THISANDPRIOR;
-						break;
-					case 'THISANDFUTURE':
-						return THISANDFUTURE;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case THISANDPRIOR:
-						return 'THISANDPRIOR';
-						break;
-					case THISANDFUTURE:
-						return 'THISANDFUTURE';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_related($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'START':
-						return START;
-						break;
-					case 'END':
-						return END;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case START:
-						return 'START';
-						break;
-					case END:
-						return 'END';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_reltype($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'PARENT':
-						return PARENT;
-						break;
-					case 'CHILD':
-						return CHILD;
-						break;
-					case 'SIBLING':
-						return SIBLING;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case PARENT:
-						return 'PARENT';
-						break;
-					case CHILD:
-						return 'CHILD';
-						break;
-					case SIBLING:
-						return 'SIBLING';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_role($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'NONE':
-						return NONE;
-						break;
-					case 'CHAIR':
-						return CHAIR;
-						break;
-					case 'REQ-PARTICIPANT':
-						return REQ_PARTICIPANT;
-						break;
-					case 'OPT-PARTICIPANT':
-						return OPT_PARTICIPANT;
-						break;
-					case 'NON-PARTICIPANT':
-						return NON_PARTICIPANT;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case NONE:
-						return 'NONE';
-						break;
-					case CHAIR:
-						return 'CHAIR';
-						break;
-					case REQ_PARTICIPANT:
-						return 'REQ-PARTICIPANT';
-						break;
-					case OPT_PARTICIPANT:
-						return 'OPT-PARTICIPANT';
-						break;
-					case NON_PARTICIPANT:
-						return 'NON-PARTICIPANT';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_rsvp($var)
-		{
-			if(is_string($var))
-			{
-				if($var == 'TRUE')
-				{
-					return 1;
-				}
-				elseif($var == 'FALSE')
-				{
-					return 0;
-				}
-			}
-			elseif(is_int($var) || $var == False)
-			{
-				if($var == 1)
-				{
-					return 'TRUE';
-				}
-				elseif($var == 0)
-				{
-					return 'FALSE';
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		function switch_transp($var)
-		{
-			if(is_string($var))
-			{
-				switch($var)
-				{
-					case 'TRANSPARENT':
-						return TRANSPARENT;
-						break;
-					case 'OPAQUE':
-						return OPAQUE;
-						break;
-				}
-			}
-			elseif(is_int($var))
-			{
-				switch($var)
-				{
-					case TRANSPARENT:
-						return 'TRANSPARENT';
-						break;
-					case OPAQUE:
-						return 'OPAQUE';
-						break;
-				}
-			}
-			else
-			{
-				return $var;
-			}
-		}
-
-		/*
-		 * The brunt of the class
-		 */
-
-		function parse($ical_text)
-		{
-			$begin_regexp = '^';
-			$semi_colon_regexp = '[\;\:]';
-			$colon_regexp = '[\:]';
-			$catch_all_regexp = '(.*)';
-			$end_regexp = '$';
-			$property_regexp = $begin_regexp.'([A-Z\-]*)'.$semi_colon_regexp.$catch_all_regexp.$end_regexp;
-			$param_regexp = $begin_regexp.$catch_all_regexp.':'.$catch_all_regexp.$end_regexp;
-
-			$mode = 'none';
-			$text = $this->read_line_unfold($ical_text);
-			while($text)
-			{
-				ereg($property_regexp,$text,$temp);
-				$majortype = str_replace('-','_',strtolower($temp[1]));
-				$value = chop($temp[2]);
-
-				if($mode != 'none' && ($majortype != 'begin' && $majortype != 'end'))
-				{
-					$this->debug('PARSE:MAJORTYPE : '.$majortype);
-					if(isset($this->property[$majortype]))
-					{
-						$state = @$this->property[$majortype]["$mode"]['state'];
-						$type = @$this->property[$majortype]['type'];
-						$multiples = @$this->property[$majortype]["$mode"]['multiples'];
-						$do_to_text = @$this->property[$majortype]['to_text'];
-					}
-					elseif(substr($majortype,0,2) == 'x_')
-					{
-						$state = 'optional';
-						$type = 'xtype';
-						$multiples = True;
-						$do_to_test = True;
-					}
-					else
-					{
-						$state = '';
-					}
-				}
-				else
-				{
-					$state = 'required';
-				}
-
-				if($majortype == 'duration')
-				{
-					unset($dur);
-
-					// Split �DURATION�
-					list($_f_['day_raw'], $_f_['time_raw']) = split('T', substr($value, 1, strlen($value)-1));
-
-					/* Datecode */
-					if(isset($_f_['day_raw']) || $_f_['day_raw'])
-					{
-						/* Days */
-						if(strstr($_f_['day_raw'],'D'))
-						{
-							$dur['days'] = eregi_replace("([0-9]+)D(.*)", "\\1", $_f_['day_raw']);
-						}
-
-						/* Weeks */
-						if(strstr($_f_['day_raw'],'W'))
-						{
-							$dur['weeks'] = eregi_replace("([^|.*]+D)?([0-9]+)W", "\\2", $_f_['day_raw']);
-						}
-					}
-
-					/* Timecode */
-					if(isset($_f_['time_raw']) || $_f_['time_raw'])
-					{
-						/* Hours */
-						if(strstr($_f_['time_raw'],'H'))
-						{
-							$dur['hours'] = eregi_replace("([0-9]+)H(.*)", "\\1", $_f_['time_raw']);
-						}
-
-						/* Minutes */
-						if(strstr($_f_['time_raw'],'M'))
-						{
-							$dur['minutes'] = eregi_replace("([^|.*]+H)?([0-9]+)M(.*)", "\\2", $_f_['time_raw']);
-						}
-
-						/* Seconds */
-						if(strstr($_f_['time_raw'],'S'))
-						{
-							$dur['seconds'] = eregi_replace("([^|.*]+M)?([0-9]+)S(.*)", "\\2", $_f_['time_raw']);
-						}
-					}
-
-					$dur['raw'] = Array(
-						'timecode' => $_f_['time_raw'],
-						'datecode' => $_f_['day_raw'],
-						'all'      => $value
-					);
-					/* Add new parameters in Event */
-					$this->set_var($event, $majortype, $dur);
-				}
-
-				if($majortype == 'begin')
-				{
-					$tmode = $mode;
-					$mode = strtolower($value);
-					switch(strtolower($value))
-					{
-						case 'daylight':
-						case 'standard':
-							$t_event = Array();
-							$t_event = $event;
-							$event = Array();
-							break;
-						case 'valarm':
-							if($tmode == 'vevent' || $tmode == 'vtodo')
-							{
-								$t_event = $event;
-								unset($event);
-								$event = Array();
-							}
-							else
-							{
-								$mode = $tmode;
-							}
-							break;
-						case 'vcalendar':
-							$ical = $this->new_ical();
-							break;
-						case 'vevent':
-						case 'vfreebusy':
-						case 'vjournal':
-						case 'vtimezone':
-						case 'vtodo':
-							$event = Array();
-							break;
-					}
-					$event['type'] = strtolower($value);
-				}
-				elseif($majortype == 'end')
-				{
-					$mode = 'none';
-					switch(strtolower($value))
-					{
-						case 'daylight':
-						case 'standard':
-							$tzdata[] = $event;
-							unset($event);
-							$event = $t_event;
-							unset($t_event);
-							$mode = 'vtimezone';
-							break;
-						case 'valarm':
-							$alarm[] = $event;
-							unset($event);
-							$event = $t_event;
-							unset($t_event);
-							$mode = $tmode;
-							break;
-						case 'vevent':
-							if(!empty($alarm))
-							{
-								$event['alarm'] = $alarm;
-								unset($alarm);
-							}
-							$this->event[] = $event;
-							unset($event);
-							break;
-						case 'vfreebusy':
-							$this->freebusy[] = $event;
-							unset($event);
-							break;
-						case 'vjournal':
-							$this->journal[] = $event;
-							unset($event);
-							break;
-						case 'vtimezone':
-							if(!empty($tzdata))
-							{
-								$event['tzdata'] = $tzdata;
-								unset($tzdata);
-							}
-							$this->timezone[] = $event;
-							unset($event);
-							break;
-						case 'vtodo':
-							if(!empty($alarm))
-							{
-								$event['alarm'] = $alarm;
-								unset($alarm);
-							}
-							$this->todo[] = $event['alarm'];
-							unset($event);
-							break;
-						case 'vcalendar':
-							$this->ical = $ical;
-							$this->ical['event'] = $this->event;
-							$this->ical['freebusy'] = $this->freebusy;
-							$this->ical['journal'] = $this->journal;
-							$this->ical['timezone'] = $this->timezone;
-							$this->ical['todo'] = $this->todo;
-							break 2;
-					}
-				}
-				elseif($majortype == 'prodid' || $majortype == 'version' || $majortype == 'method' || $majortype == 'calscale')
-				{
-					$this->parse_parameters($ical,$majortype,$this->from_text($value));
-				}
-				elseif($state == 'optional' || $state == 'required')
-				{
-					$this->debug('Mode : '.$mode.' Majortype : '.$majortype);
-					if($do_to_text)
-					{
-						$value = $this->from_text($value);
-					}
-					switch($type)
-					{
-						case 'text':
-							$this->parse_parameters($event,$majortype,$value);
-							break;
-						case 'recur':
-						case 'date-time':
-						case 'cal-address':
-							$this->parse_value($event,$majortype,$value,$mode);
-							break;
-						case 'integer':
-							if($multiples)
-							{
-								$event[$majortype][] = (int)$value;
-							}
-							else
-							{
-								$this->set_var($event,$majortype,(int)$value);
-							}
-							break;
-						case 'float':
-							$event->$majortype = new class_geo;
-							$this->parse_geo($event->$majortype,$value);
-							break;
-						case 'utc-offset':
-							$this->set_var($event,$majortype,(int)$value);
-							break;
-						case 'uri':
-							$new_var = Array();
-							$this->parse_parameters($new_var,$majortype,$value);
-							if($multiples)
-							{
-								switch($mode)
-								{
-									case 'valarm':
-										$alarm['attach'][] = $new_var;
-										break;
-									default:
-										$event[$majortype][] = $new_var;
-										break;
-								}
-							}
-							else
-							{
-								$event[$majortype] = $new_var;
-							}
-							unset($new_var);
-							break;
-						case 'xtype':
-							$this->parse_xtype($event,$majortype,$value);
-							break;
-					}
-				}
-				$text = $this->read_line_unfold($ical_text);
-			}
-			return $this->ical;
-		}
-
-		function build_ical($ical)
-		{
-			$var = Array(
-				'timezone',
-				'event',
-				'todo',
-				'journal',
-				'freebusy'
-			);
-
-			$str = 'BEGIN:VCALENDAR'."\r\n";
-			$str .= $this->fold('PRODID'.$this->build_text($ical['prodid'],'prodid'));
-			$str .= $this->fold('VERSION'.$this->build_text($ical['version'],'version'));
-			$str .= $this->fold('METHOD'.$this->build_text($ical['method'],'method'));
-			foreach($var as $vtype)
-			{
-				if($ical[$vtype])
-				{
-					for($i=0;$i<count($ical[$vtype]);$i++)
-					{
-						$str .= 'BEGIN:V'.strtoupper($vtype)."\r\n";
-						$str .= $this->build_card_internals('v'.$vtype,$ical[$vtype][$i]);
-						$str .= 'END:V'.strtoupper($vtype)."\r\n";
-					}
-				}
-			}
-			$str .= 'END:VCALENDAR'."\r\n";
-
-			return $str;
-		}
-
-		function switch_to_phpgw_status($partstat)
-		{
-			switch($partstat)
-			{
-				case 0:
-					return 'U';
-					break;
-				case 1:
-					return 'A';
-					break;
-				case 2:
-					return 'R';
-					break;
-				case 3:
-					return 'T';
-					break;
-				default:
-					return 'U';
-					break;
-			}
-		}
-
-		function switch_phpgw_status($status)
-		{
-			switch($status)
-			{
-				case 'U':
-					return 0;
-					break;
-				case 'A':
-					return 1;
-					break;
-				case 'R':
-					return 2;
-					break;
-				case 'T':
-					return 3;
-					break;
-			}
-		}
-
-		function is_owner($part_record)
-		{
-			if(($part_record['mailto']['user'].'@'.$part_record['mailto']['host'] == $GLOBALS['phpgw_info']['user']['preferences']['email']['address']) ||
-				($part_record['cn'] == $GLOBALS['phpgw_info']['user']['account_lid']))
-			{
-				return True;
-			}
-			else
-			{
-				return False;
-			}
-		}
-
-		function check_owner(&$event,$ical,$so_event)
-		{
-			if(!isset($event['participant'][$GLOBALS['phpgw_info']['user']['account_id']]))
-			{
-				if(isset($ical['organizer']))
-				{
-					if($this->is_owner($ical['organizer']))
-					{
-						$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);
-						$so_event->add_attribute('participants',$this->switch_to_phpgw_status($ical['organizer']['partstat']),$GLOBALS['phpgw_info']['user']['account_id']);
-					}
-				}
-				elseif(isset($ical['attendee']))
-				{
-					$attendee_count = count($ical['attendee']);
-
-					for($j=0;$j<$attendee_count;$j++)
-					{
-						if($this->is_owner($ical['attendee'][$j]))
-						{
-							$so_event->add_attribute('participants',$this->switch_to_phpgw_status($ical['attendee'][$j]['partstat']),(int)$GLOBALS['phpgw_info']['user']['account_id']);
-						}
-					}
-				}
-				else
-				{
-					$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);
-					$so_event->add_attribute('participants','A',$GLOBALS['phpgw_info']['user']['account_id']);
-				}
-			}
-		}
-
-		function import_file()
-		{
-			if($_FILES['uploadedfile']['tmp_name'] == 'none' || $_FILES['uploadedfile']['tmp_name'] == '')
-			{
-				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',
-						Array(
-							'menuaction'	=> 'calendar.uiicalendar.import',
-							'action'	=> 'GetFile'
-						)
-					)
-				);
-				$GLOBALS['phpwg']->common->phpgw_exit();
-			}
-			$uploaddir = $GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;
-
-			srand((double)microtime()*1000000);
-			$random_number = rand(100000000,999999999);
-			$newfilename = md5($_FILES['uploadedfile']['tmp_name'].", ".$uploadedfile_name.", "
-				. time() . getenv("REMOTE_ADDR") . $random_number );
-
-			$filename = $uploaddir . $newfilename;
-
-			move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $filename);
-			return $filename;
-		}
-
-		function import($mime_msg='')
-		{
-			if($_FILES['uploadedfile']['tmp_name'] != 'none' && $_FILES['uploadedfile']['tmp_name'] != '')
-			{
-				$filename = $this->import_file();
-				$fp=fopen($filename,'rt');
-				$mime_msg = fread($fp, filesize($filename));
-				fclose($fp);
-				unlink($filename);
-
-				/* explode can fail easily, so pre-chew the ical file */
-				$mime_msg = preg_replace("/(\r\n|\r)/", "\n", $mime_msg);	/* dos2unix */
-				$mime_msg = preg_replace("/\n\n+/", "\n", $mime_msg);	/* strip duplicate newlines */
-				$mime_msg = explode("\n",$mime_msg); 	/* explode the sanitized message into itself */
-			}
-			elseif(!$mime_msg)
-			{
-				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',
-						Array(
-							'menuaction'	=> 'calendar.uiicalendar.import',
-							'action'	=> 'GetFile'
-						)
-					)
-				);
-				$GLOBALS['phpwg']->common->phpgw_exit();
-			}
-
-			if(!is_object($GLOBALS['uicalendar']))
-			{
-				$so_event = createobject('calendar.socalendar',
-					Array(
-						'owner'	=> 0,
-						'filter'	=> '',
-						'category'	=> ''
-					)
-				);
-			}
-			else
-			{
-				$so_event = $GLOBALS['uicalendar']->bo->so;
-			}
-
-			$datetime_vars = Array(
-				'start'		=> 'dtstart',
-				'end'		=> 'dtend',
-				'modtime'	=> 'dtstamp',
-				'modtime'	=> 'last_modified'
-			);
-
-			$date_array = Array(
-				'Y'	=> 'year',
-				'm'	=> 'month',
-				'd'	=> 'mday',
-				'H'	=> 'hour',
-				'i'	=> 'min',
-				's'	=> 'sec'
-			);
-
-			/* time limit should be controlled elsewhere */
-			@set_time_limit(0);
-
-			$GLOBALS['phpgw_info']['user']['preferences'] = $GLOBALS['phpgw']->preferences->create_email_preferences();
-			$users_email = $GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
-			$cats = CreateObject('phpgwapi.categories');
-			$ical = $this->parse($mime_msg);
-			switch($ical['version']['value'])
-			{
-				case '1.0':
-					$cat_sep = ';';
-					break;
-				case '2.0':
-				default:
-					$cat_sep = ',';
-					break;
-			}
-			$c_events = count($ical['event']);
-			for($i=0;$i<$c_events;$i++)
-			{
-				if($ical['event'][$i]['uid']['value'])
-				{
-					$uid_exists = $so_event->find_uid($ical['event'][$i]['uid']['value']);
-				}
-				else
-				{
-					$uid_exists = False;
-				}
-				if($uid_exists)
-				{
-					$event = $so_event->read_entry($uid_exists);
-					$this->check_owner($event,$ical['event'][$i],$so_event);
-					$event = $so_event->get_cached_event();
-					$so_event->add_entry($event);
-				}
-				else
-				{
-					$so_event->event_init();
-					$so_event->add_attribute('id',0);
-					$so_event->add_attribute('reference',0);
-					if($ical['event'][$i]['uid']['value'])
-					{
-						$so_event->add_attribute('uid',$ical['event'][$i]['uid']['value']);
-					}
-					if($ical['event'][$i]['summary']['value'])
-					{
-						$so_event->set_title($ical['event'][$i]['summary']['value']);
-					}
-					if($ical['event'][$i]['description']['value'])
-					{
-						$so_event->set_description($ical['event'][$i]['description']['value']);
-					}
-					if($ical['event'][$i]['location']['value'])
-					{
-						$so_event->add_attribute('location',$ical['event'][$i]['location']['value']);
-					}
-					if(isset($ical['event'][$i]['priority']))
-					{
-						$so_event->add_attribute('priority',$ical['event'][$i]['priority']);
-					}
-					else
-					{
-						$so_event->add_attribute('priority',2);
-					}
-					if(!isset($ical['event'][$i]['class']))
-					{
-						$ical['event'][$i]['class'] = 1;
-					}
-					$so_event->set_class($ical['event'][$i]['class']);
-
-					@reset($datetime_vars);
-					while(list($e_datevar,$i_datevar) = each($datetime_vars))
-					{
-						if(isset($ical['event'][$i][$i_datevar]))
-						{
-							$temp_time = $so_event->maketime($ical['event'][$i][$i_datevar]) + $GLOBALS['phpgw']->datetime->tz_offset;
-							@reset($date_array);
-							while(list($key,$var) = each($date_array))
-							{
-								$event[$e_datevar][$var] = (int)(date($key,$temp_time));
-							}
-							$so_event->set_date($e_datevar,$event[$e_datevar]['year'],$event[$e_datevar]['month'],$event[$e_datevar]['mday'],$event[$e_datevar]['hour'],$event[$e_datevar]['min'],$event[$e_datevar]['sec']);
-						}
-					}
-					if(!isset($ical['event'][$i]['categories']['value']) || !$ical['event'][$i]['categories']['value'])
-					{
-						$so_event->set_category(0);
-					}
-					else
-					{
-						$ical_cats = Array();
-						if(strpos($ical['event'][$i]['categories']['value'],$cat_sep))
-						{
-							$ical_cats = explode($cat_sep,$ical['event'][$i]['categories']['value']);
-						}
-						else
-						{
-							$ical_cats[] = $ical['event'][$i]['categories']['value'];
-						}
-
-						@reset($ical_cats);
-						$cat_id_nums = Array();
-						while(list($key,$cat) = each($ical_cats))
-						{
-							if(!$cats->exists('appandmains',$cat))
-							{
-								$cats->add(
-									Array(
-										'name'	=> $cat,
-										'descr'	=> $cat,
-										'parent'	=> '',
-										'access'	=> 'private',
-										'data'	=> ''
-									)
-								);
-							}
-							$cat_id_nums[] = $cats->name2id($cat);
-						}
-						@reset($cat_id_nums);
-						if(count($cat_id_nums) > 1)
-						{
-							$so_event->set_category(implode($cat_id_nums,','));
-						}
-						else
-						{
-							$so_event->set_category($cat_id_nums[0]);
-						}
-					}
-
-					/* rrule */
-					if(isset($ical['event'][$i]['rrule']) || isset($ical['event'][$i]['duration']))
-					{
-						/* recur_enddate */
-						if(isset($ical['event'][$i]['rrule']['until']))
-						{
-							$recur_enddate['year']  = (int)($ical['event'][$i]['rrule']['until']['year']);
-							$recur_enddate['month'] = (int)($ical['event'][$i]['rrule']['until']['month']);
-							$recur_enddate['mday']  = (int)($ical['event'][$i]['rrule']['until']['mday']);
-							$recur_enddate['hour']  = (int)($ical['event'][$i]['rrule']['until']['hour']);
-							$recur_enddate['min']  = (int)($ical['event'][$i]['rrule']['until']['min']);
-							$recur_enddate['sec']  = (int)($ical['event'][$i]['rrule']['until']['sec']);
-						}
-						elseif( isset($ical['event'][$i]['duration']) )
-						{
-							/* Create timecode for strtotime */
-							$ptimer = mktime($ical['event'][$i]['dtstart']['hour'],
-								$ical['event'][$i]['dtstart']['min'],
-								$ical['event'][$i]['dtstart']['sec'],
-								$ical['event'][$i]['dtstart']['month'],
-								$ical['event'][$i]['dtstart']['mday'],
-								$ical['event'][$i]['dtstart']['year']);
-
-							/* 
-							 * Subtract 1 second so we don't overlap with the beginning of
-							 * another event.
-							 */
-
-							/* handle events with duration in weeks */
-							if ($ical['event'][$i]['duration']['weeks']		&&
-								($ical['event'][$i]['duration']['hours'] == 0)	&&
-								($ical['event'][$i]['duration']['minutes'] == 0))
-							{
-								$ical['event'][$i]['duration']['days'] =
-									($ical['event'][$i]['duration']['days'] +
-									($ical['event'][$i]['duration']['weeks']*7)) - 1;
-
-								unset($ical['event'][$i]['duration']['weeks']);
-
-								$ical['event'][$i]['duration']['hours'] = "23";
-								$ical['event'][$i]['duration']['minutes'] = "59";
-								$ical['event'][$i]['duration']['seconds'] = "59";
-							}
-							/* handle events with duration  in days */
-							if(($ical['event'][$i]['duration']['days'] && $ical['event'][$i]['duration']['hours'] == 0) &&
-							   ($ical['event'][$i]['duration']['minutes'] == 0))
-							{
-								$ical['event'][$i]['duration']['days']--;
-								$ical['event'][$i]['duration']['hours'] = "23";
-								$ical['event'][$i]['duration']['minutes'] = "59";
-								$ical['event'][$i]['duration']['seconds'] = "59";
-							}
-
-							/* Create string contains datetime for strtotime */
-							$pdate = "+";
-							if(isset($ical['event'][$i]['duration']['weeks']))
-								$pdate .= $ical['event'][$i]['duration']['weeks'] . " weeks ";
-
-							if(isset($ical['event'][$i]['duration']['days']))
-								$pdate .= $ical['event'][$i]['duration']['days'] . " days ";
-
-							if(isset($ical['event'][$i]['duration']['hours']))
-								$pdate .= $ical['event'][$i]['duration']['hours'] . " hours ";
-
-							if(isset($ical['event'][$i]['duration']['minutes']))
-								$pdate .= $ical['event'][$i]['duration']['minutes'] . " minutes ";
-
-							if(isset($ical['event'][$i]['duration']['seconds']))
-								$pdate .= $ical['event'][$i]['duration']['seconds'] . " seconds ";
-
-							/* What is datetime in 2192? */
-							$enddate = strtotime($pdate, $ptimer);
-							list(
-								$recur_enddate['year'],
-								$recur_enddate['month'],
-								$recur_enddate['mday'],
-								$recur_enddate['hour'],
-								$recur_enddate['min'],
-								$recur_enddate['sec']
-							) = split(":", date("Y:m:d:H:i:s", $enddate));
-
-							/* Set End of event */
-							$so_event->set_end(
-								$recur_enddate['year'],
-								$recur_enddate['month'],
-								$recur_enddate['mday'],
-								$recur_enddate['hour'],
-								$recur_enddate['min'],
-								$recur_enddate['sec']
-							);
-						}
-						else
-						{
-							$recur_enddate['year'] = 0;
-							$recur_enddate['month'] = 0;
-							$recur_enddate['mday'] = 0;
-						}
-
-						/* recur_data */
-						$recur_data = 0;
-						if(isset($ical['event'][$i]['rrule']['byday']))
-						{
-							$week_days = Array(
-								MCAL_M_SUNDAY		=> 'SU',
-								MCAL_M_MONDAY		=> 'MO',
-								MCAL_M_TUESDAY		=> 'TU',
-								MCAL_M_WEDNESDAY	=> 'WE',
-								MCAL_M_THURSDAY		=> 'TH',
-								MCAL_M_FRIDAY		=> 'FR',
-								MCAL_M_SATURDAY		=> 'SA'
-							);
-							@reset($week_days);
-							while(list($key,$val) = each($week_days))
-							{
-								if(strpos(' '.$ical['event'][$i]['rrule']['byday'],$val))
-								{
-									$recur_data += $key;
-								}
-							}
-						}
-
-						/* interval */
-						if(!isset($ical['event'][$i]['rrule']['interval']))
-						{
-							$interval = 1;
-						}
-						else
-						{
-							$interval = (int)$ical['event'][$i]['rrule']['interval'];
-						}
-
-						/* recur_type */
-						switch($ical['event'][$i]['rrule']['freq'])
-						{
-							case SECONDLY:
-								$so_event->set_recur_secondly($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval);
-								break;
-							case MINUTELY:
-								$so_event->set_recur_minutely($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval);
-								break;
-							case HOURLY:
-								$so_event->set_recur_hourly($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval);
-								break;
-							case DAILY:
-								$so_event->set_recur_daily($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval);
-								break;
-							case WEEKLY:
-								$so_event->set_recur_weekly($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval,$recur_data);
-								break;
-							case MONTHLY:
-								$so_event->set_recur_monthly_mday($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval);
-								break;
-							case YEARLY:
-								$so_event->set_recur_yearly($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval);
-								break;
-						}
-
-						if(isset($ical['event'][$i]['rrule']['until']))
-						{
-							$so_event->add_attribute('recur_enddate',$ical['event'][$i]['rrule']['until']['year'],'year');
-							$so_event->add_attribute('recur_enddate',$ical['event'][$i]['rrule']['until']['month'],'month');
-							$so_event->add_attribute('recur_enddate',$ical['event'][$i]['rrule']['until']['mday'],'mday');
-							$so_event->add_attribute('recur_enddate',$ical['event'][$i]['rrule']['until']['hour'],'hour');
-							$so_event->add_attribute('recur_enddate',$ical['event'][$i]['rrule']['until']['minute'],'min');
-							$so_event->add_attribute('recur_enddate',$ical['event'][$i]['rrule']['until']['second'],'sec');
-						}
-					}
-					else
-					{
-						$so_event->set_recur_none();
-					}
-
-					/* the organizer must be the current user doing the importing */
-					if(!isset($ical['event'][$i]['organizer']) || !$this->is_owner($ical['event'][$i]['organizer']))
-					{
-						$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);
-						$so_event->add_attribute('participants','A',$GLOBALS['phpgw_info']['user']['account_id']);
-					}
-
-					/* if the original organizer is an egroupware user, add the original user as an event participant */
-					/* NB: ['mailto'] has two parts, ['user'], containing the username, and ['host'], containing the domain of the user's email address */
-					if (isset($ical['event'][$i]['organizer']['mailto']['user']) && $GLOBALS['phpgw']->accounts->exists($ical['event'][$i]['organizer']['mailto']['user']) == True)
-					{
-						$so_event->add_attribute('participants','A',(int)$GLOBALS['phpgw']->accounts->name2id($ical['event'][$i]['organizer']['mailto']['user']));
-					}
-
-					$event = $so_event->get_cached_event();
-					$so_event->add_entry($event);
-				}
-			}
-			Header('Location: '.$GLOBALS['phpgw']->link('/index.php',
-					Array(
-						'menuaction'	=> 'calendar.uicalendar.view',
-						'cal_id'	=> $event['id']
-					)
-				)
-			);
-			$GLOBALS['phpgw']->common->phpgw_exit();
-		}
-
-		function export($params)
-		{
-			$event_id = $params['l_event_id'] ? $params['l_event_id'] : $_GET['cal_id'];
-			$this->chunk_split = $params['chunk_split'];
-			$method = $params['method'] ? $params['method'] : 'publish';
-
-			$string_array = Array(
-				'summary'		=> 'description',
-				'location'		=> 'location',
-				'uid'			=> 'uid'
-			);
-
-			$cats = CreateObject('phpgwapi.categories');
-
-			if(!is_array($event_id))
-			{
-				$ids[] = $event_id;
-			}
-			else
-			{
-				$ids = $event_id;
-			}
-
-			$ical = $this->new_ical();
-
-			$this->set_var($ical['prodid'],'value','-//eGroupWare//eGroupWare '.$GLOBALS['phpgw_info']['apps']['calendar']['version'].' MIMEDIR//'.strtoupper($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']));
-			$this->set_var($ical['version'],'value','1.0');
-			$this->set_var($ical['method'],'value',strtoupper($method));
-
-			if(!$GLOBALS['phpgw_info']['flags']['included_classes']['uicalendar'])
-			{
-				if(!$GLOBALS['phpgw_info']['flags']['included_classes']['bocalendar'])
-				{
-					$so_event = createobject('calendar.socalendar',
-						Array(
-							'owner'	=> 0,
-							'filter'	=> '',
-							'category'	=> ''
-						)
-					);
-				}
-				else
-				{
-					$so_event = $GLOBALS['bocalendar']->so;
-				}
-			}
-			else
-			{
-				$so_event = $GLOBALS['uicalendar']->bo->so;
-			}
-
-			foreach($ids as $event)
-			{
-				$ical_event = Array();
-				if (!is_array($event))
-				{
-					$event = $so_event->read_entry($event);
-				}
-				if($event['alarm'])
-				{
-					foreach($event['alarm'] as $alarm)
-					{
-						$ical_temp = Array();
-						$ical_temp['action']['value'] = 'DISPLAY';
-						$ical_temp['description']['value'] = $alarm['text'];
-						$this->set_var($ical_temp['trigger'],'value','VALUE=DATE-TIME:'.date('Ymd\THis\Z',$alarm['time']),'valarm');
-						$ical_event['alarm'][] = $ical_temp;
-					}
-				}
-
-				// $event has times in user's time zone, so have to adjust them to GMT, which is used by ical
-				// To do that one must substract the users time zone difference with the server and then substract the server's time zone difference with GMT
-				$gmt_offset = date('O');  // server's offset to GMT
-				$offset = ((int)(substr($gmt_offset, 0, 3)) + $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']) * 60 + (int)(substr($gmt_offset, 3, 2));
-				$event['start']['min']   -= $offset;
-				$event['end']['min']     -= $offset;
-				$event['modtime']['min'] -= $offset;
-
-				$ical_event['priority'] = $event['priority'];
-				$ical_event['class'] = (int)$event['public'];
-				$dtstart_mktime = $so_event->maketime($event['start']);
-				$this->parse_value($ical_event,'dtstart',date('Ymd\THis\Z',$dtstart_mktime),'vevent');
-				$dtend_mktime = $so_event->maketime($event['end']);
-				$this->parse_value($ical_event,'dtend',date('Ymd\THis\Z',$dtend_mktime),'vevent');
-				$mod_mktime = $so_event->maketime($event['modtime']);
-				$this->parse_value($ical_event,'last_modified',date('Ymd\THis\Z',$mod_mktime),'vevent');
-				foreach($string_array as $ical_value => $event_value)
-				{
-					if($event[$event_value])
-					{
-						$this->set_var($ical_event[$ical_value],'value',$event[$event_value]);
-					}
-				}
-
-				if ($event['category'])
-				{
-					$cats->categories(0,'calendar');
-					foreach(explode(',',$event['category']) as $cat)
-					{
-						$_cat = $cats->return_single($cat);
-						$cat_string[] = $_cat[0]['name'];
-					}
-					@reset($cat_string);
-					$this->set_var($ical_event['categories'],'value',implode($cat_string,','));
-				}
-
-				if(count($event['participants']) > 1)
-				{
-					if(!is_object($db))
-					{
-						$db = $GLOBALS['phpgw']->db;
-					}
-					foreach($event['participants'] as $part => $status)
-					{
-						$GLOBALS['phpgw']->accounts->get_account_name($part,$lid,$fname,$lname);
-						$name = $fname.' '.$lname;
-
-						$owner_status = $this->switch_partstat((int)$this->switch_phpgw_status($event['participants'][$part]));
-
-						$mailto = $GLOBALS['phpgw']->accounts->id2name($part,'account_email');
-
-						$str = 'CN="'.$name.'";PARTSTAT='.$owner_status.':'.$mailto;
-						if($part == $event['owner'])
-						{
-							$str = 'ROLE=CHAIR;'.$str;
-						}
-						else
-						{
-							$str = 'ROLE=REQ-PARTICIPANT;'.$str;
-						}
-						if ($method != 'reply' || $part == $GLOBALS['phpgw_info']['user']['account_id'])
-						{
-							$this->parse_value($ical_event,'attendee',$str,'vevent');
-						}
-						if($part == $event['owner'])
-						{
-							$this->parse_value($ical_event,'organizer',$str,'vevent');
-						}
-					}
-				}
-				if($event['recur_type'])
-				{
-					$str = '';
-					switch($event['recur_type'])
-					{
-						case MCAL_RECUR_SECONDLY:
-							$str .= 'FREQ=SECONDLY';
-							break;
-						case MCAL_RECUR_MINUTELY:
-							$str .= 'FREQ=MINUTELY';
-							break;
-						case MCAL_RECUR_HOURLY:
-							$str .= 'FREQ=HOURLY';
-							break;
-						case MCAL_RECUR_DAILY:
-							$str .= 'FREQ=DAILY';
-							break;
-						case MCAL_RECUR_WEEKLY:
-							$str .= 'FREQ=WEEKLY';
-							if($event['recur_data'])
-							{
-								$str .= ';BYDAY=';
-								for($i=1;$i<MCAL_M_ALLDAYS;$i=$i*2)
-								{
-									if($i & $event['recur_data'])
-									{
-										switch($i)
-										{
-											case MCAL_M_SUNDAY:
-												$day[] = 'SU';
-												break;
-											case MCAL_M_MONDAY:
-												$day[] = 'MO';
-												break;
-											CASE MCAL_M_TUESDAY:
-												$day[] = 'TU';
-												break;
-											case MCAL_M_WEDNESDAY:
-												$day[] = 'WE';
-												break;
-											case MCAL_M_THURSDAY:
-												$day[] = 'TH';
-												break;
-											case MCAL_M_FRIDAY:
-												$day[] = 'FR';
-												break;
-											case MCAL_M_SATURDAY:
-												$day[] = 'SA';
-												break;
-										}
-									}
-								}
-								$str .= implode(',',$day);
-							}
-							break;
-						case MCAL_RECUR_MONTHLY_MDAY:
-							break;
-						case MCAL_RECUR_MONTHLY_WDAY:
-							break;
-						case MCAL_RECUR_YEARLY:
-							$str .= 'FREQ=YEARLY';
-							break;
-					}
-					if($event['recur_interval'])
-					{
-						$str .= ';INTERVAL='.$event['recur_interval'];
-					}
-					if($event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 0)
-					{
-						$recur_mktime = $so_event->maketime($event['recur_enddate']) - $GLOBALS['phpgw']->datetime->tz_offset;
-						$str .= ';UNTIL='.date('Ymd\THis\Z',$recur_mktime);
-					}
-					$this->parse_value($ical_event,'rrule',$str,'vevent');
-
-					$exceptions = $event['recur_exception'];
-					if(is_array($exceptions))
-					{
-						foreach($exceptions as $except_datetime)
-						{
-							$ical_event['exdate'][] = $this->switch_date(date('Ymd\THis\Z',$except_datetime));
-						}
-					}
-				}
-				$ical_events[] = $ical_event;
-			}
-
-			$ical['event'] = $ical_events;
-
-			// iCals are by default utf-8
-			return $GLOBALS['phpgw']->translation->convert($this->build_ical($ical),$GLOBALS['phpgw']->translation->charset(),'utf-8');
-		}
-
-		function freebusy($params=False)
-		{
-			if (!$params) $params = $_GET;
-			$this->chunk_split = $params['chunk_split'];
-			$method = $params['method'] ? $params['method'] : 'publish';
-			$user  = is_numeric($params['user']) ? (int) $params['user'] : $GLOBALS['phpgw']->accounts->name2id($params['user']);
-			$start = isset($params['start']) ? $params['start'] : date('Ymd');
-			$end   = isset($params['end']) ? $params['end'] : (date('Y')+1).date('md');
-
-			$this->bo = CreateObject('calendar.bocalendar');
-			$events_per_day = $this->bo->store_to_cache(array(
-				'owner'  => $user,
-				'syear'  => (int) substr($start,0,4),
-				'smonth' => (int) substr($start,4,2),
-				'sday'   => (int) substr($start,6,2),
-				'eyear'  => (int) substr($end,0,4),
-				'emonth' => (int) substr($end,4,2),
-				'eday'   => (int) substr($end,6,2),
-				'no_doubles' => True,	// report events only on the startday
-			));
-			if (!is_array($events_per_day)) $events_per_day = array();
-			
-			$browser = CreateObject('phpgwapi.browser');
-			$browser->content_header($GLOBALS['phpgw']->accounts->id2name($user).'.ifb','text/calendar');
-
-			$ical = $this->new_ical();
-			$this->set_var($ical['prodid'],'value','-//eGroupWare//eGroupWare '.$GLOBALS['phpgw_info']['apps']['calendar']['version'].' MIMEDIR//'.strtoupper($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']));
-			$this->set_var($ical['version'],'value','1.0');
-			$this->set_var($ical['method'],'value',strtoupper($method));
-
-			$ical_freebusy = array();
-			
-			$mailto = $GLOBALS['phpgw']->accounts->id2name($user,'account_email');
-			$name = $GLOBALS['phpgw']->common->grab_owner_name($user);
-
-			$str = 'CN="'.$name.'";MAILTO='.$mailto;
-			$this->parse_value($ical_freebusy,'organizer',$str,'vfreebusy');
-			
-			$freebusy_url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/calendar/freebusy.php?user='.$GLOBALS['phpgw_info']['user']['account_lid']/* not sure if this should be in the file .'&password='.$GLOBALS['phpgw_info']['user']['preferences']['calendar']['freebusy_pw']*/;
-			if ($freebusy_url[0] == '/')
-			{
-				$freebusy_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$freebusy_url;
-			}
-			$this->parse_value($ical_freebusy,'url',$freebusy_url,'vfreebusy');
-
-			$this->parse_value($ical_freebusy,'dtstart',$start.'T000000Z','vfreebusy');
-			$this->parse_value($ical_freebusy,'dtend',$end.'T000000Z','vfreebusy');
-
-			// $event has times in user's time zone, so have to adjust them to GMT, which is used by ical
-			// To do that one must substract the users time zone difference with the server and then substract the server's time zone difference with GMT
-			$gmt_offset = date('O');  // server's offset to GMT
-			$offset = ((int)(substr($gmt_offset, 0, 3)) + $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']) * 60 + (int)(substr($gmt_offset, 3, 2));
-
-			foreach($events_per_day as $day => $events)
-			{
-				foreach($events as $event)
-				{
-					$event['start']['min']   -= $offset;
-					$event['end']['min']     -= $offset;
-			
-					$dtstart_mktime = $this->bo->so->maketime($event['start']);
-					$dtend_mktime = $this->bo->so->maketime($event['end']);
-					$this->parse_value($ical_freebusy,'freebusy',date('Ymd\THis\Z',$dtstart_mktime).'/'.date('Ymd\THis\Z',$dtend_mktime),'vfreebusy');
-				}
-			}
-
-			$ical['freebusy'][0] =& $ical_freebusy;
-			//_debug_array($ical);
-
-			// iCals are by default utf-8
-			echo $GLOBALS['phpgw']->translation->convert($this->build_ical($ical),$GLOBALS['phpgw']->translation->charset(),'utf-8');
-		}
-
-		function debug($str='')
-		{
-			if($this->debug_str)
-			{
-				echo $str."<br>\n";
-			}
-		}
-	}
-?>
diff --git a/calendar/inc/class.calendar_holiday.inc.php b/calendar/inc/class.calendar_holiday.inc.php
deleted file mode 100755
index dfe61cc9c7..0000000000
--- a/calendar/inc/class.calendar_holiday.inc.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar Holidays                                           *
-  * http://www.egroupware.org                                                *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	class calendar_holiday
-	{
-		var $db;
-		var $year;
-		var $tz_offset;
-		var $holidays = Array();
-		var $index = Array();
-		var $users = Array();
-		var $datetime;
-
-		function calendar_holiday($owner='')
-		{
-			$this->datetime = CreateObject('phpgwapi.datetime');
-			$this->db = $GLOBALS['phpgw']->db;
-			if(@$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
-			{
-				$this->users['user'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
-			}
-			else
-			{
-				$this->users['user'] = 'US';
-			}
-			$owner_id = get_account_id($owner);
-			if($owner_id != $GLOBALS['phpgw_info']['user']['account_id'])
-			{
-				$owner_pref = CreateObject('phpgwapi.preferences',$owner_id);
-				$owner_prefs = $owner_pref->read_repository();
-				if(isset($owner_prefs['calendar']['locale']) && $owner_prefs['common']['country'])
-				{
-					$this->users['owner'] = $owner_prefs['common']['country'];
-				}
-				else
-				{
-					$this->users['owner'] = 'US';
-				}
-			}
-			if($GLOBALS['phpgw_info']['server']['auto_load_holidays'] == True)
-			{
-				while(list($key,$value) = each($this->users))
-				{
-					$this->is_network_load_needed($value);
-				}
-			}
-		}
-
-		function is_network_load_needed($locale)
-		{
-			$sql = "SELECT count(*) FROM phpgw_cal_holidays WHERE locale='".$locale."'";
-			$this->db->query($sql,__LINE__,__FILE__);
-			$this->db->next_record();
-			$rows = $this->db->f(0);
-			if($rows==0)
-			{
-				$this->load_from_network($locale);
-			}
-		}
-
-		function save_holiday($holiday)
-		{
-			if(isset($holiday['hol_id']) && $holiday['hol_id'])
-			{
-	//			echo "Updating LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
-				$sql = "UPDATE phpgw_cal_holidays SET name='".$holiday['name']."', mday=".$holiday['mday'].', month_num='.$holiday['month_num'].', occurence='.$holiday['occurence'].', dow='.$holiday['dow'].', observance_rule='.(int)$holiday['observance_rule'].' WHERE hol_id='.$holiday['hol_id'];
-			}
-			else
-			{
-	//			echo "Inserting LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
-				$sql = 'INSERT INTO phpgw_cal_holidays(locale,name,mday,month_num,occurence,dow,observance_rule) '
-					. "VALUES('".strtoupper($holiday['locale'])."','".$holiday['name']."',".$holiday['mday'].','.$holiday['month_num'].','.$holiday['occurence'].','.$holiday['dow'].','.(int)$holiday['observance_rule'].")";
-			}
-			$this->db->query($sql,__LINE__,__FILE__);
-		}
-
-		function delete_holiday($id)
-		{
-			$sql = 'DELETE FROM phpgw_cal_holidays WHERE hol_id='.$id;
-			$this->db->query($sql,__LINE__,__FILE__);
-		}
-
-		function delete_locale($locale)
-		{
-			$sql = "DELETE FROM phpgw_cal_holidays WHERE locale='".$locale."'";
-			$this->db->query($sql,__LINE__,__FILE__);
-		}
-
-		function load_from_network($locale)
-		{
-			@set_time_limit(0);
-
-			// get the file that contains the calendar events for your locale
-			// "http://www.egroupware.org/headlines.rdf";
-			$network = CreateObject('phpgwapi.network');
-			if(isset($GLOBALS['phpgw_info']['server']['holidays_url_path']) && $GLOBALS['phpgw_info']['server']['holidays_url_path'] != 'localhost')
-			{
-				$load_from = $GLOBALS['phpgw_info']['server']['holidays_url_path'];
-			}
-			else
-			{
-				$pos = strpos(' '.$GLOBALS['phpgw_info']['server']['webserver_url'],$_SERVER['HTTP_HOST']);
-				if($pos == 0)
-				{
-					switch($_SERVER['SERVER_PORT'])
-					{
-						case 80:
-							$http_protocol = 'http://';
-							break;
-						case 443:
-							$http_protocol = 'https://';
-							break;
-					}
-					$server_host = $http_protocol.$_SERVER['HTTP_HOST'].$GLOBALS['phpgw_info']['server']['webserver_url'];
-				}
-				else
-				{
-					$server_host = $GLOBALS['phpgw_info']['server']['webserver_url'];
-				}
-				$load_from = $server_host.'/calendar/setup';
-			}
-	//		echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale)."<br>\n";
-			$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale));
-			if(!$lines)
-			{
-				return False;
-			}
-			$c_lines = count($lines);
-			for($i=0;$i<$c_lines;$i++)
-			{
-	//			echo 'Line #'.$i.' : '.$lines[$i]."<br>\n";
-				$holiday = explode("\t",$lines[$i]);
-				if(count($holiday) == 7)
-				{
-					$holiday['locale'] = $holiday[0];
-					$holiday['name'] = addslashes($holiday[1]);
-					$holiday['mday'] = (int)$holiday[2];
-					$holiday['month_num'] = (int)$holiday[3];
-					$holiday['occurence'] = (int)$holiday[4];
-					$holiday['dow'] = (int)$holiday[5];
-					$holiday['observance_rule'] = (int)$holiday[6];
-					$holiday['hol_id'] = 0;
-					$this->save_holiday($holiday);
-				}
-			}
-		}
-
-		function read_holiday()
-		{
-			$this->year = (int)$GLOBALS['phpgw']->calendar->tempyear;
-
-			$sql = $this->build_holiday_query();
-			if($sql == False)
-			{
-				return False;
-			}
-			$this->holidays = Null;
-			$this->db->query($sql,__LINE__,__FILE__);
-
-			$i = 0;
-			$temp_locale = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
-			while($this->db->next_record())
-			{
-				$this->index[$this->db->f('hol_id')] = $i;
-				$this->holidays[$i]['locale'] = $this->db->f('locale');
-				$this->holidays[$i]['name'] = $GLOBALS['phpgw']->strip_html($this->db->f('name'));
-				$this->holidays[$i]['day'] = (int)$this->db->f('mday');
-				$this->holidays[$i]['month'] = (int)$this->db->f('month_num');
-				$this->holidays[$i]['occurence'] = (int)$this->db->f('occurence');
-				$this->holidays[$i]['dow'] = (int)$this->db->f('dow');
-				$this->holidays[$i]['observance_rule'] = $this->db->f('observance_rule');
-				if(count($this->users) == 2 && $this->users[0] != $this->users[1])
-				{
-					if($this->holidays[$i]['locale'] == $this->users[1])
-					{
-						$this->holidays[$i]['owner'] = 'user';
-					}
-					else
-					{
-						$this->holidays[$i]['owner'] = 'owner';
-					}
-				}
-				else
-				{
-					$this->holidays[$i]['owner'] = 'user';
-				}
-				$c = $i;
-				$GLOBALS['phpgw_info']['user']['preferences']['common']['country'] = $this->holidays[$i]['locale'];
-				$holidaycalc = CreateObject('calendar.holidaycalc');
-				$this->holidays[$i]['date'] = $holidaycalc->calculate_date($this->holidays[$i], $this->holidays, $this->year, $this->datetime, $c);
-				unset($holidaycalc);
-				if($c != $i)
-				{
-					$i = $c;
-				}
-				$i++;
-			}
-			$this->holidays = $this->sort_by_date($this->holidays);
-			$GLOBALS['phpgw_info']['user']['preferences']['common']['country'] = $temp_locale;
-			return $this->holidays;
-		}
-
-		function build_list_for_submission($locale)
-		{
-			$i = -1;
-			$this->db->query("SELECT * FROM phpgw_cal_holidays WHERE locale='".$locale."'");
-			while($this->db->next_record())
-			{
-				$i++;
-				$holidays[$i]['locale'] = $this->db->f('locale');
-				$holidays[$i]['name']   = $GLOBALS['phpgw']->strip_html($this->db->f('name'));
-				$holidays[$i]['day']    = (int)$this->db->f('mday');
-				$holidays[$i]['month']  = (int)$this->db->f('month_num');
-				$holidays[$i]['occurence'] = (int)$this->db->f('occurence');
-				$holidays[$i]['dow']    = (int)$this->db->f('dow');
-				$holidays[$i]['observance_rule'] = $this->db->f('observance_rule');
-			}
-			return $holidays;
-		}
-
-		function build_holiday_query()
-		{
-			if(!isset($this->users) || count($this->users) == 0)
-			{
-				return False;
-			}
-			$sql = 'SELECT * FROM phpgw_cal_holidays WHERE locale in (';
-			$find_it = '';
-			reset($this->users);
-			while(list($key,$value) = each($this->users))
-			{
-				if($find_it)
-				{
-					$find_it .= ',';
-				}
-				$find_it .= "'".$value."'";
-			}
-			$sql .= $find_it.')';
-
-			return $sql;
-		}
-
-		function sort_by_date($holidays)
-		{
-			$c_holidays = count($holidays);
-			for($outer_loop=0;$outer_loop<($c_holidays - 1);$outer_loop++)
-			{
-				$outer_date = $holidays[$outer_loop]['date'];
-				for($inner_loop=$outer_loop;$inner_loop<$c_holidays;$inner_loop++)
-				{
-					$inner_date = $holidays[$inner_loop]['date'];
-					if($outer_date > $inner_date)
-					{
-						$temp = $holidays[$inner_loop];
-						$holidays[$inner_loop] = $holidays[$outer_loop];
-						$holidays[$outer_loop] = $temp;
-					}
-				}
-			}
-			return $holidays;
-		}
-
-		function find_date($date)
-		{
-			if($this->holidays == Null)
-			{
-				return False;
-			}
-
-			$c_holidays = count($this->holidays);
-			for($i=0;$i<$c_holidays;$i++)
-			{
-				if($this->holidays[$i]['date'] > $date)
-				{
-					$i = $c_holidays + 1;
-				}
-				elseif($this->holidays[$i]['date'] == $date)
-				{
-					$return_value[] = $i;
-				}
-			}
-	//		echo 'Searching for '.$GLOBALS['phpgw']->common->show_date($date).'  Found = '.count($return_value)."<br>\n";
-			if(isset($return_value))
-			{
-				return $return_value;
-			}
-			else
-			{
-				return False;
-			}
-		}
-
-		function get_holiday($index)
-		{
-			return $this->holidays[$index];
-		}
-
-		function get_name($id)
-		{
-			return $this->holidays[$id]['name'];
-		}
-	}
-?>
diff --git a/calendar/inc/class.calendar_icap.inc.php b/calendar/inc/class.calendar_icap.inc.php
deleted file mode 100755
index 492c36ed9e..0000000000
--- a/calendar/inc/class.calendar_icap.inc.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - ICal Calendar                                               *
-  * http://www.egroupware.org                                                *
-  * Created by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	if (isset($GLOBALS['phpgw_info']['flags']['included_classes']['calendar_']) &&
-		$GLOBALS['phpgw_info']['flags']['included_classes']['calendar_'] == True)
-	{
-		return;
-	}
-
-	$GLOBALS['phpgw_info']['flags']['included_classes']['calendar_'] = True;
-
-	class calendar_ extends calendar__
-	{
-		function open($calendar='',$user='',$passwd='',$options='')
-		{
-			if($user=='')
-			{
-				$user = $GLOBALS['phpgw_info']['user']['account_lid'];
-			}
-			elseif(is_int($user))
-			{
-				$this->user = $GLOBALS['phpgw']->accounts->id2name($user);
-			}
-			elseif(is_string($user))
-			{
-				$this->user = $user;
-			}
-			if($options != '')
-			{
-				$this->stream = mcal_open('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd,$options);
-			}
-			else
-			{
-				$this->stream = mcal_open('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd);
-			}
-		}
-
-		function popen($calendar='',$user='',$passwd='',$options='')
-		{
-			if($user=='')
-			{
-				$this->user = $GLOBALS['phpgw_info']['user']['account_lid'];
-			}
-			elseif(is_int($user))
-			{
-				$this->user = $GLOBALS['phpgw']->accounts->id2name($user);
-			}
-			elseif(is_string($user))
-			{
-				$this->user = $user;
-			}
-			if($options != '')
-			{
-				$this->stream = mcal_popen('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd,$options);
-			}
-			else
-			{
-				$this->stream = mcal_popen('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd);
-			}
-		}
-
-		function reopen($calendar,$options='')
-		{
-			if($options != '')
-			{
-				$this->stream = mcal_reopen($calendar,$options);
-			}
-			else
-			{
-				$this->stream = mcal_reopen($calendar);
-			}
-		}
-
-		function close($options='')
-		{
-			if($options != '')
-			{
-				return mcal_close($this->stream,$options);
-			}
-			else
-			{
-				return mcal_close($this->stream);
-			}
-		}
-
-		function create_calendar($calendar)
-		{
-			return mcal_create_calendar($this->stream,$calendar);
-		}
-
-		function rename_calendar($old_name,$new_name)
-		{
-			return mcal_rename_calendar($this->stream,$old_name,$new_name);
-		}
-
-		function delete_calendar($calendar)
-		{
-			return mcal_delete_calendar($this->stream,$calendar);
-		}
-
-		function fetch_event($event_id,$options='')
-		{
-			if(!isset($this->stream))
-			{
-				return False;
-			}
-
-			$this->event = CreateObject('calendar.calendar_item');
-
-			if($options != '')
-			{
-				$this->event = mcal_fetch_event($this->stream,$event_id,$options);
-			}
-			else
-			{
-				$this->event = mcal_fetch_event($this->stream,$event_id);
-			}
-
-			// Need to load the $this->event variable with the $event structure from
-			// the mcal_fetch_event() call
-			// Use http://www.php.net/manual/en/function.mcal-fetch-event.php as the reference
-			// This only needs legacy support
-
-			return $this->event;
-		}
-
-		function list_events($startYear,$startMonth,$startDay,$endYear='',$endMonth='',$endYear='')
-		{
-			if($endYear != '' && $endMonth != '' && $endDay != '')
-			{
-				$events = mcal_list_events($this->stream,$startYear,$startMonth,$startDay,$endYear,$endMonth,$endYear);
-			}
-			else
-			{
-				$events = mcal_list_events($this->stream,$startYear,$startMonth,$startDay);
-			}
-
-			return $events;
-		}
-
-		function append_event()
-		{
-			return mcal_append_event($this->stream);
-		}
-
-		function store_event()
-		{
-			return mcal_store_event($this->stream);
-		}
-
-		function delete_event($event_id)
-		{
-			return mcal_delete_event($this->stream,$event_id);
-		}
-
-		function snooze($event_id)
-		{
-			return mcal_snooze($this->stream,$event_id);
-		}
-
-		function list_alarms($begin_year='',$begin_month='',$begin_day='',$end_year='',$end_month='',$end_day='')
-		{
-			if($end_day == '')
-			{
-				if($end_month == '')
-				{
-					if($end_year == '')
-					{
-						if($begin_day == '')
-						{
-							if($begin_month == '')
-							{
-								if($begin_year == '')
-								{
-									return mcal_list_alarms($this->stream);
-								}
-								else
-								{
-									return mcal_list_alarms($this->stream,$begin_year);
-								}
-							}
-							else
-							{
-								return mcal_list_alarms($this->stream,$begin_year,$begin_month);
-							}
-						}
-						else
-						{
-							return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day);
-						}
-					}
-					else
-					{
-						return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year);
-					}
-				}
-				else
-				{
-					return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year,$end_month);
-				}
-			}
-			else
-			{
-				return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year,$end_month,$end_day);
-			}
-		}
-
-		function event_init()
-		{
-			$this->event = CreateObject('calendar.calendar_item');
-			return mcal_event_init($this->stream);
-		}
-
-		function set_category($category='')
-		{
-			calendar__::set_category($category);
-			return mcal_event_set_category($this->stream,$category);
-		}
-
-		function set_title($title='')
-		{
-			calendar__::set_title($title);
-			return mcal_event_set_title($this->stream,$title);
-		}
-
-		function set_description($description='')
-		{
-			calendar__::set_description($description);
-			return mcal_event_set_description($this->stream,$description);
-		}
-
-		function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			calendar__::set_start($year,$month,$day,$hour,$min,$sec);
-			return mcal_event_set_start($this->stream,$year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			calendar__::set_end($year,$month,$day,$hour,$min,$sec);
-			return mcal_event_set_end($this->stream,$year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_alarm($alarm)
-		{
-			calendar__::set_alarm($alarm);
-			return mcal_event_set_alarm ($this->stream,$alarm);
-		}
-
-		function set_class($class)
-		{
-			calendar__::set_class($class);
-			return mcal_event_set_class($this->stream,$class);
-		}
-
-		// The function definition doesn't look correct...
-		// Need more information for this function
-		function next_recurrence($weekstart,$next)
-		{
-			return mcal_next_recurrence($this->stream,$weekstart,$next);
-		}
-
-		function set_recur_none()
-		{
-			calendar__::set_recur_none();
-			return mcal_event_set_recur_none($this->stream);
-		}
-
-		function set_recur_secondly($year,$month,$day,$interval)
-		{
-			calendar__::set_recur_secondly($year,$month,$day,$interval);
-			//return mcal_event_set_recur_secondly($this->stream,$year,$month,$day,$interval);
-			return 0; // stub - mcal_event_set_recur_secondly() does not exist
-		}
-
-		function set_recur_minutely($year,$month,$day,$interval)
-		{
-			calendar__::set_recur_minutely($year,$month,$day,$interval);
-			//return mcal_event_set_recur_minutely($this->stream,$year,$month,$day,$interval);
-			return 0; // stub - mcal_event_set_recur_minutely() does not exist
-		}
-
-		function set_recur_hourly($year,$month,$day,$interval)
-		{
-			calendar__::set_recur_hourly($year,$month,$day,$interval);
-			//return mcal_event_set_recur_hourly($this->stream,$year,$month,$day,$interval);
-			return 0; // stub - mcal_event_set_recur_hourly() does not exist
-		}
-
-		function set_recur_daily($year,$month,$day,$interval)
-		{
-			calendar__::set_recur_daily($year,$month,$day,$interval);
-			return mcal_event_set_recur_daily($this->stream,$year,$month,$day,$interval);
-		}
-
-		function set_recur_weekly($year,$month,$day,$interval,$weekdays)
-		{
-			calendar__::set_recur_weekly($year,$month,$day,$interval,$weekdays);
-			return mcal_event_set_recur_weekly($this->stream,$year,$month,$day,$interval,$weekdays);
-		}
-
-		function set_recur_monthly_mday($year,$month,$day,$interval)
-		{
-			calendar__::set_recur_monthly_mday($year,$month,$day,$interval);
-			return mcal_event_set_recur_monthly_mday($this->stream,$year,$month,$day,$interval);
-		}
-
-		function set_recur_monthly_wday($year,$month,$day,$interval)
-		{
-			calendar__::set_recur_monthly_wday($year,$month,$day,$interval);
-			return mcal_event_set_recur_monthly_wday($this->stream,$year,$month,$day,$interval);
-		}
-
-		function set_recur_yearly($year,$month,$day,$interval)
-		{
-			calendar__::set_recur_yearly($year,$month,$day,$interval);
-			return mcal_event_set_recur_yearly($this->stream,$year,$month,$day,$interval);
-		}
-
-		function fetch_current_stream_event()
-		{
-			$this->event = mcal_fetch_current_stream_event($this->stream);
-			return $this->event;
-		}
-
-		function add_attribute($attribute,$value)
-		{
-			calendar__::add_attribute($attribute,$value);
-			return mcal_event_add_attribute($this->stream,$attribute,$value);
-		}
-
-		function expunge()
-		{
-			return mcal_expunge($this->stream);
-		}
-
-		/**************** Local functions for ICAL based Calendar *****************/
-
-		function set_status($id,$owner,$status)
-		{
-			$status_code_short = Array(
-				REJECTED =>	'R',
-				NO_RESPONSE	=> 'U',
-				TENTATIVE	=>	'T',
-				ACCEPTED	=>	'A'
-			);
-			$this->add_attribute('status['.$owner.']',$status_code_short[$status]);
-	//		$this->stream->query("UPDATE calendar_entry_user SET cal_status='".$status_code_short[$status]."' WHERE cal_id=".$id." AND cal_login=".$owner,__LINE__,__FILE__);
-			return True;
-		}
-	}
diff --git a/calendar/inc/class.holidaycalc.inc.php b/calendar/inc/class.holidaycalc.inc.php
index 11861a5d76..ead1d01590 100755
--- a/calendar/inc/class.holidaycalc.inc.php
+++ b/calendar/inc/class.holidaycalc.inc.php
@@ -1,34 +1,34 @@
 <?php 
-  /**************************************************************************\
-  * eGroupWare - holidaycalc                                                 *
-  * http://www.egroupware.org                                                *
-  * Based on Yoshihiro Kamimura <your@itheart.com>                           *
-  *          http://www.itheart.com                                          *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* eGroupWare - holidaycalc                                                 *
+	* http://www.egroupware.org                                                *
+	* Based on Yoshihiro Kamimura <your@itheart.com>                           *
+	*          http://www.itheart.com                                          *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
 
-	if (empty($GLOBALS['phpgw_info']['user']['preferences']['common']['country']))
+	if (empty($GLOBALS['egw_info']['user']['preferences']['common']['country']))
 	{
 		$rule = 'US';
 	}
 	else
 	{
-		$rule = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
+		$rule = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 	}
 
-	$calc_include = PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_'.$rule.'.inc.php';
+	$calc_include = EGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_'.$rule.'.inc.php';
 	if(@file_exists($calc_include))
 	{
 		include($calc_include);
 	}
 	else
 	{
-		include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_US.inc.php');
+		include(EGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_US.inc.php');
 	}
 ?>
diff --git a/calendar/inc/class.holidaycalc_JP.inc.php b/calendar/inc/class.holidaycalc_JP.inc.php
index e5c457a15a..1f1b549cbb 100755
--- a/calendar/inc/class.holidaycalc_JP.inc.php
+++ b/calendar/inc/class.holidaycalc_JP.inc.php
@@ -1,18 +1,24 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - holidaycalc_JP                                              *
-  * http://www.egroupware.org                                              *
-  * Based on Yoshihiro Kamimura <your@itheart.com>                           *
-  *          http://www.itheart.com                                          *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* eGroupWare - holidaycalc_JP                                              *
+	* http://www.egroupware.org                                              *
+	* Based on Yoshihiro Kamimura <your@itheart.com>                           *
+	*          http://www.itheart.com                                          *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
 
+	/**
+	 * Calculations for calendar JP holidays
+	 *
+	 * @package calendar
+	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+	 */
 	class holidaycalc
 	{
 		function calculate_date($holiday, &$holidays, $year, &$i)
@@ -23,7 +29,7 @@
 
 			if ($holiday['day'] == 0 && $holiday['dow'] != 0 && $holiday['occurence'] != 0)
 			{
-				$dow = $GLOBALS['phpgw']->datetime->day_of_week($year, $holiday['month'], 1);
+				$dow = $GLOBALS['egw']->datetime->day_of_week($year, $holiday['month'], 1);
 				$dayshift = (($holiday['dow'] + 7) - $dow) % 7;
 				$day = ($holiday['occurence'] - 1) * 7 + $dayshift + 1;
 
@@ -97,7 +103,7 @@
 
 			if ($year >= 1985 && $holiday['month'] == $cached_month && $day == $cached_day + 2 && $cached_observance_rule == True && $holiday['observance_rule'] == True)
 			{
-				$pdow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day-1);
+				$pdow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],$day-1);
 				if ($pdow != 0)
 				{
 					$addcnt = count($holidays) + 1;
@@ -129,7 +135,7 @@
 			}
 			elseif ($holiday['observance_rule'] == True)
 			{
-				$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day);
+				$dow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],$day);
 				// This now calulates Observed holidays and creates a new entry for them.
 				if($dow == 0)
 				{
diff --git a/calendar/inc/class.holidaycalc_US.inc.php b/calendar/inc/class.holidaycalc_US.inc.php
index 4994a3dc6f..c7c0c1afa7 100755
--- a/calendar/inc/class.holidaycalc_US.inc.php
+++ b/calendar/inc/class.holidaycalc_US.inc.php
@@ -1,18 +1,24 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - holidaycalc_US                                              *
-  * http://www.egroupware.org                                                *
-  * Based on Yoshihiro Kamimura <your@itheart.com>                           *
-  *          http://www.itheart.com                                          *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* eGroupWare - holidaycalc_US                                              *
+	* http://www.egroupware.org                                                *
+	* Based on Yoshihiro Kamimura <your@itheart.com>                           *
+	*          http://www.itheart.com                                          *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
 
+	/**
+	 * Calculations for calendar US and other holidays
+	 *
+	 * @package calendar
+	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+	 */
 	class holidaycalc
 	{
 		function add($holiday,&$holidays,$year,$day_offset=0)
@@ -41,13 +47,13 @@
 			{
 				if($holiday['occurence'] != 99)
 				{
-					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],1);
+					$dow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],1);
 					$day = (((7 * $holiday['occurence']) - 6) + ((($holiday['dow'] + 7) - $dow) % 7));
 					$day += ($day < 1 ? 7 : 0);
 
 					// Sometimes the 5th occurance of a weekday (ie the 5th monday)
 					// can spill over to the next month.  This prevents that.
-					$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
+					$ld = $GLOBALS['egw']->datetime->days_in_month($holiday['month'],$year);
 					if ($day > $ld)
 					{
 						return;
@@ -55,8 +61,8 @@
 				}
 				else
 				{
-					$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
-					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$ld);
+					$ld = $GLOBALS['egw']->datetime->days_in_month($holiday['month'],$year);
+					$dow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],$ld);
 					$day = $ld - (($dow + 7) - $holiday['dow']) % 7 ;
 				}
 			}
@@ -65,7 +71,7 @@
 				$day = $holiday['day'];
 				if($holiday['observance_rule'] == True)
 				{
-					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day);
+					$dow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],$day);
 					// This now calulates Observed holidays and creates a new entry for them.
 
 					// 0 = sundays are observed on monday (+1), 6 = saturdays are observed on fridays (-1)
@@ -75,7 +81,7 @@
 					}
 					if ($holiday['month'] == 1 && $day == 1)
 					{
-						$dow = $GLOBALS['phpgw']->datetime->day_of_week($year+1,$holiday['month'],$day);
+						$dow = $GLOBALS['egw']->datetime->day_of_week($year+1,$holiday['month'],$day);
 						// checking if next year's newyear might be observed in this year
 						if ($dow == 6)
 						{
@@ -87,7 +93,7 @@
 					// checking if last year's new year's eve might be observed in this year
 					if ($holiday['month'] == 12 && $day == 31)
 					{
-						$dow = $GLOBALS['phpgw']->datetime->day_of_week($year-1,$holiday['month'],$day);
+						$dow = $GLOBALS['egw']->datetime->day_of_week($year-1,$holiday['month'],$day);
 						if ($dow == 0)
 						{
 							$this->add($holiday,$holidays,$year-1,1);
diff --git a/calendar/inc/class.socal.inc.php b/calendar/inc/class.socal.inc.php
index 6df9623722..6937d89f75 100644
--- a/calendar/inc/class.socal.inc.php
+++ b/calendar/inc/class.socal.inc.php
@@ -1,8 +1,8 @@
 <?php
 /**************************************************************************\
-* eGroupWare - Calendar's "new" SO-layer (storage-object)                  *
+* eGroupWare - Calendar's storage-object                                   *
 * http://www.egroupware.org                                                *
-* Written and (c) 2004 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* Written and (c) 2005 by Ralf Becker <RalfBecker@outdoor-training.de>     *
 * --------------------------------------------                             *
 *  This program is free software; you can redistribute it and/or modify it *
 *  under the terms of the GNU General Public License as published by the   *
@@ -13,59 +13,97 @@
 /* $Id$ */
 
 /**
- * Class to store all calendar data
- *
- * At the moment this class is used together with the "old" socalendar class.
- * As the calendar rewrite proceeds, the old class will be removed.
+ * some necessary defines used by the calendar
+ */
+if(extension_loaded('mcal') == False)
+{
+	define('MCAL_RECUR_NONE',0);
+	define('MCAL_RECUR_DAILY',1);
+	define('MCAL_RECUR_WEEKLY',2);
+	define('MCAL_RECUR_MONTHLY_MDAY',3);
+	define('MCAL_RECUR_MONTHLY_WDAY',4);
+	define('MCAL_RECUR_YEARLY',5);
+	define('MCAL_RECUR_SECONDLY',6);
+	define('MCAL_RECUR_MINUTELY',7);
+	define('MCAL_RECUR_HOURLY',8);
+	
+	define('MCAL_M_SUNDAY',1);
+	define('MCAL_M_MONDAY',2);
+	define('MCAL_M_TUESDAY',4);
+	define('MCAL_M_WEDNESDAY',8);
+	define('MCAL_M_THURSDAY',16);
+	define('MCAL_M_FRIDAY',32);
+	define('MCAL_M_SATURDAY',64);
+	
+	define('MCAL_M_WEEKDAYS',62);
+	define('MCAL_M_WEEKEND',65);
+	define('MCAL_M_ALLDAYS',127);
+}
+
+define('REJECTED',0);
+define('NO_RESPONSE',1);
+define('TENTATIVE',2);
+define('ACCEPTED',3);
+
+/**
+ * Class to store all calendar data (storage object)
  *
+ * Tables used by socal:
+ *	- egw_cal: general calendar data: cal_id, title, describtion, locations, ...
+ *	- egw_cal_dates: start- and enddates (multiple entry per cal_id for recuring events!)
+ *	- egw_cal_users: participant info including status (multiple entries per cal_id AND startdate for recuring events)
+ * 	- egw_cal_repeats: recur-data: type, optional enddate, etc.
+ *  - egw_cal_extra: custom fields (multiple entries per cal_id possible)
+ * 
  * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
  *  UI only operates in user-time, so there have to be no conversation at all !!!
  *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
- *  SO operates only in server-time (please note, this is not the case with the socalendar*-classes used atm.)
+ *  SO operates only on server-time
  *
  * @package calendar
- * @author RalfBecker@outdoor-training.de
- * @license GPL
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005 by RalfBecker-At-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
-
 class socal
 {
 	/**
 	 * name of the main calendar table and prefix for all other calendar tables
 	 */
-	var $cal_table = 'phpgw_cal';
-	var $extra_table,$holidays_table,$repeats_table,$user_table;
+	var $cal_table = 'egw_cal';
+	var $extra_table,$repeats_table,$user_table,$dates_table,$all_tables;
 	
 	/**
 	 * internal copy of the global db-object
 	 */
 	var $db;
+
 	/**
 	 * Constructor of the socal class
 	 */
 	function socal()
 	{
 		foreach(array(
-			//'old_so'    => 'calendar.socalendar',
-			'async'    	=> 'phpgwapi.asyncservice',
+			'async' => 'phpgwapi.asyncservice',
 		) as $my => $app_class)
 		{
 			list(,$class) = explode('.',$app_class);
 
-			if (!is_object($GLOBALS['phpgw']->$class))
+			if (!is_object($GLOBALS['egw']->$class))
 			{
 				//echo "<p>calling CreateObject($app_class)</p>\n".str_repeat(' ',4096);
-				$GLOBALS['phpgw']->$class = CreateObject($app_class);
+				$GLOBALS['egw']->$class =& CreateObject($app_class);
 			}
-			$this->$my = &$GLOBALS['phpgw']->$class;
+			$this->$my =& $GLOBALS['egw']->$class;
 		}
-		$this->db = $GLOBALS['phpgw']->db;
+		$this->db = clone($GLOBALS['egw']->db);
 		$this->db->set_app('calendar');
 		
-		foreach(array('extra','holidays','repeats','user') as $name)
+		$this->all_tables = array($this->cal_table);
+		foreach(array('extra','repeats','user','dates') as $name)
 		{
 			$vname = $name.'_table';
-			$this->$vname = $this->cal_table.'_'.$name;
+			$this->all_tables[] = $this->$vname = $this->cal_table.'_'.$name;
 		}
 	}
 	
@@ -74,54 +112,91 @@ class socal
 	 *
 	 * All times (start, end and modified) are returned as timesstamps in servertime!
 	 *
-	 * @param $ids int/array id(s) of the entries to read
+	 * @param int/array/string $ids id or array of id's of the entries to read, or string with a single uid
+	 * @param int $recur_date=0 if set read the next recurrance at or after the timestamp, default 0 = read the initital one
 	 * @return array/boolean array with id => data pairs or false if entry not found
 	 */
-	function read($ids)
+	function read($ids,$recur_date=0)
 	{
-		$this->db->select($this->cal_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__);
+		//echo "<p>socal::read(".print_r($ids,true).",$recur_date)<br />\n".function_backtrace()."<p>\n";
+
+		$table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
+		$group_by_cols = $this->cal_table.'.'.implode(','.$this->cal_table.'.',array_keys($table_def['fd']));
+		$table_def = $this->db->get_table_definitions('calendar',$this->repeats_table);
+		$group_by_cols .= ','.$this->repeats_table.'.'.implode(','.$this->repeats_table.'.',array_keys($table_def['fd']));
+
+		$where = array();
+		if (is_array($ids))
+		{
+			array_walk($ids,create_function('&$val,$key','$val = (int) $val;'));
+
+			$where[] = $this->cal_table.'.cal_id IN ('.implode(',',$ids).')';
+		}
+		elseif (is_numeric($ids))
+		{
+			$where[] = $this->cal_table.'.cal_id = '.(int) $ids;
+		}
+		else
+		{
+			$where['cal_uid'] = $ids;
+		}
+		if ((int) $recur_date)
+		{
+			$where[] = 'cal_start >= '.(int)$recur_date;
+		}
+		$this->db->select($this->cal_table,"$this->repeats_table.*,$this->cal_table.*,MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end",
+			$where,__LINE__,__FILE__,false,'GROUP BY '.$group_by_cols,false,0,
+			",$this->dates_table LEFT JOIN $this->repeats_table ON $this->dates_table.cal_id=$this->repeats_table.cal_id".
+			" WHERE $this->cal_table.cal_id=$this->dates_table.cal_id");
 		
 		$events = false;
-		$recur_ids = array();
 		while (($row = $this->db->row(true,'cal_')))
 		{
-			if ($row['type'] == 'M') $recur_ids[] = $row['id'];
-			unset($row['type']);
-
+			$row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array();
+			if (!$row['recur_type']) $row['recur_type'] = MCAL_RECUR_NONE;
 			$row['alarm'] = array();
 			$events[$row['id']] = $row;
-			
+
+			// if a uid was supplied, convert it for the further code to an id
+			if (!is_array($ids) && !is_numeric($ids)) $ids = $row['id'];
 		}
 		if (!$events) return false;
 		
-		// recur details
-		if (count($recur_ids))
+		// check if we have a real recurance, if not set $recur_date=0
+		if (is_array($ids) || $events[(int)$ids]['recur_type'] == MCAL_RECUR_NONE)
 		{
-			$this->db->select($this->repeats_table,'*',array('cal_id'=>$recur_ids),__LINE__,__FILE__);
-			
-			while(($row = $this->db->row(true)))
-			{
-				$row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array();
-				$cal_id = $row['cal_id'];
-				unset($row['cal_id']);
-				$events[$cal_id] += $row;
-			}
+			$recur_date = 0;
 		}
-
-		// participants
-		$this->db->select($this->user_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__);
+		else	// adjust the given recurance to the real time, it can be a date without time(!)
+		{
+			// check if the start read is the the first (default) entry of the recuring events, then it's recur_date is 0!!!
+			$this->db->select($this->dates_table,'MIN(cal_start) AS cal_start',array('cal_id' => $ids),__LINE__,__FILE__);
+			$first = $this->db->row(true);
+			$recur_date = $first['cal_start'] == $events[$ids]['start'] ? 0 : $events[$ids]['start'];
+			
+			if ($recur_date) $events[$ids]['recur_date'] = $recur_date;	// remember it, maybe we need it later, duno now
+		}
+		// participants, if a recur_date give, we read that recurance, else the one users from the default entry with recur_date=0
+		$this->db->select($this->user_table,'*',array(
+			'cal_id'      => $ids,
+			'cal_recur_date' => $recur_date,
+		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC');	// DESC puts users before resources and contacts
 		while (($row = $this->db->row(true)))
 		{
-			// if the type is not an ordinary user (eg. contact or resource) prefix the id with the type
+			// if the type is not an ordinary user (eg. contact or resource)...
 			if ($row['cal_user_type'] && $row['cal_user_type'] != 'u')
 			{
+				// prefix the id with the type
 				$user_id = $row['cal_user_type'].$row['cal_user_id'];
+				// and append quantity
+				$row['cal_status'] .= $row['cal_quantity'] == 1 ? '' : $row['cal_quantity'];
 			}
 			else
 			{
 				$user_id = (int) $row['cal_user_id'];
 			}
 			$events[$row['cal_id']]['participants'][$user_id] = $row['cal_status'];
+			$events[$row['cal_id']]['participant_types'][$row['cal_user_type']][$row['cal_user_id']] = $row['cal_status'];
 		}
 
 		// custom fields
@@ -146,4 +221,812 @@ class socal
 		//echo "<p>socal::read(".print_r($ids,true).")=<pre>".print_r($events,true)."</pre>\n";
 		return $events;
 	}
+
+	/**
+	 * generate SQL to filter after a given category (evtl. incl. subcategories)
+	 * 
+	 * @param array/int $cat_id cat-id or array of cat-ids, or !$cat_id for none
+	 * @return string SQL to include in the query
+	 */
+	function cat_filter($cat_id)
+	{
+		$sql = '';
+		if ($cat_id)
+		{
+			if (!is_array($cat_ids) && !@$GLOBALS['egw_info']['user']['preferences']['common']['cats_no_subs'])
+			{
+				if (!is_object($GLOBALS['egw']->categories))
+				{
+					$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories');
+				}
+				$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
+			}
+			else
+			{
+				$cats = is_array($cat_id) ? $cat_id : array($cat_id);
+			}
+			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
+
+			$sql = '(cal_category'.(count($cats) > 1 ? ' IN ('.implode(',',$cats).')' : '='.$this->db->quote((int)$cat_id));
+			foreach($cats as $cat)
+			{
+				$sql .= ' OR '.$this->db->concat("','",'cal_category',"','").' LIKE '.$this->db->quote('%,'.$cat.',%');
+			}
+			$sql .= ') ';
+		}
+		return $sql;
+	}
+
+	/**
+	 * Searches / lists calendar entries, including repeating ones
+	 *
+	 * @param int $start startdate of the search/list (servertime)
+	 * @param int $end enddate of the search/list (servertime)
+	 * @param int/array $users user-id or array of user-id's, !$users means all entries regardless of users
+	 * @param int $cat_id=0 mixed category-id or array of cat-id's, default 0 = all
+	 *		Please note: only a single cat-id, will include all sub-cats (if the common-pref 'cats_no_subs' is False)
+	 * @param string $filter='' string space delimited filter-names, atm. 'all' or 'private'
+	 * @param string $query='' pattern so search for, if unset or empty all matching entries are returned (no search)
+	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
+	 * @param int/bool $offset=False offset for a limited query or False (default)
+	 * @param int $num_rows=0 number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param string $order='cal_start' column-names plus optional DESC|ASC separted by comma
+	 * @param boolean $show_rejected=true should the search return rejected invitations
+	 * @return array of cal_ids, or false if error in the parameters
+	 *
+	 * ToDo: search custom-fields too
+	 */
+	function &search($start,$end,$users,$cat_id=0,$filter='',$query='',$offset=False,$num_rows=0,$order = 'cal_start',$show_rejected=true)
+	{
+		//echo '<p>socal::search('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.print_r($users,true).','.print_r($cat_id,true).",'$filter',".print_r($query,true).",$offset,$num_rows)</p>\n";
+
+		$where = array();
+		if (is_array($query))
+		{
+			$where = $query;
+		}
+		elseif ($query)
+		{
+			foreach(array('cal_title','cal_description','cal_location') as $col)
+			{
+				$to_or[] = $col . ' LIKE ' . $this->db->quote('%'.$query.'%');
+			}
+			$where[] = '('.implode(' OR ',$to_or).')';
+		}
+		if ($users)
+		{
+			$users_by_type = array();
+			foreach(is_array($users) ? $users : array($users) as $user)
+			{
+				if (is_numeric($user))
+				{
+					$users_by_type['u'][] = (int) $user;
+				}
+				elseif (is_numeric(substr($user,1)))
+				{
+					$users_by_type[$user{0}] = (int) substr($user,1);
+				}
+			}
+			$to_or = array();
+			foreach($users_by_type as $type => $ids)
+			{
+				$to_or[] = $this->db->expression($this->user_table,array(
+					'cal_user_type' => $type,
+					'cal_user_id'   => $ids,
+				));
+			}
+			$where[] = '('.implode(' OR ',$to_or).')';
+			
+			if (!$show_rejected) $where[] = "cal_status != 'R'";
+		}
+		if ($cat_id)
+		{
+			$where[] = $this->cat_filter($cat_id);
+		}
+		if ($start) $where[] = (int)$start.' < cal_end';
+		if ($end)   $where[] = 'cal_start < '.(int)$end;
+		
+		if (!preg_match('/^[a-z_ ,]+$/i',$order)) $order = 'cal_start';		// gard against SQL injunktion
+
+		//_debug_array($where);
+		if (is_numeric($offset))	// get the total too
+		{
+			$this->db->select($this->cal_table,"DISTINCT $this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
+				$where,__LINE__,__FILE__,false,'',false,0,
+				",$this->dates_table,$this->user_table LEFT JOIN $this->repeats_table ON $this->user_table.cal_id=$this->repeats_table.cal_id".
+				" WHERE $this->cal_table.cal_id=$this->dates_table.cal_id AND $this->cal_table.cal_id=$this->user_table.cal_id AND ".
+				"(recur_type IS NULL AND cal_recur_date=0 OR cal_recur_date=cal_start)");
+
+			$this->total = $this->db->num_rows();
+		}		
+		$this->db->select($this->cal_table,"DISTINCT $this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
+			$where,__LINE__,__FILE__,$offset,'ORDER BY '.$order,false,$num_rows,
+			",$this->dates_table,$this->user_table LEFT JOIN $this->repeats_table ON $this->user_table.cal_id=$this->repeats_table.cal_id".
+			" WHERE $this->cal_table.cal_id=$this->dates_table.cal_id AND $this->cal_table.cal_id=$this->user_table.cal_id AND ".
+			"(recur_type IS NULL AND cal_recur_date=0 OR cal_recur_date=cal_start)");
+			
+		$events = $ids = $recur_dates = $recur_ids = array();	
+		while (($row =& $this->db->row(true,'cal_')))
+		{
+			$ids[] = $id = $row['id'];
+			if ($row['recur_date'])
+			{
+				$id .= '-'.$row['recur_date'];
+				$recur_dates[] = $row['recur_date'];
+			}
+			$row['alarm'] = array();
+			$row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array();
+
+			$events[$id] =& $row;
+		}
+		
+		if (count($events))
+		{
+			// now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)
+			// This will always read the first entry of each recuring event too, we eliminate it later
+			$recur_dates[] = 0;
+			$this->db->select($this->user_table,'*',array(
+				'cal_id' => array_unique($ids),
+				'cal_recur_date' => $recur_dates, 
+			),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC');	// DESC puts users before resources and contacts
+	
+			while (($row = $this->db->row(true)))
+			{
+				$id = $row['cal_id'];
+				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
+				
+				if (!isset($events[$id])) continue;		// not needed first entry of recuring event
+	
+				$events[$id]['participants'][$this->combine_user($row['cal_user_type'],$row['cal_user_id'])] = $row['cal_status'];
+			}
+/*			custom fields are not shown in the regular views, so we can ignore them here for the moment
+			$this->db->select($this->extra_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__);
+			while (($row = $this->db->row(true)))
+			{
+				$set_ids = array($row['cal_id']);
+				if (isset($recur_ids[$row['cal_id']])) $set_ids += $recur_ids[$row['cal_id']];
+				
+				foreach($set_ids as $id)
+				{
+					if (isset($events[$cal_id]))
+					{
+						$events[$id]['#'.$row['cal_extra_name']] = $row['cal_extra_value'];
+					}
+				}
+			}
+*/		
+			// alarms, atm. we read all alarms in the system, as this can be done in a single query
+			foreach((array)$this->async->read('cal'.(is_array($ids) ? '' : ':'.(int)$ids).':%') as $id => $job)
+			{
+				list(,$cal_id) = explode(':',$cal_id);
+				if (!isset($events[$cal_id])) continue;	// not needed
+				
+				$alarm         = $job['data'];	// text, enabled
+				$alarm['id']   = $id;
+				$alarm['time'] = $job['next'];
+	
+				$events[$cal_id]['alarm'][$id] = $alarm;
+			}
+		}
+		//echo "<p>socal::search\n"; _debug_array($events);
+		return $events;
+	}
+	
+	/**
+	 * Checks for conflicts
+	 */
+
+/* folowing SQL checks for conflicts completly on DB level
+	 
+SELECT cal_user_type, cal_user_id, SUM( cal_quantity )
+FROM egw_cal, egw_cal_dates, egw_cal_user
+LEFT JOIN egw_cal_repeats ON egw_cal.cal_id = egw_cal_repeats.cal_id
+WHERE egw_cal.cal_id = egw_cal_dates.cal_id
+AND egw_cal.cal_id = egw_cal_user.cal_id
+AND (
+recur_type IS NULL
+AND cal_recur_date =0
+OR cal_recur_date = cal_start
+)
+AND (
+(
+cal_user_type = 'u'			# user of the checked event
+AND cal_user_id
+IN ( 7, 5 )
+)
+AND 1118822400 < cal_end	# start- and end-time of the checked event
+AND cal_start <1118833200
+)
+AND egw_cal.cal_id !=26		# id of the checked event
+AND cal_non_blocking !=1
+AND cal_status != 'R'
+GROUP BY cal_user_type, cal_user_id
+ORDER BY cal_user_type, cal_usre_id
+
+*/ 
+	
+	/**
+	 * Saves or creates an event
+	 *
+	 * We always set cal_modified and cal_modifier and for new events cal_uid.
+	 * All other column are only written if they are set in the $event parameter!
+	 *
+	 * @param array $event
+	 * @param boolean &$set_recurrences on return: true if the recurrences need to be written, false otherwise
+	 * @param int $change_since=0 time from which on the repetitions should be changed, default 0=all
+	 * @return boolean/int false on error, cal_id otherwise
+	 */
+	function save($event,&$set_recurrences,$change_since=0)
+	{
+		//echo "<p>socal::save(,$change_since) event="; _debug_array($event);
+
+		$cal_id = (int) $event['id'];
+		unset($event['id']);
+		
+		$set_recurrences = !$cal_id && $event['recur_type'] != MCAL_RECUR_NONE;
+		
+		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
+		foreach($event as $col => $val)
+		{
+			if ($col{0} != '#' && substr($col,0,6) != 'recur_' && $col != 'alarm')
+			{
+				$event['cal_'.$col] = $val;
+				unset($event[$col]);
+			}
+		}
+		if (is_array($event['cal_category'])) $event['cal_category'] = implode(',',$event['cal_category']);
+
+		if ($cal_id)
+		{
+			$this->db->update($this->cal_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__);
+		}
+		else
+		{
+			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+
+			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+
+			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__);
+			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
+			{
+				return false;
+			}
+			// new event (without uid) or new created referencing event => create new uid
+			if (!$event['cal_uid'] || $event['cal_reference'] && strstr($event['cal_uid'],'cal-'.$event['calreference'].'-'))
+			{
+				$event['cal_uid'] = $GLOBALS['egw']->common->generate_uid('calendar',$cal_id);
+				$this->db->update($this->cal_table,array('cal_uid' => $event['cal_uid']),array('cal_id' => $cal_id),__LINE__,__FILE__);
+			}
+			// new events need to have at least one participant, default to the owner
+			if (!isset($event['cal_participants']))
+			{
+				$event['cal_participants'] = array($event['cal_owner'] => 'A');
+			}
+		}
+		// write information about recuring event, if recur_type is present in the array
+		if (isset($event['recur_type']))
+		{
+			if (isset($event['recur_exception']) && is_array($event['recur_exception']) && count($event['recur_exception']))
+			{
+				// delete execeptions from the user and dates table, it could be the first time
+				$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date' => $event['recur_exception']),__LINE__,__FILE__);
+				$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start' => $event['recur_exception']),__LINE__,__FILE__);
+
+				$event['recur_exception'] = implode(',',$event['recur_exception']);
+			}
+			else
+			{
+				$event['recur_exception'] = null;
+			}
+			if (!$set_recurrences)
+			{
+				// check if the recure-information changed
+				$this->db->select($this->repeats_table,'*',array('cal_id' => $cal_id),__LINE__,__FILE__);
+				$old_recur = $this->db->row(true);
+				$set_recurrences = $event['recur_type'] != $old_recur['recur_type'] || $event['recur_data'] != $old_recur['recur_data'] ||
+					$event['recur_interval'] != $old_recur['recur_interval'] || $event['recur_enddate'] != $old_recur['recur_enddate'] ||
+					$event['recur_exeption'] != $old_recur['recur_exeption'];
+			}
+			if($event['recur_type'] != MCAL_RECUR_NONE)
+			{
+				$this->db->insert($this->repeats_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__);
+			}
+			else
+			{
+				$this->db->delete($this->repeats_table,array('cal_id' => $cal_id),__LINE__,__FILE__);
+			}
+			if ($set_recurrences)
+			{
+				// delete all, but the lowest dates record
+				$this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__);
+				$min = $this->db->next_record() ? $this->db->f(0) : 0;
+
+				$this->db->delete($this->dates_table,array(
+					'cal_id' => $cal_id,
+					'cal_start > '.(int)$min,
+				),__LINE__,__FILE__);
+				// delete all user-records, with recur-date != 0
+				$this->db->delete($this->user_table,array(
+					'cal_id' => $cal_id,
+					'cal_recur_date != 0',
+				),__LINE__,__FILE__);
+			}
+		}
+		// update start- and endtime if present in the event-array, evtl. we need to move all recurrences
+		if (isset($event['cal_start']) && isset($event['cal_end']))
+		{
+			$this->move($cal_id,$event['cal_start'],$event['cal_end'],!$cal_id ? false : $change_since);
+		}
+		// update participants if present in the event-array
+		if (isset($event['cal_participants']))
+		{
+			$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
+		}
+		// Custom fields
+		foreach($event as $name => $value)
+		{
+			if ($name[0] == '#')
+			{
+				if (strlen($value))
+				{
+					$this->db->insert($this->extra_table,array(
+						'cal_extra_value'	=> $value,
+					),array(
+						'cal_id'			=> $cal_id,
+						'cal_extra_name'	=> substr($name,1),
+					),__LINE__,__FILE__);
+				}
+				else
+				{
+					$this->db->delete($this->extra_table,array(
+						'cal_id'			=> $cal_id,
+						'cal_extra_name'	=> substr($name,1),
+					),__LINE__,__FILE__);
+				}	
+			}
+		}
+		// updating or saving the alarms, new alarms have a temporary numeric id!
+		// ToDo: recuring events !!!
+		if (is_array($event['alarm']))
+		{
+			foreach ($event['alarm'] as $id => $alarm)
+			{
+				if (is_numeric($id)) unset($alarm['id']);	// unset the temporary id, to add the alarm
+
+				$alarm['time'] = $event['cal_start'] - $alarm['offset'];	// recalculate the offset, as the start-time might have changed
+				
+				$this->save_alarm($cal_id,$alarm);
+			}
+		}
+		return $cal_id;
+	}
+	
+	/**
+	 * moves an event to an other start- and end-time taken into account the evtl. recurrences of the event(!)
+	 *
+	 * @param int $cal_id
+	 * @param int $start new starttime
+	 * @param int $end new endtime
+	 * @param int/boolean $change_since=0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param int $old_start=0 old starttime or (default) 0, to query it from the db
+	 * @param int $old_end=0 old starttime or (default) 0
+	 * @return int/boolean number of moved recurrences or false on error
+	 */
+	function move($cal_id,$start,$end,$change_since=0,$old_start=0,$old_end=0)
+	{
+		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
+		
+		if (!(int) $cal_id) return false;
+
+		if (!$old_start)
+		{
+			if ($change_since !== false) $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',array('cal_id'=>$cal_id),__LNE__,__FILE__);
+			// if no recurrence found, create one with the new dates
+			if ($change_since === false || !($row = $this->db->row(true)) || !$row['cal_start'] || !$row['cal_end'])
+			{
+				$this->db->insert($this->dates_table,array(
+					'cal_id'    => $cal_id,
+					'cal_start' => $start,
+					'cal_end'   => $end,
+				),false,__LINE__,__FILE__);
+
+				return 1;
+			}
+			$move_start = (int) ($start-$row['cal_start']);
+			$move_end   = (int) ($end-$row['cal_end']);
+		}
+		else
+		{
+			$move_start = (int) ($start-$old_start);
+			$move_end   = (int) ($end-$old_end);
+		}
+		$where = $this->db->expression($this->cal_table,array('cal_id' => $cal_id));
+
+		if ($move_start)
+		{
+			// move the recur-date of the participants
+			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
+				((int)$change_since ? '>= '.(int)$change_since : '!= 0'));
+		}
+		if ($move_start || $move_end)
+		{
+			// move the event and it's recurrences
+			$this->db->query("UPDATE $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
+				((int) $change_since ? ' AND cal_start >= '.(int) $change_since : ''));
+		}
+		return $this->db->affected_rows();
+	}
+	
+	/**
+	 * combines user_type and user_id into a single string or integer (for users)
+	 *
+	 * @param string $user_type 1-char type: 'u' = user, ...
+	 * @param int $user_id id
+	 * @return string/int combined id
+	 */
+	function combine_user($user_type,$user_id)
+	{
+		if (!$user_type || $user_type == 'u')
+		{
+			return (int) $user_id;
+		}
+		return $user_type.$user_id;
+	}
+	
+	/**
+	 * splits the combined user_type and user_id into a single values
+	 *
+	 * @param string $user_type 1-char type: 'u' = user, ...
+	 * @param int $user_id id
+	 * @return string/int
+	 */
+	function split_user($uid,&$user_type,&$user_id)
+	{
+		if (is_numeric($uid))
+		{
+			$user_type = 'u';
+			$user_id = (int) $uid;
+		}
+		else
+		{
+			$user_type = $uid[0];
+			$user_id = (int) substr($uid,1);
+		}
+	}
+	
+	/**
+	 * updates the participants of an event, taken into account the evtl. recurrences of the event(!)
+	 * 
+	 * @param int $cal_id
+	 * @param array $participants id => status pairs
+	 * @param int/boolean $change_since=0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param int $recur_date=0 time of which repetitions should be updated, default 0=all
+	 * @return int/boolean number of updated recurrences or false on error
+	 */
+	function participants($cal_id,$participants,$change_since=0)
+	{
+		//echo "<p>socal::participants($cal_id,".print_r($participants,true).",$change_since)</p>\n";
+
+		$where = array('cal_id' => $cal_id);
+
+		if ((int) $change_since)
+		{
+			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.(int)$change_since.')';
+		}
+		if ($change_since !== false)	// existing entries only
+		{
+			// delete not longer set participants
+			$parts = $deleted = array();
+			$this->db->select($this->user_table,'DISTINCT cal_user_type,cal_user_id,cal_quantity',$where,__LINE__,__FILE__);
+			while (($row = $this->db->row(true)))
+			{
+				$uid = $this->combine_user($row['cal_user_type'],$row['cal_user_id']);
+				if (!isset($participants[$uid]))
+				{
+					$parts[] = $uid;
+					$deleted[$row['cal_user_type']][] = $row['cal_user_id'];
+				}
+				elseif($row['cal_quantity'] == (substr($participants[$uid],1) ? substr($participants[$uid],1) : 1))
+				{
+					unset($participants[$uid]);	// we dont touch them
+				}
+			}
+
+			if (count($deleted))
+			{
+				$to_or = array();
+				foreach($deleted as $type => $ids)
+				{
+					$to_or[] = $this->db->expression($this->user_table,array(
+						'cal_user_type' => $type,
+						'cal_user_id'   => $ids,
+					));
+				}
+				$this->db->delete($this->user_table,$where + array('('.implode(' OR ',$to_or).')'),__LINE__,__FILE__);
+			}
+		}
+		if (count($participants))	// these are NEW participants now
+		{
+			// find all recurrences, as they all need the new parts to be added
+			$recurrences = array();
+			if ($change_since !== false)	// existing entries only
+			{
+				$this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__);
+				while(($row = $this->db->row(true)))
+				{
+					$recurrences[] = $row['cal_recur_date'];
+				}
+			}
+			if (!count($recurrences)) $recurrences[] = 0;	// insert the default one
+
+			foreach($participants as $uid => $status)
+			{
+				$this->split_user($uid,$type,$id);
+				foreach($recurrences as $recur_date)
+				{
+					$this->db->insert($this->user_table,array(
+						'cal_status'	  => $status !== true ? $status{0} : 'U',
+						'cal_quantity'	=> substr($status,1) ? substr($status,1) : 1,
+						'cal_recur_date' => $recur_date,
+						),array(
+						'cal_id'	=> $cal_id,
+						'cal_user_type'   => $type,
+						'cal_user_id' 	  => $id,
+						
+					),__LINE__,__FILE__);
+				}
+			}
+		}
+		return true;				
+	}
+
+	/**
+	 * set the status of one participant for a given recurrence or for all recurrences since now (includes recur_date=0)
+	 *
+	 * @param int $cal_id
+	 * @param char $user_type 'u' regular user
+	 * @param int $user_id
+	 * @param int/char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
+	 * @param int $recur_date=0 date to change, or 0 = all since now
+	 * @return int number of changed recurrences
+	 */
+	function set_status($cal_id,$user_type,$user_id,$status,$recur_date=0)
+	{
+		static $status_code_short = array(
+			REJECTED 	=> 'R',
+			NO_RESPONSE	=> 'U',
+			TENTATIVE	=> 'T',
+			ACCEPTED	=> 'A'
+		);
+		if (!(int)$cal_id || !(int)$user_id) return false;
+		
+		if (is_numeric($status)) $status = $status_code_short[$status];
+
+		$where = array(
+			'cal_id'		=> $cal_id,
+			'cal_user_type'	=> $user_type ? $user_type : 'u',
+			'cal_user_id'   => $user_id,
+		);
+		if ((int) $recur_date)
+		{
+			$where['cal_recur_date'] = $recur_date;
+		}
+		else
+		{
+			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')';
+		}
+		$this->db->update($this->user_table,array('cal_status' => $status),$where,__LINE__,__FILE__);
+
+		return $this->db->affected_rows();
+	}
+	
+	/**
+	 * creates or update a recurrence in the dates and users table
+	 *
+	 * @param int $cal_id 
+	 * @param int $start
+	 * @param int $end
+	 * @param array $participants uid => status pairs
+	 */
+	function recurrence($cal_id,$start,$end,$participants)
+	{
+		//echo "<p>socal::recurrence($cal_id,$start,$end,".print_r($participants,true).")</p>\n";
+		$this->db->insert($this->dates_table,array(
+			'cal_end' => $end,
+		),array(
+			'cal_id' => $cal_id,
+			'cal_start'  => $start,
+		),__LINE__,__FILE__);
+		
+		foreach($participants as $uid => $status)
+		{
+			$this->split_user($uid,$type,$id);
+			$this->db->insert($this->user_table,array(
+				'cal_status'	 => $status !== true ? $status{0} : 'U',
+				'cal_quantity'	=> substr($status,1) ? substr($status,1) : 1,
+			),array(
+				'cal_id'		 => $cal_id,
+				'cal_recur_date' => $start,
+				'cal_user_type'  => $type,
+				'cal_user_id' 	 => $id,
+			),__LINE__,__FILE__);
+		}
+	}
+
+	/**
+	 * Get all unfinished recuring events (or all users) after a given time
+	 *
+	 * @param int $time 
+	 * @return array with cal_id => max(cal_start) pairs
+	 */
+	function unfinished_recuring($time)
+	{
+		$this->db->select($this->repeats_table,"$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",array(
+			"$this->repeats_table.cal_id = $this->dates_table.cal_id",
+			'(recur_enddate = 0 OR recur_enddate IS NULL OR recur_enddate > '.(int)$time.')',
+		),__LINE__,__FILE__,false,"GROUP BY $this->repeats_table.cal_id",false,0,','.$this->dates_table);
+		$ids = array();
+		while (($row = $this->db->Row(true)))
+		{
+			$ids[$row['cal_id']] = $row['cal_start'];
+		}
+		return $ids;
+	}
+
+	/**
+	 * deletes an event incl. all recurrences, participants and alarms
+	 *
+	 * @param int $cal_id
+	 */
+	function delete($cal_id)
+	{
+		//echo "<p>socal::delete($cal_id)</p>\n";
+
+		$this->delete_alarms($cal_id);
+
+		foreach($this->all_tables as $table)
+		{
+			$this->db->delete($table,array('cal_id'=>$cal_id),__LINE__,__FILE__);
+		}
+	}
+
+	/**
+	 * read the alarms of a calendar-event specified by $cal_id
+	 *
+	 * alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
+	 *
+	 * @param int $cal_id
+	 * @return array of alarms with alarm-id as key
+	 */
+	function read_alarms($cal_id)
+	{
+		$alarms = array();
+
+		if ($jobs = $this->async->read('cal:'.(int)$cal_id.':%'))
+		{
+			foreach($jobs as $id => $job)
+			{
+				$alarm         = $job['data'];	// text, enabled
+				$alarm['id']   = $id;
+				$alarm['time'] = $job['next'];
+
+				$alarms[$id] = $alarm;
+			}
+		}
+		return $alarms;
+	}
+
+	/**
+	 * read a single alarm specified by it's $id
+	 *
+	 * @param string $id alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
+	 * @return array with data of the alarm
+	 */
+	function read_alarm($id)
+	{
+		if (!($jobs = $this->async->read($id)))
+		{
+			return False;
+		}
+		list($id,$job) = each($jobs);
+		$alarm         = $job['data'];	// text, enabled
+		$alarm['id']   = $id;
+		$alarm['time'] = $job['next'];
+
+		//echo "<p>read_alarm('$id')="; print_r($alarm); echo "</p>\n";
+		return $alarm;
+	}
+
+	/**
+	 * saves a new or updated alarm
+	 *
+	 * @param int $cal_id Id of the calendar-entry
+	 * @param array $alarm array with fields: text, owner, enabled, ..
+	 * @return string id of the alarm
+	 */
+	function save_alarm($cal_id,$alarm)
+	{
+		//echo "<p>save_alarm(cal_id=$cal_id, alarm="; print_r($alarm); echo ")</p>\n";
+		if (!($id = $alarm['id']))
+		{
+			$alarms = $this->read_alarms($cal_id);	// find a free alarm#
+			$n = count($alarms);
+			do
+			{
+				$id = 'cal:'.(int)$cal_id.':'.$n;
+				++$n;
+			}
+			while (@isset($alarms[$id]));
+		}
+		else
+		{
+			$this->async->cancel_timer($id);
+		}
+		$alarm['cal_id'] = $cal_id;		// we need the back-reference
+
+		if (!$this->async->set_timer($alarm['time'],$id,'calendar.bocalupdate.send_alarm',$alarm))
+		{
+			return False;
+		}
+		return $id;
+	}
+
+	/**
+	 * delete all alarms of a calendar-entry
+	 *
+	 * @param int $cal_id Id of the calendar-entry
+	 * @return int number of alarms deleted
+	 */
+	function delete_alarms($cal_id)
+	{
+		$alarms = $this->read_alarms($cal_id);
+
+		foreach($alarms as $id => $alarm)
+		{
+			$this->async->cancel_timer($id);
+		}
+		return count($alarms);
+	}
+
+	/**
+	 * delete one alarms identified by its id
+	 *
+	 * @param string $id alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
+	 * @return int number of alarms deleted
+	 */
+	function delete_alarm($id)
+	{
+		return $this->async->cancel_timer($id);
+	}
+	
+	function change_delete_user($old_user,$new_user=false)
+	{
+		if (!(int)$new_user)
+		{
+			$this->split_user($old_user,$user_type,$user_id);
+			
+			if ($user_type == 'u')	// only accounts can be owners of events
+			{
+				$ids = array();
+				$this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__);
+				while(($row = $this->db->row(true)))
+				{
+					$ids[] = $row['cal_id'];
+				}
+				foreach($ids as $cal_id)
+				{
+					$this->delete($cal_id);
+				}
+			}
+			$this->db->delete($this->user_table,array(
+				'cal_user_type' => $user_type,
+				'cal_user_id'   => $user_id,
+			),__LINE__,__FILE__);
+		}
+		else
+		{
+			$this->db->update($this->cal_table,array('cal_owner' => $new_user),array('cal_owner' => $old_user),__LINE__,__FILE__);
+			$this->db->update($this->user_table,array('cal_user_id' => $new_user),array('cal_user_type' => 'u','cal_user_id' => $old_user),__LINE__,__FILE__);
+		}
+	}
 }
diff --git a/calendar/inc/class.socalendar.inc.php b/calendar/inc/class.socalendar.inc.php
deleted file mode 100755
index 93f174f23f..0000000000
--- a/calendar/inc/class.socalendar.inc.php
+++ /dev/null
@@ -1,472 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Calendar                                                    *
-	* http://www.eGroupWare.org                                                *
-	* Maintained and further developed by RalfBecker@outdoor-training.de       *
-	* Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-	*          http://www.radix.net/~cknudsen                                  *
-	* Originaly modified by Mark Peters <skeeter@phpgroupware.org>             *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	
-	/* $Id$ */
-
-	class socalendar
-	{
-//		var $debug = True;
-		var $debug = False;
-		var $cal;
-		var $db;
-		var $owner;
-		var $g_owner;
-		var $is_group = False;
-		var $datetime;
-		var $filter;
-		var $cat_id;
-
-		function socalendar($param=False)
-		{
-			$this->db = $GLOBALS['phpgw']->db;
-			if(!is_object($GLOBALS['phpgw']->datetime))
-			{
-				$GLOBALS['phpgw']->datetime = createobject('phpgwapi.datetime');
-			}
-
-			$this->owner = (!isset($param['owner']) || $param['owner'] == 0?$GLOBALS['phpgw_info']['user']['account_id']:$param['owner']);
-			$this->filter = (isset($param['filter']) && $param['filter'] != ''?$param['filter']:$this->filter);
-			$this->cat_id = (isset($param['category']) && $param['category'] != ''?$param['category']:$this->cat_id);
-			if(isset($param['g_owner']) && is_array($param['g_owner']))
-			{
-				$this->is_group = True;
-				$this->g_owner = $param['g_owner'];
-			}
-			if($this->debug)
-			{
-				echo '<!-- SO Filter : '.$this->filter.' -->'."\n";
-				echo '<!-- SO cat_id : '.$this->cat_id.' -->'."\n";
-			}
-			$this->cal = CreateObject('calendar.socalendar_');
-
-			foreach($this->cal->all_tables as $name => $table)
-			{
-				$this->$name = $table;
-			}
-			$this->open_box($this->owner);
-		}
-
-		function open_box($owner)
-		{
-			$this->cal->open('INBOX',(int)$owner);
-		}
-
-		function maketime($time)
-		{
-			return mktime($time['hour'],$time['min'],$time['sec'],$time['month'],$time['mday'],$time['year']);
-		}
-
-		function read_entry($id)
-		{
-			return $this->cal->fetch_event($id);
-		}
-
-		function cat_filter($cat_id)
-		{
-			$extra = '';
-			if ($cat_id)
-			{
-				if (!is_array($cat_ids) && !@$GLOBALS['phpgw_info']['user']['preferences']['common']['cats_no_subs'])
-				{
-					if (!is_object($GLOBALS['phpgw']->categories))
-					{
-						$GLOBALS['phpgw']->categories = CreateObject('phpgwapi.categories');
-					}
-					$cats = $GLOBALS['phpgw']->categories->return_all_children($cat_id);
-				}
-				else
-				{
-					$cats = is_array($cat_id) ? $cat_id : array($cat_id);
-				}
-				array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-
-				$extra .= "($this->table.cal_category".(count($cats) > 1 ? ' IN ('.implode(',',$cats).')' : '='.$this->db->quote((int)$cat_id));
-				foreach($cats as $cat)
-				{
-					$extra .= " OR $this->table.cal_category LIKE '$cat,%' OR $this->table.cal_category LIKE '%,$cat,%' OR $this->table.cal_category LIKE '%,$cat'";
-				}
-				$extra .= ') ';
-			}
-			return $extra;
-		}
-			
-		function list_events($startYear,$startMonth,$startDay,$endYear=0,$endMonth=0,$endDay=0,$owner_id=0,$modified=0)
-		{
-			$extra = '';
-			$extra .= strpos($this->filter,'private') ? "AND $this->table.cal_public=0 " : '';
-
-			if ($this->cat_id)
-			{
-				$extra .= ' AND '.$this->cat_filter($this->cat_id);
-			}
-			if ((int) $modified > 0)
-			{
-				$modified -=  $GLOBALS['phpgw']->datetime->tz_offset;
-				$extra .= " AND $this->table.cal_modified >= ".(int) $modified;
-			}
-			if($owner_id)
-			{
-				return $this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,$GLOBALS['phpgw']->datetime->tz_offset,$owner_id);
-			}
-			else
-			{
-				return $this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,$GLOBALS['phpgw']->datetime->tz_offset);
-			}
-		}
-
-		/**
-		 * Returns the id's of all repeating events started after s{year,month,day} AND still running at e{year,month,day}
-		 *
-		 * The startdate of an repeating events is the regular event-startdate.
-		 * Events are "still running" if no recur-enddate is set or its after e{year,month,day}
-		 */
-		function list_repeated_events($syear,$smonth,$sday,$eyear,$emonth,$eday,$owner_id=0,$modified=0)
-		{
-			if(!$owner_id)
-			{
-				$owner_id = $this->is_group ? $this->g_owner : $this->owner;
-			}
-			if($GLOBALS['phpgw_info']['server']['calendar_type'] != 'sql' ||
-				!count($owner_id))	// happens with empty groups
-			{
-				return Array();
-			}
-			$starttime = mktime(0,0,0,$smonth,$sday,$syear) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$endtime = mktime(23,59,59,$emonth,$eday,$eyear) - $GLOBALS['phpgw']->datetime->tz_offset;
-
-			$sql = "AND $this->table.cal_type='M' AND $this->user_table.cal_user_id IN (".
-				(is_array($owner_id) ? implode(',',$owner_id) : $owner_id).')';
-			
-			if ((int) $modified > 0)
-			{
-				$modified -=  $GLOBALS['phpgw']->datetime->tz_offset;
-				$sql .= " AND $this->table.cal_modified >= ".(int) $modified;
-			}
-/* why ???
-			$member_groups = $GLOBALS['phpgw']->accounts->membership($this->user);
-			@reset($member_groups);
-			while(list($key,$group_info) = each($member_groups))
-			{
-				$member[] = $group_info['account_id'];
-			}
-			@reset($member);
-			$sql .= ','.implode(',',$member).') ';
-			$sql .= "AND ($this->table.cal_starttime <= '.$starttime.') ';
-			$sql .= "AND ((($this->recur_table.recur_enddate >= $starttime) AND ($this->recur_table.recur_enddate <= $endtime)) OR ($this->recur_table.recur_enddate=0))) "
-*/
-			$sql .= " AND ($this->recur_table.recur_enddate >= $starttime OR $this->recur_table.recur_enddate=0) "
-				. (strpos($this->filter,'private')? "AND $this->table.cal_public=0 " : '')
-				. ($this->cat_id ? 'AND '.$this->cat_filter($this->cat_id) : '')
-				. "ORDER BY $this->table.cal_starttime ASC, $this->table.cal_endtime ASC, $this->table.cal_priority ASC";
-
-			if($this->debug)
-			{
-				echo '<!-- SO list_repeated_events : SQL : '.$sql.' -->'."\n";
-			}
-
-			return $this->get_event_ids(True,$sql);
-		}
-
-		function list_events_keyword($keywords,$members='')
-		{
-			if (!$members)
-			{
-				$members[] = $this->owner;
-			}
-			array_walk($members,create_function('&$val,$key','$val = (int) $val;'));
-
-			$sql = "AND ($this->user_table.cal_user_id IN (".implode(',',$members).')) AND '.
-				"($this->user_table.cal_user_id=" . (int) $this->owner . " OR $this->table.cal_public=1) AND (";
-
-			$words = split(' ',$keywords);
-			foreach($words as $i => $word)
-			{
-				$sql .= $i > 0 ? ' OR ' : '';
-				$word = $GLOBALS['phpgw']->db->quote('%'.$word.'%');
-				$sql .= "(UPPER($this->table.cal_title) LIKE UPPER($word) OR ".
-					"UPPER($this->table.cal_description) LIKE UPPER($word) OR ".
-					"UPPER($this->table.cal_location) LIKE UPPER($word) OR ".
-					"UPPER($this->extra_table.cal_extra_value) LIKE UPPER($word))";
-			}
-			$sql .= ') ';
-
-			$sql .= strpos($this->filter,'private') ? "AND $this->table.cal_public=0 " : '';
-			$sql .= $this->cat_id ? 'AND '.$this->cat_filter($this->cat_id) : '';
-			$sql .= " ORDER BY $this->table.cal_starttime DESC, $this->table.cal_endtime DESC, $this->table.cal_priority ASC";
-
-			return $this->get_event_ids(False,$sql,True);
-		}
-
-		function read_from_store($startYear,$startMonth,$startDay,$endYear='',$endMonth='',$endDay='')
-		{
-			$events = $this->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay);
-			$events_cached = Array();
-			for($i=0;$i<count($events);$i++)
-			{
-				$events_cached[] = $this->read_entry($events[$i]);
-			}
-			return $events_cached;
-		}
-
-		function get_event_ids($search_repeats=False, $sql='',$search_extra=False)
-		{
-			return $this->cal->get_event_ids($search_repeats,$sql,$search_extra);
-		}
-
-		function find_uid($uid)
-		{
-			$sql = " AND ($this->table.cal_uid=".$this->db->quote($uid).')';
-
-			$found = $this->cal->get_event_ids(False,$sql);
-			if(!$found)
-			{
-				$found = $this->cal->get_event_ids(True,$sql);
-			}
-			if(is_array($found))
-			{
-				return $found[0];
-			}
-			else
-			{
-				return False;
-			}
-		}
-
-		function add_entry(&$event)
-		{
-			return $this->cal->save_event($event);
-		}
-
-		function save_alarm($cal_id,$alarm,$id=0)
-		{
-			return $this->cal->save_alarm($cal_id,$alarm,$id);
-		}
-
-		function delete_alarm($id)
-		{
-			return $this->cal->delete_alarm($id);
-		}
-
-		function delete_alarms($cal_id)
-		{
-			return $this->cal->delete_alarms($cal_id);
-		}
-
-		function delete_entry($id)
-		{
-			return $this->cal->delete_event($id);
-		}
-
-		function expunge()
-		{
-			$this->cal->expunge();
-		}
-
-		function delete_calendar($owner)
-		{
-			$this->cal->delete_calendar($owner);
-		}
-
-		function change_owner($account_id,$new_owner)
-		{
-			if($GLOBALS['phpgw_info']['server']['calendar_type'] == 'sql')
-			{
-				$db2 = $this->db;
-				$this->db->select($this->user_table,'cal_id',array('cal_user_id'=>$account_id),__LINE__,__FILE__);
-				while($this->db->next_record())
-				{
-					$id = $this->db->f('cal_id');
-					$db2->select($this->user_table,'count(*)',$where = array(
-						'cal_id' => $id,
-						'cal_user_id'	=> $new_owner,
-					),__LINE__,__FILE__);
-					$db2->next_record();
-					if($db2->f(0) == 0)
-					{
-						$db2->update($this->user_table,array('cal_user_id' => $new_owner),$where,__LINE__,__FILE__);
-					}
-					else
-					{
-						$db2->delete($this->user_table,$where,__LINE__,__FILE__);
-					}
-				}
-				$this->db->update($this->table,array('cal_owner'=>$new_owner),array('cal_owner'=>$account_id),__LINE__,__FILE__);
-			}
-		}
-
-		function set_status($id,$status)
-		{
-			$this->cal->set_status($id,$this->owner,$status);
-		}
-
-		function get_alarm($cal_id)
-		{
-			if (!method_exists($this->cal,'get_alarm'))
-			{
-				return False;
-			}
-			return $this->cal->get_alarm($cal_id);
-		}
-
-		function read_alarm($id)
-		{
-			if (!method_exists($this->cal,'read_alarm'))
-			{
-				return False;
-			}
-			return $this->cal->read_alarm($id);
-		}
-
-		function read_alarms($cal_id)
-		{
-			if (!method_exists($this->cal,'read_alarms'))
-			{
-				return False;
-			}
-			return $this->cal->read_alarms($cal_id);
-		}
-
-		function find_recur_exceptions($event_id)
-		{
-			if($GLOBALS['phpgw_info']['server']['calendar_type'] == 'sql')
-			{
-				$arr = Array();
-				$this->db->select($this->table,'cal_starttime',array('cal_reference'=>$event_id),__LINE__,__FILE__);
-				if($this->cal->num_rows())
-				{
-					while($this->cal->next_record())
-					{
-						$arr[] = (int)$this->cal->f('cal_starttime');
-					}
-				}
-				if(count($arr) == 0)
-				{
-					return False;
-				}
-				else
-				{
-					return $arr;
-				}
-			}
-			else
-			{
-				return False;
-			}
-		}
-
-		/* Begin mcal equiv functions */
-		function get_cached_event()
-		{
-			return $this->cal->event;
-		}
-		
-		function add_attribute($var,$value,$element='**(**')
-		{
-			$this->cal->add_attribute($var,$value,$element);
-		}
-
-		function event_init()
-		{
-			$this->cal->event_init();
-		}
-
-		function set_date($element,$year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->cal->set_date($element,$year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->cal->set_start($year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->cal->set_end($year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_title($title='')
-		{
-			$this->cal->set_title($title);
-		}
-
-		function set_description($description='')
-		{
-			$this->cal->set_description($description);
-		}
-
-		function set_class($class)
-		{
-			$this->cal->set_class($class);
-		}
-
-		function set_category($category='')
-		{
-			$this->cal->set_category($category);
-		}
-
-		function set_alarm($alarm)
-		{
-			$this->cal->set_alarm($alarm);
-		}
-
-		function set_recur_none()
-		{
-			$this->cal->set_recur_none();
-		}
-
-		function set_recur_secondly($year,$month,$day,$interval)
-		{
-			$this->cal->set_recur_secondly($year,$month,$day,$interval);
-		}
-
-		function set_recur_minutely($year,$month,$day,$interval)
-		{
-			$this->cal->set_recur_minutely($year,$month,$day,$interval);
-		}
-
-		function set_recur_hourly($year,$month,$day,$interval)
-		{
-			$this->cal->set_recur_hourly($year,$month,$day,$interval);
-		}
-
-		function set_recur_daily($year,$month,$day,$interval)
-		{
-			$this->cal->set_recur_daily($year,$month,$day,$interval);
-		}
-
-		function set_recur_weekly($year,$month,$day,$interval,$weekdays)
-		{
-			$this->cal->set_recur_weekly($year,$month,$day,$interval,$weekdays);
-		}
-
-		function set_recur_monthly_mday($year,$month,$day,$interval)
-		{
-			$this->cal->set_recur_monthly_mday($year,$month,$day,$interval);
-		}
-
-		function set_recur_monthly_wday($year,$month,$day,$interval)
-		{
-			$this->cal->set_recur_monthly_wday($year,$month,$day,$interval);
-		}
-
-		function set_recur_yearly($year,$month,$day,$interval)
-		{
-			$this->cal->set_recur_yearly($year,$month,$day,$interval);
-		}
-		
-		/* End mcal equiv functions */
-	}
-?>
diff --git a/calendar/inc/class.socalendar_.inc.php b/calendar/inc/class.socalendar_.inc.php
deleted file mode 100755
index 6f96937577..0000000000
--- a/calendar/inc/class.socalendar_.inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Calendar                                                    *
-	* http://www.egroupware.org                                                *
-	* Maintained and further developed by RalfBecker@outdoor-training.de       *
-	* Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-	*          http://www.radix.net/~cknudsen                                  *
-	* Originaly modified by Mark Peters <skeeter@phpgroupware.org>             *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	if(@$GLOBALS['phpgw_info']['server']['calendar_type'] == 'mcal' &&
-		extension_loaded('mcal') == False)
-	{
-		$GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
-	}
-/* This will be elminated when ical is fully implemented */
-	else
-	{
-		$GLOBALS['phpgw_info']['server']['calendar_type'] = 'sql';
-	}
-	include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.socalendar__.inc.php');
-	include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.socalendar_'.$GLOBALS['phpgw_info']['server']['calendar_type'].'.inc.php');
-?>
diff --git a/calendar/inc/class.socalendar__.inc.php b/calendar/inc/class.socalendar__.inc.php
deleted file mode 100755
index 3fc5fb302f..0000000000
--- a/calendar/inc/class.socalendar__.inc.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Calendar                                                    *
-	* http://www.egroupware.org                                                *
-	* Maintained and further developed by RalfBecker@outdoor-training.de       *
-	* Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-	*          http://www.radix.net/~cknudsen                                  *
-	* Originaly modified by Mark Peters <skeeter@phpgroupware.org>             *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'])
-	{
-		return;
-	}
-
-	$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'] = True;
-
-	/*	include(PHPGW_SERVER_ROOT.'/calendar/setup/setup.inc.php');	*/
-
-	if(extension_loaded('mcal') == False)
-	{
-		define('MCAL_RECUR_NONE',0);
-		define('MCAL_RECUR_DAILY',1);
-		define('MCAL_RECUR_WEEKLY',2);
-		define('MCAL_RECUR_MONTHLY_MDAY',3);
-		define('MCAL_RECUR_MONTHLY_WDAY',4);
-		define('MCAL_RECUR_YEARLY',5);
-		define('MCAL_RECUR_SECONDLY',6);
-		define('MCAL_RECUR_MINUTELY',7);
-		define('MCAL_RECUR_HOURLY',8);
-		
-		define('MCAL_M_SUNDAY',1);
-		define('MCAL_M_MONDAY',2);
-		define('MCAL_M_TUESDAY',4);
-		define('MCAL_M_WEDNESDAY',8);
-		define('MCAL_M_THURSDAY',16);
-		define('MCAL_M_FRIDAY',32);
-		define('MCAL_M_SATURDAY',64);
-		
-		define('MCAL_M_WEEKDAYS',62);
-		define('MCAL_M_WEEKEND',65);
-		define('MCAL_M_ALLDAYS',127);
-	}
-
-	define('MSG_DELETED',0);
-	define('MSG_MODIFIED',1);
-	define('MSG_ADDED',2);
-	define('MSG_REJECTED',3);
-	define('MSG_TENTATIVE',4);
-	define('MSG_ACCEPTED',5);
-	define('MSG_ALARM',6);
-
-	define('REJECTED',0);
-	define('NO_RESPONSE',1);
-	define('TENTATIVE',2);
-	define('ACCEPTED',3);
-
-	class socalendar__
-	{
-		var $event;
-		var $stream;
-		var $user;
-		var $users_status;
-		var $debug = False;
-	//	var $debug = True;
-
-		function socalendar__()
-		{
-		}
-
-		function maketime($time)
-		{
-			return mktime($time['hour'],$time['min'],$time['sec'],$time['month'],$time['mday'],$time['year']);
-		}
-
-		function get_cached_event()
-		{
-			return $this->event;
-		}
-
-		function event_init()
-		{
-			$this->event = Array();
-			$this->add_attribute('owner',(int)$this->user);
-		}
-
-		function set_category($category='')
-		{
-			$this->add_attribute('category',$category);
-		}
-
-		function set_title($title='')
-		{
-			$this->add_attribute('title',$title);
-		}
-
-		function set_description($description='')
-		{
-			$this->add_attribute('description',$description);
-		}
-
-		function set_date($element,$year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->add_attribute($element,(int)$year,'year');
-			$this->add_attribute($element,(int)$month,'month');
-			$this->add_attribute($element,(int)$day,'mday');
-			$this->add_attribute($element,(int)$hour,'hour');
-			$this->add_attribute($element,(int)$min,'min');
-			$this->add_attribute($element,(int)$sec,'sec');
-			$this->add_attribute($element,0,'alarm');
-		}
-
-		function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->set_date('start',$year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-		{
-			$this->set_date('end',$year,$month,$day,$hour,$min,$sec);
-		}
-
-		function set_alarm($alarm)
-		{
-			$this->add_attribute('alarm',(int)$alarm);
-		}
-
-		function set_class($class)
-		{
-			$this->add_attribute('public',$class);
-		}
-
-		function set_common_recur($year=0,$month=0,$day=0,$interval=0)
-		{
-			$this->add_attribute('recur_interval',(int)$interval);
-			$this->set_date('recur_enddate',$year,$month,$day,0,0,0);
-			$this->add_attribute('recur_data',0);
-		}
-
-		function set_recur_none()
-		{
-			$this->set_common_recur(0,0,0,0);
-			$this->add_attribute('recur_type',MCAL_RECUR_NONE);
-		}
-
-		function set_recur_secondly($year,$month,$day,$interval)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_SECONDLY);
-		}
-
-		function set_recur_minutely($year,$month,$day,$interval)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_MINUTELY);
-		}
-
-		function set_recur_hourly($year,$month,$day,$interval)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_HOURLY);
-		}
-
-		function set_recur_daily($year,$month,$day,$interval)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_DAILY);
-		}
-
-		function set_recur_weekly($year,$month,$day,$interval,$weekdays)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_WEEKLY);
-			$this->add_attribute('recur_data',(int)$weekdays);
-		}
-
-		function set_recur_monthly_mday($year,$month,$day,$interval)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_MONTHLY_MDAY);
-		}
-		
-		function set_recur_monthly_wday($year,$month,$day,$interval)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_MONTHLY_WDAY);
-		}
-		
-		function set_recur_yearly($year,$month,$day,$interval)
-		{
-			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
-			$this->add_attribute('recur_type',MCAL_RECUR_YEARLY);
-		}
-
-		function fetch_current_stream_event()
-		{
-			return $this->fetch_event($this->event['id']);
-		}
-		
-		function add_attribute($attribute,$value,$element='**(**')
-		{
-			if(is_array($value))
-			{
-				reset($value);
-			}
-			if($element!='**(**')
-			{
-				$this->event[$attribute][$element] = $value;
-			}
-			else
-			{
-				$this->event[$attribute] = $value;
-			}
-		}
-	}
diff --git a/calendar/inc/class.socalendar_sql.inc.php b/calendar/inc/class.socalendar_sql.inc.php
deleted file mode 100755
index f6e19b5cc2..0000000000
--- a/calendar/inc/class.socalendar_sql.inc.php
+++ /dev/null
@@ -1,754 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Calendar                                                    *
-	* http://www.eGroupWare.org                                                *
-	* Maintained and further developed by RalfBecker@outdoor-training.de       *
-	* Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-	*          http://www.radix.net/~cknudsen                                  *
-	* Originaly modified by Mark Peters <skeeter@phpgroupware.org>             *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	
-	/* $Id$ */
-
-	if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'])
-	{
-		return;
-	}
-
-	$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'] = True;
-
-	class socalendar_ extends socalendar__
-	{
-		var $deleted_events = Array();
-
-		var $cal_event;
-		var $today = Array('raw','day','month','year','full','dow','dm','bd');
-
-		function socalendar_()
-		{
-			$this->socalendar__();
-
-			if (!is_object($GLOBALS['phpgw']->asyncservice))
-			{
-				$GLOBALS['phpgw']->asyncservice = CreateObject('phpgwapi.asyncservice');
-			}
-			$this->async = &$GLOBALS['phpgw']->asyncservice;
-			
-			$this->table = 'phpgw_cal';
-			$this->all_tables = array(
-				'table'			=> $this->table,
-				'user_table'	=> ($this->user_table  = $this->table.'_user'),
-				'recur_table'	=> ($this->recur_table = $this->table.'_repeats'),
-				'extra_table'	=> ($this->extra_table = $this->table.'_extra'),
-			);
-			$this->db = $GLOBALS['phpgw']->db;
-			$this->db->set_app('calendar');
-			$this->stream = &$this->db;	// legacy support
-		}
-
-		function open($calendar='',$user='',$passwd='',$options='')
-		{
-			if($user=='')
-			{
-				$this->user = $GLOBALS['phpgw_info']['user']['account_id'];
-			}
-			elseif(is_int($user))
-			{
-				$this->user = $user;
-			}
-			elseif(is_string($user))
-			{
-				$this->user = $GLOBALS['phpgw']->accounts->name2id($user);
-			}
-			return $this->db;
-		}
-
-		function popen($calendar='',$user='',$passwd='',$options='')
-		{
-			return $this->open($calendar,$user,$passwd,$options);
-		}
-
-		function reopen($calendar,$options='')
-		{
-			return $this->db;
-		}
-
-		function close($options='')
-		{
-			return True;
-		}
-
-		function create_calendar($calendar='')
-		{
-			return $calendar;
-		}
-
-		function rename_calendar($old_name='',$new_name='')
-		{
-			return $new_name;
-		}
-
-		function delete_calendar($calendar='')
-		{
-			$this->db->select($this->table,'cal_id',array('cal_owner' => $calendar),__LINE__,__FILE__);
-			if($this->db->num_rows())
-			{
-				while($this->db->next_record())
-				{
-					$this->delete_event((int)$this->db->f('cal_id'));
-				}
-				$this->expunge();
-			}
-			$this->db->lock(array($this->user_table));
-			$this->db->delete($this->user_table,array('cal_user_id' => $calendar),__LINE__,__FILE__);
-			$this->db->unlock();
-
-			return $calendar;
-		}
-
-		/*!
-		@function read_alarms
-		@abstract read the alarms of a calendar-event specified by $cal_id
-		@returns array of alarms with alarm-id as key
-		@note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
-		*/
-		function read_alarms($cal_id)
-		{
-			$alarms = array();
-
-			if ($jobs = $this->async->read('cal:'.(int)$cal_id.':%'))
-			{
-				foreach($jobs as $id => $job)
-				{
-					$alarm         = $job['data'];	// text, enabled
-					$alarm['id']   = $id;
-					$alarm['time'] = $job['next'];
-
-					$alarms[$id] = $alarm;
-				}
-			}
-			return $alarms;
-		}
-
-		/*!
-		@function read_alarm
-		@abstract read a single alarm specified by it's $id
-		@returns array with data of the alarm
-		@note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
-		*/
-		function read_alarm($id)
-		{
-			if (!($jobs = $this->async->read($id)))
-			{
-				return False;
-			}
-			list($id,$job) = each($jobs);
-			$alarm         = $job['data'];	// text, enabled
-			$alarm['id']   = $id;
-			$alarm['time'] = $job['next'];
-
-			//echo "<p>read_alarm('$id')="; print_r($alarm); echo "</p>\n";
-			return $alarm;
-		}
-
-		/*!
-		@function save_alarm
-		@abstract saves a new or updated alarm
-		@syntax save_alarm($cal_id,$alarm,$id=False)
-		@param $cal_id Id of the calendar-entry
-		@param $alarm array with fields: text, owner, enabled, ..
-		@returns the id of the alarm
-		*/
-		function save_alarm($cal_id,$alarm)
-		{
-			//echo "<p>save_alarm(cal_id=$cal_id, alarm="; print_r($alarm); echo ")</p>\n";
-			if (!($id = $alarm['id']))
-			{
-				$alarms = $this->read_alarms($cal_id);	// find a free alarm#
-				$n = count($alarms);
-				do
-				{
-					$id = 'cal:'.(int)$cal_id.':'.$n;
-					++$n;
-				}
-				while (@isset($alarms[$id]));
-			}
-			else
-			{
-				$this->async->cancel_timer($id);
-			}
-			$alarm['cal_id'] = $cal_id;		// we need the back-reference
-
-			$alarm['time'] -= $GLOBALS['phpgw']->datetime->tz_offset;	// time should be stored in server timezone
-			if (!$this->async->set_timer($alarm['time'],$id,'calendar.bocalendar.send_alarm',$alarm))
-			{
-				return False;
-			}
-			return $id;
-		}
-
-		/*!
-		@function delete_alarms($cal_id)
-		@abstract delete all alarms of a calendar-entry
-		@returns the number of alarms deleted
-		*/
-		function delete_alarms($cal_id)
-		{
-			$alarms = $this->read_alarms($cal_id);
-
-			foreach($alarms as $id => $alarm)
-			{
-				$this->async->cancel_timer($id);
-			}
-			return count($alarms);
-		}
-
-		/*!
-		@function delete_alarm($id)
-		@abstract delete one alarms identified by its id
-		@returns the number of alarms deleted
-		*/
-		function delete_alarm($id)
-		{
-			return $this->async->cancel_timer($id);
-		}
-
-		function fetch_event($event_id,$options='')
-		{
-			if(!isset($this->db))
-			{
-				return False;
-			}
-			$this->db->lock($this->all_tables);
-
-			$this->db->select($this->table,'*',array('cal_id'=>$event_id),__LINE__,__FILE__);
-
-			if($this->db->num_rows() > 0)
-			{
-				$this->event_init();
-
-				$this->db->next_record();
-				// Load the calendar event data from the db into $event structure
-				// Use http://www.php.net/manual/en/function.mcal-fetch-event.php as the reference
-				$this->add_attribute('owner',(int)$this->db->f('cal_owner'));
-				$this->add_attribute('id',(int)$this->db->f('cal_id'));
-				$this->set_class((int)$this->db->f('cal_public'));
-				$this->set_category($this->db->f('cal_category'));
-				$this->set_title(stripslashes($GLOBALS['phpgw']->strip_html($this->db->f('cal_title'))));
-				$this->set_description(stripslashes($GLOBALS['phpgw']->strip_html($this->db->f('cal_description'))));
-				$this->add_attribute('uid',$GLOBALS['phpgw']->strip_html($this->db->f('cal_uid')));
-				$this->add_attribute('location',stripslashes($GLOBALS['phpgw']->strip_html($this->db->f('cal_location'))));
-				$this->add_attribute('reference',(int)$this->db->f('cal_reference'));
-
-				// This is the preferred method once everything is normalized...
-				//$this->event->alarm = (int)$this->db->f('alarm');
-				// But until then, do it this way...
-				//Legacy Support (New)
-
-				$datetime = $GLOBALS['phpgw']->datetime->localdates($this->db->f('cal_starttime'));
-				$this->set_start($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
-
-				$datetime = $GLOBALS['phpgw']->datetime->localdates($this->db->f('cal_modified'));
-				$this->set_date('modtime',$datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
-
-				$datetime = $GLOBALS['phpgw']->datetime->localdates($this->db->f('cal_endtime'));
-				$this->set_end($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
-
-			//Legacy Support
-				$this->add_attribute('priority',(int)$this->db->f('cal_priority'));
-				if($this->db->f('cal_group') || $this->db->f('cal_groups') != 'NULL')
-				{
-					for($j=1;$j<count($groups) - 1;$j++)
-					{
-						$this->add_attribute('groups',$groups[$j],$j-1);
-					}
-				}
-
-				$this->db->select($this->recur_table,'*',array('cal_id'=>$event_id),__LINE__,__FILE__);
-				if($this->db->num_rows())
-				{
-					$this->db->next_record();
-
-					$this->add_attribute('recur_type',(int)$this->db->f('recur_type'));
-					$this->add_attribute('recur_interval',(int)$this->db->f('recur_interval'));
-					$enddate = $this->db->f('recur_enddate');
-					if($enddate != 0 && $enddate != Null)
-					{
-						$datetime = $GLOBALS['phpgw']->datetime->localdates($enddate);
-						$this->add_attribute('recur_enddate',$datetime['year'],'year');
-						$this->add_attribute('recur_enddate',$datetime['month'],'month');
-						$this->add_attribute('recur_enddate',$datetime['day'],'mday');
-						$this->add_attribute('recur_enddate',$datetime['hour'],'hour');
-						$this->add_attribute('recur_enddate',$datetime['minute'],'min');
-						$this->add_attribute('recur_enddate',$datetime['second'],'sec');
-					}
-					else
-					{
-						$this->add_attribute('recur_enddate',0,'year');
-						$this->add_attribute('recur_enddate',0,'month');
-						$this->add_attribute('recur_enddate',0,'mday');
-						$this->add_attribute('recur_enddate',0,'hour');
-						$this->add_attribute('recur_enddate',0,'min');
-						$this->add_attribute('recur_enddate',0,'sec');
-					}
-					$this->add_attribute('recur_enddate',0,'alarm');
-					if($this->debug)
-					{
-						echo 'Event ID#'.$this->event['id'].' : Enddate = '.$enddate."<br>\n";
-					}
-					$this->add_attribute('recur_data',$this->db->f('recur_data'));
-
-					$exception_list = $this->db->f('recur_exception');
-					$exceptions = Array();
-					if(strpos(' '.$exception_list,','))
-					{
-						$exceptions = explode(',',$exception_list);
-					}
-					elseif($exception_list != '')
-					{
-						$exceptions[]= $exception_list;
-					}
-					$this->add_attribute('recur_exception',$exceptions);
-				}
-
-			//Legacy Support
-				$this->db->select($this->user_table,'*',array('cal_id'=>$event_id),__LINE__,__FILE__);
-				if($this->db->num_rows())
-				{
-					while($this->db->next_record())
-					{
-						if((int)$this->db->f('cal_user_id') == (int)$this->user)
-						{
-							$this->add_attribute('users_status',$this->db->f('cal_status'));
-						}
-						$this->add_attribute('participants',$this->db->f('cal_status'),(int)$this->db->f('cal_user_id'));
-					}
-				}
-
-			// Custom fields
-				$this->db->select($this->extra_table,'*',array('cal_id'=>$event_id),__LINE__,__FILE__);
-				if($this->db->num_rows())
-				{
-					while($this->db->next_record())
-					{
-						$this->add_attribute('#'.$this->db->f('cal_extra_name'),$this->db->f('cal_extra_value'));
-					}
-				}
-			}
-			else
-			{
-				$this->event = False;
-			}
-
-			$this->db->unlock();
-
-			if ($this->event)
-			{
-				$this->event['alarm'] = $this->read_alarms($event_id);
-
-				if($this->event['reference'])
-				{
-					$this->event['alarm'] += $this->read_alarms($event_id);
-				}
-			}
-			return $this->event;
-		}
-
-		function list_events($startYear,$startMonth,$startDay,$endYear=0,$endMonth=0,$endDay=0,$extra='',$tz_offset=0,$owner_id=0)
-		{
-			if(!isset($this->db))
-			{
-				return False;
-			}
-
-			$user_where = " AND ($this->user_table.cal_user_id IN (";
-			if(is_array($owner_id) && count($owner_id))
-			{
-				array_walk($owner_id,create_function('$key,&$val','$val = (int) $val;'));
-				$user_where .= implode(',',$owner_id);
-			}
-			else
-			{
-				$user_where .= (int)$this->user;
-			}
-/* why ???
-			$member_groups = $GLOBALS['phpgw']->accounts->membership($this->user);
-			@reset($member_groups);
-			while($member_groups != False && list($key,$group_info) = each($member_groups))
-			{
-				$member[] = $group_info['account_id'];
-			}
-			@reset($member);
-	//		$user_where .= ','.implode(',',$member);
-*/
-			$user_where .= ')) ';
-
-			if($this->debug)
-			{
-				echo '<!-- '.$user_where.' -->'."\n";
-			}
-
-			$datetime = mktime(0,0,0,$startMonth,$startDay,$startYear) - $tz_offset;
-			$startDate = "AND ( ( ($this->table.cal_starttime >= $datetime) ";
-
-			$enddate = '';
-			if($endYear != 0 && $endMonth != 0 && $endDay != 0)
-			{
-				$edatetime = mktime(23,59,59,(int)$endMonth,(int)$endDay,(int)$endYear) - $tz_offset;
-				$endDate .= "AND ($this->table.cal_endtime <= $edatetime) ) "
-					. "OR ( ($this->table.cal_starttime <= $datetime) "
-					. "AND ($this->table.cal_endtime >= $edatetime) ) "
-					. "OR ( ($this->table.cal_starttime >= $datetime) "
-					. "AND ($this->table.cal_starttime <= $edatetime) "
-					. "AND ($this->table.cal_endtime >= $edatetime) ) "
-					. "OR ( ($this->table.cal_starttime <= $datetime) "
-					. "AND ($this->table.cal_endtime >= $datetime) "
-					. "AND ($this->table.cal_endtime <= $edatetime) ";
-			}
-			$endDate .= ') ) ';
-
-			$order_by = "ORDER BY $this->table.cal_starttime ASC, $this->table.cal_endtime ASC, $this->table.cal_priority ASC";
-			if($this->debug)
-			{
-				echo "SQL : ".$user_where.$startDate.$endDate.$extra."<br>\n";
-			}
-			return $this->get_event_ids(False,$user_where.$startDate.$endDate.$extra.$order_by);
-		}
-
-		function append_event()
-		{
-			$this->save_event($this->event);
-			$this->send_update(MSG_ADDED,$this->event->participants,'',$this->event);
-			return $this->event['id'];
-		}
-
-		function store_event()
-		{
-			return $this->save_event($this->event);
-		}
-
-		function delete_event($event_id)
-		{
-			$this->deleted_events[] = $event_id;
-		}
-
-		function snooze($event_id)
-		{
-		//Turn off an alarm for an event
-		//Returns true.
-		}
-
-		function list_alarms($begin_year='',$begin_month='',$begin_day='',$end_year='',$end_month='',$end_day='')
-		{
-		//Return a list of events that has an alarm triggered at the given datetime
-		//Returns an array of event ID's
-		}
-
-		// The function definition doesn't look correct...
-		// Need more information for this function
-		function next_recurrence($weekstart,$next)
-		{
-	//		return next_recurrence (int stream, int weekstart, array next);
-		}
-
-		function expunge()
-		{
-			if(count($this->deleted_events) <= 0)
-			{
-				return 1;
-			}
-			$this_event = $this->event;
-
-			$this->db->lock($this->all_tables);
-			foreach($this->deleted_events as $cal_id)
-			{
-				foreach ($this->all_tables as $table)
-				{
-					$this->db->delete($table,array('cal_id'=>$cal_id),__LINE__,__FILE__);
-				}
-			}
-			$this->db->unlock();
-
-			foreach($this->deleted_events as $cal_id)
-			{
-				$this->delete_alarms($cal_id);
-			}
-			$this->deleted_events = array();
-
-			$this->event = $this_event;
-			return 1;
-		}
-
-		/***************** Local functions for SQL based Calendar *****************/
-
-		function get_event_ids($search_repeats=False,$extra='',$search_extra=False)
-		{
-			$from = $where = ' ';
-			if($search_repeats)
-			{
-				$from  = ",$this->recur_table ";
-				$where = "AND ($this->recur_table.cal_id = $this->table.cal_id) ";
-			}
-			if($search_extra)
-			{
-				$from  .= "LEFT JOIN $this->extra_table ON $this->extra_table.cal_id = $this->table.cal_id ";
-			}
-
-			$sql = "SELECT DISTINCT $this->table.cal_id,$this->table.cal_starttime,$this->table.cal_endtime,$this->table.cal_priority".
-				" FROM $this->user_table,$this->table$from".
-				" WHERE ($this->user_table.cal_id=$this->table.cal_id) $where $extra";
-
-			if($this->debug)
-			{
-				echo "FULL SQL : ".$sql."<br>\n";
-			}
-
-			$this->db->query($sql,__LINE__,__FILE__);
-
-			$retval = Array();
-			if($this->db->num_rows() == 0)
-			{
-				if($this->debug)
-				{
-					echo "No records found!<br>\n";
-				}
-				return $retval;
-			}
-
-			while($this->db->next_record())
-			{
-				$retval[] = (int)$this->db->f('cal_id');
-			}
-			if($this->debug)
-			{
-				echo "Records found!<br>\n";
-			}
-			return $retval;
-		}
-
-		function generate_uid($event)
-		{
-			if (!$event['id']) return False;	// we need the id !!!
-
-			$suffix = $GLOBALS['phpgw_info']['server']['hostname'] ? $GLOBALS['phpgw_info']['server']['hostname'] : 'local';
-			$prefix = 'cal-'.$event['id'].'-'.$GLOBALS['phpgw_info']['server']['install_id'];
-			return $prefix . '@' . $suffix;
-		}
-
-		function save_event(&$event)
-		{
-			$this->db->lock($this->all_tables);
-			if($event['id'] == 0)
-			{
-				$this->db->insert($this->table,array(
-					'cal_uid'		=> '*new*',
-					'cal_title'		=> $event['title'],
-					'cal_owner'		=> $event['owner'],
-					'cal_priority'	=> $event['priority'],
-					'cal_public'	=> $event['public'],
-					'cal_category'	=> $event['category']
-				),False,__LINE__,__FILE__);
-
-				$event['id'] = $this->db->get_last_insert_id($this->table,'cal_id');
-			}
-			// new event or new created referencing event
-			if (!$event['uid'] || $event['reference'] && strstr($event['uid'],'cal-'.$event['reference'].'-'))
-			{
-				$event['uid'] = $this->generate_uid($event);
-			}
-			$this->db->update($this->table,array(
-				'cal_uid'		=> $event['uid'],
-				'cal_owner' 	=> $event['owner'],
-				'cal_starttime'	=> $this->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset,
-				'cal_modified'	=> time() - $GLOBALS['phpgw']->datetime->tz_offset,
-				'cal_endtime'	=> $this->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset,
-				'cal_priority'	=> $event['priority'],
-				'cal_category'	=> $event['category'],
-				'cal_type'		=> $event['recur_type'] != MCAL_RECUR_NONE ? 'M' : 'E',
-				'cal_public'	=> $event['public'],
-				'cal_title'		=> $event['title'],
-				'cal_description'=> $event['description'],
-				'cal_location'	=> $event['location'],
-				'cal_groups'	=> is_array($event['groups']) ? ','.implode(',',$event['groups']).',' : '',
-				'cal_reference'	=> $event['reference'],
-			),array('cal_id' => $event['id']),__LINE__,__FILE__);
-
-			$this->db->delete($this->user_table,array('cal_id' => $event['id']),__LINE__,__FILE__);
-
-			foreach($event['participants'] as $uid => $status)
-			{
-				$this->db->insert($this->user_table,array(
-					'cal_id'		=> $event['id'],
-					'cal_user_id' 	=> $uid,
-					'cal_status'	=> (int)$uid == $event['owner'] ? 'A' : $status,
-				),False,__LINE__,__FILE__);
-			}
-
-			if($event['recur_type'] != MCAL_RECUR_NONE)
-			{
-				$this->db->insert($this->recur_table,array(
-					'recur_type'	 => $event['recur_type'],
-					'recur_enddate' => $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 0 ?
-						$this->maketime($event['recur_enddate']) - $GLOBALS['phpgw']->datetime->tz_offset : 0,
-					'recur_data'	 => $event['recur_data'],
-					'recur_interval' => $event['recur_interval'],
-					'recur_exception'=> is_array($event['recur_exception']) ? implode(',',$event['recur_exception']) : '',
-				),array('cal_id' => $event['id']),__LINE__,__FILE__);
-			}
-			else
-			{
-				$this->db->delete($this->recur_table,array('cal_id' => $event['id']),__LINE__,__FILE__);
-			}
-			// Custom fields
-			foreach($event as $name => $value)
-			{
-				if ($name[0] == '#')
-				{
-					if (strlen($value))
-					{
-						$this->db->insert($this->extra_table,array(
-							'cal_extra_value'	=> $value,
-						),array(
-							'cal_id'			=> $event['id'],
-							'cal_extra_name'	=> substr($name,1),
-						),__LINE__,__FILE__);
-					}
-					else
-					{
-						$this->db->delete($this->extra_table,array(
-							'cal_id'			=> $event['id'],
-							'cal_extra_name'	=> substr($name,1),
-						),__LINE__,__FILE__);
-					}	
-				}
-			}
-			print_debug('Event Saved: ID #',$event['id']);
-
-			$this->db->unlock();
-
-			if (is_array($event['alarm']))
-			{
-				foreach ($event['alarm'] as $alarm)	// this are all new alarms
-				{
-					$this->save_alarm($event['id'],$alarm);
-				}
-			}
-			$GLOBALS['phpgw_info']['cal_new_event_id'] = $event['id'];
-			$this->event = $event;
-
-			return True;
-		}
-
-		function get_alarm($cal_id)
-		{
-			$alarms = $this->read_alarms($cal_id);
-			$ret = False;
-
-			foreach($alarms as $alarm)
-			{
-				if ($alarm['owner'] == $this->user || !$alarm['owner'])
-				{
-					$ret[$alarm['time']] = $alarm['text'];
-				}
-			}
-			return $ret;
-		}
-
-		function set_status($id,$owner,$status)
-		{
-			$status_code_short = Array(
-				REJECTED 	=> 'R',
-				NO_RESPONSE	=> 'U',
-				TENTATIVE	=> 'T',
-				ACCEPTED	=> 'A'
-			);
-
-			$this->db->update($this->user_table,array(
-				'cal_status'	=> $status_code_short[$status],
-			),array(
-				'cal_id'		=> $id,
-				'cal_user_id'	=> $owner,
-			),__LINE__,__FILE__);
-
-			return True;
-		}
-
-	// End of ICal style support.......
-
-		function group_search($owner=0)
-		{
-			$owner = ($owner==$GLOBALS['phpgw_info']['user']['account_id']?0:$owner);
-			$groups = substr($GLOBALS['phpgw']->common->sql_search("$this->table.groups",(int)$owner),4);
-			if (!$groups)
-			{
-				return '';
-			}
-			else
-			{
-				return "($this->table.is_public=2 AND (". $groups .')) ';
-			}
-		}
-
-		function splittime_($time)
-		{
-			$temp = array('hour','minute','second','ampm');
-			$time = strrev($time);
-			$second = (int)strrev(substr($time,0,2));
-			$minute = (int)strrev(substr($time,2,2));
-			$hour   = (int)strrev(substr($time,4));
-			$temp['second'] = (int)$second;
-			$temp['minute'] = (int)$minute;
-			$temp['hour']   = (int)$hour;
-			$temp['ampm']   = '  ';
-
-			return $temp;
-		}
-
-		function date_to_epoch($d)
-		{
-			return $this->localdates(mktime(0,0,0,(int)(substr($d,4,2)),(int)(substr($d,6,2)),(int)(substr($d,0,4))));
-		}
-
-		function list_dirty_events($lastmod=-1,$repeats=false)
-		{
-			if(!isset($this->db))
-			{
-				return False;
-			}
-			$lastmod = (int)  $lastmod;
-			$repeats = (bool) $repeats;
-
-			$user_where = " AND $this->user_table.cal_user_id=".(int)$this->user;
-/* why not used ???
-			if ($member_groups = $GLOBALS['phpgw']->accounts->membership($this->user))
-			{
-				foreach($member_groups as $key => $group_info)
-				{
-					$member[] = $group_info['account_id'];
-				}
-			}
-			$user_where .= ','.implode(',',$member) . ')) ';
-*/
-			if($this->debug)
-			{
-				echo '<!-- '.$user_where.' -->'."\n";
-			}
-
-			if($lastmod > 0)
-			{
-				$wheremod = "AND $this->table.cal_modified=".(int)$lastmod;
-			}
-
-			$order_by = " ORDER BY $this->table.cal_id ASC";
-			if($this->debug)
-			{
-				echo "SQL : ".$user_where.$wheremod.$extra."<br>\n";
-			}
-			return $this->get_event_ids($repeats,$user_where.$wheremod.$extra.$order_by);
-		}
-	}
diff --git a/calendar/inc/class.soholiday.inc.php b/calendar/inc/class.soholiday.inc.php
index d575a7fcbf..ff27a563c1 100755
--- a/calendar/inc/class.soholiday.inc.php
+++ b/calendar/inc/class.soholiday.inc.php
@@ -13,6 +13,14 @@
 
 	/* $Id$ */
 
+	/**
+	 * Storage layer for calendar holidays
+	 *
+	 * @package calendar
+	 * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+	 * @author Mark Peters <skeeter@phpgroupware.org>
+	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+	 */
 	class soholiday
 	{
 		var $debug = False;
@@ -20,9 +28,9 @@
 
 		function soholiday()
 		{
-			$this->db = $GLOBALS['phpgw']->db;
+			$this->db = clone($GLOBALS['egw']->db);
 			$this->db->set_app('calendar');
-			$this->table = 'phpgw_cal_holidays';
+			$this->table = 'egw_cal_holidays';
 		}
 
 		/* Begin Holiday functions */
@@ -72,7 +80,7 @@
 				$holidays[] = Array(
 					'index'			=> $this->db->f('hol_id'),
 					'locale'		=> $this->db->f('hol_locale'),
-					'name'			=> $GLOBALS['phpgw']->strip_html($this->db->f('hol_name')),
+					'name'			=> $GLOBALS['egw']->strip_html($this->db->f('hol_name')),
 					'day'			=> (int)$this->db->f('hol_mday'),
 					'month'			=> (int)$this->db->f('hol_month_num'),
 					'occurence'		=> (int)$this->db->f('hol_occurence'),
@@ -116,7 +124,6 @@
 			}
 			$this->db->select($this->table,'*',array('hol_id'=>$id),__LINE__,__FILE__);
 			$this->store_to_array($holidays);
-			@reset($holidays);
 			return $holidays[0];
 		}
 
@@ -127,7 +134,7 @@
 
 		function delete_locale($locale)
 		{
-			$this->db->delete($this->table,array('hol_local' => $locale),__LINE__,__FILE__);
+			$this->db->delete($this->table,array('hol_locale' => $locale),__LINE__,__FILE__);
 		}
 		
 		/* Private functions */
@@ -196,4 +203,3 @@
 			return $retval;
 		}
 	}
-?>
diff --git a/calendar/inc/class.uialarm.inc.php b/calendar/inc/class.uialarm.inc.php
deleted file mode 100755
index dc10abb08b..0000000000
--- a/calendar/inc/class.uialarm.inc.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Modified by Mark Peters <skeeter@phpgroupware.org>                       *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	class uialarm
-	{
-		var $template;
-		var $template_dir;
-
-		var $bo;
-		var $event;
-
-		var $debug = False;
-//		var $debug = True;
-
-		var $tz_offset;
-		var $theme;
-
-		var $public_functions = array(
-			'manager' => True
-		);
-
-		function uialarm()
-		{
-			$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
-			$GLOBALS['phpgw']->browser    = CreateObject('phpgwapi.browser');
-			
-			$this->theme = $GLOBALS['phpgw_info']['theme'];
-
-			$this->bo = CreateObject('calendar.boalarm');
-
-			if($this->debug)
-			{
-				echo "BO Owner : ".$this->bo->owner."<br>\n";
-			}
-			$this->template_dir = $GLOBALS['phpgw']->common->get_tpl_dir('calendar');
-
-			if (!is_object($GLOBALS['phpgw']->html))
-			{
-				$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
-			}
-			$this->html = &$GLOBALS['phpgw']->html;
-
-			// jscalendar is needed by the new navigation-menu AND it need to be loaded befor the header !!!
-			if (!is_object($GLOBALS['phpgw']->jscalendar))
-			{
-				$GLOBALS['phpgw']->jscalendar = CreateObject('phpgwapi.jscalendar');
-			}
-		}
-
-		function prep_page()
-		{
-			if ($this->bo->cal_id <= 0 ||
-				!$this->event = $this->bo->read_entry($this->bo->cal_id))
-			{
-				$GLOBALS['phpgw']->redirect_link('/index.php',Array(
-					'menuaction'	=> 'calendar.uicalendar.index'
-				));
-			}
-
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Alarm Management');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$this->template = CreateObject('phpgwapi.Template',$this->template_dir);
-
-			$this->template->set_unknowns('remove');
-			$this->template->set_file(
-				Array(
-					'alarm'	=> 'alarm.tpl'
-				)
-			);
-			$this->template->set_block('alarm','alarm_management','alarm_management');
-			$this->template->set_block('alarm','alarm_headers','alarm_headers');
-			$this->template->set_block('alarm','list','list');
-			$this->template->set_block('alarm','hr','hr');
-			$this->template->set_block('alarm','buttons','buttons');
-		}
-
-		function output_template_array($row,$list,$var)
-		{
-			if (!isset($var['tr_color']))
-			{
-				$var['tr_color'] = $GLOBALS['phpgw']->nextmatchs->alternate_row_color();
-			}
-			$this->template->set_var($var);
-			$this->template->parse($row,$list,True);
-		}
-
-		/* Public functions */
-
-		function manager()
-		{
-			if ($_POST['cancel'])
-			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.($_POST['return_to'] ? $_POST['return_to'] : 'calendar.uicalendar.index'));
-			}
-			if ($_POST['delete'] && count($_POST['alarm']))
-			{
-				if ($this->bo->delete($_POST['alarm']) < 0)
-				{
-					echo '<center>'.lang('You do not have permission to delete this alarm !!!').'</center>';
-					$GLOBALS['phpgw']->common->phpgw_exit(True);
-				}
-			}
-			if (($_POST['enable'] || $_POST['disable']) && count($_POST['alarm']))
-			{
-				if ($this->bo->enable($_POST['alarm'],$_POST['enable']) < 0)
-				{
-					echo '<center>'.lang('You do not have permission to enable/disable this alarm !!!').'</center>';
-					$GLOBALS['phpgw']->common->phpgw_exit(True);
-				}
-			}
-			$this->prep_page();
-
-			if ($_POST['add'])
-			{
-				$time = (int)($_POST['time']['days'])*24*3600 +
-					(int)($_POST['time']['hours'])*3600 +
-					(int)($_POST['time']['mins'])*60;
-
-				if ($time > 0 && !$this->bo->add($this->event,$time,$_POST['owner']))
-				{
-					echo '<center>'.lang('You do not have permission to add alarms to this event !!!').'</center>';
-					$GLOBALS['phpgw']->common->phpgw_exit(True);
-				}
-			}
-			if (!ExecMethod('calendar.uicalendar.view_event',$this->event))
-			{
-				echo '<center>'.lang('You do not have permission to read this record!').'</center>';
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-			echo "<br>\n";
-			$GLOBALS['phpgw']->template->set_var('th_bg',$this->theme['th_bg']);
-			$GLOBALS['phpgw']->template->set_var('hr_text',lang('Alarms').':');
-			$GLOBALS['phpgw']->template->fp('row','hr',True);
-			$GLOBALS['phpgw']->template->pfp('phpgw_body','view_event');
-
-			$var = Array(
-				'tr_color'		=> $this->theme['th_bg'],
-				'lang_select'	=> lang('Select'),
-				'lang_time'		=> lang('Time'),
-				'lang_text'		=> lang('Text'),
-				'lang_owner'	=> lang('Owner'),
-				'lang_enabled'	=> lang('enabled'),
-				'lang_disabled'	=> lang('disabled'),
-			);
-			if($this->event['alarm'])
-			{
-				$this->output_template_array('rows','alarm_headers',$var);
-
-				foreach($this->event['alarm'] as $key => $alarm)
-				{
-					if (!$this->bo->check_perms(PHPGW_ACL_READALARM,$alarm['owner']))
-					{
-						continue;
-					}
-					$var = Array(
-						'field'    => $GLOBALS['phpgw']->common->show_date($alarm['time']),
-						//'data'   => $alarm['text'],
-						'data'     => lang('Email Notification'),
-						'owner'    => $GLOBALS['phpgw']->common->grab_owner_name($alarm['owner']),
-						'enabled'  => $this->html->image('calendar',$alarm['enabled']?'enabled':'disabled',$alarm['enabled']?'enabled':'disabled','width="13" height="13"'),
-						'select'   => $this->html->checkbox("alarm[$alarm[id]]")
-					);
-					if ($this->bo->check_perms(PHPGW_ACL_DELETEALARM,$alarm['owner']))
-					{
-						++$to_delete;
-					}
-					$this->output_template_array('rows','list',$var);
-				}
-				$this->template->set_var('enable_button',$this->html->submit_button('enable','Enable'));
-				$this->template->set_var('disable_button',$this->html->submit_button('disable','Disable'));
-				if ($to_delete)
-				{
-					$this->template->set_var('delete_button',$this->html->submit_button('delete','Delete',"return confirm('".lang("Are you sure\\nyou want to\\ndelete these alarms?")."')"));
-				}
-				$this->template->parse('rows','buttons',True);
-			}
-			if (isset($this->event['participants'][(int)$GLOBALS['phpgw_info']['user']['account_id']]))
-			{
-				$this->template->set_var(Array(
-					'input_days'    => $this->html->select('time[days]',$_POST['time']['days'],range(0,31),True).' '.lang('days'),
-					'input_hours'   => $this->html->select('time[hours]',$_POST['time']['hours'],range(0,24),True).' '.lang('hours'),
-					'input_minutes' => $this->html->select('time[mins]',$_POST['time']['mins'],range(0,60),True).' '.lang('minutes').' '.lang('before the event'),
-					'input_owner'   => $this->html->select('owner',$GLOBALS['phpgw_info']['user']['account_id'],$this->bo->participants($this->event,True),True),
-					'input_add'     => $this->html->submit_button('add','Add Alarm'),
-				));
-			}
-			$this->template->set_var(Array(
-				'action_url'	=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uialarm.manager')),
-				'hidden_vars'	=> $this->html->input_hidden(array(
-					'cal_id' => $this->bo->cal_id,
-					'return_to' => $_POST['return_to']
-				)),
-				'lang_enable'	=> lang('Enable'),
-				'lang_disable'	=> lang('Disable'),
-				'input_cancel'  => $this->html->submit_button('cancel','Cancel')
-			));
-//echo "<p>alarm_management='".htmlspecialchars($this->template->get_var('alarm_management'))."'</p>\n";
-			$this->template->pfp('out','alarm_management');
-		}
-	}
-?>
diff --git a/calendar/inc/class.uical.inc.php b/calendar/inc/class.uical.inc.php
index d5f130c97d..49345207db 100644
--- a/calendar/inc/class.uical.inc.php
+++ b/calendar/inc/class.uical.inc.php
@@ -1,8 +1,8 @@
 <?php
 /**************************************************************************\
-* eGroupWare - Calendar - shared base-class of all calendar UserInterfaces *
+* eGroupWare - Calendar - shared base-class of all calendar UI classes     *
 * http://www.egroupware.org                                                *
-* Written and (c) 2004 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* Written and (c) 2004/5 by Ralf Becker <RalfBecker@outdoor-training.de>   *
 * --------------------------------------------                             *
 *  This program is free software; you can redistribute it and/or modify it *
 *  under the terms of the GNU General Public License as published by the   *
@@ -13,62 +13,144 @@
 /* $Id$ */
 
 /**
- * shared base-class of all calendar UserInterfaces
+ * Shared base-class of all calendar UserInterface classes
  *
  * It manages eg. the state of the controls in the UI and generated the calendar navigation (sidebox-menu)
  *
+ * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
+ *  UI only operates in user-time, so there have to be no conversation at all !!!
+ *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
+ *  SO operates only on server-time
+ *
+ * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
+ *
  * @package calendar
- * @author RalfBecker@outdoor-training.de
- * @license GPL
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2004/5 by RalfBecker-At-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 class uical
 {
 	/**
 	 * @var $debug mixed integer level or string function-name
 	 */
-	var $debug=False;
-	
+	var $debug=false;
 	/**
 	 * @var $bo class bocal
 	 */
-	var $bo;
+	var $bo,$jscal,$html,$datetime,$cats,$accountsel;
+	/**
+	 * @var array $common_prefs reference to $GLOBALS['egw_info']['user']['preferences']['common']
+	 */
+	var $common_prefs;
+	/**
+	 * @var array $cal_prefs reference to $GLOBALS['egw_info']['user']['preferences']['calendar']
+	 */
+	var $cal_prefs;
+	/**
+	 * @var int $wd_start user pref. workday start
+	 */
+	var $wd_start;
+	/**
+	 * @var int $wd_start user pref. workday end
+	 */
+	var $wd_end;
+	/**
+	 * @var int $interval_m user pref. interval
+	 */
+	var $interval_m;
+	/**
+	 * @var int $user account_id of loged in user
+	 */
+	var $user;
+	/**
+	 * @var string $date session-state: date (Ymd) of shown view
+	 */
+	var $date;
+	/**
+	 * @var int $cat_it session-state: selected category
+	 */
+	var $cat_id;
+	/**
+	 * @var int $filter session-state: selected filter
+	 */
+	var $filter;
+	/**
+	 * @var int/array $owner session-state: selected owner(s) of shown calendar(s)
+	 */
+	var $owner;
+	/**
+	 * @var boolean $multiple session-state: true multiple owners selected, false single user/group
+	 */
+	var $multiple;
+	/**
+	 * @var int $num_month session-state: number of month shown
+	 */
+	var $num_month;
+	/**
+	 * @var string $sortby session-state: filter of planner: 'category' or 'user'
+	 */
+	var $sortby;
+	/**
+	 * @var string $view session-state: selected view
+	 */
+	var $view;
+	/**
+	 * @var string $view menuaction of the selected view
+	 */
+	var $view_menuaction;
+	
+	/**
+	 * @var int $first first day of the shown view
+	 */
+	var $first;
+	/**
+	 * @var int $last last day of the shown view
+	 */
+	var $last;
 
 	/**
 	 * Constructor
+	 *
+	 * @param boolean $use_bocalupdate use bocalupdate as parenent instead of bocal
+	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function uical()
+	function uical($use_bocalupdate=false,$set_states=NULL)
 	{
 		foreach(array(
-			'bo'    => 'calendar.bocal',
+			'bo'    => $use_bocalupdate ? 'calendar.bocalupdate' : 'calendar.bocal',
 			'jscal' => 'phpgwapi.jscalendar',	// for the sidebox-menu
 			'html'  => 'phpgwapi.html',
 			'datetime' => 'phpgwapi.datetime',
-			'cats'  => 'phpgwapi.categories',
 			'accountsel' => 'phpgwapi.uiaccountsel',
 		) as $my => $app_class)
 		{
 			list(,$class) = explode('.',$app_class);
 
-			if (!is_object($GLOBALS['phpgw']->$class))
+			if (!is_object($GLOBALS['egw']->$class))
 			{
-				$GLOBALS['phpgw']->$class = CreateObject($app_class);
+				$GLOBALS['egw']->$class =& CreateObject($app_class);
 			}
-			$this->$my = &$GLOBALS['phpgw']->$class;
+			$this->$my = &$GLOBALS['egw']->$class;
 		}
-		$this->common_prefs = &$GLOBALS['phpgw_info']['user']['preferences']['common'];
-		$this->cal_prefs = &$GLOBALS['phpgw_info']['user']['preferences']['calendar'];
-		$this->wd_start = 60*$this->cal_prefs['workdaystarts'];
-		$this->wd_end   = 60*$this->cal_prefs['workdayends'];
-		$this->interval_m   = $this->cal_prefs['interval'];
+		if (!is_object($this->cats))
+		{
+			$this->cats =& CreateObject('phpgwapi.categories','','calendar');	// we need an own instance to get the calendar cats
+		}
+		$this->common_prefs	= &$GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->cal_prefs	= &$GLOBALS['egw_info']['user']['preferences']['calendar'];
+		$this->wd_start		= 60*$this->cal_prefs['workdaystarts'];
+		$this->wd_end		= 60*$this->cal_prefs['workdayends'];
+		$this->interval_m	= $this->cal_prefs['interval'];
 
-		$this->user = $GLOBALS['phpgw_info']['user']['account_id'];
+		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-		$this->manage_states();
+		$this->manage_states($set_states);
 
 		$GLOBALS['uical'] = &$this;	// make us available for ExecMethod, else it creates a new instance
 		
 		// calendar does not work with hidden sidebox atm.
-		unset($GLOBALS['phpgw_info']['user']['preferences']['common']['auto_hide_sidebox']);
+		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 	}
 
 	/**
@@ -83,12 +165,12 @@ class uical
 	 *	- filter: the used filter: no filter / all or only privat
 	 *	- num_month: number of month shown in the planner
 	 *	- sortby: category or user of planner
-	 *	- return_to: the view the dialogs should return to
+	 *	- view: the actual view, where dialogs should return to or which they refresh
 	 * @param set_states array to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
 	function manage_states($set_states=NULL)
 	{
-		$states = $states_session = $GLOBALS['phpgw']->session->appsession('session_data','calendar');
+		$states = $states_session = $GLOBALS['egw']->session->appsession('session_data','calendar');
 
 		if (is_null($set_states))
 		{
@@ -108,7 +190,9 @@ class uical
 			'num_month'  => 1,
 			'save_owner' => 0,
 			'sortby'     => 'category',
+			'planner_days'=> 0,	// full month
 			'multiple'   => 0,
+			'view'       => $this->bo->cal_prefs['defaultcalendar'],
 		) as $state => $default)
 		{
 			if (isset($set_states[$state]))
@@ -129,14 +213,36 @@ class uical
 			}
 			$this->$state = $states[$state];
 		}
+		if (substr($this->view,0,8) == 'planner_')
+		{
+			$states['sortby'] = $this->sortby = $this->view == 'planner_cat' ? 'category' : 'user';
+			$states['view'] = $this->view = 'planner';
+		}
 		// set the actual view as return_to
 		list($app,$class,$func) = explode('.',$_GET['menuaction']);
-		if ($class == 'uiviews' && $func)
+		if (($class == 'uiviews' || $class == 'uilist') && $func)
 		{
-			$states['return_to'] = $_GET['menuaction'];
+			// if planner_start_with_group is set in the users prefs: switch owner for planner to planner_start_with_group and back
+			if ($this->cal_prefs['planner_start_with_group'])
+			{
+				if ($func == 'planner' && $this->view != 'planner' && $this->owner == $this->user)
+				{
+					//echo "<p>switched for planner to {$this->cal_prefs['planner_start_with_group']}, view was $this->view, func=$func, owner was $this->owner</p>\n";
+					$states['save_owner'] = $this->save_owner = $this->owner;
+					$states['owner'] = $this->owner = $this->cal_prefs['planner_start_with_group'];
+				}
+				elseif ($func != 'planner' && $this->view == 'planner' && $this->owner == $this->cal_prefs['planner_start_with_group'] && $this->save_owner)
+				{
+					//echo "<p>switched back to $this->save_owner, view was $this->view, func=$func, owner was $this->owner</p>\n";
+					$states['owner'] = $this->owner = $this->save_owner;
+					$states['save_owner'] = $this->save_owner = 0;
+				}
+			}
+			$this->view = $states['view'] = $func;
 		}
+		$this->view_menuaction = $this->view == 'listview' ? 'calendar.uilist.listview' : 'calendar.uiviews.'.$this->view;
 		// deal with group-owners
-		if (substr($this->owner,0,2) == 'g_' || $GLOBALS['phpgw']->accounts->get_type($this->owner) == 'g')
+		if (substr($this->owner,0,2) == 'g_' || $GLOBALS['egw']->accounts->get_type($this->owner) == 'g')
 		{
 			$this->set_owner_to_group($this->owner);
 			$states['owner'] = $this->owner;
@@ -145,7 +251,7 @@ class uical
 
 		if ($this->debug > 0 || $this->debug == 'menage_states') $this->bo->debug_message('uical::manage_states(%1) session was %2, states now %3, is_group=%4, g_owner=%5',True,$set_states,$states_session,$states,$this->is_group,$this->g_owner);
 		// save the states in the session
-		$GLOBALS['phpgw']->session->appsession('session_data','calendar',$states);
+		$GLOBALS['egw']->session->appsession('session_data','calendar',$states);
 	}
 
 	/**
@@ -159,13 +265,13 @@ class uical
 		$this->owner = (int) (substr($owner,0,2) == 'g_' ? substr($owner,2) : $owner);
 		$this->is_group = True;
 		$this->g_owner = Array();
-		$members = $GLOBALS['phpgw']->accounts->member($this->owner);
+		$members = $GLOBALS['egw']->accounts->member($this->owner);
 		if (is_array($members))
 		{
 			foreach($members as $user)
 			{
 				// use only members which gave the user a read-grant
-				if ($this->bo->check_perms(PHPGW_ACL_READ,0,$user['account_id']))
+				if ($this->bo->check_perms(EGW_ACL_READ,0,$user['account_id']))
 				{
 					$this->g_owner[] = $user['account_id'];
 				}
@@ -182,8 +288,8 @@ class uical
 	*/
 	function event_icons($event)
 	{
-		$is_private = !$event['public'] && !$this->bo->check_perms(PHPGW_ACL_READ,$event);
-		$viewable = !$this->bo->printer_friendly && $this->bo->check_perms(PHPGW_ACL_READ,$event);
+		$is_private = !$event['public'] && !$this->bo->check_perms(EGW_ACL_READ,$event);
+		$viewable = !$this->bo->printer_friendly && $this->bo->check_perms(EGW_ACL_READ,$event);
 
 		if (!$is_private)
 		{
@@ -191,16 +297,12 @@ class uical
 			{
 				$icons[] = $this->html->image('calendar','high',lang('high priority'));
 			}
-			if($event['recur_type'] == MCAL_RECUR_NONE)
-			{
-				//$icons[] = $this->html->image('calendar','circle',lang('single event'));
-			}
-			else
+			if($event['recur_type'] != MCAL_RECUR_NONE)
 			{
 				$icons[] = $this->html->image('calendar','recur',lang('recurring event'));
 			}
-			$icons[] = $this->html->image('calendar',count($event['participants']) > 1 ? 'multi_3' : 'single',
-				implode(",\n",$this->bo->participants($event['participants'])));
+			$icons[] = $this->html->image('calendar',count($event['participants']) > 1 ? 'users' : 'single',
+				implode(",\n",$this->bo->participants($event)));
 		}
 		if($event['public'] == 0)
 		{
@@ -210,6 +312,18 @@ class uical
 		{
 			$icons[] = $this->html->image('calendar','alarm',lang('alarm'));
 		}
+		foreach($event['participants'] as  $participant => $status)
+		{
+			if(is_numeric($participant)) continue;
+			if(isset($this->bo->resources[$participant{0}]) && isset($this->bo->resources[$participant{0}]['icon']) && !$seticon[$participant{0}])
+			{
+				$seticon[$participant{0}] = true;
+			 	$icons[] = $this->html->image($this->bo->resources[$participant{0}]['app'],
+			 		($this->bo->resources[$participant{0}]['icon'] ? $this->bo->resources[$participant{0}]['icon'] : 'navbar'),
+			 		lang($this->bo->resources[$participant{0}]['app']),
+			 		'width="16px" height="16px"');
+			}
+		}
 		return $icons;
 	}
 
@@ -228,7 +342,7 @@ class uical
 		{
 			$onchange="location=location+(location.search.length ? '&' : '?')+'".$name."='+this.value;";
 		}
-		$select = ' <select style="width: 100%;" name="'.$name.'" onchange="'.$onchange.'" title="'.
+		$select = ' <select style="width: 185px;" name="'.$name.'" onchange="'.$onchange.'" title="'.
 			lang('Select a %1',lang($title)).'">'.
 			$options."</select>\n";
 
@@ -239,6 +353,49 @@ class uical
 		);
 	}
 
+	/**
+	 * Generate a link to add an event, incl. the necessary popup
+	 *
+	 * @param string $content content of the link
+	 * @param string $date=null which date should be used as start- and end-date, default null=$this->date
+	 * @param int $hour=null which hour should be used for the start, default null=$this->hour
+	 * @param int $minute=0 start-minute
+	 * @return string the link incl. content
+	 */
+	function add_link($content,$date=null,$hour=null,$minute=0)
+	{
+		$vars = array(
+			'menuaction'=>'calendar.uiforms.edit',
+			'date' => $date ? $date : $this->date,
+		);
+		if (!is_null($hour))
+		{
+			$vars['hour'] = $hour;
+			$vars['minute'] = $minute;
+		}
+		return $this->html->a_href($content,'/index.php',$vars,' target="_blank" title="'.$this->html->htmlspecialchars(lang('Add')).
+			'" onclick="'.$this->popup('this.href','this.target').'; return false;"');
+	}
+	
+	/**
+	 * returns javascript to open a popup window: window.open(...)
+	 *
+	 * @param string $link link or this.href
+	 * @param string $target='_blank' name of target or this.target
+	 * @param int $width=750 width of the window
+	 * @param int $height=400 height of the window
+	 * @return string javascript (using single quotes)
+	 */
+	function popup($link,$target='_blank',$width=750,$height=410)
+	{
+		return 'egw_openWindowCentered2('.($link == 'this.href' ? $link : "'".$link."'").','.
+			($target == 'this.target' ? $target : "'".$target."'").",$width,$height,'yes')";
+
+		return 'window.open('.($link == 'this.href' ? $link : "'".$link."'").','.
+			($target == 'this.target' ? $target : "'".$target."'").','.
+			"'dependent=yes,width=$width,height=$height,scrollbars=yes,status=yes')";
+	}
+
 	/**
 	 * creates the content for the sidebox-menu, called as hook
 	 */
@@ -252,33 +409,36 @@ class uical
 
 		$n = 0;	// index for file-array
 
+		$planner_days_for_view = false;
+		switch($this->view)
+		{
+			case 'month': $planner_days_for_view = 0; break;
+			case 'week':  $planner_days_for_view = $this->cal_prefs['days_in_weekview'] == 5 ? 5 : 7; break;
+			case 'day':   $planner_days_for_view = 1; break;
+		}
 		// Toolbar with the views
 		$views = '<table style="width: 100%;"><tr>'."\n";
 		foreach(array(
-			'add' => array('icon'=>'new3','text'=>'add','menuaction'=>'calendar.uicalendar.add'),
-			'day' => array('icon'=>'today','text'=>'Today','menuaction' => 'calendar.uiviews.day'),
-			'week' => array('icon'=>'week','text'=>'This week','menuaction' => 'calendar.uiviews.week'),
-			'month' => array('icon'=>'month','text'=>'This month','menuaction' => 'calendar.uiviews.month'),
-			'year'  => array('icon'=>'year','text'=>'This year','menuaction' => 'calendar.uicalendar.year'),
-			'planner' => array('icon'=>'planner','text'=>'Group Planner','menuaction' => 'calendar.uicalendar.planner'),
-			'matrixselect' => array('icon'=>'view','text'=>'Daily Matrix View','menuaction' => 'calendar.uicalendar.matrixselect'),
+			'add' => array('icon'=>'new','text'=>'add'),
+			'day' => array('icon'=>'today','text'=>'Today','menuaction' => 'calendar.uiviews.day','date' => $this->bo->date2string($this->bo->now_su)),
+			'week' => array('icon'=>'week','text'=>'Weekview','menuaction' => 'calendar.uiviews.week'),
+			'month' => array('icon'=>'month','text'=>'Monthview','menuaction' => 'calendar.uiviews.month'),
+			'planner' => array('icon'=>'planner','text'=>'Group planner','menuaction' => 'calendar.uiviews.planner','sortby' => $this->sortby)+
+				($planner_days_for_view !== false ? array('planner_days' => $planner_days_for_view) : array()),
+			'list' => array('icon'=>'list','text'=>'Listview','menuaction'=>'calendar.uilist.listview'),
 		) as $view => $data)
 		{
-			if ($view == 'add' && $this->owner != $this->user && !$this->bo->check_perms(PHPGW_ACL_ADD,0,$this->owner))
-			{
-				continue;	// we dont have permission add events to the cal of $this->owner ==> skip the icon
-			}
-			$vars = $link_vars;
-			$vars['menuaction'] = $data['menuaction'];
-			if ($view == 'day')
-			{
-				$vars['date'] = $this->bo->date2string($this->bo->now_su);	// go to today
-			}
-			$views .= '<td align="center"><a href="'.$GLOBALS['phpgw']->link('/index.php',$vars).'"><img src="'.
-				$GLOBALS['phpgw']->common->find_image('calendar',$data['icon']).
-				'" title="'.lang($data['text']).'"></a></td>'."\n";
+			$icon = array_shift($data);
+			$title = array_shift($data);
+			$vars = array_merge($link_vars,$data);
+
+			$icon = $this->html->image('calendar',$icon,lang($title));
+			$link = $view == 'add' ? $this->add_link($icon) : $this->html->a_href($icon,'/index.php',$vars);
+
+			$views .= '<td align="center">'.$link."</a></td>\n";
 		}
 		$views .= "</tr></table>\n";
+
 		$file[++$n] = array('text' => $views,'no_lang' => True,'link' => False,'icon' => False);
 
 		// special views and view-options menu
@@ -292,15 +452,10 @@ class uical
 			array(
 				'text' => lang('dayview'),
 				'value' => 'menuaction=calendar.uiviews.day',
-				'selected' => $_GET['menuaction'] == 'calendar.uiviews.day' && $_GET['days'] != 2,
+				'selected' => $_GET['menuaction'] == 'calendar.uiviews.day',
 			),
-			/*array(
-				'text' => lang('two dayview'),
-				'value' => 'menuaction=calendar.uiviews.week&days=2',
-				'selected' => $_GET['menuaction'] == 'calendar.uiviews.day' && $_GET['days'] == 2,
-			),*/
 			array(
-				'text' => lang('weekview'),
+				'text' => lang('weekview with weekend'),
 				'value' => 'menuaction=calendar.uiviews.week&days=7',
 				'selected' => $_GET['menuaction'] == 'calendar.uiviews.week' && $this->cal_prefs['days_in_weekview'] != 5,
 			),
@@ -314,71 +469,83 @@ class uical
 				'value' => 'menuaction=calendar.uiviews.month',
 				'selected' => $_GET['menuaction'] == 'calendar.uiviews.month',
 			),
-			array(
-				'text' => lang('yearview'),
-				'value' => 'menuaction=calendar.uicalendar.year',
-				'selected' => $_GET['menuaction'] == 'calendar.uicalendar.year',
-			),
 			array(
 				'text' => lang('planner by category'),
-				'value' => 'menuaction=calendar.uicalendar.planner&sortby=category',
-				'selected' => $_GET['menuaction'] == 'calendar.uicalendar.planner' && $this->sort_by != 'user',
+				'value' => 'menuaction=calendar.uiviews.planner&sortby=category'.
+					($planner_days_for_view !== false ? '&planner_days='.$planner_days_for_view : ''),
+				'selected' => $_GET['menuaction'] == 'calendar.uiviews.planner' && $this->sortby != 'user',
 			),
 			array(
 				'text' => lang('planner by user'),
-				'value' => 'menuaction=calendar.uicalendar.planner&sortby=user',
-				'selected' => $_GET['menuaction'] == 'calendar.uicalendar.planner' && $this->sort_by == 'user',
+				'value' => 'menuaction=calendar.uiviews.planner&sortby=user'.
+					($planner_days_for_view !== false ? '&planner_days='.$planner_days_for_view : ''),
+				'selected' => $_GET['menuaction'] == 'calendar.uiviews.planner' && $this->sortby == 'user',
 			),
 			array(
-				'text' => lang('matrixview'),
-				'value' => 'menuaction=calendar.uicalendar.matrixselect',
-				'selected' => $_GET['menuaction'] == 'calendar.uicalendar.matrixselect' ||
-					$_GET['menuaction'] == 'calendar.uicalendar.viewmatrix',
+				'text' => lang('listview'),
+				'value' => 'menuaction=calendar.uilist.list',
+				'selected' => $_GET['menuaction'] == 'calendar.uilist.listview',
 			),
 		) as $data)
 		{
 			$options .= '<option value="'.$data['value'].'"'.($data['selected'] ? ' selected="1"' : '').'>'.$this->html->htmlspecialchars($data['text'])."</option>\n";
 		}
-		$file[++$n] = $this->_select_box('displayed view','view',$options,$GLOBALS['phpgw']->link('/index.php'));
+		$file[++$n] = $this->_select_box('displayed view','view',$options,$GLOBALS['egw']->link('/index.php'));
 
 		// Search
 		$blur = addslashes($this->html->htmlspecialchars(lang('Search').'...'));
 		$value = @$_POST['keywords'] ? $this->html->htmlspecialchars($_POST['keywords']) : $blur;
 		$file[++$n] = array(
-			'text' => $this->html->form('<input name="keywords" value="'.$value.'" style="width: 100%;"'.
+			'text' => $this->html->form('<input name="keywords" value="'.$value.'" style="width: 185px;"'.
 				' onFocus="if(this.value==\''.$blur.'\') this.value=\'\';"'.
 				' onBlur="if(this.value==\'\') this.value=\''.$blur.'\';" title="'.lang('Search').'">',
-				$base_hidden_vars,'/index.php',array('menuaction'=>'calendar.uicalendar.search')),
+				'','/index.php',array('menuaction'=>'calendar.uilist.listview')),
 			'no_lang' => True,
 			'link' => False,
 		);
-
 		// Minicalendar
+		$link = array();
 		foreach(array(
-			'day'=>'calendar.uiviews.day',
-			'week'=>'calendar.uiviews.week',
-			'month'=>'calendar.uiviews.month') as $view => $menuaction)
+			'day'   => 'calendar.uiviews.day',
+			'week'  => 'calendar.uiviews.week',
+			'month' => 'calendar.uiviews.month') as $view => $menuaction)
 		{
-			$link_vars['menuaction'] = $view == 'month' && $_GET['menuaction'] == 'calendar.uicalendar.planner' ?
-				'calendar.uicalendar.planner' : $menuaction;	// stay in the planner
+			if ($this->view == 'planner')	
+			{
+				switch($view)
+				{
+					case 'day':   $link_vars['planner_days'] = 1; break;
+					case 'week':  $link_vars['planner_days'] = $this->cal_prefs['days_in_weekview'] == 5 ? 5 : 7; break;
+					case 'month': $link_vars['planner_days'] = 0; break;
+				}
+				$link_vars['menuaction'] = $this->view_menuaction;	// stay in the planner
+			}
+			elseif ($this->view == 'listview')
+			{
+				$link_vars['menuaction'] = $this->view_menuaction;	// stay in the listview
+			}
+			else
+			{
+				$link_vars['menuaction'] = $menuaction;
+			}
 			unset($link_vars['date']);	// gets set in jscal
-			$link[$view] = $GLOBALS['phpgw']->link('/index.php',$link_vars);
+			$link[$view] = $l = $GLOBALS['egw']->link('/index.php',$link_vars);
 		}
-		$jscalendar = $GLOBALS['phpgw']->jscalendar->flat($link['day'],$this->date,
+		$jscalendar = $GLOBALS['egw']->jscalendar->flat($link['day'],$this->date,
 			$link['week'],lang('show this week'),$link['month'],lang('show this month'));
 		$file[++$n] = array('text' => $jscalendar,'no_lang' => True,'link' => False,'icon' => False);
 
 		// Category Selection
 		$file[++$n] = $this->_select_box('Category','cat_id',
 			'<option value="0">'.lang('All categories').'</option>'.
-		$this->cats->formated_list('select','all',$this->cat_id,'True'));
+		$this->cats->formatted_list('select','all',$this->cat_id,'True'));
 
 		// we need a form for the select-boxes => insert it in the first selectbox
 		$file[$n]['text'] = $this->html->form(False,$base_hidden_vars,'/index.php',array('menuaction' => $_GET['menuaction'])) .
 			$file[$n]['text'];
 
 		// Filter all or private
-		if($this->bo->check_perms(PHPGW_ACL_PRIVATE,0,$this->owner))
+		if(is_numeric($this->owner) && $this->bo->check_perms(EGW_ACL_PRIVATE,0,$this->owner))
 		{
 			$file[] = $this->_select_box('Filter','filter',
 				'<option value=" all "'.($this->filter==' all '?' selected="1"':'').'>'.lang('No filter').'</option>'."\n".
@@ -386,14 +553,20 @@ class uical
 		}
 
 		// Calendarselection: User or Group
-		if(count($this->bo->grants) > 0 && (!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) ||
-			!$GLOBALS['phpgw_info']['server']['deny_user_grants_access']))
+		if(count($this->bo->grants) > 0 && (!isset($GLOBALS['egw_info']['server']['deny_user_grants_access']) ||
+			!$GLOBALS['egw_info']['server']['deny_user_grants_access']))
 		{
 			$grants = array();
 			foreach($this->bo->list_cals() as $grant)
 			{
 				$grants[] = $grant['grantor'];
 			}
+			// exclude non-accounts from the account-selection
+			$accounts = array();
+			foreach(explode(',',$this->owner) as $owner)
+			{
+				if (is_numeric($owner)) $accounts[] = $owner;
+			}
 			$file[] = array(
 				'text' => "
 <script type=\"text/javascript\">
@@ -411,55 +584,92 @@ function load_cal(url,id) {
 }
 </script>
 ".
-				$this->accountsel->selection('owner','uical_select_owner',$this->owner,'calendar+',$this->multiple ? 3 : 1,False,
-					' style="width: '.($this->multiple && $this->common_prefs['account_selection']=='selectbox' ? 100 : 85).'%;"'.
+				$this->accountsel->selection('owner','uical_select_owner',$accounts,'calendar+',$this->multiple ? 3 : 1,False,
+					' style="width: '.($this->multiple && $this->common_prefs['account_selection']=='selectbox' ? 185 : 165).'px;"'.
 					' title="'.lang('select a %1',lang('user')).'" onchange="load_cal(\''.
-					$GLOBALS['phpgw']->link('/index.php',array(
-						'menuaction' => $_GET['menuaction'],
+					$GLOBALS['egw']->link('/index.php',array(
+						'menuaction' => $this->view_menuaction,
 						'date' => $this->date,
 					)).'\',\'uical_select_owner\');"','',$grants),
 				'no_lang' => True,
 				'link' => False
 			);
 		}
-
 		// Import & Export
-		$file['Export'] = $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.export');
-		$file['Import'] = $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import');
-
+		$file[] = array(
+			'text' => lang('Export').': '.$this->html->a_href(lang('iCal'),'calendar.uiforms.export',$this->first ? array(
+				'start' => $this->bo->date2string($this->first),
+				'end'   => $this->bo->date2string($this->last),
+			) : false),
+			'no_lang' => True,
+			'link' => False,
+		);
+		$file[] = array(
+			'text' => lang('Import').': '.$this->html->a_href(lang('iCal'),'calendar.uiforms.import').
+				' &amp; '.$this->html->a_href(lang('CSV'),'/calendar/csv_import.php'),
+			'no_lang' => True,
+			'link' => False,
+		);
+/*
+		$print_functions = array(
+			'calendar.uiviews.day'	=> 'calendar.pdfcal.day',
+			'calendar.uiviews.week'	=> 'calendar.pdfcal.week',
+		);
+		if (isset($print_functions[$_GET['menuaction']]))
+		{
+			$file[] = array(
+				'text'	=> 'pdf-export / print',
+				'link'	=> $GLOBALS['egw']->link('/index.php',array(
+					'menuaction' => $print_functions[$_GET['menuaction']],
+					'date' => $this->date,
+				)),
+				'target' => '_blank',
+			);
+		}				
+*/
 		// we need to set the sidebox-width a bit wider, as idots.css sets it to 147, to small for the jscal
 		// setting it to auto, uses the smallest possible size, but IE kills the jscal if the width is set to auto !!!
+		$width = 203;
 		echo '<style>
 .divSidebox
 {
-	width: '.($this->html->user_agent=='msie'?'180px':'auto').';
-	/*max-width: 180px;*/
+	width: '.($this->html->user_agent == 'msie' ? $width.'px' : 'auto; max-width: '.$width.'px;').';
 }
 </style>'."\n";
-		$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+		$appname = 'calendar';
+		$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
 		display_sidebox($appname,$menu_title,$file);
 		echo "</form>\n";
+		
+		// resources menu hooks
+ 		foreach ($this->bo->resources as $resource)
+		{
+			if(!is_array($resource['cal_sidebox'])) continue;
+			$menu_title = $resource['cal_sidebox']['menu_title'] ? $resource['cal_sidebox']['menu_title'] : lang($resource['app']);
+			$file = ExecMethod($resource['cal_sidebox']['file'], $this->view_menuaction, $this->date);
+			display_sidebox($appname,$menu_title,$file);
+		}
 
-		if ($GLOBALS['phpgw_info']['user']['apps']['preferences'])
+
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
 		{
 			$menu_title = lang('Preferences');
 			$file = Array(
-				'Calendar preferences'=>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uisettings.index&appname=calendar'),
-				'Grant Access'=>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app=calendar'),
-				'Edit Categories' =>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=calendar&cats_level=True&global_cats=True'),
+				'Calendar preferences'=>$GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname=calendar'),
+				'Grant Access'=>$GLOBALS['egw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app=calendar'),
+				'Edit Categories' =>$GLOBALS['egw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=calendar&cats_level=True&global_cats=True'),
 			);
 			display_sidebox($appname,$menu_title,$file);
 		}
 
-		if ($GLOBALS['phpgw_info']['user']['apps']['admin'])
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$menu_title = lang('Administration');
 			$file = Array(
-				'Configuration'=>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
-				'Custom Fields'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index'),
-				'Holiday Management'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
-				'Import CSV-File' => $GLOBALS['phpgw']->link('/calendar/csv_import.php'),
-				'Global Categories' =>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar'),
+				'Configuration'=>$GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
+				'Custom Fields'=>$GLOBALS['egw']->link('/index.php','menuaction=admin.customfields.edit&appname=calendar'),
+				'Holiday Management'=>$GLOBALS['egw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
+				'Global Categories' =>$GLOBALS['egw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar'),
 			);
 			display_sidebox($appname,$menu_title,$file);
 		}
diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php
deleted file mode 100755
index 082990a5dd..0000000000
--- a/calendar/inc/class.uicalendar.inc.php
+++ /dev/null
@@ -1,4909 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.eGroupWare.org                                                *
-  * Maintained and further developed by RalfBecker@outdoor-training.de       *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Originaly modified by Mark Peters <skeeter@phpgroupware.org>             *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	class uicalendar
-	{
-		var $template;
-		var $template_dir;
-
-		var $bo;
-		var $cat;
-
-		var $holidays;
-		var $holiday_color;
-
-		var $debug = False;
-//		var $debug = True;
-
-		var $cat_id;
-		var $theme;
-		var $link_tpl;
-
-		// planner related variables
-		var $planner_header;
-		var $planner_rows;
-
-		var $planner_group_members;
-
-		var $planner_firstday;
-		var $planner_lastday;
-		var $planner_days;
-
-		var $planner_end_month;
-		var $planner_end_year;
-		var $planner_days_in_end_month;
-
-		var $planner_intervals = array(	// conversation hour and interval depending on intervals_per_day
-					//                                  1 1 1 1 1 1 1 1 1 1 2 2 2 2
-					//              0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3
-						'1' => array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 0=0-23h
-						'2' => array(0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0), // 0=0-12h, 1=12-23h
-						'3' => array(0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,2,2,2,2,2), // 0=0-12h, 2=12-18h, 3=18-23h
-						'4' => array(0,0,0,0,0,0,0,1,1,1,1,1,2,2,2,2,2,2,3,3,3,3,3,3)  // 0=0-7, 7-12h, 3=12-18h, 4=18-23h
-					);
-
-		var $public_functions = array(
-			'mini_calendar' => True,
-			'index' => True,
-			'month' => True,
-			'get_month' => True,
-			'week'  => True,
-			'get_week' => True,
-			'year' => True,
-			'view' => True,
-			'edit' => True,
-			'export'	=> True,
-			'reinstate_list'	=> True,
-			'reinstate'	=> True,
-			'add'  => True,
-			'delete' => True,
-			'preferences' => True,
-			'day' => True,
-			'edit_status' => True,
-			'set_action' => True,
-			'planner' => True,
-			'modify_ext_partlist' => True,
-			'matrixselect'	=> True,
-			'viewmatrix'	=> True,
-			'search' => True,
-			'header' => True,
-			'footer' => True,
-			'css'		=> True,
-		);
-
-		function uicalendar()
-		{
-			$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
-			$GLOBALS['phpgw']->browser    = CreateObject('phpgwapi.browser');
-
-			$this->theme = $GLOBALS['phpgw_info']['theme'];
-
-			$this->bo = CreateObject('calendar.bocalendar',1);
-			$this->cat = &$this->bo->cat;
-
-			print_debug('BO Owner',$this->bo->owner);
-
-			$this->template = $GLOBALS['phpgw']->template;
-			$this->template_dir = $GLOBALS['phpgw']->common->get_tpl_dir('calendar');
-
-			$this->holiday_color = (substr($this->theme['bg06'],0,1)=='#'?'':'#').$this->theme['bg06'];
-
-			$this->cat_id   = $this->bo->cat_id;
-
-			$this->link_tpl = CreateObject('phpgwapi.Template',$this->template_dir);
-			$this->link_tpl->set_unknowns('remove');
-			$this->link_tpl->set_file(
-				Array(
-					'link_picture'	=> 'link_pict.tpl'
-				)
-			);
-			$this->link_tpl->set_block('link_picture','link_pict','link_pict');
-			$this->link_tpl->set_block('link_picture','pict','pict');
-			$this->link_tpl->set_block('link_picture','link_open','link_open');
-			$this->link_tpl->set_block('link_picture','link_close','link_close');
-			$this->link_tpl->set_block('link_picture','link_text','link_text');
-
-			if($this->bo->use_session)
-			{
-				// save return-fkt for add, view, ...
-				list(,,$fkt) = explode('.',$_GET['menuaction']);
-				if ($fkt == 'day' || $fkt == 'week' || $fkt == 'month' || $fkt == 'year' || $fkt == 'planner')
-				{
-					$this->bo->return_to = $_GET['menuaction'].
-						sprintf('&date=%04d%02d%02d',$this->bo->year,$this->bo->month,$this->bo->day);
-					// reset the matrixview participants
-					$GLOBALS['phpgw']->session->appsession('participants', NULL,'');
-				}
-				$this->bo->save_sessiondata();
-			}
-			$this->always_app_header = $this->bo->prefs['common']['template_set'] == 'idots';
-
-			print_debug('UI',$this->_debug_sqsof());
-
-			if (!is_object($GLOBALS['phpgw']->html))
-			{
-				$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
-			}
-			$this->html = &$GLOBALS['phpgw']->html;
-
-			// jscalendar is needed by the new navigation-menu AND it need to be loaded befor the header !!!
-			if (!is_object($GLOBALS['phpgw']->jscalendar))
-			{
-				$GLOBALS['phpgw']->jscalendar = CreateObject('phpgwapi.jscalendar');
-			}
-			$this->jscal = &$GLOBALS['phpgw']->jscalendar;
-
-			if(!isset($this->bo->prefs['calendar']['interval']))
-			{
-				$this->bo->prefs['calendar']['interval'] = 30;
-				$GLOBALS['phpgw']->preferences->add('calendar','interval',30);
-				$GLOBALS['phpgw']->preferences->save_repository();
-			}
-		
-			// calendar does not work with hidden sidebox atm.
-			unset($GLOBALS['phpgw_info']['user']['preferences']['common']['auto_hide_sidebox']);
-		}
-
-		/* Public functions */
-
-		function mini_calendar($params)
-		{
-			static $mini_cal_tpl;
-			if(!is_array($params))
-			{
-				return;
-			}
-
-			if($params['month'] == 0)
-			{
-				$params['month'] = 12;
-				$params['year'] = $params['year'] - 1;
-			}
-			elseif($params['month'] == 13)
-			{
-				$params['month'] = 1;
-				$params['year'] = $params['year'] + 1;
-			}
-
-			$this->bo->store_to_cache(
-				Array(
-					'smonth'	=> $params['month'],
-					'sday'	=> 1,
-					'syear'	=> $params['year']
-				)
-			);
-
-			$params['link']			= (!isset($params['link'])?'':$params['link']);
-			$params['buttons']		= (!isset($params['buttons'])?'none':$params['buttons']);
-			$params['outside_month']	= (!isset($params['outside_month'])?True:$params['outside_month']);
-
-			$this->bo->read_holidays($params['year']);
-
-			$date = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$params['month'],$params['day'],$params['year']);
-			$month_ago = (int)(date('Ymd',mktime(0,0,0,$params['month'] - 1,$params['day'],$params['year'])));
-			$month_ahead = (int)(date('Ymd',mktime(0,0,0,$params['month'] + 1,$params['day'],$params['year'])));
-			$monthstart = (int)(date('Ymd',mktime(0,0,0,$params['month'],1,$params['year'])));
-			$monthend = (int)(date('Ymd',mktime(0,0,0,$params['month'] + 1,0,$params['year'])));
-
-			$weekstarttime = $GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],1);
-
-			print_debug('mini_calendar:monthstart',$monthstart);
-			print_debug('mini_calendar:weekstarttime',date('Ymd H:i:s',$weekstarttime));
-
-			if(!is_object($mini_cal_tpl))
-			{
-				$mini_cal_tpl = CreateObject('phpgwapi.Template',$this->template_dir);
-				$mini_cal_tpl->set_unknowns('remove');
-				$mini_cal_tpl->set_file(
-					Array(
-						'mini_calendar'	=> 'mini_cal.tpl'
-					)
-				);
-				$mini_cal_tpl->set_block('mini_calendar','mini_cal','mini_cal');
-				$mini_cal_tpl->set_block('mini_calendar','mini_week','mini_week');
-				$mini_cal_tpl->set_block('mini_calendar','mini_day','mini_day');
-			}
-
-
-			if($this->bo->printer_friendly == False)
-			{
-//NDEE				$month = '<a href="' . $this->page('month','&month='.$GLOBALS['phpgw']->common->show_date($date['raw'],'m').'&year='.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y')). '" class="_minicalendar">' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
-				$month = '<a href="' . $this->page('month','&month='.$GLOBALS['phpgw']->common->show_date($date['raw'],'m').'&year='.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y')). '">' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
-			}
-			else
-			{
-				$month = lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y');
-			}
-
-			$var = Array(
-				'cal_img_root'		=>	$GLOBALS['phpgw']->common->image('calendar','mini-calendar-bar'),
-				'bgcolor'			=>	$this->theme['bg_color'],
-				'bgcolor1'			=>	$this->theme['bg_color'],
-				'month'				=>	$month,
-				'bgcolor2'			=>	$this->theme['cal_dayview'],
-				'holiday_color'	=> $this->holiday_color
-			);
-
-			$mini_cal_tpl->set_var($var);
-
-			switch(strtolower($params['buttons']))
-			{
-				case 'right':
-					$var = Array(
-						'nextmonth'			=>	'<a href="'.$this->page('month','&date='.$month_ahead).'"><img src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'" border="0"></a>'
-					);
-					break;
-				case 'left':
-					$var = Array(
-						'prevmonth'			=>	'<a href="'.$this->page('month','&date='.$month_ago).'"><img src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'" border="0"></a>'
-					);
-					break;
-				case 'both':
-					$var = Array(
-						'prevmonth'			=>	'<a href="'.$this->page('month','&date='.$month_ago).'"><img src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'" border="0"></a>',
-						'nextmonth'			=>	'<a href="'.$this->page('month','&date='.$month_ahead).'"><img src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'" border="0"></a>'
-					);
-					break;
-				case 'none':
-				default:
-					$var = Array(
-						'prevmonth'			=>	'',
-						'nextmonth'			=>	''
-					);
-					break;
-			}
-			$mini_cal_tpl->set_var($var);
-
-			if(!$mini_cal_tpl->get_var('daynames'))
-			{
-				for($i=0;$i<7;$i++)
-				{
-					$var = Array(
-						'dayname'	=> '<b>' . lang($GLOBALS['phpgw']->datetime->days_short[$i]) . '</b>',
-						'day_image'	=> ''
-					);
-					$this->output_template_array($mini_cal_tpl,'daynames','mini_day',$var);
-				}
-			}
-			$today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
-			unset($date);
-			for($i=$weekstarttime + $GLOBALS['phpgw']->datetime->tz_offset;date('Ymd',$i)<=$monthend;$i += (24 * 3600 * 7))
-			{
-				unset($var);
-				$daily = $this->set_week_array($i - $GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
-				foreach($daily as $date => $day_params)
-				{
-					print_debug('Mini-Cal Date',$date);
-					$year = (int)(substr($date,0,4));
-					$month = (int)(substr($date,4,2));
-					$day = (int)(substr($date,6,2));
-					$str = '';
-					if(($date >= $monthstart && $date <= $monthend) || $params['outside_month'] == True)
-					{
-						if(!$this->bo->printer_friendly && $params['link'])
-						{
-//NDEE: class def what for?
-							$str = '<a href="'.$this->page($params['link'],'&date='.$date).'" class="'.$day_params['class'].'">'.$day.'</a>';
-						}
-						else
-						{
-
-//NDEE: printer-friendly (mini-calendar)
-							$str = $day;
-						}
-
-					}
-					else
-					{
-						$day_params['day_image'] = '';
-					}
-					$var[] = Array(
-						'day_image'	=> $day_params['day_image'],
-						'dayname'	=> $str
-					);
-				}
-				for($l=0;$l<count($var);$l++)
-				{
-					$this->output_template_array($mini_cal_tpl,'monthweek_day','mini_day',$var[$l]);
-				}
-				$mini_cal_tpl->parse('display_monthweek','mini_week',True);
-				$mini_cal_tpl->set_var('dayname','');
-				$mini_cal_tpl->set_var('monthweek_day','');
-			}
-
-			$return_value = $mini_cal_tpl->fp('out','mini_cal');
-			$mini_cal_tpl->set_var('display_monthweek','');
-//			$mini_cal_tpl->set_var('daynames','');
-//			unset($p);
-			return $return_value;
-		}
-
-		function index($params='')
-		{
-			if (!$params)
-			{
-				foreach(array('date','year','month','day') as $field)
-				{
-					if (isset($_GET[$field]))
-					{
-						$params[$field] = $_GET[$field];
-					}
-				}
-			}
-			$GLOBALS['phpgw']->redirect($this->page('',$params));
-		}
-
-
-
-// NDEE: printer-friendly
-
-		function printer_friendly($body,$app_header='')
-		{
-			if($this->bo->printer_friendly)
-			{
-				$new_body = '<html>'."\n"
-					.'<head>'."\n"
-//					.'<STYLE type="text/css">'."\n"
-//					.'<!-- '."\n"
-//					.'  .tablink { color: #000000; }'."\n"
-//					.' '.$this->css()."\n"
-//					.'-->'."\n"
-//					.'</STYLE>'."\n"
-					.'<LINK href="'.$GLOBALS['phpgw_info']['server']['webserver_url'].'/calendar/templates/default/app_print.css" type=text/css rel=StyleSheet>'."\n"
-					.'</head>
-					<table id="calendar_print_main" class="calendar_print_main">
-						<tr>
-							<td id="calendar_print_content" class="calendar_print_content">'."\n"
-					.$this->bo->debug_string.$body
-					.'		</td>
-						</tr>
-					</table></body>'."\n"
-					.'</html>'."\n";
-			}
-			else
-			{
-				unset($GLOBALS['phpgw_info']['flags']['noheader']);
-				unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-				unset($GLOBALS['phpgw_info']['flags']['noappheader']);
-				unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
-				if ($app_header && $this->always_app_header)
-				{
-					$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.$app_header;
-				}
-				$GLOBALS['phpgw']->common->phpgw_header();
-				$new_body = $this->bo->debug_string.$body;
-			}
-			return $new_body;
-		}
-
-		function month()
-		{
-			echo $this->printer_friendly($this->get_month(),lang('Monthview'));
-		}
-
-		function get_month()
-		{
-			$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
-
-			$next = $this->bo->month + 1;
-			$prev = $this->bo->month - 1;
-			$nextyear = $this->bo->year;
-			$prevyear = $this->bo->year;
-			if ($this->bo->month == 12)
-			{
-				$next = 1;
-				$nextyear = $nextyear + 1;
-			}
-			elseif ($this->bo->month == 1)
-			{
-				$prev = 12;
-				$prevyear = $prevyear - 1;
-			}
-
-			if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals']))
-			{
-				$minical_prev = $this->mini_calendar(
-					Array(
-						'day'	=> 1,
-						'month'	=> $this->bo->month - 1,
-						'year'	=> $this->bo->year,
-						'link'	=> 'day',
-						'outside_month'	=> False
-					)
-				);
-
-				$minical_next = $this->mini_calendar(
-					Array(
-						'day'	=> 1,
-						'month'	=> $this->bo->month + 1,
-						'year'	=> $this->bo->year,
-						'link'	=> 'day',
-						'outside_month'	=> False
-					)
-				);
-			}
-			else
-			{
-				$minical_prev = '';
-				$minical_next = '';
-			}
-
-			if (!$this->bo->printer_friendly)
-			{
-				$printer = '';
-				$prev_month_link = '<a href="'.$this->page('month','&year='.$prevyear.'&month='.$prev).'">&lt;&lt;</a>';
-				$next_month_link = '<a href="'.$this->page('month','&year='.$nextyear.'&month='.$next).'">&gt;&gt;</a>';
-				$param = '&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1';
-				$print = '<a href="'.$this->page('month'.$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
-			}
-			else
-			{
-				$printer = '<body bgcolor="'.$phpgw_info['theme']['bg_color'].'">';
-				$prev_month_link = '';
-				$next_month_link = '';
-				$print =	'';
-				$GLOBALS['phpgw_info']['flags']['nofooter'] = True;
-			}
-
-			$this->bo->read_holidays();
-
-			$var = Array(
-				'printer_friendly'		=>	$printer,
-				'bg_text'					=> $this->theme['bg_text'],
-				'small_calendar_prev'	=>	$minical_prev,
-				'prev_month_link'		=>	$prev_month_link,
-				'month_identifier'		=>	lang(strftime("%B",$m)).' '.$this->bo->year,
-				'username'					=>	$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
-				'next_month_link'		=>	$next_month_link,
-				'small_calendar_next'	=>	$minical_next,
-				'large_month'				=>	$this->display_month($this->bo->month,$this->bo->year,True,$this->bo->owner),
-				'print'						=>	$print
-			);
-
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_unknowns('remove');
-			$p->set_file(
-				Array(
-					'index_t'	=>	'index.tpl'
-				)
-			);
-			$p->set_var($var);
-			return $p->fp('out','index_t');
-		}
-
-		function week()
-		{
-			echo $this->printer_friendly($this->get_week(),lang('Weekview'));
-		}
-
-		function get_week()
-		{
-			$this->bo->read_holidays();
-
-			$next = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day + 7,$this->bo->year);
-			$prev = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day - 7,$this->bo->year);
-
-			if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals']))
-			{
-				$minical_this = $this->mini_calendar(
-					Array(
-						'day'	=> $this->bo->day,
-						'month'	=> $this->bo->month,
-						'year'	=> $this->bo->year,
-						'link'	=> 'day',
-						'butons'	=> 'none',
-						'outside_month'	=> False
-					)
-				);
-				$minical_prev = $this->mini_calendar(
-					Array(
-						'day'	=> 15, /* the 15th of the month is not a boundy condition */
-						'month'	=> $this->bo->month - 1,
-						'year'	=> $this->bo->year,
-						'link'	=> 'day',
-						'butons'	=> 'left',
-						'outside_month'	=> False
-					)
-				);
-				$minical_next = $this->mini_calendar(
-					Array(
-						'day'	=> 15, /* the 15th of the month is not a boundy condition */
-						'month'	=> $this->bo->month + 1,
-						'year'	=> $this->bo->year,
-						'link'	=> 'day',
-						'butons'	=> 'right',
-						'outside_month'	=> False
-					)
-				);
-			}
-			else
-			{
-
-//NDEE: printer-friendly what?
-				$minical_this = '';
-				$minical_prev = '';
-				$minical_next = '';
-			}
-
-			if (!$this->bo->printer_friendly)
-			{
-				$printer = '';
-				$prev_week_link = '<a href="'.$this->page('week','&date='.$prev['full']).'">&lt;&lt;</a>';
-				$next_week_link = '<a href="'.$this->page('week','&date='.$next['full']).'">&gt;&gt;</a>';
-				$print = '<a href="'.$this->page('week','&friendly=1&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day))."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
-			}
-			else
-			{
-
-//NDEE: printer-friendly (weekly-view)
-				$printer = '<body bgcolor="'.$this->theme['bg_color'].'">';
-				$prev_week_link = '';
-				$next_week_link = '';
-				$print =	'';
-				$GLOBALS['phpgw_info']['flags']['nofooter'] = True;
-			}
-
-			$var = Array(
-				'printer_friendly'	=>	$printer,
-				'bg_text'		=> 	$this->theme['bg_text'],
-				'small_calendar_prev'	=>	$minical_prev,
-				'prev_week_link'	=>	$prev_week_link,
-				'small_calendar_this'	=>	$minical_this,
-				'week_identifier'	=>	$this->bo->get_week_label(),
-				'next_week_link'	=>	$next_week_link,
-				'username'		=>	$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
-				'small_calendar_next'	=>	$minical_next,
-				'week_display'		=>	$this->display_weekly(
-					Array(
-						'date'		=> sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),
-						'showyear'	=> true,
-						'owners'	=> $this->bo->owner
-					)
-				),
-				'print'			=>	$print
-			);
-//todo
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_file(
-				Array(
-					'week_t' => 'week.tpl'
-				)
-			);
-			$p->set_var($var);
-			return $p->fp('out','week_t');
-
-/*
-			$this->bo->read_holidays();
-
-			if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals']))
-			{
-				$minical = $this->mini_calendar(
-					Array(
-						'day'	=> $this->bo->day,
-						'month'	=> $this->bo->month,
-						'year'	=> $this->bo->year,
-						'link'	=> 'day'
-					)
-				);
-			}
-			else
-			{
-				$minical = '';
-			}
-
-			if (!$this->bo->printer_friendly)
-			{
-				unset($GLOBALS['phpgw_info']['flags']['noheader']);
-				unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-				$GLOBALS['phpgw']->common->phpgw_header();
-				$printer = '';
-				$param = '&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day).'&friendly=1';
-				$print = '<a href="'.$this->page('day'.$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
-			}
-			else
-			{
-				$GLOBALS['phpgw_info']['flags']['nofooter'] = True;
-				$printer = '<body bgcolor="'.$this->theme['bg_color'].'">';
-				$print =	'';
-			}
-
-			$now	= $GLOBALS['phpgw']->datetime->makegmttime(0, 0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
-			$now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset;
-			$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
-
-			$p = $GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'day_t' => 'day.tpl'
-				)
-			);
-			$p->set_block('day_t','day','day');
-			$p->set_block('day_t','day_event','day_event');
-
-			$var = Array(
-				'printer_friendly'		=> $printer,
-				'bg_text'			=> $this->theme['bg_text'],
-				'daily_events'			=> $this->print_day(
-					Array(
-						'year'	=> $this->bo->year,
-						'month'	=> $this->bo->month,
-						'day'	=> $this->bo->day
-					)
-				),
-				'small_calendar'		=> $minical,
-				'date'				=> lang(date('F',$m)).' '.sprintf("%02d",$this->bo->day).', '.$this->bo->year,
-				'username'			=> $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
-				'print'				=> $print
-			);
-
-			$p->set_var($var);
-			$p->parse('day_events','day_event');
-			$p->pparse('out','day');
-*/
-		}
-
-		function year()
-		{
-			if($this->bo->printer_friendly)
-			{
-				$GLOBALS['phpgw_info']['flags']['nofooter'] = True;
-			}
-			echo $this->printer_friendly($this->get_year(),lang('Yearview'));
-		}
-
-		function get_year()
-		{
-			if(!$this->bo->printer_friendly)
-			{
-				$print = '';
-				$left_link = '<a href="'.$this->page('year','&year='.($this->bo->year - 1)).'">&lt;&lt;</a>';
-				$right_link = '<a href="'.$this->page('year','&year='.($this->bo->year + 1)).'">&gt;&gt;</a>';
-				$link = 'day';
-				$printer = '<a href="'.$this->page('year','&friendly=1&year='.$this->bo->year).'" target="cal_printer_friendly" onMouseOver="window.status = '."'".lang('Generate printer-friendly version')."'".'">['.lang('Printer Friendly').']</a>';
-			}
-			else
-			{
-
-//NDEE: printer-friendly (year-view)
-				$print = '<body bgcolor="'.$this->theme['bg_color'].'">';
-				$left_link = '';
-				$right_link = '';
-				$link = '';
-				$printer = '';
-			}
-
-			$var = Array(
-				'print'		=> $print,
-				'left_link' => $left_link,
-				'font'		=> $this->theme['font'],
-				'year_text' => $this->bo->year,
-				'right_link'=> $right_link,
-				'printer_friendly'=> $printer
-			);
-
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_file(
-				Array(
-					'year_t' => 'year.tpl'
-				)
-			);
-			$p->set_block('year_t','year','year');
-			$p->set_block('year_t','month','month_handle');
-			$p->set_block('year_t','month_sep','month_sep_handle');
-			$p->set_var($var);
-
-			for($i=1;$i<=12;$i++)
-			{
-				if(($i % 3) == 1)
-				{
-					$p->parse('row','month_sep',True);
-				}
-				$p->set_var('mini_month',$this->mini_calendar(
-						Array(
-							'day'	=> 1,
-							'month'	=> $i,
-							'year'	=> $this->bo->year,
-							'link'	=> $link,
-							'buttons'	=> 'none',
-							'outside_month'	=> False
-						)
-					)
-				);
-				$p->parse('row','month',True);
-				$p->set_var('mini_month','');
-			}
-			return $p->fp('out','year_t');
-		}
-
-		function view($vcal_id=0,$cal_date=0)
-		{
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('View');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$cal_id = get_var('cal_id',array('GET','POST'),$vcal_id);
-
-			$date = $cal_date ? $cal_date : 0;
-			$date = $date ? $date : (int)$this->bo->date;
-
-			// First, make sure they have permission to this entry
-			if ($cal_id < 1)
-			{
-				echo '<center>'.lang('Invalid entry id.').'</center>'."\n";
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-
-			if(!$this->bo->check_perms(PHPGW_ACL_READ,$cal_id))
-			{
-				echo '<center>'.lang('You do not have permission to read this record!').'</center>'."\n";
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-
-			$event = $this->bo->read_entry($cal_id);
-
-			if(!isset($event['id']))
-			{
-				echo '<center>'.lang('Sorry, this event does not exist').'.'.'</center>'."\n";
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-			if(isset($event['description']))
-			{
-				$event['description'] = str_replace(array("\n","\r"),array('<br/>',''),$event['description']);
-			}
-
-			$this->bo->repeating_events = Array();
-			$this->bo->cached_events = Array();
-			$this->bo->repeating_events[0] = $event;
-			$datetime = mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$this->bo->check_repeating_events($datetime);
-			$check_date = $GLOBALS['phpgw']->common->show_date($datetime,'Ymd');
-			if(is_array($this->bo->cached_events[$check_date][0]) &&
-				$this->bo->cached_events[$check_date][0]['id'] == $event['id'])
-			{
-				$starttime = $this->bo->maketime($event['start']);
-				$endtime = $this->bo->maketime($event['end']);
-				$event['start']['month'] = $this->bo->month;
-				$event['start']['mday'] = $this->bo->day;
-				$event['start']['year'] = $this->bo->year;
-				$temp_end =  $this->bo->maketime($event['start']) + ($endtime - $starttime);
-				$event['end']['month'] = date('m',$temp_end);
-				$event['end']['mday'] = date('d',$temp_end);
-				$event['end']['year'] = date('Y',$temp_end);
-			}
-
-			if(!$this->view_event($event,True))
-			{
-				echo '<center>'.lang('You do not have permission to read this record!').'</center>';
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-
-			$p = $GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'form_button'	=> 'form_button_script.tpl'
-				)
-			);
-
-			$button_left = $button_center = $button_right = '';
-
-			if($this->bo->check_perms(PHPGW_ACL_EDIT,$event))
-			{
-				if($event['recur_type'] != MCAL_RECUR_NONE)
-				{
-					$var = Array(
-						'action_url_button'	=> $this->page('edit','&cal_id='.$cal_id),
-						'action_text_button'	=> lang('Edit Single'),
-						'action_confirm_button'	=> '',
-						'action_extra_field'	=> $this->html->input_hidden(array(
-							'edit_type' => 'single',
-							'date' => sprintf('%04d%02d%02d',$this->bo->year,$this->bo->month,$this->bo->day)
-						))
-					);
-					$p->set_var($var);
-					$button_left .= '<td>'.$p->fp('button','form_button').'</td>';
-
-					$var = Array(
-						'action_url_button'	=> $this->page('edit','&cal_id='.$cal_id),
-						'action_text_button'	=> lang('Edit Series'),
-						'action_confirm_button'	=> '',
-						'action_extra_field'	=> $this->html->input_hidden('edit_type','series')
-					);
-					$p->set_var($var);
-					$button_left .= '<td>'.$p->fp('button','form_button').'</td>';
-				}
-				else
-				{
-					$var = Array(
-						'action_url_button'	=> $this->page('edit','&cal_id='.$cal_id),
-						'action_text_button'	=> lang('Edit'),
-						'action_confirm_button'	=> '',
-						'action_extra_field'	=> ''
-					);
-					$p->set_var($var);
-					$button_left .= '<td>'.$p->fp('button','form_button').'</td>';
-				}
-				$var = Array(
-					'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uialarm.manager'),
-					'action_text_button'	=> lang('Alarm Management'),
-					'action_confirm_button'	=> '',
-					'action_extra_field'	=> $this->html->input_hidden(array(
-						'cal_id' => $cal_id,
-						'return_to' => $this->bo->return_to
-					))
-				);
-				$p->set_var($var);
-				$button_center .= '<td>'.$p->fp('button','form_button').'</td>';
-			}
-			$var = Array(
-				'action_url_button'	=> $this->page('edit','&amp;copy_cal_id='.$cal_id),
-				'action_text_button'	=> lang('Copy'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'	=> ''
-			);
-			$p->set_var($var);
-			$button_left .= '<td>'.$p->fp('button','form_button').'</td>';
-
-			if ($this->bo->check_perms(PHPGW_ACL_DELETE,$event))
-			{
-				if($event['recur_type'] != MCAL_RECUR_NONE)
-				{
-					$var = Array(
-						'action_url_button'	=> $this->page('delete','&cal_id='.$cal_id),
-						'action_text_button'	=> lang('Delete Single'),
-						'action_confirm_button'	=> "onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this single occurence ?\\n\\nThis will delete\\nthis entry for all users.")."')\"",
-						'action_extra_field'	=> $this->html->input_hidden(array(
-							'delete_type' => 'single',
-							'date' => sprintf('%04d%02d%02d',$this->bo->year,$this->bo->month,$this->bo->day)
-						))
-					);
-					$p->set_var($var);
-					$button_right .= '<td>'.$p->fp('button','form_button').'</td>';
-
-					$var = Array(
-						'action_url_button'	=> $this->page('delete','&cal_id='.$cal_id),
-						'action_text_button'	=> lang('Delete Series'),
-						'action_confirm_button'	=> "onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.")."')\"",
-						'action_extra_field'	=> $this->html->input_hidden('delete_type','series')
-					);
-					$p->set_var($var);
-					$button_right .= '<td>'.$p->fp('button','form_button').'</td>';
-
-					if($event['recur_exception'])
-					{
-						$var = Array(
-							'action_url_button'	=> $this->page('reinstate_list','&cal_id='.$cal_id),
-							'action_text_button'	=> lang('Reinstate'),
-							'action_confirm_button'	=> '',
-							'action_extra_field'	=> ''
-						);
-						$p->set_var($var);
-						$button_center .= '<td>'.$p->fp('button','form_button').'</td>';
-					}
-				}
-				else
-				{
-					$var = Array(
-						'action_url_button'	=> $this->page('delete','&cal_id='.$cal_id),
-						'action_text_button'	=> lang('Delete'),
-						'action_confirm_button'	=> "onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.")."')\"",
-						'action_extra_field'	=> ''
-					);
-					$p->set_var($var);
-					$button_right .= '<td>'.$p->fp('button','form_button').'</td>';
-				}
-			}
-			else
-			{
-				// allow me (who I am logged in as) to set up an alarm
-				// if I am a participant, but not the owner
-				reset($event['participants']);
-				while (list($user,$short_status) = each($event['participants']))
-				{
-					if ($GLOBALS['phpgw_info']['user']['account_id'] == $user)
-					{
-						$var = Array(
-							'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uialarm.manager'),
-							'action_text_button'	=> lang('Alarm Management'),
-							'action_confirm_button'	=> '',
-							'action_extra_field'	=> $this->html->input_hidden(array(
-								'cal_id'    => $cal_id,
-								'return_to' => $this->bo->return_to
-							))
-						);
-						$p->set_var($var);
-						$button_center .= '<td>'.$p->fp('button','form_button').'</td>';
-					}
-				}
-			}
-
-			$export_params['cal_id']        = $cal_id;
-
-			$var = Array(
-				'action_url_button'	=> $this->page('export'),
-				'action_text_button'	=> lang('Export'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'    => $this->html->input_hidden($export_params)
-			);
-			$p->set_var($var);
-			$button_center .= '<td>'.$p->fp('button','form_button').'</td>';
-
-			if ($this->bo->return_to)
-			{
-				$var = Array(
-					'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to),
-					'action_text_button'	=> lang('Done'),
-					'action_confirm_button'	=> '',
-					'action_extra_field'	=> ''
-				);
-				$p->set_var($var);
-				$button_left .= '<td>'.$p->fp('button','form_button').'</td>';
-			}
-			$p->set_var(array(
-				'button_left'	=> $button_left,
-				'button_center'	=> $button_center,
-				'button_right'	=> $button_right
-			));
-			$p->pfp('phpgw_body','view_event');
-
-			$GLOBALS['phpgw']->hooks->process(array(
-				'location' => 'calendar_view',
-				'cal_id'   => $cal_id
-			));
-		}
-
-		function edit($params='')
-		{
-			if($this->debug)
-			{
-				echo '<!-- params[readsess] = '.$params['readsess'].' -->'."\n";
-				echo '<!-- params[cd] = '.$params['cd'].' -->'."\n";
-			}
-
-			if(isset($_GET['readsess']))
-			{
-				$params['readsess'] = $_GET['readsess'];
-				$params['cd'] = 0;
-			}
-
-			if($this->debug)
-			{
-				echo '<!-- params[readsess] = '.$params['readsess'].' -->'."\n";
-				echo '<!-- params[cd] = '.$params['cd'].' -->'."\n";
-			}
-
-			if($params != '' && @is_array($params) && @isset($params['readsess']))
-			{
-				$can_edit = True;
-				$this->edit_form(
-					Array(
-						'event' => $this->bo->restore_from_appsession(),
-						'cd' => $params['cd']
-					)
-				);
-			}
-			elseif(isset($_GET['cal_id']))
-			{
-				$cal_id = (int)$_GET['cal_id'];
-				$event = $this->bo->read_entry($cal_id);
-
-				if(!$this->bo->check_perms(PHPGW_ACL_EDIT,$event))
-				{
-					Header('Location: '.$this->page('view','&cal_id='.$cal_id));
-					$GLOBALS['phpgw']->common->phpgw_exit();
-				}
-				if(@isset($_POST['edit_type']) && $_POST['edit_type'] == 'single')
-				{
-					$event['id'] = 0;
-					unset($event['uid']);
-					$this->bo->set_recur_date($event,$_POST['date']);
-					$event['recur_type'] = MCAL_RECUR_NONE;
-					$event['recur_interval'] = 0;
-					$event['recur_data'] = 0;
-					$event['recur_enddate']['month'] = 0;
-					$event['recur_enddate']['mday'] = 0;
-					$event['recur_enddate']['year'] = 0;
-					$event['recur_exception'] = $event['alarm'] = array();
-				}
-				$this->edit_form(
-					Array(
-						'event' => $event,
-						'cd'	=> $cd
-					)
-				);
-			}
-			elseif(isset($_GET['copy_cal_id']))
-			{
-				$event = $this->bo->read_entry((int) $_GET['copy_cal_id']);
-
-				if(!$this->bo->check_perms(PHPGW_ACL_READ,$event))
-				{
-					$this-index();
-					return;
-				}
-				$event['id'] = 0;
-				unset($event['uid']);
-				$event['recur_exception'] = $event['alarm'] = array();
-				$event['owner'] = $this->bo->user;
-
-				$this->edit_form(
-					Array(
-						'event' => $event,
-						'cd'	=> $cd
-					)
-				);				
-			}
- 		}
-
-		function export()
-		{
-			$jscal = CreateObject('phpgwapi.jscalendar');
-			$GLOBALS['phpgw']->browser	= CreateObject('phpgwapi.browser');
-			$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			if(!isset($_REQUEST['output_file']) || !$_REQUEST['output_file'])
-			{
-				unset($GLOBALS['phpgw_info']['flags']['noheader']);
-				unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-				$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Export');
-				$GLOBALS['phpgw']->common->phpgw_header();
-
-				$p = $GLOBALS['phpgw']->template;
-				$p->set_file(
-					Array(
-						'form_button'	=> 'form_button_script.tpl'
-					)
-				);
-
-				$extra_field_text = '';
-				$extra_field_text = "\n".lang('Enter Output Filename: ( .vcs appended )')."\n".'   <input name="output_file" size="25" maxlength="80" value="">'."\n";
-				if (isset($_POST['output_file']))
-				{
-					$extra_field_text .= '<font color="red">'.lang('please enter a filename !!!')."</font>\n";
-				}
-				if(isset($_POST['cal_id']))
-					$extra_field_text .= '   '.$this->html->input_hidden('cal_id',(int)$_POST['cal_id']);
-
-				if (!isset($_POST['cal_id']) || !$_POST['cal_id'])
-				{
-					$start_date = '';
-					if(isset($_POST['custom_start']) && $_POST['custom_start'])
-						$start_date = $_POST['custom_start'];
-					else
-						$start_date = $GLOBALS['phpgw']->datetime->gmtnow;
-
-					$stop_date = '';
-					if(isset($_POST['custom_stop']) && $_POST['custom_stop'])
-						$stop_date = $_POST['custom_stop'];
-					else
-						$stop_date = $GLOBALS['phpgw']->datetime->gmtnow;
-
-					$extra_field_text .= "<p>";
-					$extra_field_text .= lang('Start Date');
-					$extra_field_text .= "&nbsp;";
-					$extra_field_text .= $jscal->input('custom_start',$start_date);
-					$extra_field_text .= "</p>\n<p>";
-					$extra_field_text .= lang('End Date');
-					$extra_field_text .= "&nbsp\n";
-					$extra_field_text .= $jscal->input('custom_stop',$stop_date);
-					$extra_field_text .= "</p>\n";
-				}
-
-				$var = Array(
-					'action_url_button'	=> $this->page('export'),
-					'action_text_button'	=> lang('Download'),
-					'action_confirm_button'	=> '',
-					'action_extra_field'    => $extra_field_text
-				);
-				$p->set_var($var);
-				echo $p->fp('out','form_button');
-			}
-			else
-			{
-				unset($cal_ids);
-				$cal_ids        = Array();
-				$output_filename = $_REQUEST['output_file'];
-				if (!preg_match('/\.vcs$/i',$output_filename))
-				{
-					$output_filename .= '.vcs';
-				}
-				if(isset($_REQUEST['custom_start']) && $_REQUEST['custom_start']) 
-				{
-					$start_date = $jscal->input2date($_REQUEST['custom_start'],False);
-					
-					if(isset($_REQUEST['custom_stop']) && $_REQUEST['custom_stop'])
-					{
-						$stop_date = $jscal->input2date($_REQUEST['custom_stop'],False);
-					} 
-					else 
-					{
-						$stop_date = array('year'=>0,'month'=>'0','day'=>0);
-					}
-					$cal_ids = $this->bo->so->list_events($start_date['year'],$start_date['month'],$start_date['day'],
-						$stop_date['year'],$stop_date['month'],$stop_date['day']);
-				} 
-				elseif(isset($_POST['cal_id']) && $_POST['cal_id'])
-				{
-					$cal_ids[0]     = $_POST['cal_id'];
-				}
-				$content = "BEGIN:VCALENDAR\n";
-				foreach ($cal_ids as $cal_id)
-				{
-					$mycontent = ExecMethod('calendar.boicalendar.export', Array(
-						'l_event_id' => $cal_id,
-						'chunk_split' => False,
-					));
-					$content .= str_replace(array("\r","METHOD:PUBLISH\n","BEGIN:VCALENDAR\n","END:VCALENDAR\n"), "", $mycontent);
-				}
-				$content .= "END:VCALENDAR\n";
-
-				$GLOBALS['phpgw']->browser->content_header($output_filename,'text/calendar',strlen($content));
-				echo $content;
-				$GLOBALS['phpgw']->common->phpgw_exit();
-			}
-		}
-
-		function reinstate_list($params='')
-		{
-			if(!$this->bo->check_perms(PHPGW_ACL_EDIT))
-			{
-				$this->no_edit();
-			}
-			elseif(!$this->bo->check_perms(PHPGW_ACL_ADD))
-			{
-				$this->index();
-			}
-
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Reinstate');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$cal_id = get_var('cal_id',array('GET'),$params['cal_id']);
-
-			if ($cal_id < 1)
-			{
-				echo '<center>'.lang('Invalid entry id.').'</center>'."\n";
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-
-			if(!$this->bo->check_perms(PHPGW_ACL_READ))
-			{
-				echo '<center>'.lang('You do not have permission to read this record!').'</center>'."\n";
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-
-			$event = $this->bo->read_entry($cal_id);
-
-			if(!isset($event['id']))
-			{
-				echo '<center>'.lang('Sorry, this event does not exist').'.'.'</center>'."\n";
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-			elseif(!isset($event['recur_exception']))
-			{
-				echo '<center>'.lang('Sorry, this event does not have exceptions defined').'.'.'</center>'."\n";
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-
-			if(!$this->view_event($event,True))
-			{
-				echo '<center>'.lang('You do not have permission to read this record!').'</center>';
-				$GLOBALS['phpgw']->common->phpgw_exit(True);
-			}
-
-			$p = &$GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'form_button'	=> 'form_button_script.tpl'
-				)
-			);
-
-			$str = '';
-
-			for($i=0;$i<count($event['recur_exception']);$i++)
-			{
-				$str .= '    <option value="'.$i.'">'.$GLOBALS['phpgw']->common->show_date($event['recur_exception'][$i]).'</option>'."\n";
-			}
-			$this->output_template_array($p,'row','list',array(
-				'field'	=> lang('Exceptions'),
-				'data'	=> '<select name="reinstate_index[]" multiple size="5">'."\n".$str.'</select>'
-			));
-
-			$var = Array(
-				'action_url_button'	=> $this->page('reinstate','&cal_id='.$cal_id),
-				'action_text_button'	=> lang('Reinstate'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'	=> ''
-			);
-			$p->set_var($var);
-			$button_left = '<td>'.$p->fp('out','form_button').'</td>';
-
-			$var = Array(
-				'action_url_button'	=> $this->bo->return_to ? $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to) : $this->page(''),
-				'action_text_button'	=> lang('Cancel'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'	=> ''
-			);
-			$p->set_var($var);
-			$button_left .= '<td>'.$p->fp('out','form_button').'</td>';
-
-			$p->set_var('button_left',$button_left);
-			$p->pfp('phpgw_body','view_event');
-		}
-
-		function reinstate($params='')
-		{
-			if(!$this->bo->check_perms(PHPGW_ACL_EDIT))
-			{
-				$this->no_edit();
-			}
-			elseif(!$this->bo->check_perms(PHPGW_ACL_ADD))
-			{
-				$this->index();
-			}
-			$cal_id = (isset($params['cal_id']) ? (int)$params['cal_id'] : '');
-			$cal_id = ($cal_id == '' ? (int)$_GET['cal_id'] : $cal_id);
-
-			$reinstate_index = (isset($params['reinstate_index']) ? (int)$params['reinstate_index'] : '');
-			$reinstate_index = ($reinstate_index == '' ? (int)$_POST['reinstate_index'] : $reinstate_index);
-			if($this->debug)
-			{
-				echo '<!-- Calling bo->reinstate -->'."\n";
-			}
-			$cd = $this->bo->reinstate(
-				Array(
-					'cal_id'	=> $cal_id,
-					'reinstate_index'	=> $reinstate_index
-				)
-			);
-			if($this->debug)
-			{
-				echo '<!-- Return Value = '.$cd.' -->'."\n";
-			}
-			if ($this->bo->return_to)
-			{
-				Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
-			}
-			else
-			{
-				Header('Location: '.$this->page('',($cd?'&cd='.$cd:'')));
-			}
-			$GLOBALS['phpgw']->common->phpgw_exit();
-		}
-
-		function add($cd=0,$readsess=0)
-		{
-			if(!$this->bo->check_perms(PHPGW_ACL_ADD))
-			{
-				$this->index();
-			}
-
-			if($readsess)
-			{
-				$event = $this->bo->restore_from_appsession;
-				if(!$event['owner'])
-				{
-					$this->bo->add_attribute('owner',$this->bo->owner);
-				}
-				$can_edit = True;
-			}
-			else
-			{
-				$this->bo->event_init();
-				$this->bo->add_attribute('id',0);
-
-				$can_edit = True;
-				$participants = (string)(get_var('participants',array('GET'),FALSE));
-				$matrix_mode  = (int)(get_var('matrix',array('GET', 'POST'),FALSE));
-				$starthour = (int)(get_var('hour',array('GET'),$this->bo->prefs['calendar']['workdaystarts']));
-				$startmin  = (int)(get_var('minute',array('GET'),0));
-				$endmin    = $startmin + (int)$this->bo->prefs['calendar']['defaultlength'];
-				$endhour   = $starthour + $this->bo->normalizeminutes($endmin);
-				;
-				$this->bo->set_start($this->bo->year,$this->bo->month,$this->bo->day,$starthour,$startmin,0);
-				$this->bo->set_end($this->bo->year,$this->bo->month,$this->bo->day,$endhour,$endmin,0);
-				$this->bo->set_title('');
-				$this->bo->set_description('');
-				$this->bo->add_attribute('location','');
-				$this->bo->add_attribute('uid','');
-				$this->bo->add_attribute('priority',2);
-				if(@$this->bo->prefs['calendar']['default_private'])
-				{
-					$this->bo->set_class(False);
-				}
-				else
-				{
-					$this->bo->set_class(True);
-				}
-
-				// Construct Participants stack
-				$_stack_participants = $GLOBALS['phpgw']->session->appsession("participants");
-				if($matrix_mode == 1) // You come from matrix, ok
-				{
-					// protection
-					if($_stack_participants)
-						$_stack_participants .= ";";
-
-					$_stack_participants .= $GLOBALS['phpgw']->session->appsession("participants_matrix");
-				}
-				if( get_var('owner',array('GET'),FALSE) )
-				{
-					// protection
-					if($_stack_participants)
-						$_stack_participants .= ";";
-
-					$_stack_participants .= str_replace(",", ";", get_var('owner', array('GET'), FALSE));
-				}
-				
-				// Read each participant
-				foreach(explode(";", $_stack_participants) as $part)
-				{
-					// Skip Owner
-					if( !$part OR ($part == $this->bo->owner) )
-						continue;
-
-					// Add into stack
-					$this->bo->add_attribute('participants', 'U',$part);
-				}
-				unset($_stack_participants);
-
-
-				/* --- OLD CODE --- 
-				// Add participants from matrixview
-				if($matrix_mode == 1)
-				{
-					foreach(explode(';', $GLOBALS['phpgw']->session->appsession("participants_matrix")) as $part)
-					{
-						// Skip owner
-						if( !$part OR ( $part == $this->bo->owner) )
-							continue;
-
-						$this->bo->add_attribute('participants', 'U',$part);
-					}
-				}
-				// Add participants from outer space
-				foreach(explode(';',$GLOBALS['phpgw']->session->appsession("participants")) as $part)
-				{
-					// Skip owner
-					if( !$part OR ( $part == $this->bo->owner) )
-						continue;
-
-					$this->bo->add_attribute('participants','U',$part);
-				}
-				// --- END OLD CODE */
-
-
-				// Add misc
-				$this->bo->add_attribute('participants','A',$this->bo->owner);
-				$this->bo->set_recur_none();
-				$event = $this->bo->get_cached_event();
-			}
-			$this->edit_form(
-				Array(
-					'event' => $event,
-					'cd' => $cd
-				)
-			);
-		}
-
-		function delete()
-		{
-			if(!isset($_GET['cal_id']))
-			{
-				Header('Location: '.$this->page('','&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day)));
-				$GLOBALS['phpgw']->common->phpgw_exit();
-			}
-
-			$date = sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day);
-			if($this->bo->check_perms(PHPGW_ACL_DELETE,$cal_id = (int)$_GET['cal_id']))
-			{
-				if(isset($_POST['delete_type']) && $_POST['delete_type'] == 'single')
-				{
-					$date = $_POST['date'];
-					$cd = $this->bo->delete_single(
-						Array(
-							'id'	=> $cal_id,
-							'year'	=> substr($date,0,4),
-							'month'	=> substr($date,4,2),
-							'day'	=> substr($date,6,2)
-						)
-					);
-				}
-				elseif((isset($_POST['delete_type']) && $_POST['delete_type'] == 'series') || !isset($_POST['delete_type']))
-				{
-					$cd = $this->bo->delete_entry($cal_id);
-					$this->bo->expunge();
-				}
-			}
-			else
-			{
-				$cd = '';
-			}
-			if ($this->bo->return_to)
-			{
-				Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
-			}
-			else
-			{
-				Header('Location: '.$this->page('','&date='.$date.($cd?'&cd='.$cd:'')));
-			}
-			$GLOBALS['phpgw']->common->phpgw_exit();
-		}
-
-		function day()
-		{
-			$this->bo->read_holidays();
-
-			if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals']))
-			{
-				$minical = $this->mini_calendar(
-					Array(
-						'day'	=> $this->bo->day,
-						'month'	=> $this->bo->month,
-						'year'	=> $this->bo->year,
-						'link'	=> 'day'
-					)
-				);
-			}
-			else
-			{
-
-//NDEE: printer-friendly (what?)
-				$minical = '';
-			}
-
-			if (!$this->bo->printer_friendly)
-			{
-				$printer = '';
-				$param = '&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day).'&friendly=1';
-				$print = '<a href="'.$this->page('day'.$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
-			}
-			else
-			{
-
-//NDEE: printer-friendly (daily-view)
-				$GLOBALS['phpgw_info']['flags']['nofooter'] = True;
-				$printer = '<body bgcolor="'.$this->theme['bg_color'].'">';
-				$print =	'';
-			}
-
-			$now	= $GLOBALS['phpgw']->datetime->makegmttime(0, 0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
-			$now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset;
-
-			$p = $GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'day_t' => 'day.tpl'
-				)
-			);
-			$p->set_block('day_t','day','day');
-			$p->set_block('day_t','day_event','day_event');
-
-			$todos = $this->get_todos($todo_label);
-			$var = Array(
-				'printer_friendly'	=> $printer,
-				'bg_text'			=> $this->theme['bg_text'],
-				'daily_events'		=> $this->print_day(
-					Array(
-						'year'	=> $this->bo->year,
-						'month'	=> $this->bo->month,
-						'day'	=> $this->bo->day
-					)
-				),
-				'small_calendar'	=> $minical,
-				'date'				=> $this->bo->long_date($now),
-				'username'			=> $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
-				'print'				=> $print,
-				'lang_todos'		=> $todo_label,
-				'todos'				=> $this->bo->printer_friendly ? $todos :
-
-//NDEE: todo's layout
-					"<div style=\"overflow: auto; max-height: 200px\">\n$todos</div>\n"
-			);
-
-			$p->set_var($var);
-			$p->parse('day_events','day_event');
-			echo $this->printer_friendly($p->fp('out','day'),lang('Dayview'));
-		}
-
-		function get_todos(&$todo_label)
-		{
-			$todos_from_hook = $GLOBALS['phpgw']->hooks->process(array(
-				'location'  => 'calendar_include_todos',
-				'year'      => $this->bo->year,
-				'month'     => $this->bo->month,
-				'day'       => $this->bo->day,
-				'owner'     => $this->bo->owner	// num. id of the user, not necessary current user
-			));
-
-			if(is_array($todo_label))
-			{
-				list($label,$showall)=$todo_label;
-			}
-			else
-			{
-				$label=$todo_label;
-				$showall=true;
-			}
-			$maxshow = (int)$GLOBALS['phpgw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
-			if($maxshow<=0)
-			{
-				$maxshow=10;
-			}
-			//print_debug("get_todos(): label=$label; showall=$showall; max=$maxshow");
-
-			$content = $todo_label = '';
-			if (is_array($todos_from_hook) && count($todos_from_hook))
-			{
-				$todo_label = !empty($label)?$label:lang("open ToDo's:");
-
-				foreach($todos_from_hook as $todos)
-				{
-					$i = 0;
-					if (is_array($todos) && count($todos))
-					{
-						foreach($todos as $todo)
-						{
-							if(!$showall && ($i++>=$maxshow))
-							{
-								break;
-							}
-							$icons = '';
-							foreach($todo['icons'] as $name => $app)
-							{
-								$icons .= ($icons?' ':'').$GLOBALS['phpgw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"');
-							}
-							$class = $class == 'row_on' ? 'row_off' : 'row_on';
-
-//NDEE <tr starts here
-							$content .= " <tr id=\"debug\" class=\"$class\">\n  <td valign=\"top\" width=\"15%\"nowrap>".
-								($this->bo->printer_friendly?$icons:$GLOBALS['phpgw']->html->a_href($icons,$todo['view'])).
-								"</td>\n  <td>".($this->bo->printer_friendly?$todo['title']:
-								$GLOBALS['phpgw']->html->a_href($todo['title'],$todo['view']))."</td>\n </tr>\n";
-						}
-					}
-				}
-			}
-			if (!empty($content))
-			{
-				return "<table border=\"0\" width=\"100%\">\n$content</table>\n";
-			}
-			return False;
-		}
-
-		function edit_status()
-		{
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Change Status');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$event = $this->bo->read_entry($_GET['cal_id']);
-
-			reset($event['participants']);
-
-			if(!$event['participants'][$this->bo->owner])
-			{
-				echo '<center>'.lang('The user %1 is not participating in this event!',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)).'</center>';
-				return;
-			}
-
-			if(!$this->bo->check_perms(PHPGW_ACL_EDIT))
-			{
-				$this->no_edit();
-				return;
-			}
-
-			$freetime = $GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year']) - $GLOBALS['phpgw']->datetime->tz_offset);
-			echo $this->timematrix(
-				Array(
-					'date'		=> $freetime,
-					'starttime'	=> $this->bo->splittime('000000',False),
-					'endtime'	=> 0,
-					'participants'	=> $event['participants']
-				)
-			).'<br>';
-
-			$event = $this->bo->read_entry($_GET['cal_id']);
-			$this->view_event($event);
-			$GLOBALS['phpgw']->template->pfp('phpgw_body','view_event');
-
-			echo $this->get_response($event['id']);
-		}
-
-		function set_action()
-		{
-			if(!$this->bo->check_perms(PHPGW_ACL_EDIT))
-			{
-				$this->no_edit();
-				return;
-			}
-
-			$this->bo->set_status((int)$_GET['cal_id'],(int)$_GET['action']);
-
-			if ($this->bo->return_to)
-			{
-				Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
-			}
-			else
-			{
-				Header('Location: '.$this->page('',''));
-			}
-			$GLOBALS['phpgw']->common->phpgw_exit();
-		}
-
-
-		function planner()
-		{
-			if(floor(phpversion()) < 4)
-			{
-				return;
-			}
-			$home = strstr($_SERVER['PHP_SELF'],'home') !== False;
-			// generate header and set global/member variables
-			//
-			$this->planner_prepare($home);
-
-			// process events within selected interval
-			//
-			$this->planner_process_interval();
-
-			// generate the planner view
-			//
-			if (!$home)
-			{
-				echo '<p>'.$this->planner_print_rows();
-			}
-			else
-			{
-				return $this->planner_print_rows();
-			}
-		}
-
-		function set_planner_group_members()
-		{
-			$type = $GLOBALS['phpgw']->accounts->get_type($this->bo->owner);
-
-			if ($type == 'g') // display schedule of all group members
-			{
-				$members = array();
-				$ids = $GLOBALS['phpgw']->acl->get_ids_for_location($this->bo->owner, 1, 'phpgw_group');
-				while (list(,$id) = each($ids))
-				{
-					if ($this->bo->check_perms(PHPGW_ACL_READ,0,$id))
-					{
-						$members[$GLOBALS['phpgw']->common->grab_owner_name($id)] = $id;
-					}
-				}
-				ksort($members);
-				$this->planner_group_members = $members;
-			}
-			else
-			{
-				$this->planner_group_members = array(
-					$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner) => $this->bo->owner
-				);
-			}
-		}
-
-		/**
-		 * planner_prepare - prepare the planner view
-		 *
-		 * - sets global environment variables
-		 * - initializes class member variables used in multiple planner related functions
-		 * - generates header lines for the planner view (month, calendar week, days)
-		 */
-		function planner_prepare($no_header = False)
-		{
-			// set some globals
-			//
-			if (!$no_header)
-			{
-				unset($GLOBALS['phpgw_info']['flags']['noheader']);
-				unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-				if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Group Planner');
-				$GLOBALS['phpgw']->common->phpgw_header();
-			}
-
-			// intervals_per_day can be configured in preferences now :-)
-			//
-			if (! $this->bo->prefs['calendar']['planner_intervals_per_day'])
-			{
-				$GLOBALS['phpgw']->preferences->add('calendar','planner_intervals_per_day',3);
-				$GLOBALS['phpgw']->preferences->save_repository();
-				$this->bo->prefs['calendar']['planner_intervals_per_day'] = 3;
-			}
-			$intervals_per_day = $this->bo->prefs['calendar']['planner_intervals_per_day'];
-			$this->bo->save_sessiondata();	// need to save $this->bo->save_owner
-
-			// set title for table and rows of planner view
-			//
-			if ($this->bo->sortby == 'category')
-			{
-				$title = lang('Category');
-			}
-			else
-			{
-				$title = lang('User');
-
-				$this->set_planner_group_members();
-			}
-
-			// create/initialize variables directly used for HTML code generation
-			//
-			$this->planner_header = array();
-			$this->planner_rows   = array();
-
-			// generate header lines with days and associated months
-			//
-			$hdr = &$this->planner_header;
-			$hdr[0]['0']  = $title;
-			$hdr[0]['.0'] = 'rowspan="3"';
-
-			$this->planner_days = 0; // reset
-
-			$m = $this->bo->month;
-			$y = $this->bo->year;
-			$this->bo->read_holidays($y);
-			for ($i=1; $i<=$this->bo->num_months; $i++,$m++)
-			{
-				if ($m == 13)
-				{
-					$m = 1; $y++; // "wrap-around" into new year
-					$this->bo->read_holidays($y);
-				}
-				$days = $GLOBALS['phpgw']->datetime->days_in_month($m,$y);
-
-				$d     = mktime(0,0,0,$m,1,$y);
-				$month = lang(date('F', $d)).strftime(' %Y', $d);
-				$color = $this->theme[$m % 2 || $this->bo->num_months == 1 ? 'th_bg' : 'row_on'];
-				$cols  = $days * $intervals_per_day;
-
-				$hdr[0]['.'.$i] = 'bgcolor="'.$color.'" colspan="'.$cols.'" align="center"';
-				$prev_month = sprintf('%04d%02d01',$y-($m==1),$m > 1?$m-1:12);
-				$next_month = sprintf('%04d%02d01',$y+($m==12),$m < 12?$m+1:1);
-				$prev_link = $GLOBALS['phpgw']->link('/index.php',"menuaction=calendar.uicalendar.planner&date=$prev_month");
-				$next_link = $GLOBALS['phpgw']->link('/index.php',"menuaction=calendar.uicalendar.planner&date=$next_month");
-				$hdr[0][$i] = "<b><a href=\"$prev_link\">&lt;&lt;</a> &nbsp $month &nbsp <a href=\"$next_link\">&gt;&gt;</a></b>";
-
-				$add_owner = array();	// if no add-rights on the showed cal use own cal
-				if (!$this->bo->save_owner && !$this->bo->check_perms(PHPGW_ACL_ADD) ||
-					!$this->bo->check_perms(PHPGW_ACL_ADD,0,$this->bo->save_owner))
-				{
-					$add_owner = array(
-						'owner' => $GLOBALS['phpgw_info']['user']['account_id']
-					);
-				}
-				for ($d=1; $d<=$days; $d++)
-				{
-					$dayname = substr(lang(date('D',mktime(0,0,0,$m,$d,$y))),0,2);
-					$index = $d + $this->planner_days;
-
-					$hdr[2]['.'.$index] = 'colspan="'.$intervals_per_day.'" align="center"';
-
-					// highlight today, saturday, sunday and holidays
-					//
-					$color = $this->theme['row_off'];
-					$dow = $GLOBALS['phpgw']->datetime->day_of_week($y,$m,$d);
-					$date = sprintf("%04d%02d%02d",$y,$m,$d);
-					if ($date == date('Ymd'))
-					{
-						$color = $GLOBALS['phpgw_info']['theme']['cal_today'];
-					}
-					elseif ($this->bo->cached_holidays[$date])
-					{
-						$color = $this->bo->holiday_color;
-						$hdr[2]['.'.$index] .= ' title="'.$this->bo->cached_holidays[$date][0]['name'].'"';
-					}
-					elseif ($dow == 0 || $dow == 6)
-					{
-						$color = $this->bo->theme['th_bg'];
-					}
-
-					$hdr[2]['.'.$index] .= " bgcolor=\"$color\"";
-
-					$hdr[2][$index] = '<a href="'.$this->html->link('/index.php',
-								array(
-									'menuaction' => 'calendar.uicalendar.add',
-									'date' => $date
-								) + $add_owner
-							).'">'.$dayname.'<br>'.$d.'</a>';
-				}
-				$this->planner_days += $days;
-			}
-
-			// create/initialize member variables describing the time interval to be displayed
-			//
-			$this->planner_end_month = $m - 1;
-			$this->planner_end_year  = $y;
-			$this->planner_days_in_end_month = $GLOBALS['phpgw']->datetime->days_in_month($this->planner_end_month,$this->planner_end_year);
-			$this->planner_firstday = (int)(date('Ymd',mktime(0,0,0,$this->bo->month,1,$this->bo->year)));
-			$this->planner_lastday  = (int)(date('Ymd',mktime(0,0,0,$this->planner_end_month,$this->planner_days_in_end_month,$this->planner_end_year)));
-
-			// generate line with calendar weeks in observed interval
-			//
-			$d      = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
-			$w      = date('W', $d);
-			if ($w == 'W')	// php < 4.1
-			{
-				$w = 1 + (int)(date('z',$d) / 7);	// a bit simplistic
-			}
-			$offset = (7-date('w', $d)+1)%7;
-			$offset = $offset == 0 ? 7 : $offset;
-			$color = $this->theme[$w % 2 ? 'th_bg' : 'row_on'];
-
-			$hdr[1]['.'.$w] = 'bgcolor="'.$color.'" colspan="'.$intervals_per_day * $offset.'" align="left"';
-			$hdr[1][$w] = '';
-			if ($offset >= 3)
-			{
-
-//NDEE: style! (groupplanner)
-				$hdr[1][$w] .= '<font size="-2"> '.lang('week').' '.$w.' </font>';
-			}
-			$days_left = $this->planner_days - $offset;
-
-			$colspan = 7 * $intervals_per_day;
-			while ($days_left > 0)
-			{
-				$colspan = ($days_left < 7) ? $days_left*$intervals_per_day : $colspan;
-				$d += 604800; // 7 days whith 24 hours (1h == 3600 seconds) each
-				$w = date('W', $d);
-				if ($w == 'W')	// php < 4.1
-				{
-					$w = 1 + (int)(date('z',$d) / 7);	// a bit simplistic
-				}
-				$w += (isset($hdr[1][$w]))?1:0; // bug in "date('W')" ?
-
-				$color = $this->theme[$w % 2 ? 'th_bg' : 'row_on'];
-				$hdr[1]['.'.$w] = 'bgcolor="'.$color.'" colspan="'.$colspan.'" align="left"';
-				$hdr[1][$w] = '';
-				if ($days_left >= 3)
-				{
-
-//NDEE: style! (groupplanner)
-					$hdr[1][$w] .= '<font size="-2"> '.lang('week').' '.$w.' </font>';
-				}
-
-				$days_left -= 7;
-			}
-			return $hdr;
-		}
-		
-		/**
-		 * tooltip for all calendar views
-		 *
-		 * displays title, time, description, location and participants, should be composed via a template in the next version
-		 *
-		 * @param $event array containing the event
-		 * @return the onmouseover attribute (incl. onmouseover=) to be included in an html-element, eg. div or table-cell
-		 */
-		function event_tooltip($event,$always_show_time=False)
-		{
-			$start = $GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset);
-			$end = $GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset);	
-			$multiday = substr($start,0,10) != substr($end,0,10);	// start and end on same day?
-
-			return $this->html->tooltip(
-					($always_show_time || $multiday ? '<p style="margin: 0px;"><b>'.$start.(!$multiday ? substr($end,10) : ' -- '.$end).'</b></p>' : '').
-					'<p style="margin: 0px;">'.$event['description'].'</p>'.
-					($event['location']?'<p style="background: silver; margin: 0px; padding: 1px;">'.$event['location'].'</p>':'').
-					(count($event['participants']) > 1 || !isset($event['participants'][$this->bo->owner]) ? '<p style="margin: 0px;">'.$this->planner_participants($event['participants']).'</p>':''),
-					False,array(
-						'TITLE' => $event['title'],
-						'WIDTH' => 250,
-					));
-		}
-
-		/**
-		 * planner_update_row - update a row of the planner view
-		 *
-		 * parameters are:
-		 *   - index (e.g. user id, category id, ...) of the row
-		 *   - name/title of the row (e.g. user name, category name)
-		 *   - the event to be integrated
-		 *   - list of categories associated with the event
-		 *   - first and last cell of the row
-		 */
-		function planner_update_row($index,$name,$event,$cat,$start_cell,$end_cell)
-		{
-			$rows              = &$this->planner_rows;
-			$intervals_per_day = $this->bo->prefs['calendar']['planner_intervals_per_day'];
-			$is_private        = !$this->bo->check_perms(PHPGW_ACL_READ,$event);
-
-			$view = $this->html->link('/index.php',
-				array(
-					'menuaction' => 'calendar.uicalendar.view',
-					'cal_id' => $event['id'],
-					'date' => date('Ymd',$this->bo->maketime($event['start']))
-				)
-			);
-
-			// check how many lines are needed for this "row" (currently: user or category)
-			$i = 0;
-			do {
-				++$i;
-
-				$k = $index.'_'.$i;
-				$ka = '.nr_'.$k;
-
-				if (!isset($rows[$k]))
-				{
-					if ($i > 1)				// further line - no name
-					{
-						$rows[$k] = array();
-						$rows[$index.'_1']['._name'] = 'rowspan="'.$i.'"';
-					}
-					else
-					{
-						$rows[$k]['_name'] = $name;
-					}
-					$rows[$ka] = 0;
-				}
-				$rows[$index.'_1']['._name'] .= ' nowrap'; // title must be one row
-
-				$row = &$rows[$k];
-				$akt_cell = &$rows[$ka];
-			} while ($akt_cell > $start_cell);
-
-			$id = $event['id'].'-'.date('Ymd',$this->bo->maketime($event['start']));
-			if ($akt_cell < $start_cell)
-			{
-				$row[$id.'_1'] = '&nbsp;';
-				$row['.'.$id.'_1'] = 'colspan="'.($start_cell-$akt_cell).'"';
-			}
-			$opt = &$row['.'.$id.'_2'];
-			$cel = &$row[$id.'_2'];
-
-			// if possible, display information about event within cells representing it
-			//
-			if ($start_cell < $end_cell)
-			{
-				$colspan = $end_cell - $start_cell;
-				$opt .= "colspan=".(1 + $colspan);
-
-				if (!$is_private)
-				{
-					$max_chars = (int)(3*$colspan/$intervals_per_day-2);
-
-					$min_chars = 3; // minimum for max_chars to display -> this should be configurable
-					if ($max_chars >= $min_chars)
-					{
-						$len_title = strlen($event['title']);
-
-						if ($len_title <= $max_chars)
-						{
-							$title = $event['title'];
-							$max_chars -= $len_title + 3; // 3 chars for separator: " - "
-							$len_descr = strlen($event['description']);
-
-							if ($len_descr > 0 && $len_descr <= $max_chars)
-							{
-								$event['print_description'] = 'yes';
-							}
-						}
-						else
-						{
-							$has_amp = strpos($event['title'],'&amp;');
-							
-//NDEE: event title gets cut here							
-							$title = substr($event['title'], 0 , $max_chars-1+($has_amp!==False&&$has_amp<$max_chars?4:0)).'...';
-						}
-						$event['print_title'] = 'yes';
-					}
-				}
-			}
-
-			if ($bgcolor=$cat['color'])
-			{
-				$opt .= ' bgcolor="'.$bgcolor.'"';
-			}
-
-			if (!$is_private)
-			{
-				$opt .= $this->event_tooltip($event,True);
-				$opt .= ' onClick="location=\''.$view.'\'"';
-				$cel = '<a href="'.$view.'">';
-			}
-			else
-			{
-				$opt .= ' title="'.lang('You do not have permission to read this record!').'"';
-				$cel = '';
-			}
-			$opt .= ' class="planner-cell"';
-
-			if ($event['priority'] == 3)
-			{
-				$cel .= $this->html->image('calendar','high.gif','','border="0"');
-			}
-			if ($event['recur_type'])
-			{
-				$cel .= $this->html->image('calendar','recur.gif','','border="0"');
-			}
-			$cel .= $this->html->image('calendar',count($event['participants'])>1?'multi_3.gif':'single.gif',
-				$is_private?$this->planner_participants($event['participants']):'','border="0"');
-			$cel .= '</a>';
-
-			if (isset($event['print_title']) && $event['print_title'] == 'yes')
-			{
-
-//NDEE: style! where?
-				$cel .= '<font size="-2"> '.$title.' </font>';
-			}
-			if (isset($event['print_description']) && $event['print_description'] == 'yes')
-			{
-
-//NDEE: style! where ?
-				$cel .= '<font size="-2"> - '.$event['description'].' </font>';
-			}
-
-			$akt_cell = $end_cell + 1;
-
-			return $rows;
-		}
-
-		function planner_process_event($event)
-		{
-			$intervals_per_day = $this->bo->prefs['calendar']['planner_intervals_per_day'];
-			$interval = $this->planner_intervals[$intervals_per_day];
-			$last_cell = $intervals_per_day * $this->planner_days - 1;
-
-			$rows = &$this->planner_rows;
-
-			// caluculate start and end of event
-			//
-			$event_start = (int)(date('Ymd',mktime(
-				0,0,0,
-				$event['start']['month'],
-				$event['start']['mday'],
-				$event['start']['year']
-			)));
-			$event_end   = (int)(date('Ymd',mktime(
-				0,0,0,
-				$event['end']['month'],
-				$event['end']['mday'],
-				$event['end']['year']
-			)));
-
-			// calculate first cell of event within observed interval
-			//
-			if ($event_start >= $this->planner_firstday)
-			{
-				$days_between = $GLOBALS['phpgw']->datetime->days_between($this->bo->month,1,$this->bo->year,$event['start']['month'],$event['start']['mday'],$event['start']['year']);
-
-				$start_cell = $intervals_per_day * $days_between + $interval[$event['start']['hour']];
-			}
-			else
-			{
-				$start_cell = 0;
-			}
-
-			// calculate last cell of event within observed interval
-			//
-			if ($event_end <= $this->planner_lastday)
-			{
-				$days_between = $GLOBALS['phpgw']->datetime->days_between($this->bo->month,1,$this->bo->year,$event['end']['month'],$event['end']['mday'],$event['end']['year']);
-				$end_cell = $intervals_per_day * $days_between + $interval[$event['end']['hour']];
-				if ($end_cell == $start_cell && $end_cell < $last_cell)
-				{
-					$end_cell++;	// min. width 1 interval
-				}
-			}
-			else
-			{
-				$end_cell = $last_cell;
-			}
-			// get the categories associated with event
-			//
-			if ($c = $event['category'])
-			{
-				list($cat)   = $this->planner_category($event['category']);
-				if ($cat['parent'])
-				{
-					list($pcat) = $this->planner_category($c = $cat['parent']);
-				}
-				else
-				{
-					$pcat = $cat;
-				}
-			}
-			else
-			{
-				$cat = $pcat = array( 'name' => lang('none'));
-			}
-
-			// add the event to it`s associated row(s)
-			//
-			if ($this->bo->sortby == 'category')
-			{
-				// event needs to show up in it`s category`s row
-				//
-				$this->planner_update_row($c,$pcat['name'],$event,$cat,$start_cell,$end_cell);
-			}
-			elseif ($this->bo->sortby == 'user')
-			{
-				// event needs to show up in rows of all participants that are also owners
-				//
-				reset($this->planner_group_members);
-				while(list($user_name,$id) = each($this->planner_group_members))
-				{
-					$status = $event['participants'][$id];
-
-					if (isset($status) && $status != 'R')
-					{
-						$this->planner_update_row($user_name,$user_name,$event,$cat,$start_cell,$end_cell);
-					}
-				}
-			}
-		}
-
-		function planner_pad_rows()
-		{
-			$rows = &$this->planner_rows;
-
-			if ($this->bo->sortby == 'user')
-			{
-				// add empty rows for users that do not participante in any event
-				//
-				reset($this->planner_group_members);
-				while(list($user_name,$id) = each($this->planner_group_members))
-				{
-					$k  = $user_name.'_1';
-					$ka = '.nr_'.$k;
-
-					if (!isset($rows[$k]))
-					{
-						$rows[$k]['_name'] = $user_name;
-						$rows[$k]['._name'] .= ' nowrap';
-						$rows[$ka] = 0;
-					}
-				}
-			}
-
-			// fill the remaining cols
-			//
-			$last_cell = $this->bo->prefs['calendar']['planner_intervals_per_day'] * $this->planner_days - 1;
-
-			ksort($rows);
-			while (list($k,$r) = each($rows))
-			{
-				if (is_array($r))
-				{
-					$rows['.'.$k] = 'bgcolor="'.$GLOBALS['phpgw']->nextmatchs->alternate_row_color().'"';
-					$row = &$rows[$k];
-					$akt_cell = &$rows['.nr_'.$k];
-					if ($akt_cell < $last_cell)
-					{
-						$row['3'] = '&nbsp';
-						$row['.3'] = 'colspan="'.(1+$last_cell-$akt_cell).'"';
-					}
-				}
-			}
-		}
-
-		function planner_print_rows()
-		{
-			$bgcolor = 'bgcolor="'.$this->theme['th_bg'].'"';
-			$intervals_per_day = $this->bo->prefs['calendar']['planner_intervals_per_day'];
-
-			if ($this->debug)
-			{
-				_debug_array($this->planner_rows);
-				reset($this->planner_rows);
-			}
-			return $this->html->table(
-				array(
-					'_hdr0' => $this->planner_header[0],
-					'._hdr0' => $bgcolor,
-					'_hdr1' => $this->planner_header[1],
-					'._hdr1' => $bgcolor,
-					'_hdr2' => $this->planner_header[2],
-					'._hdr2' => $bgcolor
-				)+$this->planner_rows,
-				'width="100%" cols="'.(1+$this->planner_days_in_end_month*$intervals_per_day).'"');
-		}
-
-		function planner_process_interval()
-		{
-			// generate duplicate free list of events within observed interval
-			//
-			/*
-			$this->bo->store_to_cache(
-				Array(
-					'syear'	=> $this->bo->year,
-					'smonth'	=> $this->bo->month,
-					'sday'	=> 1,
-					'eyear'	=> $this->planner_end_year,
-					'emonth'	=> $this->planner_end_month,
-					'eday'	=> $this->planner_days_in_end_month
-				)
-			);
-			$this->bo->remove_doubles_in_cache($this->planner_firstday,$this->planner_lastday);
-			*/
-			// hack to get the planner working again
-			$this->bo->cached_events = $GLOBALS['uical']->bo->search(array(
-				'start'   => array(
-					'year'  => $GLOBALS['uical']->year,
-					'month' => $GLOBALS['uical']->month,
-					'day'   => 1,
-				),
-				'end'   => array(
-					'year'  => $GLOBALS['uical']->year,
-					'month' => 1+$GLOBALS['uical']->month,
-					'day'   => 0,
-				),
-				'cat_id'  => $GLOBALS['uical']->cat_id,
-				'users'   => $GLOBALS['uical']->is_group ? $GLOBALS['uical']->g_owner : explode(',',$GLOBALS['uical']->owner),
-				'filter'  => $GLOBALS['uical']->filter,
-				'daywise' => True,
-			));
-			// process all events within observed interval
-			//
-			for($v=$this->planner_firstday;$v<=$this->planner_lastday;$v++)
-			{
-				$daily = $this->bo->cached_events[$v];
-
-				print_debug('For Date',$v);
-				print_debug('Count of items',count($daily));
-
-				// process all events on day $v
-				//
-				if (is_array($daily)) foreach($daily as $event)
-				{
-					if ($event['recur_type'])	// calculate start- + end-datetime for recuring events
-					{
-						$this->bo->set_recur_date($event,$v);
-					}
-					if (!$this->bo->rejected_no_show($event))
-					{
-						$this->planner_process_event($event);
-					}
-				}
-			}
-			$this->planner_pad_rows();
-		}
-
-		function matrixselect()
-		{
-			$datetime = mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) - $GLOBALS['phpgw']->datetime->tz_offset;
-
-			$sb = CreateObject('phpgwapi.sbox');
-
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Matrixview');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$p = &$GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'mq'		=> 'matrix_query.tpl',
-					'form_button'	=> 'form_button_script.tpl'
-				)
-			);
-			$p->set_block('mq','matrix_query','matrix_query');
-			$p->set_block('mq','list','list');
-
-			$p->set_var(array(
-				'delete_participants'	=> lang('Delete selected participants'),
-				'title'			=> lang('Daily Matrix View'),
-				'th_bg'			=> $this->theme['th_bg'],
-				'action_url'	=> $this->page('viewmatrix')
-			));
-
-// Date
-			$var[] = Array(
-				'field'	=>	lang('Date'),
-				'data'	=>	$GLOBALS['phpgw']->common->dateformatorder(
-					$sb->getYears('year',(int)$GLOBALS['phpgw']->common->show_date($datetime,'Y'),(int)$GLOBALS['phpgw']->common->show_date($datetime,'Y')),
-					$sb->getMonthText('month',(int)$GLOBALS['phpgw']->common->show_date($datetime,'n')),
-					$sb->getDays('day',(int)$GLOBALS['phpgw']->common->show_date($datetime,'d'))
-				)
-			);
-
-// View type
-			$var[] = Array(
-				'field'	=>	lang('View'),
-				'data'	=>	'<select name="matrixtype">'."\n"
-					. '<option value="free/busy" selected>'.lang('free/busy').'</option>'."\n"
-					. '<option value="weekly">'.lang('Weekly').'</option>'."\n"
-					. '</select>'."\n"
-			);
-
-// Participants
-			if (!is_object($GLOBALS['phpgw']->uiaccountsel))
-			{
-				$GLOBALS['phpgw']->uiaccountsel = CreateObject('phpgwapi.uiaccountsel');
-			}
-
-			$accounts = $GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar');
-
-			$users = Array();
-			for($i=0;$i<count($accounts);$i++)
-			{
-				$user = $accounts[$i];
-				if(!isset($users[$user]))
-				{
-					$users[$user] = $GLOBALS['phpgw']->common->grab_owner_name($user);
-					if($GLOBALS['phpgw']->accounts->get_type($user) == 'g')
-					{
-						$group_members = $GLOBALS['phpgw']->acl->get_ids_for_location($user,1,'phpgw_group');
-						if($group_members != False)
-						{
-							for($j=0;$j<count($group_members);$j++)
-							{
-								if(!isset($users[$group_members[$j]]))
-								{
-									$users[$group_members[$j]] = $GLOBALS['phpgw']->common->grab_owner_name($group_members[$j]);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			$num_users = count($users);
-
-			if ($num_users > 50)
-			{
-				$size = 15;
-			}
-			elseif ($num_users > 5)
-			{
-				$size = 5;
-			}
-			else
-			{
-				$size = $num_users;
-			}
-			$select=array();
-			@uasort($users,'strcasecmp');
-			foreach($users as $id => $name)
-			{
-				if(!($GLOBALS['phpgw']->accounts->exists($id) && $this->bo->check_perms(PHPGW_ACL_READ,0,$id) || $GLOBALS['phpgw']->accounts->get_type($id) == 'g'))
-				{
-					unset($users[$id]);
-				}
-			}
-			$var[] = Array(
-				'field'	=>	lang('Participants'),
-				'data'	=> "\n   ".$GLOBALS['phpgw']->uiaccountsel->selection('participants[]','uicalendar_matrix_users',array(),'calendar+',$size,False,'','',$users)
-			);
-
-			for($i=0;$i<count($var);$i++)
-			{
-				$this->output_template_array($p,'rows','list',$var[$i]);
-			}
-
-			$vars = Array(
-				'submit_button'		=> lang('View'),
-				'action_url_button'	=> $this->bo->return_to ? $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to) : $this->page(''),
-				'action_text_button'	=> lang('Cancel'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'	=> ''
-			);
-
-			$p->set_var($vars);
-			$p->parse('cancel_button','form_button');
-			$p->pparse('out','matrix_query');
-		}
-
-		function viewmatrix()
-		{
-			if ($_POST['cancel'])
-			{
-				$this->index();
-			}
-
-			
-			// Fetch participants
-			if( get_var("matrix", array("GET", "POST")) == 1 )
-			{
-				// fetch participants from session
-				$participants = explode(";", $GLOBALS['phpgw']->session->appsession("participants_matrix"));
-			} else {
-				// fetch participatns from get and post var
-				$participants = get_var("participants", array("GET", "POST"));
-				// Defined - into session - who participates
-				$GLOBALS['phpgw']->session->appsession("participants_matrix", "calendar", @implode(";", $participants));
-			}
-
-			// No type ... return to the select page
-			if (!get_var("matrixtype", array("GET", "POST")) OR !$participants )
-			{
-				header('Location: ?menuaction=calendar.uicalendar.matrixselect');
-			}
-
-			$date["year"] 	= get_var("year",  array("GET", "POST"));
-			$date["month"] 	= get_var("month", array("GET", "POST"));
-			$date["day"] 	= get_var("day",   array("GET", "POST"));
-
-			$parts = Array();
-			$acct = CreateObject('phpgwapi.accounts',$this->bo->owner);
-
-			if (is_array($participants))
-			{
-				foreach($participants as $participant)
-				{
-					switch ($GLOBALS['phpgw']->accounts->get_type($participant))
-					{
-						case 'g':
-							if ($members = $acct->member((int)$participant))
-							{
-								foreach($members as $member)
-								{
-									if($this->bo->check_perms(PHPGW_ACL_READ,0,$member['account_id']))
-									{
-										$parts[$member['account_id']] = True;
-									}
-								}
-							}
-							break;
-						case 'u':
-							if($this->bo->check_perms(PHPGW_ACL_READ,0,$participant))
-							{
-								$parts[$participant] = 1;
-							}
-							break;
-					}
-				}
-				unset($acct);
-			}
-			# $participants = array_keys($parts);	// get id's as values and a numeric index
-
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Matrixview');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			switch( get_var("matrixtype", array("GET", "POST")) )
-			{
-				case 'free/busy':
-					if( get_var("sevendays", array("GET", "POST")) )
-					{
-						$_f_daysend=7;
-					}
-					
-					for($_f_days=0; $_f_days<=$_f_daysend; $_f_days++)
-					{
-						$freetime = $GLOBALS['phpgw']->datetime->gmtdate(mktime(0,0,0,$date["month"],( $date["day"] + $_f_days ),$date["year"]));
-						echo '<br>'.$this->timematrix(
-							Array(
-								'date'		=> $freetime,
-								'starttime'	=> $this->bo->splittime('000000',False),
-								'endtime'	=> 0,
-								'participants'	=> $parts
-							)
-						);
-					}
-					break;
-				case 'weekly':
-					echo '<br>'.$this->display_weekly(
-						Array(
-							'date'		=> sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),
-							'showyear'	=> true,
-							'owners'	=> $participants
-						)
-					);
-					break;
-			}
-			echo "\n<br>\n".'<form action="'.$this->page('viewmatrix').'" method="post" name="matrixform">'."\n";
-			echo ' <table cellpadding="5"><tr><td>'."\n";
-			echo '  '.$this->html->input_hidden('year',$this->bo->year);
-			echo '  '.$this->html->input_hidden('month',$this->bo->month);
-			echo '  '.$this->html->input_hidden('day',$this->bo->day);
-			echo '  '.$this->html->input_hidden('matrixtype',$_REQUEST['matrixtype']);
-			echo '  '.$this->html->input_hidden('matrix', 1);
-			echo '  <input type="submit" name="refresh" value="'.lang('Refresh').'">'."\n";
-			echo ' </td><td>'."\n";
-			echo '  <input type="submit" name="cancel" value="'.lang('Cancel').'">'."\n";
-			echo ' </td><td>'."\n";
-
-			// Seven days
-			if( get_var("matrixtype", array("GET", "POST")) == "free/busy" )
-			{
-				if( !get_var("sevendays", array("GET", "POST")) )
-					echo '  <input type="submit" name="sevendays" value="'.lang('Show next seven days').'">'."\n";
-				else
-					echo '  <input type="submit" name="oneday" value="'.lang('Show only one day').'">'."\n";
-			}
-
-			echo ' </td></tr></table>'."\n";
-			echo '</form>'."\n";
-		}
-
-		function search()
-		{
-			if (empty($_POST['keywords']))
-			{
-				// If we reach this, it is because they didn't search for anything
-				// or they used one of the selectboxes (year, month, week) in the search-result
-				// attempt to send them back to where they came from.
-
-				$vars['menuaction'] = isset($_POST['from']) && $_POST['from'] != 'calendar.uicalendar.search' ?
-					$_POST['from'] : 'calendar.uicalendar.index';
-
-				foreach(array('date','year','month','day') as $field)
-				{
-					if (isset($_POST[$field]))
-					{
-						$vars[$field] = $_POST[$field];
-					}
-				}
-				$GLOBALS['phpgw']->redirect_link('/index.php',$vars);
-			}
-
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Search Results');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$error = '';
-
-			$matches = 0;
-
-			// There is currently a problem searching in with repeated events.
-			// It spits back out the date it was entered.  I would like to to say that
-			// it is a repeated event.
-
-			// This has been solved by the little icon indicator for recurring events.
-
-			$event_ids = $this->bo->search_keywords($_POST['keywords']);
-			foreach($event_ids as $key => $id)
-			{
-				$event = $this->bo->read_entry($id);
-
-				if(!$this->bo->check_perms(PHPGW_ACL_READ,$event))
-				{
-					continue;
-				}
-
-				$datetime = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
-
-				$info[strval($event['id'])] = array(
-					'tr_color'	=> $GLOBALS['phpgw']->nextmatchs->alternate_row_color(),
-					'date'		=> $GLOBALS['phpgw']->common->show_date($datetime),
-					'link'		=> $this->link_to_entry($event,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
-				);
-
-			}
-			$matches = count($event_ids);
-
-			if ($matches == 1)
-			{
-				$quantity = lang('1 match found').'.';
-			}
-			elseif ($matches > 0)
-			{
-				$quantity = lang('%1 matches found',$matches).'.';
-			}
-			else
-			{
-				echo '<b>'.lang('Error').':</b>'.lang('no matches found');
-				return;
-			}
-
-			$p = $GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'search_form'	=> 'search.tpl'
-				)
-			);
-			$p->set_block('search_form','search','search');
-			$p->set_block('search_form','search_list_header','search_list_header');
-			$p->set_block('search_form','search_list','search_list');
-			$p->set_block('search_form','search_list_footer','search_list_footer');
-
-			$var = Array(
-				'th_bg'		=> $this->theme['th_bg'],
-				'search_text'	=> lang('Search Results'),
-				'quantity'	=> $quantity
-			);
-			$p->set_var($var);
-
-			if($matches > 0)
-			{
-				$p->parse('rows','search_list_header',True);
-			}
-			foreach($info as $id => $data)
-			{
-				$p->set_var($data);
-				$p->parse('rows','search_list',True);
-			}
-
-			if($matches > 0)
-			{
-				$p->parse('rows','search_list_footer',True);
-			}
-
-			$p->pparse('out','search');
-		}
-
-		/* Private functions */
-		function _debug_sqsof()
-		{
-			$data = array(
-				'filter'     => $this->bo->filter,
-				'cat_id'     => $this->bo->cat_id,
-				'owner'      => $this->bo->owner,
-				'year'       => $this->bo->year,
-				'month'      => $this->bo->month,
-				'day'        => $this->bo->day,
-				'sortby'     => $this->bo->sortby,
-				'num_months' => $this->bo->num_months
-			);
-			Return _debug_array($data,False);
-		}
-
-		function output_template_array(&$p,$row,$list,$var)
-		{
-			if (!isset($var['hidden_vars']))
-			{
-				$var['hidden_vars'] = '';
-			}
-			if (!isset($var['tr_color']))
-			{
-				$var['tr_color'] = $GLOBALS['phpgw']->nextmatchs->alternate_row_color();
-			}
-			$p->set_var($var);
-			$p->parse($row,$list,True);
-		}
-
-		function page($_page='',$params='')
-		{
-			if($_page == '')
-			{
-				$page_ = explode('.',$this->bo->prefs['calendar']['defaultcalendar']);
-				$_page = $page_[0];
-
-				if ($_page=='planner_cat' || $_page=='planner_user')
-				{
-					$_page = 'planner';
-				}
-				elseif ($_page=='index' || ($_page != 'day' && $_page != 'week' && $_page != 'month' && $_page != 'year' && $_page != 'planner'))
-				{
-					$_page = 'month';
-					$GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar','month');
-					$GLOBALS['phpgw']->preferences->save_repository();
-				}
-			}
-			if($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' ||
-				strstr($GLOBALS['phpgw_info']['flags']['currentapp'],'mail'))	// email, felamimail, ...
-			{
-				$page_app = 'calendar';
-			}
-			else
-			{
-				$page_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
-			}
-			$page_class = $_page == 'day' || $_page == 'week' || $_page == 'month' ? 'uiviews' : 'uicalendar';
-
- 			if (is_array($params))
- 			{
-				$params['menuaction'] = $page_app.'.'.$page_class.'.'.$_page;
- 			}
- 			else
- 			{
-				$params = 'menuaction='.$page_app.'.'.$page_class.'.'.$_page.$params;
-			}
-			return $GLOBALS['phpgw']->link('/index.php',$params);
-		}
-
-		function header()
-		{
-return;
-			$cols = 8;
-			if($this->bo->check_perms(PHPGW_ACL_PRIVATE) == True)
-			{
-				$cols++;
-			}
-
-			$tpl = $GLOBALS['phpgw']->template;
-			$tpl->set_unknowns('remove');
-
-			if (!file_exists($file = $this->template_dir.'/header.inc.php'))
-			{
-				$file = PHPGW_SERVER_ROOT . '/calendar/templates/default/header.inc.php';
-			}
-			include($file);
-			$header = $tpl->fp('out','head');
-			unset($tpl);
-			echo $header;
-		}
-
-		function footer()
-		{
-return;
-			$menuaction = $_GET['menuaction'];
-			list(,,$method) = explode('.',$menuaction);
-
-			if (@$this->bo->printer_friendly)
-			{
-				return;
-			}
-
-			$p = $GLOBALS['phpgw']->template;
-
-			$p->set_file(
-				Array(
-					'footer'	=> 'footer.tpl',
-					'form_button'	=> 'form_button_script.tpl'
-				)
-			);
-			$p->set_block('footer','footer_table','footer_table');
-			$p->set_block('footer','footer_row','footer_row');
-			$p->set_block('footer','blank_row','blank_row');
-
-			$m = $this->bo->month;
-			$y = $this->bo->year;
-
-			$thisdate = date('Ymd',mktime(0,0,0,$m,1,$y));
-			$y--;
-
-			$str = '';
-			for ($i = 0; $i < 25; $i++)
-			{
-				$m++;
-				if ($m > 12)
-				{
-					$m = 1;
-					$y++;
-				}
-				$d = mktime(0,0,0,$m,1,$y);
-				$d_ymd = date('Ymd',$d);
-				$str .= '<option value="'.$d_ymd.'"'.($d_ymd == $thisdate?' selected':'').'>'.lang(date('F', $d)).strftime(' %Y', $d).'</option>'."\n";
-			}
-
-			$var = Array(
-				'action_url'	=> $this->page($method,''),
-				'form_name'	=> 'SelectMonth',
-				'label'		=> lang('Month'),
-				'form_label'	=> 'date',
-				'form_onchange'	=> 'document.SelectMonth.submit()',
-				'row'		=> $str,
-				'go'		=> lang('Go!')
-			);
-			$this->output_template_array($p,'table_row','footer_row',$var);
-
-			if($menuaction == 'calendar.uicalendar.week')
-			{
-				unset($thisdate);
-				$thisdate = mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) - $GLOBALS['phpgw']->datetime->tz_offset;
-				$sun = $GLOBALS['phpgw']->datetime->get_weekday_start($this->bo->year,$this->bo->month,$this->bo->day) - $GLOBALS['phpgw']->datetime->tz_offset;
-
-				$str = '';
-				for ($i = -7; $i <= 7; $i++)
-				{
-					$begin = $sun + (7*24*60*60 * $i) + 12*60*60;	// we use midday, that changes in daylight-saveing does not effect us
-					$end = $begin + 6*24*60*60;
-//					echo "<br>$i: ".date('d.m.Y H:i',$begin).' - '.date('d.m.Y H:i',$end);
-                    $str .= '<option value="' . $GLOBALS['phpgw']->common->show_date($begin,'Ymd') . '"'.($begin <= $thisdate+12*60*60 && $end >= $thisdate+12*60*60 ? ' selected':'').'>'                    
-						. $GLOBALS['phpgw']->common->show_date($begin,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']) . ' - '
-                        . $GLOBALS['phpgw']->common->show_date($end,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
-                        . '</option>' . "\n";                        
-				}
-
-				$var = Array(
-					'action_url'	=> $this->page($method,''),
-					'form_name'	=> 'SelectWeek',
-					'label'		=> lang('Week'),
-					'form_label'	=> 'date',
-					'form_onchange'	=> 'document.SelectWeek.submit()',
-					'row'		=> $str,
-					'go'		=> lang('Go!')
-				);
-
-				$this->output_template_array($p,'table_row','footer_row',$var);
-			}
-
-			$str = '';
-			for ($i = ($this->bo->year - 3); $i < ($this->bo->year + 3); $i++)
-			{
-				$str .= '<option value="'.$i.'"'.($i == $this->bo->year?' selected':'').'>'.$i.'</option>'."\n";
-			}
-
-			$var = Array(
-				'action_url'	=> $this->page($method,''),
-				'form_name'	=> 'SelectYear',
-				'label'		=> lang('Year'),
-				'form_label'	=> 'year',
-				'form_onchange'	=> 'document.SelectYear.submit()',
-				'row'		=> $str,
-				'go'		=> lang('Go!')
-			);
-			$this->output_template_array($p,'table_row','footer_row',$var);
-
-			if($menuaction == 'calendar.uicalendar.planner')
-			{
-				$str = '';
-				$date_str = '';
-
-				if($this->bo->date)
-				{
-					$date_str .= '    '.$this->html->input_hidden('date',$this->bo->date);
-				}
-				$date_str .= '    '.$this->html->input_hidden('month',$this->bo->month);
-				$date_str .= '    '.$this->html->input_hidden('day',$this->bo->day);
-				$date_str .= '    '.$this->html->input_hidden('year',$this->bo->year);
-
-				for($i=1; $i<=6; $i++)
-				{
-					$str .= '<option value="'.$i.'"'.($i == $this->bo->num_months?' selected':'').'>'.$i.'</option>'."\n";
-				}
-
-				$var = Array(
-					'action_url'	=> $this->page($method,''),
-					'form_name'	=> 'SelectNumberOfMonths',
-					'label'		=> lang('Number of Months'),
-					'hidden_vars' => $date_str,
-					'form_label'	=> 'num_months',
-					'form_onchange'	=> 'document.SelectNumberOfMonths.submit()',
-					'action_extra_field'	=> $date_str,
-					'row'		=> $str,
-					'go'		=> lang('Go!')
-				);
-				$this->output_template_array($p,'table_row','footer_row',$var);
-			}
-
-			$var = Array(
-				'submit_button'		=> lang('Submit'),
-				'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import'),
-				'action_text_button'	=> lang('Import'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'	=> ''
-			);
-			$this->output_template_array($p,'b_row','form_button',$var);
-			$p->parse('table_row','blank_row',True);
-
-			if($menuaction != 'calendar.uicalendar.view')
-			{
-				switch($menuaction)
-				{
-					case 'calendar.uicalendar.year':
-						$start_string                   = mktime(0,0,0,1,1,$this->bo->year);
-						$stop_string                    = mktime(0,0,0,12,31,$this->bo->year);
-						break;
-					case 'calendar.uicalendar.month':
-						$start_string                   = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
-						$stop_string                    = mktime(0,0,0,$this->bo->month+1,0,$this->bo->year);
-						break;
-					case 'calendar.uicalendar.week':
-						$stop_string = $start_string    = mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year);
-						$stop_string += 7*24*60*60-1;
-						break;
-					case 'calendar.uicalendar.day':
-						$stop_string = $start_string    = mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year);
-						break;
-				}
-
-				$extra_field = Array(	
-					'custom_start' => $GLOBALS['phpgw']->common->show_date($start_string,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
-					'custom_stop'  => $GLOBALS['phpgw']->common->show_date($stop_string,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
-				);
-				$var = Array(
-					'submit_button'         => lang('Submit'),
-					'action_url_button'     => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.export'),
-					'action_text_button'    => lang('Export'),
-					'action_confirm_button' => '',
-					'action_extra_field'    => $this->html->input_hidden($extra_field)
-				);
-				$p->set_var('b_row','');
-				$this->output_template_array($p,'b_row','form_button',$var);
-				$p->parse('table_row','blank_row',True);
-			}
-			$p->pparse('out','footer_table');
-			unset($p);
-		}
-
-		function css()
-		{
-			$GLOBALS['phpgw']->browser->browser();
-			if($GLOBALS['phpgw']->browser->get_agent() == 'MOZILLA')
-			{
-				$time_width = ((int)($this->bo->prefs['common']['time_format']) == 12?12:8);
-			}
-			else
-			{
-				$time_width = ((int)($this->bo->prefs['common']['time_format']) == 12?10:7);
-			}
-
-// moved to app.css in templates/default for future separation of code and style [NDEE 10.03.04]
-/*
-			 return 'A.minicalendar { color: #000000; font-size: 72%; font-family: '.$this->theme['font'].' }'."\n"
-				. '  A.bminicalendar { color: #336699; font: italic bold x-small '.$this->theme['font'].' }'."\n"
-				. '  A.minicalendargrey { color: #999999; font-size: 8px; font-family: '.$this->theme['font'].' }'."\n"
-				. '  A.bminicalendargrey { color: #336699; font-style: italic; font-size:8px; font-family '.$this->theme['font'].' }'."\n"
-				. '  A.minicalhol { padding-left:3px; padding-right:3px; background: '.$this->holiday_color.'; color: #000000; font: x-small '.$this->theme['font'].' }'."\n"
-				. '  A.bminicalhol { padding-left:3px; padding-right:3px; background: '.$this->holiday_color.'; color: #336699; font: italic bold x-small '.$this->theme['font'].' }'."\n"
-				. '  A.minicalgreyhol { padding-left:3px; padding-right:3px; background: '.$this->holiday_color.'; color: #999999; font: x-small '.$this->theme['font'].' }'."\n"
-				. '  A.bminicalgreyhol { padding-left:3px; padding-right:3px; background: '.$this->holiday_color.'; color: #999999; font: italic bold x-small '.$this->theme['font'].' }'."\n"
-				. '  .event-on { background: '.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100% '.$this->theme['font'].'; vertical-align: middle }'."\n"
-				. '  .event-off { background: '.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100% '.$this->theme['font'].'; vertical-align: middle }'."\n"
-				. '  .event-holiday { background: '.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100% '.$this->theme['font'].'; vertical-align: middle }'."\n"
-				. '  .time { background: '.$this->theme['th_bg'].'; color: '.$this->theme['bg_text'].'; font: bold 100% '.$this->theme['font'].'; width: '.$time_width.'%; vertical-align: middle; text-align: right; }'."\n"
-				. '  .tablecell { width: 80px; height: 80px }'."\n"
-				. '  .planner-cell { cursor:pointer; cursor:hand; border: thin solid black; }';
-*/
-		}
-
-		function no_edit()
-		{
-			if(!isset($GLOBALS['phpgw_info']['flags']['noheader']))
-			{
-				unset($GLOBALS['phpgw_info']['flags']['noheader']);
-				unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-				$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
-				$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-				$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Permission denied');
-				$GLOBALS['phpgw']->common->phpgw_header();
-			}
-			echo '<center>You do not have permission to edit this appointment!</center>';
-			return;
-		}
-
-		function link_to_entry($event,$month,$day,$year)
-		{
-			$str = '';
-			$is_private = !$event['public'] && !$this->bo->check_perms(PHPGW_ACL_READ,$event);
-			$viewable = !$this->bo->printer_friendly && $this->bo->check_perms(PHPGW_ACL_READ,$event);
-
-			$starttime = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$endtime = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$rawdate = mktime(0,0,0,$month,$day,$year);
-			$rawdate_offset = $rawdate - $GLOBALS['phpgw']->datetime->tz_offset;
-			$nextday = mktime(0,0,0,$month,$day + 1,$year) - $GLOBALS['phpgw']->datetime->tz_offset;
-			if ((int)$GLOBALS['phpgw']->common->show_date($starttime,'Hi') && $starttime == $endtime)
-			{
-				$time = $GLOBALS['phpgw']->common->show_date($starttime,$this->bo->users_timeformat);
-			}
-			elseif ($starttime <= $rawdate_offset && $endtime >= $nextday - 60)
-			{
-				$time = '[ '.lang('All Day').' ]';
-			}
-			elseif ((int)$GLOBALS['phpgw']->common->show_date($starttime,'Hi') || $starttime != $endtime)
-			{
-				if($starttime < $rawdate_offset && $event['recur_type'] == MCAL_RECUR_NONE)
-				{
-					$start_time = $GLOBALS['phpgw']->common->show_date($rawdate_offset,$this->bo->users_timeformat);
-				}
-				else
-				{
-					$start_time = $GLOBALS['phpgw']->common->show_date($starttime,$this->bo->users_timeformat);
-				}
-
-				if($endtime >= ($rawdate_offset + 86400))
-				{
-					$end_time = $GLOBALS['phpgw']->common->show_date(mktime(23,59,59,$month,$day,$year) - $GLOBALS['phpgw']->datetime->tz_offset,$this->bo->users_timeformat);
-				}
-				else
-				{
-					$end_time = $GLOBALS['phpgw']->common->show_date($endtime,$this->bo->users_timeformat);
-				}
-				$time = $start_time.'-'.$end_time;
-			}
-			else
-			{
-				$time = '';
-			}
-			
-			$texttitle = $texttime = $textdesc = $textlocation = $textstatus = '';
-
-			
-			
-			if(!$is_private)
-			{
-				//$text .= $this->bo->display_status($event['users_status']);
-				
-				// split text for better display by templates, also see $texttime $texttitle $textdesc $textlocation	
-				$textstatus=$this->bo->display_status($event['users_status']); 
-				
-			}
-
-			/*
-			$text = '<nobr>&nbsp;'.$time.'&nbsp;</nobr> '.$this->bo->get_short_field($event,$is_private,'title').$text.
-				(!$is_private && $event['description'] ? ': <i>'.$this->bo->get_short_field($event,$is_private,'description').'</i>':'').
-				$GLOBALS['phpgw']->browser->br;
-			*/
-			
-			$texttime=$time;
-			$texttitle=$this->bo->get_short_field($event,$is_private,'title');
-			$textdesc=(!$is_private && $event['description'] ? $this->bo->get_short_field($event,$is_private,'description'):'');
-			// added $textlocation but this must be activated in the actual pict_link.tpl file of the used template set
-			$textlocation=$this->bo->get_short_field($event,$is_private,'location');
-
-			if ($viewable)
-			{
-				$date = sprintf('%04d%02d%02d',$year,$month,$day);
-				$this->link_tpl->set_var('link_link',$this->page('view','&cal_id='.$event['id'].'&date='.$date));
-				$this->link_tpl->set_var('lang_view',lang('View this entry'));
-				$this->link_tpl->set_var('tooltip',$this->event_tooltip($event));
-				// quoting title, describtion and location for wz_tooltips
-				$this->link_tpl->parse('picture','link_open',True);
-			}
-			if (!$is_private)
-			{
-				if($event['priority'] == 3)
-				{
-					$picture[] = Array(
-						'pict'	=> $GLOBALS['phpgw']->common->image('calendar','high'),
-						'width'	=> 16,
-						'height'=> 16,
-						'title' => lang('high priority')
-					);
-				}
-				if($event['recur_type'] == MCAL_RECUR_NONE)
-				{
-					$picture[] = Array(
-						'pict'	=> $GLOBALS['phpgw']->common->image('calendar','circle'),
-						'width'	=> 9,
-						'height'=> 9,
-						'title' => lang('single event')
-					);
-				}
-				else
-				{
-					$picture[] = Array(
-						'pict'	=> $GLOBALS['phpgw']->common->image('calendar','recur'),
-						'width'	=> 12,
-						'height'=> 12,
-						'title' => lang('recurring event')
-					);
-				}
-			}
-			$participants = $this->planner_participants($event['participants']);
-			if(count($event['participants']) > 1)
-			{
-				$picture[] = Array(
-					'pict'	=> $GLOBALS['phpgw']->common->image('calendar','multi_3'),
-					'width'	=> 14,
-					'height'=> 14,
-					'title' => $participants
-				);
-			}
-			else
-			{
-				$picture[] = Array(
-					'pict'	=>  $GLOBALS['phpgw']->common->image('calendar','single'),
-					'width'	=> 14,
-					'height'=> 14,
-					'title' => $participants
-				);
-			}
-			if($event['public'] == 0)
-			{
-				$picture[] = Array(
-					'pict'	=> $GLOBALS['phpgw']->common->image('calendar','private'),
-					'width'	=> 13,
-					'height'=> 13,
-					'title' => lang('private')
-				);
-			}
-			if(@isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
-			{
-				// if the alarm is to go off the day before the event
-				// the icon does not show up because of 'alarm_today'
-				// - TOM
-				if($this->bo->alarm_today($event,$rawdate_offset,$starttime))
-				{
-					$picture[] = Array(
-						'pict'  => $GLOBALS['phpgw']->common->image('calendar','alarm'),
-						'width' => 13,
-						'height'=> 13,
-						'title' => lang('alarm')
-					);
-				}
-			}
-
-			$description = $this->bo->get_short_field($event,$is_private,'description');
-			for($i=0;$i<count($picture);$i++)
-			{
-				$var = Array(
-					'pic_image' => $picture[$i]['pict'],
-					'width'     => $picture[$i]['width'],
-					'height'    => $picture[$i]['height'],
-					'title'     => $picture[$i]['title']
-				);
-				$this->output_template_array($this->link_tpl,'picture','pict',$var);
-			}
-			if ($texttitle)
-			{
-				$var = Array(
-			//		'text' => $text,
-					'time'=> $texttime,
-					'title'=> $texttitle,
-					'users_status'=>$textstatus,
-					'desc'=> $textdesc,
-					'location'=> $textlocation
-				);
-				$this->output_template_array($this->link_tpl,'picture','link_text',$var);
-			}
-
-			if ($viewable)
-			{
-				$this->link_tpl->parse('picture','link_close',True);
-			}
-
-			//NDEE(160704) for event tooltips
-			$this->link_tpl->set_var('loctitle',lang('location'));
-			$str = $this->link_tpl->fp('out','link_pict');
-			$this->link_tpl->set_var('picture','');
-			$this->link_tpl->set_var('out','');
-//			unset($p);
-			return $str;
-		}
-
-		function overlap($params)
-		{
-			if(!is_array($params))
-			{
-			}
-			else
-			{
-				$overlapping_events = $params['o_events'];
-				$event = $params['this_event'];
-			}
-
-			$month = $event['start']['month'];
-			$mday = $event['start']['mday'];
-			$year = $event['start']['year'];
-
-			$start = mktime($event['start']['hour'],$event['start']['min'],$event['start']['sec'],$month,$mday,$year) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$end = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
-
-			$overlap = '';
-			for($i=0;$i<count($overlapping_events);$i++)
-			{
-				$overlapped_event = $this->bo->read_entry($overlapping_events[$i],True);
-				$overlap .= '<li>'.$this->link_to_entry($overlapped_event,$month,$mday,$year);
-				$overlap .= '<ul>';
-				foreach($overlapped_event['participants'] as $id => $status)
-				{
-					// Check if user can be view others participants
-					if($GLOBALS["phpgw"]->acl->get_rights($id, "calendar") < PHPGW_ACL_READ)
-						continue;
-
-					$conflict = isset($event['participants'][$id]);
-					$overlap .= '<li>'.($conflict?'<b>':'').
-						$GLOBALS['phpgw']->common->grab_owner_name($id).
-						($conflict?'</b> - '.lang('Scheduling conflict'):'')."</li>\n";
-				}
-				$overlap .= "</ul>\n";
-			}
-
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Scheduling Conflict');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$p = $GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'overlap'	=> 'overlap.tpl',
-   					'form_button'	=> 'form_button_script.tpl'
-				)
-			);
-
-			$var = Array(
-				'color'		=> $this->theme['bg_text'],
-				'overlap_title' => lang('Scheduling Conflict'),
-				'overlap_text'	=> lang('Your suggested time of <B> %1 - %2 </B> conflicts with the following existing calendar entries:',$GLOBALS['phpgw']->common->show_date($start),$GLOBALS['phpgw']->common->show_date($end)),
-				'overlap_list'	=> $overlap
-			);
-			$p->set_var($var);
-
-			$date = sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->mday);
-			$var = Array(
-				'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.bocalendar.update','readsess'=>1)),
-				'action_text_button'	=> lang('Ignore Conflict'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'	=> ''
-			);
-			$this->output_template_array($p,'resubmit_button','form_button',$var);
-
-			$var = Array(
-				'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.edit','readsess'=>1,'date'=>$date)),
-				'action_text_button'	=> lang('Re-Edit Event'),
-				'action_confirm_button'	=> '',
-				'action_extra_field'	=> ''
-			);
-			$this->output_template_array($p,'reedit_button','form_button',$var);
-			$p->pparse('out','overlap');
-		}
-
-		function planner_participants($parts)
-		{
-			static $id2lid;
-
-			$names = '';
-			while (list($id,$status) = each($parts))
-			{
-				$status = substr($this->bo->get_long_status($status),0,1);
-
-				if (!isset($id2lid[$id]))
-				{
-					$id2lid[$id] = $GLOBALS['phpgw']->common->grab_owner_name($id);
-				}
-				if (strlen($names))
-				{
-					$names .= ",\n";
-				}
-				$names .= $id2lid[$id]." ($status)";
-			}
-			if($this->debug)
-			{
-				echo '<!-- Inside participants() : '.$names.' -->'."\n";
-			}
-			return $names;
-		}
-
-		function planner_category($ids)
-		{
-			static $cats;
-			if(!is_array($ids))
-			{
-				if (strpos($ids,','))
-				{
-					$id_array = explode(',',$ids);
-				}
-				else
-				{
-					$id_array[0] = $ids;
-				}
-			}
-			$ret_val = Array();
-			foreach($id_array as $id)
-			{
-				if (!isset($cats[$id]))
-				{
-					list($cat) = $this->cat->return_single( $id );
-					$cat['data'] = unserialize($cat['data']);
-					$cat['color'] = $cat['data']['color'] ? $cat['data']['color'] : strstr($cat['description'],'#');
-					$cats[$id] = $cat;
-				}
-				$ret_val[] = $cats[$id];
-			}
-			return $ret_val;
-		}
-
-		function week_header($month,$year,$display_name = False)
-		{
-			$this->weekstarttime = $GLOBALS['phpgw']->datetime->get_weekday_start($year,$month,1);
-
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_unknowns('remove');
-			$p->set_file(
-				Array (
-					'month_header' => 'month_header.tpl'
-				)
-			);
-			$p->set_block('month_header','monthly_header','monthly_header');
-			$p->set_block('month_header','column_title','column_title');
-
-			$var = Array(
-				'bgcolor'	=> $this->theme['th_bg'],
-				'font_color'	=> $this->theme['th_text']
-			);
-			if($this->bo->printer_friendly && @$this->bo->prefs['calendar']['print_black_white'])
-			{
-				$var = Array(
-					'bgcolor'	=> '',
-					'font_color'	=> ''
-				);
-			}
-			$p->set_var($var);
-
-			$p->set_var('col_width','14');
-			if($display_name == True)
-			{
-				$p->set_var('col_title',lang('name'));
-				$p->parse('column_header','column_title',True);
-				$p->set_var('col_width','12');
-			}
-
-			for($i=0;$i<7;$i++)
-			{
-				$p->set_var('col_title',lang($GLOBALS['phpgw']->datetime->days[$i]));
-				$p->parse('column_header','column_title',True);
-			}
-			return $p->fp('out','monthly_header');
-		}
-
-		function display_week($startdate,$weekly,$cellcolor,$display_name = False,$owner=0,$monthstart=0,$monthend=0)
-		{
-			if($owner == 0)
-			{
-				$owner = $GLOBALS['phpgw_info']['user']['account_id'];
-			}
-
-			$temp_owner = $this->bo->owner;
-
-			$str = '';
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_unknowns('keep');
-
-			$p->set_file(
-				Array(
-					'month_header'	=> 'month_header.tpl',
-					'month_day'	=> 'month_day.tpl'
-				)
-			);
-			$p->set_block('month_header','monthly_row','monthly_row');
-			$p->set_block('month_header','month_column','month_column');
-			$p->set_block('month_header','column_title','column_title');
-			$p->set_block('month_day','month_daily','month_daily');
-			$p->set_block('month_day','day_event','day_event');
-			$p->set_block('month_day','event','event');
-
-			$p->set_var('extra','');
-			$p->set_var('col_width','14');
-			if($display_name)
-			{
-				$p->set_var('col_title',$GLOBALS['phpgw']->common->grab_owner_name($owner));
-				$p->parse('column_row','column_title',True);
-				$p->set_var('col_width','12');
-			}
-			$today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
-			$daily = $this->set_week_array($startdate - $GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
-			foreach($daily as $date => $day_params)
-			{
-				$year  = (int)substr($date,0,4);
-				$month = (int)substr($date,4,2);
-				$day   = (int)substr($date,6,2);
-				$var   = Array(
-					'column_data' => '',
-					'extra' => ''
-				);
-				$p->set_var($var);
-				if ($weekly || ($date >= $monthstart && $date <= $monthend))
-				{
-					if ($day_params['new_event'])
-					{
-						$new_event_link = ' <a href="'.$this->page('add','&date='.$date).'">'
-							. '<img src="'.$GLOBALS['phpgw']->common->image('calendar','new3').'" width="10" height="10" title="'.lang('New Entry').'" border="0" align="center">'
-							. '</a>';
-						$day_number = '<a href="'.$this->page('day','&date='.$date).'">'.$day.'</a>';
-					}
-					else
-					{
-						$new_event_link = '';
-						$day_number = $day;
-					}
-
-					$var = Array(
-						'extra'		=> $day_params['extra'],
-						'new_event_link'=> $new_event_link,
-						'day_number'	=> $day_number
-					);
-					if($day_params['week'])
-					{
-
-//NDEE: style! m_w_table in month_day.tpl
-// week-hilite
-						//$var['new_event_link'] .= '<font size="-2"> &nbsp; '.
-						$var['new_event_link'] .= ' &nbsp; '.
-							(!$this->bo->printer_friendly?'<a href="'.$this->page('week','&date='.$date).'"><span id="calendar_weekinfo" class="calendar_weekinfo">' .$day_params['week'].'</span></a>' : '<span id="calendar_weekinfo" class="calendar_weekinfo">'.$day_params['week'].'</span>');
-					}
-
-					$p->set_var($var);
-
-					if(@$day_params['holidays'])
-					{
-						foreach($day_params['holidays'] as $key => $value)
-						{
-							$var = Array(
-								'day_events' => '<font face="'.$this->theme['font'].'" size="-1">'.$value.'</font>'.$GLOBALS['phpgw']->browser->br
-							);
-							$this->output_template_array($p,'daily_events','event',$var);
-						}
-					}
-
-					if($day_params['appts'])
-					{
-						$var = Array(
-							'week_day_font_size'	=> '2',
-							'events'		=> ''
-						);
-						$p->set_var($var);
-						$events = $this->bo->cached_events[$date];
-						foreach($events as $event)
-						{
-							if ($this->bo->rejected_no_show($event))
-							{
-								continue;	// user does not want to see rejected events
-							}
-							$p->set_var('day_events',$this->link_to_entry($event,$month,$day,$year));
-							$p->parse('events','event',True);
-							$p->set_var('day_events','');
-						}
-					}
-					$p->parse('daily_events','day_event',True);
-					$p->parse('column_data','month_daily',True);
-					$p->set_var('daily_events','');
-					$p->set_var('events','');
-/*					if($day_params['week'])
-					{
-						$var = Array(
-							'week_day_font_size'	=> '-2',
-							'events'		=> (!$this->bo->printer_friendly?'<a href="'.$this->page('week','&date='.$date).'">' .$day_params['week'].'</a>':$day_params['week'])
-						);
-						$this->output_template_array($p,'column_data','day_event',$var);
-						$p->set_var('events','');
-					} */
-				}
-				$p->parse('column_row','month_column',True);
-				$p->set_var('column_data','');
-			}
-			$this->bo->owner = $temp_owner;
-			return $p->fp('out','monthly_row');
-		}
-
-		function display_month($month,$year,$showyear,$owner=0)
-		{
-			if($this->debug)
-			{
-				echo '<!-- datetime:gmtdate = '.$GLOBALS['phpgw']->datetime->cv_gmtdate.' -->'."\n";
-			}
-
-			$this->bo->store_to_cache(
-				Array(
-					'syear'	=> $year,
-					'smonth'=> $month,
-					'sday'	=> 1
-				)
-			);
-
-			$monthstart = (int)(date('Ymd',mktime(0,0,0,$month    ,1,$year)));
-			$monthend   = (int)(date('Ymd',mktime(0,0,0,$month + 1,0,$year)));
-
-			$start = $GLOBALS['phpgw']->datetime->get_weekday_start($year, $month, 1);
-
-			if($this->debug)
-			{
-				echo '<!-- display_month:monthstart = '.$monthstart.' -->'."\n";
-				echo '<!-- display_month:start = '.date('Ymd H:i:s',$start).' -->'."\n";
-			}
-
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_unknowns('keep');
-
-			$p->set_file(
-				Array(
-					'week' => 'month_day.tpl'
-				)
-			);
-			$p->set_block('week','m_w_table','m_w_table');
-			$p->set_block('week','event','event');
-
-			$var = Array(
-				'cols'      => 7,
-				'day_events'=> $this->week_header($month,$year,False)
-			);
-			$this->output_template_array($p,'row','event',$var);
-
-			$cellcolor = $this->theme['row_on'];
-
-			for($i = (int)($start + $GLOBALS['phpgw']->datetime->tz_offset);(int)(date('Ymd',$i)) <= $monthend;$i += 604800)
-			{
-				$cellcolor = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
-				$var = Array(
-					'day_events' => $this->display_week($i,False,$cellcolor,False,$owner,$monthstart,$monthend)
-				);
-				$this->output_template_array($p,'row','event',$var);
-			}
-			return $p->fp('out','m_w_table');
-		}
-
-		function display_weekly($params)
-		{
-			if(!is_array($params))
-			{
-				$this->index();
-			}
-
-			$year = substr($params['date'],0,4);
-			$month = substr($params['date'],4,2);
-			$day = substr($params['date'],6,2);
-			$showyear = $params['showyear'];
-			$owners = $params['owners'];
-
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_unknowns('keep');
-
-			$p->set_file(
-				Array(
-					'week'	=> 'month_day.tpl'
-				)
-			);
-			$p->set_block('week','m_w_table','m_w_table');
-			$p->set_block('week','event','event');
-
-			$start = $GLOBALS['phpgw']->datetime->get_weekday_start($year, $month, $day) + $GLOBALS['phpgw']->datetime->tz_offset;
-
-			$cellcolor = $this->theme['row_off'];
-
-			$true_printer_friendly = $this->bo->printer_friendly;
-
-			if(is_array($owners))
-			{
-				$display_name = True;
-				$counter = count($owners);
-				$owners_array = $owners;
-				$cols = 8;
-			}
-			else
-			{
-				$display_name = False;
-				$counter = 1;
-				$owners_array[0] = $owners;
-				$cols = 7;
-			}
-			$var = Array(
-				'cols'         => $cols,
-				'day_events'   => $this->week_header($month,$year,$display_name)
-			);
-			$this->output_template_array($p,'row','event',$var);
-
-			$tstart = $start - $GLOBALS['phpgw']->datetime->tz_offset;
-			$tstop = $tstart + 604800;
-			$original_owner = $this->bo->so->owner;
-			for($i=0;$i<$counter;$i++)
-			{
-				$this->bo->so->owner = $owners_array[$i];
-				$this->bo->so->open_box($owners_array[$i]);
-				$this->bo->store_to_cache(
-					Array(
-						'syear'  => date('Y',$tstart),
-						'smonth' => date('m',$tstart),
-						'sday'   => date('d',$tstart),
-						'eyear'  => date('Y',$tstop),
-						'emonth' => date('m',$tstop),
-						'eday'   => date('d',$tstop)
-					)
-				);
-				$p->set_var('day_events',$this->display_week($start,True,$cellcolor,$display_name,$owners_array[$i]));
-				$p->parse('row','event',True);
-			}
-			$this->bo->so->owner = $original_owner;
-			$this->bo->printer_friendly = $true_printer_friendly;
-			return $p->fp('out','m_w_table');
-		}
-
-		function view_event($event,$alarms=False)
-		{
-			if((!$event['participants'][$this->bo->owner] && !$this->bo->check_perms(PHPGW_ACL_READ,$event)))
-			{
-				return False;
-			}
-
-			$p = &$GLOBALS['phpgw']->template;
-
-			$p->set_file(
-				Array(
-					'view'	=> 'view.tpl'
-				)
-			);
-			$p->set_block('view','view_event','view_event');
-			$p->set_block('view','list','list');
-			$p->set_block('view','hr','hr');
-
-			$vars = $this->bo->event2array($event);
-
-			$vars['title']['tr_color'] = $this->theme['th_bg'];
-
-			if (isset($vars['participants']['data']) && is_array($vars['participants']['data']))
-			{
-				foreach($vars['participants']['data'] as $user => $str)
-				{
-					if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts))
-					{
-						$vars['participants']['data'][$user] = $parts[1].' (<a href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)';
-					}
-				}
-				$vars['participants']['data'] = implode("<br>\n",$vars['participants']['data']);
-			}
-
-			foreach($vars as $var)
-			{
-				if (strlen($var['data']))
-				{
-					$this->output_template_array($p,'row','list',$var);
-				}
-			}
-
-			if($alarms && count($event['alarm']))
-			{
-				$p->set_var('th_bg',$this->theme['th_bg']);
-				$p->set_var('hr_text',lang('Alarms'));
-				$p->parse('row','hr',True);
-
-				foreach($event['alarm'] as $key => $alarm)
-				{
-					$icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">';
-					$var = Array(
-						'field'	=> $icon.$GLOBALS['phpgw']->common->show_date($alarm['time']),
-						'data'	=> lang('Email Notification for %1',$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner']))
-					);
-					$this->output_template_array($p,'row','list',$var);
-				}
-			}
-			return True;
-		}
-
-		function nm_on_off()
-		{
-			if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == $this->theme['row_on'])
-			{
-				return '_on';
-			}
-			return '_off';
-		}
-
-		function slot_num($time,$set_day_start=0,$set_day_end=0)
-		{
-			static $day_start, $day_end, $interval=0;
-
-			if ($set_day_start) $day_start = $set_day_start;
-			if ($set_day_end)   $day_end   = $set_day_end;
-			if (!$interval)     $interval  = 60*$this->bo->prefs['calendar']['interval'];
-
-			if ($time > $day_end)
-			{
-				$time = $day_end;
-			}
-			$slot = (int)(($time - $day_start) / $interval);
-
-			return $slot < 0 ? 0 : 1+$slot;
-		}
-
-		function print_day($params)
-		{
-			if(!is_array($params))
-			{
-				$this->index();
-			}
-
-			print_debug('in print_day()');
-
-			$this->bo->store_to_cache(
-				Array(
-					'syear'  => $params['year'],
-					'smonth' => $params['month'],
-					'sday'   => $params['day'],
-					'eyear'  => $params['year'],
-					'emonth' => $params['month'],
-					'eday'   => $params['day']
-				)
-			);
-
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_unknowns('keep');
-
-			$tpl = 'day_cal.tpl';
-			if((int)($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])==2 &&
-				$GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
-			{
-				$tpl = 'day_list.tpl';
-			}
-			$templates = Array(
-				'day_cal'   => $tpl
-			);
-
-			$p->set_file($templates);
-			$p->set_block('day_cal','day','day');
-			$p->set_block('day_cal','day_row','day_row');
-			$p->set_block('day_cal','day_event_on','day_event_on');
-			$p->set_block('day_cal','day_event_off','day_event_off');
-			$p->set_block('day_cal','day_event_holiday','day_event_holiday');
-			$p->set_block('day_cal','day_time','day_time');
-
-			$date_to_eval = sprintf("%04d%02d%02d",$params['year'],$params['month'],$params['day']);
-
-			$day_start = mktime((int)($this->bo->prefs['calendar']['workdaystarts']),0,0,$params['month'],$params['day'],$params['year']);
-			$day_end = mktime((int)($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']);
-			$daily = $this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
-			print_debug('Date to Eval',$date_to_eval);
-			$events_to_show = array();
-			if($daily[$date_to_eval]['appts'])
-			{
-				$events = $this->bo->cached_events[$date_to_eval];
-				print_debug('Date',$date_to_eval);
-				print_debug('Count',count($events));
-				foreach($events as $event)
-				{
-					if ($this->bo->rejected_no_show($event))
-					{
-						continue;	// user does not want to see rejected events
-					}
-					if ($event['recur_type'])	// calculate start- + end-datetime for recuring events
-					{
-						$this->bo->set_recur_date($event,$date_to_eval);
-					}
-					$events_to_show[] = array(
-						'starttime' => $this->bo->maketime($event['start']),
-						'endtime'   => $this->bo->maketime($event['end']),
-						'content'   => $this->link_to_entry($event,$params['month'],$params['day'],$params['year'])
-					);
-				}
-			}
-			//echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n";
-			$other = $GLOBALS['phpgw']->hooks->process(array(
-				'location'  => 'calendar_include_events',
-				'year'      => $params['year'],
-				'month'     => $params['month'],
-				'day'       => $params['day'],
-				'owner'     => $this->bo->owner	// num. id of the user, not necessary current user
-			));
-
-			if (is_array($other))
-			{
-				foreach($other as $evts)
-				{
-					if (is_array($evts))
-					{
-						$events_to_show = array_merge($events_to_show,$evts);
-					}
-				}
-				usort($events_to_show,create_function('$a,$b','return $a[\'starttime\']-$b[\'starttime\'];'));
-				//echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n";
-			}
-
-			if (count($events_to_show))
-			{
-				$last_slot_end = -1;
-				foreach($events_to_show as $event)
-				{
-					$slot = $this->slot_num($event['starttime'],$day_start,$day_end);
-					$slot_end = isset($event['endtime']) ? $this->slot_num($event['endtime']-1) : $slot;	// -1 to not occupy eg. the 18.00 slot for a 17-18h date
-
-					if ($slot <= $last_slot_end)
-					{
-						$slot = $last_slot;
-						$slot_end = max($last_slot_end,$slot_end);
-					}
-					$rows[$slot] .= $event['content'];
-
-					print_debug('slot',$slot);
-					print_debug('row',$rows[$slot]);
-
-					$row_span[$slot] = 1 + $slot_end - $slot;
-
-					$last_slot = $slot;
-					$last_slot_end = $slot_end;
-					print_debug('Time',$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['start']) - $GLOBALS['phpgw']->datetime->tz_offset).' - '.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['end']) - $GLOBALS['phpgw']->datetime->tz_offset));
-					print_debug('Slot',$slot);
-				}
-				//echo "rows=<pre>"; print_r($rows); echo "<br>row_span="; print_r($row_span); echo "</pre>\n";
-			}
-			$holiday_names = $daily[$date_to_eval]['holidays'];
-			if(!$holiday_names)
-			{
-				$row_to_print = $this->nm_on_off();
-			}
-			else
-			{
-				$row_to_print = '_holiday';
-				foreach($holiday_names as $name)
-				{
-					$rows[0] = '<center>'.$name.'</center>' . $rows[0];
-				}
-			}
-			$last_slot = $this->slot_num($day_end,$day_start,$day_end);
-			$rowspan = 0;
-			for ($slot = 0; $slot <= $last_slot; ++$slot)
-			{
-				$p->set_var('extras','');
-				if ($rowspan > 1)
-				{
-					$p->set_var('event','');
-					$rowspan--;
-				}
-				elseif (!isset($rows[$slot]))
-				{
-					if((int)($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])==2 &&
-						$GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
-					{
-						$p->set_var('event', '');
-					}
-					else
-					{
-						$p->set_var('event','&nbsp;');
-						$row_to_print = $this->nm_on_off();
-						$p->parse('event','day_event'.$row_to_print);
-					}
-				}
-				else
-				{
-					$rowspan = (int)$row_span[$slot];
-					if ($rowspan > 1)
-					{
-						$p->set_var('extras',' rowspan="'.$rowspan.'"');
-					}
-					$p->set_var('event',$rows[$slot]);
-					$row_to_print = $this->nm_on_off();
-					$p->parse('event','day_event'.$row_to_print);
-				}
-				$open_link = $close_link = '';
-				$time = '&nbsp;';
-
-				if (0 < $slot && $slot < $last_slot)	// normal time-slot not before or after day_start/end
-				{
-					$time = $day_start + ($slot-1) * 60 * $this->bo->prefs['calendar']['interval'];
-					$hour = date('H',$time);
-					$min  = date('i',$time);
-					$time = $GLOBALS['phpgw']->common->formattime($hour,$min);
-
-					if(!$this->bo->printer_friendly && $this->bo->check_perms(PHPGW_ACL_ADD))
-					{
-						$open_link = ' <a href="'.$this->page('add',"&date=$date_to_eval&hour=$hour&minute=$min").'">';
-						$close_link = '</a> ';
-					}
-				}
-				$p->set_var(Array(
-					'open_link'  => $open_link,
-					'time'       => $time,
-					'close_link' => $close_link,
-					'tr_color'   => ''	// dummy to stop output_template_array to set it
-				));
-				$p->parse('time','day_time');
-
-				$p->parse('row','day_row',True);
-			}
-			return $p->fp('out','day');
-		}	// end function
-
-		function timematrix($param)
-		{
-			if(!is_array($param))
-			{
-				$this->index();
-			}
-
-			$date = $param['date'];
-			$starttime = $param['starttime'];
-			$endtime = $param['endtime'];
-			$participants = $param['participants'];
-			foreach($participants as $part => $nul)
-			{
-				$participants[$part] = $GLOBALS['phpgw']->common->grab_owner_name($part);
-				// Much better for processor  :)
-				$participants_id[]  = $part;
-			}
-			uasort($participants,'strnatcasecmp');	// sort them after their fullname
-
-			$increment = $this->bo->prefs['calendar']['interval'];
-			$interval = (int)(60 / $increment);
-			$colspan  = $this->bo->prefs['calendar']['workdayends'] - $this->bo->prefs['calendar']['workdaystarts'];
-
-			$pix = $GLOBALS['phpgw']->common->image('calendar','pix');
-
-			/* Make link */
-			if( get_var("sevendays", array("GET", "POST") ) )
-				$sevendays = "&sevendays=yes";
-
-			$_f_date = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0, $date["month"], ( $date["day"] - 1 ),$date["year"]);
-			$url_prevday = $GLOBALS['phpgw']->link('/index.php',
-								"menuaction=calendar.uicalendar.viewmatrix"
-							.	"&matrix=1"
-							.	"&year="  . $_f_date["year"]
-							.	"&month=" . $_f_date["month"]
-							.	"&day="   . $_f_date["day"]
-							.	"&matrixtype=" . get_var("matrixtype", array("POST", "GET"))
-							.	$sevendays
-							);
-			$_f_date = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0, $date["month"], ( $date["day"] + 1 ),$date["year"]);
-			$url_nextday = $GLOBALS['phpgw']->link('/index.php',
-								"menuaction=calendar.uicalendar.viewmatrix"
-							.	"&matrix=1"
-							.	"&year="  . $_f_date["year"]
-							.	"&month=" . $_f_date["month"]
-							.	"&day="   . $_f_date["day"]
-							.	"&matrixtype=" . get_var("matrixtype", array("POST", "GET"))
-							.	$sevendays
-							);
-			$str = 		'<table border="0" align="center" width="90%">'
-					. 	'<tr>'
-					.	'	<td align="left"><a href="' . $url_prevday . '"><< ' . lang('previous day') . '</a></td>'
-					.	'	<td align="center">' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l')) 
-												 . ', '.$this->bo->long_date($date)
-					.	'	</td>'
-					.	'	<td align="right"><a href="' . $url_nextday . '">' . lang('next day') . ' >></a></td>'
-					.	'</tr>'
-					.	'</table>'
-					. 	'<table width="90%" align="center" border="0" cellspacing="0" cellpadding="0" cols="'.((24 * $interval) + 1).'">'
-					. 	'<tr><td colspan="'. (($colspan * $interval) + 1) .'"><hr noshade></td></tr>'
-					. 	'<tr><td bgcolor="' . $this->theme['bg02'] . '">'
-					. 	'<font color="'.$this->theme['bg_text'].'" face="'.$this->theme['font'].'" size="-2">'
-					. 		lang('Participant').'</font>'
-					.	'</td>';
-
-			// Destroy old variable
-			unset($_f_date);
-			unset($url_parts);
-			unset($url_prevday);
-			unset($url_nextday);
-
-
-			// Show TimeMatrix
-			for( $i=$this->bo->prefs['calendar']['workdaystarts'];
-				 $i<$this->bo->prefs['calendar']['workdayends'];
-				 $i++ )
-			{
-				for($j=0;$j<$interval;$j++)
-				{
-					$k = ($j == 0 ? sprintf('%02d',$i).'<br>':'').sprintf('%02d',$j*$increment);
-
-					$str .= '<td align="left" bgcolor="'.$this->theme['bg02'].'"><font color="'.$phpgw_info['theme']['bg_text'].'" face="'.$this->theme['font'].'" size="-2">'
-						. '<a href="'.$this->page('add','&date='.$date['full'].'&hour='.$i.'&minute='.($increment * $j))."&matrix=1\" onMouseOver=\"window.status='".$i.':'.(($increment * $j)<=9?'0':'').($increment * $j)."'; return true;\">"
-						. $k."</a>&nbsp;</font></td>\n";
-				}
-			}
-			$str .= '</tr>'
-				. '<tr><td colspan="'.(($colspan * $interval) + 1).'"><hr noshade></td></tr>';
-			if(!$endtime)
-			{
-				$endtime = $starttime;
-			}
-			$owner = $this->bo->owner;
-			foreach($participants as $part => $fullname)
-			{
-				$str .= '<tr align="center">'
-					. '<td width="15%" align="left" bgcolor="'.$this->theme['th_bg'].'"><font color="'.$this->theme['bg_text'].'" face="'.$this->theme['font'].'" size="-2">'.$fullname.'</font></td>';
-
-				$this->bo->cached_events = Array();
-				$this->bo->so->owner = $part;
-				$this->bo->so->open_box($part);
-				$this->bo->store_to_cache(
-					Array(
-						'syear'	=> $date['year'],
-						'smonth'=> $date['month'],
-						'sday'	=> $date['day'],
-						'eyear'	=> 0,
-						'emonth'=> 0,
-						'eday'	=> $date['day'] + 1
-					)
-				);
-
-				if(!$this->bo->cached_events[$date['full']])
-				{
-					for( $j=$this->bo->prefs['calendar']['workdaystarts'];
-						 $j<$this->bo->prefs['calendar']['workdayends'];
-						 $j++ )
-					{
-						for($k=0;$k<$interval;$k++)
-						{
-							$str .= '<td height="1" align="left" bgcolor="'.$this->theme['bg_color'].'" color="#999999">&nbsp;</td>';
-						}
-						$str .= "\n";
-					}
-				}
-				else
-				{
-					$time_slice = $this->bo->prepare_matrix($interval,$increment,$part,$date['full']);
-					for( $h=$this->bo->prefs['calendar']['workdaystarts'];
-						 $h<$this->bo->prefs['calendar']['workdayends'];
-						 $h++ )
-					{
-						$hour = $h * 10000;
-						for($m=0;$m<$interval;$m++)
-						{
-							$index = ($hour + (($m * $increment) * 100));
-							switch($time_slice[$index]['marker'])
-							{
-								case '&nbsp':
-									$time_slice[$index]['color'] = $this->theme['bg_color'];
-									$extra = '';
-									break;
-								case '-':
-									$time_slice[$index]['color'] = $this->theme['bg01'];
-									$link = $this->page('view','&cal_id='.$time_slice[$index]['id'].'&date='.$date['full']);
-									$extra =' title="'.$time_slice[$index]['description'].'" onClick="location.href=\''.$link.'\';" style="cursor:pointer; cursor:hand;"';
-									break;
-							}
-							$str .= '<td bgcolor="'.$time_slice[$index]['color'].'" color="#999999"'.$extra.'><font color="'.$this->theme['bg_text'].'" face="'.$this->theme['font'].'" size="-2">'.$time_slice[$index]['marker'].'</font></td>';
-						}
-						$str .= "\n";
-					}
-				}
-				$str .= '</tr>'
-					. '<tr><td colspan="'.(($colspan * $interval) + 1).'"><hr noshade></td></tr>';
-			}
-			$this->bo->owner = $owner;
-			$this->bo->so->owner = $owner;
-			$this->bo->so->open_box($owner);
-			return $str.'</table></center>'."\n";
-		}
-
-		function get_response($cal_id)
-		{
-			$p = &$GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-  					'form_button'	=> 'form_button_script.tpl'
-				)
-			);
-
-			$ev = $this->bo->get_cached_event();
-			$response_choices = Array(
-				ACCEPTED	=> lang('Accept'),
-				REJECTED	=> lang('Reject'),
-				TENTATIVE	=> lang('Tentative'),
-				NO_RESPONSE	=> lang('No Response')
-			);
-			$str = '';
-			while(list($param,$text) = each($response_choices))
-			{
-				$var = Array(
-					'action_url_button'	=> $this->page('set_action','&cal_id='.$cal_id.'&action='.$param),
-					'action_text_button'	=> '  '.$text.'  ',
-					'action_confirm_button'	=> '',
-					'action_extra_field'	=> ''
-				);
-				$p->set_var($var);
-				$str .= '<td>'.$p->fp('out','form_button').'</td>'."\n";
-			}
-			if ($this->bo->return_to)
-			{
-				$var = Array(
-					'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to),
-					'action_text_button'	=> lang('cancel'),
-					'action_confirm_button'	=> '',
-					'action_extra_field'	=> ''
-				);
-				$p->set_var($var);
-				$str .= '<td>'.$p->fp('out','form_button').'</td>'."\n";
-			}
-			$str = '<td><b>'.$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner).":</b></td>\n".$str;
-
-			return '<table width="100%"><tr align="center">'."\n".$str.'</tr></table>'."\n";
-		}
-
-		function edit_form($param)
-		{
-			if(!is_array($param))
-			{
-				$this->index();
-			}
-
-			if(isset($param['event']))
-			{
-				$event = $param['event'];
-			}
-
-			$hourformat = substr($this->bo->users_timeformat,0,1);
-
-			// $sb = CreateObject('phpgwapi.sbox');
-			$sb = CreateObject('phpgwapi.sbox2');
-
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $event['id'] ? lang('Calendar - Edit') : lang('Calendar - Add');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$ownerApps = $GLOBALS['phpgw']->acl->get_user_applications($event['owner']);
-
-			$p = &$GLOBALS['phpgw']->template;
-			$p->set_file(
-				Array(
-					'edit'          => 'edit.tpl',
-					'form_button'   => 'form_button_script.tpl'
-				)
-			);
-			$p->set_block('edit','edit_entry','edit_entry');
-			$p->set_block('edit','list','list');
-			$p->set_block('edit','hr','hr');
-
-			$vars = Array(
-				'font'			=> $this->theme['font'],
-				'bg_color'		=> $this->theme['bg_text'],
-				'action_url'		=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.bocalendar.update')),
-				'common_hidden'	=> $this->html->input_hidden('cal[id]',$event['id'])
-					. $this->html->input_hidden('cal[owner]',$event['owner'])
-					. $this->html->input_hidden('cal[uid]',$event['uid'])
-					. ($_GET['cal_id'] && $event['id'] == 0?$this->html->input_hidden(array(
-						'cal[reference]' => $_GET['cal_id'],
-						'cal[new_exception]' => $event['start']['raw'])) : 
-					(@isset($event['reference'])?$this->html->input_hidden('cal[reference]',$event['reference']):''))
-					. (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']?
-					$this->html->input_hidden('participants[]',$this->bo->owner):''),
-				'errormsg'		=> ($param['cd']?$GLOBALS['phpgw']->common->check_code($param['cd']):'')
-			);
-			$p->set_var($vars);
-
-// Brief Description
-			$var['title'] = Array(
-				'tr_color' => $this->theme['th_bg'],
-				'field'	=> lang('Title'),
-				'data'	=> '<input name="cal[title]" size="45" maxlength="80" value="'.$event['title'].'">'
-			);
-
-// Full Description
-			$var['description'] = Array(
-				'field'	=> lang('Full Description'),
-				'data'	=> '<textarea name="cal[description]" rows="5" cols="40" wrap="virtual" maxlength="2048">'.$event['description'].'</textarea>'
-			);
-
-// Display Categories
-			if(strpos($event['category'],','))
-			{
-				$temp_cats = explode(',',$event['category']);
-				@reset($temp_cats);
-				while(list($key,$value) = each($temp_cats))
-				{
-					$check_cats[] = (int)$value;
-				}
-			}
-			elseif($event['category'])
-			{
-				$check_cats[] = (int)$event['category'];
-			}
-			else
-			{
-				$check_cats[] = 0;
-			}
-			$var['category'] = Array(
-				'field'	=> lang('Category'),
-				'data'	=> '<select name="categories[]" multiple size="5">'.$this->cat->formated_list('select','all',$check_cats,True).'</select>'
-			);
-
-// Location
-			$var['location'] = Array(
-				'field'	=> lang('Location'),
-				'data'	=> '<input name="cal[location]" size="45" maxlength="255" value="'.$event['location'].'">'
-			);
-
-// Project
-			if($ownerApps['projects'])
-			{
-				$boprojects = createObject('projects.boprojects');
-				$projects = $boprojects->list_projects( array('limit'=>FALSE) );
-				$projectOptions = $boprojects->select_project_list
-				(
-					array
-					(
-						'action'	=> 'all',
-						'status'	=> 'active',
-						'selected'	=> $event['projectID']
-					)
-				);
-				if(is_array($projects))
-				{
-					$projectData = '<select name="cal[project]">';
-					if(!isset($event['projectID']))
-						$projectData .= '<option value="no_project" selected="selected"></option>';
-					else
-						$projectData .= '<option value="no_project"></option>';
-
-					$projectData .= $projectOptions;
-					$projectData .= '</select>';
-				}
-				$var['project'] = Array(
-					'field'	=> lang('Project'),
-					'data'	=> $projectData
-				);
-			}
-
-// Date
-
-			$start = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$var['startdate'] = Array(
-				'field'	=> lang('Start Date'),
-				'data' => $this->jscal->input('start[str]',$start)
-			);
-
-// Time
-			if ($this->bo->prefs['common']['timeformat'] == '12')
-			{
-				$str .= '<input type="radio" name="start[ampm]" value="am"'.($event['start']['hour'] >= 12?'':' checked').'>am'."\n"
-					. '<input type="radio" name="start[ampm]" value="pm"'.($event['start']['hour'] >= 12?' checked':'').'>pm'."\n";
-			}
-			$var['starttime'] = Array(
-				'field'	=> lang('Start Time'),
-				'data'	=> '<input name="start[hour]" size="2" VALUE="'.$GLOBALS['phpgw']->common->show_date($start,$hourformat).'" maxlength="2">:<input name="start[min]" size="2" value="'.$GLOBALS['phpgw']->common->show_date($start,'i').'" maxlength="2">'."\n".$str
-			);
-
-// End Date
-			$end = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
-			$var['enddate'] = Array(
-				'field'	=> lang('End Date'),
-				'data' => $this->jscal->input('end[str]',$end)
-			);
-
-// End Time
-			if ($this->bo->prefs['common']['timeformat'] == '12')
-			{
-				$str = '<input type="radio" name="end[ampm]" value="am"'.($event['end']['hour'] >= 12?'':' checked').'>am'."\n"
-					. '<input type="radio" name="end[ampm]" value="pm"'.($event['end']['hour'] >= 12?' checked':'').'>pm'."\n";
-			}
-			$var['endtime'] = Array(
-				'field'	=> lang('End Time'),
-				'data'	=> '<input name="end[hour]" size="2" VALUE="'.$GLOBALS['phpgw']->common->show_date($end,$hourformat).'" maxlength="2">:<input name="end[min]" size="2" value="'.$GLOBALS['phpgw']->common->show_date($end,'i').'" maxlength="2">'."\n".$str
-			);
-
-// Priority
-			$var['priority'] = Array(
-				'field'	=> lang('Priority'),
-				'data'	=> $sb->getPriority('cal[priority]',$event['priority'])
-			);
-
-// Access
-			$var['access'] = Array(
-				'field'	=> lang('Private'),
-				'data'	=> '<input type="checkbox" name="cal[private]" value="private"'.(!$event['public']?' checked':'').'>'
-			);
-
-// Participants
-			if(!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access'])
-			{
-				if (!is_object($GLOBALS['phpgw']->uiaccountsel))
-				{
-					$GLOBALS['phpgw']->uiaccountsel = CreateObject('phpgwapi.uiaccountsel');
-				}
-				$get_args = array('menuaction'=>'calendar.uiforms.freetimesearch');
-				if ($event['id']) $get_args['cal_id'] = $event['id'];
-				$fts_link = $GLOBALS['phpgw']->link('/index.php',$get_args);
-
-				$fields = array('start[str]','start[hour]','start[min]','end[str]','end[hour]','end[min]','cal[recur_type]');
-				if ($this->bo->prefs['common']['timeformat'] == '12')
-				{
-					$fields[] = 'start[ampm]';
-					$fields[] = 'end[ampm]';
-				}
-				$var['participants'] = array(
-					'field'	=> lang('Participants'),
-					'data'	=> "\n   ".$GLOBALS['phpgw']->uiaccountsel->selection('participants[]','uicalendar_select_participants',$event['participants'],'calendar+',7,$event['owner']).'
-<script>
-	function call_freetimesearch(link,form) {
-		fields = Array("'.implode('","',$fields).'");
-		for (i=0; i < fields.length; ++i) {
-			link += "&"+fields[i]+"="+form[fields[i]].value;
-		}
-		participants = "";
-		for(n=0; n < form.length; ++n) {
-			with(form.elements[n]) {
-				if (name == "participants[]") {
-					if (form.elements[n].options) {
-						for(i=0; i < options.length; ++i) {
-							if (options[i].selected) participants += ":"+options[i].value;
-						}
-					} else if (checked) {
-						participants += ":"+value;
-					}
-				}
-			}
-		}
-		link += "&participants="+participants.slice(1);
-		window.open(link,"ft_search","width=700,height=500,scrollbars=yes,resizable=yes,status=yes");
-	}
-</script>
-						'.$this->html->submit_button('freetimesearch',/*lang(*/'freetime search'/*)*/,"call_freetimesearch('".$fts_link."',this.form); return false;",0,' title="'.$this->html->htmlspecialchars(lang('Find free timeslots where the marked participants are availible for the given timespan')).'"')
-				);
-/*
-// External Participants
-
-				// FIXME: where does the list of external participants come from?
-				//
-				$id = '1_h';
-				$test_contact[$id] = array();
-				$test_contact[$id]['name'] = "Stephan Cremer";
-				$id = '3_b';
-				$test_contact[$id] = array();
-				$test_contact[$id]['name'] = "Stephan_Uni Cremer_Uni";
-
-				$part = "";
-				$ext_disp = '<textarea name="external_participants" rows="5" cols="40" readonly="readonly">'."\n";
-				while(list($id,$contact) = each($test_contact)) {
-				  $part .= $part!= '' ? ',' : '';
-				  $part .= $id;
-				  $ext_disp .= '(FIXME: b_OR_h)'.$contact['name']."\n";
-				}
-				$ext_disp .= '</textarea>'."\n".'<br>';
-
-				$url = $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'calendar.uiextpartlist.modify'));
-				// $url = $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'calendar.uicalendar.modify_ext_partlist'));
-				$mod_ext = '<script language="JavaScript">'."\n"
-							. 'function modify_window(url) {'."\n"
-							. '   document.addform.ext_part_id.value="";'."\n"
-							. '   awin = window.open(url,"modify","width=500,height=400,toolbar=no,resizable=yes");'."\n"
-// DEBUG START
-. '}'."\n".'function show() {'."\n"
-. '   alert("Participants: " + document.addform.ext_part_id.value);'."\n"
-// DEBUG END
-							. '}'."\n</script>\n".$ext_disp."\n"
-// DEBUG START
-. '<input type="button" value="Status" onClick="javascript:show()">'."\n"
-// DEBUG END
-							. '<input type="button" onClick="javascript:modify_window(\$url.'&part='.$part
-							. '\')" value="'.lang('Modify List of External Participants').'">'."\n"
-							. $this->html->input_hidden('ext_part_id" value="'.$part.'">'."\n";
-
-				$var[] = Array(
-					'field'	=> "\n".lang('External Participants'),
-					'data'	=> "\n".$mod_ext."\n"
-				);
-*/
-// I Participate
-				if((($event['id'] > 0) && isset($event['participants'][$event['owner']])) || !$event['id'])
-				{
-					$checked = ' checked';
-				}
-				else
-				{
-					$checked = '';
-				}
-				$var['owner'] = Array(
-					'field'	=> $GLOBALS['phpgw']->common->grab_owner_name($event['owner']).' '.lang('Participates'),
-					'data'	=> '<input type="checkbox" name="participants[]" value="'.$event['owner'].$event['participants'][$event['owner']].'"'.$checked.'>'
-				);
-			}
-
-// Reminder
-			// The user must use "Alarm Management" to change/modify an alarm
-			// so only display the email reminder fields if this is a new event
-			// i.e. not editing an existing event
-
-			if ($event['id'] == 0) {
-				// get defaults
-				$days = $this->bo->prefs['calendar']['default_email_days'];
-				$hours = $this->bo->prefs['calendar']['default_email_hours'];
-				$min = $this->bo->prefs['calendar']['default_email_min'];
-				if (count($event['alarm']) > 1)
-				{
-					// this should not happen because when creating a new event
-					// only 1 alarm is displayed on the screen
-					// if the user wants more than 1 alarm they should
-					// use "Alarm Management"
-					echo '<!-- how did this happen, too many alarms -->'."\n";
-				}
-				// if there was an error pick up what the user entered
-				if (@isset($event['alarm']))
-				{
-					@reset($event['alarm']);
-					// just get the first one see above!!!
-					list($key,$alarm) = @each($event['alarm']);
-					$diff  = $start - $alarm['time'];
-					$days  = (int)($diff / (24*3600));
-					$hours = (int)(($diff - ($days * 24 * 3600))/3600);
-					$min   = (int)(($diff - ($days * 24 * 3600) - ($hours * 3600))/60);
-				}
-
-				// days
-				$dout = '<select name="cal[alarmdays]">'."\n";
-				for($i=0;$i<32;$i++)
-				{
-					$dout .= '<option value="'.$i.'"'.($i==$days?' selected':'').'>'.$i.'</option>'."\n";
-				}
-				$dout .= '</select>'."\n".' '.lang('days').' ';
-				// hours
-				$hout = '<select name="cal[alarmhours]">'."\n";
-				for($i=0;$i<25;$i++)
-				{
-					$hout .= '<option value="'.$i.'"'.($i==$hours?' selected':'').'>'.$i.'</option>'."\n";
-				}
-				$hout .= '</select>'."\n".' '.lang('hours').' ';
-				// minutes
-				$mout = '<select name="cal[alarmminutes]">'."\n";
-				for($i=0;$i<61;$i++)
-				{
-					$mout .= '<option value="'.$i.'"'.($i==$min?' selected':'').'>'.$i.'</option>'."\n";
-				}
-				$mout .= '</select>'."\n".' '.lang('minutes').' ';
-
-				$var['alarm'] = Array(
-					'field' => lang('Alarm'),
-					'data'	=> $dout.$hout.$mout.lang('before the event')
-				);
-
-			}
-
-// Repeat Type
-			$str = '';
-			foreach($this->bo->rpt_type as $type => $label)
-			{
-				$str .= '<option value="'.$type.'"'.($event['recur_type']==$type?' selected':'').'>'.lang($label).'</option>';
-			}
-			$var['recur_type'] = Array(
-				'field'	=> lang('Repeat Type'),
-				'data'	=> '<select name="cal[recur_type]">'."\n".$str.'</select>'."\n"
-			);
-
-			if($event['recur_enddate']['year'] != 0 && $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0)
-			{
-				$checked = ' checked';
-				$recur_end = $this->bo->maketime($event['recur_enddate']) - $GLOBALS['phpgw']->datetime->tz_offset;
-			}
-			else
-			{
-				$checked = '';
-				$recur_end = $this->bo->maketime($event['start']) + 86400 - $GLOBALS['phpgw']->datetime->tz_offset;
-			}
-
-			$var['recur_enddate'] = Array(
-				'field'	=> lang('Repeat End Date'),
-				'data'	=> '<input type="checkbox" name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').'  '.
-/*
-					$GLOBALS['phpgw']->common->dateformatorder(
-						$sb->getYears('recur_enddate[year]',(int)$GLOBALS['phpgw']->common->show_date($recur_end,'Y')),
-						$sb->getMonthText('recur_enddate[month]',(int)$GLOBALS['phpgw']->common->show_date($recur_end,'n')),
-						$sb->getDays('recur_enddate[mday]',(int)$GLOBALS['phpgw']->common->show_date($recur_end,'d'))
-					)
-*/
-					$this->jscal->input('recur_enddate[str]',$recur_end)
-			);
-
-			$i = 0; $boxes = '';
-			foreach ($this->bo->rpt_day as $mask => $name)
-			{
-				$boxes .= '<input type="checkbox" name="cal[rpt_day][]" value="'.$mask.'"'.($event['recur_data'] & $mask ? ' checked' : '').'>&nbsp;'.lang($name)."\n";
-				if (++$i == 5) $boxes .= '<br>';
-			}
-			$var['recur_day'] = Array(
-				'field'	=> lang('Repeat Day').'<br>'.lang('(for weekly)'),
-				'data'	=> $boxes
-			);
-
-			$var['recur_interval'] = Array(
-				'field'	=> lang('Interval'),
-				'data'	=> '<input name="cal[recur_interval]" size="4" maxlength="4" value="'.$event['recur_interval'].'">'
-			);
-
-			if (!isset($this->fields))
-			{
-				$this->custom_fields = CreateObject('calendar.bocustom_fields');
-				$this->fields = &$this->custom_fields->fields;
-				$this->stock_fields = &$this->custom_fields->stock_fields;
-			}
-			$ownerApps = $GLOBALS['phpgw']->acl->get_user_applications($event['owner']);
-			if($ownerApps['projects'])
-			{
-				// enable project app
-				$this->fields['project']['disabled'] = false;
-			}
-			$preserved = False;
-			foreach($this->fields as $field => $data)
-			{
-				if (!$data['disabled'])
-				{
-					if (isset($var[$field]))
-					{
-						switch($field)
-						{
-							case 'startdate':
-								$this->output_template_array($p,'row','list',$var['startdate']);
-								$this->output_template_array($p,'row','list',$var['starttime']);
-								break;
-							case 'enddate':
-								$this->output_template_array($p,'row','list',$var['enddate']);
-								$this->output_template_array($p,'row','list',$var['endtime']);
-								break;
-							case 'recur_type':
-								$p->set_var('tr_color',$this->theme['th_bg']);
-								$p->set_var('hr_text','<center><b>'.lang('Repeating Event Information').'</b></center>');
-								$p->parse('row','hr',True);
-								$this->output_template_array($p,'row','list',$var['recur_type']);
-								$this->output_template_array($p,'row','list',$var['recur_enddate']);
-								$this->output_template_array($p,'row','list',$var['recur_day']);
-								$this->output_template_array($p,'row','list',$var['recur_interval']);
-								break;
-							default:
-								$this->output_template_array($p,'row','list',$var[$field]);
-						}
-					}
-					elseif (!isset($this->stock_fields[$field]))	// Custom field
-					{
-						$lang = lang($name = substr($field,1));
-						$size = 'SIZE='.($data['shown'] ? $data['shown'] : ($data['length'] ? $data['length'] : 30)).
-							' MAXLENGTH='.($data['length'] ? $data['length'] : 255);
-						$v = array(
-							'field'	=> $lang == $name.'*' ? $name : $lang,
-							'data'	=> '<input name="cal['.htmlspecialchars($field).']" '.$size.' value="'.$event['#'.$name].'">'
-						);
-						if ($data['title'])
-						{
-							$v['tr_color'] = $this->theme['th_bg'];
-						}
-						if (!$data['length'] && $data['title'])
-						{
-							$p->set_var('tr_color',$this->theme['th_bg']);
-							$p->set_var('hr_text','<center><b>'.$v['field'].'</b></center>');
-							$p->parse('row','hr',True);
-						}
-						else
-						{
-							$this->output_template_array($p,'row','list',$v);
-						}
-					}
-				}
-				else	// preserve disabled fields
-				{
-					switch ($field)
-					{
-						case 'owner':
-							$preserved[$field] = $event['id'] ? $event['participants'][$event['owner']] : 'A';
-							break;
-						case 'recur_type':
-							foreach(array('recur_type','recur_enddate','recur_data','recur_interval') as $field)
-							{
-								$preserved[$field] = $event[$field];
-							}
-							break;
-						case 'startdate':
-						case 'enddate':
-							$field = substr($field,0,-4);
-						default:
-							$preserved[$field] = $event[$field];
-					}
-				}
-			}
-			unset($var);
-			if (is_array($preserved))
-			{
-				//echo "preserving<pre>"; print_r($preserved); echo "</pre>\n";
-				$p->set_var('common_hidden',$p->get_var('common_hidden').$this->html->input_hidden('preserved',serialize($preserved)));
-			}
-			$p->set_var('submit_button',lang('Save'));
-
-			$delete_button = $cancel_button = '';
-			if ($event['id'] > 0)
-			{
-				$var = Array(
-					'action_url_button'	=> $this->page('delete','&cal_id='.$event['id']),
-					'action_text_button'	=> lang('Delete'),
-					'action_confirm_button'	=> "onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.")."')\"",
-					'action_extra_field'	=> ''
-				);
-				$p->set_var($var);
-				$delete_button = $p->fp('out','form_button');
-			}
-			$p->set_var('delete_button',$delete_button);
-
-			if ($this->bo->return_to)
-			{
-				$var = Array(
-					'action_url_button'	=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to),
-					'action_text_button'	=> lang('Cancel'),
-					'action_confirm_button'	=> '',
-					'action_extra_field'	=> ''
-				);
-				$p->set_var($var);
-				$cancel_button = $p->fp('out','form_button');
-			}
-			$p->set_var('cancel_button',$cancel_button);
-			$p->pparse('out','edit_entry');
-		}
-
-		// modify list of an event's external participants (i.e. non pgpgw users)
-		//
-		function modify_ext_partlist()
-		{
-			$GLOBALS['phpgw_info']['flags']['noheader'] = True;
-			$GLOBALS['phpgw_info']['flags']['nonavbar'] = True;
-			$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-
-			$total_contacts = 0;
-			$participant = array();
-			$control_data= array();
-
-			$control_data['action'] = '';
-			$control_data['delete'] = array();
-			$control_data['part'] = array();
-
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_file(
-				Array(
-					'T_edit_partlist' => 'edit_partlist.tpl',
-					'T_edit_partlist_blocks' => 'edit_partlist_blocks.tpl'
-				)
-			);
-
-			$p->set_block('T_edit_partlist_blocks','B_alert_msg','V_alert_msg');
-			$p->set_block('T_edit_partlist_blocks','B_partlist','V_partlist');
-			$p->set_block('T_edit_partlist_blocks','B_participants_none','V_participants_none');
-			$p->set_block('T_edit_partlist_blocks','B_delete_btn','V_delete_btn');
-
-			global $query_addr;
-			$sb = CreateObject('phpgwapi.sbox2');
-			$addy = $sb->getAddress('addr','',$query_addr);
-
-			$add_ext  = $addy['doSearchFkt'];
-			$add_ext .= $addy['addr_title']!=lang('Address Book')?$addy['addr_title']:'';
-			$add_ext .= "&nbsp;".$addy['addr'].$addy['addr_nojs'];
-
-			$p->set_var('text_add_name',$add_ext);
-
-			if(isset($_GET['part']) && $_GET['part'])
-			{
-				$control_data['part'] = split(",", $_GET['part']);
-			}
-			else
-			{
-				$control_data['part'] = $_POST['participant'];
-				$control_data['action'] = $_POST['action'];
-				$control_data['delete'] = $_POST['delete'];
-			}
-
-			for ($i=0; $i<count($control_data['part']); $i++)
-			{
-				$id = $control_data['part'][$i];
-				list($contact) = $this->read_contact($id);
-
-				$participant[$id] = array();
-				$participant[$id]['name'] = $contact['n_given'].' '.$contact['n_family'];
-			}
-
-			if ($control_data['action'] == lang('Delete selected contacts'))
-			{
-				for ($i=0; $i<count($control_data['delete']); $i++)
-				{
-					$id = $control_data['delete'][$i];
-					unset($participant[$id]);
-				}
-			}
-
-			if ($control_data['action'] == lang('Add Contact'))
-			{
-				$id = $_POST['id_addr'];
-				if (isset($id) && (int)$id != 0)
-				{
-					list($contact) = $this->read_contact($id);
-					$participant[$id] = array();
-					$participant[$id]['name'] = $contact['n_given'].' '.$contact['n_family'];
-				}
-			}
-
-			// create list of currently selected contacts
-			//
-			while(list($id,$contact) = each($participant))
-			{
-				$p->set_var('hidden_delete_name','participant[]');
-				$p->set_var('hidden_delete_value',$id);
-				$p->set_var('ckbox_delete_name','delete[]');
-				$p->set_var('ckbox_delete_value',$id);
-				$p->set_var('ckbox_delete_participant',$contact['name']);
-				$p->parse('V_partlist','B_partlist',True);
-				$total_contacts++;
-			}
-
-			if ($total_contacts == 0)
-			{
-				// no contacts have been selected
-				// => clear the delete form, remove delete button and show the none block
-				//
-				$p->set_var('V_partlist','');
-				$p->set_var('V_delete_btn','');
-				$p->set_var('text_none',lang('None'));
-				$p->parse('V_participants_none','B_participants_none');
-			}
-			else
-			{
-				// at least one contact has been selected
-				// => clear the none block, fill the delete form and add delete button
-				//
-				$p->set_var('V_participants_none','');
-				$p->set_var('btn_delete_name','action');
-				$p->set_var('btn_delete_value',lang('Delete selected contacts'));
-				$p->parse('V_delete_btn','B_delete_btn');
-			}
-
-			$body_tags  = 'bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_color']
-							. '" alink="'.$GLOBALS['phpgw_info']['theme']['alink']
-							. '" link="'.$GLOBALS['phpgw_info']['theme']['link']
-							.'" vlink="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
-
-			$form_action = $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'calendar.uicalendar.modify'));
-
-			$charset = lang('charset');
-			$p->set_var('charset',$charset);
-			$p->set_var('page_title',$GLOBALS['phpgw_flags']['currentapp']
-				. ' - ' .lang('External Participants'));
-			$p->set_var('font_family',$GLOBALS['phpgw_info']['theme']['font']);
-			$p->set_var('body_tags',$body_tags);
-			$p->set_var('form_method','POST');
-			$p->set_var('form_action',$form_action);
-			$p->set_var('text_add_contact',lang('External Participants'));
-			$p->set_var('text_contacts_selected',lang('Selected contacts (%1)',$total_contacts));
-			$p->set_var('btn_add_name','action');
-			$p->set_var('btn_add_value',lang('Add Contact'));
-			$p->set_var('btn_done_name','done');
-			$p->set_var('btn_done_value',lang('Done'));
-			$p->set_var('btn_done_js','copyback()');
-			$p->set_var('form1_name','ext_form');
-
-			$p->pfp('out','T_edit_partlist');
-		}
-
-		function read_contact($id)
-		{
-			$query_fields = Array(
-				'n_given' => 'n_given',
-				'n_family' => 'n_family',
-				'email' => 'email',
-				'email_home' => 'email_home'
-			);
-
-			/*
-			if ($this->rights & PHPGW_ACL_READ)
-			{
-				return $this->contacts->read_single_entry($id,$fields);
-			}
-			else
-			{
-				$rtrn = array(0 => array('No access' => 'No access'));
-				return $rtrn;
-			}
-			*/
-
-			$contacts = CreateObject('phpgwapi.contacts', False);
-			return $contacts->read_single_entry($id,$query_fields);
-		}
-
-		function build_part_list(&$users,$accounts,$owner)
-		{
-			if(!is_array($accounts))
-			{
-				return;
-			}
-			foreach($accounts as $id)
-			{
-				$id = (int)$id;
-				if($id == $owner)
-				{
-					continue;
-				}
-				elseif(!isset($users[$id]))
-				{
-					if($GLOBALS['phpgw']->accounts->exists($id) == True)
-					{
-						$users[$id] = Array(
-							'name'	=> $GLOBALS['phpgw']->common->grab_owner_name($id),
-							'type'	=> $GLOBALS['phpgw']->accounts->get_type($id)
-						);
-					}
-					if($GLOBALS['phpgw']->accounts->get_type($id) == 'g')
-					{
-						$this->build_part_list($users,$GLOBALS['phpgw']->acl->get_ids_for_location($id,1,'phpgw_group'),$owner);
-					}
-				}
-			}
-			if (!function_exists('strcmp_name'))
-			{
-				function strcmp_name($arr1,$arr2)
-				{
-					if ($diff = strcmp($arr1['type'],$arr2['type']))
-					{
-						return $diff;	// groups before users
-					}
-					return strnatcasecmp($arr1['name'],$arr2['name']);
-				}
-			}
-			uasort($users,'strcmp_name');
-		}
-
-		function set_week_array($startdate,$cellcolor,$weekly)
-		{
-			for ($j=0,$datetime=$startdate;$j<7;$j++,$datetime += 86400)
-			{
-				$date = date('Ymd',$datetime + (60 * 60 * 2)); // +2h to be save when switching to and from dst, $datetime is alreay + TZ-Offset
-				print_debug('set_week_array : Date ',$date);
-
-				if($events = $this->bo->cached_events[$date])
-				{
-					print_debug('Date',$date);
-					print_debug('Appointments Found',count($events));
-
-					if (!$this->bo->prefs['calendar']['show_rejected'])
-					{
-						$appts = False;
-						foreach($events as $event)	// check for a not-rejected event
-						{
-							if (!$this->bo->rejected_no_show($event))
-							{
-								$appts = True;
-								break;
-							}
-						}
-					}
-					else
-					{
-						$appts = True;
-					}
-				}
-				else
-				{
-					$appts = False;
-				}
-
-				$holidays = $this->bo->cached_holidays[$date];
-				if($weekly)
-				{
-					$cellcolor = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
-				}
-
-				$day_image = '';
-				if($holidays)
-				{
-					$extra = ' bgcolor="'.$this->bo->holiday_color.'"';
-					$class = ($appts?'b':'').'minicalhol';
-					if ($date == $this->bo->today)
-					{
-						$day_image = ' background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
-					}
-				}
-				elseif ($date != $this->bo->today)
-				{
-					$extra = ' bgcolor="'.$cellcolor.'"';
-					$class = ($appts?'b':'').'minicalendar';
-				}
-				else
-				{
-					$extra = ' bgcolor="'.$GLOBALS['phpgw_info']['theme']['cal_today'].'"';
-					$class = ($appts?'b':'').'minicalendar';
-					$day_image = ' background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
-				}
-
-				if($this->bo->printer_friendly && @$this->bo->prefs['calendar']['print_black_white'])
-				{
-					$extra = '';
-				}
-
-				if(!$this->bo->printer_friendly && $this->bo->check_perms(PHPGW_ACL_ADD))
-				{
-					$new_event = True;
-				}
-				else
-				{
-					$new_event = False;
-				}
-				$holiday_name = Array();
-				if($holidays)
-				{
-					for($k=0;$k<count($holidays);$k++)
-					{
-						$holiday_name[] = $holidays[$k]['name'];
-					}
-				}
-				$week = '';
-				if (!$j || (!$weekly && $j && substr($date,6,2) == '01'))
-				{
-					$week = lang('week').' '.(int)((date('z',($startdate+(24*3600*4)))+7)/7);
-				}
-				$daily[$date] = Array(
-					'extra'		=> $extra,
-					'new_event'	=> $new_event,
-					'holidays'	=> $holiday_name,
-					'appts'		=> $appts,
-					'week'		=> $week,
-					'day_image'	=> $day_image,
-					'class'		=> $class
-				);
-			}
-
-			if($this->debug)
-			{
-				_debug_array($daily);
-			}
-
-			return $daily;
-		}
-	}
-?>
diff --git a/calendar/inc/class.uicustom_fields.inc.php b/calendar/inc/class.uicustom_fields.inc.php
deleted file mode 100644
index 55adb0307a..0000000000
--- a/calendar/inc/class.uicustom_fields.inc.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar - Custom fields and sorting                        *
-  * http://www.egroupware.org                                                *
-  * Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	require_once(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.bocustom_fields.inc.php');
-	$GLOBALS['phpgw_info']['flags']['included_classes']['bocustom_fields'] = True; // for 0.9.14
-
-	class uicustom_fields extends bocustom_fields
-	{
-		var $public_functions = array(
-			'index' => True,
-			'submited'  => True
-		);
-
-		function uicustom_fields()
-		{
-			$this->bocustom_fields();	// call constructor of extended class
-
-			$this->tpl = $GLOBALS['phpgw']->template;
-			if (!is_object($GLOBALS['phpgw']->nextmatchs))
-			{
-				$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
-			}
-			if (!is_object($GLOBALS['phpgw']->html))
-			{
-				$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
-			}
-			$this->html = &$GLOBALS['phpgw']->html;
-
-			// jscalendar is needed by the new navigation-menu AND it need to be loaded befor the header !!!
-			if (!is_object($GLOBALS['phpgw']->jscalendar))
-			{
-				$GLOBALS['phpgw']->jscalendar = CreateObject('phpgwapi.jscalendar');
-			}
-		}
-
-		function index($error='')
-		{
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Custom fields and sorting');
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$this->tpl = $GLOBALS['phpgw']->template;
-
-			$this->tpl->set_unknowns('remove');
-			$this->tpl->set_file(array(
-				'custom_fields_tpl'	=> 'custom_fields.tpl'
-			));
-			$this->tpl->set_block('custom_fields_tpl','custom_fields','custom_fields');
-			$this->tpl->set_block('custom_fields_tpl','row','row');
-
-			$n = 0;
-			foreach($this->fields as $field => $data)
-			{
-				$data['order'] = ($n += 10);
-				if (isset($this->stock_fields[$field]))
-				{
-					$this->set_row($data,$field);
-				}
-				else
-				{
-					$this->set_row($data,$field,'delete','Delete');
-				}
-			}
-			$this->tpl->set_var(array(
-				'hidden_vars'  => '',
-				'lang_error'   => $error,
-				'lang_name'    => lang('Name'),
-				'lang_length'  => lang('Length<br>(<= 255)'),
-				'lang_shown'   => lang('Length shown<br>(emtpy for full length)'),
-				'lang_order'   => lang('Order'),
-				'lang_title'   => lang('Title-row'),
-				'lang_disabled'=> lang('Disabled'),
-				'action_url'   => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.submited'),
-				'save_button'  => $this->html->submit_button('save','Save'),
-				'cancel_button'=> $this->html->submit_button('cancel','Cancel'),
-			));
-
-			$this->set_row(array('order' => $n+10),'***new***','add','Add');
-
-			$this->tpl->pfp('out','custom_fields');
-		}
-
-		function set_row($values,$id='',$name='',$label='')
-		{
-			if ($id !== '')
-			{
-				$id = '['.htmlspecialchars($id).']';
-			}
-			$this->tpl->set_var(array(
-				'name'    => $values['label'] ? lang($values['label']) : $this->html->input('name'.$id,$values['name'],'','SIZE="40" MAXLENGTH="40"'),
-				'length'  => $values['label'] ? '&nbsp' : $this->html->input('length'.$id,$values['length'],'','SIZE="3"'),
-				'shown'   => $values['label'] ? '&nbsp' : $this->html->input('shown'.$id,$values['shown'],'','SIZE="3"'),
-				'order'   => $this->html->input('order'.$id,$values['order'],'','SIZE="3"'),
-				'title'   => $this->html->checkbox('title'.$id,$values['title']),
-				'disabled'=> $this->html->checkbox('disabled'.$id,$values['disabled']),
-				'button'  => $name ? $this->html->submit_button($name.$id,$label) : '&nbsp'
-			));
-			if ($name !== 'add')
-			{
-				$this->tpl->set_var('tr_color',$values['title'] ? $GLOBALS['phpgw_info']['theme']['th_bg'] : $GLOBALS['phpgw']->nextmatchs->alternate_row_color());
-				$this->tpl->parse('rows','row',True);
-			}
-		}
-
-		function submited()
-		{
-			if ($_POST['cancel'])
-			{
-				$GLOBALS['phpgw']->redirect_link('/admin/');
-			}
-			//echo "<pre>"; print_r($_POST); echo "</pre>";
-
-			foreach ($_POST['order'] as $field => $order)
-			{
-				if (isset($_POST['delete'][$field]) || $field == '***new***')
-				{
-					continue;
-				}
-				while(isset($ordered[$order]))
-				{
-					++$order;
-				}
-				$ordered[$order] = array(
-					'field'     => $field,
-					'name'      => stripslashes($_POST['name'][$field]),
-					'length'    => (int)$_POST['length'][$field],
-					'shown'     => (int)$_POST['shown'][$field],
-					'title'     => !!$_POST['title'][$field],
-					'disabled'  => !!$_POST['disabled'][$field]
-				);
-				if (isset($this->stock_fields[$field]))
-				{
-					$ordered[$order]['name']  = $this->fields[$field]['name'];
-					$ordered[$order]['label'] = $this->fields[$field]['label'];
-				}
-			}
-			if (isset($_POST['add']) || strlen($_POST['name']['***new***']))
-			{
-				$name = stripslashes($_POST['name']['***new***']);
-
-				if (!strlen($name) || array_search($name,$_POST['name']) != '***new***')
-				{
-					$error .= lang('New name must not exist and not be empty!!!');
-				}
-				else
-				{
-					$order = $_POST['order']['***new***'];
-					while(isset($_POST['order'][$order]))
-					{
-						++$order;
-					}
-					$ordered[$order] = array(
-						'field'     => '#'.$name,
-						'name'      => $name,
-						'length'    => (int)$_POST['length']['***new***'],
-						'shown'     => (int)$_POST['shown']['***new***'],
-						'title'     => !!$_POST['title']['***new***'],
-						'disabled'  => !!$_POST['disabled']['***new***']
-					);
-				}
-			}
-			//echo "<pre>"; print_r($ordered); echo "</pre>\n";
-			ksort($ordered,SORT_NUMERIC);
-
-			$this->fields = array();
-			foreach($ordered as $order => $data)
-			{
-				if ($data['length'] > 255)
-				{
-					$data['length'] = 255;
-				}
-				if ($data['length'] <= 0)
-				{
-					unset($data['length']);
-				}
-				if ($data['shown'] >= $data['length'] || $data['shown'] <= 0)
-				{
-					unset($data['shown']);
-				}
-				if (!$data['title'])
-				{
-					unset($data['title']);
-				}
-				if (!$data['disabled'])
-				{
-					unset($data['disabled']);
-				}
-				$field = $data['field'];
-				unset($data['field']);
-				$this->fields[$field] = $data;
-			}
-			if (!$error && isset($_POST['save']))
-			{
-				$this->save();
-				$GLOBALS['phpgw']->redirect_link('/admin/');
-			}
-			$this->index($error);
-		}
-	}
-?>
diff --git a/calendar/inc/class.uiforms.inc.php b/calendar/inc/class.uiforms.inc.php
index 0bdf71e998..a820362bef 100644
--- a/calendar/inc/class.uiforms.inc.php
+++ b/calendar/inc/class.uiforms.inc.php
@@ -2,7 +2,7 @@
 /**************************************************************************\
 * eGroupWare - Calendar - forms of the UserInterface                       *
 * http://www.egroupware.org                                                *
-* Written and (c) 2004 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* Written and (c) 2004/5 by Ralf Becker <RalfBecker@outdoor-training.de>   *
 * --------------------------------------------                             *
 *  This program is free software; you can redistribute it and/or modify it *
 *  under the terms of the GNU General Public License as published by the   *
@@ -12,19 +12,33 @@
 
 /* $Id$ */
 
-include_once(PHPGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
+include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
 
 /**
- * calendar UserInterface forms
+ * calendar UserInterface forms: view and edit events, freetime search
+ *
+ * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
+ *  UI only operates in user-time, so there have to be no conversation at all !!!
+ *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
+ *  SO operates only on server-time
+ *
+ * The state of the UI elements is managed in the uical class, which all UI classes extend.
+ *
+ * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
  *
  * @package calendar
- * @author RalfBecker@outdoor-training.de
- * @license GPL
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2004/5 by RalfBecker-At-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 class uiforms extends uical
 {
 	var $public_functions = array(
 		'freetimesearch'  => True,
+		'edit' => true,
+		'view' => true,
+		'export' => true,
+		'import' => true,
 	);
 	
 	/**
@@ -32,24 +46,713 @@ class uiforms extends uical
 	 */
 	function uiforms()
 	{
-		$this->uical();	// call the parent's constructor
+		$this->uical(true);	// call the parent's constructor
+		
+		$this->link =& $this->bo->link;
+	}
+	
+	/**
+	 * View a calendar event
+	 */
+	function view()
+	{
+		return $this->edit(null,array('view' => true));
+	}
+
+	/**
+	 * Create a default event (adding a new event) by evaluating certain _GET vars
+	 *
+	 * @return array event-array
+	 */ 
+	function &default_add_event()
+	{
+		$owner = (int) (isset($_GET['owner']) ? $_GET['owner'] : $this->owner);
+		if (!$owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$owner)) $owner = $this->user;
+		//echo "<p>this->owner=$this->owner, _GET[owner]=$_GET[owner], user=$this->user => owner=$owner</p>\n";
+
+		$start = $this->bo->date2ts(array(
+			'full' => isset($_GET['date']) && (int) $_GET['date'] ? (int) $_GET['date'] : $this->date,
+			'hour' => (int) (isset($_GET['hour']) && (int) $_GET['hour'] ? $_GET['hour'] : $this->bo->cal_prefs['workdaystarts']),
+			'minute' => (int) $_GET['minute'],
+		));
+		//echo "<p>_GET[date]=$_GET[date], _GET[hour]=$_GET[hour], _GET[minute]=$_GET[minute], this->date=$this->date ==> start=$start=".date('Y-m-d H:i',$start)."</p>\n";
+		
+		$participant_types = array('u' => array($owner => $owner == $this->user ? 'A' : 'U'));
+		$participants = array($owner => $owner == $this->user ? 'A' : 'U');
+		if ($_GET['participants'])
+		{
+			foreach(explode(',',$_GET['participants']) as $uid)
+			{
+				if (is_numeric($uid))
+				{
+					$participants[$uid] = $participant_types['u'][$uid] = $uid == $this->user ? 'A' : 'U';
+				}
+				elseif (is_array($this->bo->resources[$uid{0}]))
+				{
+					$res_data = $this->bo->resources[$uid{0}];
+					list($id,$quantity) = explode(':',substr($uid,1));
+					$participants[$uid] = $participant_types[$uid{0}][$id] = ($res_data['new_status'] ? ExecMethod($res_data['new_status'],$id) : 'U').
+						((int) $quantity > 1 ? (int)$quantity : '');
+					// if new_status == 'x', resource is not bookable
+					if(strstr($participant_types[$uid{0}][$id],'x')) 
+					{
+						unset($participant_types[$uid{0}][$id]);
+						unset($participants[$uid]);
+					}
+				}
+			}
+		}
+		return array(
+			'participant_types' => $participant_types,
+			'participants' => $participants,
+			'owner' => $owner,
+			'start' => $start,
+			'end'   => $start + (int) $this->bo->cal_prefs['defaultlength']*60,
+			'priority' => 2,	// normal
+			'public'=> $this->cal_prefs['default_private'] ? 0 : 1,
+			'alarm' => array(),
+		);
+	}
+	
+	/**
+	 * Process the edited event and evtl. call edit to redisplay it
+	 *
+	 * @param array $content posted eTemplate content
+	 */
+	function process_edit($content)
+	{
+		//echo "content submitted="; _debug_array($content);
+		list($button) = @each($content['button']);
+		unset($content['button']);
+
+		$view = $content['view'] && $button != 'edit' && $button != 'edit_series';
+		// if we edit a single recurrance, we need to remember it for save and need to reset the recur information
+		if ($button == 'edit' && $content['recur_type'] != MCAL_RECUR_NONE)
+		{
+			$content['edit_single'] = $content['start'];
+			$content['recur_type'] = MCAL_RECUR_NONE;
+			foreach(array('recur_enddate','recur_interval','recur_exception','recur_data') as $name)
+			{
+				unset($content[$name]);
+			}
+		}
+		if ($view && $button == 'vcal')
+		{
+			$msg = $this->export($content['id'],true);
+		}
+		// delete a recur-exception
+		if ($content['recur_exception']['delete_exception'])
+		{
+			list($date) = each($content['recur_exception']['delete_exception']);
+			unset($content['recur_exception']['delete_exception']);
+			if (($key = array_search($date,$content['recur_exception'])) !== false)
+			{
+				unset($content['recur_exception'][$key]);
+				$content['recur_exception'] = array_values($content['recur_exception']);
+			}
+		}
+		// delete an alarm
+		if ($content['alarm']['delete_alarm'])
+		{
+			list($id) = each($content['alarm']['delete_alarm']);
+			//echo "delete alarm $id"; _debug_array($content['alarm']['delete_alarm']);
+			
+			if ($content['id'])
+			{
+				if ($this->bo->delete_alarm($id))
+				{
+					$msg = lang('Alarm deleted');
+					unset($content['alarm'][$id]);
+				}
+				else
+				{
+					$msg = lang('Permission denied');				
+				}
+			}
+			else
+			{
+				unset($content['alarm'][$id]);
+			}
+		}
+		$event = $content;
+		unset($event['new_alarm']);
+		unset($event['alarm']['delete_alarm']);
+
+		if (isset($content['participants']['accounts']) && !(isset($content['view']) && $content['view']))	// convert content => event
+		{
+			//echo "participants-data"; _debug_array($content['participants']);
+			$event['participants'] = $event['participant_types'] = array();
+			foreach($content['participants'] as $app => $participants)
+			{
+				if (!$participants) continue;
+
+				$type = 'u';
+				foreach($this->bo->resources as $t => $data)
+				{
+					if ($data['app'] == $app)
+					{
+						$type = $t;
+						break;
+					}
+				}
+				foreach(is_array($participants) ? $participants : explode(',',$participants) as $id)
+				{
+					if (is_array($id)) continue;	// ignore the status
+					list($id,$quantity) = explode(':',$id);
+					$event['participants'][$type == 'u' ? (int) $id : $type.$id] = $event['participant_types'][$type][$id] = 
+						// for existing participants use their old status (dont change it)
+						(isset($content['participant_types'][$type][$id]) ? $content['participant_types'][$type][$id]{0} : 
+						// for new participants check if they have a 'new_status' resource-methode to determine the status
+						(isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 
+						// if not use 'A'=accepted for the current user and 'U' otherwise
+						($type == 'u' && $id == $this->bo->user ? 'A' : 'U'))).((int) $quantity > 1 ? (int)$quantity : '');
+						// ToDo: move this logic into bocal
+				}
+			}
+			if ($event['start'] > $event['end'])	// end need to be after start, otherwise swap them
+			{
+				$event['start'] = $content['end']; 
+				$event['end'] = $content['start'];
+			}
+			if ($content['whole_day'])
+			{
+				$event['start'] = $this->bo->date2array($event['start']);
+				$event['start']['hour'] = $event['start']['minute'] = 0; unset($event['start']['raw']);
+				$event['start'] = $this->bo->date2ts($event['start']);
+				$event['end'] = $this->bo->date2array($event['end']);
+				$event['end']['hour'] = 23; $event['end']['minute'] = $event['end']['second'] = 59; unset($event['end']['raw']);
+				$event['end'] = $this->bo->date2ts($event['end']);
+			}
+			// some checks for recurances, if you give a date, make it a weekly repeating event and visa versa
+			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
+			if ($event['recur_type'] == MCAL_RECUR_WEEKLY && !$event['recur_data'])
+			{
+				$event['recur_data'] = 1 << (int)date('w',$event['start']);
+			}
+		}
+		else	// status change view
+		{
+			foreach($event['participants'] as $name => $data)
+			{
+				if (!is_array($data)) continue;
+
+				$type = 'u';
+				foreach($this->bo->resources as $t => $d)
+				{
+					if ($d['app'] == $name)
+					{
+						$type = $t;
+						break;
+					}
+				}
+				// checking for status changes
+				foreach($data[$name.'_status'] as $uid => $status)
+				{
+					list($uid,$quantity) = explode(':',$uid);
+					//echo "checking $type: $uid $status against old ".$event['participant_types'][$type][$uid]."<br />\n";
+					if ($event['participant_types'][$type][$uid]{0} != $status{0})	// status changed by user
+					{
+						if ($this->bo->set_status($event['id'],$type,$uid,$status,$event['recur_type'] != MCAL_RECUR_NONE ? $event['start'] : 0))
+						{
+							$event['participants'][$type == 'u' ? (int) $uid : $type.$uid] = 
+								$event['participant_types'][$type][$uid] = $status.$quantity;
+							// refreshing the calendar-view with the changed participant-status
+							$msg = lang('Status changed');
+							if (!$preserv['no_popup'])
+							{
+								$js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array(
+									'menuaction' => $content['referer'],
+									'msg' => $msg,
+								))).'\';';
+							}
+						}
+					}
+				}
+				unset($event['participants'][$name]);	// unset the status-changes from the event
+			}
+		}
+		$preserv = array(
+			'view'        => $view,
+			'edit_single' => $content['edit_single'],
+			'referer'     => $content['referer'],
+			'no_popup'    => $content['no_popup'],
+		);
+		switch($button)
+		{
+		case 'edit_series':
+			if ($content['recur_type'] != MCAL_RECUR_NONE)
+			{
+				// need to reload start and end of the serie
+				$event = $this->bo->read($event['id'],0);
+			}
+			break;
+				
+		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
+			unset($event['id']);
+			unset($event['uid']);
+			unset($event['alarm']);
+			unset($event['reference']);
+			unset($event['recur_exception']);
+			unset($event['edit_single']);	// in case it has been set
+			unset($event['modified']);
+			unset($event['modifier']);
+			$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
+			$preserv['view'] = $preserv['edit_single'] = false;
+			$msg = lang('Event copied - the copy can now be edited');
+			$event['title'] = lang('Copy of:').' '.$event['title'];
+			break;
+			
+		case 'ignore':
+			$ignore_conflicts = true;
+			$button = $event['button_was'];	// save or apply
+			unset($event['button_was']);
+			// fall through
+		case 'save':
+		case 'apply':
+			if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event)) 
+			{ 
+				$msg = lang('Permission denied'); 
+				break; 
+			}
+			if ($content['edit_single'])	// we edited a single event from a series
+			{
+				$event['reference'] = $event['id'];
+				unset($event['id']);
+				unset($event['uid']);
+				$conflicts = $this->bo->update($event,$ignore_conflicts);
+				if (!is_array($conflicts) && $conflicts)
+				{
+					// now we need to add the original start as recur-execption to the series
+					$recur_event = $this->bo->read($event['reference']);
+					$recur_event['recur_exception'][] = $content['edit_single'];
+					$this->bo->update($recur_event,true);	// no conflict check here
+					unset($recur_event);
+					unset($event['edit_single']);			// if we further edit it, it's just a single event
+				}
+				else	// conflict or error, we need to reset everything to the state befor we tried to save it
+				{
+					$event['id'] = $event['reference'];
+					unset($event['reference']);
+					$event['uid'] = $content['uid'];
+				}
+			}
+			else	// we edited a non-reccuring event or the whole series
+			{
+				$conflicts = $this->bo->update($event,$ignore_conflicts);
+				unset($event['ignore']);
+			}
+			if (is_array($conflicts))
+			{
+				$event['button_was'] = $button;	// remember for ignore
+				return $this->conflicts($event,$conflicts,$preserv);
+			}
+			elseif($conflicts)	// true and non-array means Ok ;-)
+			{
+				$msg .= ($msg ? ', ' : '') . lang('Event saved');
+
+				// writing links for new entry, existing ones are handled by the widget itself
+				if (!$content['id'] && is_array($content['link_to']['to_id']))	
+				{
+					$this->link->link('calendar',$event['id'],$content['link_to']['to_id']);
+				}
+				$js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array(
+					'menuaction' => $content['referer'],
+					'msg' => $msg,
+				))).'\';';
+
+				if ($content['custom_mail'])
+				{
+					$js = $this->custom_mail($event,!$content['id'])."\n".$js;	// first open the new window and then update the view
+					unset($event['custom_mail']);
+				}
+			}
+			else
+			{
+				$msg = lang('Error: saving the event !!!');
+			}
+			break;
+			
+		case 'delete':
+		case 'delete_series':
+			if (!$this->bo->check_perms(EGW_ACL_DELETE,$event)) break;
+			if (!$content['edit_series'] && $button == 'delete' && $event['recur_type'] != MCAL_RECUR_NONE)	// delete a single event from a recuring event
+			{
+				$this->bo->delete($event['id'],$event['start']);
+			}
+			else
+			{
+				$this->bo->delete($event['id']);
+			}
+			$msg = lang('Event deleted');
+			$js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array(
+				'menuaction' => $content['referer'],
+				'msg' => $msg,
+			))).'\';';
+			break;
+			
+		case 'freetime':
+			if (!is_object($GLOBALS['egw']->js))
+			{
+				$GLOBALS['egw']->js =& CreateObject('phpgwapi.javascript');
+			}
+			// the "click" has to be in onload, to make sure the button is already created
+			$GLOBALS['egw']->js->set_onload("document.getElementsByName('exec[freetime]')[0].click();");
+			break;
+			
+		case 'add_alarm':
+			if ($this->bo->check_perms(EGW_ACL_EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
+			{
+				$offset = DAY_s * $content['new_alarm']['days'] + HOUR_s * $content['new_alarm']['hours'] + 60 * $content['new_alarm']['mins'];
+				$alarm = array(
+					'offset' => $offset,
+					'time'   => $content['start'] - $offset,
+					'all'    => !$content['new_alarm']['owner'],
+					'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
+				);
+				if ($alarm['time'] < $this->bo->now_su)
+				{
+					$msg = lang("Can't add alarms in the past !!!");
+				}
+				elseif ($event['id'])	// save the alarm immediatly
+				{
+					if(($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					{
+						$alarm['id'] = $alarm_id;
+						$event['alarm'][$alarm_id] = $alarm;
+						
+						$msg = lang('Alarm added');
+					}
+					else
+					{
+						$msg = lang('Error adding the alarm');
+					}
+				}
+				else
+				{
+					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++);	// get a temporary non-conflicting, numeric id
+					$event['alarm'][$alarm['id']] = $alarm;
+				}
+			}
+			else
+			{
+				$msg = lang('Permission denied');
+			}
+			break;
+		}
+		if (in_array($button,array('cancel','save','delete','delete_series')))
+		{
+			if ($content['no_popup'])
+			{
+				$GLOBALS['egw']->redirect_link('/index.php',array(
+					'menuaction' => $content['referer'],
+					'msg'        => $msg,
+				));
+			}
+			$js .= 'window.close();';
+			echo "<html><body onload=\"$js\"></body></html>\n";
+			$GLOBALS['egw']->common->egw_exit();
+		}
+		return $this->edit($event,$preserv,$msg,$js,$content['link_to']['to_id']);
+	}
+
+	/**
+	 * return javascript to open felamimail compose window with preset content to mail all participants
+	 *
+	 * @param array $event
+	 * @param boolean $added
+	 * @return string javascript window.open command
+	 */
+	function custom_mail($event,$added)
+	{
+		$to = array();
+		foreach($event['participants'] as $uid => $status)
+		{
+			if (is_numeric($uid) && $uid != $this->user && $status != 'R' && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
+			{
+				$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
+				 
+				$to[] = $GLOBALS['egw']->common->display_fullname('',$firstname,$lastname).
+					' <'.$GLOBALS['egw']->accounts->id2name($uid,'account_email').'>';
+			}
+		}
+		list($subject,$body) = $this->bo->get_update_message($event,$added ? MSG_ADDED : MSG_MODIFIED);	// update-message is in TZ of the user
+
+		/*$ics = ExecMethod('calendar.boicalendar.export',array(
+			'l_event_id'  => array($event),
+			'method'      => 'request',
+			'chunk_split' => False
+		));*/
+		$boical =& CreateObject('calendar.boical');
+		$ics = $boical->exportVCal(array($event),'request');
+
+		$ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'ics');
+		if(($f = fopen($ics_file,'w')))
+		{
+			fwrite($f,$ics);
+			fclose($f);
+		}
+		$send->AddStringAttachment($ics, 'cal.ics', '8bit', 'text/calendar; method=request');
+
+		$vars = array(
+			'menuaction'      => 'felamimail.uicompose.compose',
+			'preset[to]'      => implode(', ',$to),
+			'preset[subject]' => $subject,
+			'preset[body]'    => $body,
+			'preset[name]'    => 'event.ics',
+			'preset[file]'    => $ics_file,
+			'preset[type]'    => 'text/calendar; method=request',
+			'preset[size]'    => filesize($ics_file),
+		);
+		return "window.open('".addslashes($GLOBALS['egw']->link('/index.php',$vars))."','_blank','width=700,height=700,scrollbars=yes,status=no');";
+	}
+
+	/**
+	 * Edit a calendar event
+	 *
+	 * @param array $event=null Event to edit, if not $_GET['cal_id'] contains the event-id
+	 * @param array $perserv=null following keys:
+	 *	view boolean view-mode, if no edit-access we automatic fallback to view-mode
+	 *	referer string menuaction of the referer
+	 *	no_popup boolean use a popup or not
+	 *	edit_single int timestamp of single event edited, unset/null otherwise
+	 * @param string $msg='' msg to display
+	 * @param string $js='window.focus();' javascript to include in the page
+	 * @param mixed $link_to_id='' $content from or for the link-widget
+	 */
+	function edit($event=null,$preserv=null,$msg='',$js = 'window.focus();',$link_to_id='')
+	{
+		$etpl =& CreateObject('etemplate.etemplate','calendar.edit');
+		
+		if (!is_array($event))
+		{
+			$preserv = array(
+				'no_popup' => isset($_GET['no_popup']),
+				'referer'  => preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] : $this->view_menuaction,
+				'view'     => $preserv['view'],
+			);
+			$cal_id = (int) $_GET['cal_id'];
+			
+			if (!$cal_id || $cal_id && !($event = $this->bo->read($cal_id,$_GET['date'])) || !$this->bo->check_perms(EGW_ACL_READ,$event))
+			{
+				if ($cal_id) 
+				{
+					if (!$preserv['no_popup'])
+					{
+						$js = "alert('".lang('Permission denied')."'); window.close();";
+					}
+					else
+					{
+						$GLOBALS['egw']->common->egw_header();
+						parse_navbar();
+						echo '<p class="redItalic" align="center">'.lang('Permission denied')."</p>\n";
+						$GLOBALS['egw']->common->egw_exit();
+					}
+				}
+				$event =& $this->default_add_event();
+			}
+			// check if the event is the whole day
+			$start = $this->bo->date2array($event['start']);
+			$end = $this->bo->date2array($event['end']);
+			$event['whole_day'] = !$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59;
+
+			$link_to_id = $event['id'];
+			if (!$add_link && !$event['id'] && isset($_GET['link_app']) && isset($_GET['link_id']) &&
+				preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$_GET['link_app'].':'.$_GET['link_id']))	// gard against XSS
+			{
+				$this->link->link('calendar',$link_to_id,$_GET['link_app'],$_GET['link_id']);
+			}
+		}
+		$view = $preserv['view'] = $preserv['view'] || $event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event);
+		//echo "view=$view, event="; _debug_array($event);
+		$content = array_merge($event,array(
+			'link_to' => array(
+				'to_id'  => $link_to_id,
+				'to_app' => 'calendar',
+			),
+			'edit_single' => $preserv['edit_single'],	// need to be in content too, as it is used in the template
+			'view' => $view,
+		));
+		$content['participants'] = array();
+		foreach($event['participant_types'] as $type => $participants)
+		{
+			$name = 'accounts';
+			if (isset($this->bo->resources[$type]))
+			{
+				$name = $this->bo->resources[$type]['app'];
+			}
+// 			_debug_array($participants);
+			foreach($participants as $id => $status)
+			{
+				$content['participants'][$name][] = $id . (substr($status,1) > 1 ? (':'.substr($status,1)) : '');
+			}
+
+			if ($view)
+			{
+				$content['participants'][$name][$name.'_status'] = $participants;
+				foreach($participants as $id => $status)
+				{
+					$readonlys[$name.'_status['.$id.']'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,($type != 'u' ? $type : '').$id);
+				}
+			}
+		}
+// 		echo '$content[participants]'; _debug_array($content['participants']);
+// 		echo '$content[participant_types]'; _debug_array($content['participant_types']);
+// 		_debug_array($sel_options);
+		$preserv = array_merge($preserv,$view ? $event : $content);
+
+		if ($event['alarm'])
+		{
+			// makes keys of the alarm-array starting with 1
+			$content['alarm'] = array(false);
+			foreach(array_values($event['alarm']) as $id => $alarm)
+			{
+				if (!$alarm['all'] && !$this->bo->check_perms(EGW_ACL_READALARM,0,$alarm['owner']))
+				{
+					continue;	// no read rights to the calendar of the alarm-owner, dont show the alarm
+				}
+				$alarm['all'] = (int) $alarm['all'];
+				$days = (int) ($alarm['offset'] / DAY_s);
+				$hours = (int) (($alarm['offset'] % DAY_s) / HOUR_s);
+				$minutes = (int) (($alarm['offset'] % HOUR_s) / 60);
+				$label = array();
+				if ($days) $label[] = $days.' '.lang('days');
+				if ($hours) $label[] = $hours.' '.lang('hours');
+				if ($minutes) $label[] = $minutes.' '.lang('Minutes');
+				$alarm['offset'] = implode(', ',$label);
+				$content['alarm'][] = $alarm;
+				
+				$readonlys['delete_alarm['.$id.']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $event : 0,$alarm['owner']);
+			}
+		}
+		else
+		{
+			$content['alarm'] = false;
+		}
+		$content['msg'] = $msg;
+
+		if ($view)
+		{
+			foreach($event as $key => $val)
+			{
+				if ($key != 'alarm') $readonlys[$key] = true;
+			}
+			// we need to unset the tab itself, as this would make all content (incl. the change-status selects) readonly
+			unset($readonlys['general|description|participants|recurrence|custom|links|alarms']);
+
+			$readonlys['button[save]'] = $readonlys['button[apply]'] = $readonlys['freetime'] = true;
+			$readonlys['link'] = $readonlys['link_to'] = $readonlys['customfields'] = true;
+		}
+		else
+		{
+			$readonlys['button[copy]'] = $readonlys['button[vcal]'] = true;
+			unset($preserv['participants']);	// otherwise deleted participants are still reported
+			$readonlys['recur_exception'] = !count($content['recur_exception']);	// otherwise we get a delete button
+		}
+		// disabling the custom fields tab, if there are none
+		$readonlys['general|description|participants|recurrence|custom|links|alarms'] = array(
+			'custom' => !count($this->bo->config['customfields'])
+		);
+		if ($view || !isset($GLOBALS['egw_info']['user']['apps']['felamimail']))
+		{
+			$etpl->disable_cells('custom_mail');
+		}
+		if (!($readonlys['button[edit_series]'] = $readonlys['button[edit]'] = !$view || !$this->bo->check_perms(EGW_ACL_EDIT,$event)))
+		{
+			$readonlys['button[edit_series]'] = $event['recur_type'] == MCAL_RECUR_NONE;
+		}
+		if (!($readonlys['button[delete_series]'] = $readonlys['button[delete]'] = !$event['id'] || !$this->bo->check_perms(EGW_ACL_DELETE,$event)))
+		{
+			$readonlys['button[delete_series]'] = !$view || $event['recur_type'] == MCAL_RECUR_NONE;
+		}
+		$sel_options = array(
+			'recur_type' => &$this->bo->recur_types,
+			'accounts_status' => &$this->bo->verbose_status,
+			'owner'           => array(),
+		);
+		if ($event['id'] || $this->bo->check_perms(EGW_ACL_EDIT,$event))	// new event or edit rights to the event ==> allow to add alarm for all users
+		{
+			$sel_options['owner'][0] = lang('All participants');
+		}
+		foreach((array) $event['participant_types']['u'] as $uid => $status)
+		{
+			if ($status != 'R' && $this->bo->check_perms(EGW_ACL_EDIT,0,$uid))
+			{
+				$sel_options['owner'][$uid] = $this->bo->participant_name($uid);
+			}
+		}
+		$content['no_add_alarm'] = !count($sel_options['owner']);	// no rights to set any alarm
+		if (!$event['id'])
+		{
+			$etpl->set_cell_attribute('button[new_alarm]','type','checkbox');	
+		}
+		foreach($this->bo->resources as $res_data)
+		{
+			$sel_options[$res_data['app'].'_status'] =& $this->bo->verbose_status;
+		}
+		if ($preserv['no_popup'])
+		{
+			$etpl->set_cell_attribute('button[cancel]','onclick','');
+		}
+		//echo "content="; _debug_array($content);
+		//echo "preserv="; _debug_array($preserv);
+ 		//echo "readonlys="; _debug_array($readonlys);
+ 		//echo "sel_options="; _debug_array($sel_options);
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . ($event['id'] ? ($view ? lang('View') : lang('Edit')) : lang('Add'));
+		$GLOBALS['egw_info']['flags']['java_script'] .= "<script>\n$js\n</script>\n";
+		$etpl->exec('calendar.uiforms.process_edit',$content,$sel_options,$readonlys,$preserv,$preserv['no_popup'] ? 0 : 2);
+	}
+
+	/**
+	 * displays a sheduling conflict
+	 *
+	 * @param array $event 
+	 * @param array $conflicts array with conflicting events, the events are not garantied to be readable by the user!
+	 * @param array $preserv data to preserv
+	 */
+	function conflicts($event,$conflicts,$preserv)
+	{
+		$etpl =& CreateObject('etemplate.etemplate','calendar.conflicts');
+		
+		foreach($conflicts as $k => $conflict)
+		{
+			$is_readable = $this->bo->check_perms(EGW_ACL_READ,$conflict);
+			
+			$conflicts[$k] += array(
+				'icon_participants' => $is_readable ? (count($conflict['participants']) > 1 ? 'users' : 'single') : 'private',
+				'tooltip_participants' => $is_readable ? implode(', ',$this->bo->participants($conflict)) : '',
+				'time' => $this->bo->long_date($conflict['start'],$conflict['end'],true),
+				'conflicting_participants' => implode(",\n",$this->bo->participants(array(
+					'participants' => array_intersect_key($conflict['participants'],$event['participants']),
+				))),
+				'icon_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? 'recur' : '',
+				'text_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? lang('Recurring event') : ' ',
+			);		
+		}
+		$content = $event + array(
+			'conflicts' => array_values($conflicts),	// conflicts have id-start as key
+		);
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict');
+
+		$etpl->exec('calendar.uiforms.process_edit',$content,false,false,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
 	}
 
 	/**
 	 * Freetime search
 	 *
 	 * As the function is called in a popup via javascript, parametes get initialy transfered via the url
-	 * @param $content array/boolean array with parameters or false (default) to use the get-params
-	 * @param start[str] string start-date
-	 * @param start[hour] string start-hour
-	 * @param start[min] string start-minutes
-	 * @param end[str] string end-date
-	 * @param end[hour] string end-hour
-	 * @param end[min] string end-minutes
-	 * @param participants string ':' delimited string of user-id's
+	 * @param array $content=null array with parameters or false (default) to use the get-params
+	 * @param string start[str] start-date
+	 * @param string start[hour] start-hour
+	 * @param string start[min] start-minutes
+	 * @param string end[str] end-date
+	 * @param string end[hour] end-hour
+	 * @param string end[min] end-minutes
+	 * @param string participants ':' delimited string of user-id's
 	 */
-	function freetimesearch($content = false)
+	function freetimesearch($content = null)
 	{
+		$etpl =& CreateObject('etemplate.etemplate','calendar.freetimesearch');
+
 		$sel_options['search_window'] = array(
 			7*DAY_s		=> lang('one week'),
 			14*DAY_s	=> lang('two weeks'),
@@ -59,25 +762,45 @@ class uiforms extends uical
 		);
 		if (!is_array($content))
 		{
-			if ($this->debug) echo "<pre>".print_r($_GET,true)."</pre>";
-
-			foreach(array('start','end') as $name)
-			{
-				$arr = $this->jscal->input2date($_GET[$name]['str'],false);
-				$arr += $_GET[$name];
-				$content[$name] = $this->bo->date2ts($arr);
-			}
-			$content['duration'] = $content['end'] - $content['start'];
+			$edit_content = $etpl->process_values2url();
 			
-			foreach(explode(':',$_GET['participants']) as $uid)
+			if ($edit_content['whole_day'])
 			{
-				if ((int) $uid) $content['participants'][] = (int) $uid;
+				$arr = $this->bo->date2array($edit_content['start']);
+				$arr['hour'] = $arr['minute'] = $arr['second'] = 0; unset($arr['raw']);
+				$edit_content['start'] = $this->bo->date2ts($arr);
+				$arr = $this->bo->date2array($edit_content['end']);
+				$arr['hour'] = 23; $arr['minute'] = $arr['second'] = 59; unset($arr['raw']);
+				$edit_content['end'] = $this->bo->date2ts($arr);
+			}
+			$content = array(
+				'start'    => $edit_content['start'],
+				'duration' => $edit_content['end'] - $edit_content['start'],
+				'end'      => $edit_content['end'],
+				'cal_id'   => $edit_content['id'],
+				'recur_type'   => $edit_content['recur_type'],
+				'participants' => array(),
+			);
+			foreach($edit_content['participants'] as $app => $ids)
+			{
+				if ($app == 'accounts')
+				{
+					$content['participants'] += $ids;
+				}
+				elseif ($ids)
+				{
+					foreach($this->bo->resources as $type => $data)
+					{
+						if ($data['app'] == $app) break;
+					}
+					foreach($ids as $id)
+					{
+						$content['participants'][] = $type . $id;
+					}
+				}
 			}
-			$content['cal_id'] = $_GET['cal_id'];
-			$content['recur_type'] = $_GET['cal']['recur_type'];
-			
 			// default search parameters
-			$content['start_time'] = $this->cal_prefs['workdaystarts'];
+			$content['start_time'] = $edit_content['whole_day'] ? 0 : $this->cal_prefs['workdaystarts'];
 			$content['end_time'] = $this->cal_prefs['workdayends'];
 			if ($this->cal_prefs['workdayends']*HOUR_s < $this->cal_prefs['workdaystarts']*HOUR_s+$content['duration'])
 			{
@@ -106,26 +829,29 @@ class uiforms extends uical
 				//echo "$selected = ".date('D d.m.Y H:i',$content['freetime'][$selected]['start']);
 				$start = (int) $content['freetime'][$selected]['start'];
 				$end = $start + $content['duration'];
+				/**
+				 * ToDo: make this an eTemplate function to transmit content back to the opener
+				 */
 				$fields_to_set = array(
-					'start[str]'	=> date($this->common_prefs['dateformat'],$start),
-					'start[min]'	=> date('i',$start),
-					'end[str]'		=> date($this->common_prefs['dateformat'],$end),
-					'end[min]'		=> date('i',$end),
+					'exec[start][str]'	=> date($this->common_prefs['dateformat'],$start),
+					'exec[start][i]'	=> (int) date('i',$start),
+					'exec[end][str]'	=> date($this->common_prefs['dateformat'],$end),
+					'exec[end][i]'		=> (int) date('i',$end),
 				);
 				if ($this->common_prefs['timeformat'] == 12)
 				{
 					$fields_to_set += array(
-						'start[hour]'	=> date('h',$start),
-						'start[ampm]'	=> date('a',$start),
-						'end[hour]'		=> date('h',$end),
-						'end[ampm]'		=> date('a',$end),
+						'exec[start][H]'	=> date('h',$start),
+						'exec[start][a]'	=> date('a',$start),
+						'exec[end][H]'		=> date('h',$end),
+						'exec[end][a]'		=> date('a',$end),
 					);
 				}
 				else	
 				{
 					$fields_to_set += array(
-						'start[hour]'	=> date('H',$start),
-						'end[hour]'		=> date('H',$end),
+						'exec[start][H]'	=> (int) date('H',$start),
+						'exec[end][H]'		=> (int) date('H',$end),
 					);
 				}
 				echo "<html>
@@ -160,12 +886,21 @@ class uiforms extends uical
 		{
 			$sel_options['duration'][$n*60] = sprintf('%d:%02d',$n/60,$n%60);
 		}
-		$etpl = CreateObject('etemplate.etemplate','calendar.freetimesearch');
+		if ($content['duration'] <= 8*HOUR_s) $content['end'] = '';
 
 		//echo "<pre>".print_r($content,true)."</pre>\n";
-		$GLOBALS['phpgw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
 		// let the window popup, if its already there
-		$GLOBALS['phpgw_info']['flags']['java_script'] .= "<script>\nwindow.focus();\n</script>\n";
+		$GLOBALS['egw_info']['flags']['java_script'] .= "<script>\nwindow.focus();\n</script>\n";
+		
+		if (!is_object($GLOBALS['egw']->js))
+		{
+			$GLOBALS['egw']->js = CreateObject('phpgwapi.javascript');
+		}
+		// We hide the enddate if one of our predefined durations fits
+		// the call to set_style_by_class has to be in onload, to make sure the function and the element is already created
+		$GLOBALS['egw']->js->set_onload("set_style_by_class('*','end_hide','visibility','".($content['duration'] && isset($sel_options['duration'][$content['duration']]) ? 'hidden' : 'visible')."');");
+		$etpl->set_cell_attribute('duration','onchange',"set_style_by_class('*','end_hide','visibility',this.value == 0 ? 'visible' : 'hidden');");
 
 		$etpl->exec('calendar.uiforms.freetimesearch',$content,$sel_options,'',array(
 				'participants'	=> $content['participants'],
@@ -177,11 +912,11 @@ class uiforms extends uical
 	/**
 	 * calculate the freetime of given $participants in a certain time-span
 	 *
-	 * @param $participants array of user-id's
-	 * @param $start int start-time timestamp in user-time
-	 * @param $end int end-time timestamp in user-time
-	 * @param $duration int min. duration in sec, default 1
-	 * @param $cal_id int own id for existing events, to exclude them from being busy-time, default 0
+	 * @param array $participants user-id's
+	 * @param int $start start-time timestamp in user-time
+	 * @param int $end end-time timestamp in user-time
+	 * @param int $duration min. duration in sec, default 1
+	 * @param int $cal_id own id for existing events, to exclude them from being busy-time, default 0
 	 * @return array of free time-slots: array with start and end values
 	 */
 	function freetime($participants,$start,$end,$duration=1,$cal_id=0)
@@ -194,8 +929,8 @@ class uiforms extends uical
 			'users'	=> $participants,
 		));
 		$busy[] = array(	// add end-of-search-date as event, to cope with empty search and get freetime til that date
-			'start'	=> array('raw'=>$end),
-			'end'	=> array('raw'=>$end),
+			'start'	=> $end,
+			'end'	=> $end,
 		);	
 		$ft_start = $start;
 		$freetime = array();
@@ -212,19 +947,19 @@ class uiforms extends uical
 				echo "event[end]=".date('D d.m.Y H:i',$event['end']['raw'])."<br>\n";
 			}
 			// $events ends before our actual position ==> ignore it
-			if ($event['end']['raw'] < $ft_start)
+			if ($event['end'] < $ft_start)
 			{
 				//echo "==> event ends before ft_start ==> continue<br>\n";
 				continue;
 			}
 			// $events starts before our actual position ==> set start to it's end and go to next event
-			if ($event['start']['raw'] < $ft_start)
+			if ($event['start'] < $ft_start)
 			{
 				//echo "==> event starts before ft_start ==> set ft_start to it's end & continue<br>\n";
-				$ft_start = $event['end']['raw'];
+				$ft_start = $event['end'];
 				continue;
 			}
-			$ft_end = $event['start']['raw'];
+			$ft_end = $event['start'];
 
 			// only show slots equal or bigger to min_length
 			if ($ft_end - $ft_start >= $duration)
@@ -235,7 +970,7 @@ class uiforms extends uical
 				);
 				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
 			}	
-			$ft_start = $event['end']['raw'];
+			$ft_start = $event['end'];
 		}
 		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
 		
@@ -247,12 +982,12 @@ class uiforms extends uical
 	 *
 	 * If the duration is bigger then the difference of start- and end_time, the end_time is ignored
 	 *
-	 * @param $freetime array of free time-slots: array with start and end values
-	 * @param $duration int min. duration in sec
-	 * @param $weekdays int allowed weekdays, bitfield of MCAL_M_...
-	 * @param $start_time int minimum start-hour 0-23
-	 * @param $end_time int maximum end-hour 0-23, or 0 for none
-	 * @param $sel_options array on return options for start-time selectbox
+	 * @param array $freetime free time-slots: array with start and end values
+	 * @param int $duration min. duration in sec
+	 * @param int $weekdays allowed weekdays, bitfield of MCAL_M_...
+	 * @param int $start_time minimum start-hour 0-23
+	 * @param int $end_time maximum end-hour 0-23, or 0 for none
+	 * @param array $sel_options on return options for start-time selectbox
 	 * @return array of free time-slots: array with start and end values
 	 */
 	function split_freetime_daywise($freetime,$duration,$weekdays,$start_time,$end_time,&$sel_options)
@@ -321,4 +1056,105 @@ class uiforms extends uical
 		}
 		return $freetime_daywise;
 	}
+	
+	/**
+	 * Export events as vCalendar version 2.0 files (iCal)
+	 *
+	 * @param int/array $content=0 numeric cal_id or submitted content from etempalte::exec
+	 * @param boolean $return_error=false should an error-msg be returned or a regular page with it generated (default)
+	 * @return string error-msg if $return_error
+	 */
+	function export($content=0,$return_error=false)
+	{
+		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
+		{
+			if (!($ical =& ExecMethod('calendar.boical.exportVCal',$cal_id)))
+			{
+				$msg = lang('Permission denied');
+				
+				if ($return_error) return $msg;
+			}
+			else
+			{
+				$GLOBALS['egw']->browser =& CreateObject('phpgwapi.browser');
+				$GLOBALS['egw']->browser->content_header('event.ics','text/calendar',strlen($ical));
+				echo $ical;
+				$GLOBALS['egw']->common->egw_exit();
+			}
+		}
+		if (is_array($content))
+		{
+			$events =& $this->bo->search(array(
+				'start' => $content['start'],
+				'end'   => $content['end'],
+				'enum_recuring' => false,
+				'daywise'       => false,
+				'owner'         => $this->owner,
+				'date_format'   => 'server',	// timestamp in server time for boical class
+			));
+			if (!$events)
+			{
+				$msg = lang('No events found');
+			}
+			else
+			{
+				$ical =& ExecMethod('calendar.boical.exportVCal',$events/*,$content['version']*/);
+				$GLOBALS['egw']->browser =& CreateObject('phpgwapi.browser');
+				$GLOBALS['egw']->browser->content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',strlen($ical));
+				echo $ical;
+				$GLOBALS['egw']->common->egw_exit();
+			}
+		}
+		if (!is_array($content))
+		{
+			$view = $GLOBALS['egw']->session->appsession('view','calendar');
+
+			$content = array(
+				'start' => $this->bo->date2ts($_REQUEST['start'] ? $_REQUEST['start'] : $this->date),
+				'end'   => $this->bo->date2ts($_REQUEST['end'] ? $_REQUEST['end'] : $this->date),
+				'file'  => 'event.ics',
+				'version' => '2.0',
+			);
+		}
+		$content['msg'] = $msg;
+		
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
+		$etpl =& CreateObject('etemplate.etemplate','calendar.export');
+		
+		$etpl->exec('calendar.uiforms.export',$content);
+	}
+	
+	/**
+	 * Import events as vCalendar version 2.0 files (iCal)
+	 *
+	 * @param array $content=null submitted content from etempalte::exec
+	 */
+	function import($content=null)
+	{
+		if (is_array($content))
+		{
+			if (is_array($content['ical_file']) && is_uploaded_file($content['ical_file']['tmp_name']))
+			{
+				if (!ExecMethod('calendar.boical.importVCal',file_get_contents($content['ical_file']['tmp_name'])))
+				{
+					$msg = lang('Error: importing the iCal');
+				}
+				else
+				{
+					$msg = lang('iCal successful imported');
+				}
+			}
+			else
+			{
+				$msg = lang('You need to select an iCal file first');
+			}
+		}
+		$content = array(
+			'msg' => $msg,
+		);
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Import');
+		$etpl =& CreateObject('etemplate.etemplate','calendar.import');
+		
+		$etpl->exec('calendar.uiforms.import',$content);
+	}
 }
diff --git a/calendar/inc/class.uiholiday.inc.php b/calendar/inc/class.uiholiday.inc.php
index f875f0bc1f..da39374f5b 100755
--- a/calendar/inc/class.uiholiday.inc.php
+++ b/calendar/inc/class.uiholiday.inc.php
@@ -1,19 +1,26 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Modified by Mark Peters <skeeter@phpgroupware.org>                       *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* eGroupWare - Calendar                                                    *
+	* http://www.egroupware.org                                                *
+	* Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
+	*          http://www.radix.net/~cknudsen                                  *
+	* Modified by Mark Peters <skeeter@phpgroupware.org>                       *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
 	/* $Id$ */
 
+	/**
+	 * User interface for calendar holidays
+	 *
+	 * @package calendar
+	 * @author Mark Peters <skeeter@phpgroupware.org>
+	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+	 */
 	class uiholiday
 	{
 		var $debug = False;
@@ -35,30 +42,42 @@
 
 		function uiholiday()
 		{
-			$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
+			$GLOBALS['egw']->nextmatchs =& CreateObject('phpgwapi.nextmatchs');
 
-			$this->bo = CreateObject('calendar.boholiday');
+			$this->bo =& CreateObject('calendar.boholiday');
 			$this->bo->check_admin();
 			$this->base_url = $this->bo->base_url;
-			$this->template_dir = $GLOBALS['phpgw']->common->get_tpl_dir('calendar');
-			$this->sb = CreateObject('phpgwapi.sbox');
+			$this->template_dir = $GLOBALS['egw']->common->get_tpl_dir('calendar');
+			$this->sb =& CreateObject('phpgwapi.sbox');
 
 			// jscalendar is needed by the new navigation-menu AND it need to be loaded befor the header !!!
-			if (!is_object($GLOBALS['phpgw']->jscalendar))
+			if (!is_object($GLOBALS['egw']->jscalendar))
 			{
-				$GLOBALS['phpgw']->jscalendar = CreateObject('phpgwapi.jscalendar');
+				$GLOBALS['egw']->jscalendar =& CreateObject('phpgwapi.jscalendar');
 			}
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Holiday Management');
+			$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Holiday Management');
+			
+			$GLOBALS['egw']->template->set_var('help_msg',lang('<b>Please note</b>: The calendar use the holidays of your country, which is set to %1. You can change it in your %2.<br />Holidays are %3 automatic installed from %4. You can changed it in %5.',
+				'<b>'.$GLOBALS['egw_info']['user']['preferences']['common']['country'].'</b>','<a href="'.$GLOBALS['egw']->link('/index.php',array(
+					'menuaction' => 'preferences.uisettings.index',
+					'appname'    => 'preferences',
+				)).'">'.lang('common preferences').'</a>',$GLOBALS['egw_info']['server']['auto_load_holidays'] ? '' : '<b>'.lang('not').'</b>',
+				'<b>'.$GLOBALS['egw_info']['server']['holidays_url_path'].'</b>',
+				'<a href="'.$GLOBALS['egw']->link('/index.php',array(
+					'menuaction' => 'admin.uiconfig.index',
+					'appname'    => 'calendar',
+				)).'">'.lang('admin').' >> '.lang('calendar').' >> '.lang('site configuration').'</a>'));
+			$GLOBALS['egw']->template->set_var('total','');
 		}
 
 		function admin()
 		{
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw']->common->phpgw_header();
+			unset($GLOBALS['egw_info']['flags']['noheader']);
+			unset($GLOBALS['egw_info']['flags']['nonavbar']);
+			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
+			$GLOBALS['egw']->common->egw_header();
 
-			$p = &$GLOBALS['phpgw']->template;
+			$p = &$GLOBALS['egw']->template;
 			$p->set_file(Array('locales'=>'locales.tpl'));
 			$p->set_block('locales','list','list');
 			$p->set_block('locales','row','row');
@@ -66,11 +85,11 @@
 			$p->set_block('locales','submit_column','submit_column');
 
 			$var = Array(
-				'th_bg'		=> $GLOBALS['phpgw_info']['theme']['th_bg'],
-				'left_next_matchs'	=> $GLOBALS['phpgw']->nextmatchs->left('/index.php?menuaction=calendar.uiholiday.admin',$this->bo->start,$this->bo->total),
-				'right_next_matchs'	=> $GLOBALS['phpgw']->nextmatchs->right('/index.php?menuaction=calendar.uiholiday.admin',$this->bo->start,$this->bo->total),
+				'th_bg'		=> $GLOBALS['egw_info']['theme']['th_bg'],
+				'left_next_matchs'	=> $GLOBALS['egw']->nextmatchs->left('/index.php?menuaction=calendar.uiholiday.admin',$this->bo->start,$this->bo->total),
+				'right_next_matchs'	=> $GLOBALS['egw']->nextmatchs->right('/index.php?menuaction=calendar.uiholiday.admin',$this->bo->start,$this->bo->total),
 				'center'			=> '<td align="center">'.lang('Countries').'</td>',
-				'sort_name'		=> $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->bo->sort,'locale',$this->bo->order,'/calendar/'.basename($SCRIPT_FILENAME),lang('Country')),
+				'sort_name'		=> $GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort,'locale',$this->bo->order,'/calendar/'.basename($SCRIPT_FILENAME),lang('Country')),
 				'header_edit'	=> lang('Edit'),
 				'header_delete'	=> lang('Delete'),
 				'header_extra'	=> lang('Submit to Repository'),
@@ -94,16 +113,16 @@
 				$p->set_var('submit_extra',' width="5%"');
 				while (list(,$value) = each($locales))
 				{
-					$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+					$tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color);
 					if (! $value)  $value  = '&nbsp;';
 
 					$var = Array(
 						'tr_color'		=> $tr_color,
 						'group_name'	=> $value,
-						'edit_link'		=> '<a href="'.$GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$value)) . '"> '.lang('Edit').' </a>',
-						'delete_link'	=> '<a href="'.$GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.delete_locale','locale'=>$value)).'"> '.lang('Delete').' </a>',
-						'extra_link'	=> '<a href="'.$GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.submit','locale'=>$value)).'"> '.lang('Submit').' </a>'.
-							' &nbsp; &nbsp; <a href="'.$GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.submit','locale'=>$value,'download'=>1)).'"> '.lang('Download').' </a>'
+						'edit_link'		=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$value)) . '"> '.lang('Edit').' </a>',
+						'delete_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.delete_locale','locale'=>$value)).'"> '.lang('Delete').' </a>',
+						'extra_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.submit','locale'=>$value)).'"> '.lang('Submit').' </a>'.
+							' &nbsp; &nbsp; <a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.submit','locale'=>$value,'download'=>1)).'"> '.lang('Download').' </a>'
 					);
 					$p->set_var($var);
 					$p->parse('rows','row',True);
@@ -111,9 +130,9 @@
 			}
 
 			$var = Array(
-				'new_action'		=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','id'=>0)),
+				'new_action'		=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','id'=>0)),
 				'lang_add'			=> lang('add'),
-				'search_action'	=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
+				'search_action'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
 				'lang_search'		=> lang('search')
 			);
 
@@ -137,24 +156,24 @@
 				$link_params = Array(
 					'menuaction'	=> 'calendar.uiholiday.admin'
 				);
-				$GLOBALS['phpgw']->redirect_link($this->base_url,$link_params);
+				$GLOBALS['egw']->redirect_link($this->base_url,$link_params);
 			}
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw']->common->phpgw_header();
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
+			unset($GLOBALS['egw_info']['flags']['noheader']);
+			unset($GLOBALS['egw_info']['flags']['nonavbar']);
+			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
+			$GLOBALS['egw']->common->egw_header();
+			$p =& $GLOBALS['egw']->template;
 			$p->set_file(Array('locale'=>'locales.tpl'));
 			$p->set_block('locale','list','list');
 			$p->set_block('locale','row','row');
 			$p->set_block('locale','row_empty','row_empty');
 			$p->set_block('locale','back_button_form','back_button_form');
 
-			if (!is_object($GLOBALS['phpgw']->html))
+			if (!is_object($GLOBALS['egw']->html))
 			{
-				$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
+				$GLOBALS['egw']->html =& CreateObject('phpgwapi.html');
 			}
-			$html = &$GLOBALS['phpgw']->html;
+			$html = &$GLOBALS['egw']->html;
 			$year_form = str_replace('<option value=""></option>','',$html->form($html->sbox_submit($this->sb->getYears('year',$this->bo->year),true),array(),
 				$this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0])));
 			unset($html);
@@ -163,14 +182,14 @@
 			$total = count($holidays);
 
 			$var = Array(
-				'th_bg'				=> $GLOBALS['phpgw_info']['theme']['th_bg'],
-				'left_next_matchs'	=> $GLOBALS['phpgw']->nextmatchs->left('/index.php',$this->bo->start,$total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
-				'right_next_matchs'	=> $GLOBALS['phpgw']->nextmatchs->right('/index.php',$this->bo->start,$total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
+				'th_bg'				=> $GLOBALS['egw_info']['theme']['th_bg'],
+				'left_next_matchs'	=> $GLOBALS['egw']->nextmatchs->left('/index.php',$this->bo->start,$total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
+				'right_next_matchs'	=> $GLOBALS['egw']->nextmatchs->right('/index.php',$this->bo->start,$total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
 				'center'			=> '<td align="right">'.lang('Holidays').' ('.$this->bo->locales[0].')</td><td align="left">'.$year_form.'</td>',
-				'sort_name'			=> $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->bo->sort,'name',$this->bo->order,'/index.php',lang('Holiday'),'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
+				'sort_name'			=> $GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort,'name',$this->bo->order,'/index.php',lang('Holiday'),'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
 				'header_edit'		=> lang('Edit'),
 				'header_delete'		=> lang('Delete'),
-				'header_rule'		=> '<td>'.$GLOBALS['phpgw']->nextmatchs->show_sort_order($this->bo->sort,'month_num,mday',$this->bo->order,'/index.php',lang('Rule'),'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year).'</td>',
+				'header_rule'		=> '<td>'.$GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort,'month_num,mday',$this->bo->order,'/index.php',lang('Rule'),'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year).'</td>',
 				'header_extra'		=> lang('Copy'),
 				'extra_width'		=> 'width="5%"'
 			);
@@ -179,17 +198,18 @@
 
 			if (!count($holidays))
 			{
-				$p->set_var('message',lang('no matches found'));
-				$p->parse('rows','row_empty',True);
+				$p->set_var('total',lang('no matches found'));
+				//$p->parse('rows','row_empty',True);
 			}
 			else
 			{
-				$maxmatchs = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+				$maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
 				$end = min($total,$this->bo->start+$maxmatchs);
-				$p->set_var('rows',lang('showing %1 - %2 of %3',1+$this->bo->start,$end,$total));
+				$p->set_var('total',lang('showing %1 - %2 of %3',1+$this->bo->start,$end,$total));
+				//$p->parse('rows','row_empty',True);
 				for($i=$this->bo->start; $i < $end; $i++)
 				{
-					$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+					$tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color);
 					if (!$holidays[$i]['name'])
 					{
 						$holidays[$i]['name'] = '&nbsp;';
@@ -200,9 +220,9 @@
 						'header_delete'=> lang('Delete'),
 						'group_name'	=> $holidays[$i]['name'],
 						'rule'			=> '<td>'.$this->bo->rule_string($holidays[$i]).'</td>',
-						'edit_link'		=> '<a href="'.$GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Edit').' </a>',
-						'extra_link'	=> '<a href="'.$GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.copy_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Copy').' </a>',
-						'delete_link'	=> '<a href="'.$GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.delete_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Delete').' </a>'
+						'edit_link'		=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Edit').' </a>',
+						'extra_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.copy_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Copy').' </a>',
+						'delete_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.delete_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Delete').' </a>'
 					);
 
 					$p->set_var($var);
@@ -211,11 +231,11 @@
 			}
 
 			$var = Array(
-				'new_action'	=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','locale'=>$this->bo->locales[0],'id'=>0,'year'=>$this->bo->year)),
+				'new_action'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','locale'=>$this->bo->locales[0],'id'=>0,'year'=>$this->bo->year)),
 				'lang_add'		=> lang('add'),
-				'back_action'	=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
+				'back_action'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
 				'lang_back'		=> lang('Back'),
-				'search_action'=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0],'year'=>$this->bo->year)),
+				'search_action'=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0],'year'=>$this->bo->year)),
 				'lang_search'	=> lang('search')
 			);
 			$p->set_var($var);
@@ -248,20 +268,20 @@
 			{
 				$holiday['locale'] = $this->locale;
 			}
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday');
-			$GLOBALS['phpgw']->common->phpgw_header();
+			unset($GLOBALS['egw_info']['flags']['noheader']);
+			unset($GLOBALS['egw_info']['flags']['nonavbar']);
+			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
+			$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday');
+			$GLOBALS['egw']->common->egw_header();
 
-			$t = &$GLOBALS['phpgw']->template;
+			$t = &$GLOBALS['egw']->template;
 			$t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_script.tpl'));
 			$t->set_block('holiday','form','form');
 			$t->set_block('holiday','list','list');
 
 			if (@count($error))
 			{
-				$message = $GLOBALS['phpgw']->common->error_list($error);
+				$message = $GLOBALS['egw']->common->error_list($error);
 			}
 			else
 			{
@@ -271,7 +291,7 @@
 			$var = Array(
 				'title_holiday' => ($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday'),
 				'message'       => $message,
-				'actionurl'     => $GLOBALS['phpgw']->link($this->base_url,'menuaction=calendar.boholiday.add&year='.$this->bo->year),
+				'actionurl'     => $GLOBALS['egw']->link($this->base_url,'menuaction=calendar.boholiday.add&year='.$this->bo->year),
 				'hidden_vars'   => '<input type="hidden" name="holiday[hol_id]" value="'.$this->bo->id.'">'."\n"
 					. '<input type="hidden" name="holiday[locales]" value="'.$this->bo->locales[0].'">'."\n"
 			);
@@ -284,7 +304,7 @@
 			$this->display_item($t,lang('title'),'<input name="holiday[name]" size="60" maxlength="50" value="'.$holiday['name'].'">');
 
 // Date
-			$this->display_item($t,lang('Date'),$GLOBALS['phpgw']->common->dateformatorder($this->sb->getYears('holiday[year]',$holiday['occurence']>1900?$holiday['occurence']:0),$this->sb->getMonthText('holiday[month_num]',$holiday['month']),$this->sb->getDays('holiday[mday]',$holiday['day'])).
+			$this->display_item($t,lang('Date'),$GLOBALS['egw']->common->dateformatorder($this->sb->getYears('holiday[year]',$holiday['occurence']>1900?$holiday['occurence']:0),$this->sb->getMonthText('holiday[month_num]',$holiday['month']),$this->sb->getDays('holiday[mday]',$holiday['day'])).
 				'&nbsp;'.lang('Set a Year only for one-time / non-regular holidays.'));
 
 // Occurence
@@ -343,7 +363,7 @@
 			}
 			
 			$t->set_var(Array(
-				'action_url_button'	=> $GLOBALS['phpgw']->link($this->base_url,$link_params),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,$link_params),
 				'action_text_button'	=> lang('Cancel'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
@@ -359,7 +379,7 @@
 					'id'			=> $this->bo->id
 				);
 				$t->set_var(Array(
-					'action_url_button'	=> $GLOBALS['phpgw']->link($this->base_url,$link_params),
+					'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,$link_params),
 					'action_text_button'	=> lang('Delete'),
 					'action_confirm_button'	=> '',
 					'action_extra_field'	=> ''
@@ -381,18 +401,18 @@
 				$this->admin();
 			}
 
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw']->common->phpgw_header();
+			unset($GLOBALS['egw_info']['flags']['noheader']);
+			unset($GLOBALS['egw_info']['flags']['nonavbar']);
+			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
+			$GLOBALS['egw']->common->egw_header();
 
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
+			$p =& CreateObject('phpgwapi.Template',$this->template_dir);
 			$p->set_file(Array('form'=>'delete_common.tpl','form_button'=>'form_button_script.tpl'));
 		
 			$p->set_var('messages',lang('Are you sure you want to delete this Country ?')."<br>".$this->bo->locales[0]);
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
 				'action_text_button'	=> lang('No'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
@@ -401,7 +421,7 @@
 			$p->parse('no','form_button');
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.boholiday.delete_locale','locale'=>$this->bo->locales[0])),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.boholiday.delete_locale','locale'=>$this->bo->locales[0])),
 				'action_text_button'	=> lang('Yes'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
@@ -421,18 +441,18 @@
 				$this->edit_locale();
 			}
 			
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw']->common->phpgw_header();
+			unset($GLOBALS['egw_info']['flags']['noheader']);
+			unset($GLOBALS['egw_info']['flags']['nonavbar']);
+			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
+			$GLOBALS['egw']->common->egw_header();
 
-			$p = CreateObject('phpgwapi.Template',$this->template_dir);
+			$p =& CreateObject('phpgwapi.Template',$this->template_dir);
 			$p->set_file(Array('form'=>'delete_common.tpl','form_button'=>'form_button_script.tpl'));
 		
 			$p->set_var('messages',lang('Are you sure you want to delete this holiday ?')."<br>".$holiday['name'].' ('.$this->bo->locales[0].') '.$this->bo->rule_string($holiday));
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0],'year'=>$this->bo->year)),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0],'year'=>$this->bo->year)),
 				'action_text_button'	=> lang('No'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
@@ -441,7 +461,7 @@
 			$p->parse('no','form_button');
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['phpgw']->link($this->base_url,Array('menuaction'=>'calendar.boholiday.delete_holiday','locale'=>$this->bo->locales[0],'id'=>$this->bo->id,'year'=>$this->bo->year)),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.boholiday.delete_holiday','locale'=>$this->bo->locales[0],'id'=>$this->bo->id,'year'=>$this->bo->year)),
 				'action_text_button'	=> lang('Yes'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
@@ -460,46 +480,61 @@
 			}
 			$this->bo->year = 0;	// for a complete list with all years
 			$holidays = $this->bo->get_holiday_list();
+			
+			if (!is_array($holidays) || !count($holidays))
+			{
+				$this->admin();
+			}
+			// sort holidays by year / occurence:
+			usort($holidays,'_holiday_cmp');
 
 			if (isset($_GET['download']))
 			{
 				$locale = $this->bo->locales[0];
-				$browser = CreateObject('phpgwapi.browser');
+				$browser =& CreateObject('phpgwapi.browser');
 				$browser->content_header("holidays.$locale.csv",'text/text');
 				unset($browser);
 
-				while (list(,$holiday) = @each($holidays))
+				echo "charset\t".$GLOBALS['egw']->translation->charset()."\n";
+				$last_year = -1;
+				foreach($holidays as $holiday)
 				{
+					$year = $holiday['occurence'] <= 0 ? 0 : $holiday['occurence'];
+					if ($year != $last_year)
+					{
+						echo "\n".($year ? $year : 'regular (year=0)').":\n";
+						$last_year = $year;
+					}
 					echo "$locale\t$holiday[name]\t$holiday[day]\t$holiday[month]\t$holiday[occurence]\t$holiday[dow]\t$holiday[observance_rule]\n";
 				}
-				$GLOBALS['phpgw']->common->phpgw_exit();
+				$GLOBALS['egw']->common->egw_exit();
 			}
-			elseif($this->debug)
+			if($this->debug)
 			{
-				$action = $GLOBALS['phpgw']->link('/calendar/phpgroupware.org/accept_holiday.php');
+				$action = $GLOBALS['egw']->link('/calendar/egroupware.org/accept_holiday.php');
 			}
 			else
 			{
 				$action = 'http://www.egroupware.org/cal/accept_holiday.php';
 			}
-			$GLOBALS['phpgw_info']['flags']['noappheader']	= True;
-			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
-			$GLOBALS['phpgw_info']['flags']['nofooter'] = True;
-			$GLOBALS['phpgw']->common->phpgw_header();
+			$GLOBALS['egw_info']['flags']['noappheader']	= True;
+			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
+			$GLOBALS['egw_info']['flags']['nofooter'] = True;
+			$GLOBALS['egw']->common->egw_header();
 
 			echo '<body onLoad="document.submitform.submit()">'."\n";
 			echo '<form action="'.$action.'" method="post" name="submitform">'."\n";
 
-			$c_holidays = count($holidays);
 			echo '<input type="hidden" name="locale" value="'.$this->bo->locales[0].'">'."\n";
-			for($i=0;$i<$c_holidays;$i++)
+			echo '<input type="hidden" name="charset" value="'.$GLOBALS['egw']->translation->charset().'">'."\n";
+			foreach($holidays as $holiday)
 			{
-				echo '<input type="hidden" name="name[]" value="'.htmlspecialchars($holidays[$i]['name']).'">'."\n"
-					. '<input type="hidden" name="day[]" value="'.$holidays[$i]['day'].'">'."\n"
-					. '<input type="hidden" name="month[]" value="'.$holidays[$i]['month'].'">'."\n"
-					. '<input type="hidden" name="occurence[]" value="'.$holidays[$i]['occurence'].'">'."\n"
-					. '<input type="hidden" name="dow[]" value="'.$holidays[$i]['dow'].'">'."\n"
-					. '<input type="hidden" name="observance[]" value="'.$holidays[$i]['observance_rule'].'">'."\n";
+				echo '<input type="hidden" name="name[]" value="'.htmlspecialchars($holiday['name']).'">'."\n"
+					. '<input type="hidden" name="day[]" value="'.$holiday['day'].'">'."\n"
+					. '<input type="hidden" name="month[]" value="'.$holiday['month'].'">'."\n"
+					. '<input type="hidden" name="occurence[]" value="'.$holiday['occurence'].'">'."\n"
+					. '<input type="hidden" name="dow[]" value="'.$holiday['dow'].'">'."\n"
+					. '<input type="hidden" name="observance[]" value="'.$holiday['observance_rule'].'">'."\n\n";
 			}
 			echo "</form>\n</body>\n</head>";
 		}
@@ -508,7 +543,7 @@
 		function display_item(&$p,$field,$data)
 		{
 			$var = Array(
-				'tr_color' => $GLOBALS['phpgw']->nextmatchs->alternate_row_color(),
+				'tr_color' => $GLOBALS['egw']->nextmatchs->alternate_row_color(),
 				'field'	=> $field,
 				'data'	=> $data
 			);
diff --git a/calendar/inc/class.uiicalendar.inc.php b/calendar/inc/class.uiicalendar.inc.php
deleted file mode 100755
index 6fb733aca4..0000000000
--- a/calendar/inc/class.uiicalendar.inc.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Modified by Mark Peters <skeeter@phpgroupware.org>                       *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	class uiicalendar
-	{
-		var $bo;
-		var $template;
-
-		var $public_functions = array(
-			'test'		=> True,
-			'import'		=> True
-		);
-
-
-
-		function uiicalendar()
-		{
-			$this->bo = CreateObject('calendar.boicalendar');
-			$this->template = $GLOBALS['phpgw']->template;
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Calendar - [iv]Cal Importer');
-
-			// jscalendar is needed by the new navigation-menu AND it need to be loaded befor the header !!!
-			if (!is_object($GLOBALS['phpgw']->jscalendar))
-			{
-				$GLOBALS['phpgw']->jscalendar = CreateObject('phpgwapi.jscalendar');
-			}
-		}
-
-		function print_test($val,$title,$x_pre='')
-		{
-//			echo 'VAL = '._debug_array($val,False)."<br>\n";
-			if(is_array($val))
-			{
-				@reset($val);
-				while(list($key,$value) = each($val))
-				{
-					if(is_array($key))
-					{
-						$this->print_test($key,$title,$x_pre);
-					}
-					elseif(is_array($value))
-					{
-						$this->print_test($value,$title,$x_pre);
-					}
-					else
-					{
-						if($x_pre && $key == 'name')
-						{
-							$x_key = $x_pre.$value;
-							list($key,$value) = each($val);
-							$key=$x_key;
-						}
-						if($this->bo->parameter[$key]['type'] == 'function')
-						{
-							$function = $this->bo->parameter[$key]['function'];
-							$v_value = $this->bo->$function($value);
-						}
-						else
-						{
-							$v_value = $value;
-						}
-						echo $title.' ('.$key.') = '.$v_value."<br>\n";
-					}
-				}
-			}
-			elseif($val != '')
-			{
-				echo $title.' = '.$val."<br>\n";
-			}
-		}
-
-		function test()
-		{
-			$print_events = True;
-			
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			echo "Start Time : ".$GLOBALS['phpgw']->common->show_date()."<br>\n";
-			@set_time_limit(0);
-
-			$icsfile=PHPGW_APP_INC.'/events.ics';
-			$fp=fopen($icsfile,'rt');
-			$contents = explode("\n",fread($fp, filesize($icsfile)));
-			fclose($fp);
-
-			$vcalendar = $this->bo->parse($contents);
-
-			if($print_events)
-			{
-				$this->print_test($vcalendar['prodid'],'Product ID');
-				$this->print_test($vcalendar['method'],'Method');
-				$this->print_test($vcalendar['version'],'Version');
-
-				for($i=0;$i<count($vcalendar['event']);$i++)
-				{
-					$event = $vcalendar['event'][$i];
-
-					echo "<br>\nEVENT<br>\n";
-//					echo 'TEST Debug : '._debug_array($event,False)."<br>\n";
-					$this->print_test($event['uid'],'UID','X-');
-					$this->print_test($event['valscale'],'Calscale','X-');
-					$this->print_test($event['description'],'Description','X-');
-					$this->print_test($event['summary'],'Summary','X-');
-					$this->print_test($event['comment'],'Comment','X-');
-					$this->print_test($event['location'],'Location','X-');
-					$this->print_test($event['sequence'],'Sequence','X-');
-					$this->print_test($event['priority'],'Priority','X-');
-					$this->print_test($event['categories'],'Categories','X-');
-					$this->print_test($event['dtstart'],'Date Start','X-');
-					$this->print_test($event['dtstamp'],'Date Stamp','X-');
-					$this->print_test($event['rrule'],'Recurrence','X-');
-
-					echo "Class = ".$this->bo->switch_class($event['class'])."<br>\n";
-
-					$this->print_test($event['organizer'],'Organizer','X-');
-					$this->print_test($event['attendee'],'Attendee','X-');
-					$this->print_test($event['x_type'],'X-Type','X-');
-					$this->print_test($event['alarm'],'Alarm','X-');
-				}
-			}
-
-/*
-			for($i=0;$i<count($vcalendar->todo);$i++)
-			{
-				echo "<br>\nTODO<br>\n";
-				if($vcalendar['todo'][$i]['summary']['value'])
-				{
-					echo "Summary = ".$vcalendar['todo'][$i]['summary']['value']."<br>\n";
-				}
-				if($vcalendar['todo'][$i]['description']['value'])
-				{
-					echo "Description (Value) = ".$vcalendar['todo'][$i]['description']['value']."<br>\n";
-				}
-				if($vcalendar['todo'][$i]['description']['altrep'])
-				{
-					echo "Description (Alt Rep) = ".$vcalendar['todo'][$i]['description']['altrep']."<br>\n";
-				}
-				if($vcalendar['todo'][$i]['location']['value'])
-				{
-					echo "Location = ".$vcalendar['todo'][$i]['location']['value']."<br>\n";
-				}
-				echo "Sequence = ".$vcalendar['todo'][$i]['sequence']."<br>\n";	
-				echo "Date Start : ".$GLOBALS['phpgw']->common->show_date(mktime($vcalendar['todo'][$i]['dtstart']['hour'],$vcalendar['todo'][$i]['dtstart']['min'],$vcalendar['todo'][$i]['dtstart']['sec'],$vcalendar['todo'][$i]['dtstart']['month'],$vcalendar['todo'][$i]['dtstart']['mday'],$vcalendar['todo'][$i]['dtstart']['year']) - $this->datatime->tz_offset)."<br>\n";
-				echo "Class = ".$vcalendar['todo'][$i]['class']['value']."<br>\n";
-			}
-
-*/
-			include(PHPGW_APP_INC.'/../setup/setup.inc.php');
-
-			$this->bo->set_var($vcalendar['prodid'],'value','-//phpGroupWare//phpGroupWare '.$setup_info['calendar']['version'].' MIMEDIR//'.strtoupper($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']));
-			$this->bo->set_var($vcalendar['version'],'value','2.0');
-			$this->bo->set_var($vcalendar['method'],'value',strtoupper('publish'));
-			echo "<br><br><br>\n";
-			echo nl2br($this->bo->build_ical($vcalendar));
-			echo "End Time : ".$GLOBALS['phpgw']->common->show_date()."<br>\n";
-		}
-
-		function import()
-		{
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw_info']['flags']['nonappheader'] = True;
-			$GLOBALS['phpgw_info']['flags']['nonappfooter'] = True;
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			if(!@is_dir($GLOBALS['phpgw_info']['server']['temp_dir']))
-			{
-				mkdir($GLOBALS['phpgw_info']['server']['temp_dir'],0700);
-			}
-
-			echo '<body bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '">';
-
-			if ($GLOBALS['HTTP_GET_VARS']['action'] == 'GetFile')
-			{
-				echo '<b><center>' . lang('You must select a [iv]Cal. (*.[iv]cs)') . '</b></center><br><br>';
-			}
-
- 			$this->template->set_file(
- 				Array(
- 					'vcalimport' => 'vcal_import.tpl'
- 				)
- 			);
-
-			$var = Array(
-				'vcal_header'	=> '<p>',
-				'ical_lang'		=> lang('(i/v)Cal'),
-				'action_url'	=> $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.boicalendar.import'),
-				'lang_access'	=> lang('Access'),
-				'lang_groups'	=> lang('Which groups'),
-				'access_option'=> $access_option,
-				'group_option'	=> $group_option,
-				'load_vcal'	=> lang('Load [iv]Cal')
-			);
-			$this->template->set_var($var);
-			$this->template->pparse('out','vcalimport');
-		}
-	}
-?>
diff --git a/calendar/inc/class.uilist.inc.php b/calendar/inc/class.uilist.inc.php
new file mode 100644
index 0000000000..f6f356ce16
--- /dev/null
+++ b/calendar/inc/class.uilist.inc.php
@@ -0,0 +1,204 @@
+<?php
+/**************************************************************************\
+* eGroupWare - Calendar - Listview and Search                             *
+* http://www.egroupware.org                                                *
+* Written and (c) 2005 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* --------------------------------------------                             *
+*  This program is free software; you can redistribute it and/or modify it *
+*  under the terms of the GNU General Public License as published by the   *
+*  Free Software Foundation; either version 2 of the License, or (at your  *
+*  option) any later version.                                              *
+\**************************************************************************/
+
+/* $Id$ */
+
+include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
+
+/**
+ * Class to generate the calendar listview and the search
+ *
+ * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
+ *  UI only operates in user-time, so there have to be no conversation at all !!!
+ *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
+ *  SO operates only on server-time
+ *
+ * The state of the UI elements is managed in the uical class, which all UI classes extend.
+ *
+ * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
+ *
+ * @package calendar
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2004/5 by RalfBecker-At-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ */
+class uilist extends uical
+{
+	var $public_functions = array(
+		'listview'  => True,
+	);
+	/**
+	 * @var $debug mixed integer level or string function- or widget-name
+	 */
+	var $debug=false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
+	 */
+	function uilist($set_states=null)
+	{
+		$this->uical(false,$set_states);	// call the parent's constructor
+
+		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Listview');
+		
+		$this->date_filters = array(
+			'after'  => lang('After current date'),
+			'before' => lang('Before current date'),
+			'all'    => lang('All events'),
+		);
+	}
+	
+	/**
+	 * Show the calendar on the home page
+	 *
+	 * @return string with content
+	 */
+	function &home()
+	{
+		// set the defaults for the home-page
+		$this->uilist(array(
+			'date'       => $this->bo->date2string($this->bo->now_su),
+			'cat_id'     => 0,
+			'filter'     => 'all',
+			'owner'      => $this->user,
+			'multiple'   => 0,
+			'view'       => $this->bo->cal_prefs['defaultcalendar'],			
+		));
+		$GLOBALS['egw']->session->appsession('calendar_list','calendar','');	// in case there's already something set
+
+		return $this->listview(null,'',true);
+	}	
+	
+	/**
+	 * Show the listview
+	 */
+	function listview($content=null,$msg='',$home=false)
+	{
+		if ($_GET['msg']) $msg = $_GET['msg'];
+
+		$etpl =& CreateObject('etemplate.etemplate','calendar.list');
+		
+		$content = array(
+			'nm' => $GLOBALS['egw']->session->appsession('calendar_list','calendar'),
+			'msg'      => $msg,
+		);
+		if (!is_array($content['nm']))
+		{
+			$content['nm'] = array(
+				'get_rows'       =>	'calendar.uilist.get_rows',
+	 			'filter_no_lang' => True,	// I  set no_lang for filter (=dont translate the options)
+				'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
+				'no_cat'         => True,	// I  disable the cat-selectbox
+//				'bottom_too'     => True,// I  show the nextmatch-line (arrows, filters, search, ...) again after the rows
+				'filter'         => 'after',
+				'order'          =>	'cal_start',// IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+			);
+		}
+		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
+		{
+			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
+		}
+		return $etpl->exec('calendar.uilist.listview',$content,array(
+			'filter' => &$this->date_filters,
+		),$readonlys,'',$home ? -1 : 0);
+	}
+	
+	/**
+	 * set filter for search, so that everything is shown
+	 */
+	function adjust_for_search($keywords,&$params)
+	{
+		$params['search'] = $keywords;
+		$params['start']  = 0;
+		$params['order'] = 'cal_start';
+		if ($keywords)
+		{
+			$params['filter'] = 'all';
+			$params['sort'] = 'DESC';
+			unset($params['col_filter']['participant']);
+		}
+		else
+		{
+			$params['filter'] = 'after';
+			$params['sort'] = 'ASC';
+		}
+	}
+
+	/**
+	 * query calendar for nextmatch in the listview
+	 *
+	 * @internal 
+	 * @param array &$params parameters
+	 * @param array &$rows returned rows/events
+	 * @param array &$readonlys eg. to disable buttons based on acl
+	 */
+	function get_rows(&$params,&$rows,&$readonlys)
+	{
+		//echo "uilist::get_rows() params="; _debug_array($params);
+		$old_params = $GLOBALS['egw']->session->appsession('calendar_list','calendar');
+		if ($old_params['filter'] && $old_params['filter'] != $params['filter'])	// filter changed => order accordingly
+		{
+			$params['order'] = 'cal_start';
+			$params['sort'] = $params['filter'] == 'after' ? 'ASC' : 'DESC';
+		}
+		if ($old_params['search'] != $params['search'])
+		{
+			$this->adjust_for_search($params['search'],$params);
+		}
+		$GLOBALS['egw']->session->appsession('calendar_list','calendar',$params);
+		
+		$search_params = array(
+			'cat_id'  => $this->cat_id,
+			'filter'  => $this->filter,
+			'query'   => $params['search'],
+			'offset'  => (int) $params['start'],
+			'order'   => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start',
+		);
+		switch($params['filter'])
+		{
+			case 'all':
+				break;
+			case 'before':
+				$search_params['end'] = $this->date;
+				break;
+			case 'after':
+			default:
+				$search_params['start'] = $this->date;
+				break;
+		}
+		if ((int) $params['col_filter']['participant'])
+		{
+			$search_params['users'] = (int) $params['col_filter']['participant'];
+		}
+		elseif(empty($params['search']))	// active search displays entries from all users
+		{
+			$search_params['users'] = $this->is_group ? $this->g_owner : explode(',',$this->owner);
+		}
+		$rows = array();
+		foreach((array) $this->bo->search($search_params) as $event)
+		{
+			$readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event);
+			$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event);
+			$readonlys['view['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_READ,$event);
+
+			$event['parts'] = implode(",\n",$this->bo->participants($event));
+			if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
+			if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+			$rows[] = $event;
+		}
+		//_debug_array($rows);
+		return $this->bo->total;
+	}
+}
diff --git a/calendar/inc/class.uiviews.inc.php b/calendar/inc/class.uiviews.inc.php
index c216bc8cc9..79facf84d8 100644
--- a/calendar/inc/class.uiviews.inc.php
+++ b/calendar/inc/class.uiviews.inc.php
@@ -2,7 +2,7 @@
 /**************************************************************************\
 * eGroupWare - Calendar - Views and Widgets                                *
 * http://www.egroupware.org                                                *
-* Written and (c) 2004 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* Written and (c) 2004/5 by Ralf Becker <RalfBecker@outdoor-training.de>   *
 * --------------------------------------------                             *
 *  This program is free software; you can redistribute it and/or modify it *
 *  under the terms of the GNU General Public License as published by the   *
@@ -12,14 +12,15 @@
 
 /* $Id$ */
 
-include_once(PHPGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
+include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
 
 /**
  * Class to generate the calendar views and the necesary widgets
  *
  * @package calendar
- * @author RalfBecker@outdoor-training.de
- * @license GPL
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2004/5 by RalfBecker-At-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 class uiviews extends uical
 {
@@ -27,35 +28,57 @@ class uiviews extends uical
 		'day'   => True,
 		'week'  => True,
 		'month' => True,
+		'planner' => True,
 	);
 	/**
 	 * @var $debug mixed integer level or string function- or widget-name
 	 */
-	var $debug=False;
+	var $debug=false;
 
 	/**
 	 * @var minimum width for an event
 	 */
 	var $eventCol_min_width = 80;
+	
+	/**
+	 * @var int $extraRows extra rows above and below the workday
+	 */
+	var $extraRows = 1;
 
 	var $timeRow_width = 40;
 
 	/**
-	 * Constructor
+	 * @var int $rowsToDisplay how many rows per day get displayed, gets set be the timeGridWidget
 	 */
-	function uiviews()
+	var $rowsToDisplay;
+
+	/**
+	 * @var int $rowHeight height in percent of one row, gets set be the timeGridWidget
+	 */
+	var $rowHeigth;
+	
+	/**
+	 * @var array $search_params standard params for calling bocal::search for all views, set by the constructor
+	 */
+	var $search_params;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
+	 */
+	function uiviews($set_states=null)
 	{
-		$this->width = $this->establish_width();
+		$this->uical(false,$set_states);	// call the parent's constructor
 
-		$this->uical();	// call the parent's constructor
-
-		$GLOBALS['phpgw_info']['flags']['nonavbar'] = False;
+		$GLOBALS['egw_info']['flags']['nonavbar'] = False;
 		$app_header = array(
-			'calendar.uiviews.day' => lang('Dayview'),
-			'calendar.uiviews.week' => lang('Weekview'),
+			'calendar.uiviews.day'   => lang('Dayview'),
+			'calendar.uiviews.week'  => lang('Weekview'),
 			'calendar.uiviews.month' => lang('Monthview'),
+			'calendar.uiviews.planner' => lang('Group planner'),
 		);
-		$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].
+		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].
 			(isset($app_header[$_GET['menuaction']]) ? ' - '.$app_header[$_GET['menuaction']] : '');
 
 		// standard params for calling bocal::search for all views
@@ -66,41 +89,156 @@ class uiviews extends uical
 			'filter'  => $this->filter,
 			'daywise' => True,
 		);
-
 		$this->holidays = $this->bo->read_holidays($this->year);
 	}
+	
+	/**
+	 * Show the last view or the default one, if no last
+	 */
+	function index()
+	{
+		if (!$this->view) $this->view = 'week';
+
+		// handle views in other files
+		if (!isset($this->public_functions[$this->view]))
+		{
+			$GLOBALS['egw']->redirect_link('/index.php',array('menuaction'=>$this->view_menuaction));
+		}
+		// get manual to load the right page
+		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualCalendar'.ucfirst($this->view));
+		
+		$this->{$this->view}();
+	}
+	
+	/**
+	 * Show the calendar on the home page
+	 *
+	 * @return string with content
+	 */
+	function &home()
+	{
+		// set some stuff for the home-page
+		$this->uiviews(array(
+			'date'       => $this->bo->date2string($this->bo->now_su),
+			'cat_id'     => 0,
+			'filter'     => 'all',
+			'owner'      => substr($this->cal_prefs['defaultcalendar'],0,7) == 'planner' && $this->cal_prefs['planner_start_with_group'] ? 
+				$this->cal_prefs['planner_start_with_group'] : $this->user,
+			'multiple'   => 0,
+			'view'       => $this->bo->cal_prefs['defaultcalendar'],			
+		));
+		switch($this->cal_prefs['defaultcalendar'])
+		{
+			case 'planner_user':
+			case 'planner_cat':
+			case 'planner':
+				return $this->planner(true);
+
+			case 'month':
+				return $this->month(0,true);
+
+			default:
+			case 'week':
+				return $this->week(0,true);
+				
+			case 'day':
+				return $this->day(true);
+		}
+	}
+	
+	/**
+	 * Displays the planner view
+	 *
+	 * @param boolean $home=false if true return content suitable for home-page
+	 */
+	function &planner($home=false)
+	{
+		if (!$this->planner_days)	// planner monthview
+		{
+			if ($this->day < 15)	// show one complete month
+			{
+				$this->_week_align_month($this->first,$this->last);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+			}
+			else	// show 2 half month
+			{
+				$this->_week_align_month($this->first,$this->last,15);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->first)).' / '.lang(adodb_date('F',$this->last)).' '.$this->year;
+			}
+		}
+		elseif ($this->planner_days >= 5)	// weeekview
+		{
+			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+			$this->last = $this->bo->date2array($this->first);
+			$this->last['day'] += (int) $this->planner_days - 1;
+			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
+			unset($this->last['raw']);
+			$this->last = $this->bo->date2ts($this->last);
+			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
+		}
+		else // dayview
+		{
+			$this->first = $this->bo->date2ts($this->date);
+			$this->last = $this->bo->date2array($this->first);
+			$this->last['day'] += (int) $this->planner_days - 1;
+			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
+			unset($this->last['raw']);
+			$this->last = $this->bo->date2ts($this->last);
+			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.($this->planner_days == 1 ? lang(date('l',$this->first)).', ' : '').
+				$this->bo->long_date($this->first,$this->planner_days > 1 ? $this->last : 0);
+		}
+		
+		$search_params = $this->search_params;
+		$search_params['daywise'] = false;
+		$search_params['start'] = $this->first;
+		$search_params['end'] = $this->last;
+		$events = $this->bo->search($search_params);
+
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+
+		$content =& $this->plannerWidget($events,$this->first,$this->last,$this->sortby == 'user' ? false : (int) $this->cat_id);
+
+		if (!$home)
+		{
+			$GLOBALS['egw']->common->egw_header();
+			if ($_GET['msg']) echo '<p class="redItalic" align="center">'.$this->html->htmlspecialchars($_GET['msg'])."</p>\n";
+		
+			echo $content;
+		}
+		return $content;
+	}
 
 	/**
 	 * Displays the monthview or a multiple week-view
+	 *
+	 * @param int $weeks=0 number of weeks to show, if 0 (default) all weeks of one month are shows
+	 * @param boolean $home=false if true return content suitable for home-page
 	 */
-	function month($weeks=0)
+	function &month($weeks=0,$home=false)
 	{
 		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
 
-		$first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day=1);
 		if ($weeks)
 		{
-			$last = $first + $weeks * 7 * DAY_s - 1;
+			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day=1);
+			$this->last = $this->first + $weeks * 7 * DAY_s - 1;
 		}
 		else
 		{
-			$last = $this->datetime->get_weekday_start($this->year,$this->month,
-				$days_in_month=$this->datetime->days_in_month($this->month,$this->year));
-			$last += WEEK_s - 1;
+			$this->_week_align_month($this->first,$this->last);
 		}
-		if ($this->debug > 0)$this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($first),$this->bo->date2string($last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
 
-		$GLOBALS['phpgw_info']['flags']['app_header'] .= ': '.lang(date('F',$this->bo->date2ts($this->date))).' '.$this->year;
-		$GLOBALS['phpgw']->common->phpgw_header();
+		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
 
-		$search_params = $this->search_params;
-
-		$days = $this->bo->search(array(
-			'start'   => $first,
-			'end'     => $last,
+		$days =& $this->bo->search(array(
+			'start'   => $this->first,
+			'end'     => $this->last,
 		)+$this->search_params);
 
-		for ($week_start = $first; $week_start < $last; $week_start += WEEK_s)
+		$content = '';
+		// we add DAY_s/2 to $this->first (using 12h), to deal with daylight saving changes
+		for ($week_start = $this->first+DAY_s/2; $week_start < $this->last; $week_start += WEEK_s)
 		{
 			$week = array();
 			for ($i = 0; $i < 7; ++$i)
@@ -112,19 +250,57 @@ class uiviews extends uical
 				'menuaction' => 'calendar.uiviews.week',
 				'date' => $this->bo->date2string($week_start),
 			);
-			$title = lang('Wk').' '.date('W',$week_start);
+			$title = lang('Wk').' '.adodb_date('W',$week_start);
 			$title = $this->html->a_href($title,$week_view,'',' title="'.lang('Weekview').'"');
 
-			echo $this->timeGridWidget($week,max($this->width,7*$this->eventCol_min_width+$this->timeRow_width),60,5,'',$title);
+			$content .= $this->timeGridWidget($week,60,200,'',$title);
 		}
+		if (!$home)
+		{
+			$GLOBALS['egw']->common->egw_header();
+			if ($_GET['msg']) echo '<p class="redItalic" align="center">'.$this->html->htmlspecialchars($_GET['msg'])."</p>\n";
+		
+			echo $content;
+		}
+		return $content;
+	}
+
+	/**
+	 * get start and end of a month aligned to full weeks
+	 *
+	 * @param int &$first timestamp 0h of first day of week containing the first of the current month
+	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
+	 * @param int $day=1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
+	 */
+	function _week_align_month(&$first,&$last,$day=1)
+	{
+		$first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day=$day);
+		if ($day == 1)
+		{
+			$last = $this->datetime->get_weekday_start($this->year,$this->month,
+				$this->datetime->days_in_month($this->month,$this->year));
+		}
+		else
+		{
+			$last = $this->datetime->get_weekday_start($this->year,$this->month+1,$day);
+		}			
+		// now we need to calculate the end of the last day of that week
+		// as simple $last += WEEK_s - 1; does NOT work, if daylight saving changes in that week!!!
+		$last = $this->bo->date2array($last);
+		$last['day'] += 6; 
+		$last['hour'] = 23; 
+		$last['min'] = $last['sec'] = 59;
+		unset($last['raw']);	// otherwise date2ts does not calc raw new, but uses it
+		$last = $this->bo->date2ts($last);
 	}
 
 	/**
 	 * Displays the weekview, with 5 or 7 days
 	 *
 	 * @param int $days=0 number of days to show, if 0 (default) the value from the URL or the prefs is used
+	 * @param boolean $home=false if true return content suitable for home-page
 	 */
-	function week($days=0)
+	function week($days=0,$home=false)
 	{
 		if (!$days)
 		{
@@ -132,71 +308,136 @@ class uiviews extends uical
 			if ($days != 5) $days = 7;
 			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
 			{
-				$GLOBALS['phpgw']->preferences->add('calendar','days_in_weekview',$days);
-				$GLOBALS['phpgw']->preferences->save_repository();
+				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
 		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
 
-		$wd_start = $first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+		$wd_start = $this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
 		if ($days == 5)		// no weekend-days
 		{
 			switch($this->cal_prefs['weekdaystarts'])
 			{
 				case 'Saturday':
-					$first += DAY_s;
+					$this->first += DAY_s;
 					// fall through
 				case 'Sunday':
-					$first += DAY_s;
+					$this->first += DAY_s;
 					break;
 			}
 		}
-		//echo "<p>weekdaystarts='".$this->cal_prefs['weekdaystarts']."', get_weekday_start($this->year,$this->month,$this->day)=".date('l Y-m-d',$wd_start).", first=".date('l Y-m-d',$first)."</p>\n";
-		$last = $first + $days * DAY_s - 1;
+		//echo "<p>weekdaystarts='".$this->cal_prefs['weekdaystarts']."', get_weekday_start($this->year,$this->month,$this->day)=".date('l Y-m-d',$wd_start).", first=".date('l Y-m-d',$this->first)."</p>\n";
+		$this->last = $this->first + $days * DAY_s - 1;
 
-		$GLOBALS['phpgw_info']['flags']['app_header'] .= ': '.lang('Wk').' '.date('W',$first).
-			': '.$this->bo->long_date($first,$last);
-		$GLOBALS['phpgw']->common->phpgw_header();
+		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
 
 		$search_params = array(
-				'start'   => $first,
-				'end'     => $last,
+				'start'   => $this->first,
+				'end'     => $this->last,
 			) + $this->search_params;
 
 		$users = $this->search_params['users'];
 		if (!is_array($users)) $users = array($users);
 		
+		// for more then 3 users, show all in one row
+		if (count($users) > 3) $users = array($users);
+		
+		$content = '';
 		foreach($users as $user)
 		{
 			$search_params['users'] = $user;
-			echo $this->timeGridWidget($this->bo->search($search_params),
-				max($this->width,$days*$this->eventCol_min_width+$this->timeRow_width),
-				count($users) * $this->cal_prefs['interval'],count($users) * 1.7,'',
-				count($users) > 1 ? $GLOBALS['phpgw']->common->grab_owner_name($user) : '');
+			if (count($users) > 1)
+			{
+				$content .= '<b>'.$this->bo->participant_name($user)."</b>\n";
+			}
+			$content .= $this->timeGridWidget($this->bo->search($search_params),
+				count($users) * $this->cal_prefs['interval'],400 / count($users),'','',count($users) > 1 ? $user : 0);
 		}
+		if (!$home)
+		{
+			$GLOBALS['egw']->common->egw_header();
+			if ($_GET['msg']) echo '<p class="redItalic" align="center">'.$this->html->htmlspecialchars($_GET['msg'])."</p>\n";
+			
+			echo $content;
+		}
+		return $content;
 	}
 
 	/**
 	 * Displays the dayview
+	 *
+	 * @param boolean $home=false if true return content suitable for home-page
 	 */
-	function day()
+	function &day($home=false)
 	{
 		if ($this->debug > 0) $this->bo->debug_message('uiviews::day() date=%1',True,$this->date);
 
-		$ts = $this->bo->date2ts((string)$this->date);
-		$GLOBALS['phpgw_info']['flags']['app_header'] .= ': '.lang(date('l',$ts)).', '.$this->bo->long_date($ts);
-		$GLOBALS['phpgw']->common->phpgw_header();
+		$this->last = $this->first = $this->bo->date2ts((string)$this->date);
+		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('l',$this->first)).', '.$this->bo->long_date($this->first);
+		
+		$this->search_params['end'] = $this->last = $this->first+DAY_s-1;
+		
+		if (!$home)
+		{
+			$GLOBALS['egw']->common->egw_header();
+			if ($_GET['msg']) echo '<p class="redItalic" align="center">'.$this->html->htmlspecialchars($_GET['msg'])."</p>\n";
+	
+			$users = $this->search_params['users'];
+			if (!is_array($users)) $users = array($users);
 
-		$todos = $this->get_todos($todo_label);
+			// for more then 3 users, show all in one row
+			if (count($users) == 1 || count($users) > 3) 
+			{
+				$dayEvents =& $this->bo->search($this->search_params);
+				$owner = 0;
+			}
+			else
+			{
+				$dayEvents = array();
+				$search_params = $this->search_params;
+				foreach($users as $user)
+				{
+					$title = '<b>'.$this->bo->participant_name($user).'</b>';
+					$search_params['users'] = $user;
+					list(,$dayEvents[$title]) = each($this->bo->search($search_params));
+				}
+				$owner = $users;
+			}
+			$cols = array();
+			$cols[0] =& $this->timeGridWidget($dayEvents,$this->cal_prefs['interval'],450,'','',$owner);
 
-		echo $this->html->table(array(0 => array(
-			$this->timeGridWidget($this->bo->search($this->search_params),$this->width-250,$this->cal_prefs['interval'],1.7),
-			$this->html->div(
-				$this->html->div($todo_label,'','calDayTodosHeader th')."\n".
-				$this->html->div($todos,'','calDayTodosTable'),
-			'','calDayTodos')
-		),'.0' => 'valign="top"'),'width="100%"');
+			if (($todos = $this->get_todos($todo_label)) !== false)
+			{
+				if ($GLOBALS['egw_info']['user']['apps']['infolog'])
+				{
+					foreach(array('task','phone','note') as $type)
+					{
+						$todo_label .= '&nbsp;'.$this->html->a_href( $this->html->image('infolog',$type,lang('Add')),'infolog.uiinfolog.edit',array(
+							'type' => $type,
+							'start_time' => $ts,
+						));
+					}
+				}
+				$cols[1] = $this->html->div(
+					$this->html->div($todo_label,'','calDayTodosHeader th')."\n".
+					$this->html->div($todos,'','calDayTodosTable'),'','calDayTodos');
+				$cols['.1'] = 'width=30%';
+				echo $this->html->table(array(
+					0 => $cols,
+					'.0' => 'valign="top"'
+				),'class="calDayView"');
+			}
+			else
+			{
+				echo $cols[0];
+			}
+		}
+		else
+		{
+			return $this->timeGridWidget($this->bo->search($this->search_params),$this->cal_prefs['interval'],300);
+		}
 	}
 
 	/**
@@ -204,11 +445,11 @@ class uiviews extends uical
 	 *
 	 * @param array/string $todo_label label for the todo-box or array with 2 values: the label and a boolean show_all
 	 *	On return $todo_label contains the label for the todo-box
-	 * @return string html with a table of open todo's
+	 * @return string/boolean html with a table of open todo's or false if no hook availible
 	 */
 	function get_todos(&$todo_label)
 	{
-		$todos_from_hook = $GLOBALS['phpgw']->hooks->process(array(
+		$todos_from_hook = $GLOBALS['egw']->hooks->process(array(
 			'location'  => 'calendar_include_todos',
 			'year'      => $this->year,
 			'month'     => $this->month,
@@ -225,7 +466,7 @@ class uiviews extends uical
 			$label=$todo_label;
 			$showall=true;
 		}
-		$maxshow = (int)$GLOBALS['phpgw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
+		$maxshow = (int)$GLOBALS['egw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
 		if($maxshow <= 0)
 		{
 			$maxshow=10;
@@ -235,13 +476,13 @@ class uiviews extends uical
 		$content = $todo_label = '';
 		if (is_array($todos_from_hook) && count($todos_from_hook))
 		{
-			$todo_label = !empty($label) ? $label : lang("open ToDo's:");
-
 			foreach($todos_from_hook as $todos)
 			{
 				$i = 0;
-				if (is_array($todos) && count($todos))
+				if (is_array($todos))
 				{
+					$todo_label = !empty($label) ? $label : lang("open ToDo's:");
+
 					foreach($todos as $todo)
 					{
 						if(!$showall && ($i++ > $maxshow))
@@ -251,14 +492,17 @@ class uiviews extends uical
 						$icons = '';
 						foreach($todo['icons'] as $name => $app)
 						{
-							$icons .= ($icons?' ':'').$GLOBALS['phpgw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"');
+							$icons .= ($icons?' ':'').$GLOBALS['egw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"');
 						}
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
 
 						$content .= " <tr class=\"$class\">\n  <td valign=\"top\" width=\"15%\" nowrap>".
-							($this->bo->printer_friendly?$icons:$GLOBALS['phpgw']->html->a_href($icons,$todo['view'])).
+							($this->bo->printer_friendly?$icons:$GLOBALS['egw']->html->a_href($icons,$todo['view'])).
 							"</td>\n  <td>".($this->printer_friendly?$todo['title']:
-							$GLOBALS['phpgw']->html->a_href($todo['title'],$todo['view']))."</td>\n </tr>\n";
+							$GLOBALS['egw']->html->a_href($todo['title'],$todo['view']))."</td>\n </tr>\n";
+						/**
+						 * ToDo: add delete and closing action
+						 */
 					}
 				}
 			}
@@ -267,35 +511,36 @@ class uiviews extends uical
 		{
 			return "<table border=\"0\" width=\"100%\">\n$content</table>\n";
 		}
-		return False;
+		return $todo_label ? '' : false;
 	}
 		
 	/**
 	 * Calculates the vertical position based on the time
 	 *
 	 * workday start- and end-time, is taken into account, as well as timeGrids px_m - minutes per pixel param
+	 *
 	 * @param int $time in minutes
-	 * @return int position in pixels
+	 * @return float position in percent
 	 */
 	function time2pos($time)
 	{
-		// time before workday => condensed in the first row
+		// time before workday => condensed in the first $this->extraRows rows
 		if ($this->wd_start > 0 && $time < $this->wd_start)
 		{
-			$pos = round($time / $this->px_m / $this->wd_start);
+			$pos = (1 + $this->extraRows * $time / $this->wd_start) * $this->rowHeight;	// 1 for the header
 		}
 		// time after workday => condensed in the last row
-		elseif ($this->wd_end < 24*60 && $time > $this->wd_end+2*$this->granularity_m)
+		elseif ($this->wd_end < 24*60 && $time > $this->wd_end+1*$this->granularity_m)
 		{
-			$pos = $this->time2pos($this->wd_end+2*$this->granularity_m) +
-				@round(($time - ($this->wd_end+2*$this->granularity_m)) / $this->px_m /
-				(24*60 - ($this->wd_end+2*$this->granularity_m)));
+			$pos = 100 - ($this->extraRows * $this->rowHeight * (1 - ($time - $this->wd_end) / (24*60 - $this->wd_end)));
 		}
 		// time during the workday => 2. row on (= + granularity)
 		else
 		{
-			$pos = round(($time - $this->wd_start + $this->granularity_m) / $this->px_m);
+			$pos = $this->rowHeight * (1+$this->extraRows+($time-$this->wd_start)/$this->granularity_m);
 		}
+		$pos = round($pos,1);
+
 		if ($this->debug > 3) $this->bo->debug_message('uiviews::time2pos(%1)=%2',False,$time,$pos);
 
 		return $pos;
@@ -305,13 +550,15 @@ class uiviews extends uical
 	 * Calculates the height of a differenc between 2 times
 	 *
 	 * workday start- and end-time, is taken into account, as well as timeGrids px_m - minutes per pixel param
+	 *
 	 * @param int $start time in minutes
 	 * @param int $end time in minutes
 	 * @param int $minimum=0 minimum height
-	 * @return int height in pixel
+	 * @return float height in percent
 	 */
 	function times2height($start,$end,$minimum=0)
 	{
+		$minimum = $this->rowHeigth;
 		$height = $this->time2pos($end) - $this->time2pos($start);
 
 		if ($this->debug > 3) $this->bo->debug_message('uiviews::times2height(%1,%2,min=%3)=%4',False,$start,$end,$minimum,$height);
@@ -325,74 +572,78 @@ class uiviews extends uical
 	 * Uses the dayColWidget to display each day.
 	 *
 	 * @param $daysEvents array with subarrays of events for each day to show, day as YYYYMMDD as key
-	 * @param int $width width of the widget
-	 * @param int $granularity_m granularity in minutes of the rows
-	 * @param int/float $px_m minutes per pixel - pixel in minutes ;-)
-	 * @param string $indent string for correct indention
-	 * @param string $title title of the time-grid
+	 * @param int $granularity_m=30 granularity in minutes of the rows
+	 * @param int $height=400 height of the widget
+	 * @param string $indent='' string for correct indention
+	 * @param string $title='' title of the time-grid
+	 * @param int/array $owner=0 owner of the calendar (default 0 = $this->owner) or array with owner for each column
 	 */
-	function timeGridWidget($daysEvents,$width,$granularity_m=30,$px_m=1.7,$indent='',$title='')
+	function &timeGridWidget($daysEvents,$granularity_m=30,$height=400,$indent='',$title='',$owner=0)
 	{
-		if ($this->debug > 1 || $this->debug==='timeGridWidget') $this->bo->debug_message('uiviews::timeGridWidget(events=%1,width=%2,granularity_m=%3,px_m=%4,)',True,$daysEvents,$width,$granularity_m,$px_m);
+		if ($this->debug > 1 || $this->debug==='timeGridWidget') $this->bo->debug_message('uiviews::timeGridWidget(events=%1,granularity_m=%2,height=%3,,title=%4)',True,$daysEvents,$granularity_m,$height,$title);
 
-		$this->px_m = $px_m;	// for time2pos()
 		$this->granularity_m = $granularity_m;
+		$this->display_start = $this->wd_start - ($this->extraRows * $this->granularity_m);
+		$this->display_end	= $this->wd_end + ($this->extraRows * $this->granularity_m);
 
-		$html = $indent.'<div class="calTimeGrid" style="width: '.$width.'px;">'."\n";
+		$wd_end = ($this->wd_end === 0 ? 1440 : $this->wd_end);
+		$totalDisplayMinutes	= $wd_end - $this->wd_start;
+		$this->rowsToDisplay	= ($totalDisplayMinutes/$granularity_m)+2+2*$this->extraRows;
+		$this->rowHeight		= round(100/$this->rowsToDisplay,1);
 
-		if ($title)
+		$html = $indent.'<div class="calTimeGrid" style="height: '.$height.'px;">'."\n";
+
+		$html .= $indent."\t".'<div class="calGridHeader row_on" style="width: 47px; height: '.
+			$this->rowHeight.'%;">'.$title."</div>\n";
+
+		$off = false;	// Off-row means a different bgcolor
+		$add_links = count($daysEvents) == 1;
+
+		// the hour rows
+		for($i=1; $i < $this->rowsToDisplay; $i++)
 		{
-			$html .= $indent."\t".'<div class="calGridHeader">'.$title."</div>\n";
-		}
-		$off = True;	// Off-row means a different bgcolor
-		for ($t = 0; $t < 24*60; $t += $inc)
-		{
-			$inc = $granularity_m;
-			if (!$t && $this->wd_start)
+			$currentTime = $this->display_start + (($i-1) * $this->granularity_m);
+			if($this->wd_start <= $currentTime && $this->wd_end >= $currentTime)
 			{
-				$inc = $this->wd_start;
-			}
-			elseif ($t > $this->wd_end)
-			{
-				$inc = 24*60 - $this->wd_end;
-			}
-			$html .= $indent."\t".'<div class="calTimeRowOff'.($off ? ' row_off' : ' row_on').
-				'" style="height: '.($this->times2height($t,$t + $inc)).'px;">'."\n";
-
-			$add_links = count($daysEvents) == 1 && $this->bo->check_perms(PHPGW_ACL_ADD,0,$this->owner);
-			$add = array(
-				'menuaction' => 'calendar.uicalendar.add',
-				'date' => $this->date,
-				'owner' => $this->owner,
-			);
-			if ($t >= $this->wd_start && $t <= $this->wd_end)
-			{
-				$time = $GLOBALS['phpgw']->common->formattime(sprintf('%02d',$t/60),sprintf('%02d',$t%60));
-				if ($add_links)
-				{
-					$add['hour'] = (int) ($t/60);
-					$add['minute'] = $t%60;
-					$time = $this->html->a_href($time,$add,'',' title="'.lang('Add').'"');
-				}
+				$html .= $indent."\t".'<div class="calTimeRow'.($off ? 'Off row_off' : ' row_on').
+					'" style="height: '.$this->rowHeight.'%; top:'. $i*$this->rowHeight .'%;">'."\n";
+				$time = $GLOBALS['egw']->common->formattime(sprintf('%02d',$currentTime/60),sprintf('%02d',$currentTime%60));
+				if ($add_links) $time = $this->add_link($time,$this->date,(int) ($currentTime/60),$currentTime%60);
 				$html .= $indent."\t\t".'<div class="calTimeRowTime">'.$time."</div>\n";
+				$html .= $indent."\t</div>\n";	// calTimeRow
+				$off = !$off;
 			}
-			$html .= $indent."\t</div>\n";	// calTimeRow
-
-			$off = !$off;
 		}
 
 		if (is_array($daysEvents) && count($daysEvents))
 		{
+			$numberOfDays	= count($daysEvents);
+			$dayColWidth	= 100/$numberOfDays;
+
 			$dayCols_width = $width - $this->timeRow_width - 1;
-			$html .= $indent."\t".'<div class="calDayCols" style="left: '.$this->timeRow_width.'px; width: '.$dayCols_width.'px;">'."\n";
+
+			// Lars Kneschke 2005-08-28
+			// why do we use a div in a div which has the same height and width???
+			// To make IE6 happy!!! Whithout the second div you can't use 
+			// style="left: 50px; right: 0px;"
+			$html .= $indent."\t".'<div id="calDayCols" class="calDayCols"><div style="width=100%; height: 100%;">'."\n";
 			$dayCol_width = $dayCols_width / count($daysEvents);
 			$n = 0;
 			foreach($daysEvents as $day => $events)
 			{
-				$html .= $this->dayColWidget($day,$events,(int)($n*$dayCol_width),(int)$dayCol_width,$indent."\t\t",count($daysEvents) != 1,++$on_off & 1);
+				$short_title = count($daysEvents) > 1;
+				$col_owner = $owner;
+				if (!is_numeric($day))
+				{
+					$short_title = $day;
+					$day = $this->date;
+					$col_owner = $owner[$n];
+				}
+				$html .= $this->dayColWidget($day,$events,$n*$dayColWidth,
+					$dayColWidth,$indent."\t\t",$short_title,++$on_off & 1,$col_owner);
 				++$n;
 			}
-			$html .= $indent."\t</div>\n";	// calDayCols
+			$html .= $indent."\t</div></div>\n";	// calDayCols
 		}
 		$html .= $indent."</div>\n";	// calTimeGrid
 
@@ -409,10 +660,11 @@ class uiviews extends uical
 	 * @param int $left start of the widget
 	 * @param int $width width of the widget
 	 * @param string $indent string for correct indention
-	 * @param boolean $short_title should we add a label (weekday, day) with link to the day-view above each day
-	 * @param boolean $on_off start with row_on or row_off, default false=row_off
+	 * @param boolean/string $short_title=True should we add a label (weekday, day) with link to the day-view above each day or string with title
+	 * @param boolean $on_off=false start with row_on or row_off, default false=row_off
+	 * @param int $owner=0 if != 0 owner to add to the add-event link
 	 */
-	function dayColWidget($day_ymd,$events,$left,$width,$indent,$short_title=True,$on_off=False)
+	function dayColWidget($day_ymd,$events,$left,$width,$indent,$short_title=True,$on_off=False,$owner=0)
 	{
 		if ($this->debug > 1 || $this->debug==='dayColWidget') $this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)',False,$day_ymd,$events,$left,$width);
 
@@ -423,13 +675,13 @@ class uiviews extends uical
 		foreach($events as $event)
 		{
 			$event['multiday'] = False;
-			$event['start_m'] = ($this->bo->date2ts($event['start']) - $day_start) / 60;
+			$event['start_m'] = ($event['start'] - $day_start) / 60;
 			if ($event['start_m'] < 0)
 			{
 				$event['start_m'] = 0;
 				$event['multiday'] = True;
 			}
-			$event['end_m'] = ($this->bo->date2ts($event['end']) - $day_start) / 60;
+			$event['end_m'] = ($event['end'] - $day_start) / 60;
 			if ($event['end_m'] >= 24*60)
 			{
 				$event['end_m'] = 24*60-1;
@@ -439,8 +691,10 @@ class uiviews extends uical
 			$eventCols[$c][] = $event;
 			$col_ends[$c] = $event['end_m'];
 		}
+
 		if (count($eventCols))
 		{
+			/* code to overlay the column, not used at the moment
 			$eventCol_dist = $eventCol_width = round($width / count($eventCols));
 			$eventCol_min_width = 80;
 			if ($eventCol_width < $eventCol_min_width)
@@ -450,43 +704,47 @@ class uiviews extends uical
 				{
 					$eventCol_dist = round(($width - $eventCol_min_width) / (count($eventCols)-1));
 				}
-			}
+			}*/
+			$eventCol_dist = $eventCol_width = round(100 / count($eventCols));
 		}
 
-		$html = $indent.'<div class="calDayCol" style="left: '.$left.'px; width: '.$width.'px;">'."\n";
+		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calDayCol" style="left: '.$left.
+			'%; width: '.$width.'%;">'."\n";
 
 		// Creation of the header-column with date, evtl. holiday-names and a matching background-color
 		$ts = $this->bo->date2ts((string)$day_ymd);
-		$title = lang(date('l',$ts)).', '.($short_title ? date('d.',$ts) : $this->bo->long_date($ts));
+		$title = is_bool($short_title) ? (lang(adodb_date('l',$ts)).', '.($short_title ? adodb_date('d.',$ts) : $this->bo->long_date($ts))) : $short_title;
 		$day_view = array(
 			'menuaction' => 'calendar.uiviews.day',
 			'date' => $day_ymd,
 		);
-		if ($short_title)
+		if ($short_title === true)
 		{
 			$title = $this->html->a_href($title,$day_view,'',
 				!isset($this->holidays[$day_ymd])?' title="'.lang('Dayview').'"':'');
 		}
-		if (isset($this->holidays[$day_ymd]))
-		{
-			$class = 'calHoliday';
-			foreach($this->holidays[$day_ymd] as $holiday)
-			{
-				$holidays[] = $holiday['name'];
-			}
-			$holidays = implode(', ',$holidays);
-		}
-		elseif ($day_ymd == $this->bo->date2string($this->bo->now_su))
-		{
-			$class = 'calToday';
-		}
-		else
-		{
-			$class = $on_off ? 'row_on' : 'row_off';
-		}
-		$html .= $indent."\t".'<div class="calDayColHeader '.$class.'"'.($holidays ? ' title="'.$holidays.'"':'').'>'.
+		$this->_day_class_holiday($day_ymd,$class,$holidays);
+		// the weekday and date
+		$html .= $indent."\t".'<div style="height: '. $this->rowHeight .'%" class="calDayColHeader '.$class.'"'.($holidays ? ' title="'.$holidays.'"':'').'>'.
 			$title.(!$short_title && $holidays ? ': '.$holidays : '')."</div>\n";
 
+		// adding divs to click on for each row / time-span
+		for($counter = 1; $counter < $this->rowsToDisplay; $counter++)
+		{
+			//print "$counter - ". $counter*$this->rowHeight ."<br>";
+			$linkData = array(
+				'menuaction'	=>'calendar.uiforms.edit',
+				'date'		=> $day_ymd,
+				'hour'		=> floor(($this->wd_start + (($counter-$this->extraRows-1)*$this->granularity_m))/60),
+				'minute'	=> floor(($this->wd_start + (($counter-$this->extraRows-1)*$this->granularity_m))%60),
+			);
+			if ($owner) $linkData['owner'] = $owner;
+
+			$html .= $indent."\t".'<div style="height:'. $this->rowHeight .'%; top: '. $counter*$this->rowHeight .
+				'%;" class="calAddEvent" onclick="'.$this->popup($GLOBALS['egw']->link('/index.php',$linkData)).';return false;">'.
+				'</div>'."\n";
+		}
+		// displaying all event columns of the day
 		foreach($eventCols as $n => $eventCol)
 		{
 			$html .= $this->eventColWidget($eventCol,$n*$eventCol_dist,$eventCol_width,$indent."\t");
@@ -495,6 +753,57 @@ class uiviews extends uical
 
 		return $html;
 	}
+	
+	/**
+	 * get the CSS class and holidays for a given day
+	 *
+	 * @param string $day_ymd date
+	 * @param string &$class class to use
+	 * @param string &$holidays commaseparted holidays or empty if none
+	 * @param boolean $only_weekend=false show only the weekend in header-color, otherwise every second days is shown too
+	 */
+	function _day_class_holiday($day_ymd,&$class,&$holidays,$only_weekend=false)
+	{
+		$class = $holidays = '';
+		$bday = false;
+		if (isset($this->holidays[$day_ymd]))
+		{
+			foreach($this->holidays[$day_ymd] as $holiday)
+			{
+				if (isset($holiday['birthyear']))
+				{
+					$bday = true;
+				}
+				else
+				{
+					$class = 'calHoliday';
+				}
+				$holidays[] = $holiday['name'];
+			}
+			$holidays = implode(', ',$holidays);
+		}
+		if (!$class)
+		{
+			if ($day_ymd == $this->bo->date2string($this->bo->now_su))
+			{
+				$class = 'calToday';
+			}
+			else
+			{
+				$day = (int) date('w',$this->bo->date2ts((string) $day_ymd));
+	
+				if ($only_weekend)
+				{
+					$class = $day == 0 || $day == 6 ? 'th' : 'row_off';
+				}
+				else
+				{
+					$class = $day & 1 ? 'row_on' : 'th';
+				}
+			}
+		}
+		if ($bday) $class .= ' calBirthday';
+	}
 
 	/**
 	 * Creates colunm for non-overlaping (!) events
@@ -510,7 +819,7 @@ class uiviews extends uical
 	{
 		if ($this->debug > 1 || $this->debug==='eventColWidget') $this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)',False,$events,$left,$width);
 
-		$html = $indent.'<div class="calEventCol" style="left: '.((int)$left).'px; width: '.((int)$width).'px;">'."\n";
+		$html = $indent.'<div class="calEventCol" style="left: '.$left.'%; width:'.$width.'%;">'."\n";
 		foreach($events as $event)
 		{
 			$html .= $this->eventWidget($event,$width,$indent."\t");
@@ -528,21 +837,26 @@ class uiviews extends uical
 	 * @param $event array with the data of event to show
 	 * @param $width int width of the widget
 	 * @param string $indent string for correct indention
+	 * @param boolean $return_array=false should an array with keys(tooltip,popup,html) be returned or the complete widget as string
+	 * @param string $block='event_widget' template used the render the widget
+	 * @return string/array 
 	 */
-	function eventWidget($event,$width,$indent)
+	function eventWidget($event,$width,$indent,$return_array=false,$block='event_widget')
 	{
-		if ($this->debug > 1 || $this->debug==='eventWidget') $this->bo->debug_message('uiviews::eventWidget(%1)',False,$event);
+		if ($this->debug > 1 || $this->debug==='eventWidget') $this->bo->debug_message('uiviews::eventWidget(%1,width=%2)',False,$event,$width);
 
 		static $tpl = False;
 		if (!$tpl)
 		{
-			$tpl = $GLOBALS['phpgw']->template;
+			$tpl = $GLOBALS['egw']->template;
+			$tpl->set_root($GLOBALS['egw']->common->get_tpl_dir('calendar'));
 			$tpl->set_file('event_widget_t','event_widget.tpl');
 			$tpl->set_block('event_widget_t','event_widget');
 			$tpl->set_block('event_widget_t','event_tooltip');
+			$tpl->set_block('event_widget_t','planner_event');
 		}
 
-		if ($event['start_m'] == 0 && $event['end_m'] == 24*60-1)
+		if ($event['start_m'] == 0 && $event['end_m'] >= 24*60-1)
 		{
 			$timespan = lang('all day');
 		}
@@ -550,11 +864,11 @@ class uiviews extends uical
 		{
 			foreach(array($event['start_m'],$event['end_m']) as $minutes)
 			{
-				$timespan[] = $GLOBALS['phpgw']->common->formattime(sprintf('%02d',$minutes/60),sprintf('%02d',$minutes%60));
+				$timespan[] = $GLOBALS['egw']->common->formattime(sprintf('%02d',$minutes/60),sprintf('%02d',$minutes%60));
 			}
 			$timespan = implode(' - ',$timespan);
 		}
-		$is_private = !$this->bo->check_perms(PHPGW_ACL_READ,$event);
+		$is_private = !$this->bo->check_perms(EGW_ACL_READ,$event);
 
 		$icons = !$is_private ? $this->event_icons($event) : array($this->html->image('calendar','private',lang('private')));
 		$cats  = $this->bo->categories($event['category'],$color);
@@ -564,40 +878,61 @@ class uiviews extends uical
 		$corner_radius=$width > $small_trigger_width ? 10 : 5;
 		$header_height=$width > $small_trigger_width ? 19 : 12;	// multi_3 icon has a height of 19=16+2*1padding+1border !
 		$height = $this->times2height($event['start_m'],$event['end_m'],$header_height);
-		$body_height = max(0,$height - $header_height - $corner_radius);
+		//$body_height = max(0,$height - $header_height - $corner_radius);
 		$border=1;
 		$headerbgcolor = $color ? $color : '#808080';
 		// the body-colors (gradient) are calculated from the headercolor, which depends on the cat of an event
 		$bodybgcolor1 = $this->brighter($headerbgcolor,170);
 		$bodybgcolor2 = $this->brighter($headerbgcolor,220);
 		
+		// seperate each participant types
+		$part_array = array();
+		foreach($this->bo->participants($event) as $part_key => $participant)
+		{
+			if(is_numeric($part_key))
+			{
+				$part_array[lang('Participants')][$part_key] = $participant;
+			}
+			elseif(isset($this->bo->resources[$part_key{0}]))
+			{
+				 $part_array[((isset($this->bo->resources[$part_key{0}]['participants_header'])) ? $this->bo->resources[$part_key{0}]['participants_header'] : lang($this->bo->resources[$part_key{0}]['app']))][$part_key] = $participant;
+			}
+		}
+		foreach($part_array as $part_group => $participant)
+		{
+			$participants .= $this->add_nonempty($participant,$part_group,True);
+		}
+		
 		$tpl->set_var(array(
 			// event-content, some of it displays only if it really has content or is needed
 			'header_icons' => $width > $small_trigger_width ? implode("",$icons) : '',
-			'body_icons' => $width > $small_trigger_width ? '' : implode("\n",$icons).'<br>',
+			'body_icons' => $width > $small_trigger_width ? '' : implode("\n",$icons),
 			'icons' => implode("\n",$icons),
-			'header' => $timespan,
+			'timespan' => $timespan,
+			'header' => !$is_private ? $this->html->htmlspecialchars($event['title']) : lang('private'), // $timespan,
 			'title'   => !$is_private ? $this->html->htmlspecialchars($event['title']) : lang('private'),
 			'description' => !$is_private ? nl2br($this->html->htmlspecialchars($event['description'])) : '',
 			'location'   => !$is_private ? $this->add_nonempty($event['location'],lang('Location')) : '',
-			'participants' => count($event['participants']) == 1 && isset($event['participants'][$this->user]) || $is_private ? '' :
-				$this->add_nonempty($this->bo->participants($event['participants']),lang('Participants'),True),
+			'participants' => $participants,
+			'times' => !$event['multiday'] ? $this->add_nonempty($timespan,lang('Time')) :
+				$this->add_nonempty($GLOBALS['egw']->common->show_date($event['start']),lang('Start')).
+				$this->add_nonempty($GLOBALS['egw']->common->show_date($event['end']),lang('End')),
 			'multidaytimes' => !$event['multiday'] ? '' :
-				$this->add_nonempty($GLOBALS['phpgw']->common->show_date($this->bo->date2ts($event['start'])),lang('Start Date/Time')).
-				$this->add_nonempty($GLOBALS['phpgw']->common->show_date($this->bo->date2ts($event['end'])),lang('End Date/Time')),
+				$this->add_nonempty($GLOBALS['egw']->common->show_date($event['start']),lang('Start')).
+				$this->add_nonempty($GLOBALS['egw']->common->show_date($event['end']),lang('End')),
 			'category' => !$is_private ? $this->add_nonempty($cats,lang('Category')) : '',
 			// the tooltip is based on the content of the actual widget, this way it takes no extra bandwidth/volum
 //			'tooltip' => $this->html->tooltip(False,False,array('BorderWidth'=>0,'Padding'=>0)),
 			// various aspects of the geometry or style
 			'corner_radius'  => $corner_radius.'px',
 			'header_height' => $header_height.'px',
-			'body_height' => $body_height.'px',
+			//'body_height' => $body_height.'px',
 			'height' => $height,
 			'width' => ($width-20).'px',
 			'border' => $border,
 			'bordercolor' => $headerbgcolor,
 			'headerbgcolor' => $headerbgcolor,
-			'bodybackground' => 'url('.$GLOBALS['phpgw_info']['server']['webserver_url'].
+			'bodybackground' => 'url('.$GLOBALS['egw_info']['server']['webserver_url'].
 				'/calendar/inc/gradient.php?color1='.urlencode($bodybgcolor1).'&color2='.urlencode($bodybgcolor2).
 				'&width='.$width.') repeat-y '.$bodybgcolor2,
 			'Small' => $width > $small_trigger_width ? '' : 'Small',	// to use in css class-names
@@ -609,7 +944,7 @@ class uiviews extends uical
 			'lower_right'=>array('width'=>$corner_radius,'height'=>-$corner_radius,'border'=>$border,'color'=>$headerbgcolor,'bgcolor'=>$bodybgcolor2),
 		) as $name => $data)
 		{
-			$tpl->set_var($name.'_corner',$GLOBALS['phpgw_info']['server']['webserver_url'].
+			$tpl->set_var($name.'_corner',$GLOBALS['egw_info']['server']['webserver_url'].
 				'/calendar/inc/round_corners.php?width='.$data['width'].'&height='.$data['height'].
 				'&bgcolor='.urlencode($data['bgcolor']).
 				(isset($data['color']) ? '&color='.urlencode($data['color']) : '').
@@ -617,13 +952,24 @@ class uiviews extends uical
 		}
 		$tooltip = $tpl->fp('tooltip','event_tooltip');
 		$tpl->set_var('tooltip',$this->html->tooltip($tooltip,False,array('BorderWidth'=>0,'Padding'=>0)));
-		$html = $tpl->fp('out','event_widget');
+		$html = $tpl->fp('out',$block);
 
-		$view_link = $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uicalendar.view','cal_id'=>$event['id'],'date'=>$event['start']['full']));
-
-		return $indent.'<div class="calEvent" style="top: '.$this->time2pos($event['start_m']).'px; height: '.
-			$height.'px;" onclick="document.location=\''.$view_link.'\';">'."\n".
-			$html.$indent."</div>\n";
+		$view_link = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.uiforms.view','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
+		$popup = $is_private ? '' : ' onclick="'.$this->popup($view_link).'; return false;"';
+		
+		if ($return_array)
+		{
+			return array(
+				'tooltip' => $tooltip,
+				'popup'   => $popup,
+				'html'    => $html,
+				'private' => $is_private,
+				'color'   => $color,
+			);
+		}
+		//_debug_array($event);
+		return $indent.'<div class="calEvent'.($is_private ? 'Private' : '').'" style="top: '.$this->time2pos($event['start_m']).
+			'%; height: '.$height.'%;"'.$popup.'>'."\n".$html.$indent."</div>\n";
 	}
 
 	function add_nonempty($content,$label,$one_per_line=False)
@@ -664,115 +1010,543 @@ class uiviews extends uical
 		//echo "brighter($rgb=".print_r($components,True).")=$brighter</p>\n";
 		return $brighter;
 	}
+	
+	
+	/**
+	 * Creates a planner view: grid with columns for the time and rows for categories or users
+	 *
+	 * Uses the plannerRowWidget to display rows
+	 *
+	 * @param array $events events to show
+	 * @param mixed $start start-time of the grid
+	 * @param mixed $end end-time of the grid
+	 * @param boolean/int $by_cat rows by sub-categories of $by_cat (cat_id or 0 for upmost level) or by users (false)
+	 * @param string $indent='' string for correct indention
+	 * @return string with widget
+	 */
+	function &plannerWidget($events,$start,$end,$by_cat=0,$indent='')
+	{
+		$content = $indent.'<div class="plannerWidget">'."\n";
+		
+		// display the header, containing a headerTitle and multiple headerRows with the scales
+		$content .= $indent."\t".'<div class="plannerHeader">'."\n";
+		// display the headerTitle
+		$title = $by_cat === false ? lang('User') : lang('Category');
+		$content .= $indent."\t\t".'<div class="plannerHeaderTitle th">'.$title."</div>\n";
+		
+		// display the headerRows with the scales
+		$content .= $indent."\t\t".'<div class="plannerHeaderRows">'."\n";
+		// set start & end to timestamp and first & last to timestamp of 12h midday, to avoid trouble with daylight saving
+		foreach(array('start' => 'first','end' => 'last') as $t => $v)
+		{
+			$$t = $this->bo->date2ts($$t);
+			$$v = $this->bo->date2array($$t);
+			unset(${$v}['raw']);
+			${$v}['hour'] = 12;
+			${$v}['minute'] = ${$v}['second'] = 0;
+			${$v} = $this->bo->date2ts($$v);
+		}
+		$days = 1 + (int) round(($last - $first) / DAY_s);	// we have to use round to get the right number if daylight saving changes
+		if ($days >= 28)	// display the month scale
+		{
+			$content .= $this->plannerMonthScale($first,$days,$indent."\t\t\t");
+		}
+		if ($days >= 5)	// display the week scale
+		{
+			$content .= $this->plannerWeekScale($first,$days,$indent."\t\t\t");
+		}
+		$content .= $this->plannerDayScale($first,$days,$indent."\t\t\t");		// day-scale, always displayed
+		if ($days <= 7)	// display the hour scale
+		{
+			$content .= $this->plannerHourScale($start,$days,$indent."\t\t\t");
+		}
+		$content .= $indent."\t\t</div>\n";	// end of the plannerHeaderRows
+		$content .= $indent."\t</div>\n";	// end of the plannerHeader
+		
+		// sort the events after user or category
+		$rows = $sort2label = array();
+		if ($by_cat === false)	// planner by user
+		{
+			$sort2label = $this->_get_planner_users();
+		}
+		foreach($events as $key => $event)
+		{
+			if ($by_cat === false)	// planner by user
+			{
+				foreach($event['participants'] as $sort => $status)
+				{
+					if (isset($sort2label[$sort]))
+					{
+						$rows[$sort][] =& $events[$key];
+					}
+				}
+			}
+			else	// planner by cat
+			{
+				foreach($this->_get_planner_cats($event['category'],$sort2label,$sort2color) as $sort)
+				{
+					if (!is_array($rows[$sort])) $rows[$sort] = array();
+
+					$rows[$sort][] =& $events[$key];
+				}
+			}
+		}
+		// display a plannerRowWidget for each row (user or category)
+		foreach($sort2label as $sort => $label)
+		{
+			if (!isset($rows[$sort])) continue;		// dont show empty categories (user-rows get all initialised
+
+			$class = $class == 'row_on' ? 'row_off' : 'row_on';
+			$content .= $this->plannerRowWidget(isset($rows[$sort]) ? $rows[$sort] : array(),$start,$end,$label,$class,$indent."\t");
+		}
+		$content .= $indent."</div>\n";		// end of the plannerWidget
+		
+		return $content;
+	}
+	
+	/**
+	 * get all users to display in the planner_by_user
+	 *
+	 * @return array with uid => label pairs
+	 */
+	function _get_planner_users()
+	{
+		$users = array();
+		foreach(explode(',',$this->owner) as $user)
+		{
+			if (is_numeric($user) && $GLOBALS['egw']->accounts->get_type($user) == 'g')
+			{
+				foreach((array) $GLOBALS['egw']->accounts->member($user) as $data)
+				{
+					$user = $data['account_id'];
+					if ($this->bo->check_perms(EGW_ACL_READ,0,$user))
+					{
+						$users[$user] = $this->bo->participant_name($user);
+					}
+				}
+			}
+			else
+			{
+				$users[$user] = $this->bo->participant_name($user);
+			}
+			asort($users);	
+		}
+		return $users;
+	}
+	
+	/**
+	 * get all categories used as sort criteria for the planner by category
+	 * 
+	 * the returned cat is as direct sub-category of $this->cat_id or a main (level 1) category if !$this->cat_id
+	 *
+	 * @param string $cats comma-delimited cat_id's or empty for no cat
+	 * @param array &$sort2label labels for the returned cats
+	 * @return array with cat_id's
+	 */
+	function _get_planner_cats($cats,&$sort2label)
+	{
+		static $cat2sort;
+		
+		if (!is_array($cat2sort))
+		{
+			$cat2sort = array();
+			foreach((array)$this->cats->return_array('all',0,false,'','','',true) as $data)
+			{
+				if ($data['parent'] == $this->cat_id || $data['id'] == $this->cat_id)	// cat is a direct sub of $this->cat_id
+				{
+					$cat2sort[$data['id']] = $data['id'];
+					$sort2label[$data['id']] = stripslashes($data['name']);
+				}
+				elseif(isset($cat2sort[$data['parent']]))	// parent is already in the array => add us with same target
+				{
+					$cat2sort[$data['id']] = $cat2sort[$data['parent']];
+				} 
+			}
+		}
+		$ret = array();
+		foreach(!is_array($cats) ? explode(',',$cats) : $cats as $cat)
+		{
+			if (isset($cat2sort[$cat]) && !in_array($cat2sort[$cat],$ret))
+			{
+				$ret[] = $cat2sort[$cat];
+			}
+		}
+		if (!count($ret))
+		{
+			$sort2label[0] = lang('none');
+			$ret[] = 0;
+		}
+		//echo "<p>uiviews::_get_planner_cats($cats=".$this->cats->id2name($cats).") (this->cat_id=$this->cat_id) = ".print_r($ret,true).'='.$this->cats->id2name($ret[0])."</p>\n";
+		return $ret;
+	}
 
 	/**
-	 * trys to figure out the inner window width from the browser and installs an onResize handler
+	 * Creates month scale for the planner
 	 *
-	 * If no $_REQUEST[windowInnerWidth] is present, the pages get reloaded with some javascript, which sets
-	 * the width in the URL. If a width could be determined, an onResize handler gets installed, which refreshes
-	 * the page, with the new width set in the URL.
-	 * If we are allowed to set cookies, we additionaly set a cookie with the width, to save the additonal reload.
-	 * An onLoad handler checks if we operate with the correct width, or reloads the page if not.
+	 * @param int $start start-time (12h) of the scale
+	 * @param int $days number of days to display
+	 * @param string $indent='' string for correct indention
+	 * @return string with scale
 	 */
-	function establish_width()
+	function plannerMonthScale($start,$days,$indent)
 	{
-		if (!isset($_REQUEST['windowInnerWidth']))	// we neither have a cookie nor an url-var, get one ...
+		$day_width = round(100 / $days,2);
+
+		$content .= $indent.'<div class="plannerScale">'."\n";
+		for($t = $start,$left = 0,$i = 0; $i < $days; $t += $days_in_month*DAY_s,$left += $days_in_month*$day_width,$i += $days_in_month)
 		{
-?>
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=<?php echo $GLOBALS['phpgw']->translation->charset(); ?>">
-<meta http-equiv="refresh" content="1; URL=<?php echo $_SERVER['PHP_SELF'].'?'.($_SERVER['QUERY_STRING'] ? $_SERVER['QUERY_STRING'].'&':'').'windowInnerWidth=Off'; ?>">
-</head>
-<body onLoad="location = location + (location.search.length ? '&' : '?') + 'windowInnerWidth=' + (window.innerWidth ? window.innerWidth : document.body.clientWidth);">
-<noscript>
-<p><?php echo lang('Determining window width ...'); ?></p>
-<p><?php echo lang('Needs javascript to be enabled !!!'); ?></p>
-</noscript>
-</body>
-</html>
-<?php
-			$GLOBALS['phpgw']->common->phpgw_exit();
+			$t_arr = $this->bo->date2array($t);
+			unset($t_arr['raw']);	// force recalculation
+			unset($t_arr['full']);
+			$days_in_month = $this->datetime->days_in_month($t_arr['month'],$t_arr['year']) - ($t_arr['day']-1);
+			if ($i + $days_in_month > $days)
+			{
+				$days_in_month = $days - $i;
+			}
+			if ($days_in_month > 10)
+			{
+				$title = lang(date('F',$t)).' '.$t_arr['year'];
+				// previous links
+				$prev = $t_arr;
+				$prev['day'] = 1;
+				if ($prev['month']-- <= 1)
+				{
+					$prev['month'] = 12;
+					$prev['year']--;
+				}
+				if ($this->bo->date2ts($prev) < $start-20*DAY_s)
+				{
+					$prev['day'] = $this->day;
+					$full = $this->bo->date2string($prev);
+					if ($this->day >= 15) $prev = $t_arr;		// we stay in the same month
+					$prev['day'] = $this->day < 15 ? 15 : 1;
+					$half = $this->bo->date2string($prev);
+					$title = $this->html->a_href($this->html->image('phpgwpai','first',lang('back one month'),$options=' alt="<<"'),array(
+						'menuaction' => $this->view_menuaction,
+						'date'       => $full,
+					)) . ' &nbsp; '.
+					$this->html->a_href($this->html->image('phpgwpai','left',lang('back half a month'),$options=' alt="<"'),array(
+						'menuaction' => $this->view_menuaction,
+						'date'       => $half,
+					)) . ' &nbsp; '.$title;
+				}
+				// next links
+				$next = $t_arr;
+				if ($next['month']++ >= 12)
+				{
+					$next['month'] = 1;
+					$next['year']++;
+				}
+				if ($this->bo->date2ts($next) > $start+($days-10)*DAY_s)
+				{
+					if ($this->day >= 15) $next = $t_arr;		// we stay in the same month
+					$next['day'] = $this->day;
+					$full = $this->bo->date2string($next);
+					if ($this->day < 15) $next = $t_arr;		// we stay in the same month
+					$next['day'] = $this->day < 15 ? 15 : 1;
+					$half = $this->bo->date2string($next);
+					$title .= ' &nbsp; '.$this->html->a_href($this->html->image('phpgwpai','right',lang('forward half a month'),$options=' alt=">>"'),array(
+						'menuaction' => $this->view_menuaction,
+						'date'       => $half,
+					)). ' &nbsp; '.
+					$this->html->a_href($this->html->image('phpgwpai','last',lang('forward one month'),$options=' alt=">>"'),array(
+						'menuaction' => $this->view_menuaction,
+						'date'       => $full,
+					));
+				}
+			}
+			else
+			{
+				$title = '&nbsp;';
+			}
+			$class = $class == 'row_on' ? 'th' : 'row_on';
+			$content .= $indent."\t".'<div class="plannerMonthScale '.$class.'" style="left: '.$left.'%; width: '.($day_width*$days_in_month).'%;">'.
+				$title."</div>\n";
 		}
+		$content .= $indent."</div>\n";		// end of plannerScale
 
-		$width = (int) $_GET['windowInnerWidth'] ? $_GET['windowInnerWidth'] : $_COOKIE['windowInnerWidth'];
-
-		if ($GLOBALS['phpgw_info']['server']['usecookies'])
-		{
-			$GLOBALS['phpgw']->session->phpgw_setcookie('windowInnerWidth',$width);
-		}
-		if ($width)
-		{
-			$GLOBALS['phpgw_info']['flags']['java_script'] = '
-<script type="text/javascript">
-	    
-function MM_findObj(n, d) { //v4.0
-
-  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
-  
-      d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
-      
-        if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
-	
-	  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
-	  
-	    if(!x && document.getElementById) x=document.getElementById(n); return x;
-	    
-	    }
-function MM_showHideLayers() { //v3.0
-
-  var i,p,v,obj,args=MM_showHideLayers.arguments;
-  
-    for (i=0; i<(args.length-2); i+=3) if ((obj=MM_findObj(args[i]))!=null) { v=args[i+2];
-    
-        if (obj.style) { obj=obj.style; v=(v==\'show\')?\'visible\':(v=\'hide\')?\'hidden\':v; }
-	
-	    obj.visibility=v; }
-	    
-	    }
-
-function reload_inner_width() {
-	var width = window.innerWidth ? window.innerWidth : document.body.clientWidth;
-
-	MM_showHideLayers(\'processing\',\'\',\'show\') ;	
-	
-	if (location.search.indexOf("windowInnerWidth=") < 0)
-	{
-		location = location+(location.search.length ? "&" : "?")+"windowInnerWidth="+width;
-	}
-	else
-	{
-		var loc = location.toString();
-		location = loc.replace(/^(.*windowInnerWidth=)[0-9]*(.*)$/,"$1"+width+"$2");
+		return $content;
 	}
 	
-}
-</script>
-';
-			if (!is_object($GLOBALS['phpgw']->js))
-			{
-				$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
-			}
-			$GLOBALS['phpgw']->js->set_onresize('reload_inner_width();');
-			
-			// need to be instanciated here, as the constructor is not yet finished
-			if (!is_object($GLOBALS['phpgw']->html))
-			{
-				$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
-			}
-			$GLOBALS['phpgw']->js->set_onresize('reload_inner_width();');
-			// dont check for MS IE the window-width on load, as some versions report constantly changing sizes
-			if ($GLOBALS['phpgw']->html->user_agent != 'msie') 
-			{
-				//$GLOBALS['phpgw']->js->set_onload('if ('.$width.'!=(window.innerWidth ? window.innerWidth : document.body.clientWidth)) reload_inner_width();');
-				$GLOBALS['phpgw']->js->set_onload('if ('.$width.'!=window.innerWidth) reload_inner_width();');
-			}
-		}
-		else
+	/**
+	 * Creates a week scale for the planner
+	 *
+	 * @param int $start start-time (12h) of the scale
+	 * @param int $days number of days to display
+	 * @param string $indent='' string for correct indention
+	 * @return string with scale
+	 */
+	function plannerWeekScale($start,$days,$indent)
+	{
+		$week_width = round(100 / $days * ($days <= 7 ? $days : 7),2);
+
+		$content .= $indent.'<div class="plannerScale">'."\n";
+		for($t = $start,$left = 0,$i = 0; $i < $days; $t += 7*DAY_s,$left += $week_width,$i += 7)
 		{
-			$width = 1000;	// default, if the browser does not report it
+			$title = lang('Week').' '.date('W',$t);
+			if ($days > 7)
+			{
+				$title = $this->html->a_href($title,array(
+					'menuaction' => 'calendar.uiviews.planner',
+					'planner_days' => 7,
+					'date'       => date('Ymd',$t),
+				),false,' title="'.$this->html->htmlspecialchars(lang('Weekview')).'"');
+			}
+			else
+			{
+				// prev. week
+				$title = $this->html->a_href($this->html->image('phpgwpai','first',lang('previous'),$options=' alt="<<"'),array(
+					'menuaction' => $this->view_menuaction,
+					'date'       => date('Ymd',$t-7*DAY_s),
+				)) . ' &nbsp; <b>'.$title;
+				// next week
+				$title .= '</b> &nbsp; '.$this->html->a_href($this->html->image('phpgwpai','last',lang('next'),$options=' alt=">>"'),array(
+					'menuaction' => $this->view_menuaction,
+					'date'       => date('Ymd',$t+7*DAY_s),
+				));
+			}
+			$class = $class == 'row_on' ? 'th' : 'row_on';
+			$content .= $indent."\t".'<div class="plannerWeekScale '.$class.'" style="left: '.$left.'%; width: '.$week_width.'%;">'.$title."</div>\n";
 		}
-//		print $width ;
-		return $width - 250;	// 180 for sidebox-menu, TODO: this need to come from the template
+		$content .= $indent."</div>\n";		// end of plannerScale
+
+		return $content;
+	}
+	
+	/**
+	 * Creates day scale for the planner
+	 *
+	 * @param int $start start-time (12h) of the scale
+	 * @param int $days number of days to display
+	 * @param string $indent='' string for correct indention
+	 * @return string with scale
+	 */
+	function plannerDayScale($start,$days,$indent)
+	{
+		$day_width = round(100 / $days,2);
+
+		$content .= $indent.'<div class="plannerScale'.($days > 3 ? 'Day' : '').'">'."\n";
+		for($t = $start,$left = 0,$i = 0; $i < $days; $t += DAY_s,$left += $day_width,++$i)
+		{
+			if ($days <= 3)
+			{
+				$title = '<b>'.lang(date('l',$t)).', '.date('j',$t).'. '.lang(date('F',$t)).'</b>';
+			}
+			elseif ($days <= 7)
+			{
+				$title = lang(date('l',$t)).'<br />'.date('j',$t).'. '.lang(date('F',$t));
+			}
+			else
+			{
+				$title = substr(lang(date('D',$t)),0,2).'<br />'.date('j',$t);	
+			}
+			if ($days > 1)
+			{
+				$title = $this->html->a_href($title,array(
+					'menuaction'   => 'calendar.uiviews.planner',
+					'planner_days' => 1,
+					'date'         => date('Ymd',$t),
+				),false,' title="'.$this->html->htmlspecialchars(lang('Dayview')).'"');
+			}
+			if ($days < 5)
+			{
+				if (!$i)	// prev. day only for the first day
+				{
+					$title = $this->html->a_href($this->html->image('phpgwpai','first',lang('previous'),$options=' alt="<<"'),array(
+						'menuaction' => $this->view_menuaction,
+						'date'       => date('Ymd',$start-DAY_s),
+					)) . ' &nbsp; '.$title;
+				}
+				if ($i == $days-1)	// next day only for the last day
+				{
+					$title .= ' &nbsp; '.$this->html->a_href($this->html->image('phpgwpai','last',lang('next'),$options=' alt=">>"'),array(
+						'menuaction' => $this->view_menuaction,
+						'date'       => date('Ymd',$start+DAY_s),
+					));
+				}
+			}
+			$this->_day_class_holiday($this->bo->date2string($t),$class,$holidays,$days > 7);
+			$content .= $indent."\t".'<div class="plannerDayScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;"'.
+				($holidays ? ' title="'.$this->html->htmlspecialchars($holidays).'"' : '').'>'.$title."</div>\n";
+		}
+		$content .= $indent."</div>\n";		// end of plannerScale
+
+		return $content;
+	}
+	
+	/**
+	 * Creates hour scale for the planner
+	 *
+	 * @param int $start start-time (12h) of the scale
+	 * @param int $days number of days to display
+	 * @param string $indent='' string for correct indention
+	 * @return string with scale
+	 */
+	function plannerHourScale($start,$days,$indent)
+	{
+		foreach(array(1,2,3,4,6,8,12) as $d)	// numbers dividing 24 without rest
+		{
+			if ($d > $days) break;
+			$decr = $d;
+		}
+		$hours = $days * 24;
+		if ($days == 1)			// for a single day we calculate the hours of a days, to take into account daylight saving changes (23 or 25 hours)
+		{
+			$t_arr = $this->bo->date2array($start);
+			unset($t_arr['raw']);
+			$t_arr['hour'] = $t_arr['minute'] = $t_arr['second'] = 0;
+			$s = $this->bo->date2ts($t_arr);
+			$t_arr['hour'] = 23; $t_arr['minute'] = $t_arr['second'] = 59;
+			$hours = ($this->bo->date2ts($t_arr) - $s) / HOUR_s;
+		}
+		$cell_width = round(100 / $hours * $decr,2);
+		
+		$content .= $indent.'<div class="plannerScale">'."\n";
+		for($t = $start,$left = 0,$i = 0; $i < $hours; $t += $decr*HOUR_s,$left += $cell_width,$i += $decr)
+		{
+			$title = date($this->cal_prefs['timeformat'] == 12 ? 'ha' : 'H',$t);
+
+			$class = $class == 'row_on' ? 'th' : 'row_on';
+			$content .= $indent."\t".'<div class="plannerHourScale '.$class.'" style="left: '.$left.'%; width: '.($cell_width).'%;">'.$title."</div>\n";
+		}
+		$content .= $indent."</div>\n";		// end of plannerScale
+
+		return $content;
+	}
+	
+	/**
+	 * Creates a row for one user or category, with a header (user or category name) and (multiple) rows with non-overlapping events
+	 *
+	 * Uses the eventRowWidget to display a row of non-overlapping events
+	 *
+	 * @param array $events to show
+	 * @param int $start start-time of the row
+	 * @param int $end end-time of the row
+	 * @param string $header user or category name for the row-header
+	 * @param string $class additional css class for the row
+	 * @param string $indent='' string for correct indention
+	 * @return string with widget
+	 */
+	function plannerRowWidget($events,$start,$end,$header,$class,$indent='')
+	{
+		$content = $indent.'<div class="plannerRowWidget '.$class.'">'."\n";
+
+		// display the row-header
+		$content .= $indent."\t".'<div class="plannerRowHeader">'.$header."</div>\n";
+		
+		// sorting the events in non-overlapping rows
+		$rows = array(array());
+		$row_end = array();
+		foreach($events as $n => $event)
+		{
+			for($row = 0; (int) $row_end[$row] > $event['start']; ++$row);	// find a "free" row (no other event)
+			$rows[$row][] =& $events[$n];
+			$row_end[$row] = $event['end'];
+		}
+		//echo $header; _debug_array($rows);
+		// display the rows
+		$content .= $indent."\t".'<div class="eventRows">'."\n";
+		foreach($rows as $row)
+		{
+			$content .= $this->eventRowWidget($row,$start,$end,$indent."\t\t");
+		}
+		$content .= $indent."\t</div>\n";	// end of the eventRows
+
+		$content .= $indent."</div>\n";		// end of the plannerRowWidget
+		
+		return $content;
+	}
+
+	/**
+	 * Creates a row with non-overlapping events
+	 *
+	 * Uses the plannerEventWidget to display the events
+	 *
+	 * @param array $events non-overlapping events to show
+	 * @param int $start start-time of the row
+	 * @param int $end end-time of the row
+	 * @param string $indent='' string for correct indention
+	 * @return string with widget
+	 */
+	function eventRowWidget($events,$start,$end,$indent='')
+	{
+		$content = $indent.'<div class="eventRowWidget">'."\n";
+		
+		foreach($events as $event)
+		{
+			$content .= $this->plannerEventWidget($event,$start,$end,$indent."\t");
+		}
+		$content .= $indent."</div>\n";
+		
+		return $content;
+	}
+	
+	/**
+	 * Calculate a time-dependent position in the planner
+	 *
+	 * We use a non-linear scale in the planner monthview, which shows the workday start or end
+	 * as start or end of the whole day. This improves the resolution a bit.
+	 *
+	 * @param int $time
+	 * @param int $start start-time of the planner
+	 * @param int $end end-time of the planner
+	 * @return float percentage position between 0-100
+	 */
+	function _planner_pos($time,$start,$end)
+	{
+		if ($time <= $start) return 0;	// we are left of our scale
+		if ($time >= $end) return 100;	// we are right of our scale
+		
+		if ($this->planner_days)
+		{
+			$percent = ($time - $start) / ($end - $start);
+		}
+		else	// monthview
+		{
+			$t_arr = $this->bo->date2array($time);
+			$day_start = $this->bo->date2ts((string)$t_arr['full']);
+			$percent = ($day_start - $start) / ($end - $start);
+	
+			$time_of_day = 60 * $t_arr['hour'] + $t_arr['minute'];
+			if ($time_of_day >= $this->wd_start)
+			{
+				if ($time_of_day > $this->wd_end)
+				{
+					$day_percentage = 1;
+				}
+				else
+				{
+					$day_percentage = ($time_of_day-$this->wd_start) / ($this->wd_end - $this->wd_start);		// between 0 and 1
+				}
+				$days = ($end - $start) / DAY_s;
+				$percent += $day_percentage / $days;
+			}
+		}
+		$percent = round(100 * $percent,2);
+		
+		//echo "<p>_planner_pos(".date('Y-m-d H:i',$time).', '.date('Y-m-d H:i',$start).', '.date('Y-m-d H:i',$end).") = $percent</p>\n";
+		return $percent;
+	}
+
+	/**
+	 * Displays one event for the planner, using the eventWidget of the other views
+	 *
+	 * @param array $event
+	 * @param int $start start-time of the planner
+	 * @param int $end end-time of the planner
+	 * @return string with widget
+	 */
+	function plannerEventWidget($event,$start,$end,$indent='')
+	{
+		$event['multiday'] = true;	// otherwise eventWidgets displays only the time and expects start_m to be set
+		$data = $this->eventWidget($event,200,$indent,true,'planner_event');
+		
+		$left = $this->_planner_pos($event['start'],$start,$end);
+		$width = $this->_planner_pos($event['end'],$start,$end) - $left;
+		$color = $data['color'] ? $data['color'] : 'gray';
+		
+		return $indent.'<div class="plannerEvent'.($data['private'] ? 'Private' : '').'" style="left: '.$left.
+			'%; width: '.$width.'%; background-color: '.$color.';"'.$data['popup'].' '.
+			$this->html->tooltip($data['tooltip'],False,array('BorderWidth'=>0,'Padding'=>0)).'>'."\n".$data['html'].$indent."</div>\n";
 	}
 }
diff --git a/calendar/inc/hook_admin.inc.php b/calendar/inc/hook_admin.inc.php
index db857b8fad..6980f703a8 100755
--- a/calendar/inc/hook_admin.inc.php
+++ b/calendar/inc/hook_admin.inc.php
@@ -1,8 +1,7 @@
 <?php
 	/**************************************************************************\
-	* eGroupWare                                                               *
+	* eGroupWare - Calendar                                                    *
 	* http://www.egroupware.org                                                *
-	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
@@ -15,11 +14,10 @@
 // Only Modify the $file and $title variables.....
 	$title = $appname;
 	$file = Array(
-		'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
-		'Custom fields and sorting' => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index'),
-		'Calendar Holiday Management' => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
-		'Import CSV-File' => $GLOBALS['phpgw']->link('/calendar/csv_import.php'),
-		'Global Categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar')
+		'Site Configuration' => $GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
+		'Custom fields' => $GLOBALS['egw']->link('/index.php','menuaction=admin.customfields.edit&appname=calendar'),
+		'Calendar Holiday Management' => $GLOBALS['egw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
+		'Global Categories' => $GLOBALS['egw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar')
 	);
 //Do not modify below this line
 	display_section($appname,$title,$file);
diff --git a/calendar/inc/hook_deleteaccount.inc.php b/calendar/inc/hook_deleteaccount.inc.php
index b656f81af8..a85d01d883 100755
--- a/calendar/inc/hook_deleteaccount.inc.php
+++ b/calendar/inc/hook_deleteaccount.inc.php
@@ -1,31 +1,15 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare                                                               *
-  * http://www.egroupware.org                                                *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* eGroupWare                                                               *
+	* http://www.egroupware.org                                                *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 	/* $Id$ */
 
-	// Delete all records for a user
-	if((int)$GLOBALS['hook_values']['account_id'] > 0)
-	{
-		if((int)$_POST['new_owner'] == 0)
-		{
-			ExecMethod('calendar.bocalendar.delete_calendar',(int)$GLOBALS['hook_values']['account_id']);
-		}
-		else
-		{
-			ExecMethod('calendar.bocalendar.change_owner',
-				Array(
-					'old_owner'	=> (int)$GLOBALS['hook_values']['account_id'],
-					'new_owner'	=> (int)$_POST['new_owner']
-				)
-			);
-		}
-	}
-?>
+	$socal =& CreateObject('calendar.socal');
+	$socal->change_delete_user((int)$_POST['account_id'],(int)$_POST['new_owner']);
+	unset($socal);
diff --git a/calendar/inc/hook_email.inc.php b/calendar/inc/hook_email.inc.php
deleted file mode 100755
index f2d50fac5d..0000000000
--- a/calendar/inc/hook_email.inc.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	global $calendar_id;
-
-	$d1 = strtolower(substr($GLOBALS['phpgw_info']['server']['app_inc'],0,3));
-	if($d1 == 'htt' || $d1 == 'ftp')
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$phpgw->common->phpgw_exit();
-	}
-	unset($d1);
-
-	if ($calendar_id)
-	{
-		$GLOBALS['phpgw']->translation->add_app('calendar');
-
-		$cal = CreateObject('calendar.uicalendar');
-		//echo "Event ID: $calendar_id<br>\n";
-
-		if ($event = $cal->bo->read_entry($calendar_id))
-		{
-			echo $cal->timematrix(
-				Array(
-					'date'		=> $GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year']) - $phpgw->calendar->tz_offset),
-					'starttime'	=> $cal->bo->splittime('000000',False),
-					'endtime'	=> 0,
-					'participants'	=> $event['participants'])
-					) .
-
-				'</td></tr><tr><td>' .
-
-				$cal->view_event($event) .
-
-				'</td></tr><tr><td align="center">' .
-
-				$cal->get_response($calendar_id);
-		}
-		unset($cal); unset($event);
-	}
-?>
diff --git a/calendar/inc/hook_home.inc.php b/calendar/inc/hook_home.inc.php
index 7aeb19fb4f..3dc20782fc 100755
--- a/calendar/inc/hook_home.inc.php
+++ b/calendar/inc/hook_home.inc.php
@@ -1,100 +1,65 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+/**************************************************************************\
+* eGroupWare - Calendar on Homepage                                        *
+* http://www.egroupware.org                                                *
+* Written and (c) 2004 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* --------------------------------------------                             *
+*  This program is free software; you can redistribute it and/or modify it *
+*  under the terms of the GNU General Public License as published by the   *
+*  Free Software Foundation; either version 2 of the License, or (at your  *
+*  option) any later version.                                              *
+\**************************************************************************/
 
-  /* $Id$ */
+/* $Id$ */
 
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' )
+if($GLOBALS['egw_info']['user']['preferences']['calendar']['mainscreen_showevents'])
+{
+	$GLOBALS['egw']->translation->add_app('calendar');
+
+	$save_app_header = $GLOBALS['egw_info']['flags']['app_header'];
+	
+	if ($GLOBALS['egw_info']['user']['preferences']['calendar']['defaultcalendar'] == 'listview')
 	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
+		$content =& ExecMethod('calendar.uilist.home');
 	}
-	unset($d1);
-
-	$showevents = (int)$GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'];
-	if($showevents>0)
+	else
 	{
-		$GLOBALS['phpgw']->translation->add_app('calendar');
-		if(!is_object($GLOBALS['phpgw']->datetime))
-		{
-			$GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
-		}
-
-		$GLOBALS['date'] = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
-		$GLOBALS['g_year'] = substr($GLOBALS['date'],0,4);
-		$GLOBALS['g_month'] = substr($GLOBALS['date'],4,2);
-		$GLOBALS['g_day'] = substr($GLOBALS['date'],6,2);
-		$GLOBALS['owner'] = $GLOBALS['phpgw_info']['user']['account_id'];
-		$GLOBALS['css'] = "\n".'<style type="text/css">'."\n".'<!--'."\n"
-			. ExecMethod('calendar.uicalendar.css').'-->'."\n".'</style>';
-
-		if($showevents==2)
-		{
-			$_page = "small";
-		}
-		else
-		{
-			$page_ = explode('.',$GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultcalendar']);
-			$_page = substr($page_[0],0,7);	// makes planner from planner_{user|category}
-			if ($_page=='index' || ($_page != 'day' && $_page != 'week' && $_page != 'month' && $_page != 'year' && $_page != 'planner'))
-			{
-				$_page = 'month';
-//			$GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar','month');
-//			$GLOBALS['phpgw']->preferences->save_repository();
-			}
-		}
-
-		if(!@file_exists(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php'))
-		{
-			$_page = 'day';
-		}
-		include(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');
-
-		$title = lang('Calendar');
-
-		$portalbox = CreateObject('phpgwapi.listbox',
-			Array(
-				'title'	=> $title,
-				'primary'	=> $GLOBALS['phpgw_info']['theme']['navbar_bg'],
-				'secondary'	=> $GLOBALS['phpgw_info']['theme']['navbar_bg'],
-				'tertiary'	=> $GLOBALS['phpgw_info']['theme']['navbar_bg'],
-				'width'	=> '100%',
-				'outerborderwidth'	=> '0',
-				'header_background_image'	=> $GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler')
-			)
-		);
-
-		$app_id = $GLOBALS['phpgw']->applications->name2id('calendar');
-		$GLOBALS['portal_order'][] = $app_id;
-		$var = Array(
-			'up'	=> Array('url'	=> '/set_box.php', 'app'	=> $app_id),
-			'down'	=> Array('url'	=> '/set_box.php', 'app'	=> $app_id),
-			'close'	=> Array('url'	=> '/set_box.php', 'app'	=> $app_id),
-			'question'	=> Array('url'	=> '/set_box.php', 'app'	=> $app_id),
-			'edit'	=> Array('url'	=> '/set_box.php', 'app'	=> $app_id)
-		);
-
-		while(list($key,$value) = each($var))
-		{
-			$portalbox->set_controls($key,$value);
-		}
-
-		$portalbox->data = Array();
-
-		echo "\n".'<!-- BEGIN Calendar info -->'."\n".$portalbox->draw($GLOBALS['extra_data'])."\n".'<!-- END Calendar info -->'."\n";
-		unset($cal);
+		$content =& ExecMethod('calendar.uiviews.home');
 	}
-	flush();
-	unset($showevents);
-?>
+	$portalbox =& CreateObject('phpgwapi.listbox',array(
+		'title'	=> $GLOBALS['egw_info']['flags']['app_header'],
+		'primary'	=> $GLOBALS['egw_info']['theme']['navbar_bg'],
+		'secondary'	=> $GLOBALS['egw_info']['theme']['navbar_bg'],
+		'tertiary'	=> $GLOBALS['egw_info']['theme']['navbar_bg'],
+		'width'	=> '100%',
+		'outerborderwidth'	=> '0',
+		'header_background_image'	=> $GLOBALS['egw']->common->image('phpgwapi/templates/default','bg_filler')
+	));
+	$GLOBALS['egw_info']['flags']['app_header'] = $save_app_header; 
+	unset($save_app_header);
+
+	$GLOBALS['portal_order'][] = $app_id = $GLOBALS['egw']->applications->name2id('calendar');
+	foreach(array('up','down','close','question','edit') as $key)
+	{
+		$portalbox->set_controls($key,Array('url' => '/set_box.php', 'app' => $app_id));
+	}
+	$portalbox->data = Array();
+
+	if (!file_exists(EGW_SERVER_ROOT.($css_file ='/calendar/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/app.css')))
+	{
+		$css_file = '/calendar/templates/default/app.css';
+	}
+	echo '
+<!-- BEGIN Calendar info -->
+<style type="text/css">
+<!--
+@import url('.$GLOBALS['egw_info']['server']['webserver_url'].$css_file.');
+-->
+</style>
+'.$portalbox->draw($content)."\n".'<!-- END Calendar info -->'."\n";
+	
+	unset($key);
+	unset($app_id);
+	unset($content); 
+	unset($portalbox);
+}
diff --git a/calendar/inc/hook_home_day.inc.php b/calendar/inc/hook_home_day.inc.php
deleted file mode 100755
index e033cfa5fb..0000000000
--- a/calendar/inc/hook_home_day.inc.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' )
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
-	}
-	unset($d1);
-
-	$GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table border="0" cols="3"><tr><td align="center" width="35%" valign="top">'
-		. ExecMethod('calendar.uicalendar.mini_calendar',
-			Array(
-				'day'		=> $GLOBALS['g_day'],
-				'month'	=> $GLOBALS['g_month'],
-				'year'	=> $GLOBALS['g_year'],
-				'link'	=> 'day'
-			)
-		).'</td><td align="center"><table border="0" width="100%" cellspacing="0" cellpadding="0">'
-		. '<tr><td align="center">'.ExecMethod('calendar.bocalendar.long_date',time())
-		.'</td></tr><tr><td bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_text']
-		.'" valign="top">'.ExecMethod('calendar.uicalendar.print_day',
-			Array(
-				'year'	=> $GLOBALS['g_year'],
-				'month'	=> $GLOBALS['g_month'],
-				'day'		=> $GLOBALS['g_day']
-			)
-		).'</td></tr></table>'."\n".'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";
-?>
diff --git a/calendar/inc/hook_home_month.inc.php b/calendar/inc/hook_home_month.inc.php
deleted file mode 100755
index ae7d654069..0000000000
--- a/calendar/inc/hook_home_month.inc.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' )
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
-	}
-	unset($d1);
-
-	$GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table border="0" cols="3"><tr><td align="center" width="100%" valign="top">'
-		. ExecMethod('calendar.uicalendar.get_month')
-		.'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";
-?>
diff --git a/calendar/inc/hook_home_planner.inc.php b/calendar/inc/hook_home_planner.inc.php
deleted file mode 100644
index 26e4f61cb2..0000000000
--- a/calendar/inc/hook_home_planner.inc.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar - Planner                                          *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' )
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
-	}
-	unset($d1);
-
-	$GLOBALS['extra_data'] = '<table width="100%" cellpadding="0"><tr><td bgcolor="white">'.
-		ExecMethod('calendar.uicalendar.planner').'</td></tr></table>';
-?>
diff --git a/calendar/inc/hook_home_small.inc.php b/calendar/inc/hook_home_small.inc.php
deleted file mode 100755
index 9f104f9638..0000000000
--- a/calendar/inc/hook_home_small.inc.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' )
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
-	}
-	unset($d1);
-
-	$today = $GLOBALS['phpgw']->datetime->users_localtime;
-	$dates = array($today);
-	$wday = date('w',$today);
-	if($wday=='5') // if it's Friday, show the weekend, plus Monday
-	{
-		$dates[] = $today + 86400;		// Saturday
-		$dates[] = $today + (2*86400);	// Sunday
-	}
-	if($wday=='6') // if it's Saturday, show Sunday, plus Monday
-	{
-		$dates[] = $today + 86400;		// Sunday
-	}
-	$dates[] = $dates[count($dates)-1] + 86400; // the next business day
-
-	$extra_data = $GLOBALS['css']."\n"
-			. '<table border="0" width="100%" cellspacing="0" cellpadding="1">'
-			. '<tr><td valign="top" width="100%">';
-	foreach($dates as $id=>$day)
-	{
-		$dayprint = ExecMethod('calendar.uicalendar.print_day',
-							Array(
-								'year'  => date('Y',$day),
-								'month' => date('m',$day),
-								'day'   => date('d',$day)
-							));
-		$extra_data .= '<font class="event-off" style="font-weight: bold">&nbsp;&nbsp&nbsp;'.lang(date('l',$day)) .'</font><br />' . $dayprint;
-	}
-	$extra_data .= '</td></tr></table>'."\n";
-
-	$GLOBALS['extra_data'] = $extra_data;
-
-	unset($dates);
-	unset($today);
-	unset($extra_data);
-?>
diff --git a/calendar/inc/hook_home_week.inc.php b/calendar/inc/hook_home_week.inc.php
deleted file mode 100755
index a659862dcd..0000000000
--- a/calendar/inc/hook_home_week.inc.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' )
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
-	}
-	unset($d1);
-
-	$GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table border="0" cols="3"><tr><td align="center" width="100%" valign="top">'
-		. ExecMethod('calendar.uicalendar.get_week')
-		.'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";
-?>
diff --git a/calendar/inc/hook_home_year.inc.php b/calendar/inc/hook_home_year.inc.php
deleted file mode 100755
index e98a7ace98..0000000000
--- a/calendar/inc/hook_home_year.inc.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' )
-	{
-		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
-		$GLOBALS['phpgw']->common->phpgw_exit();
-	}
-	unset($d1);
-
-	$GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table border="0" cols="3"><tr><td align="center" width="100%" valign="top">'
-		. ExecMethod('calendar.uicalendar.get_year')
-		.'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";
-?>
diff --git a/calendar/inc/hook_preferences.inc.php b/calendar/inc/hook_preferences.inc.php
index bff76bbb3f..d247439fb2 100644
--- a/calendar/inc/hook_preferences.inc.php
+++ b/calendar/inc/hook_preferences.inc.php
@@ -1,8 +1,7 @@
 <?php
   /**************************************************************************\
-  * eGroupWare                                                               *
+  * eGroupWare - Calendar                                                              *
   * http://www.egroupware.org                                                *
-  * Written by Joseph Engo <jengo@phpgroupware.org>                          *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
@@ -16,9 +15,9 @@
 	$file = array(
 		'Preferences'     => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uisettings.index&appname=' . $appname),
 		'Grant Access'    => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
-		'Edit Categories' => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app='.$appname.'&cats_level=True&global_cats=True')
+		'Edit Categories' => $GLOBALS['egw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app='.$appname.'&cats_level=True&global_cats=True'),
+		'Import CSV-File' => $GLOBALS['egw']->link('/calendar/csv_import.php'),
 	);
 //Do not modify below this line
 	display_section($appname,$title,$file);
 }
-?>
diff --git a/calendar/inc/hook_settings.inc.php b/calendar/inc/hook_settings.inc.php
index 87f5cf2ab9..dc204a754d 100644
--- a/calendar/inc/hook_settings.inc.php
+++ b/calendar/inc/hook_settings.inc.php
@@ -15,25 +15,20 @@
 
 	/* $Id$ */
 
-	// jscalendar is needed by the new navigation-menu AND it need to be loaded befor the header !!!
-	if (!is_object($GLOBALS['egw']->jscalendar))
-	{
-		$GLOBALS['egw']->jscalendar = CreateObject('phpgwapi.jscalendar');
-	}
-	ExecMethod('calendar.bocalendar.check_set_default_prefs');
+	ExecMethod('calendar.bocal.check_set_default_prefs');
 
 	$default = array(
-		'day'          => lang('Daily'),
-		'week'         => lang('Weekly'),
-		'month'        => lang('Monthly'),
-		'year'         => lang('Yearly'),
+		'day'          => lang('Dayview'),
+		'week'         => lang('Weekview'),
+		'month'        => lang('Monthview'),
 		'planner_cat'  => lang('Planner by category'),
 		'planner_user' => lang('Planner by user'),
+		'listview'     => lang('Listview'),
 	);
 	/* Select list with number of day by week */
 	$week_view = array(
-		'5'	=> lang('Weekview without weekend'),
-		'7' => lang('Weekview including weekend'),
+		'5' => lang('Weekview without weekend'),
+		'7' => lang('Weekview with weekend'),
 	);
 	/* Selection of list for home page is different from default calendar,
 	   since the decision for the front page is different for the decision
@@ -83,6 +78,7 @@
 		'repetition'  => lang('Repetitiondetails (or empty)'),
 		'action'      => lang('Action that caused the notify: Added, Canceled, Accepted, Rejected, ...'),
 		'link'        => lang('Link to view the event'),
+		'disinvited'  => lang('Participants disinvited from an event'),
 	);
 	$weekdaystarts = array(
 		'Monday'   => lang('Monday'),
@@ -113,12 +109,6 @@
 			$options[$group['account_id']] = $GLOBALS['egw']->common->grab_owner_name($group['account_id']);
 		}
 	}
-	$planner_intervals = array(
-		1	=> '1',
-		2	=> '2',
-		3	=> '3',
-		4	=> '4',
-	);
 	$defaultfilter = array(
 		'all'     => lang('all'),
 		'private' => lang('private only'),
@@ -219,6 +209,19 @@
 			'xmlrpc' => True,
 			'admin'  => False
 		),
+		'notifyDisinvited' => array(
+			'type'   => 'notify',
+			'label'  => 'Notification messages for disinvited participants ',
+			'name'   => 'notifyDisinvited',
+			'rows'   => 5,
+			'cols'   => 50,
+			'help'   => 'This message is sent to disinvited participants.',
+			'default' => '',
+			'values' => $event_details,
+			'subst_help' => False,
+			'xmlrpc' => True,
+			'admin'  => False
+		),
 		'notifyResponse' => array(
 			'type'   => 'notify',
 			'label'  => 'Notification messages for your responses ',
@@ -314,15 +317,6 @@
 			'xmlrpc' => True,
 			'admin'  => False
 		),
-		'planner_intervals_per_day' => array(
-			'type'   => 'select',
-			'label'  => 'Intervals per day in planner view',
-			'name'   => 'planner_intervals_per_day',
-			'values' => $planner_intervals,
-			'help'   => 'Specifies the the number of intervals shown in the planner view.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
 		'defaultfilter' => array(
 			'type'   => 'select',
 			'label'  => 'Default calendar filter',
@@ -340,24 +334,6 @@
 			'xmlrpc' => True,
 			'admin'  => False
 		),
-/* not used at the moment
-		'display_minicals' => array(
-			'type'  => 'check',
-			'label' => 'Print the mini calendars',
-			'name'  => 'display_minicals',
-			'help'  => 'Should the mini calendars by printed / displayed in the printer friendly views ?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'print_black_white' => array(
-			'type'  => 'check',
-			'label' => 'Print calendars in black & white',
-			'name'  => 'print_black_white',
-			'help'  => 'Should the printer friendly view be in black & white or in color (as in normal view)?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-*/
 		'freebusy' => array(
 			'type'  => 'check',
 			'label' => 'Make freebusy information available to not loged in persons?',
diff --git a/calendar/inc/hook_sidebox_menu.inc.php b/calendar/inc/hook_sidebox_menu.inc.php
deleted file mode 100644
index 21645a9217..0000000000
--- a/calendar/inc/hook_sidebox_menu.inc.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**************************************************************************\
-* eGroupWare - Calendar's Sidebox-Menu for idots-template                  *
-* http://www.egroupware.org                                                *
-* Written by Pim Snel <pim@lingewoud.nl>                                   *
-* --------------------------------------------                             *
-*  This program is free software; you can redistribute it and/or modify it *
-*  under the terms of the GNU General Public License as published by the   *
-*  Free Software Foundation; either version 2 of the License, or (at your  *
-*  option) any later version.                                              *
-\**************************************************************************/
-
-/* $Id$ */
-
-/**
-* File is depricated, the hook moved into the class uical !!!
-*/
-
-// register the new hooks, if the admin missed it ;-)
-
-if (!is_object($GLOBALS['phpgw']->hooks))
-{
-	$GLOBALS['phpgw']->hooks = CreateObject('phpgwapi.hooks');
-}
-include(PHPGW_INCLUDE_ROOT . '/calendar/setup/setup.inc.php');
-
-$GLOBALS['phpgw']->hooks->register_hooks('calendar',$setup_info['calendar']['hooks']);
-
-ExecMethod($setup_info['calendar']['hooks']['sidebox_menu']);
diff --git a/calendar/index.php b/calendar/index.php
index fa14663891..2b8c7f90b2 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -1,45 +1,25 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Modified by Mark Peters <skeeter@phpgroupware.org>                       *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+/**************************************************************************\
+* eGroupWare - Calendar                                                    *
+* http://www.egroupware.org                                                *
+* Written and (c) 2005 by Ralf Becker <RalfBecker@outdoor-training.de>     *
+* --------------------------------------------                             *
+*  This program is free software; you can redistribute it and/or modify it *
+*  under the terms of the GNU General Public License as published by the   *
+*  Free Software Foundation; either version 2 of the License, or (at your  *
+*  option) any later version.                                              *
+\**************************************************************************/
 
-	/* $Id$ */
+/* $Id$ */
 
-	$phpgw_flags = Array(
-		'currentapp'	=>	'calendar',
-		'noheader'	=>	True,
-		'nonavbar'	=>	True,
-		'noappheader'	=>	True,
-		'noappfooter'	=>	True,
-		'nofooter'	=>	True
-	);
+$GLOBALS['egw_info'] = array('flags' => array(
+	'currentapp'=>	'calendar',
+	'noheader'	=>	True,
+	'nonavbar'	=>	True,
+));
 
-	$GLOBALS['phpgw_info']['flags'] = $phpgw_flags;
+include('../header.inc.php');
 
-	include('../header.inc.php');
-	if(!is_object($GLOBALS['phpgw']->datetime))
-	{
-		$GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
-	}
+ExecMethod('calendar.uiviews.index');
 
-	$parms = Array(
-#		'menuaction'=> 'calendar.uicalendar.index',
-		'date'		=> date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime)
-	);
-
-	//echo 'Local DateTime: '.date('Ymd H:i:s',$GLOBALS['phpgw']->datetime->users_localtime).'<br>'."\n";
-
-#	$GLOBALS['phpgw']->redirect_link('/index.php',$parms);
-	ExecMethod('calendar.uicalendar.index',$parms);
-	$GLOBALS['phpgw']->common->phpgw_exit();
-
-?>
+$GLOBALS['egw']->common->egw_footer();
diff --git a/calendar/setup/default_records.inc.php b/calendar/setup/default_records.inc.php
index b2a4e8bb75..c35a1b77e5 100644
--- a/calendar/setup/default_records.inc.php
+++ b/calendar/setup/default_records.inc.php
@@ -12,5 +12,15 @@
 	/* $Id$ */
 
 	// enable auto-loading of holidays from localhost by default
-	$oProc->query("INSERT INTO phpgw_config (config_app, config_name, config_value) VALUES ('phpgwapi','auto_load_holidays','True')");
-	$oProc->query("INSERT INTO phpgw_config (config_app, config_name, config_value) VALUES ('phpgwapi','holidays_url_path','localhost')");
+	foreach(array(
+		'auto_load_holidays' => 'True',
+		'holidays_url_path'  => 'localhost',
+	) as $name => $value)
+	{
+		$oProc->insert($GLOBALS['egw_setup']->config_table,array(
+			'config_value' => $value,
+		),array(
+			'config_app' => 'phpgwapi',
+			'config_name' => $name,
+		),__FILE__,__LINE__);
+	}
diff --git a/calendar/setup/etemplates.inc.php b/calendar/setup/etemplates.inc.php
index 9a07b76b48..a9065c36c1 100644
--- a/calendar/setup/etemplates.inc.php
+++ b/calendar/setup/etemplates.inc.php
@@ -1,13 +1,52 @@
 <?php
-// eTemplates for Application 'calendar', generated by etemplate.dump() 2004-12-12 13:22
+// eTemplates for Application 'calendar', generated by soetemplate::dump4setup() 2005-11-08 22:20
 
 /* $Id$ */
 
-$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",ired";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:5:",0,12";s:4:"name";s:10:"duration_h";s:4:"help";s:23:"Duration of the meeting";}i:2;a:5:{s:4:"type";s:13:"select-number";s:4:"size";s:8:",0,59,05";s:5:"label";s:1:":";s:4:"name";s:12:"duration_min";s:4:"help";s:19:"Timeframe to search";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"or Enddate / -time";}i:4;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
+$templ_version=1;
+
+$templ_data[] = array('name' => 'calendar.conflicts','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:3:{i:0;a:3:{s:4:"type";s:5:"label";s:5:"label";s:20:" Scheduling conflict";s:4:"span";s:9:",size120b";}i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:34:"conflicts[$row][icon_participants]";s:5:"label";s:38:"@conflicts[$row][tooltip_participants]";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:27:"conflicts[$row][icon_recur]";s:5:"label";s:28:"@conflicts[$row][text_recur]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:21:"conflicts[$row][time]";s:7:"no_lang";s:1:"1";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"name";s:22:"conflicts[$row][title]";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:41:"conflicts[$row][conflicting_participants]";s:7:"no_lang";s:1:"1";}s:4:"help";s:23:"conflict[$row][tooltip]";}}}s:4:"rows";i:1;s:4:"cols";i:4;}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Ignore conflict";s:4:"name";s:14:"button[ignore]";s:4:"help";s:37:"Saves the event ignoring the conflict";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reedit]";s:5:"label";s:13:"Re-Edit event";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Freetime search";s:4:"name";s:16:"button[freetime]";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}}','size' => '','style' => '','modified' => '1119080124',);
+
+$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:6:{s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:1:"A";s:3:"100";s:2:"c4";s:3:"row";s:2:"h4";s:8:",!@owner";s:1:"B";s:3:"300";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"name";s:5:"title";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:63:"General|Description|Participants|Recurrence|Custom|Links|Alarms";s:4:"name";s:63:"general|description|participants|recurrence|custom|links|alarms";s:4:"help";s:158:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:5:"owner";s:8:"readonly";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:9:"date-time";s:5:"label";s:7:"Updated";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}}}i:5;a:3:{s:1:"A";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"7";s:4:"span";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:19:"button[edit_series]";s:5:"label";s:11:"Edit series";s:4:"help";s:35:"Edit this series of recuring events";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:15:"Edit this event";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[copy]";s:5:"label";s:4:"Copy";s:4:"help";s:15:"Copy this event";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:22:"saves the changes made";}i:5;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"apply the changes";}i:6;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";s:4:"help";s:16:"Close the window";}i:7;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:11:"custom_mail";s:5:"label";s:21:"mail all participants";s:4:"help";s:59:"compose a mail to all participants after the event is saved";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:5:"align";s:5:"right";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:6:"button";s:4:"name";s:21:"button[delete_series]";s:5:"label";s:13:"Delete series";s:4:"help";s:37:"Delete this series of recuring events";s:7:"onclick";s:56:"return confirm(\'Delete this series of recuring events\');";}i:2;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}}}}s:4:"rows";i:5;s:4:"cols";i:3;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1118477069',);
+
+$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:6:{s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:1:"A";s:3:"100";s:2:"c4";s:3:"row";s:2:"h4";s:8:",!@owner";s:1:"B";s:3:"300";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"name";s:5:"title";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:5:{s:4:"type";s:3:"tab";s:4:"span";s:3:"all";s:5:"label";s:63:"General|Description|Participants|Recurrence|Custom|Links|Alarms";s:4:"name";s:63:"general|description|participants|recurrence|custom|links|alarms";s:4:"help";s:158:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:5:"owner";s:8:"readonly";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:5:{s:4:"type";s:9:"date-time";s:5:"label";s:7:"Updated";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}}}i:5;a:3:{s:1:"A";a:11:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";s:4:"span";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:4:"name";s:19:"button[edit_series]";s:5:"label";s:11:"Edit series";s:4:"help";s:35:"Edit this series of recuring events";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:15:"Edit this event";}i:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[copy]";s:5:"label";s:4:"Copy";s:4:"help";s:15:"Copy this event";}i:4;a:4:{s:4:"type";s:6:"button";s:4:"name";s:12:"button[vcal]";s:5:"label";s:6:"Export";s:4:"help";s:27:"Download this event as iCal";}i:5;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"help";s:22:"saves the changes made";}i:6;a:4:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";s:4:"help";s:17:"apply the changes";}i:7;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";s:4:"help";s:16:"Close the window";}i:8;a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:11:"custom_mail";s:5:"label";s:21:"mail all participants";s:4:"help";s:59:"compose a mail to all participants after the event is saved";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:5:"align";s:5:"right";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:6:"button";s:4:"name";s:21:"button[delete_series]";s:5:"label";s:13:"Delete series";s:4:"help";s:37:"Delete this series of recuring events";s:7:"onclick";s:56:"return confirm(\'Delete this series of recuring events\');";}i:2;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}}}}s:4:"rows";i:5;s:4:"cols";i:3;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1118477069',);
+
+$templ_data[] = array('name' => 'calendar.edit.alarms','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"h1";s:16:"20,@no_add_alarm";s:2:"c2";s:4:",top";s:2:"h2";s:8:",!@alarm";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"B";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:3:{s:4:"type";s:13:"select-number";s:4:"size";s:4:",0,7";s:4:"name";s:15:"new_alarm[days]";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[days]";s:5:"label";s:4:"days";}i:3;a:3:{s:4:"type";s:13:"select-number";s:4:"name";s:16:"new_alarm[hours]";s:4:"size";s:5:",0,23";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"size";s:19:",,,new_alarm[hours]";s:5:"label";s:5:"hours";}i:5;a:3:{s:4:"type";s:13:"select-number";s:4:"name";s:15:"new_alarm[mins]";s:4:"size";s:7:",0,55,5";}i:6;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[mins]";s:5:"label";s:7:"Minutes";}i:7;a:5:{s:4:"type";s:6:"select";s:4:"name";s:16:"new_alarm[owner]";s:7:"no_lang";s:1:"1";s:5:"label";s:3:"for";s:4:"help";s:31:"Select who should get the alarm";}i:8;a:3:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[add_alarm]";s:5:"label";s:9:"Add alarm";}}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Alarms";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"All participants";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[time]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[offset]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:11:"${row}[all]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"E";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:27:"delete_alarm[$row_cont[id]]";s:4:"help";s:17:"Delete this alarm";s:7:"onclick";s:36:"return confirm(\'Delete this alarm\');";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:4:"name";s:5:"alarm";s:7:"options";a:0:{}}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118780740',);
+
+$templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"name";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118737582',);
+
+$templ_data[] = array('name' => 'calendar.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:7:"row,top";s:1:"A";s:2:"95";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,description";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"12,70";s:4:"name";s:11:"description";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118480337',);
+
+$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:9:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c3";s:3:"row";s:2:"c4";s:7:"row,top";s:2:"c6";s:3:"row";s:2:"c5";s:3:"row";s:2:"c2";s:3:"row";s:2:"h4";s:2:"60";s:1:"B";s:3:"35%";}i:1;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,start";s:5:"label";s:5:"Start";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:6:"needed";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"whole_day";s:5:"label";s:9:"whole day";s:4:"help";s:31:"Event will occupy the whole day";s:4:"size";s:11:",, ,disable";}}i:2;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:6:",,,end";s:5:"label";s:3:"End";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:6:"needed";s:1:"1";}s:1:"C";a:5:{s:4:"type";s:6:"button";s:5:"label";s:15:"Freetime search";s:4:"name";s:8:"freetime";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";s:7:"onclick";s:239:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";}}i:3;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,location";s:5:"label";s:8:"Location";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:6:"80,255";s:4:"name";s:8:"location";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,category";s:5:"label";s:8:"Category";}s:1:"B";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"3";s:4:"name";s:8:"category";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:5;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,priority";s:5:"label";s:8:"Priority";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}i:2;a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:12:"non blocking";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";}s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:6;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:9:",,,public";s:5:"label";s:7:"Private";}s:1:"B";a:4:{s:4:"type";s:8:"checkbox";s:4:"size";s:3:"0,1";s:4:"name";s:6:"public";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:3;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118477982',);
+
+$templ_data[] = array('name' => 'calendar.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"h1";s:6:",@view";s:2:"h2";s:6:",@view";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:2:"th";s:2:"c4";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:16:"Create new links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:7:"link-to";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"link-list";s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:4:"size";s:17:"100%,200,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1118758702',);
+
+$templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:7:"row,top";s:1:"A";s:2:"95";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:15:",,,participants";s:5:"label";s:12:"Participants";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"size";s:2:"14";s:4:"name";s:22:"participants[accounts]";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Resources";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:16:"resources_select";s:4:"size";s:2:"14";s:4:"name";s:23:"participants[resources]";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:16:"100%,200,,row_on";s:7:"options";a:3:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200,,row_on','style' => '','modified' => '1118481127',);
+
+$templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:7:"row,top";s:1:"A";s:2:"95";s:2:"h1";s:6:",@view";s:2:"h2";s:7:",!@view";s:2:"c2";s:4:",top";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:15:",,,participants";s:5:"label";s:12:"Participants";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"size";s:2:"14";s:4:"name";s:22:"participants[accounts]";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Resources";s:5:"align";s:5:"right";}s:1:"D";a:3:{s:4:"type";s:16:"resources_select";s:4:"size";s:2:"14";s:4:"name";s:23:"participants[resources]";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:26:"accounts_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:22:"participants[accounts]";s:7:"options";a:0:{}}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Resources";s:5:"align";s:5:"right";}s:1:"D";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:19:",!@resources_status";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:16:"resources_select";s:4:"name";s:6:"${row}";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:5:{s:4:"type";s:6:"select";s:4:"name";s:27:"resources_status[$row_cont]";s:8:"onchange";s:1:"1";s:4:"help";s:30:"Accept or reject an invitation";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:23:"participants[resources]";s:7:"options";a:0:{}}}}s:4:"rows";i:2;s:4:"cols";i:4;s:4:"size";s:23:"100%,200,,row_on,,,auto";s:7:"options";a:4:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"200";i:6;s:4:"auto";}}}','size' => '100%,200,,row_on,,,auto','style' => '','modified' => '1129665796',);
+
+$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118737412',);
+
+$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:6:{s:2:"c1";s:2:"th";s:1:"A";s:2:"95";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:1:"D";s:3:"50%";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"be back soon ;-)";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_type";s:5:"label";s:11:"Repeat type";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:10:"recur_type";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,recur_interval";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";s:4:"size";s:9:"None,2,10";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:16:",,,recur_enddate";s:5:"label";s:8:"End date";}s:1:"B";a:3:{s:4:"type";s:4:"date";s:4:"name";s:13:"recur_enddate";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_data";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:3:"5,1";s:4:"name";s:10:"recur_data";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:4;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118737412',);
+
+$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:9:{s:2:"c1";s:2:"th";s:1:"A";s:2:"95";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:7:"row,top";s:1:"D";s:3:"50%";s:2:"h1";s:2:"12";s:2:"h2";s:2:"12";s:2:"h3";s:2:"12";}i:1;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"be back soon ;-)";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_type";s:5:"label";s:11:"Repeat type";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:10:"recur_type";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"size";s:17:",,,recur_interval";s:5:"label";s:8:"Interval";}s:1:"D";a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:14:"recur_interval";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";s:4:"size";s:9:"None,2,10";}}i:3;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:16:",,,recur_enddate";s:5:"label";s:8:"End date";}s:1:"B";a:4:{s:4:"type";s:4:"date";s:4:"name";s:13:"recur_enddate";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";s:4:"span";s:3:"all";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:13:",,,recur_data";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:3:"6,1";s:4:"name";s:10:"recur_data";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}s:1:"D";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:4:"$row";s:8:"readonly";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"size";s:6:"delete";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"help";s:21:"Delete this exception";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"rows";i:4;s:4:"cols";i:4;s:4:"size";s:8:"100%,200";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"200";}}}','size' => '100%,200','style' => '','modified' => '1118737412',);
+
+$templ_data[] = array('name' => 'calendar.export','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:1:{s:2:"h5";s:2:",1";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,start";s:5:"label";s:5:"Start";}s:1:"B";a:3:{s:4:"type";s:4:"date";s:4:"name";s:5:"start";s:4:"help";s:23:"Startdate of the export";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:6:",,,end";s:5:"label";s:3:"End";}s:1:"B";a:3:{s:4:"type";s:4:"date";s:4:"name";s:3:"end";s:4:"help";s:21:"Enddate of the export";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,file";s:5:"label";s:8:"Filename";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"file";s:4:"help";s:24:"Filename of the download";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:10:",,,version";s:5:"label";s:7:"Version";}s:1:"B";a:2:{s:4:"type";s:6:"select";s:4:"name";s:7:"version";}}i:6;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:8:"Download";s:4:"name";s:8:"download";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:7;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1130738737',);
+
+$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",ired";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:5:",0,12";s:4:"name";s:10:"duration_h";s:4:"help";s:23:"Duration of the meeting";}i:2;a:5:{s:4:"type";s:13:"select-number";s:4:"size";s:8:",0,59,05";s:5:"label";s:1:":";s:4:"name";s:12:"duration_min";s:4:"help";s:19:"Timeframe to search";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"or Enddate / -time";}i:4;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
 .ired { color: red; font-style: italic; }','modified' => '1097251203',);
 
-$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",ired";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"or Enddate / -time";}i:3;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
-.ired { color: red; font-style: italic; }','modified' => '1102850646',);
+$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";s:4:"span";s:9:",end_hide";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"cancel";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
+.redItalic { color: red; font-style: italic; }
+.end_hide { visibility: hidden; }','modified' => '1102850646',);
 
-$templ_data[] = array('name' => 'calendar.freetimesearch.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Select";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"size";s:3:",16";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[start]";s:4:"help";s:13:"select a time";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Select";s:4:"name";s:12:"select[$row]";s:4:"help";s:41:"use the selected time and close the popup";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}}}','size' => '','style' => '','modified' => '1097183756',);
+$templ_data[] = array('name' => 'calendar.freetimesearch.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Select";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"size";s:3:",16";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[start]";s:4:"help";s:13:"select a time";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Select";s:4:"name";s:12:"select[$row]";s:4:"help";s:41:"use the selected time and close the popup";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1097183756',);
+
+$templ_data[] = array('name' => 'calendar.import','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"iCal file";}s:1:"B";a:3:{s:4:"type";s:4:"file";s:4:"name";s:9:"ical_file";s:6:"needed";s:1:"1";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131469789',);
+
+$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:9:"nextmatch";s:4:"size";s:18:"calendar.list.rows";s:4:"name";s:2:"nm";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1128458939',);
+
+$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"C";s:3:"50%";}i:1;a:5:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Start";s:4:"name";s:5:"start";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:3:"end";s:5:"label";s:3:"End";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:5:"title";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:3:"des";}}s:1:"D";a:3:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"size";s:12:"Participants";s:4:"name";s:11:"participant";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:12:"${row}[icon]";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}s:4:"name";s:5:"start";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}}s:1:"D";a:4:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"E";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"view";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"view this entry";s:7:"onclick";s:176:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.view&cal_id=$row_cont[id]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this entry";s:7:"onclick";s:176:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:17:"Delete this entry";s:7:"onclick";s:36:"return confirm(\'Delete this entry\');";}}}}s:4:"rows";i:2;s:4:"cols";i:5;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1128457387',);
+
+$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:3:"40%";s:1:"E";s:3:"10%";}i:1;a:5:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"cal_end";s:5:"label";s:3:"End";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:9:"cal_owner";s:5:"label";s:5:"Owner";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}}s:1:"D";a:3:{s:4:"size";s:16:"All participants";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:2;a:5:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}s:4:"name";s:5:"start";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}}s:1:"D";a:4:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"E";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"view";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:15:"View this event";s:7:"onclick";s:176:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.view&cal_id=$row_cont[id]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"help";s:15:"Edit this event";s:7:"onclick";s:176:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:17:"Delete this event";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";}}}}s:4:"rows";i:2;s:4:"cols";i:5;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1128457387',);
 
diff --git a/calendar/setup/phpgw_de.lang b/calendar/setup/phpgw_de.lang
index 5835129a93..032fc43168 100644
--- a/calendar/setup/phpgw_de.lang
+++ b/calendar/setup/phpgw_de.lang
@@ -1,352 +1,275 @@
 %1 %2 in %3	calendar	de	%1 %2 im %3
-%1 matches found	calendar	de	%1 Treffer gefunden
 %1 records imported	calendar	de	%1 Datensätze importiert
 %1 records read (not yet imported, you may go back and uncheck test import)	calendar	de	%1 Datensätze gelesen (noch nicht importiert, sie können zurück gehen und Test Import ausschalten)
-(for weekly)	calendar	de	(für wöchentlich)
-(i/v)cal	calendar	de	[iv]Cal
-1 match found	calendar	de	1 Treffer gefunden
-a	calendar	de	a
-accept	calendar	de	Zusagen
+<b>please note</b>: the calendar use the holidays of your country, which is set to %1. you can change it in your %2.<br />holidays are %3 automatic installed from %4. you can changed it in %5.	calendar	de	<b>Bitte beachten</b>: Der Kalender verwendet die Feiertages Ihres Landes, welches auf %1 eingestellt ist. Das können Sie in Ihren %2 ändern.<br />Feiertage werden %3 automatisch von %4 installiert, was in %5 änderbar ist.
+a non blocking event will not conflict with other events	calendar	de	Ein nicht blockierender Termin ergibt keine Konflikt mit anderen Terminen
+accept or reject an invitation	calendar	de	Einladung zu- oder absagen
 accepted	calendar	de	Zugesagt
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	de	Aktion die die Benachrichtigung verursacht hat: Zugefügt, Storniert, Zugesagt, Abgesagt
-add a single entry by passing the fields.	calendar	de	Einen einzelnen neuen Eintrag über seine Felder erzeugen.
+actions	calendar	de	Befehle
 add alarm	calendar	de	Alarm zufügen
-add contact	calendar	de	Kontakt zufügen
-add or update a single entry by passing the fields.	calendar	de	Einen einzelnen Eintrag zufügen oder speichern durch Angabe der Felder.
 added	calendar	de	Neuer Termin
-address book	calendar	de	Adressbuch
+after current date	calendar	de	Nach dem aktuellen Datum
 alarm	calendar	de	Alarm
+alarm added	calendar	de	Alarm zugefügt
+alarm deleted	calendar	de	Alarm gelöscht
 alarm for %1 at %2 in %3	calendar	de	Alarm für %1 am %2 in %3
 alarm management	calendar	de	Alarm Management
-alarm-management	calendar	de	Alarm Management
 alarms	calendar	de	Alarme
 all categories	calendar	de	Alle Kategorien
 all day	calendar	de	ganztägig
+all events	calendar	de	Alle Termine
+all participants	calendar	de	Alle Teilnehmer
+allows to edit the event again	calendar	de	Erlaubt den Termin erneut zu bearbeiten
+apply the changes	calendar	de	Übernimmt die Änderungen
 are you sure you want to delete this country ?	calendar	de	Sind Sie sicher, dass Sie dieses Land löschen wollen ?
 are you sure you want to delete this holiday ?	calendar	de	Sind Sie sicher, dass Sie diesen Feiertag löschen wollen ?
-are you sure\nyou want to\ndelete these alarms?	calendar	de	Sind Sie sicher,\ndass Sie diese\nAlarme löschen wollen ?
-are you sure\nyou want to\ndelete this entry ?	calendar	de	Sind Sie sicher,\ndass Sie diesen\nEintrag löschen wollen ?
-are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	de	Sind Sie sicher,\ndass Sie diesen\nEintrag löschen wollen ?\n\nDieser Eintrag wird damit\nfür alle Benutzer gelöscht.
-are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	de	Sind Sie sicher,\ndass Sie diesen einzelnen\nEintrag löschen wollen ?\n\nDieser Eintrag wird damit\nfür alle Benutzer gelöscht.
-are you surenyou want tondelete these alarms?	calendar	de	Sind Sie sicher,\ndass Sie diese\nAlarme löschen wollen ?
-are you surenyou want tondelete this entry ?	calendar	de	Sind Sie sicher,\ndass Sie diesen\nEintrag löschen wollen ?
-are you surenyou want tondelete this entry ?nnthis will deletenthis entry for all users.	calendar	de	Sind Sie sicher,\ndass Sie diesen\nEintrag löschen wollen ?\n\nDieser Eintrag wird damit\nfür alle Benutzer gelöscht.
-are you surenyou want tondelete this single occurence ?nnthis will deletenthis entry for all users.	calendar	de	Sind Sie sicher,\ndass Sie diesen einzelnen\nEintrag löschen wollen ?\n\nDieser Eintrag wird damit\nfür alle Benutzer gelöscht.
-back	calendar	de	zurück
+back half a month	calendar	de	einen halben Monat zurück
+back one month	calendar	de	einen Monat zurück
+before current date	calendar	de	Vor dem aktuellen Datum
 before the event	calendar	de	vor dem Termin
-brief description	calendar	de	Kurzbeschreibung
-business	calendar	de	geschäftlich
-calendar	common	de	Kalender
-calendar - [iv]cal importer	calendar	de	Kalendar - [iv]Cal Importieren
-calendar - add	calendar	de	Kalendereintrag hinzufügen
-calendar - edit	calendar	de	Kalendereintrag bearbeiten
+birthday	calendar	de	Geburtstag
+busy	calendar	de	belegt
+by	calendar	de	von
 calendar event	calendar	de	Kalender Aktualisierung
 calendar holiday management	admin	de	Feiertage verwalten
 calendar preferences	calendar	de	Kalender Einstellungen
 calendar settings	admin	de	Kalender Einstellungen
 calendar-fieldname	calendar	de	Kalender Feldname
+can't add alarms in the past !!!	calendar	de	Kann keine Alarme in der Vergangenheit setzen !!!
 canceled	calendar	de	Abgesagt
-change all events for $params['old_owner'] to $params['new_owner'].	calendar	de	Ändere alle Termine für $params['old_owner'] auf $params['new_owner'].
-change status	calendar	de	Zusage ändern
 charset of file	calendar	de	Zeichensatz der Datei
-choose the category	calendar	de	Kategorie auswählen
-click %1here%2 to return to the calendar.	calendar	de	%1Hier%2 klicken um zum Kalender zurück zu kehren.
-configuration	calendar	de	Konfiguration
+close the window	calendar	de	Schließt das Fenster
+compose a mail to all participants after the event is saved	calendar	de	Schreibe eine Mail an alle Teilnehmer nachdem der Termin gespeichert wurde
+copy of:	calendar	de	Kopie von:
+copy this event	calendar	de	Kopiert diesen Termin
 countries	calendar	de	Länder
 country	calendar	de	Land
-created by	calendar	de	Angelegt von
+create new links	calendar	de	Neue Verknüpfung erstellen
+csv	calendar	de	CSV
 csv-fieldname	calendar	de	CSV-Feldname
 csv-filename	calendar	de	CSV-Dateiname
 custom fields	calendar	de	Benutzerdefinierte Felder
-custom fields and sorting	common	de	Benutzerdefinierte Felder und Sortierung
 daily	calendar	de	Täglich
-daily matrix view	calendar	de	Matrix-Ansicht
 days	calendar	de	Tage
+days of the week for a weekly repeated event	calendar	de	Wochentage für wöchentlich wiederholten Termin
 days repeated	calendar	de	wiederholte Tage
 dayview	calendar	de	Tagesansicht
 default appointment length (in minutes)	calendar	de	Standardlänge eines neuen Kalendareintrags (in Minuten)
 default calendar filter	calendar	de	Standard-Filter des Kalenders
 default calendar view	calendar	de	Standard-Ansicht des Kalenders
 default length of newly created events. the length is in minutes, eg. 60 for 1 hour.	calendar	de	Vorgabe für die Länge von neuen Kalendareinträgen. Die Länge ist in Minuten, zb. 60 für 1 Stunde.
-default view of appointments	calendar	de	Standard-Ansicht der Termine
 default week view	calendar	de	Vorgabe Wochenansicht
 defines the size in minutes of the lines in the day view.	calendar	de	Bestimmt die Zeitskala in Minuten der Tagesansicht des Kalendars.
-delete a single entry by passing the id.	calendar	de	Lösche einen einzelnen Eintrag über seine Id.
-delete an entire users calendar.	calendar	de	Lösche den kompletten Kalender eines Benutzers.
-delete selected contacts	calendar	de	Löscht die ausgewählten Kontakte.
-delete selected participants	calendar	de	Löscht die ausgewählten Teilnehmer
 delete series	calendar	de	Serie löschen
-delete single	calendar	de	Einzelevent löschen
-deleted	calendar	de	Abgesagt
-description	calendar	de	Beschreibung
-determining window width ...	calendar	de	Bestimme die Fensterbreite ...
-disable	calendar	de	Ausschalten
-disabled	calendar	de	ausgeschaltet
-display interval in day view	calendar	de	Intervall der Tagesansicht
-display mini calendars when printing	calendar	de	zeige einen kleinen Kalender beim drucken
+delete this alarm	calendar	de	Diesen Alarm löschen
+delete this event	calendar	de	Diesen Termin löschen
+delete this exception	calendar	de	Diese Ausnahme löschen
+delete this series of recuring events	calendar	de	Diese Serie von wiederholenden Terminen löschen
+disinvited	calendar	de	Ausgeladen
 display status of events	calendar	de	Status von Terminen anzeigen
-displayed view	calendar	de	Ansicht
 displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	de	Zeigt Ihre Standard-Kalendar-Ansicht auf der Startseite angezeigt werden (die Seite die sich nach dem Login öffnet oder wenn Sie auf Home klicken)?
 do you want a weekview with or without weekend?	calendar	de	Wollen Sie eine Wochenansicht mit oder ohne Wochenende?
-do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all changes include changes of title, description, participants and the acceptions and rejections of the appointment.	calendar	de	Möchten Sie über neue oder geänderte Termine benachrichtigt werden? Sie werden benachrichtigt werden über Änderungen welche Sie selbst durchführen.<br> Sie können die benachrichtigungen beschränken auf bestimmte Änderungen. Jeder auszuwählende Punkt schließt auch die darüber aufgeführten Benachrichtigungen mit ein. Alle Änderungen beinhaltet Änderungen des Titels, der Beschreibung, Teilnehmer so wie Zusagen so wie Absagen von Terminen.
 do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	de	Wollen Sie über neue oder geänderte Termine benachrichtigt werden? Sie werden nie über eigene Änderungen benachrichtig.<br>Sie können die Benachrichtigungen auf verschiedene Änderungen begrenzen. Jede Zeile enthält die Benachrichtigungen der darüberliegenden. Alle Änderungen umfasst den Title, die Beschreibung, Teilnehmer, aber keine Antworten der Teilnehmer. Wenn der Ersteller eines Event irgendeine Benachrichtigung will, erhält er automatisch auch die Antworten der Teilnehmer, wie Zusagen und Absagen.
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	de	Möchten Sie eine regelmäßige Zusammenfassung Ihrer Termine via E-Mail erhalten?<br>Die Zusammenfassung wird täglich (jeden Morgen), oder für eine wöchentliche Zusammenfassung Montags an Ihre standard E-Mail Adresse gesendet.<br> Die Benachrichtigung wird nur versendet wenn Sie am nächsten Tag oder in der nächsten Woche auch einen Termin haben.
 do you wish to autoload calendar holidays files dynamically?	admin	de	Sollen die Feiertage automatisch geladen werden?
 download	calendar	de	Herunterladen
-duration	calendar	de	Dauer
+download this event as ical	calendar	de	Termin als iCal herunterladen
 duration of the meeting	calendar	de	Dauer des Termins
 edit series	calendar	de	Serie bearbeiten
-edit single	calendar	de	Einzel bearbeiten
-email notification	calendar	de	Benachrichtigung per Email
-email notification for %1	calendar	de	Benachrichtigung per Email für %1
+edit this event	calendar	de	Diesen Termin bearbeiten
+edit this series of recuring events	calendar	de	Diese Serie von wiederholenden Terminen bearbeiten
 empty for all	calendar	de	leer für alle
-enable	calendar	de	Einschalten
-enabled	calendar	de	eingeschaltet
+end	calendar	de	Ende
 end date/time	calendar	de	Enddatum/-zeit
 enddate	calendar	de	Enddatum
 enddate / -time of the meeting, eg. for more then one day	calendar	de	Enddatum und -zeit des Termins, zB. für mehr als einen Tag
+enddate of the export	calendar	de	Enddatum des Exports
 ends	calendar	de	endet
-enter output filename: ( .vcs appended )	calendar	de	Namen der Ausgabedatei (.vcs angehangen)
+error adding the alarm	calendar	de	Fehler beim Zufügen des Alarms
+error: importing the ical	calendar	de	Fehler: beim Importieren des iCal
+error: saving the event !!!	calendar	de	Fehler: beim Speichern des Termins !!!
+event copied - the copy can now be edited	calendar	de	Termin kopiert - die Kopie kann jetzt bearbeitet werden
+event deleted	calendar	de	Termin gelöscht
 event details follow	calendar	de	Details zum Termin folgen
+event saved	calendar	de	Termin gespeichert
+event will occupy the whole day	calendar	de	Termin nimmt den ganzen Tag ein
 exceptions	calendar	de	Ausnahmen
+existing links	calendar	de	Bestehende Verknüpfungen
 export	calendar	de	Exportieren
-export a list of entries in ical format.	calendar	de	Eine Liste von Einträgen im iCal Format exportieren.
 extended	calendar	de	Erweitert
 extended updates always include the complete event-details. ical's can be imported by certain other calendar-applications.	calendar	de	Erweiterte Benachrichtigungen enthälten immer die kompletten Termindetails. iCal's können von vielen anderen Kalendarprogrammen importiert werden.
-external participants	calendar	de	Externe Teilnehmer
-failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	de	Fehler beim Senden einer Email an '%1' #%2 Betreff='%3', Absender='%4' !!!
 fieldseparator	calendar	de	Feldtrenner
-find free timeslots where the marked participants are availible for the given timespan	calendar	de	Such freie Zeitslots an denen die ausgewählten Teilnehmer für die gegebene Zeitspanne verfügbar sind
+filename	calendar	de	Dateiname
+filename of the download	calendar	de	Name der herunterzuladenden Datei
+find free timeslots where the selected participants are availible for the given timespan	calendar	de	Such freie Zeitslots an denen die ausgewählten Teilnehmer für die gegebene Zeitspanne verfügbar sind
 firstname of person to notify	calendar	de	Vorname der zu benachrichtigenden Person
+for	calendar	de	für
 format of event updates	calendar	de	Format der Benachrichtigungen
-fr	calendar	de	Fr
-free/busy	calendar	de	frei/belegt
+forward half a month	calendar	de	einen halben Monat weiter
+forward one month	calendar	de	einen Monat weiter
 freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	de	Belegtzeiten: Unbekannter Benutzername '%1', falsches Passwort oder nicht verfügbar für nicht angemeldete Benutzer !!!
 freetime search	calendar	de	Terminsuche
-frequency	calendar	de	Häufigkeit
 fri	calendar	de	Fr
 full description	calendar	de	vollständige Beschreibung
 fullname of person to notify	calendar	de	Name der zu benachrichtigenden Person
-generate printer-friendly version	calendar	de	Drucker-freundliche Version erzeugen
-global categories	calendar	de	Globale Kategorien
+general	calendar	de	Allgemein
 global public and group public	calendar	de	Global öffentlich und Gruppen-öffentlich
 global public only	calendar	de	nur Global öffentlich
-go!	calendar	de	Go!
-grant calendar access	common	de	Berechtigungen für Kalenderzugriffe
 group planner	calendar	de	Gruppenplaner
 group public only	calendar	de	Gruppen-Öffentlich
 here is your requested alarm.	calendar	de	Hier ist ihr bestellter Alarm.
-high	calendar	de	hoch
 high priority	calendar	de	Hohe Priorität
 holiday	calendar	de	Feiertag
 holiday management	calendar	de	Feiertagsverwaltung
-holiday-management	calendar	de	Feiertagsverwaltung
 holidays	calendar	de	Feiertage
 hours	calendar	de	Stunden
 how far to search (from startdate)	calendar	de	wie weit suchen (vom Startdatum)
-i participate	calendar	de	Ich nehme teil
+ical	calendar	de	iCal
 ical / rfc2445	calendar	de	iCal / RFC2445
+ical export	calendar	de	iCal Export
+ical file	calendar	de	iCal Datei
+ical import	calendar	de	iCal Import
+ical successful imported	calendar	de	iCal erfolgreich importiert
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	de	Wenn ausgewählt werden Feiertage die auf ein Wochenende fallen, am drauffolgenden Montag nachgeholt.
 if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	de	Wenn Sie hier kein Passwort angeben, ist die Information für jeden verfügbar, der die Adresse (URL) kennt!!!
 ignore conflict	calendar	de	Konflikt ignorieren
 import	calendar	de	Importieren
-import csv-file	common	de	CSV-Datei importieren
+import csv-file	calendar	de	CSV-Datei importieren
 interval	calendar	de	Interval
 intervals in day view	calendar	de	Zeitintervalle in der Tagesansicht
-intervals per day in planner view	calendar	de	Zeitintervalle pro Tag in der Planeransicht
-invalid entry id.	calendar	de	ungültige Id des Eintrags.
+invalid email-address "%1" for user %2	calendar	de	Ungültige Email-Adresse "%1" für Benutzer %2
 last	calendar	de	letzte
 lastname of person to notify	calendar	de	Nachname der zu benachrichtigenden Person
-length shown<br>(emtpy for full length)	calendar	de	angezeigte Länge<br>(leer für volle Länge)
-length<br>(<= 255)	calendar	de	Länge<br>(<= 255)
-link	calendar	de	Verweis
 link to view the event	calendar	de	Verweis (Weblink) um den Termin anzuzeigen
-list all categories.	calendar	de	Alle Kategorien auflisten.
-load [iv]cal	calendar	de	[iv]Cal Laden
+links	calendar	de	Verknüpfungen
+links, attachments	calendar	de	Verknüpfungen, Dateianhänge
+listview	calendar	de	Listenansicht
 location	calendar	de	Ort
 location to autoload from	admin	de	Von wo sollen sie geladen werden
-low	calendar	de	niedrig
+location, start- and endtimes, ...	calendar	de	Ort, Start- und Endzeiten
+mail all participants	calendar	de	Mail an alle Teilnehmer
 make freebusy information available to not loged in persons?	calendar	de	Die Belegtzeiten für nicht angemeldete Personen verfügbar machen?
-matrixview	calendar	de	Matrixansicht
 minutes	calendar	de	Minuten
-mo	calendar	de	Mo
 modified	calendar	de	Geändert
-modify list of external participants	calendar	de	Liste der externen Teilnehmer änderen
 mon	calendar	de	Mo
-month	calendar	de	Monat
 monthly	calendar	de	Monatlich
 monthly (by date)	calendar	de	Monatlich (nach Datum)
 monthly (by day)	calendar	de	Monatlich (nach Wochentag)
 monthview	calendar	de	Monatsansicht
-needs javascript to be enabled !!!	calendar	de	Dafür muss Javascript aktiviert sein !!!
-new entry	calendar	de	Neuer Eintrag
-new name must not exist and not be empty!!!	calendar	de	Neuer Name darf nicht exisitieren und nicht leer sein!!!
 new search with the above parameters	calendar	de	neue Suche mit den obigen Parametern
-next day	calendar	de	nächster Tag
+no events found	calendar	de	Keine Termine gefunden
 no filter	calendar	de	Kein Filter
 no matches found	calendar	de	Keine Treffer gefunden
-no matches found.	calendar	de	Keine Treffer gefunden.
 no response	calendar	de	Keine Antwort
-normal	calendar	de	normal
-notification message for updates you send	calendar	de	Mitteilungs Text für updates welche Sie versenden
+non blocking	calendar	de	nicht blockierend
 notification messages for added events	calendar	de	Benachrichtigungstext für neue Termine
 notification messages for canceled events	calendar	de	Benachrichtigungstext für stornierte Termine
+notification messages for disinvited participants	calendar	de	Benachrichtigung für ausgeladene Teilnehmer
 notification messages for modified events	calendar	de	Benachrichtigungstext für geänderte Termine
 notification messages for your alarms	calendar	de	Benachrichtigungstext für Ihre Alarme
 notification messages for your responses	calendar	de	Benachrichtigungstext für Ihre Antworten
-number of intervals per day in planner view	calendar	de	Anzahl Intervale pro Tag im Planer
-number of months	calendar	de	Anzahl Monate
 number of records to read (%1)	calendar	de	Anzeil Datensätze zu lesen (%1)
 observance rule	calendar	de	Observance Rule
 occurence	calendar	de	Wiederholung
 old startdate	calendar	de	Altes Startdatum
-olddate	calendar	de	AltesDatum
 on %1 %2 %3 your meeting request for %4	calendar	de	Am %1 hat %2 Ihre Einladung für den %4 %3
-on all changes	calendar	de	bei allen Veränderungen
 on all modification, but responses	calendar	de	bei allen Änderungen, außer Antworten
-on any time change (and above options)	calendar	de	bei allen zeitliche Änderunge (und obige optionen)
 on any time change too	calendar	de	auch jede zeitliche Veränderung
 on invitation / cancelation only	calendar	de	nur bei Einladungen/Absagen
 on participant responses too	calendar	de	auch bei Antworten der Teilnehmer
 on time change of more than 4 hours too	calendar	de	bei zeitlichen Änderungen größer als 4 Stunden
-on time change of time of more than 4 hours (and above options)	calendar	de	wenn der Termin sich um mehr als 4 Stunde verschiebt (und obige Optionen)
 one month	calendar	de	ein Monat
 one week	calendar	de	eine Woche
 one year	calendar	de	ein Jahr
 only the initial date of that recuring event is checked!	calendar	de	Nur das Startdatum diese wiederholenden Termins wird geprüft!
 open todo's:	calendar	de	unerledigte Aufgaben:
-or enddate / -time	calendar	de	oder Enddatum / -zeit
-order	calendar	de	Reihenfolge
 overlap holiday	calendar	de	überlappender Feiertag
-participant	calendar	de	Teilnehmer
 participants	calendar	de	Teilnehmer
-participates	calendar	de	nimmt teil
+participants disinvited from an event	calendar	de	Ausgeladene Teilnehmer eines Termins
+participants, resources, ...	calendar	de	Teilnehmer, Ressourcen
 password for not loged in users to your freebusy information?	calendar	de	Passwort für Ihre Belegtzeiten für nicht angemeldete Personen?
 people holiday	calendar	de	Feiertag
 permission denied	calendar	de	Zugriff verweigert
-planner	calendar	de	Planer
 planner by category	calendar	de	Planer nach Kategorien
 planner by user	calendar	de	Planer nach Benutzern
-please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	de	Bitte den entsprechenden Eintrag im Ihrem Kalendar bestätigen, Zusagen, Absagen oder die Änderungen beachten
-please enter a filename !!!	calendar	de	Bitte geben Sie einen Dateinamen an !!!
+please note: you can configure the field assignments after you uploaded the file.	calendar	de	Bitte beachten: Die Feldzuordnung kann NACH dem Hochladen der Datei konfiguriert werden.
 preselected group for entering the planner	calendar	de	vorausgewählte Gruppe beim Planeraufruf
-previous day	calendar	de	vorheriger Tag
-print calendars in black & white	calendar	de	Kalender in schwarz und weiß drucken
-print the mini calendars	calendar	de	Mini- Kalender drucken
-printer friendly	calendar	de	Drucker-freundlich
-privat	calendar	de	Privat
+previous	calendar	de	vorherig
 private and global public	calendar	de	Privat und Global öffentlich
 private and group public	calendar	de	Privat und Gruppen öffentlich
 private only	calendar	de	nur private
 re-edit event	calendar	de	Event erneut bearbeiten
-read a list of entries.	calendar	de	Eine Liste von Einträgen lesen.
-read a single entry by passing the id and fieldlist.	calendar	de	Einen einzelnen Eintrag über seine Id und eine Feldliste lesen.
-read this list of methods.	calendar	de	Diese Liste der Methoden lesen.
 receive email updates	calendar	de	Empfange E-Mail updates
-receive email updates when:	calendar	de	Empfange E-Mail updates wenn:
-receive extra information in event mails	calendar	de	Zusätzliche Informationen bei EMail-Benachrichtigung
 receive summary of appointments	calendar	de	Zusammenfassung der Termine erhalten
+recurrence	calendar	de	Wiederholung
 recurring event	calendar	de	Wiederholender Termin
-refresh	calendar	de	Aktualisieren
-reinstate	calendar	de	Wiedereinsetzen
-reject	calendar	de	Absagen
 rejected	calendar	de	Abgesagt
-repeat day	calendar	de	Wiederholungstag
-repeat end date	calendar	de	Enddatum
+repeat days	calendar	de	Wiederholungstage
+repeat the event until which date (empty means unlimited)	calendar	de	Bis zu welchen Datum soll der Termin wiederholt werden (leer bedeutet unbegrenzt)
 repeat type	calendar	de	Wiederholungstyp
 repeating event information	calendar	de	Informationen zu sich wiederholenden Ereignissen
+repeating interval, eg. 2 to repeat every second week	calendar	de	Wiederholungsinterval, zB. 2 für jeder zweite Woche
 repetition	calendar	de	Wiederholung
 repetitiondetails (or empty)	calendar	de	Details der Wiederholung (oder leer)
 reset	calendar	de	Zurücksetzen
+resources	calendar	de	Ressourcen
 rule	calendar	de	Regel
-sa	calendar	de	Sa
 sat	calendar	de	Sa
+saves the changes made	calendar	de	Speichert die Änderungen
+saves the event ignoring the conflict	calendar	de	Speichert den Konflikt ignorierend den Termin
 scheduling conflict	calendar	de	Terminüberschneidung
-search results	calendar	de	Suchergebnisse
 select a %1	calendar	de	%1 auswählen
 select a time	calendar	de	eine Zeit auswählen
-selected contacts (%1)	calendar	de	Ausgewählte Kontakte (%1)
-send updates via email	common	de	Updates via E-Mail senden
-send/receive updates via email	calendar	de	Senden/Empfangen von Aktualisierungen via EMail
+select resources	calendar	de	Ressourcen auswählen
+select who should get the alarm	calendar	de	Auswählen wer den Alarm erhalten soll
 set a year only for one-time / non-regular holidays.	calendar	de	Nur für einmalige/unregelmäßige Feiertage das Jahr angeben.
 set new events to private	calendar	de	Neue Termine als private Termine eintragen
 should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	de	Sollen Einladungen welche von Ihnen abgelehnt wurden in Ihrem Kalender angezeigt werden?<br> Sie können diese Einladungen dann später akzeptieren (z. B. wenn Sie eine Terminkolission gelöst haben), wenn Sie in Ihrem Kalender noch vorhanden sind!
 should new events created as private by default ?	calendar	de	Sollen neue Termine generell als Privat angelegt werden?
 should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	de	Sollen nicht angemeldete Personen ihre Belegtzeiten einsehen können? Sie können ein Passwort setzen um diese Informationen zu schützen. Das Passwort sollte sich von Ihrem normalen Passwort unterscheiden. Die Belegtzeiten sind im iCal Format und enthalten ausschließlich die Zeiten an denen sie nicht verfügbar sind. Sie enthalten NICHT den Namen, die Beschreibung oder den Ort des Termins. Die Adresse (URL) Ihrer Belegtzeiten ist %1.
-should the mini calendars by printed / displayed in the printer friendly views ?	calendar	de	Soll der Mini Kalender "gedruckt werden/angezeigt werden"  in einer Druck freundlichen Ansicht ?
-should the printer friendly view be in black & white or in color (as in normal view)?	calendar	de	Soll die Drucker freundliche Ansicht in schwarz-weiß dargestellt werden oder in Farbe (identisch der normalen Ansicht)?
 should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	de	Soll der Status (Zugesagt,Abgesagt ...)der Termin- Teilnehmer in Klammern hinter jeden Teilnehmer angezeigt werden?
-show day view on main screen	calendar	de	Tagesansicht auf Startseite anzeigen
 show default view on main screen	calendar	de	Standardansicht auf der Startseite anzeigen
-show high priority events on main screen	calendar	de	Termine mit hoher Priorität auf der Startseite anzeigen
 show invitations you rejected	calendar	de	Zeige Einladungen welche abgelehnt wurden an
 show list of upcoming events	calendar	de	Zeige eine Liste der kommenden Termine
-show next seven days	calendar	de	Nächsten sieben Tage anzeigen
-show only one day	calendar	de	Nur einen Tag anzeigen
-show the calendar of multiple users	calendar	de	Kalender von mehreren Benutzeren anzeigen
 show this month	calendar	de	Diesen Monat anzeigen
 show this week	calendar	de	Diese Woche anzeigen
 single event	calendar	de	Einzelner Termin
-sorry, the owner has just deleted this event	calendar	de	Der Eigentümer hat diesen Termin gerade gelöscht
-sorry, this event does not exist	calendar	de	Dieser Termin existiert nicht
-sorry, this event does not have exceptions defined	calendar	de	Dieser Termin hat keine Ausnahmen definiert
-sort by	calendar	de	Sortieren nach
-specifies the the number of intervals shown in the planner view.	calendar	de	Legt die Anzahl der Zeitintervalle fest welche in der Kalenderplanung angezeigt werden.
+start	calendar	de	Start
 start date/time	calendar	de	Startdatum/-zeit
-start- and enddates	calendar	de	Start- und Enddatum/-zeit
-startdate	calendar	de	Startdatum
 startdate / -time	calendar	de	Startdatum / -zeit
 startdate and -time of the search	calendar	de	Startdatum und -zeit der Suche
+startdate of the export	calendar	de	Startdatum des Exports
 startrecord	calendar	de	Startdatensatz
-su	calendar	de	So
+status changed	calendar	de	Status geändert
 submit to repository	calendar	de	Übertragen zu eGroupWare.org
 sun	calendar	de	So
 tentative	calendar	de	Vorläufige Zusage
 test import (show importable records <u>only</u> in browser)	calendar	de	Test Import (zeigt importierte Datensätze <u>nur</u> im Webbrowser an)
-text	calendar	de	Text
-th	calendar	de	Do
-the following conflicts with the suggested time:<ul>%1</ul>	calendar	de	Im gewählten Zeitraum gibt es einen Konflikt:<ul>%1</ul>
-the user %1 is not participating in this event!	calendar	de	Der Benutzer %1 nimmt nicht an diesem Event teil!
-there was an error trying to connect to your news server.<br>please contact your admin to check the news servername, username or password.	calendar	de	Fehler beim Kontaktieren Ihres News-Servers.<br>Bitte benachrichtigen Sie Ihren Administrator um Servername, Username und Passwort für News zu überprüfen.
 this day is shown as first day in the week or month view.	calendar	de	Dieser Tag wird als erster in der Wochen- oder Monatsansicht angezeigt
 this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	de	Diese Zeit definiert das Ende des Arbeitstags in der Tagesansicht. Alle späteren Einträge werden darunter dargestellt.
-this defines the start of your dayview. events before this time, are shown above the dayview.	calendar	de	Diese Zeit definiert das Start des Arbeitstags in der Tageseinsicht. Alle späteren Einträge werden darüber dargestellt.
 this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	de	Diese Zeit definiert den Anfang des Arbeitstags in der Tagesansicht. Alle früheren Einträge werden darüber dargestellt.
 this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	calendar	de	Diese Gruppe wird als vorauswahl ausgewählt wenn Sie den Planer öffnen. Sie können die Gruppe jederzeit wechseln wenn Sie möchten.
-this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	de	Das wird meistens durch einen nicht oder falsch konfigurierten SMTP Server verursacht. Benachrichtigen Sie Ihren Administrator.
 this message is sent for canceled or deleted events.	calendar	de	Diese Benachrichtigung wird für stornierte oder gelöschte Termine versandt.
 this message is sent for modified or moved events.	calendar	de	Diese Benachrichtigung wird für geänderte Termine versandt.
+this message is sent to disinvited participants.	calendar	de	Diese Nachricht wird ausgeladenen Teilnehmern geschickt.
 this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	de	Diese Nachricht wird an alle Teilnehmer der Termine die Sie anlegen versandt, die Benachrichtigungen wünschen.<br>Sie können verschiedene Variablen verwenden, welche durch die Daten des Termins ersetzt werden. Die erste Zeite ist der Betreff der E-Mail.
-this message is sent to every participant of events you own, who has requested notifcations.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	de	Mit dieser Nachricht laden Sie Teilnehmer zu einem Termin ein, welche eine automatische Benachrichtigung aktiviert haben.<br> Sie können verschiedene Variablen benutzen welche durch die Daten des Meetings ersetzt werden. Die erste Zeile ist der Betreff der E-Mail
 this message is sent when you accept, tentative accept or reject an event.	calendar	de	Diese Nachricht wird gesendet wenn Sie einen Termin zusagen, vorläufig zusagen oder absagen.
 this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	de	Diese Meldung wird ihnen gesandt, wenn sie einen Alarm für einen Termin setzen. Nehmen sie alle Information darin auf, die sie benötigen.
-this month	calendar	de	Dieser Monat
-this week	calendar	de	Diese Woche
-this year	calendar	de	Dieses Jahr
 three month	calendar	de	drei Monate
 thu	calendar	de	Do
 til	calendar	de	bis
 timeframe	calendar	de	Zeitrahmen
 timeframe to search	calendar	de	Zeitrahmen für die Suche
-title	calendar	de	Titel
 title of the event	calendar	de	Titel des Termin
-title-row	calendar	de	Titelzeile
 to many might exceed your execution-time-limit	calendar	de	zu viele können ihre Laufzeitbeschränkung überschreiten
-to-firstname	calendar	de	An-Vorname
-to-fullname	calendar	de	An-Name
-to-lastname	calendar	de	An-Nachname
-today	calendar	de	Heute
 translation	calendar	de	Übersetzung
-tu	calendar	de	Di
 tue	calendar	de	Di
-two dayview	calendar	de	Zweitagesansicht
 two weeks	calendar	de	zwei Wochen
-update a single entry by passing the fields.	calendar	de	Einen einzelnen Termin über seine Felder updaten.
 updated	calendar	de	Aktualisiert
 use end date	calendar	de	Enddatum benutzen
 use the selected time and close the popup	calendar	de	benutzt die ausgewählte Zeit und schließt das Popup
-view this entry	calendar	de	Diesen Eintrag anzeigen
-we	calendar	de	Mi
+view this event	calendar	de	Diesen Termin anzeigen
 wed	calendar	de	Mi
 week	calendar	de	Woche
 weekday starts on	calendar	de	Arbeitswoche beginnt am
@@ -354,37 +277,21 @@ weekdays	calendar	de	Wochentage
 weekdays to use in search	calendar	de	Wochentage für die Suche
 weekly	calendar	de	Wöchentlich
 weekview	calendar	de	Wochenansicht
-weekview including weekend	calendar	de	Wochenansicht mit Wochenende
+weekview with weekend	calendar	de	Wochenansicht mit Wochenende
 weekview without weekend	calendar	de	Wochenansicht ohne Wochenende
-when creating new events default set to private	calendar	de	neue Termine sind privat
 which events do you want to see when you enter the calendar.	calendar	de	Welche Termine möchten Sie angezeigt bekommen wenn Sie den Kalender öffnen?
 which of calendar view do you want to see, when you start calendar ?	calendar	de	Welche der möglichen Ansichten des Kalenders möchten Sie als Standard sehen wenn der Kalender geöffnet wird?
-wk	calendar	de	KW
+whole day	calendar	de	ganztägig
 work day ends on	calendar	de	Arbeitstag endet um
 work day starts on	calendar	de	Arbeitstag beginnt um
-workdayends	calendar	de	Arbeitstag endet
-year	calendar	de	Jahr
 yearly	calendar	de	Jährlich
 yearview	calendar	de	Jahresansicht
 you can either set a year or a occurence, not both !!!	calendar	de	Sie können nur entweder das Jahr oder die Wiederholung angeben, nicht beides!
 you can only set a year or a occurence !!!	calendar	de	Sie können nur ein Jahr oder eine Wiederholung angeben !
-you do not have permission to add alarms to this event !!!	calendar	de	Sie haben keine Berechtigung Alarme zu diesem Termin zuzufügen !!!
-you do not have permission to delete this alarm !!!	calendar	de	Sie haben keine Berechtigung diesen Alarm zu löschen !!!
-you do not have permission to enable/disable this alarm !!!	calendar	de	Sie haben keine Berechtigung diesen Alarm ein- oder auszuschalten !!!
 you do not have permission to read this record!	calendar	de	Sie haben keine Berechtigung diesen Eintrag zu lesen!
-you have %1 high priority events on your calendar today.	common	de	Sie haben heute %1 Einträge mit hoher Priorität auf Ihrer Liste!
-you have 1 high priority event on your calendar today.	common	de	Sie haben heute einen Eintrag mit hoher Priorität auf Ihrer Liste!
 you have a meeting scheduled for %1	calendar	de	Sie haben einen Termin am %1.
-you have not entered a title	calendar	de	Sie haben keinen Titel angegeben
-you have not entered a valid date	calendar	de	Sie haben kein gültiges Datum angegeben
-you have not entered a valid time of day	calendar	de	Sie haben keine gültige Uhrzeit angegeben
-you have not entered a\nbrief description	calendar	de	Sie haben keine a\nKurzbeschreibung eingegeben
-you have not entered a\nvalid time of day	calendar	de	Sie haben keine a\ngültige Tageszeit eingegeben.
-you have not entered participants	calendar	de	Sie haben keine Teilnehmer angegeben
-you must enter one or more search keywords	calendar	de	Sie müssen einen oder mehrere Suchbegriffe angeben
-you must enter one or more search keywords.	calendar	de	Sie müssen einen oder mehrere Suchbegriffe angeben.
-you must select a [iv]cal. (*.[iv]cs)	calendar	de	Sie müssen einen [iv]Cal (*.[iv]cs) auswählen.
+you have been disinvited from the meeting at %1	calendar	de	Sie wurden vom Termin am %1 ausgeladen
+you need to select an ical file first	calendar	de	Sie müssen zuerst eine iCal Datei auswählen
 you need to set either a day or a occurence !!!	calendar	de	Sie müssen entweder einen Tag oder eine Wiederholung angeben !!!
 your meeting scheduled for %1 has been canceled	calendar	de	Ihr Termin am %1 wurde abgesagt.
 your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	de	Ihr Termin am %1 wurde auf %2 verschoben.
-your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries:	calendar	de	Der von Ihnen gewählte Zeitraum <B> %1 - %2 </B> führt zu Konflikten mit folgenden bereits existierenden Kalendereinträgen:
diff --git a/calendar/setup/phpgw_en.lang b/calendar/setup/phpgw_en.lang
index 107252d271..277b238922 100644
--- a/calendar/setup/phpgw_en.lang
+++ b/calendar/setup/phpgw_en.lang
@@ -1,195 +1,179 @@
 %1 %2 in %3	calendar	en	%1 %2 in %3
-%1 matches found	calendar	en	%1 matches found
 %1 records imported	calendar	en	%1 records imported
 %1 records read (not yet imported, you may go back and uncheck test import)	calendar	en	%1 records read (not yet imported, you may go back and uncheck Test Import)
-(for weekly)	calendar	en	(for Weekly)
-(i/v)cal	calendar	en	(i/v)Cal
-1 match found	calendar	en	1 match found
-a	calendar	en	a
-accept	calendar	en	Accept
+<b>please note</b>: the calendar use the holidays of your country, which is set to %1. you can change it in your %2.<br />holidays are %3 automatic installed from %4. you can changed it in %5.	calendar	en	<b>Please note</b>: The calendar use the holidays of your country, which is set to %1. You can change it in your %2.<br />Holidays are %3 automatic installed from %4. You can changed it in %5.
+a non blocking event will not conflict with other events	calendar	en	A non blocking event will not conflict with other events
+accept or reject an invitation	calendar	en	Accept or reject an invitation
 accepted	calendar	en	Accepted
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	en	Action that caused the notify: Added, Canceled, Accepted, Rejected, ...
-add a single entry by passing the fields.	calendar	en	Add a single entry by passing the fields.
-add alarm	calendar	en	Add Alarm
-add contact	calendar	en	Add Contact
-add or update a single entry by passing the fields.	calendar	en	Add or update a single entry by passing the fields.
+actions	calendar	en	Actions
+add alarm	calendar	en	Add alarm
 added	calendar	en	Added
-address book	calendar	en	Address Book
+after current date	calendar	en	After current date
 alarm	calendar	en	Alarm
+alarm added	calendar	en	Alarm added
+alarm deleted	calendar	en	Alarm deleted
 alarm for %1 at %2 in %3	calendar	en	Alarm for %1 at %2 in %3
-alarm management	calendar	en	Alarm Management
-alarm-management	calendar	en	Alarm-Management
+alarm management	calendar	en	Alarm management
 alarms	calendar	en	Alarms
 all categories	calendar	en	All categories
-all day	calendar	en	All Day
+all day	calendar	en	all day
+all events	calendar	en	All events
+all participants	calendar	en	All participants
+allows to edit the event again	calendar	en	Allows to edit the event again
+apply the changes	calendar	en	apply the changes
 are you sure you want to delete this country ?	calendar	en	Are you sure you want to delete this Country ?
 are you sure you want to delete this holiday ?	calendar	en	Are you sure you want to delete this holiday ?
-are you sure\nyou want to\ndelete these alarms?	calendar	en	Are you sure\nyou want to\ndelete these alarms?
-are you sure\nyou want to\ndelete this entry ?	calendar	en	Are you sure\nyou want to\ndelete this entry ?
-are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	en	Are you sure\nyou want to\ndelete this entry ?\n\nThis will delete\nthis entry for all users.
-are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	en	Are you sure\nyou want to\ndelete this single occurence ?\n\nThis will delete\nthis entry for all users.
+back half a month	calendar	en	back half a month
+back one month	calendar	en	back one month
+before current date	calendar	en	Before current date
 before the event	calendar	en	before the event
-brief description	calendar	en	Brief Description
-business	calendar	en	Business
-calendar	common	en	Calendar
-calendar - [iv]cal importer	calendar	en	Calendar - [iv]Cal Importer
-calendar - add	calendar	en	Calendar - Add
-calendar - edit	calendar	en	Calendar - Edit
+birthday	calendar	en	Birthday
+busy	calendar	en	busy
+by	calendar	en	by
 calendar event	calendar	en	Calendar Event
 calendar holiday management	admin	en	Calendar Holiday Management
-calendar preferences	calendar	en	Calendar Preferences
-calendar settings	admin	en	Calendar Settings
-calendar-fieldname	calendar	en	Calendar-Fieldname
+calendar preferences	calendar	en	Calendar preferences
+calendar settings	admin	en	Calendar settings
+calendar-fieldname	calendar	en	calendar-Fieldname
+can't add alarms in the past !!!	calendar	en	Can't add alarms in the past !!!
 canceled	calendar	en	Canceled
-change all events for $params['old_owner'] to $params['new_owner'].	calendar	en	Change all events for $params['old_owner'] to $params['new_owner'].
-change status	calendar	en	Change Status
 charset of file	calendar	en	Charset of file
-click %1here%2 to return to the calendar.	calendar	en	Click %1here%2 to return to the calendar.
-configuration	calendar	en	Configuration
+close the window	calendar	en	Close the window
+compose a mail to all participants after the event is saved	calendar	en	compose a mail to all participants after the event is saved
+copy of:	calendar	en	Copy of:
+copy this event	calendar	en	Copy this event
 countries	calendar	en	Countries
 country	calendar	en	Country
-created by	calendar	en	Created by
+create new links	calendar	en	Create new links
+csv	calendar	en	CSV
 csv-fieldname	calendar	en	CSV-Fieldname
 csv-filename	calendar	en	CSV-Filename
-custom fields	calendar	en	Custom Fields
-custom fields and sorting	common	en	Custom fields and sorting
+custom fields	calendar	en	Custom fields
 daily	calendar	en	Daily
-daily matrix view	calendar	en	Daily Matrix View
 days	calendar	en	days
+days of the week for a weekly repeated event	calendar	en	Days of the week for a weekly repeated event
 days repeated	calendar	en	days repeated
-dayview	calendar	en	Day View
+dayview	calendar	en	dayview
 default appointment length (in minutes)	calendar	en	default appointment length (in minutes)
 default calendar filter	calendar	en	Default calendar filter
-default calendar view	calendar	en	Default calendar view
+default calendar view	calendar	en	default calendar view
 default length of newly created events. the length is in minutes, eg. 60 for 1 hour.	calendar	en	Default length of newly created events. The length is in minutes, eg. 60 for 1 hour.
-default week view	calendar	en	Default week view
+default week view	calendar	en	default week view
 defines the size in minutes of the lines in the day view.	calendar	en	Defines the size in minutes of the lines in the day view.
-delete a single entry by passing the id.	calendar	en	Delete a single entry by passing the id.
-delete an entire users calendar.	calendar	en	Delete an entire users calendar.
-delete selected contacts	calendar	en	Delete selected contacts
-delete selected participants	calendar	en	Delete selected participants
-delete series	calendar	en	Delete Series
-delete single	calendar	en	Delete Single
-deleted	calendar	en	Deleted
-description	calendar	en	Description
-determining window width ...	calendar	en	Determining window width ...
-disable	calendar	en	Disable
-disabled	calendar	en	disabled
-display interval in day view	calendar	en	Display interval in Day View
-display mini calendars when printing	calendar	en	Display mini calendars when printing
-display status of events	calendar	en	Display Status of Events
-displayed view	calendar	en	displayed view
+delete series	calendar	en	Delete series
+delete this alarm	calendar	en	Delete this alarm
+delete this event	calendar	en	Delete this event
+delete this exception	calendar	en	Delete this exception
+delete this series of recuring events	calendar	en	Delete this series of recuring events
+disinvited	calendar	en	Disinvited
+display status of events	calendar	en	Display status of events
 displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	en	Displays your default calendar view on the startpage (page you get when you enter eGroupWare or click on the homepage icon)?
 do you want a weekview with or without weekend?	calendar	en	Do you want a weekview with or without weekend?
 do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	en	Do you want to be notified about new or changed appointments? You be notified about changes you make yourself.<br>You can limit the notifications to certain changes only. Each item includes all the notification listed above it. All modifications include changes of title, description, participants, but no participant responses. If the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	en	Do you want to receive a regulary summary of your appointsments via email?<br>The summary is sent to your standard email-address on the morning of that day or on Monday for weekly summarys.<br>It is only sent when you have any appointments on that day or week.
 do you wish to autoload calendar holidays files dynamically?	admin	en	Do you wish to autoload calendar holidays files dynamically?
 download	calendar	en	Download
-duration	calendar	en	Duration
+download this event as ical	calendar	en	Download this event as iCal
 duration of the meeting	calendar	en	Duration of the meeting
-edit series	calendar	en	Edit Series
-edit single	calendar	en	Edit Single
-email notification	calendar	en	Email Notification
-email notification for %1	calendar	en	Email Notification for %1
+edit series	calendar	en	Edit series
+edit this event	calendar	en	Edit this event
+edit this series of recuring events	calendar	en	Edit this series of recuring events
 empty for all	calendar	en	empty for all
-enable	calendar	en	Enable
-enabled	calendar	en	enabled
+end	calendar	en	End
 end date/time	calendar	en	End Date/Time
 enddate	calendar	en	Enddate
 enddate / -time of the meeting, eg. for more then one day	calendar	en	Enddate / -time of the meeting, eg. for more then one day
+enddate of the export	calendar	en	Enddate of the export
 ends	calendar	en	ends
-enter output filename: ( .vcs appended )	calendar	en	Enter Output Filename: ( .vcs appended )
-event details follow	calendar	en	Event Details Follow
+error adding the alarm	calendar	en	Error adding the alarm
+error: importing the ical	calendar	en	Error: importing the iCal
+error: saving the event !!!	calendar	en	Error: saving the event !!!
+event copied - the copy can now be edited	calendar	en	Event copied - the copy can now be edited
+event deleted	calendar	en	Event deleted
+event details follow	calendar	en	Event Details follow
+event saved	calendar	en	Event saved
+event will occupy the whole day	calendar	en	Event will occupy the whole day
 exceptions	calendar	en	Exceptions
+existing links	calendar	en	Existing links
 export	calendar	en	Export
-export a list of entries in ical format.	calendar	en	Export a list of entries in iCal format.
 extended	calendar	en	Extended
 extended updates always include the complete event-details. ical's can be imported by certain other calendar-applications.	calendar	en	Extended updates always include the complete event-details. iCal's can be imported by certain other calendar-applications.
-external participants	calendar	en	External Participants
-failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	en	Failed sending message to '%1' #%2 subject='%3', sender='%4' !!!
 fieldseparator	calendar	en	Fieldseparator
-find free timeslots where the marked participants are availible for the given timespan	calendar	en	Find free timeslots where the marked participants are availible for the given timespan
+filename	calendar	en	Filename
+filename of the download	calendar	en	Filename of the download
+find free timeslots where the selected participants are availible for the given timespan	calendar	en	Find free timeslots where the selected participants are availible for the given timespan
 firstname of person to notify	calendar	en	Firstname of person to notify
+for	calendar	en	for
 format of event updates	calendar	en	Format of event updates
-fr	calendar	en	F
-free/busy	calendar	en	Free/Busy
+forward half a month	calendar	en	forward half a month
+forward one month	calendar	en	forward one month
 freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	en	freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!
 freetime search	calendar	en	Freetime Search
-frequency	calendar	en	Frequency
 fri	calendar	en	Fri
-full description	calendar	en	Full Description
+full description	calendar	en	Full description
 fullname of person to notify	calendar	en	Fullname of person to notify
-generate printer-friendly version	calendar	en	Generate printer-friendly version
-global categories	calendar	en	Global Categories
-global public and group public	calendar	en	Global Public and group public
-global public only	calendar	en	Global Public Only
-go!	calendar	en	Go!
-grant calendar access	common	en	Grant Calendar Access
-group planner	calendar	en	Group Planner
-group public only	calendar	en	Group Public Only
+general	calendar	en	General
+global public and group public	calendar	en	global public and group public
+global public only	calendar	en	global public only
+group planner	calendar	en	Group planner
+group public only	calendar	en	group public only
 here is your requested alarm.	calendar	en	Here is your requested alarm.
 high priority	calendar	en	high priority
 holiday	calendar	en	Holiday
 holiday management	calendar	en	Holiday Management
-holiday-management	calendar	en	Holiday-Management
 holidays	calendar	en	Holidays
 hours	calendar	en	hours
 how far to search (from startdate)	calendar	en	how far to search (from startdate)
-i participate	calendar	en	I Participate
+ical	calendar	en	iCal
 ical / rfc2445	calendar	en	iCal / rfc2445
+ical export	calendar	en	iCal Export
+ical file	calendar	en	iCal file
+ical import	calendar	en	iCal Import
+ical successful imported	calendar	en	iCal successful imported
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	en	If checked holidays falling on a weekend, are taken on the monday after.
 if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	en	If you dont set a password here, the information is available to everyone, who knows the URL!!!
-ignore conflict	calendar	en	Ignore Conflict
+ignore conflict	calendar	en	Ignore conflict
 import	calendar	en	Import
-import csv-file	common	en	Import CSV-File
+import csv-file	calendar	en	Import CSV-File
 interval	calendar	en	Interval
 intervals in day view	calendar	en	Intervals in day view
-intervals per day in planner view	calendar	en	Intervals per day in planner view
-invalid entry id.	calendar	en	Invalid entry id.
-last	calendar	en	last
+invalid email-address "%1" for user %2	calendar	en	Invalid email-address "%1" for user %2
+last	calendar	en	Last
 lastname of person to notify	calendar	en	Lastname of person to notify
-length shown<br>(emtpy for full length)	calendar	en	Length shown<br>(emtpy for full length)
-length<br>(<= 255)	calendar	en	Length<br>(<= 255)
-link	calendar	en	Link
 link to view the event	calendar	en	Link to view the event
-list all categories.	calendar	en	List all categories.
-load [iv]cal	calendar	en	Load [iv]Cal
+links	calendar	en	Links
+links, attachments	calendar	en	Links, Attachments
+listview	calendar	en	listview
 location	calendar	en	Location
 location to autoload from	admin	en	Location to autoload from
+location, start- and endtimes, ...	calendar	en	Location, Start- and Endtimes, ...
+mail all participants	calendar	en	mail all participants
 make freebusy information available to not loged in persons?	calendar	en	Make freebusy information available to not loged in persons?
-matrixview	calendar	en	Matrix View
-minutes	calendar	en	minutes
-mo	calendar	en	M
+minutes	calendar	en	Minutes
 modified	calendar	en	Modified
-modify list of external participants	calendar	en	Modify List of External Participants
 mon	calendar	en	Mon
-month	calendar	en	Month
 monthly	calendar	en	Monthly
 monthly (by date)	calendar	en	Monthly (by date)
 monthly (by day)	calendar	en	Monthly (by day)
-monthview	calendar	en	Month View
-needs javascript to be enabled !!!	calendar	en	Needs javascript to be enabled !!!
-new entry	calendar	en	New Entry
-new name must not exist and not be empty!!!	calendar	en	New name must not exist and not be empty!!!
+monthview	calendar	en	monthview
 new search with the above parameters	calendar	en	new search with the above parameters
-next day	calendar	en	next day
+no events found	calendar	en	No events found
 no filter	calendar	en	No filter
-no matches found	calendar	en	No matches found
-no response	calendar	en	No Response
+no matches found	calendar	en	no matches found
+no response	calendar	en	No response
+non blocking	calendar	en	non blocking
 notification messages for added events	calendar	en	Notification messages for added events
 notification messages for canceled events	calendar	en	Notification messages for canceled events
+notification messages for disinvited participants	calendar	en	Notification messages for disinvited participants
 notification messages for modified events	calendar	en	Notification messages for modified events
 notification messages for your alarms	calendar	en	Notification messages for your alarms
 notification messages for your responses	calendar	en	Notification messages for your responses
-number of intervals per day in planner view	calendar	en	Number of Intervals per Day in Planner View
-number of months	calendar	en	Number of months
 number of records to read (%1)	calendar	en	Number of records to read (%1)
 observance rule	calendar	en	Observance Rule
 occurence	calendar	en	Occurence
 old startdate	calendar	en	Old Startdate
-olddate	calendar	en	OldDate
 on %1 %2 %3 your meeting request for %4	calendar	en	On %1 %2 %3 your meeting request for %4
-on all changes	calendar	en	on all changes
 on all modification, but responses	calendar	en	on all modification, but responses
 on any time change too	calendar	en	on any time change too
 on invitation / cancelation only	calendar	en	on invitation / cancelation only
@@ -199,169 +183,115 @@ one month	calendar	en	one month
 one week	calendar	en	one week
 one year	calendar	en	one year
 only the initial date of that recuring event is checked!	calendar	en	Only the initial date of that recuring event is checked!
-open todo's:	calendar	en	Open To Do Items:
-or enddate / -time	calendar	en	or Enddate / -time
-order	calendar	en	Order
+open todo's:	calendar	en	open ToDo's:
 overlap holiday	calendar	en	overlap holiday
-participant	calendar	en	Participant
 participants	calendar	en	Participants
-participates	calendar	en	Participates
+participants disinvited from an event	calendar	en	Participants disinvited from an event
+participants, resources, ...	calendar	en	Participants, Resources, ...
 password for not loged in users to your freebusy information?	calendar	en	Password for not loged in users to your freebusy information?
 people holiday	calendar	en	people holiday
 permission denied	calendar	en	Permission denied
-planner	calendar	en	Planner
-planner by category	calendar	en	Planner by category
-planner by user	calendar	en	Planner by user
-please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	en	Please confirm, accept, reject or examine changes in the corresponding entry in your calendar
-please enter a filename !!!	calendar	en	please enter a filename !!!
+planner by category	calendar	en	planner by category
+planner by user	calendar	en	planner by user
+please note: you can configure the field assignments after you uploaded the file.	calendar	en	Please note: You can configure the field assignments AFTER you uploaded the file.
 preselected group for entering the planner	calendar	en	Preselected group for entering the planner
-previous day	calendar	en	previous day
-print calendars in black & white	calendar	en	Print calendars in black & white
-print the mini calendars	calendar	en	Print the mini calendars
-printer friendly	calendar	en	Printer Friendly
-privat	calendar	en	Privat
-private and global public	calendar	en	Private and Global Public
-private and group public	calendar	en	Private and Group Public
+previous	calendar	en	previous
+private and global public	calendar	en	private and global public
+private and group public	calendar	en	private and group public
 private only	calendar	en	Private Only
-re-edit event	calendar	en	Re-Edit Event
-read a list of entries.	calendar	en	Read a list of entries.
-read a single entry by passing the id and fieldlist.	calendar	en	Read a single entry by passing the id and fieldlist.
-read this list of methods.	calendar	en	Read this list of methods.
+re-edit event	calendar	en	Re-Edit event
 receive email updates	calendar	en	Receive email updates
-receive extra information in event mails	calendar	en	Receive extra information in event mails
 receive summary of appointments	calendar	en	Receive summary of appointments
-recurring event	calendar	en	recurring event
-refresh	calendar	en	Refresh
-reinstate	calendar	en	Reinstate
+recurrence	calendar	en	Recurrence
+recurring event	calendar	en	Recurring event
 rejected	calendar	en	Rejected
-repeat day	calendar	en	Repeat day
-repeat end date	calendar	en	Repeat End date
+repeat days	calendar	en	Repeat days
+repeat the event until which date (empty means unlimited)	calendar	en	repeat the event until which date (empty means unlimited)
 repeat type	calendar	en	Repeat type
 repeating event information	calendar	en	Repeating Event Information
+repeating interval, eg. 2 to repeat every second week	calendar	en	repeating interval, eg. 2 to repeat every second week
 repetition	calendar	en	Repetition
 repetitiondetails (or empty)	calendar	en	Repetitiondetails (or empty)
 reset	calendar	en	Reset
+resources	calendar	en	Resources
 rule	calendar	en	Rule
-sa	calendar	en	Sa
 sat	calendar	en	Sat
-scheduling conflict	calendar	en	Scheduling Conflict
-search results	calendar	en	Search Results
-select a %1	calendar	en	Select a %1
+saves the changes made	calendar	en	saves the changes made
+saves the event ignoring the conflict	calendar	en	Saves the event ignoring the conflict
+scheduling conflict	calendar	en	Scheduling conflict
+select a %1	calendar	en	select a %1
 select a time	calendar	en	select a time
-selected contacts (%1)	calendar	en	Selected contacts (%1)
-send updates via email	common	en	Send updates via EMail
-send/receive updates via email	calendar	en	Send/Receive updates via EMail
+select resources	calendar	en	Select resources
+select who should get the alarm	calendar	en	Select who should get the alarm
 set a year only for one-time / non-regular holidays.	calendar	en	Set a Year only for one-time / non-regular holidays.
 set new events to private	calendar	en	Set new events to private
 should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	en	Should invitations you rejected still be shown in your calendar ?<br>You can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!
 should new events created as private by default ?	calendar	en	Should new events created as private by default ?
 should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	en	Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is %1.
-should the mini calendars by printed / displayed in the printer friendly views ?	calendar	en	Should the mini calendars by printed / displayed in the printer friendly views ?
-should the printer friendly view be in black & white or in color (as in normal view)?	calendar	en	Should the printer friendly view be in black & white or in color (as in normal view)?
 should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	en	Should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?
-show day view on main screen	calendar	en	show day view on main screen
-show default view on main screen	calendar	en	Show default view on main screen
-show high priority events on main screen	calendar	en	Show high priority events on main screen
+show default view on main screen	calendar	en	show default view on main screen
 show invitations you rejected	calendar	en	Show invitations you rejected
-show list of upcoming events	calendar	en	Show list of upcoming events
-show next seven days	calendar	en	Show next seven days
-show only one day	calendar	en	Show only one day
-show the calendar of multiple users	calendar	en	show the calendar of multiple users
+show list of upcoming events	calendar	en	show list of upcoming events
 show this month	calendar	en	show this month
 show this week	calendar	en	show this week
 single event	calendar	en	single event
-sorry, the owner has just deleted this event	calendar	en	Sorry, the owner has just deleted this event
-sorry, this event does not exist	calendar	en	Sorry, this event does not exist
-sorry, this event does not have exceptions defined	calendar	en	Sorry, this event does not have exceptions defined
-sort by	calendar	en	Sort by
-specifies the the number of intervals shown in the planner view.	calendar	en	Specifies the the number of intervals shown in the planner view.
+start	calendar	en	Start
 start date/time	calendar	en	Start Date/Time
-start- and enddates	calendar	en	Start- and Enddates
-startdate	calendar	en	Startdate
 startdate / -time	calendar	en	Startdate / -time
 startdate and -time of the search	calendar	en	Startdate and -time of the search
+startdate of the export	calendar	en	Startdate of the export
 startrecord	calendar	en	Startrecord
-su	calendar	en	Su
+status changed	calendar	en	Status changed
 submit to repository	calendar	en	Submit to Repository
 sun	calendar	en	Sun
 tentative	calendar	en	Tentative
 test import (show importable records <u>only</u> in browser)	calendar	en	Test Import (show importable records <u>only</u> in browser)
-text	calendar	en	Text
-th	calendar	en	T
-the following conflicts with the suggested time:<ul>%1</ul>	calendar	en	The following conflicts with the suggested time:<ul>%1</ul>
-the user %1 is not participating in this event!	calendar	en	The user %1 is not participating in this event!
-there was an error trying to connect to your news server.<br>please contact your admin to check the news servername, username or password.	calendar	en	There was an error trying to connect to your news server.<br>Please contact your admin to check the news servername, username or password.
 this day is shown as first day in the week or month view.	calendar	en	This day is shown as first day in the week or month view.
-this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	en	This defines the end of your day view. Events after this time are shown below the day view.
-this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	en	This defines the start of your day view. Events before this time are shown above the day view.<br>This time is also used as a default start time for new events.
+this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	en	This defines the end of your dayview. Events after this time, are shown below the dayview.
+this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	en	This defines the start of your dayview. Events before this time, are shown above the dayview.<br>This time is also used as a default starttime for new events.
 this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	calendar	en	This group that is preselected when you enter the planner. You can change it in the planner anytime you want.
-this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	en	This is mostly caused by a not or wrongly configured SMTP server. Notify your administrator.
 this message is sent for canceled or deleted events.	calendar	en	This message is sent for canceled or deleted events.
 this message is sent for modified or moved events.	calendar	en	This message is sent for modified or moved events.
+this message is sent to disinvited participants.	calendar	en	This message is sent to disinvited participants.
 this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	en	This message is sent to every participant of events you own, who has requested notifcations about new events.<br>You can use certain variables which get substituted with the data of the event. The first line is the subject of the email.
-this message is sent when you accept, tentative accept or reject an event.	calendar	en	This message is sent when you accept, tentatively accept, or reject an event.
-this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	en	This message is sent when you set an Alarm for a certain event.  Include all information you might need.
-this month	calendar	en	This Month
-this week	calendar	en	This Week
-this year	calendar	en	This Year
+this message is sent when you accept, tentative accept or reject an event.	calendar	en	This message is sent when you accept, tentative accept or reject an event.
+this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	en	This message is sent when you set an Alarm for a certain event. Include all information you might need.
 three month	calendar	en	three month
 thu	calendar	en	Thu
 til	calendar	en	til
 timeframe	calendar	en	Timeframe
 timeframe to search	calendar	en	Timeframe to search
-title	calendar	en	Title
 title of the event	calendar	en	Title of the event
-title-row	calendar	en	Title-row
 to many might exceed your execution-time-limit	calendar	en	to many might exceed your execution-time-limit
-to-firstname	calendar	en	To-Firstname
-to-fullname	calendar	en	To-Fullname
-to-lastname	calendar	en	To-Lastname
-today	calendar	en	Today
 translation	calendar	en	Translation
-tu	calendar	en	T
 tue	calendar	en	Tue
-two dayview	calendar	en	two dayview
 two weeks	calendar	en	two weeks
-update a single entry by passing the fields.	calendar	en	Update a single entry by passing the fields.
 updated	calendar	en	Updated
-use end date	calendar	en	Use End date
+use end date	calendar	en	use end date
 use the selected time and close the popup	calendar	en	use the selected time and close the popup
-view this entry	calendar	en	View this entry
-we	calendar	en	W
+view this event	calendar	en	View this event
 wed	calendar	en	Wed
 week	calendar	en	Week
-weekday starts on	calendar	en	Weekday starts on
+weekday starts on	calendar	en	weekday starts on
 weekdays	calendar	en	Weekdays
 weekdays to use in search	calendar	en	Weekdays to use in search
 weekly	calendar	en	Weekly
-weekview	calendar	en	Week View
-weekview including weekend	calendar	en	Weekview including weekend
+weekview	calendar	en	weekview
+weekview with weekend	calendar	en	Weekview with weekend
 weekview without weekend	calendar	en	weekview without weekend
-when creating new events default set to private	calendar	en	When creating new events default set to private
 which events do you want to see when you enter the calendar.	calendar	en	Which events do you want to see when you enter the calendar.
-which of calendar view do you want to see, when you start calendar ?	calendar	en	Which of calendar view do you want to see when you start calendar ?
-wk	calendar	en	Wk
-work day ends on	calendar	en	Work day ends on
-work day starts on	calendar	en	Work day starts on
-workdayends	calendar	en	workdayends
+which of calendar view do you want to see, when you start calendar ?	calendar	en	Which of calendar view do you want to see, when you start calendar ?
+whole day	calendar	en	whole day
+work day ends on	calendar	en	work day ends on
+work day starts on	calendar	en	work day starts on
 yearly	calendar	en	Yearly
-yearview	calendar	en	Year View
+yearview	calendar	en	yearview
 you can either set a year or a occurence, not both !!!	calendar	en	You can either set a Year or a Occurence, not both !!!
 you can only set a year or a occurence !!!	calendar	en	You can only set a year or a occurence !!!
-you do not have permission to add alarms to this event !!!	calendar	en	You do not have permission to add alarms to this event !!!
-you do not have permission to delete this alarm !!!	calendar	en	You do not have permission to delete this alarm !!!
-you do not have permission to enable/disable this alarm !!!	calendar	en	You do not have permission to enable/disable this alarm !!!
 you do not have permission to read this record!	calendar	en	You do not have permission to read this record!
-you have %1 high priority events on your calendar today.	common	en	You have %1 high priority events on your calendar today.
-you have 1 high priority event on your calendar today.	common	en	You have 1 high priority event on your calendar today.
 you have a meeting scheduled for %1	calendar	en	You have a meeting scheduled for %1
-you have not entered a title	calendar	en	You have not entered a title
-you have not entered a valid date	calendar	en	You have not entered a valid date
-you have not entered a valid time of day	calendar	en	You have not entered a valid time of day
-you have not entered participants	calendar	en	You have not entered participants
-you must enter one or more search keywords	calendar	en	You must enter one or more search keywords
-you must select a [iv]cal. (*.[iv]cs)	calendar	en	You must select a [iv]Cal. (*.[iv]cs)
+you have been disinvited from the meeting at %1	calendar	en	You have been disinvited from the meeting at %1
+you need to select an ical file first	calendar	en	You need to select an iCal file first
 you need to set either a day or a occurence !!!	calendar	en	You need to set either a day or a occurence !!!
 your meeting scheduled for %1 has been canceled	calendar	en	Your meeting scheduled for %1 has been canceled
 your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	en	Your meeting that had been scheduled for %1 has been rescheduled to %2
-your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries:	calendar	en	Your suggested time of <B> %1 - %2 </B> conflicts with the following existing calendar entries:
diff --git a/calendar/setup/phpgw_es-es.lang b/calendar/setup/phpgw_es-es.lang
index f1f689e4f1..37a053c9a4 100644
--- a/calendar/setup/phpgw_es-es.lang
+++ b/calendar/setup/phpgw_es-es.lang
@@ -5,32 +5,49 @@
 (for weekly)	calendar	es-es	(por semanal)
 (i/v)cal	calendar	es-es	(i/v) Cal
 1 match found	calendar	es-es	1 coincidencia encontrada
+<b>please note</b>: the calendar use the holidays of your country, which is set to %1. you can change it in your %2.<br />holidays are %3 automatic installed from %4. you can changed it in %5.	calendar	es-es	<b>Por favor, tenga en cuenta que</b>: El calendario usa las fiestas de su país, que es %1. Puede cambiarlo en su %2.<br />Las vacaciones %3 se instalan automáticamente desde %4. Lo puede cambiar en %5.
 a	calendar	es-es	a
+a non blocking event will not conflict with other events	calendar	es-es	Un evento que no bloquea no entrará en conflicto con otros eventos
 accept	calendar	es-es	Aceptar
+accept or reject an invitation	calendar	es-es	Aceptar o rechazar una invitación
 accepted	calendar	es-es	Aceptado
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	es-es	Acción que causó la notificación: Añadido, Cancelado, Aceptado, Rechazado, ...
+actions	calendar	es-es	Acciones
 add a single entry by passing the fields.	calendar	es-es	Añadir una entrada simple pasando los campos:
 add alarm	calendar	es-es	Añadir alarma
 add contact	calendar	es-es	Añadir contacto
 add or update a single entry by passing the fields.	calendar	es-es	Añadir o actualizar una simple entrada pasando los campos
 added	calendar	es-es	Añadido
 address book	calendar	es-es	Libreta de direcciones
+after current date	calendar	es-es	Después de la fecha actual
 alarm	calendar	es-es	Alarma
+alarm added	calendar	es-es	Se ha añadido una alarma
+alarm deleted	calendar	es-es	Se ha borrado una alarma
 alarm for %1 at %2 in %3	calendar	es-es	Alarma para %1 en %2 in %3
 alarm management	calendar	es-es	Gestión de alarmas
 alarm-management	calendar	es-es	Gestión de alarmas
 alarms	calendar	es-es	Alarmas
 all categories	calendar	es-es	Todas las categorías
 all day	calendar	es-es	Todo el día
+all events	calendar	es-es	Todos los eventos
+all participants	calendar	es-es	Todos los participantes
+allows to edit the event again	calendar	es-es	Permite volver a editar el evento
+apply the changes	calendar	es-es	Aplicar los cambios
 are you sure you want to delete this country ?	calendar	es-es	¿Seguro que quiere borrar este país?
 are you sure you want to delete this holiday ?	calendar	es-es	¿Seguro que desea borrar esta fiesta?
 are you sure\nyou want to\ndelete these alarms?	calendar	es-es	¿Está seguro\nde querer\nborrar estas alarmas?
 are you sure\nyou want to\ndelete this entry ?	calendar	es-es	¿Está seguro\nde querer\nborrar esta entrada?
 are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	es-es	¿Está seguro\nde querer\nborrar esta entrada?\n\nEsto borrará\nla entrada para todos los usuarios.
 are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	es-es	¿Está seguronde querer\nborrar esta ocurrencia?\n\nEsto borrará\nla entrada para todos los usuarios.
+back half a month	calendar	es-es	medio mes hacia atrás
+back one month	calendar	es-es	un mes hacia atrás
+before current date	calendar	es-es	Antes de la fecha actual
 before the event	calendar	es-es	antes del evento
+birthday	calendar	es-es	Cumpleaños
 brief description	calendar	es-es	Descripción breve
 business	calendar	es-es	Negocios
+busy	calendar	es-es	ocupado
+by	calendar	es-es	por
 calendar	common	es-es	Calendario
 calendar - [iv]cal importer	calendar	es-es	Calendario - Importador [iv]Cal
 calendar - add	calendar	es-es	Calendario - Agregar
@@ -40,15 +57,23 @@ calendar holiday management	admin	es-es	Gesti
 calendar preferences	calendar	es-es	Preferencias - Calendario
 calendar settings	admin	es-es	Preferencias de calendario
 calendar-fieldname	calendar	es-es	Calendario - Nombre de campo
+can't add alarms in the past !!!	calendar	es-es	¡¡No se pueden añadir alarmas en el pasado!!
 canceled	calendar	es-es	Cancelado
 change all events for $params['old_owner'] to $params['new_owner'].	calendar	es-es	Cambiar todos los eventos de $params['old_owner'] a $params['new_owner'].
 change status	calendar	es-es	Cambiar estado
 charset of file	calendar	es-es	Juego de caracteres del fichero
 click %1here%2 to return to the calendar.	calendar	es-es	Pulse %1aquí%2 para volver al calendario.
+close the window	calendar	es-es	Cerrar la ventana
+common preferences	calendar	es-es	preferencias comunes
+compose a mail to all participants after the event is saved	calendar	es-es	redactar un correo para todos los participantes después de guardar el evento
 configuration	calendar	es-es	Configuración
+copy of:	calendar	es-es	Copia de:
+copy this event	calendar	es-es	Copiar este evento
 countries	calendar	es-es	Paises
 country	calendar	es-es	País
+create new links	calendar	es-es	Crear enlaces nuevos
 created by	calendar	es-es	Creado por
+csv	calendar	es-es	CSV
 csv-fieldname	calendar	es-es	CSV - Nombre del campo
 csv-filename	calendar	es-es	CSV- Nombre del fichero
 custom fields	calendar	es-es	Campos personalizados
@@ -56,6 +81,7 @@ custom fields and sorting	common	es-es	Campos personalizados y ordenaci
 daily	calendar	es-es	Diario
 daily matrix view	calendar	es-es	Vista matricial del día
 days	calendar	es-es	días
+days of the week for a weekly repeated event	calendar	es-es	Días de la semana para un evento de repetición semanal
 days repeated	calendar	es-es	días repetidos
 dayview	calendar	es-es	Vista diaria
 default appointment length (in minutes)	calendar	es-es	duración por defecto de los eventos (en minutos)
@@ -70,11 +96,16 @@ delete selected contacts	calendar	es-es	Eliminar contactos seleccionados
 delete selected participants	calendar	es-es	Borrar los participantes seleccionados
 delete series	calendar	es-es	Borrar series
 delete single	calendar	es-es	Borrar simple
+delete this alarm	calendar	es-es	Borrar esta alarma
+delete this event	calendar	es-es	Borrar este evento
+delete this exception	calendar	es-es	Borrar esta excepción
+delete this series of recuring events	calendar	es-es	Borrar esta serie de eventos recurrentes
 deleted	calendar	es-es	Eliminado
 description	calendar	es-es	Descripción
 determining window width ...	calendar	es-es	Determinando el ancho de la ventana...
 disable	calendar	es-es	Desactivar
 disabled	calendar	es-es	desactivado
+disinvited	calendar	es-es	Ya no está invitado
 display interval in day view	calendar	es-es	Mostrar intervalo en vista diaria
 display mini calendars when printing	calendar	es-es	Mostrar minicalendarios al imprimir
 display status of events	calendar	es-es	Mostrar estado de los eventos
@@ -85,22 +116,34 @@ do you want to be notified about new or changed appointments? you be notified ab
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	es-es	¿Desea recibir regularmente por correo un resumen de sus citas?<br>El resumen se le enviará a su correo electrónico habitual el mismo día por la mañana o el lunes para resúmenes semanales.<br>Sólo se envía si hay citas en ese día o esa semana.
 do you wish to autoload calendar holidays files dynamically?	admin	es-es	¿Desea cargar automáticamente en el calendario los ficheros de fiestas?
 download	calendar	es-es	Descargar
+download this event as ical	calendar	es-es	Descargar este evento como iCal
 duration	calendar	es-es	Duración
 duration of the meeting	calendar	es-es	Duración de la reunión
 edit series	calendar	es-es	Editar series
 edit single	calendar	es-es	Editar sencillo
+edit this event	calendar	es-es	Editar este evento
+edit this series of recuring events	calendar	es-es	Editar esta serie de eventos recurrentes
 email notification	calendar	es-es	Notificación por correo
 email notification for %1	calendar	es-es	Notificación por correo para %1
 empty for all	calendar	es-es	vacío para todos
 enable	calendar	es-es	Activar
 enabled	calendar	es-es	activado
+end	calendar	es-es	Fin
 end date/time	calendar	es-es	Fecha/Hora final
 enddate	calendar	es-es	Fecha final
 enddate / -time of the meeting, eg. for more then one day	calendar	es-es	Fecha final / -hora de la reunión, p. ej. para más de un día
+enddate of the export	calendar	es-es	Fecha de fin de la exportación
 ends	calendar	es-es	acaba
 enter output filename: ( .vcs appended )	calendar	es-es	Introduzca el nombre del fichero de salida (añadir .vcs)
+error adding the alarm	calendar	es-es	Error al añadir la alarma
+error: saving the event !!!	calendar	es-es	Error al guardar el evento
+event copied - the copy can now be edited	calendar	es-es	Evento copiado. Ahora se puede editar la copia
+event deleted	calendar	es-es	Evento borrado
 event details follow	calendar	es-es	A continuación, los detalles del evento
+event saved	calendar	es-es	Evento guardado
+event will occupy the whole day	calendar	es-es	El evento ocupará todo el día
 exceptions	calendar	es-es	Excepciones
+existing links	calendar	es-es	Enlaces existentes
 export	calendar	es-es	Exportar
 export a list of entries in ical format.	calendar	es-es	Exportar una lista de entradas en format iCal.
 extended	calendar	es-es	Extendido
@@ -108,9 +151,15 @@ extended updates always include the complete event-details. ical's can be import
 external participants	calendar	es-es	Participantes externos
 failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	es-es	Fallo al enviar mensaje a '%1' nº%2 asunto='%3', remitente='%4'
 fieldseparator	calendar	es-es	Separador de campos
+filename	calendar	es-es	Nombre de fichero
+filename of the download	calendar	es-es	Nombre de fichero de la descarga
 find free timeslots where the marked participants are availible for the given timespan	calendar	es-es	Encontrar espacios de tiempo libres donde los partipantes marcados estén disponibles para el horario elegido
+find free timeslots where the selected participants are availible for the given timespan	calendar	es-es	Buscar márgenes de tiempo libres donde los participantes seleccionados estén disponibles para las horas indicadas
 firstname of person to notify	calendar	es-es	Nombre de pila de la persona a notificar
+for	calendar	es-es	para
 format of event updates	calendar	es-es	Formato de las actualizaciones de eventos
+forward half a month	calendar	es-es	medio mes hacia adelante
+forward one month	calendar	es-es	un mes hacia adelante
 fr	calendar	es-es	V
 free/busy	calendar	es-es	Libre/Ocupado
 freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	es-es	libre-ocupado: Usuario desconocido "%1", contraseña incorrecta o no está disponible
@@ -119,6 +168,7 @@ frequency	calendar	es-es	Frecuencia
 fri	calendar	es-es	Vie
 full description	calendar	es-es	Descripción completa
 fullname of person to notify	calendar	es-es	Nombre completo de la persona a la que notificar
+general	calendar	es-es	General
 generate printer-friendly version	calendar	es-es	Generar versión para impresion
 global categories	calendar	es-es	Categorías globales
 global public and group public	calendar	es-es	Público Global y grupo público
@@ -136,16 +186,18 @@ holidays	calendar	es-es	Festivos
 hours	calendar	es-es	horas
 how far to search (from startdate)	calendar	es-es	cuánto buscar (desde la fecha de inicio)
 i participate	calendar	es-es	Participo
+ical	calendar	es-es	iCal
 ical / rfc2445	calendar	es-es	iCal / rfc2445
+ical export	calendar	es-es	Exportar iCal
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	es-es	Si los festivos marcados caen en fin de semana, se toman el lunes siguiente.
 if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	es-es	¡Si no pone aquí una contraseña, la información está disponible para todos los que conozcan la URL!
-if you dont set a password here, the information is availible to everyone, who knows the url!!!	calendar	es-es	Si no indica una contraseña aquí, ¡la información está disponible para todos los que conozcan la URL!
 ignore conflict	calendar	es-es	Ignorar conflicto
 import	calendar	es-es	Importar
 import csv-file	common	es-es	Importar fichero CSV
 interval	calendar	es-es	Intervalo
 intervals in day view	calendar	es-es	Intervalos en la vista de día
 intervals per day in planner view	calendar	es-es	Intervalos por día en la vista del planificador
+invalid email-address "%1" for user %2	calendar	es-es	La dirección de correo "%1" no es válida para el usuario %2
 invalid entry id.	calendar	es-es	Id de entrada no válido
 last	calendar	es-es	último
 lastname of person to notify	calendar	es-es	Apellido de la persona a la que notificar
@@ -153,12 +205,16 @@ length shown<br>(emtpy for full length)	calendar	es-es	Longitud mostrada<br>(vac
 length<br>(<= 255)	calendar	es-es	Longitud<br>(<=255)
 link	calendar	es-es	Vínculo
 link to view the event	calendar	es-es	Vínculo para ver el evento
+links	calendar	es-es	Enlaces
+links, attachments	calendar	es-es	Enlaces, adjuntos
 list all categories.	calendar	es-es	Listar todas las categorías
+listview	calendar	es-es	Ver lista
 load [iv]cal	calendar	es-es	Cargar [iv]Cal
 location	calendar	es-es	Lugar
 location to autoload from	admin	es-es	Lugar desde donde cargar automáticamente
+location, start- and endtimes, ...	calendar	es-es	Ubicación, hora de inicio y final...
+mail all participants	calendar	es-es	Enviar correo a todos los participantes
 make freebusy information available to not loged in persons?	calendar	es-es	¿Poner la información del tiempo disponible a las personas que no inicien sesión?
-make freebusy information availible to not loged in persons?	calendar	es-es	¿Hacer la información libre-ocupado disponible para personas que no inicien sesión?
 matrixview	calendar	es-es	Vista matricial
 minutes	calendar	es-es	minutos
 mo	calendar	es-es	L
@@ -175,12 +231,15 @@ new entry	calendar	es-es	Nueva entrada
 new name must not exist and not be empty!!!	calendar	es-es	El nuevo nombre no debe existir previamente ni estar en blanco
 new search with the above parameters	calendar	es-es	nueva búsqueda con los parámetros de arriba
 next day	calendar	es-es	dia siguiente
+no events found	calendar	es-es	No se encontraron eventos
 no filter	calendar	es-es	Sin filtro
 no matches found	calendar	es-es	No se encontraron coincidencias
-no matches found.	calendar	es-es	No se encontraron coincidencias.
 no response	calendar	es-es	Sin respuesta
+non blocking	calendar	es-es	no bloquea
+not	calendar	es-es	no
 notification messages for added events	calendar	es-es	Mensajes de notificación para eventos añadidos
 notification messages for canceled events	calendar	es-es	Mensajes de notificación para eventos cancelados
+notification messages for disinvited participants	calendar	es-es	Mensajes de notificación para participantes que dejan de ser invitados
 notification messages for modified events	calendar	es-es	Mensajes de notificación para eventos modificados
 notification messages for your alarms	calendar	es-es	Mensajes de notificación para sus alarmas
 notification messages for your responses	calendar	es-es	Mensajes de notificación para sus respuestas
@@ -203,11 +262,12 @@ one week	calendar	es-es	una semana
 one year	calendar	es-es	un año
 only the initial date of that recuring event is checked!	calendar	es-es	¡Sólo está marcada la fecha inicial del evento recurrente!
 open todo's:	calendar	es-es	Abrir tareas pendientes
-or enddate / -time	calendar	es-es	or fecha de final / -hora
 order	calendar	es-es	Orden
 overlap holiday	calendar	es-es	solapar festivo
 participant	calendar	es-es	Participante
 participants	calendar	es-es	Participantes
+participants disinvited from an event	calendar	es-es	Participantes que dejan de ser invitados de un evento
+participants, resources, ...	calendar	es-es	Participantes, recursos
 participates	calendar	es-es	Participa
 password for not loged in users to your freebusy information?	calendar	es-es	¿Contraseña para los usuarios sin sesión para la información libre-ocupado?
 people holiday	calendar	es-es	festivo para la gente
@@ -217,7 +277,9 @@ planner by category	calendar	es-es	Planificador por categor
 planner by user	calendar	es-es	Planificador por usuario
 please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	es-es	Por favor, confirme, acepte, rechace o examine los cambios en la entrada correspondiente en su calendario
 please enter a filename !!!	calendar	es-es	Por favor, introduzca un nombre de fichero
+please note: you can configure the field assignments after you uploaded the file.	calendar	es-es	Por favor, tenga en cuenta: puede configurar el campo asignaciones DESPUES de subir el fichero.
 preselected group for entering the planner	calendar	es-es	Grupo preseleccionado para entrar en el planificador
+previous	calendar	es-es	anterior
 previous day	calendar	es-es	día anterior
 print calendars in black & white	calendar	es-es	Imprimir calendario en blanco y negro
 print the mini calendars	calendar	es-es	Imprimir minicalendarios
@@ -233,24 +295,33 @@ read this list of methods.	calendar	es-es	Leer esta lista de m
 receive email updates	calendar	es-es	Recibir actualizaciones de correo
 receive extra information in event mails	calendar	es-es	Recibir información extra en los eventos de correo
 receive summary of appointments	calendar	es-es	Recibir resumen de las citas
+recurrence	calendar	es-es	Repeticiones
 recurring event	calendar	es-es	evento recurrente
 refresh	calendar	es-es	Refrescar
 reinstate	calendar	es-es	Restablecer
 rejected	calendar	es-es	Rechazado
 repeat day	calendar	es-es	Repetir día
+repeat days	calendar	es-es	Días de repetición
 repeat end date	calendar	es-es	Repetir fecha final
+repeat the event until which date (empty means unlimited)	calendar	es-es	repetir el evento hasta qué fecha (en blanco significa sin límite)
 repeat type	calendar	es-es	Tipo repetición
 repeating event information	calendar	es-es	Información repetitiva de eventos
+repeating interval, eg. 2 to repeat every second week	calendar	es-es	intervalo de repetición, p. ej., 2 para repetir cada segunda semana
 repetition	calendar	es-es	Repetición
 repetitiondetails (or empty)	calendar	es-es	Detalles de la repetición (o vacío)
 reset	calendar	es-es	Restablecer
+resources	calendar	es-es	Recursos
 rule	calendar	es-es	Regla
 sa	calendar	es-es	Sa
 sat	calendar	es-es	Sáb
+saves the changes made	calendar	es-es	guarda los cambios realizados
+saves the event ignoring the conflict	calendar	es-es	Guarda el evento ignorando el conflicto
 scheduling conflict	calendar	es-es	Conflicto de calendario
 search results	calendar	es-es	Resultados de la búsqueda
 select a %1	calendar	es-es	Seleccionar un %1
 select a time	calendar	es-es	seleccionar una hora
+select resources	calendar	es-es	Seleccionar recursos
+select who should get the alarm	calendar	es-es	Seleccionar quién debe obtener la alarma
 selected contacts (%1)	calendar	es-es	Contactos seleccionados (%1)
 send updates via email	common	es-es	Enviar actualizaciones por correo electrónico
 send/receive updates via email	calendar	es-es	Enviar y recibir actualizaciones por correo electrónico
@@ -273,17 +344,21 @@ show the calendar of multiple users	calendar	es-es	Mostrar el calendario de vari
 show this month	calendar	es-es	Mostrar este mes
 show this week	calendar	es-es	Mostrar esta semana
 single event	calendar	es-es	evento simple
+site configuration	calendar	es-es	configuración del sitio
 sorry, the owner has just deleted this event	calendar	es-es	Lo sentimos, el propietario acaba de eliminar este evento
 sorry, this event does not exist	calendar	es-es	Lo sentimos, este evento no existe
 sorry, this event does not have exceptions defined	calendar	es-es	Lo sentimos, este evento no tiene excepciones definidas
 sort by	calendar	es-es	Ordenar por
 specifies the the number of intervals shown in the planner view.	calendar	es-es	Especifica el número de intervalos mostrados en la vista del planificador.
+start	calendar	es-es	Inicio
 start date/time	calendar	es-es	Fecha/Hora inicio
 start- and enddates	calendar	es-es	Fechas de inicio y fin
 startdate	calendar	es-es	Fecha de inicio
 startdate / -time	calendar	es-es	Fecha de incio / -hora
 startdate and -time of the search	calendar	es-es	Fecha de inicio y -hora de la búsqueda
+startdate of the export	calendar	es-es	Fecha de inicio de la exportación
 startrecord	calendar	es-es	Registro inicial
+status changed	calendar	es-es	Estado modificado
 su	calendar	es-es	Do
 submit to repository	calendar	es-es	Enviar al repositorio
 sun	calendar	es-es	Dom
@@ -301,6 +376,7 @@ this group that is preselected when you enter the planner. you can change it in
 this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	es-es	Esto se debe mayormente a una configuración errónea del servidor SMTP. Notifíquelo a su administrador.
 this message is sent for canceled or deleted events.	calendar	es-es	Este mensaje se envía cuando un evento se borra o se cancela.
 this message is sent for modified or moved events.	calendar	es-es	Este mensaje se envía al modificar o mover eventos.
+this message is sent to disinvited participants.	calendar	es-es	Este mensaje se envía a los participantes que dejan de estar invitados
 this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	es-es	Este mensaje se envía a cada participante de los eventos de los que usted es el dueño, quien ha solicitado notificaciones sobre nuevos eventos.<br>Puede usar ciertas variables a las que sustituyen los datos del evento. La primera línea es el asunto del correo electrónico.
 this message is sent when you accept, tentative accept or reject an event.	calendar	es-es	Este mensaje se envía cuando acepta, acepta temporalmente o rechaza un evento.
 this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	es-es	Este mensaje se envía cuando pone una alarma para un evento concreto. Incluya toda la información necesaria.
@@ -323,31 +399,30 @@ today	calendar	es-es	Hoy
 translation	calendar	es-es	Traducción
 tu	calendar	es-es	M
 tue	calendar	es-es	Mar
-two dayview	calendar	es-es	Dos vistas del día
 two weeks	calendar	es-es	dos semanas
 update a single entry by passing the fields.	calendar	es-es	Actualizar una entrada simple pasando los campos.
 updated	calendar	es-es	Actualizado
 use end date	calendar	es-es	Usar fecha final
 use the selected time and close the popup	calendar	es-es	usar la hora seleccionada y cerrar la ventana
-view this entry	calendar	es-es	Ver esta entrada
+view this event	calendar	es-es	Ver este evento
 we	calendar	es-es	Mi
-wed	calendar	es-es	Mie
+wed	calendar	es-es	Mié
 week	calendar	es-es	Semana
 weekday starts on	calendar	es-es	La semana empieza en
 weekdays	calendar	es-es	Días laborales
 weekdays to use in search	calendar	es-es	Días laborales a usar en la búsqueda
 weekly	calendar	es-es	Semanal
 weekview	calendar	es-es	Vista semanal
-weekview including weekend	calendar	es-es	Vista semanal incluyendo el fin de semana
+weekview with weekend	calendar	es-es	vista semanal con fin de semana
 weekview without weekend	calendar	es-es	Vista semanal sin fin de semana
 when creating new events default set to private	calendar	es-es	Crear nuevos eventos como privados
 which events do you want to see when you enter the calendar.	calendar	es-es	¿Qué eventos quiere ver al entrar al calendario?
 which of calendar view do you want to see, when you start calendar ?	calendar	es-es	¿Qué vista del calendario quiere ver cuando entra al calendario?
+whole day	calendar	es-es	todo el día
 wk	calendar	es-es	Trabajo
 work day ends on	calendar	es-es	Los días laborables acaban en
 work day starts on	calendar	es-es	Los días laborables empiezan en
 workdayends	calendar	es-es	Final del día laborable
-year	calendar	es-es	Año
 yearly	calendar	es-es	Anual
 yearview	calendar	es-es	Vista anual
 you can either set a year or a occurence, not both !!!	calendar	es-es	Puede poner un año o una ocurrencia, pero no ambos.
@@ -359,11 +434,10 @@ you do not have permission to read this record!	calendar	es-es	
 you have %1 high priority events on your calendar today.	common	es-es	Ud. tiene %1 eventos de alta prioridad en su calendario para hoy.
 you have 1 high priority event on your calendar today.	common	es-es	Ud. tiene 1 evento de alta prioridad en su calendario para hoy.
 you have a meeting scheduled for %1	calendar	es-es	Ud. tiene una reunión programada para %1
+you have been disinvited from the meeting at %1	calendar	es-es	Ha dejado de estar invitado a la reunión de %1
 you have not entered a title	calendar	es-es	No ha introducido un título
 you have not entered a valid date	calendar	es-es	Ha introducido una fecha incorrecta
 you have not entered a valid time of day	calendar	es-es	Ha introducido una hora incorrecta
-you have not entered a\nbrief description	calendar	es-es	Ud. no ha ingresado una\nBrief descripción
-you have not entered a\nvalid time of day.	calendar	es-es	Ud. no ha ingresado una\nvalid hora valida.
 you have not entered participants	calendar	es-es	No ha introducido participantes
 you must enter one or more search keywords	calendar	es-es	Ud. debe introducir una o más claves de búsqueda
 you must select a [iv]cal. (*.[iv]cs)	calendar	es-es	Debe seleccionar un [iv]Cal. (*.[iv]cs)
diff --git a/calendar/setup/phpgw_fr.lang b/calendar/setup/phpgw_fr.lang
index 25fc7c9bf2..cf841f7a5d 100644
--- a/calendar/setup/phpgw_fr.lang
+++ b/calendar/setup/phpgw_fr.lang
@@ -6,15 +6,19 @@
 (i/v)cal	calendar	fr	(i/v)Cal
 1 match found	calendar	fr	1 correspondance trouvée
 a	calendar	fr	un
-accept	calendar	fr	Accepte
+a non blocking event will not conflict with other events	calendar	fr	Un événement non bloquant n'entrera pas en conflit avec d'autres événements.
+accept	calendar	fr	Accepter
+accept or reject an invitation	calendar	fr	Accepter ou rejeter une invitation
 accepted	calendar	fr	Accepté
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	fr	L'action qui a causé la notification: Ajouté, Annulé, Accepté, Rejeté, ...
+actions	calendar	fr	Actions
 add a single entry by passing the fields.	calendar	fr	Ajouter une unique entrée en passant les champs.
 add alarm	calendar	fr	Ajouter une alarme
 add contact	calendar	fr	Ajouter un contact
 add or update a single entry by passing the fields.	calendar	fr	Ajoutez ou mettez à jour une seule entrée en passant les champs.
 added	calendar	fr	Ajouté
 address book	calendar	fr	Carnet d'adresses
+after current date	calendar	fr	Après la date courante
 alarm	calendar	fr	Alarme
 alarm for %1 at %2 in %3	calendar	fr	Alarme pour %1 à %2 dans %3
 alarm management	calendar	fr	Gestion des alarmes
@@ -22,19 +26,21 @@ alarm-management	calendar	fr	Gestion des alarmes
 alarms	calendar	fr	Alarmes
 all categories	calendar	fr	Toutes catégories
 all day	calendar	fr	Journée entière
+all events	calendar	fr	Tous les événements
+all participants	calendar	fr	Tous les participants
+allows to edit the event again	calendar	fr	Autorise à éditer à nouveau l'événement
+apply the changes	calendar	fr	Appliquer les modifications
 are you sure you want to delete this country ?	calendar	fr	Etes-vous sûr de vouloir effacer ce pays ?
 are you sure you want to delete this holiday ?	calendar	fr	Etes-vous sûr de vouloir effacer ces vacances ?
 are you sure\nyou want to\ndelete these alarms?	calendar	fr	Etes-vous sûr\nde vouloir\neffacer ces alarmes?
 are you sure\nyou want to\ndelete this entry ?	calendar	fr	Etes-vous sûr\nde vouloir\neffacer cette entrée ?
 are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	fr	Etes-vous sûr\nde vouloir\neffacer cette entrée ?\n\nCeci va effacer\ncette entrée pour tous les utilisateurs.
 are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	fr	Etes-vous sûr\nde vouloir\neffacer cette unique occurence ?\n\nCeci va effacer\ncette entrée pour tous les utilisateurs.
-are you surenyou want tondelete these alarms?	calendar	fr	Etes-vous sûr\nde vouloir\neffacer ces alarmes?
-are you surenyou want tondelete this entry ?	calendar	fr	Etes-vous sûr\nde vouloir\neffacer cette entrée ?
-are you surenyou want tondelete this entry ?nnthis will deletenthis entry for all users.	calendar	fr	Etes-vous sûr\nde vouloir\neffacer cette entrée ?\n\nCeci va effacer\ncette entrée pour tous les utilisateurs.
-are you surenyou want tondelete this single occurence ?nnthis will deletenthis entry for all users.	calendar	fr	Etes-vous sûr\nde vouloir\neffacer cette unique occurence ?\n\nCeci va effacer\ncette entrée pour tous les utilisateurs.
-before the event	calendar	fr	avant l'évènement
+before current date	calendar	fr	Avant la date courante
+before the event	calendar	fr	avant l'événement
 brief description	calendar	fr	Description brève
 business	calendar	fr	Travail
+by	calendar	fr	par
 calendar	common	fr	Calendrier
 calendar - [iv]cal importer	calendar	fr	Calendrier - Importateur [iv]Cal
 calendar - add	calendar	fr	Calendrier - Ajouter
@@ -49,9 +55,13 @@ change all events for $params['old_owner'] to $params['new_owner'].	calendar	fr
 change status	calendar	fr	Modifier le statut
 charset of file	calendar	fr	Table de charactères du fichier
 click %1here%2 to return to the calendar.	calendar	fr	Cliquer %1ici%2 pour retourner au calendrier
+close the window	calendar	fr	Fermer la fenêtre
+compose a mail to all participants after the event is saved	calendar	fr	Ecrire un mail à tous les participants après l'enregistrement de l'événement
 configuration	calendar	fr	Configuration
+copy this event	calendar	fr	Copier cet événement
 countries	calendar	fr	Pays
 country	calendar	fr	Pays
+create new links	calendar	fr	Créer de nouveaux liens
 created by	calendar	fr	Créé par
 csv-fieldname	calendar	fr	CSV-nom des champs
 csv-filename	calendar	fr	CSV-nom du fichier
@@ -60,6 +70,7 @@ custom fields and sorting	common	fr	Champs personnalis
 daily	calendar	fr	Journalier
 daily matrix view	calendar	fr	Vue journalière de la matrice
 days	calendar	fr	Jours
+days of the week for a weekly repeated event	calendar	fr	Jours de la semaine pour la répétition hebdomadaire
 days repeated	calendar	fr	Jours répétés
 dayview	calendar	fr	Vue journalière
 default appointment length (in minutes)	calendar	fr	Durée du rendez-vous par défaut (en minutes)
@@ -74,11 +85,14 @@ delete selected contacts	calendar	fr	Effacer les contacts s
 delete selected participants	calendar	fr	Supprimer les participants s&eacute;lectionn&eacute;es
 delete series	calendar	fr	Effacer les séries
 delete single	calendar	fr	Effacer un unique
+delete this event	calendar	fr	Effacer cet événement
+delete this series of recuring events	calendar	fr	Effacer cette série d'événements récurrents
 deleted	calendar	fr	Effacé
 description	calendar	fr	Description
 determining window width ...	calendar	fr	Recherche de la largeur de fenêtre
 disable	calendar	fr	Désactiver
 disabled	calendar	fr	Désactivé
+disinvited	calendar	fr	Invitation annulée
 display interval in day view	calendar	fr	Afficher l'intervalle dans la vue journalière
 display mini calendars when printing	calendar	fr	Afficher mini calendriers à l'impression
 display status of events	calendar	fr	Afficher le statut des événements
@@ -93,19 +107,26 @@ duration	calendar	fr	Dur
 duration of the meeting	calendar	fr	Durée de la réunion
 edit series	calendar	fr	Modifier toutes les occurrences
 edit single	calendar	fr	Modifier cette occurrence
+edit this event	calendar	fr	Editer cet événement
+edit this series of recuring events	calendar	fr	Editer cette série d'événements récurrents
 email notification	calendar	fr	Notification par email
 email notification for %1	calendar	fr	Notification par email pour %1
-email reminder	calendar	fr	EMail de rappel
 empty for all	calendar	fr	Vide pour tous
 enable	calendar	fr	Activer
 enabled	calendar	fr	Activé
+end	calendar	fr	Fin
 end date/time	calendar	fr	Date/Heure de fin
 enddate	calendar	fr	Date de fin
 enddate / -time of the meeting, eg. for more then one day	calendar	fr	Date et fin de la réunion, eg. pour plus d'une journée
 ends	calendar	fr	Finit
 enter output filename: ( .vcs appended )	calendar	fr	Entrer le nom du fichier de sortie: ( .vcs ajouté )
+error: saving the event !!!	calendar	fr	Erreur de sauvegarde de l'événement !!!
+event deleted	calendar	fr	Evénement effacé
 event details follow	calendar	fr	Les détails de l'évènement suivent
+event saved	calendar	fr	Evénement enregistré
+event will occupy the whole day	calendar	fr	L'événement occupera la journée entière
 exceptions	calendar	fr	Exceptions
+existing links	calendar	fr	Liens existants
 export	calendar	fr	Export
 export a list of entries in ical format.	calendar	fr	Exporter une liste d'entrées dans le format iCal.
 extended	calendar	fr	Etendu
@@ -114,6 +135,7 @@ external participants	calendar	fr	Participants ext
 failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	fr	Impossible d'envoyer le message à "%1" #%2 sujet="%3", expéditeur="%4" !
 fieldseparator	calendar	fr	Séparateur de champs
 find free timeslots where the marked participants are availible for the given timespan	calendar	fr	Recherche de crénaux horaires où les participants sélectionnés sont disponibles pour la durée choisie
+find free timeslots where the selected participants are availible for the given timespan	calendar	fr	Trouver des plages de temps libre sur lesquelles les participants sélectionnés sont disponibles
 firstname of person to notify	calendar	fr	Prénom de la personne à prévenir
 format of event updates	calendar	fr	Format des mises à jour d'évènement
 fr	calendar	fr	V
@@ -124,6 +146,7 @@ frequency	calendar	fr	Fr
 fri	calendar	fr	Ven
 full description	calendar	fr	Description complète
 fullname of person to notify	calendar	fr	Nom complet de la personne à prévenir
+general	calendar	fr	Général
 generate printer-friendly version	calendar	fr	Générer une version imprimable
 global categories	calendar	fr	Catégories globales
 global public and group public	calendar	fr	Public global et groupe public
@@ -144,11 +167,9 @@ i participate	calendar	fr	Je participe
 ical / rfc2445	calendar	fr	iCal / rfc2445
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	fr	Si activé les vacances tombant sur un Week-End, sont prises sur le lundi d'après.
 if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	fr	Si vous ne définissez pas de mot de passe ici, les informations seront disponibles à n'importe qui connaissant l'adresse
-if you dont set a password here, the information is availible to everyone, who knows the url!!!	calendar	fr	Si vous ne mettez pas de mot de passe ici, l'information sera accessible par n'importe quelle personne connaissant l'URL!
 ignore conflict	calendar	fr	Ignorer le conflit
 import	calendar	fr	Import
 import csv-file	common	fr	Importer un fichier CSV
-import csv-file into calendar	calendar	fr	Importer un fichier CSV dans le calendrier
 interval	calendar	fr	Intervalle
 intervals in day view	calendar	fr	Intervalles dans la vue journalière
 intervals per day in planner view	calendar	fr	Intervalles par jour dans la vue planning
@@ -159,12 +180,16 @@ length shown<br>(emtpy for full length)	calendar	fr	Longueur montr
 length<br>(<= 255)	calendar	fr	Longueur<br>(<= 255)
 link	calendar	fr	Lien
 link to view the event	calendar	fr	Lien pour voir l'événement
+links	calendar	fr	Liens
+links, attachments	calendar	fr	Liens, attachements
 list all categories.	calendar	fr	Lister toutes les catégories
+listview	calendar	fr	Liste d'événements
 load [iv]cal	calendar	fr	Charger [iv]Cal
 location	calendar	fr	Emplacement
 location to autoload from	admin	fr	Emplacement depuis lequel auto-charger
+location, start- and endtimes, ...	calendar	fr	Emplacement, Heures de début et de fin...
+mail all participants	calendar	fr	Envoyer un mail à tous les participants
 make freebusy information available to not loged in persons?	calendar	fr	Mettre à disposition les disponibilités sans être loggué
-make freebusy information availible to not loged in persons?	calendar	fr	Mettre à disposition des utilisateurs non connectés l'information Libre/Occupé?
 matrixview	calendar	fr	Vue matricielle
 minutes	calendar	fr	minutes
 mo	calendar	fr	L
@@ -184,15 +209,16 @@ next day	calendar	fr	Jour suivant
 no filter	calendar	fr	Pas de filtres
 no matches found	calendar	fr	Pas d'occurences trouvées
 no response	calendar	fr	Pas de réponse
-notification messages for added events	calendar	fr	Messages de notification pour les évènements ajoutés
-notification messages for canceled events	calendar	fr	Messages de notification pour les évènements annulés
-notification messages for modified events	calendar	fr	Messages de notification pour les évènements modifiés
+non blocking	calendar	fr	Non bloquant
+notification messages for added events	calendar	fr	Messages de notification pour les événements ajoutés
+notification messages for canceled events	calendar	fr	Messages de notification pour les événements annulés
+notification messages for disinvited participants	calendar	fr	Messages de notification pour les invitations annulées
+notification messages for modified events	calendar	fr	Messages de notification pour les événements modifiés
 notification messages for your alarms	calendar	fr	Messages de notification pour vos alarmes
 notification messages for your responses	calendar	fr	Messages de notification pour vos réponses
 number of intervals per day in planner view	calendar	fr	Nombre d'intervalles par jour dans la vue planificateur
 number of months	calendar	fr	Nombre de mois
 number of records to read (%1)	calendar	fr	Nombre d'entrées
-number of records to read (<=200)	calendar	fr	Nombre d'enregistrements à lire (<=200)
 observance rule	calendar	fr	Règle d'observation
 occurence	calendar	fr	Occurence
 old startdate	calendar	fr	Ancienne date de début
@@ -214,6 +240,8 @@ order	calendar	fr	Ordre
 overlap holiday	calendar	fr	Vacances recouvrantes
 participant	calendar	fr	Participant
 participants	calendar	fr	Participants
+participants disinvited from an event	calendar	fr	Invitations annulées pour un événement
+participants, resources, ...	calendar	fr	Participants, Ressources...
 participates	calendar	fr	Participe
 password for not loged in users to your freebusy information?	calendar	fr	Mot de passe des utilisateurs non connectés pour l'information Libre/Occupé?
 people holiday	calendar	fr	Vacances des personnes
@@ -239,20 +267,27 @@ read this list of methods.	calendar	fr	Lire cette liste de m
 receive email updates	calendar	fr	Recevoir les mises à jour par EMail
 receive extra information in event mails	calendar	fr	Recevoir des informations supplémentaires dans les EMails d'évènements
 receive summary of appointments	calendar	fr	Recevoir le résumé des rendez-vous
+recurrence	calendar	fr	Récurrence
 recurring event	calendar	fr	Evènement récurrent
 refresh	calendar	fr	Rafraîchir
 reinstate	calendar	fr	Réinstaller
 rejected	calendar	fr	Rejeté
 repeat day	calendar	fr	Jour de répétition
+repeat days	calendar	fr	Jours de répétition
 repeat end date	calendar	fr	Date de fin de répétition
+repeat the event until which date (empty means unlimited)	calendar	fr	Répéter l'événement jusqu'à quelle date ? (vide pour illimité)
 repeat type	calendar	fr	Type de répétition
 repeating event information	calendar	fr	Informations d'événement répétitif
+repeating interval, eg. 2 to repeat every second week	calendar	fr	Intervalle de répétition, par exemple 2 pour répéter chaque deuxième semaine
 repetition	calendar	fr	Répétition
 repetitiondetails (or empty)	calendar	fr	Détails de répétition (ou vide)
 reset	calendar	fr	Réinitialiser
+resources	calendar	fr	Ressources
 rule	calendar	fr	Règle
 sa	calendar	fr	Sa
 sat	calendar	fr	Sam
+saves the changes made	calendar	fr	Sauvegarder les modifications
+saves the event ignoring the conflict	calendar	fr	Sauvegarder l'événement en ignorant le conflit
 scheduling conflict	calendar	fr	Conflit de planification
 search results	calendar	fr	Résultats de recherche
 select a %1	calendar	fr	Sélectionnez un %1
@@ -284,12 +319,14 @@ sorry, this event does not exist	calendar	fr	D
 sorry, this event does not have exceptions defined	calendar	fr	Désolé, cet évènement n'a pas d'exceptions définies
 sort by	calendar	fr	Sort by
 specifies the the number of intervals shown in the planner view.	calendar	fr	Spécifie le nombre d'intervalles montrés dans la vue planning.
+start	calendar	fr	Début
 start date/time	calendar	fr	Date/heure de début
 start- and enddates	calendar	fr	Dates de début et de fin
 startdate	calendar	fr	Date de début
 startdate / -time	calendar	fr	Date/heure de début
 startdate and -time of the search	calendar	fr	Date/heure de début de recherche
 startrecord	calendar	fr	Enregistrement de début
+status changed	calendar	fr	Le statut a été modifié
 su	calendar	fr	Di
 submit to repository	calendar	fr	Soumettre au dépôt
 sun	calendar	fr	Dim
@@ -301,13 +338,13 @@ the following conflicts with the suggested time:<ul>%1</ul>	calendar	fr	L'
 the user %1 is not participating in this event!	calendar	fr	L'utilisateur %1 ne participe pas à cet évènement!
 there was an error trying to connect to your news server.<br>please contact your admin to check the news servername, username or password.	calendar	fr	Il y a eu une erreur en essayant de se connecter à votre serveur de News.<br>SVP, contactez votre administrateur pour vérifier le nom du serveur de News, votre nom ou mot de passe.
 this day is shown as first day in the week or month view.	calendar	fr	Ce jour est montré comme le premier jour dans la vue hebdomadaire ou mensuelle.
-this day is shown as last day in the week view.	calendar	fr	Ce jour est considéré comme le dernier jour dans la vue hebdomadaire.
 this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	fr	Ceci définit la fin de votre vue journalière. Les évènements après cette heure sont montrés sous la vue journalière.
 this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	fr	Ceci définit le début de votre vue journalière. Les évènements avant cette heuresont montrés au-dessus de la vue journalière.<br>Cette heure est aussi utilisée comme l'heure de début par défaut pour les nouveaux évènements.
 this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	calendar	fr	Ce groupe qui est présélectionné quand vous entrez dans le planning. Vous pouvez le changer dans le planning chaque fois que vous le voulez.
 this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	fr	Cette erreur est généralement due à une mauvaise configuration du serveur SMTP. Contactez votre administrateur.
 this message is sent for canceled or deleted events.	calendar	fr	Ce message est envoyé pour les évènements annulés ou effacés.
 this message is sent for modified or moved events.	calendar	fr	Ce message est envoyé pour les évènements modifiés ou déplacés.
+this message is sent to disinvited participants.	calendar	fr	Ce message est envoyé aux participants dont l'invitation a été annulée.
 this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	fr	Ce message est envoyé à tous les participants des évènements vous appartenant qui ont demandé des notifications à propos des nouveaux évènements.<br>Vous pouvez utiliser certaines variables qui seront remplacées par les données de l'évènement. La première ligne est le sujet de l'EMail.
 this message is sent when you accept, tentative accept or reject an event.	calendar	fr	Ce message est envoyé quand vous acceptez, essayez d'accepter ou rejetez un évènement.
 this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	fr	Ce message est envoyé quand vous réglez une Alarme pour un évènement précis. Incluez toutes les informations dont vous pourriez avoir besoin.
@@ -340,7 +377,6 @@ view this entry	calendar	fr	Voir cette entr
 we	calendar	fr	M
 wed	calendar	fr	Mer
 week	calendar	fr	Semaine
-weekday ends on	calendar	fr	La semaine se termine le
 weekday starts on	calendar	fr	La semaine débute le
 weekdays	calendar	fr	Jours de la semaine
 weekdays to use in search	calendar	fr	Jour de la semaine à inclure dans la recherche
@@ -351,6 +387,7 @@ weekview without weekend	calendar	fr	Vue Hebdo sans Weekend
 when creating new events default set to private	calendar	fr	A la création de nouveaux événements mettre par défaut en privé
 which events do you want to see when you enter the calendar.	calendar	fr	Quels évènements voulez-vous voir quand vous entrez dans le calendrier.
 which of calendar view do you want to see, when you start calendar ?	calendar	fr	Laquelle des vues du calendrier vous voulez voir, quand vous entrez dans le calendrier ?
+whole day	calendar	fr	Journée entière
 wk	calendar	fr	Sem.
 work day ends on	calendar	fr	Jour de travail finit à
 work day starts on	calendar	fr	Jour de travail démarre à
@@ -366,6 +403,7 @@ you do not have permission to read this record!	calendar	fr	Vous n'avez pas les
 you have %1 high priority events on your calendar today.	common	fr	Vous avez %1 événements de haute priorité dans votre calendrier aujourd'hui.
 you have 1 high priority event on your calendar today.	common	fr	Vous avez 1 événement de haute priorité dans votre calendrier aujourd'hui.
 you have a meeting scheduled for %1	calendar	fr	Vous avez une réunion planifiée pour %1
+you have been disinvited from the meeting at %1	calendar	fr	Votre invitation au rendez-vous de %1 a été annulée
 you have not entered a title	calendar	fr	Vous n'avez pas entré de titre
 you have not entered a valid date	calendar	fr	Vous n'avez pas entré une date correcte
 you have not entered a valid time of day	calendar	fr	Vous n'avez pas entré une heure de la journée correcte
diff --git a/calendar/setup/phpgw_it.lang b/calendar/setup/phpgw_it.lang
index 0d13c8a577..e7bb58d197 100644
--- a/calendar/setup/phpgw_it.lang
+++ b/calendar/setup/phpgw_it.lang
@@ -5,32 +5,49 @@
 (for weekly)	calendar	it	(per settimana)
 (i/v)cal	calendar	it	(i/v)Cal
 1 match found	calendar	it	Trovata 1 occorrenza
-a	calendar	it	A
+<b>please note</b>: the calendar use the holidays of your country, which is set to %1. you can change it in your %2.<br />holidays are %3 automatic installed from %4. you can changed it in %5.	calendar	it	<b>Attenzione</b>: l'agenda usa le festività della tua nazione, che è impostata a %1. Puoi cambiarla in %2.<br />Le festività sono %3 automaticamente installate da %4. Puoi cambiarle  in %5.
+a	calendar	it	a
+a non blocking event will not conflict with other events	calendar	it	Un evento non bloccante non sarà in conflitto con altri eventi
 accept	calendar	it	Accetta
+accept or reject an invitation	calendar	it	Accetta o o rifiuta un invito
 accepted	calendar	it	Accettato
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	it	Azione che ha causato la notifica: Aggiunto, Cancellato, Accettato, Rifiutato, ...
+actions	calendar	it	Azioni
 add a single entry by passing the fields.	calendar	it	Aggiungi una singola voce compilando i campi
 add alarm	calendar	it	Aggiungi Allarme
 add contact	calendar	it	Aggiungi un Contatto
 add or update a single entry by passing the fields.	calendar	it	Aggiungi o aggiorna una singola voce compilando i campi.
 added	calendar	it	Aggiunto
 address book	calendar	it	Rubrica
-alarm	calendar	it	allarme
+after current date	calendar	it	Dopo la data attuale
+alarm	calendar	it	Sveglia
+alarm added	calendar	it	Sveglia aggiunta
+alarm deleted	calendar	it	Sveglia cancellata
 alarm for %1 at %2 in %3	calendar	it	Allarme per %1 a %2 in %3
 alarm management	calendar	it	Gestione Allarmi
 alarm-management	calendar	it	Gestione-Allarmi
 alarms	calendar	it	Allarmi
 all categories	calendar	it	Tutte le categorie
 all day	calendar	it	Tutto il giorno
+all events	calendar	it	Tutti gli eventi
+all participants	calendar	it	Tutti i partecipanti
+allows to edit the event again	calendar	it	Permette di modificare ancora l'evento
+apply the changes	calendar	it	apllica le modifiche
 are you sure you want to delete this country ?	calendar	it	Confermi la cancellazione di questa Nazione ?
 are you sure you want to delete this holiday ?	calendar	it	Sei sicuro di voler cancellare questa festività ?
 are you sure\nyou want to\ndelete these alarms?	calendar	it	Sei sicuro\ndi voler\ncancellare questo allarme ?
 are you sure\nyou want to\ndelete this entry ?	calendar	it	Sei sicuro\ndi voler\ncancellare questa voce ?
 are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	it	Sei sicuro di\nvoler cancellare\nquesta voce?\n\nQuesto comporterà la cancellazione\nper tutti gli utenti.
 are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	it	Confermi la cancellazione di questa singola voce?\n\nQuesto comporterà la cancellazione\nper tutti gli utenti
+back half a month	calendar	it	indietro metà mese
+back one month	calendar	it	indietro un mese
+before current date	calendar	it	Prima della data attuale
 before the event	calendar	it	prima dell'evento
+birthday	calendar	it	Compleanno
 brief description	calendar	it	Descrizione breve
 business	calendar	it	Business
+busy	calendar	it	occupato
+by	calendar	it	da
 calendar	common	it	Agenda
 calendar - [iv]cal importer	calendar	it	Agenda - Importazione [iv]Cal
 calendar - add	calendar	it	Agenda - Aggiungi
@@ -40,15 +57,22 @@ calendar holiday management	admin	it	Gestione Festivit
 calendar preferences	calendar	it	Preferenze Agenda
 calendar settings	admin	it	Impostazioni Agenda
 calendar-fieldname	calendar	it	Campi-Agenda
+can't add alarms in the past !!!	calendar	it	Non si può aggiungere sveglie nel passato !!!
 canceled	calendar	it	Cancellato
 change all events for $params['old_owner'] to $params['new_owner'].	calendar	it	Modifica tutti gli eventi per $params['old_owner'] a $params['new_owner'].
 change status	calendar	it	Cambia Stato
 charset of file	calendar	it	Charset del file
 click %1here%2 to return to the calendar.	calendar	it	Per ritornare all'agenda premi %1qui%2.
+close the window	calendar	it	Chiudi la finestra
+compose a mail to all participants after the event is saved	calendar	it	componi una email per tutti i partecipanti dopo che l'evento è stato salvato
 configuration	calendar	it	Configurazione
+copy of:	calendar	it	Copia di:
+copy this event	calendar	it	Copia questo evento
 countries	calendar	it	Nazioni
 country	calendar	it	Nazione
+create new links	calendar	it	Crea nuovi collegamenti
 created by	calendar	it	Creato da
+csv	calendar	it	CSV
 csv-fieldname	calendar	it	Campi-CSV
 csv-filename	calendar	it	Nomefile-CSV
 custom fields	calendar	it	Personalizza i Campi
@@ -56,6 +80,7 @@ custom fields and sorting	common	it	Personalizzazione e Ordinamento dei Campi
 daily	calendar	it	Giornaliero
 daily matrix view	calendar	it	Vista Matrice Giornaliera
 days	calendar	it	giorni
+days of the week for a weekly repeated event	calendar	it	Giorni della settimana per un evento con ricorrenza settimanale
 days repeated	calendar	it	giorni ripetuti
 dayview	calendar	it	Vista Giornaliera
 default appointment length (in minutes)	calendar	it	lunghezza predefinita degli appuntamenti (in minuti)
@@ -70,11 +95,16 @@ delete selected contacts	calendar	it	Cancella il contatto selezionato
 delete selected participants	calendar	it	Cancella i partecipanti selezionati
 delete series	calendar	it	Cancella serie
 delete single	calendar	it	Cancellazione singola
+delete this alarm	calendar	it	Cancella questa sveglia
+delete this event	calendar	it	Cancella questo evento
+delete this exception	calendar	it	Cancella questa eccezione
+delete this series of recuring events	calendar	it	Cancella questa serie di eventi ricorrenti
 deleted	calendar	it	Eliminato
 description	calendar	it	Descrizione
 determining window width ...	calendar	it	Determinazione larghezza finestra ...
 disable	calendar	it	Disabilita
 disabled	calendar	it	disabilitato
+disinvited	calendar	it	Disinvitato
 display interval in day view	calendar	it	Visualizza intervallo nella Vista Giornaliera
 display mini calendars when printing	calendar	it	Visualizza mini calendari quando stampi
 display status of events	calendar	it	Visualizza lo stato per gli Eventi
@@ -85,22 +115,34 @@ do you want to be notified about new or changed appointments? you be notified ab
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	it	Vuoi ricevere regolarmente il resoconto dei tuoi appuntamenti via e-mail?<br>Il resoconto sarà mandato al tuo indirizzo e-mail standard ogni mattina o ogni Lunedì per il resoconto settimanale.<br>Sarà mandato solo se avrai un appuntamento per quel giorno o per quella settimana.
 do you wish to autoload calendar holidays files dynamically?	admin	it	Vuoi caricare automaticamente nell'agenda i file con l'elenco delle festività?
 download	calendar	it	Download
+download this event as ical	calendar	it	Scarica questo evento come iCal
 duration	calendar	it	Durata
 duration of the meeting	calendar	it	Durata della riunione
 edit series	calendar	it	Modifica Serie
 edit single	calendar	it	Modifica Singolo
+edit this event	calendar	it	Modifica questo evento
+edit this series of recuring events	calendar	it	Modifica questa serie di eventi ricorrenti
 email notification	calendar	it	Notifica via e-mail
 email notification for %1	calendar	it	Notifica via e-mail %1
 empty for all	calendar	it	vuoto per tutti
 enable	calendar	it	Abilita
 enabled	calendar	it	abilitato
+end	calendar	it	Fine
 end date/time	calendar	it	Data/Ora finale
 enddate	calendar	it	Data-finale
 enddate / -time of the meeting, eg. for more then one day	calendar	it	Data/ora finale della riunione, es: per più di un giorno
+enddate of the export	calendar	it	Data finale dell'esportazione
 ends	calendar	it	finisce
 enter output filename: ( .vcs appended )	calendar	it	Inserisci il nome del file di destinazione
+error adding the alarm	calendar	it	Errore aggiungendo la sveglia
+error: saving the event !!!	calendar	it	Errore: durante il salvataggio dell'evento !!!
+event copied - the copy can now be edited	calendar	it	Evento copiato - la copia può ora essere modificata
+event deleted	calendar	it	Evento cancellato
 event details follow	calendar	it	Dettagli dell'evento
+event saved	calendar	it	Evento salvato
+event will occupy the whole day	calendar	it	L'evento occuperà l'intera giornata
 exceptions	calendar	it	Eccezioni
+existing links	calendar	it	Collegamenti esistenti
 export	calendar	it	Esporta
 export a list of entries in ical format.	calendar	it	Esporta una lista delle voci in formato iCal
 extended	calendar	it	Esteso
@@ -108,9 +150,15 @@ extended updates always include the complete event-details. ical's can be import
 external participants	calendar	it	Partecipanti Esterni
 failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	it	Invio messaggio a '%1' #%2 soggetto='%3', mittente='%4' fallito!!!
 fieldseparator	calendar	it	Separatore
+filename	calendar	it	Nome file
+filename of the download	calendar	it	Nome file del download
 find free timeslots where the marked participants are availible for the given timespan	calendar	it	Trova spazi liberi in cui i partecipanti selezionati sono disponibili per il periodo stabilito
+find free timeslots where the selected participants are availible for the given timespan	calendar	it	Trova spazi di tempo libero in cui tutti i partecipanti sono disponibili per il periodo stabilito
 firstname of person to notify	calendar	it	Nome della persona da avvisare
+for	calendar	it	per
 format of event updates	calendar	it	Formato degli aggiornamenti degli eventi
+forward half a month	calendar	it	avanti metà mese
+forward one month	calendar	it	avanti un mese
 fr	calendar	it	V
 free/busy	calendar	it	Libero/Occupato
 freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	it	libero/occupato: Utente '%1' sconosciuto, password errata o non disponibile agli utenti non loggati !!!
@@ -119,6 +167,7 @@ frequency	calendar	it	Frequenza
 fri	calendar	it	Ven
 full description	calendar	it	Descrizione completa
 fullname of person to notify	calendar	it	Nome completo della persona da avvisare
+general	calendar	it	Generale
 generate printer-friendly version	calendar	it	Genera versione stampabile
 global categories	calendar	it	Categorie Globali
 global public and group public	calendar	it	Pubblico Globale e Pubblico per il Gruppo
@@ -136,16 +185,18 @@ holidays	calendar	it	Festivit
 hours	calendar	it	ore
 how far to search (from startdate)	calendar	it	quanto lontano cercare (dalla data iniziale)
 i participate	calendar	it	Io Partecipo
+ical	calendar	it	iCal
 ical / rfc2445	calendar	it	iCal / rfc2445
+ical export	calendar	it	Esportazione iCal
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	it	Se selezionato la festività che ricorre nel weekend sarà spostata al lunedì successivo.
 if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	it	Se non stabilisci una password qui, l'informazione sarà disponibile a chiunque conosca l'URL!!!
-if you dont set a password here, the information is availible to everyone, who knows the url!!!	calendar	it	Se non imposti una password, le infomrazioni saranno disponibili a tutti coloro che conoscono l'URL!!!
 ignore conflict	calendar	it	Ignora Conflitto
 import	calendar	it	Importa
 import csv-file	common	it	Importa File-CSV
 interval	calendar	it	Intervallo
 intervals in day view	calendar	it	Intervallo nella Vista giornaliera
 intervals per day in planner view	calendar	it	Intervallo giornaliero nel pianificatore
+invalid email-address "%1" for user %2	calendar	it	Indirizzo email "%1" non valido per utente %2
 invalid entry id.	calendar	it	ID della voce non valido
 last	calendar	it	ultimo
 lastname of person to notify	calendar	it	Cognome della persona da avvisare
@@ -153,12 +204,16 @@ length shown<br>(emtpy for full length)	calendar	it	Lunghezza visiva<br>(vuoto p
 length<br>(<= 255)	calendar	it	Lunghezza<br>(<= 255)
 link	calendar	it	Link
 link to view the event	calendar	it	Link per visualizzare l'evento
+links	calendar	it	Collegamenti
+links, attachments	calendar	it	Collegamenti, Allegati
 list all categories.	calendar	it	Lista tutte le categorie.
+listview	calendar	it	Vista elenco
 load [iv]cal	calendar	it	Carica [iv]Cal
 location	calendar	it	Località
 location to autoload from	admin	it	Indirizzo da cui caricare automaticamente
+location, start- and endtimes, ...	calendar	it	Luogo, Inizio e Fine, ...
+mail all participants	calendar	it	Invia email a tutti i partecipanti
 make freebusy information available to not loged in persons?	calendar	it	Rendere disponibili le informazioni libero/occupato alle persone non loggate?
-make freebusy information availible to not loged in persons?	calendar	it	Rendi le informazioni di disponibilità alle persone non loggate?
 matrixview	calendar	it	Vista a Matrice
 minutes	calendar	it	minutes
 mo	calendar	it	L
@@ -175,11 +230,14 @@ new entry	calendar	it	Nuova Voce
 new name must not exist and not be empty!!!	calendar	it	I nuovi nomi devono esistere e non essere vuoti!!!
 new search with the above parameters	calendar	it	nuova ricerca con i parametri indicati sopra
 next day	calendar	it	giorno seguente
+no events found	calendar	it	Nessun evento trovato
 no filter	calendar	it	Nessun Filtro
 no matches found	calendar	it	Nessuna corrispondenza
 no response	calendar	it	Nessuna Risposta
+non blocking	calendar	it	non bloccante
 notification messages for added events	calendar	it	Messaggi di notifica per gli eventi aggiunti
 notification messages for canceled events	calendar	it	Messaggi di notifica per gli eventi cancellati
+notification messages for disinvited participants	calendar	it	Messaggi di notifica per i partecipanti disinvitati
 notification messages for modified events	calendar	it	Messaggi di notifica per gli eventi modificati
 notification messages for your alarms	calendar	it	Messaggi di notifica per i tuoi allarmi
 notification messages for your responses	calendar	it	Messaggi di notifica per le tue risposte
@@ -200,22 +258,26 @@ on time change of more than 4 hours too	calendar	it	anche sul cambio ora maggior
 one month	calendar	it	un mese
 one week	calendar	it	una settimana
 one year	calendar	it	un anno
+only the initial date of that recuring event is checked!	calendar	it	Solo la data iniziale di quel evento ricorrente è selezionata!
 open todo's:	calendar	it	ToDo Aperti:
-or enddate / -time	calendar	it	o data/ora finale
 order	calendar	it	Ordine
 overlap holiday	calendar	it	sovrapposizione di una festività
 participant	calendar	it	Partecipante
 participants	calendar	it	Partecipanti
-participates	calendar	it	partecipa
+participants disinvited from an event	calendar	it	Partecipanti disinvitati da un evento
+participants, resources, ...	calendar	it	Partecipanti, Risorse, ...
+participates	calendar	it	Partecipa
 password for not loged in users to your freebusy information?	calendar	it	Password per gli utenti non loggati sulle tue informazioni di disponibilità?
-people holiday	calendar	it	festività personale
+people holiday	calendar	it	festività personali
 permission denied	calendar	it	Permesso negato
 planner	calendar	it	Pianificatore
 planner by category	calendar	it	Pianificatore per categorie
 planner by user	calendar	it	Pianificatore per utente
 please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	it	Per favore conferma, accetta, rifiuta o esamina i cambiamenti della voce corrispondente nel tuo calendario
 please enter a filename !!!	calendar	it	Prego inserire un nome File !!!
+please note: you can configure the field assignments after you uploaded the file.	calendar	it	Attenzione: Puoi configurare il campo assegnazioni DOPO che hai caricato il file.
 preselected group for entering the planner	calendar	it	Gruppo predefinito per aggiunte al pianificatore
+previous	calendar	it	precedente
 previous day	calendar	it	giorno prededente
 print calendars in black & white	calendar	it	Stampa agende in bianco e nero
 print the mini calendars	calendar	it	Stampa la mini agenda
@@ -231,24 +293,33 @@ read this list of methods.	calendar	it	Leggi questa lista di metodi
 receive email updates	calendar	it	Ricevi aggiornamenti via e-mail
 receive extra information in event mails	calendar	it	Ricevi informazioni extra nell'e-mail dell'evento
 receive summary of appointments	calendar	it	Ricevi il resoconto degli appuntamenti
+recurrence	calendar	it	Ricorrenza
 recurring event	calendar	it	evento ricorrente
 refresh	calendar	it	Aggiorna
 reinstate	calendar	it	reinstanziare
 rejected	calendar	it	Rifiutato
 repeat day	calendar	it	Giorno ripetizione
+repeat days	calendar	it	Giorni di ripetizione
 repeat end date	calendar	it	Data ultima ripetizione
+repeat the event until which date (empty means unlimited)	calendar	it	ripeti l'evento fino a che data (vuoto significa illimitato)
 repeat type	calendar	it	Tipo di ripetizione
 repeating event information	calendar	it	Informazioni sugli eventi ricorrenti
+repeating interval, eg. 2 to repeat every second week	calendar	it	intervallo di ripetizione, es. 2 per ripetere ogni seconda settimana
 repetition	calendar	it	Ripetizione
 repetitiondetails (or empty)	calendar	it	Dettagli Ripetizione (o vuoto)
 reset	calendar	it	Reset
+resources	calendar	it	Risorse
 rule	calendar	it	Regola
 sa	calendar	it	Sa
 sat	calendar	it	Sab
+saves the changes made	calendar	it	salva le modifiche fatte
+saves the event ignoring the conflict	calendar	it	Salva l'evento ignorando il conflitto
 scheduling conflict	calendar	it	Conflitto di orario
 search results	calendar	it	Risultati Ricerca
 select a %1	calendar	it	Seleziona %1
 select a time	calendar	it	seleziona un'ora
+select resources	calendar	it	Seleziona risorse
+select who should get the alarm	calendar	it	Seleziona chi dovrà avere la sveglia
 selected contacts (%1)	calendar	it	Contatti selezionati (%1)
 send updates via email	common	it	Invia aggiornamenti via e-mail
 send/receive updates via email	calendar	it	Invia/Ricevi aggiornamenti via e-mail
@@ -276,12 +347,15 @@ sorry, this event does not exist	calendar	it	Spiacente, questo evento non esiste
 sorry, this event does not have exceptions defined	calendar	it	Spiacente, questo evento non ha eccezioni definite
 sort by	calendar	it	Ordina per
 specifies the the number of intervals shown in the planner view.	calendar	it	Specifica il numero di intervalli nel pianificatore
+start	calendar	it	Inizio
 start date/time	calendar	it	Data/Ora Inizio
 start- and enddates	calendar	it	Data Iniziale e Finale
 startdate	calendar	it	Data Inizio
 startdate / -time	calendar	it	Data/ora iniziale
 startdate and -time of the search	calendar	it	Data/ora iniziale della ricerca
+startdate of the export	calendar	it	Data iniziale dell'esportazione
 startrecord	calendar	it	Primo Record
+status changed	calendar	it	Stato modificato
 su	calendar	it	Do
 submit to repository	calendar	it	Invia all'archivio
 sun	calendar	it	Dom
@@ -299,6 +373,7 @@ this group that is preselected when you enter the planner. you can change it in
 this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	it	Questo è causato da un impostazione sbagliata del server SMTP. Avvisa l'Amministratore.
 this message is sent for canceled or deleted events.	calendar	it	Questo messaggio è inviato per gli eventi annullati o cancellati.
 this message is sent for modified or moved events.	calendar	it	Questo messaggio è inviato. per gli eventi modficiati o spostati.
+this message is sent to disinvited participants.	calendar	it	Questo messaggio viene inviato ai partecipanti disinvitati.
 this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	it	Questo messaggio è inviato ad ogni partecipante, che ha richiesto la notifica, all'evento da te creato.<br>Puoi usare certe variabili che sostituiranno dati dell'evento. La prima linea è l'oggetto dell'e-mail.
 this message is sent when you accept, tentative accept or reject an event.	calendar	it	Questo messaggio è inviato quando accetti, provi ad accettare, o rifiuti un evento.
 this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	it	Questo messaggio è inviato quando imposti un Allarme per certi eventi.  Include tutte le informazioni di cui hai bisogno.
@@ -321,13 +396,11 @@ today	calendar	it	Oggi
 translation	calendar	it	Traduzione
 tu	calendar	it	M
 tue	calendar	it	Mar
-two dayview	calendar	it	vista due giorni
-two weeks	calendar	it	due settimane
 update a single entry by passing the fields.	calendar	it	Aggiornamento di una singola voce compilando i campi
 updated	calendar	it	Modificato
 use end date	calendar	it	Usa data di termine
 use the selected time and close the popup	calendar	it	utilizza l'ora selezionata e chiudi popup
-view this entry	calendar	it	Visualizza questa voce
+view this event	calendar	it	Visualizza questo evento
 we	calendar	it	M
 wed	calendar	it	Mer
 week	calendar	it	Settimana
@@ -336,11 +409,12 @@ weekdays	calendar	it	Giorni settimanali
 weekdays to use in search	calendar	it	Giorni settimanali da usare per la ricerca
 weekly	calendar	it	Settimanale
 weekview	calendar	it	Vista Settimanale
-weekview including weekend	calendar	it	Vista settimanale con weekend
+weekview with weekend	calendar	it	Vista settimanale con weekend
 weekview without weekend	calendar	it	Vista settimanale senza weekend
 when creating new events default set to private	calendar	it	Quando vengono creati nuovi eventi settali automaticamente come privati
 which events do you want to see when you enter the calendar.	calendar	it	Quali eventi vuoi vedere quando entri nell'agenda.
 which of calendar view do you want to see, when you start calendar ?	calendar	it	Quale vista dell'agenda vuoi vedere quanto apri l'agenda?
+whole day	calendar	it	giornata intera
 wk	calendar	it	Sett
 work day ends on	calendar	it	La giornata lavorativa termina alle
 work day starts on	calendar	it	La giornata lavorativa inizia alle
@@ -356,6 +430,7 @@ you do not have permission to read this record!	calendar	it	Non hai l'autorizzaz
 you have %1 high priority events on your calendar today.	common	it	Oggi hai %1 eventi ad alta priorità nella tua agenda.
 you have 1 high priority event on your calendar today.	common	it	Oggi hai 1 evento a priorità alta nella tua agenda.
 you have a meeting scheduled for %1	calendar	it	Hai un meeting fissato alle %1
+you have been disinvited from the meeting at %1	calendar	it	Sei stato disinvitato dal meeting alle
 you have not entered a title	calendar	it	Non hai inserito alcun titolo
 you have not entered a valid date	calendar	it	Non hai inserito una data valida
 you have not entered a valid time of day	calendar	it	Non hai inserito un orario valido
diff --git a/calendar/setup/phpgw_nl.lang b/calendar/setup/phpgw_nl.lang
index 6c7f00b573..f57e7ae56a 100644
--- a/calendar/setup/phpgw_nl.lang
+++ b/calendar/setup/phpgw_nl.lang
@@ -5,34 +5,49 @@
 (for weekly)	calendar	nl	(voor wekelijks)
 (i/v)cal	calendar	nl	(i/v)Cal
 1 match found	calendar	nl	1 resultaat gevonden
+<b>please note</b>: the calendar use the holidays of your country, which is set to %1. you can change it in your %2.<br />holidays are %3 automatic installed from %4. you can changed it in %5.	calendar	nl	<b>Let op</b>: de agenda gebruikt de vrije dagen van uw land dat staat ingesteld op %1. U kunt dit wijzigen in uw %2.<br />Vrije dagen worden %3 automatisch geinstalleerd vanaf %4. U kunt dit wijzigen in %5.
 a	calendar	nl	a
+a non blocking event will not conflict with other events	calendar	nl	Een niet-blokkerende gebeurtenis zal geen conflicten met andere gebeurtenissen geven
 accept	calendar	nl	Accepteren
+accept or reject an invitation	calendar	nl	Accepteer of weiger een uitnodiging
 accepted	calendar	nl	Geaccepteerd
-action that caused the notify: added, canceled, accepted, rejected, ...	calendar	nl	Reden van de notificatie:Toegevoegd, Geannuleerd, Geaccepteerd, Geweigerd, ...
+action that caused the notify: added, canceled, accepted, rejected, ...	calendar	nl	Reden van de notificatie: Toegevoegd, Geannuleerd, Geaccepteerd, Geweigerd, ...
+actions	calendar	nl	Acties
 add a single entry by passing the fields.	calendar	nl	Een enkele afspraak toevoegen door de afzonderlijke velden in te voeren.
 add alarm	calendar	nl	Alarm toevoegen
 add contact	calendar	nl	Contact toevoegen
+add or update a single entry by passing the fields.	calendar	nl	Voeg een enkel veld toe of bewerk het door de velden door te geven.
 added	calendar	nl	Toegevoegd
 address book	calendar	nl	Adresboek
-alarm	calendar	nl	Alarm
-alarm for %1 at %2 in %3	calendar	nl	Alarm voor %1 op %2 in %3
-alarm management	calendar	nl	Alarmbeheer
-alarm-management	calendar	nl	Alarmbeheer
-alarms	calendar	nl	Alarms
+after current date	calendar	nl	Na de huidige datum
+alarm	calendar	nl	Herinnering
+alarm added	calendar	nl	Herinnering toegevoegd
+alarm deleted	calendar	nl	Herinnering verwijderd
+alarm for %1 at %2 in %3	calendar	nl	Herinnering voor %1 op %2 in %3
+alarm management	calendar	nl	Herinneringen beheer
+alarm-management	calendar	nl	Herinneringen beheer
+alarms	calendar	nl	Herinneringen
+all categories	calendar	nl	Alle categorieën
 all day	calendar	nl	Hele dag
+all events	calendar	nl	Alle gebeurtenissen
+all participants	calendar	nl	Alle deelnemers
+allows to edit the event again	calendar	nl	Staat toe om de gebeurtenis opnieuw te wijzigen
+apply the changes	calendar	nl	wijzigingen doorvoeren
 are you sure you want to delete this country ?	calendar	nl	Weet u zeker dat u dit land wilt verwijderen?
 are you sure you want to delete this holiday ?	calendar	nl	Weet u zeker dat u deze feestdag wilt verwijderen?
-are you sure\nyou want to\ndelete these alarms?	calendar	nl	Weet u zeker dat u deze alarms wilt verwijderen?
+are you sure\nyou want to\ndelete these alarms?	calendar	nl	Weet u zeker\n dat u deze\n waarschuwingen wilt verwijderen?
 are you sure\nyou want to\ndelete this entry ?	calendar	nl	Weet u zeker\n dat u deze\nafspraak wilt verwijderen?
 are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	nl	Weet u zeker\n dat u deze\nafspraak wilt verwijderen?\nDit zal de afspraak bij\nalle gebruikers verwijderen.
 are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	nl	Weet u zeker\n dat u deze enkele afpraak wilt verwijdere?\n\nDeze afspraak zal voor iedere gebruiker worden verwijderd.
-are you surenyou want tondelete these alarms?	calendar	nl	Weet u zeker dat u deze alarms wilt verwijderen?
-are you surenyou want tondelete this entry ?	calendar	nl	Weet u zeker\n dat u deze\nafspraak wilt verwijderen?
-are you surenyou want tondelete this entry ?nnthis will deletenthis entry for all users.	calendar	nl	Weet u zeker\n dat u deze\nafspraak wilt verwijderen?\nDit zal de afspraak bij\nalle gebruikers verwijderen.
-are you surenyou want tondelete this single occurence ?nnthis will deletenthis entry for all users.	calendar	nl	Weet u zeker\n dat u deze enkele afpraak wilt verwijdere?\n\nDeze afspraak zal voor iedere gebruiker worden verwijderd.
+back half a month	calendar	nl	halve maand terug
+back one month	calendar	nl	één maand terug
+before current date	calendar	nl	Voor de huidige datum
 before the event	calendar	nl	voor de afspraak
+birthday	calendar	nl	Verjaardag
 brief description	calendar	nl	Korte omschrijving
 business	calendar	nl	Bedrijf
+busy	calendar	nl	bezet
+by	calendar	nl	door
 calendar	common	nl	Agenda
 calendar - [iv]cal importer	calendar	nl	Agenda - [iv]Cal Importeren
 calendar - add	calendar	nl	Agenda - toevoegen
@@ -42,14 +57,21 @@ calendar holiday management	admin	nl	Agenda feestdagen beheer
 calendar preferences	calendar	nl	Agenda voorkeuren
 calendar settings	admin	nl	Agenda instellingen
 calendar-fieldname	calendar	nl	Agenda - Veldnaam
+can't add alarms in the past !!!	calendar	nl	Herinneringen kunnen niet in het verleden aangemaakt worden !!!
 canceled	calendar	nl	Geannuleerd
 change all events for $params['old_owner'] to $params['new_owner'].	calendar	nl	Alle afspraken wijzigen voor $params['oude_eigenaar'] naar $params['nieuwe_eigenaar'].
 change status	calendar	nl	Verander status
 charset of file	calendar	nl	Karakterset van bestand
-click %1here%2 to return to the calendar.	calendar	nl	Klik %1here%2 om terug te keren naar de agenda.
+click %1here%2 to return to the calendar.	calendar	nl	Klik %1hier%2 om terug te keren naar de agenda.
+close the window	calendar	nl	Venster sluiten
+common preferences	calendar	nl	Normale voorkeuren
+compose a mail to all participants after the event is saved	calendar	nl	stel een email aan alle deelnemers op nadat de gebeurtenis is opgeslagen
 configuration	calendar	nl	Configuratie
+copy of:	calendar	nl	Kopie van:
+copy this event	calendar	nl	Kopieer deze gebeurtenis
 countries	calendar	nl	Landen
 country	calendar	nl	Land
+create new links	calendar	nl	Nieuwe links aanmaken
 created by	calendar	nl	Aangemaakt door
 csv-fieldname	calendar	nl	CSV-veldnaam
 csv-filename	calendar	nl	CSV-bestandsnaam
@@ -58,46 +80,69 @@ custom fields and sorting	common	nl	Aangepaste velden en volgorde
 daily	calendar	nl	Dagelijks
 daily matrix view	calendar	nl	Dagelijks matrix overzicht
 days	calendar	nl	dagen
+days of the week for a weekly repeated event	calendar	nl	Dagen van de week voor een wekelijks herhalende gebeurtenis
 days repeated	calendar	nl	dagen herhaald
 dayview	calendar	nl	Dagweergave
 default appointment length (in minutes)	calendar	nl	standaard afspraakduur (in minuten)
 default calendar filter	calendar	nl	Standaard agendafilter
 default calendar view	calendar	nl	Standaard agendaoverzicht
 default length of newly created events. the length is in minutes, eg. 60 for 1 hour.	calendar	nl	Standaard lengte van nieuw aangemaakte afspraken. De lengte is in minuten, bijv. 60 voor 1 uur.
+default week view	calendar	nl	Standaard weekoverzicht
 defines the size in minutes of the lines in the day view.	calendar	nl	Standaard grootte in minutes van de regels in de dagelijkse weergave.
 delete a single entry by passing the id.	calendar	nl	Verwijder een enkele afspraak door het ID in te voeren
 delete an entire users calendar.	calendar	nl	Een complete gebruikersagenda verwijderen.
 delete selected contacts	calendar	nl	Geselecteerde contacten verwijderen
+delete selected participants	calendar	nl	Geselecteerde deelnemers verwijderen
 delete series	calendar	nl	Series verwijderen
 delete single	calendar	nl	Enkele verwijderen
-delete this entry ?	calendar	nl	Weet u zeker
+delete this alarm	calendar	nl	Deze herinnering verwijderen
+delete this event	calendar	nl	Deze gebeurtenis verwijderen
+delete this exception	calendar	nl	Deze uitzondering verwijderen
+delete this series of recuring events	calendar	nl	Deze serie herhalende gebeurtenissen verwijderen
 deleted	calendar	nl	Verwijderd
 description	calendar	nl	Omschrijving
+determining window width ...	calendar	nl	Vensterbreedte wordt berekend ...
 disable	calendar	nl	Deactiveer
 disabled	calendar	nl	gedeactiveerd
+disinvited	calendar	nl	Uitnodiging teruggetrokken
 display interval in day view	calendar	nl	Verdelingen in dagelijks overzicht
 display mini calendars when printing	calendar	nl	Mini kalenders tijdens het afdrukken
 display status of events	calendar	nl	Status van afspraken weergeven
+displayed view	calendar	nl	huidige  weergave
 displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	nl	Laat uw standaard agenda weergave zien op de startpagina (De pagina waarmee eGroupWare geopend wordt of die u krijgt als u op klikt op 'start'
-displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	nl	Geeft uw standaard agenda weer op de hoofdpagina
-do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	nl	Wilt u worden geïnformeerd over nieuwe of gewijzigde afspraken? U wordt geïnformeerd over wijzigingen die u zelf heeft gemaakt.<br/>U kunt de de notificaties beperken to alleen bepaalde wijzigingen. Elk item bevat alle notificaties hierboven weergegeven. "Alle wijzigingen" bevat wijziging va titel, beschrijving, deelnemers, maar niet reacties van deelnemers. Als de eigenaar van een afspraak verzocht heeft om een van de notificaties, zal hij of zij altijd reacties krijgen van de deelnemers zoals acceptaties en afwijzigingen.
-do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	nl	Wilt u per email een periodieke overzichten ontvangen van uw afspraken? </br>Het overzicht wordt verzonden naar uw standaard emailadres op de ochtend dat de afspraak plaatsvind en op maandag voor wekelijkse overzichten. <br/> Er wordt alleen een overzicht verstuurd als er in die afspraken staan geregistreerd.
+do you want a weekview with or without weekend?	calendar	nl	Wil je weekoverzicht met of zonder weekend?
+do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	nl	Wilt u worden geinformeerd over nieuwe of gewijzigde afspraken? U wordt geïnformeerd over wijzigingen die u zelf heeft gemaakt.<br />U kunt de de notificaties beperken to alleen bepaalde wijzigingen. Elk item bevat alle notificaties hierboven weergegeven. "Alle wijzigingen" bevat wijziging va titel, beschrijving, deelnemers, maar niet reacties van deelnemers. Als de eigenaar van een afspraak verzocht heeft om een van de notificaties, zal hij of zij altijd reacties krijgen van de deelnemers zoals acceptaties en afwijzigingen.
+do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	nl	Wilt u per email een periodieke overzichten ontvangen van uw afspraken? </br>Het overzicht wordt verzonden naar uw standaard emailadres op de ochtend dat de afspraak plaatsvind en op maandag voor wekelijkse overzichten. <br /> Er wordt alleen een overzicht verstuurd als er in die afspraken staan geregistreerd.
 do you wish to autoload calendar holidays files dynamically?	admin	nl	Wilt u de feestdagen automatisch downloaden
 download	calendar	nl	Downloaden
+download this event as ical	calendar	nl	Download deze gebeurtenis als iCal
 duration	calendar	nl	Duur
+duration of the meeting	calendar	nl	Duur van de bijeenkomst
 edit series	calendar	nl	Alles bewerken
 edit single	calendar	nl	Een bewerken
+edit this event	calendar	nl	Deze gebeurtenis bewerken
+edit this series of recuring events	calendar	nl	De hele reeks herhalende gebeurtenissen bewerken
 email notification	calendar	nl	Email Notificatie
 email notification for %1	calendar	nl	Email Notificatie voor %1
 empty for all	calendar	nl	leeg voor alle
 enable	calendar	nl	Activeren
 enabled	calendar	nl	Geactiveerd
+end	calendar	nl	Eind
 end date/time	calendar	nl	Einddatum/-tijd
 enddate	calendar	nl	Einddatum
+enddate / -time of the meeting, eg. for more then one day	calendar	nl	Einddatum / -tijd van de bijeenkomst, bijvoorbeeld voor langer dan één dag
+enddate of the export	calendar	nl	Einddatum van de export
 ends	calendar	nl	eindigt
 enter output filename: ( .vcs appended )	calendar	nl	Voer een bestandsnaam in om naartoe te schrijven (inclusief .vcs extentie)
+error adding the alarm	calendar	nl	Fout bij instellen van de herinnering
+error: saving the event !!!	calendar	nl	Fout: opslaan van de gebeurtenis !!!
+event copied - the copy can now be edited	calendar	nl	Gebeurtenis gekopieerd - de kopie kan nu bewerkt worden
+event deleted	calendar	nl	Gebeurtenis verwijderd
 event details follow	calendar	nl	Afspraak details volgen
+event saved	calendar	nl	Gebeurtenis opgeslagen
+event will occupy the whole day	calendar	nl	Gebeurtenis duurt de hele dag
 exceptions	calendar	nl	Uitzonderingen
+existing links	calendar	nl	Bestaande links
 export	calendar	nl	Exporteren
 export a list of entries in ical format.	calendar	nl	Een lijst met afspraken exporteren in iCal-formaat.
 extended	calendar	nl	Uitgebreid
@@ -105,14 +150,24 @@ extended updates always include the complete event-details. ical's can be import
 external participants	calendar	nl	Externe participanten
 failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	nl	Het versturen van een bericht naar '%1' #%2 onderwerp='%3', afzender='%4' is mislukt !!!
 fieldseparator	calendar	nl	Veldscheidingssymbool
+filename	calendar	nl	Bestandsnaam
+filename of the download	calendar	nl	Bestandsnaam van de download
+find free timeslots where the marked participants are availible for the given timespan	calendar	nl	Zoek naar vrije tijdstippen waarop de gemarkeerde deelnemers beschikbaar zijn binnen de opgegeven tijdsduur
+find free timeslots where the selected participants are availible for the given timespan	calendar	nl	Zoek vrije tijdstippen waarop de geselecteerde deelnemers beschikbaar zijn binnen de opgegeven tijdsduur
 firstname of person to notify	calendar	nl	Voornaam van persoon om te op de hoogte te brengen
+for	calendar	nl	voor
 format of event updates	calendar	nl	Formaat van afspraakbewerkingen
+forward half a month	calendar	nl	halve maand verder
+forward one month	calendar	nl	één maand verder
 fr	calendar	nl	Vr
 free/busy	calendar	nl	Vrij/Bezet
+freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	nl	Vrij/Bezet: onbekende gebruiker '%1', verkeerd wachtwoord of niet beschikbaar voor niet-ingelogde gebruikers!!!
+freetime search	calendar	nl	Beschikbare tijd opzoeken
 frequency	calendar	nl	Frequentie
 fri	calendar	nl	Vri
 full description	calendar	nl	Volledige omschrijving
 fullname of person to notify	calendar	nl	Volledige naam van persoon om te op de hoogte te brengen
+general	calendar	nl	Algemeen
 generate printer-friendly version	calendar	nl	Genereer printervriendelijke versie
 global categories	calendar	nl	Globale categorieën
 global public and group public	calendar	nl	Globaal publiek en group publiek
@@ -121,8 +176,6 @@ go!	calendar	nl	Uitvoeren!
 grant calendar access	common	nl	Geef agenda toegang
 group planner	calendar	nl	Groepsplanner
 group public only	calendar	nl	Alleen group publiek
-has been canceled	calendar	nl	is geanulleerd
-has been rescheduled to	calendar	nl	is verplaats naar
 here is your requested alarm.	calendar	nl	Hier is uw verzochte alarm.
 high priority	calendar	nl	hoge prioriteit
 holiday	calendar	nl	Vakantie
@@ -130,23 +183,37 @@ holiday management	calendar	nl	Feestdagenbeheer
 holiday-management	calendar	nl	Feestdagenbeheer
 holidays	calendar	nl	Vakanties
 hours	calendar	nl	uren
+how far to search (from startdate)	calendar	nl	hoe ver vooruit zoeken (vanaf de startdatum)
 i participate	calendar	nl	Ik doe mee
+ical	calendar	nl	iCal
 ical / rfc2445	calendar	nl	iCal / rfc2445
+ical export	calendar	nl	iCal export
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	nl	wanneer deze optie is geactiveerd zullen feestdagen die vallen in het weekend, genomen worden op de maandag daarna.
+if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	nl	Indien u hier geen wachtwoord instelt, is de informatie beschikbaar voor iedereen die de URL kent!!!
 ignore conflict	calendar	nl	Conflict negeren
 import	calendar	nl	Importeren
 import csv-file	common	nl	CSV-bstand importeren
 interval	calendar	nl	Herhaling
 intervals in day view	calendar	nl	Intervallen in dagelijke weergave
 intervals per day in planner view	calendar	nl	Intervallen per dag in planner weergave
+invalid email-address "%1" for user %2	calendar	nl	Ongeldig emailadres "%1" voor gebruiker %2
 invalid entry id.	calendar	nl	Ongeldige record-ID
 last	calendar	nl	laatste
 lastname of person to notify	calendar	nl	Achternaam van persoon om te op de hoogte te brengen
-length shown<br>(emtpy for full length)	calendar	nl	Lengte weergeven<br/>(leeg laten voor de volledige lengte)
-length<br>(<= 255)	calendar	nl	Lengte<br/>(<= 255)
+length shown<br>(emtpy for full length)	calendar	nl	Lengte weergeven<br />(leeg laten voor de volledige lengte)
+length<br>(<= 255)	calendar	nl	Lengte<br />(<= 255)
+link	calendar	nl	Link
+link to view the event	calendar	nl	Link om het evenement te bekijken
+links	calendar	nl	Links
+links, attachments	calendar	nl	Links, bijlagen
+list all categories.	calendar	nl	Lijst alle categorieën
+listview	calendar	nl	Lijstweergave
 load [iv]cal	calendar	nl	[iv]Cal laden
 location	calendar	nl	Plaats
 location to autoload from	admin	nl	Plaats om van te laden
+location, start- and endtimes, ...	calendar	nl	Plaats, start- en eindtijden
+mail all participants	calendar	nl	Stuur een email naar alle deelnemers
+make freebusy information available to not loged in persons?	calendar	nl	Maak vrij/bezet informatie beschikbaar voor nietingelogde personen?
 matrixview	calendar	nl	Matrixweergave
 minutes	calendar	nl	minuten
 mo	calendar	nl	Ma
@@ -158,14 +225,21 @@ monthly	calendar	nl	Maandelijks
 monthly (by date)	calendar	nl	Maandelijks (op datum)
 monthly (by day)	calendar	nl	Maandelijks (op dag)
 monthview	calendar	nl	Maandweergave
+needs javascript to be enabled !!!	calendar	nl	Vereist dat javascript is ingeschakeld !!!
 new entry	calendar	nl	Nieuwe afspraak
 new name must not exist and not be empty!!!	calendar	nl	Nieuwe naam niet reeds bestaan en mag niet leeg zijn!!!
+new search with the above parameters	calendar	nl	opnieuw zoeken met de bovenstaande instellingen
+next day	calendar	nl	volgende dag
+no events found	calendar	nl	Geen gebeurtenissen gevonden
+no filter	calendar	nl	Geen filter
 no matches found	calendar	nl	Geen resultaten gevonden
-no matches found.	calendar	nl	Geen resultaten gevonden
 no response	calendar	nl	Geen Antwoord
-notification messages for added events	calendar	nl	Notificatieberichten voor toegevoegde afsrpaken
-notification messages for canceled events	calendar	nl	Notificatieberichten voor geannuleerde afsrpaken
-notification messages for modified events	calendar	nl	Notificatieberichten voor gewijzigde afsrpaken
+non blocking	calendar	nl	niet blokkerend
+not	calendar	nl	niet
+notification messages for added events	calendar	nl	Notificatieberichten voor toegevoegde afspraken
+notification messages for canceled events	calendar	nl	Notificatieberichten voor geannuleerde afspraken
+notification messages for disinvited participants	calendar	nl	Notificatieberichten voor deelnemers waarvan de uitnodiging is ingetrokken
+notification messages for modified events	calendar	nl	Notificatieberichten voor gewijzigde afspraken
 notification messages for your alarms	calendar	nl	Notificatieberichten voor uw alarms
 notification messages for your responses	calendar	nl	Notificatieberichten voor uw reacties
 number of intervals per day in planner view	calendar	nl	Aantal items per dag in planner overzicht
@@ -176,27 +250,37 @@ occurence	calendar	nl	Gebeurtenis
 old startdate	calendar	nl	Oude startdatum
 olddate	calendar	nl	OudeDatum
 on %1 %2 %3 your meeting request for %4	calendar	nl	Op %1 %2 %3 uw afspraak aanvraag voor %4
-on all changes	calendar	nl	op alle wijzigingen
-on all modification, but responses	calendar	nl	op alle wijzigingen, behalve reacties
-on any time change too	calendar	nl	op iedere tijd ook wijzigen
-on invitation / cancelation only	calendar	nl	op uitnodiging / alleen annulering
-on participant responses too	calendar	nl	ook op deelnemerreacties
-on time change of more than 4 hours too	calendar	nl	ook op tijdswijziging van meer dan 4 uur
+on all changes	calendar	nl	bij alle wijzigingen
+on all modification, but responses	calendar	nl	bij alle wijzigingen, behalve reacties
+on any time change too	calendar	nl	ook bij iedere wijziging van tijdstip
+on invitation / cancelation only	calendar	nl	alleen bij uitnodiging / annulering
+on participant responses too	calendar	nl	ook bij deelnemerreacties
+on time change of more than 4 hours too	calendar	nl	ook bij tijdswijziging van meer dan 4 uur
+one month	calendar	nl	één maand
+one week	calendar	nl	één week
+one year	calendar	nl	één jaar
+only the initial date of that recuring event is checked!	calendar	nl	Alleen de startdatum van die terugkerende gebeurtenis is gecontroleerd!
 open todo's:	calendar	nl	Openstaande taken:
 order	calendar	nl	Volgorde
 overlap holiday	calendar	nl	vakantie overlapt
 participant	calendar	nl	Deelnemer
 participants	calendar	nl	Deelnemers
-participates	calendar	nl	Deelnemen
+participants disinvited from an event	calendar	nl	Deelnemers waarvan de uitnodiging is ingetrokken
+participants, resources, ...	calendar	nl	Deelnemers, hulpmiddelen, ...
+participates	calendar	nl	Neemt deel aan
+password for not loged in users to your freebusy information?	calendar	nl	Wachtwoord voor niet-ingelogde gebruiker voor jouw vrij/bezet informatie?
 people holiday	calendar	nl	mensen vakantie
 permission denied	calendar	nl	Toegang geweigerd
 planner	calendar	nl	Planner
 planner by category	calendar	nl	Planner per categorie
 planner by user	calendar	nl	Planner per gebruiker
 please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	nl	Wilt u de afspraak in uw agenda bevestigen, accepteren, weigeren of bijken.
-preselected group for entering the planner	calendar	nl	Geselecteerde groep bij het openen van de planner
+please enter a filename !!!	calendar	nl	vul s.v.p. een bestandsnaam in!!!
+preselected group for entering the planner	calendar	nl	Voorgeselecteerde groep bij het openen van de planner
+previous	calendar	nl	vorige
+previous day	calendar	nl	vorige dag
 print calendars in black & white	calendar	nl	Kalenders in zwart/wit afdrukken
-print the mini calendars	calendar	nl	Print minikalenders
+print the mini calendars	calendar	nl	Minikalenders afdrukken
 printer friendly	calendar	nl	Afdrukvriendelijk
 privat	calendar	nl	Privé
 private and global public	calendar	nl	Privé en globaal publiek
@@ -209,22 +293,33 @@ read this list of methods.	calendar	nl	Lees deze lijst met methodes.
 receive email updates	calendar	nl	Ontvang email updates
 receive extra information in event mails	calendar	nl	Ontvang extra informatie in afspraak berichten
 receive summary of appointments	calendar	nl	Ontvang overzicht van afspraken
-recurring event	calendar	nl	terugkerende afsrpaak
+recurrence	calendar	nl	Terugkeren
+recurring event	calendar	nl	terugkerende afspraak
 refresh	calendar	nl	Verversen
 reinstate	calendar	nl	Opnieuw in gebruik nemen
 rejected	calendar	nl	Afgewezen
 repeat day	calendar	nl	Dag herhalen
+repeat days	calendar	nl	Dagen herhalen
 repeat end date	calendar	nl	Einddatum herhalingspatroon
+repeat the event until which date (empty means unlimited)	calendar	nl	tot welke datum de gebeurtenis herhalen (leeg betekent onbeperkt)
 repeat type	calendar	nl	Herhalingstype
 repeating event information	calendar	nl	Afspraak herhalings informatie
+repeating interval, eg. 2 to repeat every second week	calendar	nl	herhalingsinterval, bijvoorbeeld 2 herhaalt iedere tweede week
 repetition	calendar	nl	Herhalingspatroon
 repetitiondetails (or empty)	calendar	nl	Details herhaling (of leeg laten)
 reset	calendar	nl	Herstel
+resources	calendar	nl	Hulpmiddelen
 rule	calendar	nl	Regel
 sa	calendar	nl	Za
 sat	calendar	nl	Zat
+saves the changes made	calendar	nl	bewaar de aangebrachte wijzigingen
+saves the event ignoring the conflict	calendar	nl	Bewaart de gebeurtenis en negeert het conflict
 scheduling conflict	calendar	nl	Afspraak conflict
 search results	calendar	nl	Zoekresultaten
+select a %1	calendar	nl	Selecteer een %1
+select a time	calendar	nl	selecteer een tijd
+select resources	calendar	nl	Selecteer hulpmiddelen
+select who should get the alarm	calendar	nl	Selecteer wie de herinnering moet ontvangen
 selected contacts (%1)	calendar	nl	Geselecteerde contacten (%1)
 send updates via email	common	nl	Zend aanpassingen via e-mail
 send/receive updates via email	calendar	nl	Zend/ontvang aanpassingen via e-mail
@@ -232,6 +327,7 @@ set a year only for one-time / non-regular holidays.	calendar	nl	Stel een een ja
 set new events to private	calendar	nl	Zet nieuwe afspraken op privé
 should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	nl	Moeten uitnodigingen die u heeft afgewezen nog steeds worden weergegeven in uw agenda? <br/> U kunt ze alleen achteraf nog accepteren als ze in uw agenda worden weergegeven! (bijv. wanneer een planningsconflict is verwijderd)
 should new events created as private by default ?	calendar	nl	Moeten nieuwe afspraken standaard als privé worden aangemaakt?
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	nl	Moeten niet-ingelogde personen jouw vrij/bezet informatie kunnen bekijken? Je kunt een extra wachtwoord instellen dat afwijkt van je normale wachtwoord, om deze informatie af te beveiligen. De vrij/bezet informatie is in iCal formaat en bevat uitsluitend de tijdstippen waarop je bezet bent. Het bevat niet de naam, omschrijving of locatie van de afspraak. De URL naar jouw vrij/bezet informatie is %1.
 should the mini calendars by printed / displayed in the printer friendly views ?	calendar	nl	Moeten de minikalenders worden weergegeven en geprint in de printervriendelijke weergaves?
 should the printer friendly view be in black & white or in color (as in normal view)?	calendar	nl	Moeten de printervriendelijke weergaves in kleur of in zwart wit worden weergegeven?
 should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	nl	Moet de status van de afspraak-deelnemers (accepteren, afwijzen, ...) worden weergegeven tussen haakjes achter elke de namen van de deelnemers?
@@ -240,16 +336,27 @@ show default view on main screen	calendar	nl	Geeft standaard overzicht weer op b
 show high priority events on main screen	calendar	nl	Evenementen met hoge prioriteit weergeven op hoofdscherm
 show invitations you rejected	calendar	nl	Uitnodigingen weergeven die zijn afgewezen
 show list of upcoming events	calendar	nl	Lijst weergeven van toekomstige afspraken
+show next seven days	calendar	nl	Toon volgende zeven dagen
+show only one day	calendar	nl	Toon slechts één dag
+show the calendar of multiple users	calendar	nl	toon de agenda van meerdere personen
+show this month	calendar	nl	toon deze maand
+show this week	calendar	nl	toon deze week
 single event	calendar	nl	enkele afspraak
+site configuration	calendar	nl	site configuratie
 sorry, the owner has just deleted this event	calendar	nl	Sorry, de eigenaar heeft deze afspraak zojuist verwijderd
 sorry, this event does not exist	calendar	nl	Excuses, deze afspraak bestaat niet
 sorry, this event does not have exceptions defined	calendar	nl	Excuses, deze afspraak heeft geen uitzonderingen gedefinieerd.
 sort by	calendar	nl	Sorteren op
-specifies the the number of intervals shown in the planner view.	calendar	nl	Specificeerd het aantal intervallen die worden weergegeven in de plannerweergave
+specifies the the number of intervals shown in the planner view.	calendar	nl	Specificeert het aantal in de plannerweergave getoonde intervallen.
+start	calendar	nl	Start
 start date/time	calendar	nl	Startdatum/ -tijd
 start- and enddates	calendar	nl	Start- en einddata
 startdate	calendar	nl	Startdatum
+startdate / -time	calendar	nl	Startdatum / -tijd
+startdate and -time of the search	calendar	nl	Startdatum en -tijd van de zoekopdracht
+startdate of the export	calendar	nl	Startdatum van de export
 startrecord	calendar	nl	Startregel
+status changed	calendar	nl	Status gewijzigd
 su	calendar	nl	Zo
 submit to repository	calendar	nl	Naar repository inzenden
 sun	calendar	nl	Zon
@@ -259,21 +366,26 @@ text	calendar	nl	Tekst
 th	calendar	nl	Do
 the following conflicts with the suggested time:<ul>%1</ul>	calendar	nl	Het volgende levert een conflict op met de voorgestelde tijd:<ul>%1</ul>
 the user %1 is not participating in this event!	calendar	nl	De gebruiker %1 neemt niet deel aan deze afspraak!
-there was an error trying to connect to your news server.<br>please contact your admin to check the news servername, username or password.	calendar	nl	Er was een probleem tijdens de verbinding met de news server.<br>Neem contact op met de beheerder om de servernaam, gebruikersnaam en wachtwoord te controleren.
+there was an error trying to connect to your news server.<br>please contact your admin to check the news servername, username or password.	calendar	nl	Er was een probleem tijdens de verbinding met de news server.<br />Neem contact op met de beheerder om de servernaam, gebruikersnaam en wachtwoord te controleren.
 this day is shown as first day in the week or month view.	calendar	nl	Deze dag wordt weergegeven als de eerste dag in de week- and maandweergave.
-this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	nl	Dit definieerd het einde van uw dagweergave. Afspraken die na deze tijd plaatsvinden worden  onderaan de dagweergave weergegeven.
-this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	nl	Dit definieerd het begin van uw dagweergave. Afspraken die voor deze tijd plaatsvinden worden boven de dagweergave weergegeven.
+this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	nl	Dit definieert het einde van uw dagweergave. Afspraken die na deze tijd plaatsvinden worden  onderaan de dagweergave weergegeven.
+this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	nl	Dit definieert het begin van uw dagweergave. Afspraken die voor deze tijd plaatsvinden worden boven de dagweergave weergegeven.<br />Deze tijd wordt ook gebruikt als standaard starttijd voor nieuwe afspraken.
 this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	calendar	nl	Deze groep is voorgeselecteerd wanneer u de planner opent. U kunt deze selectie in de planner eventueel wijzigen.
 this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	nl	Dit wordt meestal veroorzaakt door een verkeerd geconfigureerde SMTP-server. Waarschuw uw systeembeheerder.
 this message is sent for canceled or deleted events.	calendar	nl	Deze notificatie wordt verstuurd voor geannuleerde en verwijderde afspraken.
 this message is sent for modified or moved events.	calendar	nl	Deze notificatie wordt verstuurd voor gewijzigde afspraken.
-this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	nl	Deze notificatie wordt verstuurd naar elke deelnemer van uw afspraken die notificatie voor nieuwe afspraken heeft geactiveerd.<br/> U kunt bepaalde plaatsvervangende woorden invullen  die worden gebruikt met de gegevens van de afspraak. De eerste regel is het onderwerp van de email.
-this message is sent when you accept, tentative accept or reject an event.	calendar	nl	Deze notificatie wordt verstuurd wanneer uw afspraken accepteerd, op proef accepteerd of afwijst.
-this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	nl	Deze notificatie wordt verstuur als u een alarm instelt voor een bepaalde afspraak. Geef aan welke informatie u mogelijker nodig heeft.
+this message is sent to disinvited participants.	calendar	nl	Deze notificatie wordt verstuurd aan deelnemers waarvan de uitnodiging is ingetrokken.
+this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	nl	Deze notificatie wordt verstuurd naar elke deelnemer van uw afspraken die notificatie voor nieuwe afspraken heeft geactiveerd.<br /> U kunt bepaalde plaatsvervangende woorden invullen  die worden gebruikt met de gegevens van de afspraak. De eerste regel is het onderwerp van de email.
+this message is sent when you accept, tentative accept or reject an event.	calendar	nl	Deze notificatie wordt verstuurd wanneer u afspraken accepteert, op proef accepteert of afwijst.
+this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	nl	Deze notificatie wordt verstuurd als u een alarm instelt voor een bepaalde afspraak. Geef aan welke informatie u mogelijker nodig heeft.
 this month	calendar	nl	Deze maand
 this week	calendar	nl	Deze week
 this year	calendar	nl	Dit jaar
+three month	calendar	nl	drie maanden
 thu	calendar	nl	Don
+til	calendar	nl	tot
+timeframe	calendar	nl	Tijdskader
+timeframe to search	calendar	nl	Tijdskader om te zoeken
 title	calendar	nl	Titel
 title of the event	calendar	nl	Titel van afspraak
 title-row	calendar	nl	Regeltitel
@@ -285,23 +397,30 @@ today	calendar	nl	Vandaag
 translation	calendar	nl	Vertaling
 tu	calendar	nl	Di
 tue	calendar	nl	Din
+two weeks	calendar	nl	twee weken
 update a single entry by passing the fields.	calendar	nl	Werk een enkele afspraak bij door de afzonderlijke velden in te voeren.
 updated	calendar	nl	Bijgewerkt
 use end date	calendar	nl	Gebruik einddatum
-view this entry	calendar	nl	Deze afspraak bekijken
+use the selected time and close the popup	calendar	nl	gebruik de geselecteerde tijd en sluit het popupvenster
+view this event	calendar	nl	Bekijk deze gebeurtenis
 we	calendar	nl	Wo
 wed	calendar	nl	Woe
 week	calendar	nl	Week
 weekday starts on	calendar	nl	De week begint op
+weekdays	calendar	nl	Weekdagen
+weekdays to use in search	calendar	nl	Weekdagen waarop gezocht moet worden
 weekly	calendar	nl	wekelijks
 weekview	calendar	nl	Weekweergave
-when creating new events default set to private	calendar	nl	Nieuwe afspraken standaard op prive zetten
+weekview with weekend	calendar	nl	weekweergave met weekend
+weekview without weekend	calendar	nl	weekweergave zonder weekend
+when creating new events default set to private	calendar	nl	Nieuwe afspraken standaard op privé zetten
 which events do you want to see when you enter the calendar.	calendar	nl	Welke afspraken wilt u zien wanneer u de agenda opent?
 which of calendar view do you want to see, when you start calendar ?	calendar	nl	Welke agendaweergave wilt u zien wanneer u de agenda opent?
+whole day	calendar	nl	hele dag
+wk	calendar	nl	Wk
 work day ends on	calendar	nl	Werkdag eindigt om
 work day starts on	calendar	nl	Werkdag begint om
 workdayends	calendar	nl	werkdag eindigt
-year	calendar	nl	Jaar
 yearly	calendar	nl	Jaarlijks
 yearview	calendar	nl	Jaarweergave
 you can either set a year or a occurence, not both !!!	calendar	nl	U kunt of een Jaar of een Gebeurtenis in, niet beide !!!
@@ -312,19 +431,15 @@ you do not have permission to enable/disable this alarm !!!	calendar	nl	U heeft
 you do not have permission to read this record!	calendar	nl	U heeft geen toegang om dit record in te lezen
 you have %1 high priority events on your calendar today.	common	nl	U hebt vandaag %1 afspraken met hoge prioriteit op uw agenda staan.
 you have 1 high priority event on your calendar today.	common	nl	U hebt vandaag 1 afspraak met hoge prioriteit op uw agenda staan.
-you have a meeting scheduled for	calendar	nl	U heeft een afspraak om
 you have a meeting scheduled for %1	calendar	nl	U heeft een vergadering gepland voor %1
+you have been disinvited from the meeting at %1	calendar	nl	Uw uitnodiging voor de bijeenkomst op %1 is ingetrokken
 you have not entered a title	calendar	nl	U heeft geen titel opgegeven
 you have not entered a valid date	calendar	nl	U heeft geen geldige datum opgegeven
 you have not entered a valid time of day	calendar	nl	U heeft geen geldige tijd opgegeven
-you have not entered a\nbrief description	calendar	nl	U hebt geen korte\nomschrijving ingevoerd
-you have not entered a\nvalid time of day.	calendar	nl	U hebt geen geldige\n tijd ingevoerd
 you have not entered participants	calendar	nl	U heeft geen deelnemers opgegeven
 you must enter one or more search keywords	calendar	nl	U moet een of meer zoektermen invoeren
 you must select a [iv]cal. (*.[iv]cs)	calendar	nl	U moet een iCal of vCal selecteren (*.ics of *.vcs)
 you need to set either a day or a occurence !!!	calendar	nl	U moet of een Dag  of een Gebeurtenis instellen !!!
-your meeting scheduled for	calendar	nl	Uw afspraak op
 your meeting scheduled for %1 has been canceled	calendar	nl	U geplande vergadering voor %1 is geannuleerd.
-your meeting that had been scheduled for	calendar	nl	Uw afspraak die was op
 your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	nl	Uw vergadering die stond gepland voor %1 is opnieuw ingepland naar %2
 your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries:	calendar	nl	Uw opgegeven tijd (%1 - %2) levert een conflict op met de volgende afspraken:
diff --git a/calendar/setup/phpgw_no.lang b/calendar/setup/phpgw_no.lang
index d413daf13c..477abd0d69 100644
--- a/calendar/setup/phpgw_no.lang
+++ b/calendar/setup/phpgw_no.lang
@@ -5,32 +5,48 @@
 (for weekly)	calendar	no	(for Ukentlig)
 (i/v)cal	calendar	no	(i/v)Kal
 1 match found	calendar	no	1 treff funnet
+<b>please note</b>: the calendar use the holidays of your country, which is set to %1. you can change it in your %2.<br />holidays are %3 automatic installed from %4. you can changed it in %5.	calendar	no	<b>Vennligst bemerk</b>: Kalenderen bruker helligdager for ditt land som er satt til %1.  Du kan endre dette i ditt %2.<b/>Helligdager er %3 automatisk lagt til for %4.  Du kan endre dette til %5.
 a	calendar	no	a
+a non blocking event will not conflict with other events	calendar	no	En hendelse som ikke blokkerer vil ikke være i konflikt med andre hendelser
 accept	calendar	no	Godta
+accept or reject an invitation	calendar	no	Aksepter eller avslå invitasjonen
 accepted	calendar	no	Godtatt
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	no	Handling som utløste denne meldingen: Lagt til, Kansellert, Akseptert, Avslått, ...
-add a single entry by passing the fields.	calendar	no	Llegg til en enkel oppføring ved å hoppe over feltene.
+actions	calendar	no	Aksjoner
+add a single entry by passing the fields.	calendar	no	Legg til en enkel oppføring ved å hoppe over feltene.
 add alarm	calendar	no	Legg til alarm
 add contact	calendar	no	Legg til kontakt
 add or update a single entry by passing the fields.	calendar	no	Legg til eller oppdater en enkel oppføring ved å hoppe over feltene.
 added	calendar	no	Lagt til
 address book	calendar	no	Adresseliste
+after current date	calendar	no	Etter inneværende dato
 alarm	calendar	no	Alarm
+alarm added	calendar	no	Alarm lagt til
+alarm deleted	calendar	no	Alarm slettet
 alarm for %1 at %2 in %3	calendar	no	Alarm for %1 ved %2 i %3
 alarm management	calendar	no	Alarm Styring
 alarm-management	calendar	no	Alarm-Styring
 alarms	calendar	no	Alarmer
 all categories	calendar	no	Alle kategorier
 all day	calendar	no	Hele Dagen
+all events	calendar	no	Alle hendelser
+all participants	calendar	no	Alle deltagere
+allows to edit the event again	calendar	no	Tillate endring av alarmen
+apply the changes	calendar	no	Oppdater endringene
 are you sure you want to delete this country ?	calendar	no	Er du sikker på at du vil slette dette landet?
 are you sure you want to delete this holiday ?	calendar	no	Er du sikker på at du vil slette denne ferien?
 are you sure\nyou want to\ndelete these alarms?	calendar	no	Er du sikker\npå at du vil\nslette disse alarmene?
 are you sure\nyou want to\ndelete this entry ?	calendar	no	Er dy sikker\npå at du vil\nslette denne oppføringen?
 are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	no	Er du sikker\npå at du vil\nslette denne oppføringen?\n\nDette sletter oppføringen\nfor alle brukere.
 are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	no	Er du sikker\npå at du vil slette\ndenne enkle oppføringen?\n\nDette sletter oppføringen\nfor alle brukere.
+back half a month	calendar	no	Tilbake en halv mnd.
+back one month	calendar	no	Tilbake en mnd.
+before current date	calendar	no	For inneværende dato
 before the event	calendar	no	før hendelsen
 brief description	calendar	no	Kort beskrivelse
 business	calendar	no	Arbeid
+busy	calendar	no	Opptatt
+by	calendar	no	av
 calendar	common	no	Kalender
 calendar - [iv]cal importer	calendar	no	Kalender - [iv}Kal Importer
 calendar - add	calendar	no	Kalender - Legg til
@@ -40,14 +56,20 @@ calendar holiday management	admin	no	Kalender Feriestyring
 calendar preferences	calendar	no	Kalender Preferanser
 calendar settings	admin	no	Kalender Innstillinger
 calendar-fieldname	calendar	no	Kalender-Feltnavn
+can't add alarms in the past !!!	calendar	no	Kan ikke legge til alarmer for passerte hendelser!
 canceled	calendar	no	Annullert
 change all events for $params['old_owner'] to $params['new_owner'].	calendar	no	Endre alle hendelser for $params['old_owner'] til $parame['new_owner'].
 change status	calendar	no	Forandre Status
 charset of file	calendar	no	Karaktersett i fil
 click %1here%2 to return to the calendar.	calendar	no	Klikk %1her%2 for å returnere til kalenderen.
+close the window	calendar	no	Lukk vinduet
+compose a mail to all participants after the event is saved	calendar	no	Komponer en mail til alle deltagere etter at hendelsen er lagret
 configuration	calendar	no	Konfigurasjon
+copy of:	calendar	no	Kopi av:
+copy this event	calendar	no	Kopier denne hendelsen
 countries	calendar	no	Land
 country	calendar	no	Land
+create new links	calendar	no	Opprett ny lenke
 created by	calendar	no	Opprettet av
 csv-fieldname	calendar	no	CSV-Feltnavn
 csv-filename	calendar	no	CSV-Filnavn
@@ -56,6 +78,7 @@ custom fields and sorting	common	no	Egendefinerte felt og sortering
 daily	calendar	no	Daglig
 daily matrix view	calendar	no	Daglig matrisevisning
 days	calendar	no	dager
+days of the week for a weekly repeated event	calendar	no	Ukedag for ukentlig repeterende hendelser
 days repeated	calendar	no	dager gjentatt
 dayview	calendar	no	Dagvisning
 default appointment length (in minutes)	calendar	no	standard avtalelengde (i minutter)
@@ -70,11 +93,16 @@ delete selected contacts	calendar	no	Slett valgte kontakter
 delete selected participants	calendar	no	Slett valgte deltagere
 delete series	calendar	no	Slett en serie
 delete single	calendar	no	Slett enkel
+delete this alarm	calendar	no	Slett denne alarmen
+delete this event	calendar	no	Slett denne hendelsen
+delete this exception	calendar	no	Slett dette unntaket
+delete this series of recuring events	calendar	no	Slett serie med repeterende hendelser
 deleted	calendar	no	Slettet
 description	calendar	no	Beskrivelse
 determining window width ...	calendar	no	Bestemmer vindusbredde...
 disable	calendar	no	Koble ut
 disabled	calendar	no	utkoblet
+disinvited	calendar	no	Ikke lenger invitert
 display interval in day view	calendar	no	Vis intervall i dagvisning
 display mini calendars when printing	calendar	no	Vis små kalendere når man printer
 display status of events	calendar	no	Vis Status av Hending
@@ -85,22 +113,34 @@ do you want to be notified about new or changed appointments? you be notified ab
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	no	Ønsker du å motta regelmessige sammendrag av dine avtaler via e-post?<br>Oppsummeringen vil bli sendt til din standard e-post adresse på morgenen samme dag, eller på mandager for ukentlige sammendrag.<br>Den vil bare bli sendt når du har en avtale den dagen eller uken.
 do you wish to autoload calendar holidays files dynamically?	admin	no	Ønsker du å automatisk laste kalenderferiefiler?
 download	calendar	no	Last ned
+download this event as ical	calendar	no	Last ned denne hendelsen som iCal
 duration	calendar	no	Varighet
 duration of the meeting	calendar	no	Varighet av møtet
 edit series	calendar	no	Redigere Serie
 edit single	calendar	no	Redigere Enkel
+edit this event	calendar	no	Endre hendelse
+edit this series of recuring events	calendar	no	Endre denne serien med repeterende hendelser
 email notification	calendar	no	E-post Varsel
 email notification for %1	calendar	no	E-post Varsel for %1
 empty for all	calendar	no	tøm for alle
 enable	calendar	no	Koble inn
 enabled	calendar	no	innkoblet
+end	calendar	no	Slutt
 end date/time	calendar	no	Slutt Dato/Tid
 enddate	calendar	no	Sluttdato
 enddate / -time of the meeting, eg. for more then one day	calendar	no	Sluttdato / - tid for møtet, dersom mere enn en dag.
+enddate of the export	calendar	no	Sluttdato for eksport
 ends	calendar	no	slutter
 enter output filename: ( .vcs appended )	calendar	no	Skriv inn utgående filnavn: (.vcs tilføyes)
+error adding the alarm	calendar	no	Feil ved forsøk på å sette alarm
+error: saving the event !!!	calendar	no	Feil ved forsøk på lagring av hendelse!
+event copied - the copy can now be edited	calendar	no	Hendelse kopiert - kopien kan nå endres
+event deleted	calendar	no	Hendelse slettet
 event details follow	calendar	no	Hendelses Detaljer Følger
+event saved	calendar	no	Hendelse lagret
+event will occupy the whole day	calendar	no	Hendelse opptar hele dagen
 exceptions	calendar	no	Unntak
+existing links	calendar	no	Eksisterende lenker
 export	calendar	no	Eksporter
 export a list of entries in ical format.	calendar	no	Eksporter en liste over oppføringer som iCal format.
 extended	calendar	no	Forlenget
@@ -108,9 +148,15 @@ extended updates always include the complete event-details. ical's can be import
 external participants	calendar	no	Eksterne deltagere
 failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	no	Feil ved sending av melding til '%1' #2 emne='%3', avsender='%4' !!!
 fieldseparator	calendar	no	Feltseperator
+filename	calendar	no	Filnavn
+filename of the download	calendar	no	Filnavn for nedlastingen
 find free timeslots where the marked participants are availible for the given timespan	calendar	no	Finn frie tidspunkter hvor de valgte deltagerne er tilgjengelige for angitt varighet
+find free timeslots where the selected participants are availible for the given timespan	calendar	no	Finn frie tidssoner hvor de valgte deltagerne er tilgjengelig for angitt varighet.
 firstname of person to notify	calendar	no	Fornavn til person som skal varsles
+for	calendar	no	for
 format of event updates	calendar	no	Format på hendelsesoppdateringer
+forward half a month	calendar	no	Forover en halv mnd.
+forward one month	calendar	no	Forover en mnd.
 fr	calendar	no	F
 free/busy	calendar	no	Ledig/Opptatt
 freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	no	Ledig/opptatt: Ukjent bruker '%1', feil passord eller ikke tilgjengelig når du ikke er innlogget !!!
@@ -119,6 +165,7 @@ frequency	calendar	no	Hvor ofte
 fri	calendar	no	Fre
 full description	calendar	no	Full beskrivelse
 fullname of person to notify	calendar	no	Hele navnet til person som skal varsles
+general	calendar	no	Generell
 generate printer-friendly version	calendar	no	Generer printer-vennlig versjon
 global categories	calendar	no	Globale kategorier
 global public and group public	calendar	no	Global offentlig og gruppe offentlig
@@ -136,6 +183,7 @@ holidays	calendar	no	Ferier
 hours	calendar	no	timer
 how far to search (from startdate)	calendar	no	Hvor langt skal det søkes (fra startdato)
 i participate	calendar	no	Jeg deltar
+ical	calendar	no	iCal
 ical / rfc2445	calendar	no	iCal / rfc2445
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	no	Hvis merket ferie faller på en helg, blir den tatt mandagen etter.
 if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	no	Dersom du ikke setter et passord her vil informasjonen være tilgjengelig for alle som kjenner nettadressen !
@@ -145,6 +193,7 @@ import csv-file	common	no	Importer CSV-Fil
 interval	calendar	no	Intervall
 intervals in day view	calendar	no	Intervaller i dagvisning
 intervals per day in planner view	calendar	no	Intervaller per dag i planleggervisning
+invalid email-address "%1" for user %2	calendar	no	Feil e-mailadresse "%1" for bruker %2
 invalid entry id.	calendar	no	Feil oppføringsidentifikasjon
 last	calendar	no	siste
 lastname of person to notify	calendar	no	Etternavn til person som skal varsles
@@ -152,10 +201,15 @@ length shown<br>(emtpy for full length)	calendar	no	Lengde vist<br>(tom for full
 length<br>(<= 255)	calendar	no	Lengde<br>(<=255)
 link	calendar	no	Lenke
 link to view the event	calendar	no	Lenke til hendelse
+links	calendar	no	Lenker
+links, attachments	calendar	no	Lenker, tillegg
 list all categories.	calendar	no	Vis alle kategorier.
+listview	calendar	no	Listevisning
 load [iv]cal	calendar	no	Last [iv]Cal
 location	calendar	no	Lokasjon
 location to autoload from	admin	no	Lokasjon å automatisk laste fra
+location, start- and endtimes, ...	calendar	no	Lokasjon, start- og sluttid,...
+mail all participants	calendar	no	Send e-mail til deltagerne
 make freebusy information available to not loged in persons?	calendar	no	Skal informasjon om ledig/opptatt være tilgjengelig for personer som ikke er pålogget ?
 matrixview	calendar	no	Matrisevisning
 minutes	calendar	no	minutter
@@ -176,8 +230,10 @@ next day	calendar	no	neste dag
 no filter	calendar	no	uten filter
 no matches found	calendar	no	Ingen treff funnet
 no response	calendar	no	Ingen Respons
+non blocking	calendar	no	Ikke blokkerende
 notification messages for added events	calendar	no	Varslingsmeldinger for tillagte hendelser
 notification messages for canceled events	calendar	no	Varslingsmeldinger for avbrutte hendelser
+notification messages for disinvited participants	calendar	no	Varslingsmeldinger for avmeldte deltagere
 notification messages for modified events	calendar	no	Varslingsmeldinger for endrede hendelser
 notification messages for your alarms	calendar	no	Varslingsmeldinger for dine alarmer
 notification messages for your responses	calendar	no	Varslingsmeldinger for dine responser
@@ -200,11 +256,12 @@ one week	calendar	no	en uke
 one year	calendar	no	et år
 only the initial date of that recuring event is checked!	calendar	no	Bare startdato for den repeterende handlingen blir kontrollert !
 open todo's:	calendar	no	Åpne gjøremål liste:
-or enddate / -time	calendar	no	eller sluttdato / -tid
 order	calendar	no	Bestill
 overlap holiday	calendar	no	overlapp ferie
 participant	calendar	no	Deltaker
 participants	calendar	no	Deltakere
+participants disinvited from an event	calendar	no	Deltagere avmeldt fra en hendelse
+participants, resources, ...	calendar	no	Deltagere, ressurser,....
 participates	calendar	no	Deltar
 password for not loged in users to your freebusy information?	calendar	no	Passord for ikke påloggede brukere til din freebusy informasjon?
 people holiday	calendar	no	personer ferie
@@ -215,7 +272,8 @@ planner by user	calendar	no	Planlegger for bruker
 please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	no	Vennligst bekreft, godta, avslå eller etterse endringer i den korresponderende oppføringen i din kalender
 please enter a filename !!!	calendar	no	Vennligst angi et filnavn !!!
 preselected group for entering the planner	calendar	no	Forhåndsvelg gruppe når du starter planlegger
-previous day	calendar	no	foregående dag
+previous	calendar	no	Foregående
+previous day	calendar	no	Foregående dag
 print calendars in black & white	calendar	no	Skriv ut kalendere i svart/hvit
 print the mini calendars	calendar	no	Skriv ut de små kalenderne
 printer friendly	calendar	no	Printer Vennlig
@@ -230,24 +288,33 @@ read this list of methods.	calendar	no	Les denne listen av metoder.
 receive email updates	calendar	no	Motta e-post oppdateringer
 receive extra information in event mails	calendar	no	Motta ekstra informasjon i hendelses e-post
 receive summary of appointments	calendar	no	Motta et sammendrag av avtaler
+recurrence	calendar	no	Repeterende
 recurring event	calendar	no	periodisk oppføring
 refresh	calendar	no	Oppdater
 reinstate	calendar	no	Sett inn på ny
 rejected	calendar	no	Avslått
 repeat day	calendar	no	Gjenta dag
+repeat days	calendar	no	Repeterende dag
 repeat end date	calendar	no	Gjenta sluttdato
+repeat the event until which date (empty means unlimited)	calendar	no	Repeter hendelse til hvilken dato (tom setter ingen grense)
 repeat type	calendar	no	Gjenta type
 repeating event information	calendar	no	Gjenta oppføringsinformasjon
+repeating interval, eg. 2 to repeat every second week	calendar	no	Repeterende interval, feks. 2 for hver annen uke
 repetition	calendar	no	Gjentakelse
 repetitiondetails (or empty)	calendar	no	Repitasjonsdetaljer (eller tom)
 reset	calendar	no	Tilbakestill
+resources	calendar	no	Ressurser
 rule	calendar	no	Regel
 sa	calendar	no	Lø
 sat	calendar	no	Lør
+saves the changes made	calendar	no	Lagre endringene
+saves the event ignoring the conflict	calendar	no	Lagre hendelse uten hensyn til konflikt
 scheduling conflict	calendar	no	Planleggingskonflikt
 search results	calendar	no	Søkeresultater
 select a %1	calendar	no	Velg en %1
 select a time	calendar	no	velg en tid
+select resources	calendar	no	Velg ressurser
+select who should get the alarm	calendar	no	Velg hvem som skal motta alarmen
 selected contacts (%1)	calendar	no	Velg kontakter (%1)
 send updates via email	common	no	Send oppdateringer via e-post
 send/receive updates via email	calendar	no	Send/Motta oppdateringer via e-post
@@ -275,12 +342,15 @@ sorry, this event does not exist	calendar	no	Beklager, denne oppf
 sorry, this event does not have exceptions defined	calendar	no	Beklager, denne oppføringen har ingen unntak definert
 sort by	calendar	no	Sorter etter
 specifies the the number of intervals shown in the planner view.	calendar	no	Spesifiserer antall intervaller som er vist i planlegger visning.
+start	calendar	no	Start
 start date/time	calendar	no	Start Dato/Tid
 start- and enddates	calendar	no	Start- og Slutt-dato
 startdate	calendar	no	Startdato
 startdate / -time	calendar	no	Startdato /-tid
 startdate and -time of the search	calendar	no	Startdato og -tid i søket
+startdate of the export	calendar	no	Startdato for eksport
 startrecord	calendar	no	Startrekke
+status changed	calendar	no	Status endret
 su	calendar	no	Sø
 submit to repository	calendar	no	Send til Arkiv
 sun	calendar	no	Søn
@@ -298,6 +368,7 @@ this group that is preselected when you enter the planner. you can change it in
 this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	no	Dette er normalt forårsaket av en feil konfigurert SMTP gjener. Meld fra til din administrator.
 this message is sent for canceled or deleted events.	calendar	no	Denne meldingen blir sent for kansellerte eller slettede oppføringer.
 this message is sent for modified or moved events.	calendar	no	Denne meldingen er sendt for endrede eller flyttede oppføringer
+this message is sent to disinvited participants.	calendar	no	Denne meldingen er til avmeldte deltagere.
 this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	no	Denne meldingen blir sendt til alle deltakere på denne oppføringen som du er eier av, som har bedt om en varsling om nye oppføringer.<br>Du kan bruke forskjellige alternativer som blir byttet med innholdet i denne oppføringen. Den første linjen er overskriften av e-posten.
 this message is sent when you accept, tentative accept or reject an event.	calendar	no	Denne meldingen blir sendt når du godtar, forsøksvis godtar, eller avslår en oppføring.
 this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	no	Denne meldingen blir sendt når du har satt en Alarm for en spesiell oppføring. Inkluder all den informasjonen du trenger.
@@ -320,13 +391,11 @@ today	calendar	no	Idag
 translation	calendar	no	Oversettelse
 tu	calendar	no	T
 tue	calendar	no	Tir
-two dayview	calendar	no	to dager
-two weeks	calendar	no	to uker
 update a single entry by passing the fields.	calendar	no	oppdater en enkel oppføring ved å hoppe over feltene
 updated	calendar	no	Oppdatert
 use end date	calendar	no	Bruk sluttdato
 use the selected time and close the popup	calendar	no	bruk valgt tid og lukk popup-vinduet
-view this entry	calendar	no	Vis denne oppføringen
+view this event	calendar	no	Vis denne hendelsen
 we	calendar	no	O
 wed	calendar	no	Ons
 week	calendar	no	Uke
@@ -335,11 +404,12 @@ weekdays	calendar	no	Ukedager
 weekdays to use in search	calendar	no	Ukedager som skal benyttes i søk
 weekly	calendar	no	Ukentlig
 weekview	calendar	no	Ukevisning
-weekview including weekend	calendar	no	Ukevisning inkl. helg
+weekview with weekend	calendar	no	Ukevisning inkl. helg
 weekview without weekend	calendar	no	Ukevisning eksl. helg
 when creating new events default set to private	calendar	no	Når du lager en ny oppføring, sett den som standard til privat
 which events do you want to see when you enter the calendar.	calendar	no	Hvilke oppføringer du ønsker å se når du starter kalenderen.
 which of calendar view do you want to see, when you start calendar ?	calendar	no	Hvilke kalendervisning ønsker du å se når du starter kalenderen?
+whole day	calendar	no	Hele dagen
 wk	calendar	no	Uke
 work day ends on	calendar	no	Arbeidsdagen ender på
 work day starts on	calendar	no	Arbeidsdagen starter på
@@ -355,6 +425,7 @@ you do not have permission to read this record!	calendar	no	Du har ikke tilgang
 you have %1 high priority events on your calendar today.	common	no	Du har %1 høy prioritets oppføring i din kalender i dag.
 you have 1 high priority event on your calendar today.	common	no	Du har 1 høy prioritets oppføring i din kalender i dag.
 you have a meeting scheduled for %1	calendar	no	Du har ett møte planlagt for %1
+you have been disinvited from the meeting at %1	calendar	no	Du har blitt avmeldt fra møtet den %1
 you have not entered a title	calendar	no	Du har ikke skrevet inn en tittel
 you have not entered a valid date	calendar	no	Du har ikke skrevet inn en gyldig dato
 you have not entered a valid time of day	calendar	no	Du har ikke skrevet inn ett gyldig tidspunkt på dagen
diff --git a/calendar/setup/phpgw_zh-tw.lang b/calendar/setup/phpgw_zh-tw.lang
new file mode 100644
index 0000000000..05bc8e4ba4
--- /dev/null
+++ b/calendar/setup/phpgw_zh-tw.lang
@@ -0,0 +1,367 @@
+%1 %2 in %3	calendar	zh-tw	在%3的%1 %2
+%1 matches found	calendar	zh-tw	共有 %1 筆資料符�
+%1 records imported	calendar	zh-tw	%1 筆資料匯入
+%1 records read (not yet imported, you may go back and uncheck test import)	calendar	zh-tw	讀�了%1筆資料(還沒匯入，您必須回到上一�並且�消圈�匯入測試)
+(for weekly)	calendar	zh-tw	（�週）
+(i/v)cal	calendar	zh-tw	(i/v)Cal
+1 match found	calendar	zh-tw	共有 1 筆資料符�
+a	calendar	zh-tw	一
+accept	calendar	zh-tw	接�
+accepted	calendar	zh-tw	已接�
+action that caused the notify: added, canceled, accepted, rejected, ...	calendar	zh-tw	需��醒的�作：新增��消�接��拒絕�...
+add a single entry by passing the fields.	calendar	zh-tw	�據這個項目建立一個複本
+add alarm	calendar	zh-tw	新增警示
+add contact	calendar	zh-tw	新增�繫
+add or update a single entry by passing the fields.	calendar	zh-tw	��傳�欄�來新增或更新一筆記錄
+added	calendar	zh-tw	新增日期
+address book	calendar	zh-tw	通訊錄
+alarm	calendar	zh-tw	警告
+alarm for %1 at %2 in %3	calendar	zh-tw	在%3的%1 中 %2警告
+alarm management	calendar	zh-tw	警示管�
+alarm-management	calendar	zh-tw	警告管�員
+alarms	calendar	zh-tw	警告
+all categories	calendar	zh-tw	所有類別
+all day	calendar	zh-tw	所有日期
+are you sure you want to delete this country ?	calendar	zh-tw	您確定�移除這個國家嗎？
+are you sure you want to delete this holiday ?	calendar	zh-tw	您確定�移除這個�日嗎？
+are you sure\nyou want to\ndelete these alarms?	calendar	zh-tw	您確定\n�刪除\n這些�醒？
+are you sure\nyou want to\ndelete this entry ?	calendar	zh-tw	您確定�移除\n這筆資料嗎？
+are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	zh-tw	您確定�移除這筆資料嗎？\n所有使用者的資料將一併移除。
+are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	zh-tw	您確定\n您�刪除這個期間？\n\n這將會\n刪除所有使用者的相�事件。
+before the event	calendar	zh-tw	事件之�
+brief description	calendar	zh-tw	簡短敘述
+business	calendar	zh-tw	商務
+calendar	common	zh-tw	行事曆
+calendar - [iv]cal importer	calendar	zh-tw	Calendar - [iv]Cal Importer
+calendar - add	calendar	zh-tw	行事曆 - 新增
+calendar - edit	calendar	zh-tw	行事曆 - 編輯
+calendar event	calendar	zh-tw	日曆事件
+calendar holiday management	admin	zh-tw	行事曆�日管�
+calendar preferences	calendar	zh-tw	行事曆喜好設定
+calendar settings	admin	zh-tw	設定行事曆
+calendar-fieldname	calendar	zh-tw	行事曆欄��稱
+canceled	calendar	zh-tw	�消
+change all events for $params['old_owner'] to $params['new_owner'].	calendar	zh-tw	改變所有$params['old_owner']的事件給$params['new_owner']。
+change status	calendar	zh-tw	修改狀態
+charset of file	calendar	zh-tw	檔案字元編碼
+click %1here%2 to return to the calendar.	calendar	zh-tw	點� %1這裡%2 回到行事曆
+configuration	calendar	zh-tw	設定
+countries	calendar	zh-tw	國家
+country	calendar	zh-tw	國家
+created by	calendar	zh-tw	建立者
+csv-fieldname	calendar	zh-tw	CSV-欄��稱
+csv-filename	calendar	zh-tw	CSV-檔案�稱
+custom fields	calendar	zh-tw	自訂欄�
+custom fields and sorting	common	zh-tw	自訂欄�與排�
+daily	calendar	zh-tw	�日
+daily matrix view	calendar	zh-tw	�日陣列檢視模�
+days	calendar	zh-tw	æ—¥
+days repeated	calendar	zh-tw	日�覆
+dayview	calendar	zh-tw	日行事曆
+default appointment length (in minutes)	calendar	zh-tw	�設會議時間長度(分�)
+default calendar filter	calendar	zh-tw	�設行事曆�濾器
+default calendar view	calendar	zh-tw	�設行事曆檢視模�
+default length of newly created events. the length is in minutes, eg. 60 for 1 hour.	calendar	zh-tw	�設建立事件的長度(分�)，�設為60=1�時。
+default week view	calendar	zh-tw	�設週曆模�
+defines the size in minutes of the lines in the day view.	calendar	zh-tw	定義行事曆�覽時�個時段的分�數
+delete a single entry by passing the id.	calendar	zh-tw	刪除這個事件並且略�這個ID
+delete an entire users calendar.	calendar	zh-tw	刪除整個使用者的行事曆
+delete selected contacts	calendar	zh-tw	刪除�繫
+delete selected participants	calendar	zh-tw	刪除�與者
+delete series	calendar	zh-tw	刪除連鎖項目
+delete single	calendar	zh-tw	刪除單一項目
+deleted	calendar	zh-tw	刪除日期
+description	calendar	zh-tw	�述
+determining window width ...	calendar	zh-tw	�測視窗寬度...
+disable	calendar	zh-tw	�用
+disabled	calendar	zh-tw	�用
+display interval in day view	calendar	zh-tw	�日顯示的間隔
+display mini calendars when printing	calendar	zh-tw	列�時顯示�行事曆
+display status of events	calendar	zh-tw	顯示事件的狀態
+displayed view	calendar	zh-tw	已顯示模�
+displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	zh-tw	顯示您�設的行事曆�覽模�在啟始�(您登入egroupWare第一個看到或是按下您的首�按鈕的��)
+do you want a weekview with or without weekend?	calendar	zh-tw	您是�希望週曆包�週末？
+do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	zh-tw	您希望系統在約會新增或是修改時主動�醒您嗎？您也會收到包括您自己更新的通知。<br>您�以�制系統��醒確定的修改。�個項目包�它以上的清單。所有的修改包括標題��述��與者的改變，但是�包括�與者的回應。如果事件的�有者�求任何�醒，他會收到�與者接�或是拒絕的回應。
+do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	zh-tw	您希望定期��電�郵件收到系統自動寄出的約會通知概�嗎？<br>這個概�會在�天早上寄出�日概�或是�個星期一寄出�週概�。<br>它�會在那一天或是那一週有約會時寄出。
+do you wish to autoload calendar holidays files dynamically?	admin	zh-tw	您希望動態新增行事曆的�日嗎？
+download	calendar	zh-tw	下載
+duration	calendar	zh-tw	期間
+duration of the meeting	calendar	zh-tw	會議期間
+edit series	calendar	zh-tw	編輯全系列約會
+edit single	calendar	zh-tw	編輯單一約會
+email notification	calendar	zh-tw	電�郵件�醒
+email notification for %1	calendar	zh-tw	%1的電�郵件�醒
+empty for all	calendar	zh-tw	全部空白
+enable	calendar	zh-tw	啟用
+enabled	calendar	zh-tw	啟用
+end date/time	calendar	zh-tw	��日期時間
+enddate	calendar	zh-tw	��日期
+enddate / -time of the meeting, eg. for more then one day	calendar	zh-tw	��日期 / 會議的時間，例如超�一天的會議
+ends	calendar	zh-tw	��日期
+enter output filename: ( .vcs appended )	calendar	zh-tw	輸入輸出檔�：(記得加上副檔�.vcs)
+event details follow	calendar	zh-tw	事件細節
+exceptions	calendar	zh-tw	例外
+export	calendar	zh-tw	匯出
+export a list of entries in ical format.	calendar	zh-tw	匯出事件清單�為iCal格�
+extended	calendar	zh-tw	延伸的
+extended updates always include the complete event-details. ical's can be imported by certain other calendar-applications.	calendar	zh-tw	延伸的更新包�完整的事件細節，iCal格��以被其他行事曆軟體讀�。
+external participants	calendar	zh-tw	外部�與者
+failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	zh-tw	無法傳�尋給'%1'#%2 標題='%3'，傳�者='%4'�
+fieldseparator	calendar	zh-tw	欄�分隔字元
+find free timeslots where the marked participants are availible for the given timespan	calendar	zh-tw	找尋指定人員的行程是�有空檔
+firstname of person to notify	calendar	zh-tw	需�通知的人�
+format of event updates	calendar	zh-tw	事件更新的格�
+fr	calendar	zh-tw	五
+free/busy	calendar	zh-tw	有空/忙錄
+freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	zh-tw	狀態：�知�的使用者'%1'，錯誤的密碼或是目�無法登入�
+freetime search	calendar	zh-tw	時間空檔查詢
+frequency	calendar	zh-tw	頻率
+fri	calendar	zh-tw	五
+full description	calendar	zh-tw	完整敘述
+fullname of person to notify	calendar	zh-tw	需�通知的全�
+generate printer-friendly version	calendar	zh-tw	產生�善列�版本
+global categories	calendar	zh-tw	全域類別
+global public and group public	calendar	zh-tw	全�公用�群組公用
+global public only	calendar	zh-tw	全�公用
+go!	calendar	zh-tw	出發�
+grant calendar access	common	zh-tw	管�行事曆權�
+group planner	calendar	zh-tw	群組計畫
+group public only	calendar	zh-tw	群組公用
+here is your requested alarm.	calendar	zh-tw	這是您�求的�醒。
+high priority	calendar	zh-tw	高優先權
+holiday	calendar	zh-tw	�日
+holiday management	calendar	zh-tw	�日管�
+holiday-management	calendar	zh-tw	�日管�
+holidays	calendar	zh-tw	�日
+hours	calendar	zh-tw	�時
+how far to search (from startdate)	calendar	zh-tw	�尋的期間(從開始日期)
+i participate	calendar	zh-tw	我��與
+ical / rfc2445	calendar	zh-tw	iCal / rfc2445
+if checked holidays falling on a weekend, are taken on the monday after.	calendar	zh-tw	如果�擇的�日剛好是週末，系統會自動移到星期一。
+if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	zh-tw	如果您在此並未設定密碼，知�網�的人就能夠讀�。
+ignore conflict	calendar	zh-tw	忽略�疊的約會
+import	calendar	zh-tw	匯入
+import csv-file	common	zh-tw	匯入CSV逗點分隔檔案
+interval	calendar	zh-tw	é–“éš”
+intervals in day view	calendar	zh-tw	�日�覽的間隔
+intervals per day in planner view	calendar	zh-tw	在計畫�覽模�的間隔日數
+invalid entry id.	calendar	zh-tw	錯誤的事件ID。
+last	calendar	zh-tw	最後
+lastname of person to notify	calendar	zh-tw	��醒的人�(姓)
+length shown<br>(emtpy for full length)	calendar	zh-tw	顯示長度<br>(空白代表完整長度)
+length<br>(<= 255)	calendar	zh-tw	長度<br>(<=255)
+link	calendar	zh-tw	連�
+link to view the event	calendar	zh-tw	事件連�
+list all categories.	calendar	zh-tw	顯示所有分類
+load [iv]cal	calendar	zh-tw	Load [iv]Cal
+location	calendar	zh-tw	約會�置
+location to autoload from	admin	zh-tw	自動讀�的�置
+make freebusy information available to not loged in persons?	calendar	zh-tw	將行程資訊開放給未登入的人？
+matrixview	calendar	zh-tw	基礎�覽
+minutes	calendar	zh-tw	分�
+mo	calendar	zh-tw	一
+modified	calendar	zh-tw	修改日期
+modify list of external participants	calendar	zh-tw	外部�與者的修改清單
+mon	calendar	zh-tw	一
+month	calendar	zh-tw	月
+monthly	calendar	zh-tw	�月
+monthly (by date)	calendar	zh-tw	�月（以日期計）
+monthly (by day)	calendar	zh-tw	�月（以天數計）
+monthview	calendar	zh-tw	月行事曆
+needs javascript to be enabled !!!	calendar	zh-tw	您必須啟用�覽器的javascript功能
+new entry	calendar	zh-tw	新增資料
+new name must not exist and not be empty!!!	calendar	zh-tw	新的�稱必須未存在或是�能夠空白�
+new search with the above parameters	calendar	zh-tw	��上�的�數從新�尋
+next day	calendar	zh-tw	下一天
+no filter	calendar	zh-tw	沒有�則
+no matches found	calendar	zh-tw	沒有找到符�的�果
+no response	calendar	zh-tw	沒有回應
+notification messages for added events	calendar	zh-tw	新增事件�醒
+notification messages for canceled events	calendar	zh-tw	�消事件�醒
+notification messages for modified events	calendar	zh-tw	修改事件�醒
+notification messages for your alarms	calendar	zh-tw	您的通知事件�醒
+notification messages for your responses	calendar	zh-tw	您的回覆事件�醒
+number of intervals per day in planner view	calendar	zh-tw	在計畫�覽模�下的間隔日數
+number of months	calendar	zh-tw	月數
+number of records to read (%1)	calendar	zh-tw	讀�的資料筆數(%1)
+observance rule	calendar	zh-tw	�循�則
+occurence	calendar	zh-tw	期間
+old startdate	calendar	zh-tw	舊的開始日期
+olddate	calendar	zh-tw	舊的日期
+on %1 %2 %3 your meeting request for %4	calendar	zh-tw	在 %1 %2 %3 有 %4 的約會
+on all changes	calendar	zh-tw	所有改變
+on all modification, but responses	calendar	zh-tw	所有修改，除了回應
+on any time change too	calendar	zh-tw	任何時間改變
+on invitation / cancelation only	calendar	zh-tw	�有邀請與�消
+on participant responses too	calendar	zh-tw	�與者回應時
+on time change of more than 4 hours too	calendar	zh-tw	在改變超�四�時後
+one month	calendar	zh-tw	一個月
+one week	calendar	zh-tw	一星期
+one year	calendar	zh-tw	一年
+only the initial date of that recuring event is checked!	calendar	zh-tw	�有���複事件的�始日期�
+open todo's:	calendar	zh-tw	未完�的待辦事項
+or enddate / -time	calendar	zh-tw	或��日期 / 時間
+order	calendar	zh-tw	順�
+overlap holiday	calendar	zh-tw	�疊的�日
+participant	calendar	zh-tw	與會者
+participants	calendar	zh-tw	與會者
+participates	calendar	zh-tw	�與
+password for not loged in users to your freebusy information?	calendar	zh-tw	讓未登入使用者檢視您有空或是忙碌的密碼？
+people holiday	calendar	zh-tw	�日
+permission denied	calendar	zh-tw	拒絕存�
+planner	calendar	zh-tw	計畫者
+planner by category	calendar	zh-tw	類別計畫者
+planner by user	calendar	zh-tw	使用者計畫者
+please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	zh-tw	請確�����拒絕或是檢查您的行事曆中相�的事件異動
+please enter a filename !!!	calendar	zh-tw	請輸入檔案�稱�
+preselected group for entering the planner	calendar	zh-tw	進入計畫管�的�設群組
+previous day	calendar	zh-tw	�一天
+print calendars in black & white	calendar	zh-tw	使用單色列�
+print the mini calendars	calendar	zh-tw	列�迷你行事曆
+printer friendly	calendar	zh-tw	�善列�
+privat	calendar	zh-tw	�人的
+private and global public	calendar	zh-tw	�人�全�公用
+private and group public	calendar	zh-tw	�人�群組公用
+private only	calendar	zh-tw	�人
+re-edit event	calendar	zh-tw	�新編輯約會
+read a list of entries.	calendar	zh-tw	讀�事件列表
+read a single entry by passing the id and fieldlist.	calendar	zh-tw	從傳�的ID與欄�清單讀�單一事件
+read this list of methods.	calendar	zh-tw	讀�這個方法的列表
+receive email updates	calendar	zh-tw	接收更新郵件�醒
+receive extra information in event mails	calendar	zh-tw	在事件�醒郵件中接收�外的資訊
+receive summary of appointments	calendar	zh-tw	接收約會概�
+recurring event	calendar	zh-tw	循環事件
+refresh	calendar	zh-tw	�新整�
+reinstate	calendar	zh-tw	復原
+rejected	calendar	zh-tw	拒絕
+repeat day	calendar	zh-tw	�覆天數
+repeat end date	calendar	zh-tw	�覆��日期
+repeat type	calendar	zh-tw	�覆類型
+repeating event information	calendar	zh-tw	約會�覆資訊
+repetition	calendar	zh-tw	�覆約會
+repetitiondetails (or empty)	calendar	zh-tw	�複細節(或空白)
+reset	calendar	zh-tw	�設
+rule	calendar	zh-tw	�則
+sa	calendar	zh-tw	å…­
+sat	calendar	zh-tw	å…­
+scheduling conflict	calendar	zh-tw	約會�疊
+search results	calendar	zh-tw	�尋�果
+select a %1	calendar	zh-tw	�了一個 %1
+select a time	calendar	zh-tw	�擇一個時間
+selected contacts (%1)	calendar	zh-tw	�擇的�絡人(%1)
+send updates via email	common	zh-tw	��電�郵件傳�最新消�
+send/receive updates via email	calendar	zh-tw	��電�郵件傳�/接收最新消�
+set a year only for one-time / non-regular holidays.	calendar	zh-tw	設定�有特定年會發生的�日
+set new events to private	calendar	zh-tw	設定新事件為�人的
+should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	zh-tw	您已經拒絕的邀請還�顯示在您的行事曆中嗎？<br>如果它�然顯示在您的行事曆中，您�以在事後接�(例如原本有牴觸的行程已經�消)它。
+should new events created as private by default ?	calendar	zh-tw	�設新增的事件是�人的？
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	zh-tw	沒有登入的使用者能�知�您�在是有空或是忙碌？您�以設定�外的密碼(�是自己登入的密碼)來��其他未經授權的人�覽。有空或是忙碌的資訊是 iCal 格�，而且�會讓�覽的人看到有無行程，他們無法進一步�得行程的詳細資料，�是事件�稱��述或是地點等。連�到這個功能的網�是  %1 。
+should the mini calendars by printed / displayed in the printer friendly views ?	calendar	zh-tw	�顯示/列�的迷你行事曆需�放在�善列�的��中�覽嗎？
+should the printer friendly view be in black & white or in color (as in normal view)?	calendar	zh-tw	�善列��使用單色顯示嗎？
+should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	zh-tw	在�個�與者�稱的後�需�顯示該�與者的狀態(接��拒絕�...)嗎？
+show day view on main screen	calendar	zh-tw	在首�顯示當日行程
+show default view on main screen	calendar	zh-tw	在主�畫�顯示�設�覽
+show high priority events on main screen	calendar	zh-tw	在首�顯示高優先權的約會
+show invitations you rejected	calendar	zh-tw	顯示您已經拒絕的邀請
+show list of upcoming events	calendar	zh-tw	顯示�將到來的行程
+show next seven days	calendar	zh-tw	顯示下一週
+show only one day	calendar	zh-tw	�顯示一天
+show the calendar of multiple users	calendar	zh-tw	顯示多人行事曆
+show this month	calendar	zh-tw	顯示這個月
+show this week	calendar	zh-tw	顯示這一週
+single event	calendar	zh-tw	單一事件
+sorry, the owner has just deleted this event	calendar	zh-tw	很抱歉，該約會的�有者剛移除了該約會
+sorry, this event does not exist	calendar	zh-tw	抱歉，這個事件�存在
+sorry, this event does not have exceptions defined	calendar	zh-tw	報建，這個事件並沒有例外
+sort by	calendar	zh-tw	排�
+specifies the the number of intervals shown in the planner view.	calendar	zh-tw	指定計畫管��覽模�的間隔數
+start date/time	calendar	zh-tw	開始日期/時間
+start- and enddates	calendar	zh-tw	開始與��日期
+startdate	calendar	zh-tw	開始日期
+startdate / -time	calendar	zh-tw	開始日期 / 時間
+startdate and -time of the search	calendar	zh-tw	�尋的開始日期 / 時間
+startrecord	calendar	zh-tw	開始紀錄
+su	calendar	zh-tw	æ—¥
+submit to repository	calendar	zh-tw	�出到儲�庫中
+sun	calendar	zh-tw	æ—¥
+tentative	calendar	zh-tw	暫定
+test import (show importable records <u>only</u> in browser)	calendar	zh-tw	測試匯入(<u>�有</u>在�覽器中顯示�以匯入的紀錄)
+text	calendar	zh-tw	文字
+th	calendar	zh-tw	å››
+the following conflicts with the suggested time:<ul>%1</ul>	calendar	zh-tw	下列的約會和您欲加入的約會�疊：<ul>%1</ul>
+the user %1 is not participating in this event!	calendar	zh-tw	%1�是這個事件的�與者
+there was an error trying to connect to your news server.<br>please contact your admin to check the news servername, username or password.	calendar	zh-tw	無法連�到您的新�主機，<br>請和網路管�者�絡，�助檢查新�主機的�稱�使用者代號�密碼。
+this day is shown as first day in the week or month view.	calendar	zh-tw	這一天會在週或是月行事曆中第一個顯示
+this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	zh-tw	這定義了�日行事曆的��，在這個時間之後的事件會顯示在日行事曆下�。
+this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	zh-tw	這定義了�日行事曆的開始，在這個時間之�的事件會顯示在日行事曆上�。<br>這個時間也會是新增事件的�設開始時間。
+this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	calendar	zh-tw	這個群組是當您進入計畫管�時�設的群組，您�以在事後修改。
+this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	zh-tw	這通常是SMTP伺�器設定錯誤所造�，請�醒您的管�員。
+this message is sent for canceled or deleted events.	calendar	zh-tw	這個訊�是因為事件的�消或刪除
+this message is sent for modified or moved events.	calendar	zh-tw	這個訊�是因為事件的修改或移動
+this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	zh-tw	這個訊�會�給您所�有的所有事件中有設定�醒功能的�與人。<br>您�以使用事件資料的替代值。第一行是郵件的標題。
+this message is sent when you accept, tentative accept or reject an event.	calendar	zh-tw	這個訊�會在您���暫時��或是拒絕一個事件後寄出，
+this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	zh-tw	這個訊�會在您設定事件警示時寄出，包�一些您或需需�的訊�。
+this month	calendar	zh-tw	本月
+this week	calendar	zh-tw	本週
+this year	calendar	zh-tw	今年
+three month	calendar	zh-tw	一季
+thu	calendar	zh-tw	å››
+til	calendar	zh-tw	到
+timeframe	calendar	zh-tw	時段
+timeframe to search	calendar	zh-tw	�尋的時段
+title	calendar	zh-tw	標題
+title of the event	calendar	zh-tw	事件標題
+title-row	calendar	zh-tw	事件-列
+to many might exceed your execution-time-limit	calendar	zh-tw	處�太多資料�能會超�系統�許的處�時間
+to-firstname	calendar	zh-tw	-�
+to-fullname	calendar	zh-tw	-全�
+to-lastname	calendar	zh-tw	-姓
+today	calendar	zh-tw	今天
+translation	calendar	zh-tw	翻譯
+tu	calendar	zh-tw	二
+tue	calendar	zh-tw	二
+two dayview	calendar	zh-tw	兩天模�
+two weeks	calendar	zh-tw	兩週
+update a single entry by passing the fields.	calendar	zh-tw	��第�的欄�更新一個單一事件
+updated	calendar	zh-tw	更新日期
+use end date	calendar	zh-tw	有��日期
+use the selected time and close the popup	calendar	zh-tw	使用指定的時間並且關閉彈出視窗
+view this entry	calendar	zh-tw	檢視此筆資料
+we	calendar	zh-tw	三
+wed	calendar	zh-tw	三
+week	calendar	zh-tw	星期
+weekday starts on	calendar	zh-tw	星期開始日
+weekdays	calendar	zh-tw	週日數
+weekdays to use in search	calendar	zh-tw	�尋的週日數
+weekly	calendar	zh-tw	�週
+weekview	calendar	zh-tw	週行事曆
+weekview including weekend	calendar	zh-tw	週曆包�週末
+weekview without weekend	calendar	zh-tw	週曆�包�週末
+when creating new events default set to private	calendar	zh-tw	新增約會時�設為�人性約會
+which events do you want to see when you enter the calendar.	calendar	zh-tw	當您進入行事曆時您希望看到什麼樣的行事曆。
+which of calendar view do you want to see, when you start calendar ?	calendar	zh-tw	當您開始了一個行事曆您希望看到哪個行事曆？
+wk	calendar	zh-tw	週
+work day ends on	calendar	zh-tw	�日��時間
+work day starts on	calendar	zh-tw	�日開始時間
+workdayends	calendar	zh-tw	工作日��於
+yearly	calendar	zh-tw	�年
+yearview	calendar	zh-tw	年行事曆
+you can either set a year or a occurence, not both !!!	calendar	zh-tw	您�以設定一個期間或是星期幾，�能兩者都��
+you can only set a year or a occurence !!!	calendar	zh-tw	您��以設定一年或是一個事件�
+you do not have permission to add alarms to this event !!!	calendar	zh-tw	您沒有權�新增這個事件的
+you do not have permission to delete this alarm !!!	calendar	zh-tw	您沒有刪除這個警報的權��
+you do not have permission to enable/disable this alarm !!!	calendar	zh-tw	您沒有啟用/關閉這個警報的權��
+you do not have permission to read this record!	calendar	zh-tw	您沒有讀�這個紀錄的權��
+you have %1 high priority events on your calendar today.	common	zh-tw	您今天有 %1 個高��性的約會。
+you have 1 high priority event on your calendar today.	common	zh-tw	您今天有 1 個高��性的約會。
+you have a meeting scheduled for %1	calendar	zh-tw	您跟%1有個行程
+you have not entered a title	calendar	zh-tw	您沒有輸入約會主題
+you have not entered a valid date	calendar	zh-tw	您沒有輸入正確的日期
+you have not entered a valid time of day	calendar	zh-tw	您沒有輸入正確的時間
+you have not entered participants	calendar	zh-tw	您沒有�擇與會者
+you must enter one or more search keywords	calendar	zh-tw	您必需輸入一個或一個以上的關�字
+you must select a [iv]cal. (*.[iv]cs)	calendar	zh-tw	您必須�擇一個 [iv]Cal. (*.[iv]cs)
+you need to set either a day or a occurence !!!	calendar	zh-tw	您必須設定一個日期或是一個期間�
+your meeting scheduled for %1 has been canceled	calendar	zh-tw	您與%1的行程已經�消了
+your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	zh-tw	您與%1的行程已經�新安排到%2
+your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries:	calendar	zh-tw	您所使用的約會時間 <B> %1 - %2 </B> 和下列的約會�疊：
diff --git a/calendar/setup/phpgw_zt.lang b/calendar/setup/phpgw_zt.lang
deleted file mode 100644
index 72f9db74e3..0000000000
--- a/calendar/setup/phpgw_zt.lang
+++ /dev/null
@@ -1,375 +0,0 @@
-%1 %2 in %3	calendar	zt	在%3的%1 %2
-%1 matches found	calendar	zt	共有 %1 筆資料符�
-%1 records imported	calendar	zt	%1 筆資料匯入
-%1 records read (not yet imported, you may go back and uncheck test import)	calendar	zt	讀�了%1筆資料(還沒匯入，您必須回到上一�並且�消圈�匯入測試)
-(for weekly)	calendar	zt	（�週）
-(i/v)cal	calendar	zt	(i/v)Cal
-1 match found	calendar	zt	共有 1 筆資料符�
-a	calendar	zt	一
-accept	calendar	zt	接�
-accepted	calendar	zt	已接�
-action that caused the notify: added, canceled, accepted, rejected, ...	calendar	zt	需��醒的�作：新增��消�接��拒絕�...
-add a single entry by passing the fields.	calendar	zt	�據這個項目建立一個複本
-add alarm	calendar	zt	新增警示
-add contact	calendar	zt	新增�繫
-add or update a single entry by passing the fields.	calendar	zt	��傳�欄�來新增或更新一筆記錄
-added	calendar	zt	新增日期
-address book	calendar	zt	通訊錄
-alarm	calendar	zt	警告
-alarm for %1 at %2 in %3	calendar	zt	在%3的%1 中 %2警告
-alarm management	calendar	zt	警示管�
-alarm-management	calendar	zt	警告管�員
-alarms	calendar	zt	警告
-all categories	calendar	zt	所有類別
-all day	calendar	zt	所有日期
-are you sure you want to delete this country ?	calendar	zt	您確定�移除這個國家嗎？
-are you sure you want to delete this holiday ?	calendar	zt	您確定�移除這個�日嗎？
-are you sure\nyou want to\ndelete these alarms?	calendar	zt	您確定\n�刪除\n這些�醒？
-are you sure\nyou want to\ndelete this entry ?	calendar	zt	您確定�移除\n這筆資料嗎？
-are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	zt	您確定�移除這筆資料嗎？\n所有使用者的資料將一併移除。
-are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	zt	您確定\n您�刪除這個期間？\n\n這將會\n刪除所有使用者的相�事件。
-before the event	calendar	zt	事件之�
-brief description	calendar	zt	簡短敘述
-business	calendar	zt	商務
-calendar	common	zt	行事曆
-calendar - [iv]cal importer	calendar	zt	Calendar - [iv]Cal Importer
-calendar - add	calendar	zt	行事曆 - 新增
-calendar - edit	calendar	zt	行事曆 - 編輯
-calendar event	calendar	zt	日曆事件
-calendar holiday management	admin	zt	行事曆�日管�
-calendar preferences	calendar	zt	行事曆喜好設定
-calendar settings	admin	zt	設定行事曆
-calendar-fieldname	calendar	zt	行事曆欄��稱
-canceled	calendar	zt	�消
-change all events for $params['old_owner'] to $params['new_owner'].	calendar	zt	改變所有$params['old_owner']的事件給$params['new_owner']。
-change status	calendar	zt	修改狀態
-charset of file	calendar	zt	檔案字元編碼
-click %1here%2 to return to the calendar.	calendar	zt	點� %1這裡%2 回到行事曆
-configuration	calendar	zt	設定
-countries	calendar	zt	國家
-country	calendar	zt	國家
-created by	calendar	zt	建立者
-csv-fieldname	calendar	zt	CSV-欄��稱
-csv-filename	calendar	zt	CSV-檔案�稱
-custom fields	calendar	zt	自訂欄�
-custom fields and sorting	common	zt	自訂欄�與排�
-daily	calendar	zt	�日
-daily matrix view	calendar	zt	�日陣列檢視模�
-days	calendar	zt	æ—¥
-days repeated	calendar	zt	日�覆
-dayview	calendar	zt	日行事曆
-default appointment length (in minutes)	calendar	zt	�設會議時間長度(分�)
-default calendar filter	calendar	zt	�設行事曆�濾器
-default calendar view	calendar	zt	�設行事曆檢視模�
-default length of newly created events. the length is in minutes, eg. 60 for 1 hour.	calendar	zt	�設建立事件的長度(分�)，�設為60=1�時。
-default week view	calendar	zt	�設週曆模�
-defines the size in minutes of the lines in the day view.	calendar	zt	定義行事曆�覽時�個時段的分�數
-delete a single entry by passing the id.	calendar	zt	刪除這個事件並且略�這個ID
-delete an entire users calendar.	calendar	zt	刪除整個使用者的行事曆
-delete selected contacts	calendar	zt	刪除�繫
-delete selected participants	calendar	zt	刪除�與者
-delete series	calendar	zt	刪除連鎖項目
-delete single	calendar	zt	刪除單一項目
-deleted	calendar	zt	刪除日期
-description	calendar	zt	�述
-determining window width ...	calendar	zt	�測視窗寬度...
-disable	calendar	zt	�用
-disabled	calendar	zt	�用
-display interval in day view	calendar	zt	�日顯示的間隔
-display mini calendars when printing	calendar	zt	列�時顯示�行事曆
-display status of events	calendar	zt	顯示事件的狀態
-displayed view	calendar	zt	已顯示模�
-displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	zt	顯示您�設的行事曆�覽模�在啟始�(您登入egroupWare第一個看到或是按下您的首�按鈕的��)
-do you want a weekview with or without weekend?	calendar	zt	您是�希望週曆包�週末？
-do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	zt	您希望系統在約會新增或是修改時主動�醒您嗎？您也會收到包括您自己更新的通知。<br>您�以�制系統��醒確定的修改。�個項目包�它以上的清單。所有的修改包括標題��述��與者的改變，但是�包括�與者的回應。如果事件的�有者�求任何�醒，他會收到�與者接�或是拒絕的回應。
-do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	zt	您希望定期��電�郵件收到系統自動寄出的約會通知概�嗎？<br>這個概�會在�天早上寄出�日概�或是�個星期一寄出�週概�。<br>它�會在那一天或是那一週有約會時寄出。
-do you wish to autoload calendar holidays files dynamically?	admin	zt	您希望動態新增行事曆的�日嗎？
-download	calendar	zt	下載
-duration	calendar	zt	期間
-duration of the meeting	calendar	zt	會議期間
-edit series	calendar	zt	編輯全系列約會
-edit single	calendar	zt	編輯單一約會
-email notification	calendar	zt	電�郵件�醒
-email notification for %1	calendar	zt	%1的電�郵件�醒
-empty for all	calendar	zt	全部空白
-enable	calendar	zt	啟用
-enabled	calendar	zt	啟用
-end date/time	calendar	zt	��日期時間
-enddate	calendar	zt	��日期
-enddate / -time of the meeting, eg. for more then one day	calendar	zt	��日期 / 會議的時間，例如超�一天的會議
-ends	calendar	zt	��日期
-enter output filename: ( .vcs appended )	calendar	zt	輸入輸出檔�：(記得加上副檔�.vcs)
-event details follow	calendar	zt	事件細節
-exceptions	calendar	zt	例外
-export	calendar	zt	匯出
-export a list of entries in ical format.	calendar	zt	匯出事件清單�為iCal格�
-extended	calendar	zt	延伸的
-extended updates always include the complete event-details. ical's can be imported by certain other calendar-applications.	calendar	zt	延伸的更新包�完整的事件細節，iCal格��以被其他行事曆軟體讀�。
-external participants	calendar	zt	外部�與者
-failed sending message to '%1' #%2 subject='%3', sender='%4' !!!	calendar	zt	無法傳�尋給'%1'#%2 標題='%3'，傳�者='%4'�
-fieldseparator	calendar	zt	欄�分隔字元
-find free timeslots where the marked participants are availible for the given timespan	calendar	zt	找尋指定人員的行程是�有空檔
-firstname of person to notify	calendar	zt	需�通知的人�
-format of event updates	calendar	zt	事件更新的格�
-fr	calendar	zt	五
-free/busy	calendar	zt	有空/忙錄
-freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	zt	狀態：�知�的使用者'%1'，錯誤的密碼或是目�無法登入�
-freetime search	calendar	zt	時間空檔查詢
-frequency	calendar	zt	頻率
-fri	calendar	zt	五
-full description	calendar	zt	完整敘述
-fullname of person to notify	calendar	zt	需�通知的全�
-generate printer-friendly version	calendar	zt	產生�善列�版本
-global categories	calendar	zt	全域類別
-global public and group public	calendar	zt	全�公用�群組公用
-global public only	calendar	zt	全�公用
-go!	calendar	zt	出發�
-grant calendar access	common	zt	管�行事曆權�
-group planner	calendar	zt	群組計畫
-group public only	calendar	zt	群組公用
-here is your requested alarm.	calendar	zt	這是您�求的�醒。
-high priority	calendar	zt	高優先權
-holiday	calendar	zt	�日
-holiday management	calendar	zt	�日管�
-holiday-management	calendar	zt	�日管�
-holidays	calendar	zt	�日
-hours	calendar	zt	�時
-how far to search (from startdate)	calendar	zt	�尋的期間(從開始日期)
-i participate	calendar	zt	我��與
-ical / rfc2445	calendar	zt	iCal / rfc2445
-if checked holidays falling on a weekend, are taken on the monday after.	calendar	zt	如果�擇的�日剛好是週末，系統會自動移到星期一。
-if you dont set a password here, the information is available to everyone, who knows the url!!!	calendar	zt	如果您在此並未設定密碼，知�網�的人就能夠讀�。
-if you dont set a password here, the information is availible to everyone, who knows the url!!!	calendar	zt	如果您沒有在這裡設定密碼，所有的人都�以看到您的資訊�
-ignore conflict	calendar	zt	忽略�疊的約會
-import	calendar	zt	匯入
-import csv-file	common	zt	匯入CSV逗點分隔檔案
-import csv-file into calendar	calendar	zt	匯入CSV檔案到行事曆
-interval	calendar	zt	é–“éš”
-intervals in day view	calendar	zt	�日�覽的間隔
-intervals per day in planner view	calendar	zt	在計畫�覽模�的間隔日數
-invalid entry id.	calendar	zt	錯誤的事件ID。
-last	calendar	zt	最後
-lastname of person to notify	calendar	zt	��醒的人�(姓)
-length shown<br>(emtpy for full length)	calendar	zt	顯示長度<br>(空白代表完整長度)
-length<br>(<= 255)	calendar	zt	長度<br>(<=255)
-link	calendar	zt	連�
-link to view the event	calendar	zt	事件連�
-list all categories.	calendar	zt	顯示所有分類
-load [iv]cal	calendar	zt	Load [iv]Cal
-location	calendar	zt	約會�置
-location to autoload from	admin	zt	自動讀�的�置
-make freebusy information available to not loged in persons?	calendar	zt	將行程資訊開放給未登入的人？
-make freebusy information availible to not loged in persons?	calendar	zt	讓未登入的使用者�覽您目�是有空或是忙碌中？
-matrixview	calendar	zt	基礎�覽
-minutes	calendar	zt	分�
-mo	calendar	zt	一
-modified	calendar	zt	修改日期
-modify list of external participants	calendar	zt	外部�與者的修改清單
-mon	calendar	zt	一
-month	calendar	zt	月
-monthly	calendar	zt	�月
-monthly (by date)	calendar	zt	�月（以日期計）
-monthly (by day)	calendar	zt	�月（以天數計）
-monthview	calendar	zt	月行事曆
-needs javascript to be enabled !!!	calendar	zt	您必須啟用�覽器的javascript功能
-new entry	calendar	zt	新增資料
-new name must not exist and not be empty!!!	calendar	zt	新的�稱必須未存在或是�能夠空白�
-new search with the above parameters	calendar	zt	��上�的�數從新�尋
-next day	calendar	zt	下一天
-no filter	calendar	zt	沒有�則
-no matches found	calendar	zt	沒有找到符�的�果
-no matches found.	calendar	zt	沒有找到符�的資料
-no repsonse	calendar	zt	沒有回應
-no response	calendar	zt	沒有回應
-notification messages for added events	calendar	zt	新增事件�醒
-notification messages for canceled events	calendar	zt	�消事件�醒
-notification messages for modified events	calendar	zt	修改事件�醒
-notification messages for your alarms	calendar	zt	您的通知事件�醒
-notification messages for your responses	calendar	zt	您的回覆事件�醒
-number of intervals per day in planner view	calendar	zt	在計畫�覽模�下的間隔日數
-number of months	calendar	zt	月數
-number of records to read (%1)	calendar	zt	讀�的資料筆數(%1)
-number of records to read (<=200)	calendar	zt	讀�的資料筆數(<=200)
-observance rule	calendar	zt	�循�則
-occurence	calendar	zt	期間
-old startdate	calendar	zt	舊的開始日期
-olddate	calendar	zt	舊的日期
-on %1 %2 %3 your meeting request for %4	calendar	zt	在 %1 %2 %3 有 %4 的約會
-on all changes	calendar	zt	所有改變
-on all modification, but responses	calendar	zt	所有修改，除了回應
-on any time change too	calendar	zt	任何時間改變
-on invitation / cancelation only	calendar	zt	�有邀請與�消
-on participant responses too	calendar	zt	�與者回應時
-on time change of more than 4 hours too	calendar	zt	在改變超�四�時後
-one month	calendar	zt	一個月
-one week	calendar	zt	一星期
-one year	calendar	zt	一年
-only the initial date of that recuring event is checked!	calendar	zt	�有���複事件的�始日期�
-open todo's:	calendar	zt	未完�的待辦事項
-or enddate / -time	calendar	zt	或��日期 / 時間
-order	calendar	zt	順�
-overlap holiday	calendar	zt	�疊的�日
-participant	calendar	zt	與會者
-participants	calendar	zt	與會者
-participates	calendar	zt	�與
-password for not loged in users to your freebusy information?	calendar	zt	讓未登入使用者檢視您有空或是忙碌的密碼？
-people holiday	calendar	zt	�日
-permission denied	calendar	zt	拒絕存�
-planner	calendar	zt	計畫者
-planner by category	calendar	zt	類別計畫者
-planner by user	calendar	zt	使用者計畫者
-please confirm,accept,reject or examine changes in the corresponding entry in your calendar	calendar	zt	請確�����拒絕或是檢查您的行事曆中相�的事件異動
-please enter a filename !!!	calendar	zt	請輸入檔案�稱�
-preselected group for entering the planner	calendar	zt	進入計畫管�的�設群組
-previous day	calendar	zt	�一天
-print calendars in black & white	calendar	zt	使用單色列�
-print the mini calendars	calendar	zt	列�迷你行事曆
-printer friendly	calendar	zt	�善列�
-privat	calendar	zt	�人的
-private and global public	calendar	zt	�人�全�公用
-private and group public	calendar	zt	�人�群組公用
-private only	calendar	zt	�人
-re-edit event	calendar	zt	�新編輯約會
-read a list of entries.	calendar	zt	讀�事件列表
-read a single entry by passing the id and fieldlist.	calendar	zt	從傳�的ID與欄�清單讀�單一事件
-read this list of methods.	calendar	zt	讀�這個方法的列表
-receive email updates	calendar	zt	接收更新郵件�醒
-receive extra information in event mails	calendar	zt	在事件�醒郵件中接收�外的資訊
-receive summary of appointments	calendar	zt	接收約會概�
-recurring event	calendar	zt	循環事件
-refresh	calendar	zt	�新整�
-reinstate	calendar	zt	復原
-reject	calendar	zt	拒絕
-rejected	calendar	zt	拒絕
-repeat day	calendar	zt	�覆天數
-repeat end date	calendar	zt	�覆��日期
-repeat type	calendar	zt	�覆類型
-repeating event information	calendar	zt	約會�覆資訊
-repetition	calendar	zt	�覆約會
-repetitiondetails (or empty)	calendar	zt	�複細節(或空白)
-reset	calendar	zt	�設
-rule	calendar	zt	�則
-sa	calendar	zt	å…­
-sat	calendar	zt	å…­
-scheduling conflict	calendar	zt	約會�疊
-search results	calendar	zt	�尋�果
-select a %1	calendar	zt	�了一個 %1
-select a time	calendar	zt	�擇一個時間
-selected contacts (%1)	calendar	zt	�擇的�絡人(%1)
-send updates via email	common	zt	��電�郵件傳�最新消�
-send/receive updates via email	calendar	zt	��電�郵件傳�/接收最新消�
-set a year only for one-time / non-regular holidays.	calendar	zt	設定�有特定年會發生的�日
-set new events to private	calendar	zt	設定新事件為�人的
-should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	zt	您已經拒絕的邀請還�顯示在您的行事曆中嗎？<br>如果它�然顯示在您的行事曆中，您�以在事後接�(例如原本有牴觸的行程已經�消)它。
-should new events created as private by default ?	calendar	zt	�設新增的事件是�人的？
-should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	zt	沒有登入的使用者能�知�您�在是有空或是忙碌？您�以設定�外的密碼(�是自己登入的密碼)來��其他未經授權的人�覽。有空或是忙碌的資訊是 iCal 格�，而且�會讓�覽的人看到有無行程，他們無法進一步�得行程的詳細資料，�是事件�稱��述或是地點等。連�到這個功能的網�是  %1 。
-should the mini calendars by printed / displayed in the printer friendly views ?	calendar	zt	�顯示/列�的迷你行事曆需�放在�善列�的��中�覽嗎？
-should the printer friendly view be in black & white or in color (as in normal view)?	calendar	zt	�善列��使用單色顯示嗎？
-should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	zt	在�個�與者�稱的後�需�顯示該�與者的狀態(接��拒絕�...)嗎？
-show day view on main screen	calendar	zt	在首�顯示當日行程
-show default view on main screen	calendar	zt	在主�畫�顯示�設�覽
-show high priority events on main screen	calendar	zt	在首�顯示高優先權的約會
-show invitations you rejected	calendar	zt	顯示您已經拒絕的邀請
-show list of upcoming events	calendar	zt	顯示�將到來的行程
-show next seven days	calendar	zt	顯示下一週
-show only one day	calendar	zt	�顯示一天
-show the calendar of multiple users	calendar	zt	顯示多人行事曆
-show this month	calendar	zt	顯示這個月
-show this week	calendar	zt	顯示這一週
-single event	calendar	zt	單一事件
-sorry, the owner has just deleted this event	calendar	zt	很抱歉，該約會的�有者剛移除了該約會
-sorry, this event does not exist	calendar	zt	抱歉，這個事件�存在
-sorry, this event does not have exceptions defined	calendar	zt	報建，這個事件並沒有例外
-sort by	calendar	zt	排�
-specifies the the number of intervals shown in the planner view.	calendar	zt	指定計畫管��覽模�的間隔數
-start date/time	calendar	zt	開始日期/時間
-start- and enddates	calendar	zt	開始與��日期
-startdate	calendar	zt	開始日期
-startdate / -time	calendar	zt	開始日期 / 時間
-startdate and -time of the search	calendar	zt	�尋的開始日期 / 時間
-startrecord	calendar	zt	開始紀錄
-su	calendar	zt	æ—¥
-submit to repository	calendar	zt	�出到儲�庫中
-sun	calendar	zt	æ—¥
-tentative	calendar	zt	暫定
-test import (show importable records <u>only</u> in browser)	calendar	zt	測試匯入(<u>�有</u>在�覽器中顯示�以匯入的紀錄)
-text	calendar	zt	文字
-th	calendar	zt	å››
-the following conflicts with the suggested time:<ul>%1</ul>	calendar	zt	下列的約會和您欲加入的約會�疊：<ul>%1</ul>
-the user %1 is not participating in this event!	calendar	zt	%1�是這個事件的�與者
-there was an error trying to connect to your news server.<br>please contact your admin to check the news servername, username or password.	calendar	zt	無法連�到您的新�主機，<br>請和網路管�者�絡，�助檢查新�主機的�稱�使用者代號�密碼。
-this day is shown as first day in the week or month view.	calendar	zt	這一天會在週或是月行事曆中第一個顯示
-this defines the end of your dayview. events after this time, are shown below the dayview.	calendar	zt	這定義了�日行事曆的��，在這個時間之後的事件會顯示在日行事曆下�。
-this defines the start of your dayview. events before this time, are shown above the dayview.<br>this time is also used as a default starttime for new events.	calendar	zt	這定義了�日行事曆的開始，在這個時間之�的事件會顯示在日行事曆上�。<br>這個時間也會是新增事件的�設開始時間。
-this group that is preselected when you enter the planner. you can change it in the planner anytime you want.	calendar	zt	這個群組是當您進入計畫管�時�設的群組，您�以在事後修改。
-this is mostly caused by a not or wrongly configured smtp server. notify your administrator.	calendar	zt	這通常是SMTP伺�器設定錯誤所造�，請�醒您的管�員。
-this message is sent for canceled or deleted events.	calendar	zt	這個訊�是因為事件的�消或刪除
-this message is sent for modified or moved events.	calendar	zt	這個訊�是因為事件的修改或移動
-this message is sent to every participant of events you own, who has requested notifcations about new events.<br>you can use certain variables which get substituted with the data of the event. the first line is the subject of the email.	calendar	zt	這個訊�會�給您所�有的所有事件中有設定�醒功能的�與人。<br>您�以使用事件資料的替代值。第一行是郵件的標題。
-this message is sent when you accept, tentative accept or reject an event.	calendar	zt	這個訊�會在您���暫時��或是拒絕一個事件後寄出，
-this message is sent when you set an alarm for a certain event. include all information you might need.	calendar	zt	這個訊�會在您設定事件警示時寄出，包�一些您或需需�的訊�。
-this month	calendar	zt	本月
-this week	calendar	zt	本週
-this year	calendar	zt	今年
-three month	calendar	zt	一季
-thu	calendar	zt	å››
-til	calendar	zt	到
-timeframe	calendar	zt	時段
-timeframe to search	calendar	zt	�尋的時段
-title	calendar	zt	標題
-title of the event	calendar	zt	事件標題
-title-row	calendar	zt	事件-列
-to many might exceed your execution-time-limit	calendar	zt	處�太多資料�能會超�系統�許的處�時間
-to-firstname	calendar	zt	-�
-to-fullname	calendar	zt	-全�
-to-lastname	calendar	zt	-姓
-today	calendar	zt	今天
-translation	calendar	zt	翻譯
-tu	calendar	zt	二
-tue	calendar	zt	二
-two dayview	calendar	zt	兩天模�
-two weeks	calendar	zt	兩週
-update a single entry by passing the fields.	calendar	zt	��第�的欄�更新一個單一事件
-updated	calendar	zt	更新日期
-use end date	calendar	zt	有��日期
-use the selected time and close the popup	calendar	zt	使用指定的時間並且關閉彈出視窗
-view this entry	calendar	zt	檢視此筆資料
-we	calendar	zt	三
-wed	calendar	zt	三
-week	calendar	zt	星期
-weekday starts on	calendar	zt	星期開始日
-weekdays	calendar	zt	週日數
-weekdays to use in search	calendar	zt	�尋的週日數
-weekly	calendar	zt	�週
-weekview	calendar	zt	週行事曆
-weekview including weekend	calendar	zt	週曆包�週末
-weekview without weekend	calendar	zt	週曆�包�週末
-when creating new events default set to private	calendar	zt	新增約會時�設為�人性約會
-which events do you want to see when you enter the calendar.	calendar	zt	當您進入行事曆時您希望看到什麼樣的行事曆。
-which of calendar view do you want to see, when you start calendar ?	calendar	zt	當您開始了一個行事曆您希望看到哪個行事曆？
-wk	calendar	zt	週
-work day ends on	calendar	zt	�日��時間
-work day starts on	calendar	zt	�日開始時間
-workdayends	calendar	zt	工作日��於
-year	calendar	zt	å¹´
-yearly	calendar	zt	�年
-yearview	calendar	zt	年行事曆
-you can either set a year or a occurence, not both !!!	calendar	zt	您�以設定一個期間或是星期幾，�能兩者都��
-you can only set a year or a occurence !!!	calendar	zt	您��以設定一年或是一個事件�
-you do not have permission to add alarms to this event !!!	calendar	zt	您沒有權�新增這個事件的
-you do not have permission to delete this alarm !!!	calendar	zt	您沒有刪除這個警報的權��
-you do not have permission to enable/disable this alarm !!!	calendar	zt	您沒有啟用/關閉這個警報的權��
-you do not have permission to read this record!	calendar	zt	您沒有讀�這個紀錄的權��
-you have %1 high priority events on your calendar today.	common	zt	您今天有 %1 個高��性的約會。
-you have 1 high priority event on your calendar today.	common	zt	您今天有 1 個高��性的約會。
-you have a meeting scheduled for %1	calendar	zt	您跟%1有個行程
-you have not entered a title	calendar	zt	您沒有輸入約會主題
-you have not entered a valid date	calendar	zt	您沒有輸入正確的日期
-you have not entered a valid time of day	calendar	zt	您沒有輸入正確的時間
-you have not entered participants	calendar	zt	您沒有�擇與會者
-you must enter one or more search keywords	calendar	zt	您必需輸入一個或一個以上的關�字
-you must select a [iv]cal. (*.[iv]cs)	calendar	zt	您必須�擇一個 [iv]Cal. (*.[iv]cs)
-you need to set either a day or a occurence !!!	calendar	zt	您必須設定一個日期或是一個期間�
-your meeting scheduled for %1 has been canceled	calendar	zt	您與%1的行程已經�消了
-your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	zt	您與%1的行程已經�新安排到%2
-your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries:	calendar	zt	您所使用的約會時間 <B> %1 - %2 </B> 和下列的約會�疊：
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 1afd4f641c..24fafbe070 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -12,50 +12,45 @@
 	/* $Id$ */
 
 	$setup_info['calendar']['name']    = 'calendar';
-	$setup_info['calendar']['version'] = '1.0.0.005';
+	$setup_info['calendar']['version'] = '1.0.1.009';
 	$setup_info['calendar']['app_order'] = 3;
 	$setup_info['calendar']['enable']  = 1;
 
-	$setup_info['calendar']['author'] = 'Mark Peters';
 	$setup_info['calendar']['license']  = 'GPL';
 	$setup_info['calendar']['description'] =
-		'Powerful calendar with meeting request system and ACL security.';
-	$setup_info['calendar']['note'] =
-		'Originaly based on Webcalendar by <a href="http://www.radix.net/~cknudsen" target="_blank">Craig Knudsen</a>.<p>
-		';
-	$setup_info['calendar']['maintainer'] = array(
+		'Powerful group calendar with meeting request system and ACL security.';
+	$setup_info['calendar']['note'] = 
+		'The calendar has been completly rewritten for eGroupWare 1.2.';
+	$setup_info['calendar']['author'] = $setup_info['calendar']['maintainer'] = array(
 		'name'  => 'Ralf Becker',
 		'email' => 'RalfBecker@outdoor-training.de'
 	);
 
-	$setup_info['calendar']['tables'][] = 'phpgw_cal';
-	$setup_info['calendar']['tables'][] = 'phpgw_cal_holidays';
-	$setup_info['calendar']['tables'][] = 'phpgw_cal_repeats';
-	$setup_info['calendar']['tables'][] = 'phpgw_cal_user';
-	$setup_info['calendar']['tables'][] = 'phpgw_cal_extra';
+	$setup_info['calendar']['tables'][] = 'egw_cal';
+	$setup_info['calendar']['tables'][] = 'egw_cal_holidays';
+	$setup_info['calendar']['tables'][] = 'egw_cal_repeats';
+	$setup_info['calendar']['tables'][] = 'egw_cal_user';
+	$setup_info['calendar']['tables'][] = 'egw_cal_extra';
+	$setup_info['calendar']['tables'][] = 'egw_cal_dates';
 
 	/* The hooks this app includes, needed for hooks registration */
 	$setup_info['calendar']['hooks'][] = 'add_def_prefs';
 	$setup_info['calendar']['hooks'][] = 'admin';
 	$setup_info['calendar']['hooks'][] = 'deleteaccount';
-	$setup_info['calendar']['hooks'][] = 'email';
 	$setup_info['calendar']['hooks'][] = 'home';
-	$setup_info['calendar']['hooks'][] = 'home_day';
-	$setup_info['calendar']['hooks'][] = 'home_month';
-	$setup_info['calendar']['hooks'][] = 'home_week';
-	$setup_info['calendar']['hooks'][] = 'home_year';
 	$setup_info['calendar']['hooks'][] = 'preferences';
 	$setup_info['calendar']['hooks'][] = 'settings';
 	$setup_info['calendar']['hooks']['sidebox_menu'] = 'calendar.uical.sidebox_menu';
+	$setup_info['calendar']['hooks']['search_link'] = 'calendar.bocal.search_link';
 
 	/* Dependencies for this app to work */
 	$setup_info['calendar']['depends'][] = array(
 		 'appname' => 'phpgwapi',
-		 'versions' => Array('0.9.14','0.9.15','0.9.16','1.0.0','1.0.1')
+		 'versions' => Array('1.0.0','1.0.1','1.2')
 	);
 	$setup_info['calendar']['depends'][] = array(
 		 'appname' => 'etemplate',
-		 'versions' => Array('1.0.0','1.0.1')
+		 'versions' => Array('1.0.0','1.0.1','1.2')
 	);
 
 
@@ -63,3 +58,12 @@
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/calendar/setup/tables_current.inc.php b/calendar/setup/tables_current.inc.php
index 0164d6e135..f82652583f 100644
--- a/calendar/setup/tables_current.inc.php
+++ b/calendar/setup/tables_current.inc.php
@@ -12,30 +12,29 @@
   /* $Id$ */
 
 	$phpgw_baseline = array(
-		'phpgw_cal' => array(
+		'egw_cal' => array(
 			'fd' => array(
 				'cal_id' => array('type' => 'auto','nullable' => False),
 				'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-				'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
+				'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
 				'cal_category' => array('type' => 'varchar','precision' => '30'),
 				'cal_groups' => array('type' => 'varchar','precision' => '255'),
-				'cal_starttime' => array('type' => 'int','precision' => '8'),
 				'cal_modified' => array('type' => 'int','precision' => '8'),
-				'cal_endtime' => array('type' => 'int','precision' => '8'),
-				'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-				'cal_type' => array('type' => 'varchar','precision' => '10'),
-				'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
+				'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
+				'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
 				'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
 				'cal_description' => array('type' => 'text'),
 				'cal_location' => array('type' => 'varchar','precision' => '255'),
-				'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+				'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'cal_modifier' => array('type' => 'int','precision' => '4'),
+				'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0')
 			),
 			'pk' => array('cal_id'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
 		),
-		'phpgw_cal_holidays' => array(
+		'egw_cal_holidays' => array(
 			'fd' => array(
 				'hol_id' => array('type' => 'auto','nullable' => False),
 				'hol_locale' => array('type' => 'char','precision' => '2','nullable' => False),
@@ -51,34 +50,35 @@
 			'ix' => array('hol_locale'),
 			'uc' => array()
 		),
-		'phpgw_cal_repeats' => array(
+		'egw_cal_repeats' => array(
 			'fd' => array(
-				'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-				'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-				'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
+				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
+				'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
 				'recur_enddate' => array('type' => 'int','precision' => '8'),
-				'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-				'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-				'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+				'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
+				'recur_data' => array('type' => 'int','precision' => '2','default' => '1'),
+				'recur_exception' => array('type' => 'text')
 			),
 			'pk' => array('cal_id'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
 		),
-		'phpgw_cal_user' => array(
+		'egw_cal_user' => array(
 			'fd' => array(
-				'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'cal_user_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'cal_recur_date' => array('type' => 'int','precision' => '8','default' => '0'),
+				'cal_user_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u'),
+				'cal_user_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
 				'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-				'cal_user_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+				'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1')
 			),
-			'pk' => array('cal_id','cal_user_id','cal_user_type'),
+			'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
 		),
-		'phpgw_cal_extra' => array(
+		'egw_cal_extra' => array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
 				'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
@@ -88,6 +88,16 @@
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
+		),
+		'egw_cal_dates' => array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
+				'cal_start' => array('type' => 'int','precision' => '8','nullable' => False),
+				'cal_end' => array('type' => 'int','precision' => '8','nullable' => False)
+			),
+			'pk' => array('cal_id','cal_start'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
 		)
 	);
-?>
diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index 0b15df5a50..622d149183 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -13,14 +13,14 @@
 
 	function calendar_v0_9_2to0_9_3update_owner($table, $field)
 	{
-		$GLOBALS['phpgw_setup']->oProc->query("select distinct($field) from $table");
-		if ($GLOBALS['phpgw_setup']->oProc->num_rows())
+		$GLOBALS['egw_setup']->oProc->query("select distinct($field) from $table");
+		if ($GLOBALS['egw_setup']->oProc->num_rows())
 		{
-			while ($GLOBALS['phpgw_setup']->oProc->next_record())
+			while ($GLOBALS['egw_setup']->oProc->next_record())
 			{
-				$owner[count($owner)] = $GLOBALS['phpgw_setup']->oProc->f($field);
+				$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
 			}
-			if($GLOBALS['phpgw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
+			if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
 			{
 				$acctstbl = 'accounts';
 			}
@@ -30,12 +30,12 @@
 			}
 			for($i=0;$i<count($owner);$i++)
 			{
-				$GLOBALS['phpgw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
-				$GLOBALS['phpgw_setup']->oProc->next_record();
-				$GLOBALS['phpgw_setup']->oProc->query("UPDATE $table SET $field=".$GLOBALS['phpgw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
+				$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
+				$GLOBALS['egw_setup']->oProc->next_record();
+				$GLOBALS['egw_setup']->oProc->query("UPDATE $table SET $field=".$GLOBALS['egw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
 			}
 		}
-		$GLOBALS['phpgw_setup']->oProc->AlterColumn($table, $field, array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => 0));
+		$GLOBALS['egw_setup']->oProc->AlterColumn($table, $field, array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => 0));
 	}
 
 
@@ -117,8 +117,8 @@
 	$test[] = '0.9.4pre2';
 	function calendar_upgrade0_9_4pre2()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('webcal_entry', 'cal_create_by', 'cal_owner');
-		$GLOBALS['phpgw_setup']->oProc->AlterColumn('webcal_entry', 'cal_owner', array('type' => 'int', 'precision' => 4, 'nullable' => false));
+		$GLOBALS['egw_setup']->oProc->RenameColumn('webcal_entry', 'cal_create_by', 'cal_owner');
+		$GLOBALS['egw_setup']->oProc->AlterColumn('webcal_entry', 'cal_owner', array('type' => 'int', 'precision' => 4, 'nullable' => false));
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre3';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
 	}
@@ -175,18 +175,9 @@
 	$test[] = '0.9.7pre1';
 	function calendar_upgrade0_9_7pre1()
 	{
-		$db2 = $GLOBALS['phpgw_setup']->db;
+		$db2 = clone($GLOBALS['egw_setup']->db);
 
-		if($GLOBALS['phpgw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre8'))
-		{
-			$appstable = 'applications';
-		}
-		else
-		{
-			$appstable = 'phpgw_applications';
-		}
-
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('calendar_entry',
+		$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry',
 			Array(
 				'fd' => array(
 					'cal_id' => array('type' => 'auto', 'nullable' => false),
@@ -208,23 +199,23 @@
 			)
 		);
 	
-		$GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
-		$GLOBALS['phpgw_setup']->oProc->next_record();
-		if($GLOBALS['phpgw_setup']->oProc->f(0))
+		$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->next_record();
+		if($GLOBALS['egw_setup']->oProc->f(0))
 		{
-			$GLOBALS['phpgw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
-			while($GLOBALS['phpgw_setup']->oProc->next_record())
+			$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
+			while($GLOBALS['egw_setup']->oProc->next_record())
 			{
-				$cal_id = $GLOBALS['phpgw_setup']->oProc->f('cal_id');
-				$cal_owner = $GLOBALS['phpgw_setup']->oProc->f('cal_owner');
-				$cal_duration = $GLOBALS['phpgw_setup']->oProc->f('cal_duration');
-				$cal_priority = $GLOBALS['phpgw_setup']->oProc->f('cal_priority');
-				$cal_type = $GLOBALS['phpgw_setup']->oProc->f('cal_type');
-				$cal_access = $GLOBALS['phpgw_setup']->oProc->f('cal_access');
-				$cal_name = $GLOBALS['phpgw_setup']->oProc->f('cal_name');
-				$cal_description = $GLOBALS['phpgw_setup']->oProc->f('cal_description');
-				$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['phpgw_setup']->oProc->f('cal_time')),4))),intval(strrev(substr(strrev($GLOBALS['phpgw_setup']->oProc->f('cal_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['phpgw_setup']->oProc->f('cal_time')),0,2))),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_date'),4,2)),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_date'),6,2)),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_date'),0,4)));
-				$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['phpgw_setup']->oProc->f('cal_mod_time')),4))),intval(strrev(substr(strrev($GLOBALS['phpgw_setup']->oProc->f('cal_mod_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['phpgw_setup']->oProc->f('cal_mod_time')),0,2))),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_mod_date'),4,2)),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_mod_date'),6,2)),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_mod_date'),0,4)));
+				$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
+				$cal_owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
+				$cal_duration = $GLOBALS['egw_setup']->oProc->f('cal_duration');
+				$cal_priority = $GLOBALS['egw_setup']->oProc->f('cal_priority');
+				$cal_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
+				$cal_access = $GLOBALS['egw_setup']->oProc->f('cal_access');
+				$cal_name = $GLOBALS['egw_setup']->oProc->f('cal_name');
+				$cal_description = $GLOBALS['egw_setup']->oProc->f('cal_description');
+				$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),0,4)));
+				$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),0,4)));
 				$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id,__LINE__,__FILE__);
 				$db2->next_record();
 				$cal_group = $db2->f('groups');
@@ -233,10 +224,10 @@
 			}
 		}
 	
-		$GLOBALS['phpgw_setup']->oProc->DropTable('webcal_entry_groups');
-		$GLOBALS['phpgw_setup']->oProc->DropTable('webcal_entry');
+		$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_groups');
+		$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry');
 	
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('calendar_entry_user',
+		$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_user',
 			Array(
 				'fd' => array(
 					'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
@@ -250,23 +241,23 @@
 			)
 		);
 	
-		$GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
-		$GLOBALS['phpgw_setup']->oProc->next_record();
-		if($GLOBALS['phpgw_setup']->oProc->f(0))
+		$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->next_record();
+		if($GLOBALS['egw_setup']->oProc->f(0))
 		{
-			$GLOBALS['phpgw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id',__LINE__,__FILE__);
-			while($GLOBALS['phpgw_setup']->oProc->next_record())
+			$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id',__LINE__,__FILE__);
+			while($GLOBALS['egw_setup']->oProc->next_record())
 			{
-				$cal_id = $GLOBALS['phpgw_setup']->oProc->f('cal_id');
-				$cal_login = $GLOBALS['phpgw_setup']->oProc->f('cal_login');
-				$cal_status = $GLOBALS['phpgw_setup']->oProc->f('cal_status');
+				$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
+				$cal_login = $GLOBALS['egw_setup']->oProc->f('cal_login');
+				$cal_status = $GLOBALS['egw_setup']->oProc->f('cal_status');
 				$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')",__LINE__,__FILE__);
 			}
 		}
 	
-		$GLOBALS['phpgw_setup']->oProc->DropTable('webcal_entry_user');
+		$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_user');
 	
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('calendar_entry_repeats',
+		$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_repeats',
 			Array(
 				'fd' => array(
 					'cal_id' => array('type' => 'int', 'precision' => 4, 'default' => '0', 'nullable' => false),
@@ -283,18 +274,18 @@
 			)
 		);
 	
-		$GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
-		$GLOBALS['phpgw_setup']->oProc->next_record();
-		if($GLOBALS['phpgw_setup']->oProc->f(0))
+		$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->next_record();
+		if($GLOBALS['egw_setup']->oProc->f(0))
 		{
-			$GLOBALS['phpgw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id',__LINE__,__FILE__);
-			while($GLOBALS['phpgw_setup']->oProc->next_record())
+			$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id',__LINE__,__FILE__);
+			while($GLOBALS['egw_setup']->oProc->next_record())
 			{
-				$cal_id = $GLOBALS['phpgw_setup']->oProc->f('cal_id');
-				$cal_type = $GLOBALS['phpgw_setup']->oProc->f('cal_type');
-				if(isset($GLOBALS['phpgw_setup']->oProc->Record['cal_end']))
+				$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
+				$cal_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
+				if(isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
 				{
-					$enddate = mktime(0,0,0,intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_end'),4,2)),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_end'),6,2)),intval(substr($GLOBALS['phpgw_setup']->oProc->f('cal_end'),0,4)));
+					$enddate = mktime(0,0,0,intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),0,4)));
 					$useend = 1;
 				}
 				else
@@ -302,14 +293,14 @@
 					$enddate = 0;
 					$useend = 0;
 				}
-				$cal_frequency = $GLOBALS['phpgw_setup']->oProc->f('cal_frequency');
-				$cal_days = $GLOBALS['phpgw_setup']->oProc->f('cal_days');
+				$cal_frequency = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
+				$cal_days = $GLOBALS['egw_setup']->oProc->f('cal_days');
 				$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')",__LINE__,__FILE__);
 			}
 		}
 	
-		$GLOBALS['phpgw_setup']->oProc->DropTable('webcal_entry_repeats');
-		$GLOBALS['phpgw_setup']->oProc->query("UPDATE $appstable SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
+		$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
 	
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -318,21 +309,21 @@
 	$test[] = "0.9.7pre2";
 	function calendar_upgrade0_9_7pre2()
 	{
-		$db2 = $GLOBALS['phpgw_setup']->db;
+		$db2 = $GLOBALS['egw_setup']->db;
 	
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('calendar_entry', 'cal_duration', 'cal_edatetime');
-		$GLOBALS['phpgw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id',__LINE__,__FILE__);
-		if($GLOBALS['phpgw_setup']->oProc->num_rows())
+		$GLOBALS['egw_setup']->oProc->RenameColumn('calendar_entry', 'cal_duration', 'cal_edatetime');
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id',__LINE__,__FILE__);
+		if($GLOBALS['egw_setup']->oProc->num_rows())
 		{
-			while($GLOBALS['phpgw_setup']->oProc->next_record())
+			while($GLOBALS['egw_setup']->oProc->next_record())
 			{
-				$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['phpgw_setup']->db->f('cal_owner'),__LINE__,__FILE__);
+				$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'),__LINE__,__FILE__);
 				$db2->next_record();
 				$tz = $db2->f('preference_value');
-				$cal_id = $GLOBALS['phpgw_setup']->oProc->f('cal_id');
-				$datetime = $GLOBALS['phpgw_setup']->oProc->f('cal_datetime') - ((60 * 60) * $tz);
-				$mdatetime = $GLOBALS['phpgw_setup']->oProc->f('cal_mdatetime') - ((60 * 60) * $tz);
-				$edatetime = $datetime + (60 * $GLOBALS['phpgw_setup']->oProc->f('cal_edatetime'));
+				$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
+				$datetime = $GLOBALS['egw_setup']->oProc->f('cal_datetime') - ((60 * 60) * $tz);
+				$mdatetime = $GLOBALS['egw_setup']->oProc->f('cal_mdatetime') - ((60 * 60) * $tz);
+				$edatetime = $datetime + (60 * $GLOBALS['egw_setup']->oProc->f('cal_edatetime'));
 				$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id,__LINE__,__FILE__);
 			}
 		}
@@ -579,7 +570,7 @@
 	$test[] = '0.9.11.001';
 	function calendar_upgrade0_9_11_001()
 	{
-		$db2 = $GLOBALS['phpgw_setup']->db;
+		$db2 = $GLOBALS['egw_setup']->db;
 
 		if(extension_loaded('mcal') == False)
 		{
@@ -600,7 +591,7 @@
 		}
 
 // calendar_entry => phpgw_cal
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_cal',
+		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal',
 			Array(
 				'fd' => array(
 					'cal_id' => array('type' => 'auto', 'nullable' => False),
@@ -623,12 +614,12 @@
 			)
 		);
 
-		$GLOBALS['phpgw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
-		while($GLOBALS['phpgw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
+		while($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$id = $GLOBALS['phpgw_setup']->oProc->f('cal_id');
-			$owner = $GLOBALS['phpgw_setup']->oProc->f('cal_owner');
-			$access = $GLOBALS['phpgw_setup']->oProc->f('cal_access');
+			$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
+			$owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
+			$access = $GLOBALS['egw_setup']->oProc->f('cal_access');
 			switch($access)
 			{
 				case 'private':
@@ -641,22 +632,22 @@
 					$is_public = 2;
 					break;
 			}
-			$groups = $GLOBALS['phpgw_setup']->oProc->f('cal_group');
-			$datetime = $GLOBALS['phpgw_setup']->oProc->f('cal_datetime');
-			$mdatetime = $GLOBALS['phpgw_setup']->oProc->f('cal_mdatetime');
-			$edatetime = $GLOBALS['phpgw_setup']->oProc->f('cal_edatetime');
-			$priority = $GLOBALS['phpgw_setup']->oProc->f('cal_priority');
-			$type = $GLOBALS['phpgw_setup']->oProc->f('cal_type');
-			$title = $GLOBALS['phpgw_setup']->oProc->f('cal_name');
-			$description = $GLOBALS['phpgw_setup']->oProc->f('cal_description');
+			$groups = $GLOBALS['egw_setup']->oProc->f('cal_group');
+			$datetime = $GLOBALS['egw_setup']->oProc->f('cal_datetime');
+			$mdatetime = $GLOBALS['egw_setup']->oProc->f('cal_mdatetime');
+			$edatetime = $GLOBALS['egw_setup']->oProc->f('cal_edatetime');
+			$priority = $GLOBALS['egw_setup']->oProc->f('cal_priority');
+			$type = $GLOBALS['egw_setup']->oProc->f('cal_type');
+			$title = $GLOBALS['egw_setup']->oProc->f('cal_name');
+			$description = $GLOBALS['egw_setup']->oProc->f('cal_description');
 
 			$db2->query("INSERT INTO phpgw_cal(cal_id,owner,groups,datetime,mdatetime,edatetime,priority,cal_type,is_public,title,description) "
 				. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')",__LINE__,__FILE__);
 		}
-		$GLOBALS['phpgw_setup']->oProc->DropTable('calendar_entry');
+		$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry');
 
 // calendar_entry_repeats => phpgw_cal_repeats
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_cal_repeats',
+		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
 			Array(
 				'fd' => array(
 					'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
@@ -672,11 +663,11 @@
 				'uc' => array()
 			)
 		);
-		$GLOBALS['phpgw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
-		while($GLOBALS['phpgw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
+		while($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$id = $GLOBALS['phpgw_setup']->oProc->f('cal_id');
-			$recur_type = $GLOBALS['phpgw_setup']->oProc->f('cal_type');
+			$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
+			$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
 			switch($recur_type)
 			{
 				case 'daily':
@@ -695,10 +686,10 @@
 					$recur_type_num = RECUR_YEARLY;
 					break;
 			}
-			$recur_end_use = $GLOBALS['phpgw_setup']->oProc->f('cal_use_end');
-			$recur_end = $GLOBALS['phpgw_setup']->oProc->f('cal_end');
-			$recur_interval = $GLOBALS['phpgw_setup']->oProc->f('cal_frequency');
-			$days = strtoupper($GLOBALS['phpgw_setup']->oProc->f('cal_days'));
+			$recur_end_use = $GLOBALS['egw_setup']->oProc->f('cal_use_end');
+			$recur_end = $GLOBALS['egw_setup']->oProc->f('cal_end');
+			$recur_interval = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
+			$days = strtoupper($GLOBALS['egw_setup']->oProc->f('cal_days'));
 			$recur_data = 0;
 			$recur_data += (substr($days,0,1)=='Y'?M_SUNDAY:0);
 			$recur_data += (substr($days,1,1)=='Y'?M_MONDAY:0);
@@ -710,10 +701,10 @@
 			$db2->query("INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_use_end,recur_enddate,recur_interval,recur_data) "
 				. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)",__LINE__,__FILE__);
 		}
-		$GLOBALS['phpgw_setup']->oProc->DropTable('calendar_entry_repeats');
+		$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry_repeats');
 
 // calendar_entry_user => phpgw_cal_user
-		$GLOBALS['phpgw_setup']->oProc->RenameTable('calendar_entry_user','phpgw_cal_user');
+		$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user','phpgw_cal_user');
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.002';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -729,7 +720,7 @@
 	$test[] = '0.9.11.003';
 	function calendar_upgrade0_9_11_003()
 	{
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_cal_holidays',
+		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 			Array(
 				'fd' => array(
 					'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
@@ -764,8 +755,8 @@
 	$test[] = '0.9.11.006';
 	function calendar_upgrade0_9_11_006()
 	{
-		$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_cal_holidays');
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_cal_holidays',
+		$GLOBALS['egw_setup']->oProc->DropTable('phpgw_cal_holidays');
+		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 			Array(
 				'fd' => array(
 					'hol_id' => array('type' => 'auto','nullable' => False),
@@ -787,11 +778,11 @@
 	$test[] = '0.9.11.007';
 	function calendar_upgrade0_9_11_007()
 	{
-		$GLOBALS['phpgw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_holidays','mday',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_holidays','month_num',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_holidays','occurence',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_holidays','dow',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+		$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','mday',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','month_num',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','occurence',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','dow',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.008';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -807,8 +798,8 @@
 	$test[] = '0.9.11.009';
 	function calendar_upgrade0_9_11_009()
 	{
-		$GLOBALS['phpgw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_holidays','observance_rule',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+		$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','observance_rule',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.010';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -843,7 +834,7 @@
 	$test[] = '0.9.13.002';
 	function calendar_upgrade0_9_13_002()
 	{
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal','reference',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','reference',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.003';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -852,7 +843,7 @@
 	$test[] = '0.9.13.003';
 	function calendar_upgrade0_9_13_003()
 	{
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_cal_alarm',
+		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
 			Array(
 				'fd' => array(
 					'alarm_id' => array('type' => 'auto','nullable' => False),		
@@ -868,8 +859,8 @@
 			)
 		);
 
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal','uid',array('type' => 'varchar', 'precision' => 255,'nullable' => False));
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal','location',array('type' => 'varchar', 'precision' => 255,'nullable' => True));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','uid',array('type' => 'varchar', 'precision' => 255,'nullable' => False));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','location',array('type' => 'varchar', 'precision' => 255,'nullable' => True));
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.004';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -878,7 +869,7 @@
 	$test[] = '0.9.13.004';
 	function calendar_upgrade0_9_13_004()
 	{
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_alarm','alarm_enabled',array('type' => 'int', 'precision' => 4,'nullable' => False, 'default' => '1'));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm','alarm_enabled',array('type' => 'int', 'precision' => 4,'nullable' => False, 'default' => '1'));
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.005';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -888,18 +879,18 @@
 	function calendar_upgrade0_9_13_005()
 	{
 		$calendar_data = Array();
-		$GLOBALS['phpgw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
-		while($GLOBALS['phpgw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
+		while($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$calendar_data[$GLOBALS['phpgw_setup']->oProc->f('cal_id')] = $GLOBALS['phpgw_setup']->oProc->f('category');
+			$calendar_data[$GLOBALS['egw_setup']->oProc->f('cal_id')] = $GLOBALS['egw_setup']->oProc->f('category');
 		}
 
-		$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_cal','category',array('type' => 'varchar', 'precision' => 30,'nullable' => True));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','category',array('type' => 'varchar', 'precision' => 30,'nullable' => True));
 
 		@reset($calendar_data);
 		while($calendar_data && list($cal_id,$category) = each($calendar_data))
 		{
-			$GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id,__LINE__,__FILE__);		
+			$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id,__LINE__,__FILE__);		
 		}
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.006';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -908,7 +899,7 @@
 	$test[] = '0.9.13.006';
 	function calendar_upgrade0_9_13_006()
 	{
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_repeats','recur_exception',array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats','recur_exception',array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.007';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -918,14 +909,14 @@
 	$test[] = '0.9.13.007';
 	function calendar_upgrade0_9_13_007()
 	{
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
 			'type' => 'varchar',
 			'precision' => '1',
 			'nullable' => False,
 			'default' => 'u'
 		));
 
-		$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
 				'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
@@ -937,7 +928,7 @@
 			'uc' => array()
 		));
 
-		$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_cal_alarm');
+		$GLOBALS['egw_setup']->oProc->DropTable('phpgw_cal_alarm');
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.002';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -948,7 +939,7 @@
 	function calendar_upgrade0_9_16_001()
 	{
 		// this is to set the default as schema_proc was not setting an empty default
-		$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
 			'type' => 'varchar',
 			'precision' => '1',
 			'nullable' => False,
@@ -965,7 +956,7 @@
 	$test[] = '0.9.16.002';
 	function calendar_upgrade0_9_16_002()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+		$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
 				'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
@@ -989,7 +980,7 @@
 	$test[] = '0.9.16.003';
 	function calendar_upgrade0_9_16_003()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
+		$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
 				'cal_login' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
@@ -1010,7 +1001,7 @@
 	$test[] = '0.9.16.004';
 	function calendar_upgrade0_9_16_004()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
+		$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
 			'fd' => array(
 				'hol_id' => array('type' => 'auto','nullable' => False),
 				'locale' => array('type' => 'char','precision' => '2','nullable' => False),
@@ -1037,14 +1028,14 @@
 	{
 		// creates uid's for all entries which do not have unique ones, they are '-@domain.com'
 		// very old entries even have an empty uid, see 0.9.16.006 update
-		$GLOBALS['phpgw_setup']->oProc->query("SELECT config_name,config_value FROM phpgw_config WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'",__LINE__,__FILE__);
-		while ($GLOBALS['phpgw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'",__LINE__,__FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$config[$GLOBALS['phpgw_setup']->oProc->f(0)] = $GLOBALS['phpgw_setup']->oProc->f(1);
+			$config[$GLOBALS['egw_setup']->oProc->f(0)] = $GLOBALS['egw_setup']->oProc->f(1);
 		}
-		$GLOBALS['phpgw_setup']->oProc->query('UPDATE phpgw_cal SET uid='.
-			$GLOBALS['phpgw_setup']->db->concat($GLOBALS['phpgw_setup']->db->quote('cal-'),'cal_id',
-				$GLOBALS['phpgw_setup']->db->quote('-'.$config['install_id'].'@'.
+		$GLOBALS['egw_setup']->oProc->query('UPDATE phpgw_cal SET uid='.
+			$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'),'cal_id',
+				$GLOBALS['egw_setup']->db->quote('-'.$config['install_id'].'@'.
 				($config['mail_suffix'] ? $config['mail_suffix'] : 'local'))).
 			" WHERE uid LIKE '-@%' OR uid=''");
 
@@ -1066,7 +1057,7 @@
 	function calendar_upgrade0_9_16_007()
 	{
 		// update the sequenzes for refreshed tables (postgres only)
-		$GLOBALS['phpgw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
+		$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
 		
 		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1076,19 +1067,19 @@
 	$test[] = '1.0.0';
 	function calendar_upgrade1_0_0()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','uid','cal_uid');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','owner','cal_owner');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','category','cal_category');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','groups','cal_groups');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','datetime','cal_starttime');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','mdatetime','cal_modified');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','edatetime','cal_endtime');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','priority','cal_priority');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','is_public','cal_public');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','title','cal_title');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','description','cal_description');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','location','cal_location');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal','reference','cal_reference');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','uid','cal_uid');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','owner','cal_owner');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','category','cal_category');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','groups','cal_groups');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','datetime','cal_starttime');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','mdatetime','cal_modified');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','edatetime','cal_endtime');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','priority','cal_priority');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','is_public','cal_public');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','title','cal_title');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','description','cal_description');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','location','cal_location');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','reference','cal_reference');
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.001';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1098,13 +1089,13 @@
 	$test[] = '1.0.0.001';
 	function calendar_upgrade1_0_0_001()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_holidays','locale','hol_locale');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_holidays','name','hol_name');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_holidays','mday','hol_mday');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_holidays','month_num','hol_month_num');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_holidays','occurence','hol_occurence');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_holidays','dow','hol_dow');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_holidays','observance_rule','hol_observance_rule');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','locale','hol_locale');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','name','hol_name');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','mday','hol_mday');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','month_num','hol_month_num');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','occurence','hol_occurence');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','dow','hol_dow');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','observance_rule','hol_observance_rule');
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.002';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1114,8 +1105,8 @@
 	$test[] = '1.0.0.002';
 	function calendar_upgrade1_0_0_002()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_login','cal_user_id');
-		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_type','cal_user_type');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_login','cal_user_id');
+		$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_type','cal_user_type');
 
 		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.003';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1125,7 +1116,7 @@
 	$test[] = '1.0.0.003';
 	function calendar_upgrade1_0_0_003()
 	{
-		$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
 			'type' => 'varchar',
 			'precision' => '255',
 			'nullable' => False,
@@ -1140,7 +1131,7 @@
 	$test[] = '1.0.0.004';
 	function calendar_upgrade1_0_0_004()
 	{
-		$GLOBALS['phpgw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+		$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
 				'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
@@ -1159,4 +1150,300 @@
 		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.005';
 		return $GLOBALS['setup_info']['calendar']['currentver'];
 	}
+
+
+	$test[] = '1.0.0.005';
+	function calendar_upgrade1_0_0_005()
+	{
+		// change prefix of all calendar tables to egw_
+		foreach(array('cal','cal_user','cal_repeats','cal_extra','cal_holidays') as $name)
+		{
+			$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name,'egw_'.$name);
+		}
+
+		// create new dates table, with content from the egw_cal table
+		$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates',array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
+				'cal_start' => array('type' => 'int','precision' => '8','nullable' => False),
+				'cal_end' => array('type' => 'int','precision' => '8','nullable' => False)
+			),
+			'pk' => array('cal_id','cal_start'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		));
+		$GLOBALS['egw_setup']->oProc->query("INSERT INTO egw_cal_dates SELECT cal_id,cal_starttime,cal_endtime FROM egw_cal");
+
+		// drop the fields transfered to the dates table
+		$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+			'fd' => array(
+				'cal_id' => array('type' => 'auto','nullable' => False),
+				'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
+				'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
+				'cal_category' => array('type' => 'varchar','precision' => '30'),
+				'cal_groups' => array('type' => 'varchar','precision' => '255'),
+				'cal_modified' => array('type' => 'int','precision' => '8'),
+				'cal_endtime' => array('type' => 'int','precision' => '8'),
+				'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
+				'cal_type' => array('type' => 'varchar','precision' => '10'),
+				'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
+				'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+				'cal_description' => array('type' => 'text'),
+				'cal_location' => array('type' => 'varchar','precision' => '255'),
+				'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			),
+			'pk' => array('cal_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'cal_starttime');
+		$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+			'fd' => array(
+				'cal_id' => array('type' => 'auto','nullable' => False),
+				'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
+				'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
+				'cal_category' => array('type' => 'varchar','precision' => '30'),
+				'cal_groups' => array('type' => 'varchar','precision' => '255'),
+				'cal_modified' => array('type' => 'int','precision' => '8'),
+				'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
+				'cal_type' => array('type' => 'varchar','precision' => '10'),
+				'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
+				'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+				'cal_description' => array('type' => 'text'),
+				'cal_location' => array('type' => 'varchar','precision' => '255'),
+				'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			),
+			'pk' => array('cal_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'cal_endtime');
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.001';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.001';
+	function calendar_upgrade1_0_1_001()
+	{
+		/* done by RefreshTable() anyway
+		$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_recur_date',array(
+			'type' => 'int',
+			'precision' => '8',
+			'default' => '0'
+		));*/
+		$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+				'cal_recur_date' => array('type' => 'int','precision' => '8','default' => '0'),
+				'cal_user_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u'),
+				'cal_user_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+				'cal_status' => array('type' => 'char','precision' => '1','default' => 'A')
+			),
+			'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		));
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.002';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.002';
+	function calendar_upgrade1_0_1_002()
+	{
+		$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+			'fd' => array(
+				'cal_id' => array('type' => 'auto','nullable' => False),
+				'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
+				'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
+				'cal_category' => array('type' => 'varchar','precision' => '30'),
+				'cal_groups' => array('type' => 'varchar','precision' => '255'),
+				'cal_modified' => array('type' => 'int','precision' => '8'),
+				'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
+				'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
+				'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+				'cal_description' => array('type' => 'text'),
+				'cal_location' => array('type' => 'varchar','precision' => '255'),
+				'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			),
+			'pk' => array('cal_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'cal_type');
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_owner',array(
+			'type' => 'int',
+			'precision' => '4',
+			'nullable' => False
+		));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_priority',array(
+			'type' => 'int',
+			'precision' => '2',
+			'nullable' => False,
+			'default' => '2'
+		));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_public',array(
+			'type' => 'int',
+			'precision' => '2',
+			'nullable' => False,
+			'default' => '1'
+		));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_reference',array(
+			'type' => 'int',
+			'precision' => '4',
+			'nullable' => False,
+			'default' => '0'
+		));
+		$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_modifier',array(
+			'type' => 'int',
+			'precision' => '4'
+		));
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.003';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.003';
+	function calendar_upgrade1_0_1_003()
+	{
+		$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
+				'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
+				'recur_enddate' => array('type' => 'int','precision' => '8'),
+				'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
+				'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
+				'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			),
+			'pk' => array('cal_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'recur_use_end');
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','cal_id',array(
+			'type' => 'int',
+			'precision' => '4',
+			'nullable' => False
+		));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_type',array(
+			'type' => 'int',
+			'precision' => '2',
+			'nullable' => False
+		));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_interval',array(
+			'type' => 'int',
+			'precision' => '2',
+			'default' => '1'
+		));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_data',array(
+			'type' => 'int',
+			'precision' => '2',
+			'default' => '1'
+		));
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.004';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.004';
+	function calendar_upgrade1_0_1_004()
+	{
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+			'type' => 'int',
+			'precision' => '4',
+			'nullable' => False,
+			'default' => '0'
+		));
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+			'type' => 'int',
+			'precision' => '4',
+			'nullable' => False,
+			'default' => '0'
+		));
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.005';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.005';
+	function calendar_upgrade1_0_1_005()
+	{
+		$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_quantity',array(
+			'type' => 'int',
+			'precision' => '4',
+			'default' => '1'
+		));
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.006';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.006';
+	function calendar_upgrade1_0_1_006()
+	{
+		$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_non_blocking',array(
+			'type' => 'int',
+			'precision' => '2',
+			'default' => '0'
+		));
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.007';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.007';
+	function calendar_upgrade1_0_1_007()
+	{
+		$GLOBALS['egw_setup']->db->update('egw_cal_repeats',array('recur_exception' => null),array('recur_exception' => ''),__LINE__,__FILE__,'calendar');
+
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_exception',array(
+			'type' => 'text'
+		));
+
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.008';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
+
+
+	$test[] = '1.0.1.008';
+	function calendar_upgrade1_0_1_008()
+	{
+		$config =& CreateObject('phpgwapi.config','calendar');
+		$config_data = $config->read_repository();
+		if (isset($config_data['fields']))	// old custom fields
+		{
+			$customfields = array();
+			$order = 0;
+			foreach($config_data['fields'] as $name => $data)
+			{
+				if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
+				{
+					$customfields[substr($name,1)] = array(
+						'type'  => 'text',
+						'len'   => $data['length'].($data['shown'] ? ','.$data['shown'] : ''),
+						'label' => $data['name'],
+						'order' => ($order += 10),
+					);
+				}
+			}
+			if (count($customfields))
+			{
+				$config->save_value('customfields',$customfields);
+			}
+			$config->delete_value('fields');
+			$config->save_repository();		// delete_value does not save
+		}
+		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.009';
+		return $GLOBALS['setup_info']['calendar']['currentver'];
+	}
 ?>
diff --git a/calendar/templates/default/alarm.tpl b/calendar/templates/default/alarm.tpl
deleted file mode 100755
index 90ba695990..0000000000
--- a/calendar/templates/default/alarm.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN alarm_management -->
-<form id="calendar_alarmform" action="{action_url}" method="post" name="alarmform">
-{hidden_vars}
-	<table id="calendar_alarmform_table" border="0" width="90%" align="center">
-		{rows}
-		<tr>
-			<td colspan="4">
-				<br>&nbsp;{input_days}&nbsp;{input_hours}&nbsp;{input_minutes}&nbsp;{input_owner}&nbsp;{input_add}<br>&nbsp;
-			</td>
-			<td align="right">
-				{input_cancel}
-			</td>
-		</tr>
-	</table>
-</form>
-<!-- END alarm_management -->
-
-<!-- BEGIN alarm_headers -->
-	<tr bgcolor="{tr_color}">
-		<th align="left" width="25%">{lang_time}</th>
-		<th align="left" width="30%">{lang_text}</th>
-		<th align="left" width="25%">{lang_owner}</th>
-		<th width="10%">{lang_enabled}</th>
-		<th width="10%">{lang_select}</th>
-	</tr>
-<!-- END alarm_headers -->
-
-<!-- BEGIN list -->
-	<tr bgcolor="{tr_color}">
-		<td>
-			<b>{field}:</b>
-		</td>
-		<td>
-			{data}
-		</td>
-		<td>
-			{owner}
-		</td>
-		<td align="center">
-			{enabled}
-		</td>
-		<td align="center">
-			{select}
-		</td>
-	</tr>
-<!-- END list -->
-
-<!-- BEGIN hr -->
-	<tr bgcolor="{th_bg}">
-		<td colspan="5" align="center">
-			<b>{hr_text}</b>
-		</td>
-	</tr>
-<!-- END hr -->
-
-<!-- BEGIN buttons -->
-	<tr>
-		<td colspan="6" align="right">
-			{enable_button}&nbsp;{disable_button}&nbsp;{delete_button}
-		</td>
-	</tr>
-<!-- END buttons -->
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index c10ed90e6f..0613be10a5 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1,10 +1,30 @@
-/* CSS Document */
+/* $Id$ */
 
-/*
- * CSS settings for the new uiviews code
- */
+/******************************************************************
+ * CSS settings for the day, week and month view (timeGridWidget) *
+ ******************************************************************/
 
 .redItalic { color: red; font-style: italic; }
+.size120b { font-size: 120%; font-weight: bold; }
+
+/* marks a day in the colum-header as today
+ */
+.calToday{
+	background: #ffffcc;
+}
+/* marks a day in the colum-header as holiday
+ */
+.calHoliday{
+	background: #dac0c0;
+}
+/* marks a day in the column-header additionaly as birthday of some contact,
+ * it should work together with the backgrounds of calToday, calHoliday, th, row_on and row_off
+ */
+.calBirthday,.calBirthday a{
+	color: black;
+	font-weight: bold;
+	font-style: italic;
+}
 
 /* timeGridWidget, contains timeRow's and dayCol's
  */
@@ -12,20 +32,21 @@
 	position: relative;
 	top: 0px;
 	left: 0px;
-	border:1px solid gray;
-	margin-top: 20px;	/* contains the dayColHeader */
+	border:1px solid silver;
+	width: 100%;
 /* set via inline style on runtime:
- *  width:
+ *  height:
  */
 }
 
 /* single row in the time-line, always used in conjunction with row_{on|off}, you dont need to set a bgcolor, but you can
  */
 .calTimeRow,.calTimeRowOff{
-	position: relative;
+	position: absolute;
 	width: 100%;
 /* set via inline style on runtime:
  *  height:
+ *  top:
  */
 }
 .calTimeRow{
@@ -47,6 +68,8 @@
 	position: absolute;
 	top: 0px;
 	height: 100%;
+	left: 50px;
+	right: 0px;
 /* set via inline style on runtime:
  *  left:  width(calTimeRowTime)
  *  width: 100% - width(calTimeRowTime)
@@ -63,28 +86,24 @@
  *  left:
  *  width:
  */
-	border-left: 1px solid gray;
+	border-left: 1px solid silver;
 }
 
 /* header for the dayCol
  */
 .calDayColHeader,.calGridHeader{
 	position: absolute;
-	top: -20px;
+	top: 0px;
 	width: 100%;
 	text-align: center;
 	font-size: 100%;
 	white-space: nowrap;
-	border: 1px solid gray;
+	border-bottom: 1px solid gray;
+	border-right: 1px solid gray;
 	height: 16px;
-	left: -1px;
-	padding-top: 2px;
-}
-.calToday{
-	background: #ffffcc;
-}
-.calHoliday{
-	background: #dac0c0;
+	line-height: 16px;
+	left: 0px;
+	z-index: 10;
 }
 
 .calViewUserNameBox {
@@ -130,20 +149,20 @@
  *  left:
  *  width:
  */
-/*	border: 1px dotted red; */
 }
 
 /* contains one event: header-row & -body
  */
-.calEvent,.calEvent:hover{
+.calEvent,.calEventPrivate{
 	position: absolute;
-/*	background-color: #ffffC0;*/
 	left: 0px;
 	width: 100%;
 	overflow: hidden;
+	z-index: 20;
 /* set via inline style on runtime:
  *  top: depending on startime
- *  top: depending on length
+ *  height: depending on length
+ *  background-color: depending on category
  */
 }
 .calEvent:hover{
@@ -152,6 +171,18 @@
 	cursor: hand;
 }
 
+.calAddEvent{
+	position: absolute;
+	width: 100%;
+	z-index: 10;
+}
+
+.calAddEvent:hover{
+	background-color: #D2D7FF;
+	cursor: pointer;
+	cursor: hand;
+}
+
 /* header-row of the event
  */
 .calEventHeader,.calEventHeaderSmall{
@@ -189,286 +220,153 @@
 	font-size: 110%;
 }
 
-/* cal day-view's todo column
- */
-.calDayToDos {
-	width: 250px;
-	text-align: center;
-}
-/* header row
+/* table of the dayView containing 2 cols: 1) day-view, 2) todos
 */
+.calDayView{
+	width: 100%;
+}
+/* calDayTods is the day-view's todo column, containing the calDayTodoHeader and the calDayTodoTable
+ */
 .calDayTodos .calDayTodosHeader {
 	margin: 0px; 
 	padding: 2px;
 	font-weight: bold;
 }
-/* div containing the table with the ToDo's
-*/
 .calDayTodos .calDayTodosTable {
 	overflow: auto; 
 	max-height: 400px;
 }
+.calDayTodos {
+	width: 250px;
+	text-align: center;
+	margin-left: 10px;
+	border: 1px solid silver;
+}
 
-/*
- * From here on, settings for the "old" uicalendar code
+/******************************************************
+ * CSS settings for the planner views (plannerWidget) *
+ ******************************************************/
+ 
+/* plannerWidget represents the whole planner, consiting of the plannerHeader and multiple plannerRowWidgets
  */
-.to_continue
-{
-	font-size: 9px;
+.plannerWidget {
+	position: relative;
+	top: 0px;
+	left: 0px;
+	width: 99.5%;
+	border: 1px solid gray;
+	padding-right: 3px;
 }
 
-A.minicalendar 
-{ 
-	color: #000000; 
-	font-size: 9px;
-	
+/* plannerHeader contains a plannerHeaderTitle and multiple plannerHeaderRows
+ */
+.plannerHeader {
+	position: relative;
+	top: 0px;
+	left: 0px;
+	width: 100%;
 }
 
-A.bminicalendar 
-{ 
-	color: #336699; 
-	font-style: italic;
-	font-weight: bold;
-	font-size: 9px;
+/* plannerRowWidget contains a plannerRowHeader and multiple eventRowWidgets in an eventRows
+ */
+.plannerRowWidget {
+	position: relative;
+	top: 0px;
+	left: 0px;
+	width: 100%;
 }
 
-A.minicalendargrey 
-{ 
-	color: #999999; 
-	font-size: 10px;
+/* plannerScale represents a scale-row of the plannerHeader, containing multiple planner{Day|Week|Month}Scales
+ */
+.plannerScale,.plannerScaleDay{
+	position: relative;
+	top: 0px;
+	left: 0%;
+	width: 100%;
+	height: 20px;
+	line-height: 20px;
+}
+.plannerScaleDay {
+	height: 28px;
+	line-height: 14px;
+}
+.plannerDayScale,.plannerMonthScale,.plannerWeekScale,.plannerHourScale {
+	position: absolute;
+	top: 0px;
+	/* left+width: is set by the code on runtime */
+	text-align: center;
+	height: 100%;
+	border: 1px solid white;
+/* set via inline style on runtime:
+ *  left: 
+ *  width: 
+ */
+}
+.plannerHourScale {
+	font-size: 90%;
+}
+.plannerDayScale {
+	font-size: 90%;
+}
+.plannerWeekScale {
+	line-height: 20px;
+}
+.plannerMonthScale {
 	font-weight: bold;
 }
-
-A.bminicalendargrey 
-{ 
-	color: #336699; 
-	font-style: italic; 
-	font-size:10px;
-}
-
-A.minicalhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #000000; 
-	font-size: 10px;
-}
-
-A.bminicalhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #336699; 
-	font-size: 10px;
-}
-
-A.minicalgreyhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #999999; 
-	font-size: 10px;
-}
-
-A.bminicalgreyhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #999999; 
-	font-size: 10px;
-}
-
-
-.event-on
-{ 
-	background: #D3DCE3;
-	border: #E8F0F0 1px solid;
-}
-
-.event-off
-{ 
-	background: #E8F0F0;
-	border: #D3DCE3 1px solid;
-}
-
-.event-holiday
-{
-	font-size: 100%;
-	background: #dac0c0;
-	color:#000000;
+.plannerDayScale img,.plannerWeekScale img,.plannerMonthScale img {
 	vertical-align: middle;
 }
 
-.time
-{
-	background: #D3DCE3;
-	color:#000000;
-	font-size: 10px;
-	font-weight: bold;
-	vertical-align: middle;
-	width: 5.2%;
-	text-align: right;
-	padding-right: 5px;
-	line-height: 11px;
-	border: #E8F0F0 1px solid;
+/* plannerRowHeader contains the user or category name of the plannerRowWidget
+ */
+.plannerRowHeader, .plannerHeaderTitle {
+	position: absolute;
+	top: 0px;
+	left: 0%;
+	width: 15%;		/* need to be identical for plannerRowHeader and plannerHeaderTitle and match left of eventRows/plannerHeaderRows */
+	height: 100%;
+	line-height: 20px;
+	border: 1px solid white;
 }
 
+/* eventRows contain multiple eventRowWidgets
+ */
+.eventRows, .plannerHeaderRows {
+	position: relative;
+	top: 0px;
+	left: 15%;	/* need to be identical for eventRows and plannerHeaderRows and match width of plannerRowHeader/plannerHeaderTitle */
+	width: 85%;
+}
 
-.planner-cell
-{
+/* eventRowWidget contains non-overlapping events
+ */
+.eventRowWidget {
+	position: relative;
+	top: 0px;
+	left: 0px;
+	width: 100%;
+	height: 20px;
+	border: 1px solid white;
+}
+
+.plannerEvent,.plannerEventPrivate{
+	position: absolute;
+	top: 0px;
+	height: 100%;
+	overflow: hidden;
+	z-index: 20;
+	border: 1px solid black;
+/* set via inline style on runtime:
+ *  left: depending on startime
+ *  width: depending on length
+ *  background-color: depending on category
+ */
+}
+.plannerEvent img,.plannerEventPrivate img {
+	padding-top: 2px;
+}
+.plannerEvent:hover{
 	cursor: pointer;
 	cursor: hand;
-	border: thin solid black;
-}
-
-/* common */
-.calendar_link_print
-{
-	text-align: center;
-	font-size: 10px;
-}
-
-//Mini Calendar
-
-.calendar_minical_table
-{
-	width: 180px;
-	font-weight: bold;
-}
-
-.calendar_minical_daytable
-{
-	width: 100%;
-}
-
-.calendar_minical_dayname
-{
-	font-size: 9px;
-	text-align: right;
-}
-
-.calendar_minical_hrule
-{
-	width: 96%;
-}
-
-/* Header */
-.calendar_dropbuttons
-{
-	align: center;
-	text-align: center;
-	vertical-align: bottom;
-	font-weight: bold;
-	font-size: 8px;
-}
-
-.calendar-weekidentifier
-{
-	font-size:16px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_header
-{
-	font-size: 16px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_dayview_table_header
-{
-	font-size: 13px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_dayview_todo_header
-{
-	margin: 0px; 
-	padding: 2px;
-	font-weight: bold;
-}
-
-/* week view */
-.calendar_week_identifier_table
-{
-	border: 0px solid black;
-	width: 100%;
-}
-
-.calendar_week_identifier
-{
-	font-size: 13px;
-	text-align: center;
-	font-weight: bold;
-}
-
-.calendar_weekview_daytitle
-{
-	font-weight: bold;
-	font-size: 12px;
-	background: #D3DCE3;
-}
-
-.calendar_m_w_table
-{
-	table-layout:fixed;
-	overflow:auto;
-	height: 100%;
-	width: 100%;
-	border: 0px #000000 solid;
-}
-
-.calendar_m_w_table_row
-{
-	height: 80px;
-}
-
-.calendar_m_w_tablecell
-{
-	vertical-align: top;
-	padding-left: 4px;
-	padding-right: 4px;
-	padding-bottom: 6px;
-}
-
-A.event_entry
-{
-	font-size:10px;
-}
-
-/* month view */
-
-.calendar_month_identifier
-{
-	font-size:14px;
-	font-weight: bold;
-}
-
-.calendar_user_identifier
-{
-	font-size:12px;
-	color: #009999;
-	font-weight: bold;
-}
-
-.calendar_week_minical_table
-{
-	width:100%;
-	border: 0px solid #000000
-}
-
-.calendar_weekinfo
-{
-	color: #000000;
-	padding-left: 2px;
-	padding-right: 2px;
-	font-size: 10px;
-	font-weight: bold;
-	font-style: italic;
 }
diff --git a/calendar/templates/default/csv_import.tpl b/calendar/templates/default/csv_import.tpl
index b186ce50a8..50d8dd4beb 100644
--- a/calendar/templates/default/csv_import.tpl
+++ b/calendar/templates/default/csv_import.tpl
@@ -1,7 +1,7 @@
 <!-- BEGIN filename -->
-	  		<TR>
-	    		<TD>{lang_csvfile}</td>
-				<td><INPUT NAME="csvfile" SIZE=30 TYPE="file" VALUE="{csvfile}"></td>
+	  		<tr>
+	    		<td>{lang_csvfile}</td>
+				<td><input name="csvfile" SIZE=30 type="file" value="{csvfile}"></td>
 			</tr>
 			<tr>
 				<td>{lang_fieldsep}</td>
@@ -14,8 +14,11 @@
 				</td>
 			</tr>
 			<tr><td>&nbsp;</td>
-				<td><INPUT NAME="convert" TYPE="submit" VALUE="{submit}"></TD>
-			</TR>
+				<td><input name="convert" type="submit" value="{submit}"></td>
+			</tr>
+			<tr>
+				<td colspan="2">{lang_help}</td>
+			</tr>
 <!-- END filename -->
 
 <!-- BEGIN fheader -->
@@ -29,21 +32,21 @@
 <!-- BEGIN fields -->
 			<tr>
 				<td>{csv_field}</td>
-				<td><SELECT name="cal_fields[{csv_idx}]">{cal_fields}</select></td>
+				<td><select name="cal_fields[{csv_idx}]">{cal_fields}</select></td>
 				<td><input name="trans[{csv_idx}]" size=60 value="{trans}"></td>
 			</tr>
 <!-- END fields -->
 
 <!-- BEGIN ffooter -->
 			<tr>
-				<td rowspan="2" valign="middle" nowrap><br>{submit}</TD>
+				<td rowspan="2" valign="middle" nowrap><br>{submit}</td>
 				<td colspan="2"><br>
-					{lang_start} <INPUT name="start" type="text" size="5" value="{start}"> &nbsp; &nbsp;
-					{lang_max} <INPUT name="max" type="text" size="3" value="{max}"><td>
+					{lang_start} <input name="start" type="text" size="5" value="{start}"> &nbsp; &nbsp;
+					{lang_max} <input name="max" type="text" size="3" value="{max}"><td>
 			</tr>
 			<tr>
-				<td colspan="2"><INPUT name="debug" type="checkbox" value="1"{debug}> {lang_debug}</td>
-			</TR>
+				<td colspan="2"><input name="debug" type="checkbox" value="1"{debug}> {lang_debug}</td>
+			</tr>
 			<tr><td colspan="3">&nbsp;<p>
 				{help_on_trans}
 			</td></tr>
@@ -55,20 +58,15 @@
 					{log}<p>
 					{anz_imported}
 				</td>
-			</TR>
+			</tr>
 <!-- END imported -->
 
 <!-- BEGIN import -->
-<br/>
-<center>
-		<form {enctype} action="{action_url}" method="post">
-		<table>
-
-		{rows}
-
-		</table>
-		{hiddenvars}
-		</form>
-
-</center>
+<br />
+<form {enctype} action="{action_url}" method="post">
+{hiddenvars}
+	<table align="center">
+{rows}
+	</table>
+</form>
 <!-- END import -->
diff --git a/calendar/templates/default/custom_fields.tpl b/calendar/templates/default/custom_fields.tpl
deleted file mode 100644
index 57bba92875..0000000000
--- a/calendar/templates/default/custom_fields.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN custom_fields -->
-{lang_error}<br>
-<form action="{action_url}" method="post">
- {hidden_vars}
- <center>
-  <table border="0" width="90%">
-   <tr class="th">
-    <th align="left" width="30%">{lang_name}</th>
-    <th>{lang_length}</th>
-    <th>{lang_shown}</th>
-    <th>{lang_order}</th>
-    <th>{lang_title}</th>
-    <th>{lang_disabled}</th>
-    <th>&nbsp;</th>
-   </tr>
-   {rows}
-   <tr class="th">
-    <td>{name}</td>
-    <td align="center">{length}</td>
-    <td align="center">{shown}</td>
-    <td align="center">{order}</td>
-    <td align="center">{title}</td>
-    <td align="center">{disabled}</td>
-    <td align="center">{button}</td>
-   </tr>
-   <tr>
-    <td>{save_button} &nbsp; {cancel_button}</td>
-   </tr>
-  </table>
- </center>
-</form>
-<br>
-<!-- END custom_fields -->
-
-<!-- BEGIN row -->
-   <tr bgcolor="{tr_color}">
-    <td>{name}</td>
-    <td align="center">{length}</td>
-    <td align="center">{shown}</td>
-    <td align="center">{order}</td>
-    <td align="center">{title}</td>
-    <td align="center">{disabled}</td>
-    <td align="center">{button}</td>
-   </tr>
-<!-- END row -->
diff --git a/calendar/templates/default/day.tpl b/calendar/templates/default/day.tpl
deleted file mode 100755
index df9f66738a..0000000000
--- a/calendar/templates/default/day.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day -->
-{printer_friendly}
-<table id="calendar_dayview_table" class="calendar_dayview_table" border="0" width="100%">
-	<tr>
-		<td valign="top" width="70%">
-			<table id="calendar_dayview1" border="0" width=100%>
-				<tr>
-					<td class="calendar_dayview_table_header">
-      					{date}&nbsp;<span class="calendar_user_identifier">:&nbsp;{username}&nbsp;:</span>
-						<br />
-     				</td>
-    			</tr>
-				{day_events}
-   			</table>
-   			<p align="center">{print}</p>
-  		</td>
- 		 <td align="center" valign="top">
-  			 <table id="calendar_dayview2" width="100%">
-    			<tr>
-     				<td align="center">
-						{small_calendar}
-     				</td>
-    			</tr>
-    			<tr>
-     				<td align="center">
-      					<div class="th">
-       						<p class="calendar_dayview_todo_header">{lang_todos}</p>
-								{todos}
-      					</div>
-     				</td>
-    			</tr>
-   			</table>
-  		</td>
- 	</tr>
-</table>
-<!-- END day -->
-
-<!-- BEGIN day_event -->
-	<tr>
-		<td>
-
-			{daily_events}
-
-		</td>
-	</tr>
-<!-- END day_event -->
diff --git a/calendar/templates/default/day_cal.tpl b/calendar/templates/default/day_cal.tpl
deleted file mode 100755
index 552b309cf2..0000000000
--- a/calendar/templates/default/day_cal.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day -->
-<div class="th">
- <table class="calendar_dayview_maintable" width="100%" cellpadding="0">
-{row}
-</table>
- </div>
-<!-- END day -->
-<!-- BEGIN day_row -->
-    <tr>{time}{event}
-    </tr>
-<!-- END day_row -->
-<!-- BEGIN day_event_on -->
-     <td class="event-on"{extras}>&nbsp;{event}</td>
-<!-- END day_event_on -->
-<!-- BEGIN day_event_off -->
-     <td class="event-off"{extras}>&nbsp;{event}</td>
-<!-- END day_event_off -->
-<!-- BEGIN day_event_holiday -->
-     <td class="event-holiday"{extras}>&nbsp;{event}</td>
-<!-- END day_event_holiday -->
-<!-- BEGIN day_time -->
-     <td class="time" nowrap>{open_link}{time}{close_link}</td>
-<!-- END day_time -->
-
diff --git a/calendar/templates/default/day_list.tpl b/calendar/templates/default/day_list.tpl
deleted file mode 100755
index e1263b2cb2..0000000000
--- a/calendar/templates/default/day_list.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day -->
-<div class="event-off">
-<table border="0" width="100%" cellpadding="0">
-	<tr>
-		<td class="event-on">
-{row}
-		</td>
-	</tr>
-</table>
-</div>
-<!-- END day -->
-<!-- BEGIN day_row -->
-    <font style="font-size: 8pt;">{event}</font>
-<!-- END day_row -->
-<!-- BEGIN day_event_on -->
-	<font class="event-on">{event}</font>
-<!-- END day_event_on -->
-<!-- BEGIN day_event_off -->
-	<font class="event-on">{event}</font>
-<!-- END day_event_off -->
-<!-- BEGIN day_event_holiday -->
-	{event}
-<!-- END day_event_holiday -->
-<!-- BEGIN day_time -->
-	{time}
-     <!--<td class="time" nowrap>{open_link}{time}{close_link}</td>-->
-<!-- END day_time -->
-
diff --git a/calendar/templates/default/edit.tpl b/calendar/templates/default/edit.tpl
deleted file mode 100755
index cd53d39ce9..0000000000
--- a/calendar/templates/default/edit.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN edit_entry -->
-<center>
-<font color="#000000" face="{font}">
-
-<form action="{action_url}" method="post" name="app_form">
-{common_hidden}
-<table border="0" width="90%">
- <tr>
-  <td colspan="2">
-   <center><font size="+1"><b>{errormsg}</b></font></center>
-  </td>
- </tr>
-{row}
- <tr>
-  <td>
-  <table><tr valign="top">
-  <td>
-  <div style="padding-right: 2px">
-  	<input style="font-size:10px" type="submit" value="{submit_button}"></div></form>
-  </td>
-  <td>{cancel_button}</td>
-  </tr></table>
-  </td>
-  <td valign="top" align="right">{delete_button}</td>
- </tr>
-</table>
-</font>
-</center>
-<!-- END edit_entry -->
-<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
-  <td valign="top" width="35%">&nbsp;<b>{field}:</b></td>
-  <td valign="top" width="65%">{data}</td>
- </tr>
-<!-- END list -->
-<!-- BEGIN hr -->
- <tr bgcolor="{tr_color}">
-  <td colspan="2">
-   {hr_text}
-  </td>
- </tr>
-<!-- END hr -->
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 071a2f01b7..fa8de1edad 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -2,43 +2,49 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="calendar.edit.general" template="" lang="" group="0" version="1.0.1.001">
-		<grid width="100%">
+		<grid width="100%" height="200">
 			<columns>
 				<column width="95"/>
+				<column width="35%"/>
 				<column/>
 			</columns>
 			<rows>
 				<row class="row">
-					<description options=",,,start" value="Start Date/Time"/>
-					<date-time id="start"/>
+					<description options=",,,start" value="Start"/>
+					<date-time id="start" needed="1"/>
+					<checkbox id="whole_day" label="whole day" statustext="Event will occupy the whole day" options=",, ,disable"/>
 				</row>
 				<row class="row">
-					<description options=",,,end" value="End Date/Time"/>
-					<date-time id="end"/>
+					<description options=",,,end" value="End"/>
+					<date-time id="end" needed="1"/>
+					<button label="Freetime search" id="freetime" statustext="Find free timeslots where the selected participants are availible for the given timespan" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.freetimesearch')+values2url(this.form,'start,end,participants,recur_type,whole_day'),'ft_search','dependent=yes,width=700,height=500,scrollbars=yes,status=yes'); return false;"/>
 				</row>
 				<row class="row">
 					<description options=",,,location" value="Location"/>
-					<textbox size="80" maxlength="255" id="location"/>
+					<textbox size="80" maxlength="255" id="location" span="all"/>
 				</row>
-				<row class="row" valign="top">
+				<row class="row" valign="top" height="60">
 					<description options=",,,category" value="Category"/>
-					<listbox type="select-cat" rows="3" id="category"/>
+					<listbox type="select-cat" rows="3" id="category" span="all"/>
 				</row>
 				<row class="row">
 					<description options=",,,priority" value="Priority"/>
-					<menulist>
-						<menupopup type="select-priority" id="priority"/>
-					</menulist>
+					<hbox span="all" orient=",0,0">
+						<menulist>
+							<menupopup type="select-priority" id="priority"/>
+						</menulist>
+						<checkbox label="non blocking" statustext="A non blocking event will not conflict with other events" id="non_blocking" options=",, ,disable"/>
+					</hbox>
 				</row>
 				<row class="row">
 					<description options=",,,public" value="Private"/>
-					<checkbox options="0,1" id="public"/>
+					<checkbox options="0,1" id="public" span="all"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="calendar.edit.description" template="" lang="" group="0" version="1.0.1.001">
-		<grid width="100%">
+		<grid width="100%" height="200">
 			<columns>
 				<column width="95"/>
 				<column/>
@@ -51,88 +57,215 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="resources.resource_selectbox" template="" lang="" group="0" version="">
-		<grid>
-			<columns>
-				<column/>
-				<column/>
-			</columns>
-			<rows>
-				<row valign="bottom">
-					<listbox rows="14+" id="selectbox"/>
-					<button onclick="window.open(egw::link('/index.php','menuaction=resources.ui_resources.select'),'','dependent=yes,width=600,height=450,scrollbars=yes,status=yes'); return false;" id="button" label="Add resources" image="navbar" needed="1"/>
-				</row>
-			</rows>
-		</grid>
-	</template>
-	<template id="calendar.edit.participants" template="" lang="" group="0" version="1.0.1.001">
-		<grid width="100%">
+	<template id="calendar.edit.participants" template="" lang="" group="0" version="1.0.1.002">
+		<grid width="100%" height="200" class="row_on" overflow="auto">
 			<columns>
 				<column width="95"/>
 				<column/>
 				<column/>
+				<column/>
 			</columns>
 			<rows>
-				<row class="row" valign="top">
+				<row class="row" valign="top" disabled="@view">
 					<description options=",,,participants" value="Participants"/>
-					<listbox type="select-account" rows="14" id="participants"/>
-					<template content="resources" id="resources.resource_selectbox"/>
+					<listbox type="select-account" rows="14" id="participants[accounts]"/>
+					<description value="Resources" align="right"/>
+					<resources_select options="14" id="participants[resources]"/>
+				</row>
+				<row valign="top" disabled="!@view">
+					<description value="Participants"/>
+					<grid>
+						<columns>
+							<column/>
+							<column/>
+						</columns>
+						<rows>
+							<row>
+								<menulist>
+									<menupopup type="select-account" id="${row}" readonly="true"/>
+								</menulist>
+								<menulist>
+									<menupopup id="accounts_status[$row_cont]" onchange="1" statustext="Accept or reject an invitation" no_lang="1"/>
+								</menulist>
+							</row>
+						</rows>
+					</grid>
+					<description value="Resources" align="right"/>
+					<grid>
+						<columns>
+							<column/>
+							<column/>
+						</columns>
+						<rows>
+							<row disabled="!@resources_status">
+								<resources_select id="${row}" readonly="true" no_lang="1"/>
+								<menulist>
+									<menupopup id="resources_status[$row_cont]" onchange="1" statustext="Accept or reject an invitation" no_lang="1"/>
+								</menulist>
+							</row>
+						</rows>
+					</grid>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit.recurrence" template="" lang="" group="0" version="">
-		<grid>
+	<template id="calendar.edit.recurrence" template="" lang="" group="0" version="1.0.1.002">
+		<grid width="100%" height="200">
+			<columns>
+				<column width="95"/>
+				<column/>
+				<column/>
+				<column width="50%"/>
+			</columns>
+			<rows>
+				<row class="th" height="12">
+					<description span="all" value="Repeating Event Information"/>
+				</row>
+				<row class="row" height="12">
+					<description options=",,,recur_type" value="Repeat type"/>
+					<menulist>
+						<menupopup id="recur_type"/>
+					</menulist>
+					<description options=",,,recur_interval" value="Interval"/>
+					<menulist>
+						<menupopup type="select-number" id="recur_interval" statustext="repeating interval, eg. 2 to repeat every second week" options="None,2,10"/>
+					</menulist>
+				</row>
+				<row class="row" height="12">
+					<description options=",,,recur_enddate" value="End date"/>
+					<date id="recur_enddate" statustext="repeat the event until which date (empty means unlimited)" span="all"/>
+				</row>
+				<row class="row" valign="top">
+					<description options=",,,recur_data" value="Repeat days"/>
+					<listbox type="select-dow" rows="6" options="1" id="recur_data" statustext="Days of the week for a weekly repeated event"/>
+					<description value="Exceptions"/>
+					<grid>
+						<columns>
+							<column/>
+							<column/>
+						</columns>
+						<rows>
+							<row>
+								<date-time id="$row" readonly="true"/>
+								<button label="Delete" image="delete" id="delete_exception[$row_cont]" statustext="Delete this exception" onclick="return confirm('Delete this exception');"/>
+							</row>
+						</rows>
+					</grid>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="calendar.edit.custom" template="" lang="" group="0" version="1.0.1.001">
+		<grid width="100%" height="200" overflow="auto">
 			<columns>
 				<column/>
 			</columns>
 			<rows>
-				<row>
-					<description/>
+				<row valign="top">
+					<customfields id="customfields"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit.links" template="" lang="" group="0" version="">
-		<grid>
+	<template id="calendar.edit.links" template="" lang="" group="0" version="1.0.1.001">
+		<grid width="100%" height="200" overflow="auto">
 			<columns>
+				<column width="95"/>
 				<column/>
 			</columns>
 			<rows>
-				<row>
-					<description/>
+				<row class="th" disabled="@view">
+					<description span="all" value="Create new links"/>
+				</row>
+				<row class="row" disabled="@view">
+					<link-to span="all" id="link_to"/>
+				</row>
+				<row class="th">
+					<description span="all" value="Existing links"/>
+				</row>
+				<row class="row_off" valign="top">
+					<link-list span="all" id="link_to"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit.custom" template="" lang="" group="0" version="">
-		<grid>
+	<template id="calendar.edit.alarms" template="" lang="" group="0" version="1.0.1.001">
+		<grid width="100%" height="200" overflow="auto">
 			<columns>
+				<column width="95"/>
 				<column/>
 			</columns>
 			<rows>
-				<row>
-					<description/>
+				<row class="row" height="20" disabled="@no_add_alarm">
+					<description value="before the event"/>
+					<hbox>
+						<menulist>
+							<menupopup type="select-number" options=",0,7" id="new_alarm[days]"/>
+						</menulist>
+						<description options=",,,new_alarm[days]" value="days"/>
+						<menulist>
+							<menupopup type="select-number" id="new_alarm[hours]" options=",0,23"/>
+						</menulist>
+						<description options=",,,new_alarm[hours]" value="hours"/>
+						<menulist>
+							<menupopup type="select-number" id="new_alarm[mins]" options=",0,55,5"/>
+						</menulist>
+						<description options=",,,new_alarm[mins]" value="Minutes"/>
+						<menulist>
+							<menupopup id="new_alarm[owner]" no_lang="1" label="for" statustext="Select who should get the alarm"/>
+						</menulist>
+						<button id="button[add_alarm]" label="Add alarm"/>
+					</hbox>
+				</row>
+				<row valign="top" disabled="!@alarm">
+					<description value="Alarms"/>
+					<grid>
+						<columns>
+							<column/>
+							<column/>
+							<column/>
+							<column/>
+							<column/>
+						</columns>
+						<rows>
+							<row class="th">
+								<description value="Time"/>
+								<description value="before the event"/>
+								<description value="All participants"/>
+								<description value="Owner"/>
+								<description value="Action"/>
+							</row>
+							<row class="row">
+								<date-time id="${row}[time]" readonly="true"/>
+								<description id="${row}[offset]" no_lang="1"/>
+								<checkbox align="center" id="${row}[all]" readonly="true"/>
+								<menulist>
+									<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
+								</menulist>
+								<button image="delete" label="Delete" align="center" id="delete_alarm[$row_cont[id]]" statustext="Delete this alarm" onclick="return confirm('Delete this alarm');"/>
+							</row>
+						</rows>
+					</grid>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit" template="" lang="" group="0" version="1.0.1.001">
+	<template id="calendar.edit" template="" lang="" group="0" version="1.0.1.002">
 		<grid width="100%">
 			<columns>
 				<column width="100"/>
-				<column/>
+				<column width="300"/>
 				<column/>
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description span="all" class="redItalic" id="msg"/>
+					<description span="all" class="redItalic" id="msg" no_lang="1" align="center"/>
 					<description/>
 					<description/>
 				</row>
 				<row class="th">
 					<description value="Title"/>
-					<textbox size="80" maxlength="255" id="title" span="all"/>
+					<textbox size="80" maxlength="255" id="title" span="all" needed="1"/>
 				</row>
 				<row>
 					<tabbox span="all">
@@ -141,16 +274,18 @@
 							<tab label="Description" statustext="Full description"/>
 							<tab label="Participants" statustext="Participants, Resources, ..."/>
 							<tab label="Recurrence" statustext="Repeating Event Information"/>
-							<tab label="Links" statustext="Links"/>
 							<tab label="Custom" statustext="Custom fields"/>
+							<tab label="Links" statustext="Links, Attachments"/>
+							<tab label="Alarms" statustext="Alarm management"/>
 						</tabs>
 						<tabpanels>
 							<template id="calendar.edit.general"/>
 							<template id="calendar.edit.description"/>
 							<template id="calendar.edit.participants"/>
 							<template id="calendar.edit.recurrence"/>
-							<template id="calendar.edit.links"/>
 							<template id="calendar.edit.custom"/>
+							<template id="calendar.edit.links"/>
+							<template id="calendar.edit.alarms"/>
 						</tabpanels>
 					</tabbox>
 				</row>
@@ -168,12 +303,19 @@
 				</row>
 				<row>
 					<hbox span="2">
-						<button id="edit" label="Edit" statustext="Edit this event"/>
-						<button label="Save" id="save" statustext="saves the changes made"/>
-						<button id="apply" label="Apply" statustext="apply the changes"/>
-						<button id="cancel" label="Cancel" onclick="window.close();"/>
+						<button id="button[edit_series]" label="Edit series" statustext="Edit this series of recuring events"/>
+						<button id="button[edit]" label="Edit" statustext="Edit this event"/>
+						<button id="button[copy]" label="Copy" statustext="Copy this event"/>
+						<button id="button[vcal]" label="Export" statustext="Download this event as iCal"/>
+						<button label="Save" id="button[save]" statustext="saves the changes made"/>
+						<button id="button[apply]" label="Apply" statustext="apply the changes"/>
+						<button id="button[cancel]" label="Cancel" onclick="window.close();" statustext="Close the window"/>
+						<checkbox id="custom_mail" label="mail all participants" statustext="compose a mail to all participants after the event is saved"/>
+					</hbox>
+					<hbox align="right">
+						<button id="button[delete_series]" label="Delete series" statustext="Delete this series of recuring events" onclick="return confirm('Delete this series of recuring events');"/>
+						<button label="Delete" id="button[delete]" statustext="Delete this event" onclick="return confirm('Delete this event');"/>
 					</hbox>
-					<button label="Delete" align="right" id="delete"/>
 				</row>
 			</rows>
 		</grid>
diff --git a/calendar/templates/default/event_widget.tpl b/calendar/templates/default/event_widget.tpl
index 0e4935fd3c..1f9cb078d2 100644
--- a/calendar/templates/default/event_widget.tpl
+++ b/calendar/templates/default/event_widget.tpl
@@ -1,57 +1,38 @@
 <!-- BEGIN event_widget -->
-<table style="width: 99%; margin: 0px; padding: 0px;" cellpadding="0" cellspacing="0" border="0" align="center" {tooltip}>
+<table style="width: 99%; height: 100%; margin: 0px; padding: 0px;" cellpadding="0" cellspacing="0" border="0" align="center" {tooltip}>
 
 	<tr style="height: {header_height};" valign="top">
-		<!-- too many layout problems with round corners //NDEE -->
-		<!-- <td style="width: {corner_radius}; background: url({upper_left_corner}) no-repeat;"></td> -->
 		<td valign="middle" class="calEventHeader{Small}" style="height: {header_height}; border-top: {border} px solid {bordercolor}; background-color: {headerbgcolor};">{header_icons} {header}</td>
-		<!-- <td style="width: {corner_radius}; background: url({upper_right_corner}) no-repeat;"></td> -->
 	</tr>
 
-	<tr valign="top" style="height: {body_height};">
-		<!--<td colspan="3" class="calEventBody{Small}" style="background: {bodybackground}; border-left: {border}px solid {bordercolor}; border-right: {border}px solid {bordercolor};">-->
+	<tr valign="top" style="height: 100%;">
 		<td class="calEventBody{Small}" style="background: {bodybackground}; border-bottom: {border}px solid {bordercolor}; border-left: {border}px solid {bordercolor}; border-right: {border}px solid {bordercolor};">
-			<p style="margin: 0px;">{body_icons}
-			<span class="calEventTitle">{title}</span>
+			<p style="margin: 0px;">{body_icons}<br>
+			<span class="calEventTitle">{title}</span></p>
 		</td>
 	</tr>
-<!--
-	<tr style="height: {corner_radius};">
-		<td style="width: {corner_radius}; background: url({lower_left_corner}) no-repeat;"></td>
-		<td style="border-bottom: {border}px solid {bordercolor}; background: {bodybackground};"></td>
-		<td style="width: {corner_radius}; background: url({lower_right_corner}) no-repeat"></td>
-	</tr>
--->
 </table>
 <!-- END event_widget -->
 
 <!-- BEGIN event_tooltip -->
 <table style="width: 99%; margin: 0px; padding: 0px;" cellpadding="0" cellspacing="0" border="0" align="center">
 	<tr style="height: {header_height};" valign="top">
-		<!-- too many layout problems with round corners //NDEE -->
-		<!--<td style="width: {corner_radius}; background: url({upper_left_corner}) no-repeat;"></td>-->
 		<td valign="middle" class="calEventHeader{Small}" style="height: {header_height}; border-top: {border} px solid {bordercolor}; background-color: {headerbgcolor};">{header_icons} {header}</td>
-		<!--<td style="width: {corner_radius}; background: url({upper_right_corner}) no-repeat;"></td>-->
 	</tr>
 	<tr valign="top">
-		<!--<td colspan="3" class="calEventBody{Small}" style="background: {bodybackground}; border-left: {border}px solid {bordercolor}; border-right: {border}px solid {bordercolor};">-->
 		<td class="calEventBody{Small}" style="background: {bodybackground}; border-bottom: {border}px solid {bordercolor}; border-left: {border}px solid {bordercolor}; border-right: {border}px solid {bordercolor};">
 			<p style="margin: 0px;">{body_icons}
 			<span class="calEventTitle">{title}</span><br>
 			{description}</p>
-			<p style="margin: 2px 0px;">{multidaytimes}
+			<p style="margin: 2px 0px;">{times}
 			{location}
 			{category}
 			{participants}</p>
 		</td>
 	</tr>
-<!--
-	<tr style="height: {corner_radius};">
-		<td style="width: {corner_radius}; background: url({lower_left_corner}) no-repeat;"></td>
-		<td style="border-bottom: {border}px solid {bordercolor}; background: {bodybackground};"></td>
-		<td style="width: {corner_radius}; background: url({lower_right_corner}) no-repeat"></td>
-	</tr>
--->
 </table>
 <!-- END event_tooltip -->
 
+<!-- BEGIN planner_event -->
+{icons} {title}
+<!-- END planner_event -->
diff --git a/calendar/templates/default/export.xet b/calendar/templates/default/export.xet
new file mode 100644
index 0000000000..d16129e75b
--- /dev/null
+++ b/calendar/templates/default/export.xet
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="calendar.export" template="" lang="" group="0" version="1.0.1.001">
+		<grid>
+			<columns>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<description span="all"/>
+				</row>
+				<row>
+					<description options=",,,start" value="Start"/>
+					<date id="start" statustext="Startdate of the export"/>
+				</row>
+				<row>
+					<description options=",,,end" value="End"/>
+					<date id="end" statustext="Enddate of the export"/>
+				</row>
+				<row>
+					<description options=",,,file" value="Filename"/>
+					<textbox id="file" statustext="Filename of the download"/>
+				</row>
+				<row disabled="1">
+					<description options=",,,version" value="Version"/>
+					<menulist>
+						<menupopup id="version"/>
+					</menulist>
+				</row>
+				<row>
+					<description/>
+					<button label="Download" id="download"/>
+				</row>
+				<row>
+					<description span="all"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/footer.tpl b/calendar/templates/default/footer.tpl
deleted file mode 100755
index 473bb42557..0000000000
--- a/calendar/templates/default/footer.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN footer_table -->
-       <hr clear="all">
-       <font size="-1">
-       <table border="0" width="100%" cellpadding="0" cellspacing="0">
-        <tr valign="top">
-{table_row}
-	</tr>
-       </table>
-<!-- END footer_table -->
-<!-- BEGIN footer_row -->
-         <td width="33%">
-          <font size="-1">
-           <form action="{action_url}" method="post" name="{form_name}">
-            <B>{label}:</B>
-			{hidden_vars}
-            <select name="{form_label}" onchange="{form_onchange}">
-	     {row}
-	    </select>
-            <noscript><input type="submit" value="{go}"></noscript>
-	   </form>
-	  </font>
-	 </td>
-<!-- END footer_row -->
-<!-- BEGIN blank_row -->
-         <td>
-          {b_row}
-         </td>
-<!-- END blank_row -->
-
-
diff --git a/calendar/templates/default/form_button_dropdown.tpl b/calendar/templates/default/form_button_dropdown.tpl
deleted file mode 100755
index 785962f861..0000000000
--- a/calendar/templates/default/form_button_dropdown.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- $Id$ -->
-<form action="{form_link}" method="post" name="{form_name}form">
-<td width="{form_width}%" align="center" valign="top" style="padding-top:16px">
-	<span style="font-size:10px"><b>{title}:</b>
-    {hidden_vars}    
-    <select name="{form_name}" onchange="document.{form_name}form.submit()">
-		{form_options}
-	</select>
-    <noscript>
-    	<input type="submit" value="{button_value}">
-    </noscript>
-	</span>
-</td>
-</form>
\ No newline at end of file
diff --git a/calendar/templates/default/freetimesearch.xet b/calendar/templates/default/freetimesearch.xet
index 5fee6ba777..bef661279b 100644
--- a/calendar/templates/default/freetimesearch.xet
+++ b/calendar/templates/default/freetimesearch.xet
@@ -36,7 +36,7 @@
 			<rows>
 				<row>
 					<description class="size120b" value="Freetime Search"/>
-					<description class="ired" no_lang="1" id="msg"/>
+					<description class="redItalic" no_lang="1" id="msg"/>
 				</row>
 				<row>
 					<description value="Startdate / -time"/>
@@ -48,8 +48,7 @@
 						<menulist>
 							<menupopup no_lang="1" id="duration" statustext="Duration of the meeting"/>
 						</menulist>
-						<description value="or Enddate / -time"/>
-						<date-time id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"/>
+						<date-time id="end" statustext="Enddate / -time of the meeting, eg. for more then one day" class="end_hide"/>
 					</hbox>
 				</row>
 				<row>
@@ -78,7 +77,8 @@
 		</grid>
 		<styles>
 			.size120b { text-size: 120%; font-weight: bold; }
-.ired { color: red; font-style: italic; }
+.redItalic { color: red; font-style: italic; }
+.end_hide { visibility: hidden; }
 		</styles>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/head.tpl b/calendar/templates/default/head.tpl
deleted file mode 100755
index c3d44ccbad..0000000000
--- a/calendar/templates/default/head.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN head -->
-{row}<br />
-<!-- END head -->
-
-<!-- BEGIN head_table -->
-<table id="calendar_head_table" class="calendar_head_table" border="0" width="100%" cols="{cols}" cellpadding="0" cellspacing="0">
-	<tr>
-		{header_column}
-	</tr>
-</table>
-<!-- END head_table -->
-
-<!-- BEGIN head_col -->
-{str}
-<!-- END head_col -->
\ No newline at end of file
diff --git a/calendar/templates/default/hr.tpl b/calendar/templates/default/hr.tpl
deleted file mode 100755
index fdbb59c224..0000000000
--- a/calendar/templates/default/hr.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Id$ -->
- <tr>
-  <td colspan="2">
-   {hr_text}
-  </td>
- </tr>
-
diff --git a/calendar/templates/default/images/circle.gif b/calendar/templates/default/images/circle.gif
deleted file mode 100755
index e211e6c869..0000000000
Binary files a/calendar/templates/default/images/circle.gif and /dev/null differ
diff --git a/calendar/templates/default/images/circle.png b/calendar/templates/default/images/circle.png
deleted file mode 100644
index e7e6518ff4..0000000000
Binary files a/calendar/templates/default/images/circle.png and /dev/null differ
diff --git a/calendar/templates/default/images/disabled.gif b/calendar/templates/default/images/disabled.gif
deleted file mode 100755
index f776b68be1..0000000000
Binary files a/calendar/templates/default/images/disabled.gif and /dev/null differ
diff --git a/calendar/templates/default/images/disabled.png b/calendar/templates/default/images/disabled.png
deleted file mode 100644
index 2415dfc78b..0000000000
Binary files a/calendar/templates/default/images/disabled.png and /dev/null differ
diff --git a/calendar/templates/default/images/enabled.gif b/calendar/templates/default/images/enabled.gif
deleted file mode 100755
index 3003103d5b..0000000000
Binary files a/calendar/templates/default/images/enabled.gif and /dev/null differ
diff --git a/calendar/templates/default/images/enabled.png b/calendar/templates/default/images/enabled.png
deleted file mode 100644
index 543710fb7b..0000000000
Binary files a/calendar/templates/default/images/enabled.png and /dev/null differ
diff --git a/calendar/templates/default/images/list.png b/calendar/templates/default/images/list.png
new file mode 100644
index 0000000000..ecaa54be38
Binary files /dev/null and b/calendar/templates/default/images/list.png differ
diff --git a/calendar/templates/default/images/mini-calendar-bar.gif b/calendar/templates/default/images/mini-calendar-bar.gif
deleted file mode 100644
index 33dd895024..0000000000
Binary files a/calendar/templates/default/images/mini-calendar-bar.gif and /dev/null differ
diff --git a/calendar/templates/default/images/mini-calendar-bar.png b/calendar/templates/default/images/mini-calendar-bar.png
deleted file mode 100644
index e6df98d7f0..0000000000
Binary files a/calendar/templates/default/images/mini-calendar-bar.png and /dev/null differ
diff --git a/calendar/templates/default/images/mini_day_block.gif b/calendar/templates/default/images/mini_day_block.gif
deleted file mode 100644
index d31fa09acb..0000000000
Binary files a/calendar/templates/default/images/mini_day_block.gif and /dev/null differ
diff --git a/calendar/templates/default/images/mini_day_block.png b/calendar/templates/default/images/mini_day_block.png
deleted file mode 100644
index 0db414dd5c..0000000000
Binary files a/calendar/templates/default/images/mini_day_block.png and /dev/null differ
diff --git a/calendar/templates/default/images/multi_3.gif b/calendar/templates/default/images/multi_3.gif
deleted file mode 100755
index bca0e9baa5..0000000000
Binary files a/calendar/templates/default/images/multi_3.gif and /dev/null differ
diff --git a/calendar/templates/default/images/multi_3.png b/calendar/templates/default/images/multi_3.png
deleted file mode 100644
index 7109febe0c..0000000000
Binary files a/calendar/templates/default/images/multi_3.png and /dev/null differ
diff --git a/calendar/templates/default/images/new.gif b/calendar/templates/default/images/new.gif
deleted file mode 100755
index 3406ddfddd..0000000000
Binary files a/calendar/templates/default/images/new.gif and /dev/null differ
diff --git a/calendar/templates/default/images/new.png b/calendar/templates/default/images/new.png
deleted file mode 100644
index 616a415d8c..0000000000
Binary files a/calendar/templates/default/images/new.png and /dev/null differ
diff --git a/calendar/templates/default/images/new2.gif b/calendar/templates/default/images/new2.gif
deleted file mode 100644
index e3cf313418..0000000000
Binary files a/calendar/templates/default/images/new2.gif and /dev/null differ
diff --git a/calendar/templates/default/images/new2.png b/calendar/templates/default/images/new2.png
deleted file mode 100644
index 9aef0c2879..0000000000
Binary files a/calendar/templates/default/images/new2.png and /dev/null differ
diff --git a/calendar/templates/default/images/new3.gif b/calendar/templates/default/images/new3.gif
deleted file mode 100755
index 687f6aaf75..0000000000
Binary files a/calendar/templates/default/images/new3.gif and /dev/null differ
diff --git a/calendar/templates/default/images/new3.png b/calendar/templates/default/images/new3.png
deleted file mode 100755
index 0fc23618ca..0000000000
Binary files a/calendar/templates/default/images/new3.png and /dev/null differ
diff --git a/calendar/templates/default/images/pix.gif b/calendar/templates/default/images/pix.gif
deleted file mode 100644
index 3a46969559..0000000000
Binary files a/calendar/templates/default/images/pix.gif and /dev/null differ
diff --git a/calendar/templates/default/images/pix.png b/calendar/templates/default/images/pix.png
deleted file mode 100644
index 2980a0fdd7..0000000000
Binary files a/calendar/templates/default/images/pix.png and /dev/null differ
diff --git a/calendar/templates/default/images/rpt.gif b/calendar/templates/default/images/rpt.gif
deleted file mode 100755
index b3401110cb..0000000000
Binary files a/calendar/templates/default/images/rpt.gif and /dev/null differ
diff --git a/calendar/templates/default/images/rpt.png b/calendar/templates/default/images/rpt.png
deleted file mode 100644
index b80c72091f..0000000000
Binary files a/calendar/templates/default/images/rpt.png and /dev/null differ
diff --git a/calendar/templates/default/images/view.gif b/calendar/templates/default/images/view.gif
deleted file mode 100755
index 3d9691db2f..0000000000
Binary files a/calendar/templates/default/images/view.gif and /dev/null differ
diff --git a/calendar/templates/default/images/view.png b/calendar/templates/default/images/view.png
deleted file mode 100644
index ed18a6cd7f..0000000000
Binary files a/calendar/templates/default/images/view.png and /dev/null differ
diff --git a/calendar/templates/default/import.xet b/calendar/templates/default/import.xet
new file mode 100644
index 0000000000..5154571925
--- /dev/null
+++ b/calendar/templates/default/import.xet
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="calendar.import" template="" lang="" group="0" version="1.0.1.001">
+		<grid>
+			<columns>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<description span="all" class="redItalic" id="msg" no_lang="1" align="center"/>
+					<description/>
+				</row>
+				<row>
+					<description value="iCal file"/>
+					<file id="ical_file" needed="1"/>
+				</row>
+				<row>
+					<description/>
+					<button label="Import" id="import"/>
+				</row>
+				<row>
+					<description span="all"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/index.tpl b/calendar/templates/default/index.tpl
deleted file mode 100755
index 0d0b69b86d..0000000000
--- a/calendar/templates/default/index.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- $Id$ -->
-{printer_friendly}
-<table id="calendar_index_table" border="0" width="100%" cols="5">
-	<tr>
-		<td align="left" valign="top" width="20%">
-			{small_calendar_prev}
-		</td>
-		<td align="center" valign="middle" width="15%">
-			<b>{prev_month_link}</b>
-		</td>
-		<td align="center" width="30%">
-			<span class="calendar_month_identifier">
-				{month_identifier}
-			</span>
-				<br />
-			<span class="calendar_user_identifier">
-				:&nbsp;{username}&nbsp;:
-			</span>
-		</td>
-		<td align="center" valign="middle" width="15%">
-			{next_month_link}
-		</td>
-		<td align="right" valign="top" width="20%">
-			{small_calendar_next}
-		</td>
-	</tr>
-</table>
-{large_month}
-<p>
-<p>
-<div class="calendar_link_print">
-	{print}
-</div>
diff --git a/calendar/templates/default/link_pict.tpl b/calendar/templates/default/link_pict.tpl
deleted file mode 100755
index ad6d7bdffa..0000000000
--- a/calendar/templates/default/link_pict.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- $Id$    link_pict -->
-
-<!-- BEGIN link_pict -->
-{picture}
-<!-- END link_pict -->
-
-<!-- BEGIN link_open -->
-<div id="calendar_event_entry">
-<a class="event_entry" href="{link_link}" onMouseOver="window.status='{lang_view}'; return true;" onMouseOut="window.status=''; return true;"><br>
-<!-- END link_open -->
-
-<!-- BEGIN pict -->
- <img src="{pic_image}" width="{width}" height="{height}" title="{title}" border="0" />
-<!-- END pict -->
-
-<!-- BEGIN link_text_old -->
-<nobr>&nbsp;{time}&nbsp;</nobr> {title}&nbsp;{users_status}: <i>{desc}</i><!--({location})-->
-<!-- END link_text_old -->
-
-<!-- BEGIN link_text -->
-<nobr>&nbsp;<span style="color: black">{time}</span> {users_status}</nobr><br><div  onmouseover="this.T_STATIC=true;this.T_OFFSETX=-2;this.T_OFFSETY=36;return escape('<table width=200 cellpadding=3 cellspacing=0 border=0><tr><td style=\'color: white;\' bgcolor=#606060>{time}::<b>{title}</b></td></tr><tr><td><br>{desc}<br><br></td></tr><tr><td bgcolor=#c7c7c7>{location}</td></tr></table>');"><b>{title}</b><br><i>{desc}</i><br><b>{location}</b></div>
-<!-- END link_text -->
-
-<!-- BEGIN link_close -->
-</a></div>
-<!-- END link_close -->
diff --git a/calendar/templates/default/list.tpl b/calendar/templates/default/list.tpl
deleted file mode 100755
index 0ad7059a4e..0000000000
--- a/calendar/templates/default/list.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN list -->
- <tr>
-  <td valign="top" width="35%"><b>{field}:</b></td>
-  <td valign="top" width="65%">{data}</td>
- </tr>
-<!-- END list -->
diff --git a/calendar/templates/default/list.xet b/calendar/templates/default/list.xet
new file mode 100644
index 0000000000..1f1bbe3b95
--- /dev/null
+++ b/calendar/templates/default/list.xet
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="calendar.list.rows" template="" lang="" group="0" version="1.0.1.002">
+		<grid width="100%">
+			<columns>
+				<column/>
+				<column width="40%"/>
+				<column/>
+				<column/>
+				<column width="10%"/>
+			</columns>
+			<rows>
+				<row class="th">
+					<vbox>
+						<nextmatch-sortheader label="Start" id="cal_start"/>
+						<nextmatch-sortheader id="cal_end" label="End"/>
+					</vbox>
+					<vbox>
+						<nextmatch-sortheader label="Title" id="cal_title"/>
+						<nextmatch-sortheader label="Description" id="cal_description"/>
+					</vbox>
+					<vbox>
+						<nextmatch-sortheader id="cal_owner" label="Owner" readonly="true"/>
+						<nextmatch-sortheader id="cal_location" label="Location"/>
+					</vbox>
+					<nextmatch-accountfilter options="All participants" id="participant"/>
+					<description value="Actions"/>
+				</row>
+				<row class="row" valign="top">
+					<vbox id="start">
+						<date-time id="${row}[start]" readonly="true"/>
+						<date-time id="${row}[end]" readonly="true"/>
+					</vbox>
+					<vbox>
+						<description id="${row}[title]" readonly="true" no_lang="1" options="b"/>
+						<description id="${row}[description]" no_lang="1"/>
+					</vbox>
+					<vbox>
+						<menulist>
+							<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
+						</menulist>
+						<description id="${row}[location]" no_lang="1"/>
+					</vbox>
+					<description id="${row}[parts]" readonly="true" no_lang="1"/>
+					<hbox>
+						<button image="view" label="view" id="view[$row_cont[id]]" statustext="View this event" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.view&amp;cal_id=$row_cont[id]'),'425','dependent=yes,width=750,height=450,scrollbars=yes,status=yes'); return false;"/>
+						<button image="edit" label="Edit" id="edit[$row_cont[id]]" statustext="Edit this event" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.edit&amp;cal_id=$row_cont[id]'),'425','dependent=yes,width=750,height=450,scrollbars=yes,status=yes'); return false;"/>
+						<button id="delete[$row_cont[id]]" image="delete" label="Delete" statustext="Delete this event" onclick="return confirm('Delete this event');"/>
+					</hbox>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="calendar.list" template="" lang="" group="0" version="1.0.1.001">
+		<grid width="100%">
+			<columns>
+				<column/>
+			</columns>
+			<rows>
+				<row disabled="!@msg">
+					<description class="redItalic" align="center" id="msg" no_lang="1"/>
+				</row>
+				<row>
+					<nextmatch options="calendar.list.rows" id="nm"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/locales.tpl b/calendar/templates/default/locales.tpl
index 89cf69f022..3bb73a34f3 100755
--- a/calendar/templates/default/locales.tpl
+++ b/calendar/templates/default/locales.tpl
@@ -1,5 +1,6 @@
 <!-- BEGIN list -->
-<p>
+<p class="row_on" style="text-align: center; border: 1px dotted black; padding: 10px;">{help_msg}</p>
+
  <table border="0" width="45%" align="center">
   <tr>
    <td align="left">{left_next_matchs}</td>
@@ -7,6 +8,7 @@
    <td align="right">{right_next_matchs}</td>
   </tr>
  </table>
+ <p align="center">{total}</p>
 
  <table border="0" width="70%" align="center">
   <tr bgcolor="{th_bg}">
diff --git a/calendar/templates/default/matrix_query.tpl b/calendar/templates/default/matrix_query.tpl
deleted file mode 100755
index a8e74191a7..0000000000
--- a/calendar/templates/default/matrix_query.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN matrix_query -->
-<center>
-<form action="{action_url}" method="post" name="matrixform">
-<table border="0" width="98%">
- <tr bgcolor="{th_bg}">
-  <td colspan="2" align="center"><b>{title}</b></td>
- </tr>
- {rows}
- <tr>
-  <td>
-   <table cellspacing="5"><tr>
-    <td><input type="submit" value="{submit_button}"></td>
-   </tr></table>
-  </td>
- </tr>
-</table>
-</form>
-</center>
-<!-- END matrix_query -->
-<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
-  <td valign="top" width="35%"><b>&nbsp;{field}:</b></td>
-  <td valign="top" width="65%">{data}</td>
- </tr>
-<!-- END list -->
diff --git a/calendar/templates/default/mini_cal.tpl b/calendar/templates/default/mini_cal.tpl
deleted file mode 100755
index ab0c06d0f8..0000000000
--- a/calendar/templates/default/mini_cal.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN mini_cal -->
-
-	<table id="calendar_minical_table" class="calendar_minical_table" border=0 cellspacing="0" cellpadding="0">
-		<tr>
-			<td style="padding-left: 8px; font-weight: bold; text-align: left;">
-				{month}
-			</td>
-			<td align="right">
-				<!-- why empty? -->
-				{prevmonth}&nbsp;&nbsp;{nextmonth}
-			</td>
-		</tr>
-		<tr>
-			<td  style="padding-left: 8px; text-align: left;">
-<!--				<img src="{cal_img_root}" width="90%" height="1"> -->
-					<hr class="calendar_minical_hrule">
-			</td>
-		</tr>
-		<tr valign="top">
-			<td>
-				<table id="calendar_minical_daytable" class="calendar_minical_daytable" cellspacing="5" cellpadding="0">
-					<tr>{daynames}</tr>
-						{display_monthweek}
-				</table>
-
-			</td>
-	 	</tr>
-	</table>
-<!-- END mini_cal -->
-
-<!-- BEGIN mini_week -->
-	<tr>
-		{monthweek_day}
-	</tr>
-<!-- END mini_week -->
-
-<!-- BEGIN mini_day -->
-		<td class="calendar_minical_dayname" {day_image}>
-			{dayname}
-		</td>
-<!-- END mini_day -->
diff --git a/calendar/templates/default/month.tpl b/calendar/templates/default/month.tpl
deleted file mode 100755
index 248f065fc1..0000000000
--- a/calendar/templates/default/month.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Id$ -->
-
-<table id="calendar_month_table" width="100%" border="0" bordercolor="#FFFFFF" cellspacing="2" cellpadding="2" cols={cols}>
-	{row}
-</table>
-
-
diff --git a/calendar/templates/default/month_column.tpl b/calendar/templates/default/month_column.tpl
deleted file mode 100755
index d5940298df..0000000000
--- a/calendar/templates/default/month_column.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- $Id$   month_column -->
-
-<td valign="top" colspan="1" width="{col_width}%"{extra}>
-	{column_data}
-</td>
diff --git a/calendar/templates/default/month_day.tpl b/calendar/templates/default/month_day.tpl
deleted file mode 100755
index 24c54f62ae..0000000000
--- a/calendar/templates/default/month_day.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- $Id$    month_day -->
-
-<!-- BEGIN m_w_table -->
-
-<table id="calendar_m_w_table" class="calendar_m_w_table">
-	<! from month_header.tpl -->
-	{row}
-</table>
-<!-- END m_w_table -->
-
-<!-- BEGIN month_daily -->
-<span id="calendar_m_w_table_daynumber" style="font-size:10px">[ {day_number} ]</span>{new_event_link}<br />
-    {daily_events}
-<!-- END month_daily -->
-
-<!-- BEGIN day_event -->
-{events}
-<!-- END day_event -->
-
-<!-- BEGIN event -->
-{day_events}
-<!-- END event -->
diff --git a/calendar/templates/default/month_header.tpl b/calendar/templates/default/month_header.tpl
deleted file mode 100755
index d12dd6ed89..0000000000
--- a/calendar/templates/default/month_header.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN monthly_header -->
-<tr class="calendar_m_w_table_header" colspan="{cols}" width="{col_width}%">
-{column_header}</tr>
-<!-- END monthly_header -->
-
-<!-- BEGIN monthly_row -->
-<tr class="calendar_m_w_table_row" colspan="{cols}" width="{col_width}%">
-{column_row}</tr>
-<!-- END monthly_row -->
-
-<!-- BEGIN column_title -->
-<th class="calendar_weekview_daytitle" width="14.28%">{col_title}</th>
-<!-- END column_title -->
-
-<!-- BEGIN month_column -->
-<td class="calendar_m_w_tablecell" colspan="1" width="{col_width}%"{extra}>{column_data}</td>
-<!-- END month_column -->
diff --git a/calendar/templates/default/overlap.tpl b/calendar/templates/default/overlap.tpl
deleted file mode 100755
index 9899bc814b..0000000000
--- a/calendar/templates/default/overlap.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN overlap -->
-<center><br />
-<table id="calendar_overlap_table">
-	<tr>
-		<td>
-			{overlap_text}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<ul>{overlap_list}</ul>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<table id="calendar_overlap_table2" cellspacing="5">
-				<tr>
-					<td>
-						{resubmit_button}
-					</td>
-					<td>
-						{reedit_button}
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</center>
-<!-- END overlap -->
diff --git a/calendar/templates/default/pref.tpl b/calendar/templates/default/pref.tpl
deleted file mode 100755
index df3b6308f7..0000000000
--- a/calendar/templates/default/pref.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- BEGIN pref -->
-<p><b>{title}:</b><hr><p>
-<form action="{action_url}" method="POST">
- <table border="0" align="center" width="90%">
-  {row}
- </table>
- <center><input type="submit" name="submit" value="{submit_lang}"></center>
-</form>
-<!-- END pref -->
-
-<!-- BEGIN pref_colspan -->
-  <tr bgcolor="{bg_color}">
-   <td colspan="2">{text}</td>
-  </tr>
-<!-- END pref_colspan -->
-
-<!-- BEGIN pref_list -->
-  <tr bgcolor="{bg_color}">
-   <td align="right">{field}</td>
-   <td align="center">{data}</td>
-  </tr>
-<!-- END pref_list -->
diff --git a/calendar/templates/default/preference_acl.tpl b/calendar/templates/default/preference_acl.tpl
deleted file mode 100755
index 6d9380e8e6..0000000000
--- a/calendar/templates/default/preference_acl.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{errors}
-{title}
-<table border="0" align="center" width="70%">
- <tr>
-  {nml}
-  <td width="40%">
-   <div align="center">
-    <form method="POST" action="{action_url}">
-{common_hidden_vars}
-     <input type="text" name="query" value="{search_value}">
-     <input type="submit" name="search" value="{search}">
-    </form>
-   </div>
-  </td>
-  {nmr}
- </tr>
-</table>
-<form method="POST" action="{action_url}">
- <table border="0" align="center" width="50%" cols="4">
-{row}
- </table>
-{common_hidden_vars_form}
- <input type="hidden" name="processed" value="{processed}">
- <center><input type="submit" name="submit" value="{submit_lang}"></center>
-</form>
-
-
diff --git a/calendar/templates/default/search.tpl b/calendar/templates/default/search.tpl
deleted file mode 100755
index 9ec9abd665..0000000000
--- a/calendar/templates/default/search.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN search -->
-<table id="calendar_search_table" width="90%">
-	<tr>
-		<td colspan="2" align="center" bgcolor="{th_bg}">
-			<b>{quantity}</b>
-		</td>
-	</tr>
-	{rows}
-</table>
-<!-- END search -->
-
-<!-- BEGIN search_list_header -->
-
-<!-- END search_list_header -->
-
-<!-- BEGIN search_list -->
-	<tr bgcolor="{tr_color}">
-		<td width="20%">
-			&nbsp;{date}
-		</td>
-		<td>
-			{link}
-		</td>
-	</tr>
-<!-- END search_list -->
-
-<!-- BEGIN search_list_footer -->
-
-<!-- END search_list_footer -->
diff --git a/calendar/templates/default/vcal_import.tpl b/calendar/templates/default/vcal_import.tpl
deleted file mode 100755
index bab84907bc..0000000000
--- a/calendar/templates/default/vcal_import.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- vcardin form -->
-{vcal_header}
-    <form ENCTYPE="multipart/form-data" method="POST" action="{action_url}">
-      <table border=0>
-      <tr>
-       <td>{ical_lang}: <input type="file" name="uploadedfile"></td>
-       <td><input type="submit" name="action" value="{load_vcal}"></td>
-      </tr>
-      </table>
-     </form>
diff --git a/calendar/templates/default/view.tpl b/calendar/templates/default/view.tpl
deleted file mode 100755
index daf75fa90c..0000000000
--- a/calendar/templates/default/view.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN view_event -->
-<center>
-<table id="calendar_view_event" border="0" width="90%">
-	{row}
-	<tr>
-		<td>
-			<table id="calendar_viewevent_button_left" cellspacing="5">
-				<tr>
-					{button_left}
-				</tr>
-			</table>
-		</td>
-	   <td align="center">
-			<table id="calendar_viewevent_button_center" cellspacing="5">
-				<tr>
-					{button_center}
-				</tr>
-			</table>
-		</td>
-		<td align="right">
-			<table id="calendar_viewevent_button_right" cellspacing="5">
-				<tr>
-					{button_right}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</center>
-<!-- END view_event -->
-
-<!-- BEGIN list -->
-	<tr bgcolor="{tr_color}">
-		<td valign="top" width="30%">&nbsp;<b>{field}:</b></td>
-		<td colspan="2" valign="top" width="70%">{data}</td>
-	</tr>
-<!-- END list -->
-
-<!-- BEGIN hr -->
-	<tr>
-		<td colspan="3" bgcolor="{th_bg}" align="center">
-			<b>{hr_text}</b>
-		</td>
-	</tr>
-<!-- END hr -->
diff --git a/calendar/templates/default/week.tpl b/calendar/templates/default/week.tpl
deleted file mode 100755
index efffc2941d..0000000000
--- a/calendar/templates/default/week.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- $Id$ -->
-
-{printer_friendly}
-
-<!-- head table with mini calendars -->
-
-<table id="calendar_week_minical_table" class="calendar_week_minical_table">
-	<tr>
-		<td id="small_calendar_prev" align="left" valign="top" width="20%">
-			{small_calendar_prev}
-		</td>
-		<td  id="prev_week_link"  align="center" valign="middle" width="20%">
-			<b>{prev_week_link}</b>
-		</td>
-		<td  id="small_calendar_this"  align="center" valign="top" width="20%">
-			{small_calendar_this}
-		</td>
-		<td  id="next_week_link"  align="center" valign="middle" width="20%">
-			<b>{next_week_link}</b>
-		</td>
-		<td  id="small_calendar_right"  align="right" valign="top" width="20%">
-			{small_calendar_next}
-		</td>
-	</tr>
-</table>
-<br />
-<table id="calendar_week_identifier_table" class="calendar_week_identifier_table">
-	<tr>
-		<td align="center">
-			<span class="calendar_week_identifier">{week_identifier}&nbsp;&nbsp;</span>
-			<span class="calendar_user_identifier">::&nbsp;{username}&nbsp;::</span>
-		</td>
-	</tr>
-</table>
-<!-- from month_day.tpl -->
-{week_display}
-
-<div class="calendar_link_print">
-<br />
-{print}
-</div>
\ No newline at end of file
diff --git a/calendar/templates/default/year.tpl b/calendar/templates/default/year.tpl
deleted file mode 100755
index 2529bc1b02..0000000000
--- a/calendar/templates/default/year.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- BEGIN year -->
-{print}
-<center>
-<table id="calendar_year_table" border="0" cellspacing="3" cellpadding="4" cols=4>
-	<tr>
-		<td align="center">
-			{left_link}
-		</td>
-		<td align="center">
-			<font face="{font}" size="+1">{year_text}</font>
-		</td>
-		<td align="center">
-			{right_link}
-		</td>
-		{row}
-	</tr>
-</table>
-</center>
-<p>
-<div class="calendar_link_print">
-{printer_friendly}
-</div>
-<!-- END year -->
-
-<!-- BEGIN month -->
-<td valign="top">
-	{mini_month}
-</td>
-<!-- END month -->
-
-<!-- BEGIN month_sep -->
-</tr>
-<tr valign="top">
-<!-- END month_sep -->
-
diff --git a/calendar/templates/idots/images/month.gif b/calendar/templates/idots/images/month.gif
deleted file mode 100644
index 0b7982a5f8..0000000000
Binary files a/calendar/templates/idots/images/month.gif and /dev/null differ
diff --git a/calendar/templates/idots/images/month.png b/calendar/templates/idots/images/month.png
deleted file mode 100644
index 20b66c2393..0000000000
Binary files a/calendar/templates/idots/images/month.png and /dev/null differ
diff --git a/calendar/templates/idots/images/navbar.png b/calendar/templates/idots/images/navbar.png
deleted file mode 100755
index 7b9c92e33c..0000000000
Binary files a/calendar/templates/idots/images/navbar.png and /dev/null differ
diff --git a/calendar/templates/idots/images/planner.gif b/calendar/templates/idots/images/planner.gif
deleted file mode 100644
index 84b3410970..0000000000
Binary files a/calendar/templates/idots/images/planner.gif and /dev/null differ
diff --git a/calendar/templates/idots/images/planner.png b/calendar/templates/idots/images/planner.png
deleted file mode 100644
index 32729ad90a..0000000000
Binary files a/calendar/templates/idots/images/planner.png and /dev/null differ
diff --git a/calendar/templates/idots/images/today.gif b/calendar/templates/idots/images/today.gif
deleted file mode 100644
index 65d68c8873..0000000000
Binary files a/calendar/templates/idots/images/today.gif and /dev/null differ
diff --git a/calendar/templates/idots/images/today.png b/calendar/templates/idots/images/today.png
deleted file mode 100644
index 3c9e085eae..0000000000
Binary files a/calendar/templates/idots/images/today.png and /dev/null differ
diff --git a/calendar/templates/idots/images/view.gif b/calendar/templates/idots/images/view.gif
deleted file mode 100644
index 3d9691db2f..0000000000
Binary files a/calendar/templates/idots/images/view.gif and /dev/null differ
diff --git a/calendar/templates/idots/images/view.png b/calendar/templates/idots/images/view.png
deleted file mode 100644
index ed18a6cd7f..0000000000
Binary files a/calendar/templates/idots/images/view.png and /dev/null differ
diff --git a/calendar/templates/idots/images/week.gif b/calendar/templates/idots/images/week.gif
deleted file mode 100644
index e0fcf77766..0000000000
Binary files a/calendar/templates/idots/images/week.gif and /dev/null differ
diff --git a/calendar/templates/idots/images/week.png b/calendar/templates/idots/images/week.png
deleted file mode 100644
index 8d9de14858..0000000000
Binary files a/calendar/templates/idots/images/week.png and /dev/null differ
diff --git a/calendar/templates/idots/images/year.gif b/calendar/templates/idots/images/year.gif
deleted file mode 100644
index d8b22ee911..0000000000
Binary files a/calendar/templates/idots/images/year.gif and /dev/null differ
diff --git a/calendar/templates/idots/images/year.png b/calendar/templates/idots/images/year.png
deleted file mode 100644
index 8888a410e2..0000000000
Binary files a/calendar/templates/idots/images/year.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/arrow.gif b/calendar/templates/idsociety/images/arrow.gif
deleted file mode 100755
index eedb9bb028..0000000000
Binary files a/calendar/templates/idsociety/images/arrow.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/arrow.png b/calendar/templates/idsociety/images/arrow.png
deleted file mode 100644
index 68f3127779..0000000000
Binary files a/calendar/templates/idsociety/images/arrow.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/circle.gif b/calendar/templates/idsociety/images/circle.gif
deleted file mode 100755
index 89624b9039..0000000000
Binary files a/calendar/templates/idsociety/images/circle.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/circle.png b/calendar/templates/idsociety/images/circle.png
deleted file mode 100644
index c127fdaff6..0000000000
Binary files a/calendar/templates/idsociety/images/circle.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/mini-calendar-bar.gif b/calendar/templates/idsociety/images/mini-calendar-bar.gif
deleted file mode 100644
index 33dd895024..0000000000
Binary files a/calendar/templates/idsociety/images/mini-calendar-bar.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/mini-calendar-bar.png b/calendar/templates/idsociety/images/mini-calendar-bar.png
deleted file mode 100644
index e6df98d7f0..0000000000
Binary files a/calendar/templates/idsociety/images/mini-calendar-bar.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/mini_day_block.gif b/calendar/templates/idsociety/images/mini_day_block.gif
deleted file mode 100644
index d31fa09acb..0000000000
Binary files a/calendar/templates/idsociety/images/mini_day_block.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/mini_day_block.png b/calendar/templates/idsociety/images/mini_day_block.png
deleted file mode 100644
index 0db414dd5c..0000000000
Binary files a/calendar/templates/idsociety/images/mini_day_block.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/multi_1.gif b/calendar/templates/idsociety/images/multi_1.gif
deleted file mode 100755
index cef1a9bbe7..0000000000
Binary files a/calendar/templates/idsociety/images/multi_1.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/multi_1.png b/calendar/templates/idsociety/images/multi_1.png
deleted file mode 100644
index e088407fa1..0000000000
Binary files a/calendar/templates/idsociety/images/multi_1.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/multi_3.gif b/calendar/templates/idsociety/images/multi_3.gif
deleted file mode 100755
index 4f4f8f0934..0000000000
Binary files a/calendar/templates/idsociety/images/multi_3.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/multi_3.png b/calendar/templates/idsociety/images/multi_3.png
deleted file mode 100644
index b73d333f79..0000000000
Binary files a/calendar/templates/idsociety/images/multi_3.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/new.gif b/calendar/templates/idsociety/images/new.gif
deleted file mode 100755
index 687f6aaf75..0000000000
Binary files a/calendar/templates/idsociety/images/new.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/new.png b/calendar/templates/idsociety/images/new.png
deleted file mode 100644
index 0fc23618ca..0000000000
Binary files a/calendar/templates/idsociety/images/new.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/pix.gif b/calendar/templates/idsociety/images/pix.gif
deleted file mode 100644
index 3a46969559..0000000000
Binary files a/calendar/templates/idsociety/images/pix.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/pix.png b/calendar/templates/idsociety/images/pix.png
deleted file mode 100644
index 2980a0fdd7..0000000000
Binary files a/calendar/templates/idsociety/images/pix.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/rpt.gif b/calendar/templates/idsociety/images/rpt.gif
deleted file mode 100755
index 384fee476b..0000000000
Binary files a/calendar/templates/idsociety/images/rpt.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/rpt.png b/calendar/templates/idsociety/images/rpt.png
deleted file mode 100644
index 572ba96c47..0000000000
Binary files a/calendar/templates/idsociety/images/rpt.png and /dev/null differ
diff --git a/calendar/templates/idsociety/images/view.gif b/calendar/templates/idsociety/images/view.gif
deleted file mode 100755
index bdbb794874..0000000000
Binary files a/calendar/templates/idsociety/images/view.gif and /dev/null differ
diff --git a/calendar/templates/idsociety/images/view.png b/calendar/templates/idsociety/images/view.png
deleted file mode 100644
index 4d74a19fa8..0000000000
Binary files a/calendar/templates/idsociety/images/view.png and /dev/null differ
diff --git a/calendar/templates/jerryr/app.css b/calendar/templates/jerryr/app.css
deleted file mode 100644
index 51615534a5..0000000000
--- a/calendar/templates/jerryr/app.css
+++ /dev/null
@@ -1,262 +0,0 @@
-/* CSS Document */
-
-.to_continue
-{
-	font-size: 9px;
-}
-
-A.minicalendar 
-{ 
-	color: #666666; 
-	font-size: 9px;
-	
-}
-
-A.bminicalendar 
-{ 
-	color: #336699; 
-	font-style: italic;
-	font-weight: bold;
-	font-size: 9px; 
-}
-
-A.minicalendargrey 
-{ 
-	color: #999999; 
-	font-size: 10px;
-	font-weight: bold;
-}
-
-A.bminicalendargrey 
-{ 
-	color: #336699; 
-	font-style: italic; 
-	font-size:10px; 
-}
-
-A.minicalhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #000000; 
-	font-size: 10px; 
-}
-
-A.bminicalhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #336699; 
-	font-size: 10px; 
-}
-
-A.minicalgreyhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #999999; 
-	font-size: 10px; 
-}
-
-A.bminicalgreyhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #999999; 
-	font-size: 10px; 
-}
-
-
-.event-on
-{ 
-	background: #faf8f3;
-	border: #c9c9c9 1px solid;
-}
-
-.event-off
-{ 
-	background: #f4f2ed;
-	border: #c9c9c9 1px solid;
-}
-
-.event-holiday
-{
-	font-size: 100%;
-	background: #dac0c0;
-	color:#000000;
-	vertical-align: middle;
-}
-
-.time
-{
-	background: #f4f2ed;
-	color:#000000;
-	font-size: 10px;
-	font-weight: bold;
-	vertical-align: middle;
-	width: 5.2%;
-	text-align: right;
-	padding-right: 5px;
-	line-height: 11px;
-	border: #c9c9c9 1px solid;
-}
-
-
-.planner-cell
-{
-	cursor: pointer;
-	cursor: hand;
-	border: thin solid black;
-}
-
-/* common */
-.calendar_link_print
-{
-	text-align: center;
-	font-size: 10px;
-}
-
-//Mini Calendar
-
-.calendar_minical_table
-{
-	width: 180px;
-	font-weight: bold;
-}
-
-.calendar_minical_daytable
-{
-	width: 100%;
-}
-
-.calendar_minical_dayname
-{
-	font-size: 9px;
-	text-align: right;
-}
-
-.calendar_minical_hrule
-{
-	width: 96%;
-}
-
-/* Header */
-.calendar_dropbuttons
-{
-	align: center;
-	text-align: center;
-	vertical-align: bottom;
-	font-weight: bold;
-	font-size: 8px;
-}
-
-.calendar-weekidentifier
-{
-	font-size:16px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_header
-{
-	font-size: 16px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_dayview_table_header
-{
-	font-size: 13px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_dayview_todo_header
-{
-	margin: 0px; 
-	padding: 2px;
-	font-weight: bold;
-}
-
-/* week view */
-.calendar_week_identifier_table
-{
-	border: 0px solid black;
-	width: 100%;
-}
-
-.calendar_week_identifier
-{
-	font-size: 13px;
-	text-align: center;
-	font-weight: bold;
-}
-
-.calendar_weekview_daytitle
-{
-	font-weight: bold;
-	font-size: 12px;
-	background: #D3DCE3;
-}
-
-.calendar_m_w_table
-{
-	table-layout:fixed;
-	overflow:auto;
-	height: 100%;
-	width: 100%;
-	border: 0px #000000 solid;
-}
-
-.calendar_m_w_table_row
-{
-	height: 80px;
-}
-
-.calendar_m_w_tablecell
-{
-	vertical-align: top;
-	padding-left: 4px;
-	padding-right: 4px;
-	padding-bottom: 6px;
-}
-
-A.event_entry
-{
-	font-size:10px;
-}
-
-/* month view */
-
-.calendar_month_identifier
-{
-	font-size:14px;
-	font-weight: bold;
-}
-
-.calendar_user_identifier
-{
-	font-size:12px;
-	color: #009999;
-	font-weight: bold;
-}
-
-.calendar_week_minical_table
-{
-	width:100%;
-	border: 0px solid #000000
-}
-
-.calendar_weekinfo
-{
-	color: #000000;
-	padding-left: 2px;
-	padding-right: 2px;
-	font-size: 10px;
-	font-weight: bold;
-	font-style: italic;
-}
diff --git a/calendar/templates/jerryr/day.tpl b/calendar/templates/jerryr/day.tpl
deleted file mode 100644
index 16cbfd81a9..0000000000
--- a/calendar/templates/jerryr/day.tpl
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day -->
-{printer_friendly}
-<table border="0" width="100%" class="calDayViewShadowBox">
-	<tr>
-		<td valign="top" width="70%">
-   			<table border="0" cellpadding=0 cellspacing=0 width=100%>
-					<tr>
-						<td width=8 class="calLtLtTitleBlue"></td>
-						<td width=8 class="calLtMidTitleBlue"></td>
-						<td  nowrap class="calDayTitleBlue" >{date}&nbsp;&nbsp;{username}&nbsp;</td>
-						<td width=8 class="calRtMidTitleBlue" ></td>
-						<td width=8 class="calRtRtTitleBlue" ></td>
-					</tr>
-					<tr>
-						<td width=8 class="calLeftShadow"></td>
-						<td valign="top" colspan=3 >
-							<table width=100% cellpadding=0 cellspacing=0>{day_events}</table>
-						</td>
-						<td width=8 class="calRightShadow"></td>
-					</tr>
-					<tr class="calRowBottomShadow">
-						<td width=8 class="calLtLtFoot"></td>
-						<td width=8 class="calLtMidFoot"></td>
-						<td>&nbsp;</td>
-						<td width=8 class="calRtMidFoot"></td>
-						<td width=8 class="calRtRtFoot"></td>
-					</tr>	
-				</table><p>{print}</p>
-			</td>
-			<td width=5></td>
-			<td align="center" valign="top" >
-				<table cellpadding=0 cellspacing=0 width="100%">
-					<tr>
-						<td>{small_calendar}</td>
-					</tr>
-				</table>
-				<table height="5" border=0><tr><td></td></tr></table>
-				<table width=100% cellspacing=0 cellpadding=0>
-					<tr>
-						<td>
-							<table border=0 width="100%" cellpadding=0 cellspacing=0>
-								<tr>
-									<td width=8 class="calLtLtTitleRed"></td>
-									<td width=8 class="calLtMidTitleRed"></td>
-									<td  nowrap class="calDayTitleRed" >{lang_todos}</td>
-									<td width=8 class="calRtMidTitleRed" ></td>
-									<td width=8 class="calRtRtTitleRed" ></td>
-								</tr>
-								<tr>
-									<td width=8 class="calLeftShadow"></td>
-									<td valign="top" colspan=3 >	{todos}</td>
-									<td width=8 class="calRightShadow"></td>
-								</tr>
-								<tr class="calRowBottomShadow">
-									<td width=8 class="calLtLtFoot"></td>
-									<td width=8 class="calLtMidFoot"></td>
-									<td></td>
-									<td width=8 class="calRtMidFoot"></td>
-									<td width=8 class="calRtRtFoot"></td>
-								</tr>	
-							</table>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
-<!-- END day -->
-<!-- BEGIN day_event -->
-    <tr>
-     <td valign="top">
-{daily_events}
-     </td>
-    </tr>
-<!-- END day_event -->
-
diff --git a/calendar/templates/jerryr/edit.tpl b/calendar/templates/jerryr/edit.tpl
deleted file mode 100644
index cea1b9778c..0000000000
--- a/calendar/templates/jerryr/edit.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN edit_entry -->
-<script language="JavaScript">
-	self.name="first_Window";
-	function accounts_popup()
-	{
-		Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
-	}
-</script>
-<center>
-<font color="#000000" face="{font}">
-
-<form action="{action_url}" method="post" name="app_form">
-{common_hidden}
-<table class="calDayViewShadowBox" width="100%"><tr><td>
-<table class="calDayViewSideBoxes" width="100%">
- <tr>
-  <td colspan="2">
-   <center><font size="+1"><b>{errormsg}</b></font></center>
-  </td>
- </tr>
-{row}
- <tr>
-  <td>
-   <table><tr valign="top">
-    <td><input type="submit" value="{submit_button}">&nbsp;</form></td>
-    <td>{cancel_button}</td>
-   </tr></table>
-  </td>
-  <td align="right">{delete_button}</td>
- </tr>
-</table>
-</td></tr></table>
-</font>
-</center>
-<!-- END edit_entry -->
-<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
-  <td valign="top" width="35%">&nbsp;<b>{field}:</b></td>
-  <td valign="top" width="65%">{data}</td>
- </tr>
-<!-- END list -->
-<!-- BEGIN hr -->
- <tr bgcolor="{tr_color}">
-  <td colspan="2">
-   {hr_text}
-  </td>
- </tr>
-<!-- END hr -->
diff --git a/calendar/templates/jerryr/footer.tpl b/calendar/templates/jerryr/footer.tpl
deleted file mode 100644
index c694bc97cf..0000000000
--- a/calendar/templates/jerryr/footer.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN footer_table -->
-<!--
-<tr>
-    <td>1</td>
-</tr>
--->
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-    <tr>
-	{table_row}
-    </tr>
-</table>
-<!--       <tr>-->
-<!-- END footer_table -->
-
-
-<!-- BEGIN footer_row -->
-
-    <form action="{action_url}" method="post" name="{form_name}">
-<td valign="top">
-	<span style="font-size:9px; font-weight:bold;">{label}:</span>
-	{hidden_vars}
-	<select name="{form_label}" onchange="{form_onchange}">
-	{row}
-	</select>
-	<noscript><input type="submit" value="{go}"></noscript>
-</td>
-    </form>
-
-<!-- END footer_row -->
-
-<!-- BEGIN blank_row -->
-     <td>
-    {b_row}
-    </td>
-<!-- END blank_row -->
-<!-- <td> -->
-
diff --git a/calendar/templates/jerryr/head.tpl b/calendar/templates/jerryr/head.tpl
deleted file mode 100644
index d483005ad2..0000000000
--- a/calendar/templates/jerryr/head.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN head -->
-{row}
-<!-- END head -->
-<!-- BEGIN head_table -->
-<table border="0" width="100%" cols="{cols}" cellpadding="0" cellspacing="0">
- <tr>
-  {header_column} </tr>
-</table>
-<!-- END head_table -->
-<!-- BEGIN head_col -->
-{str}
-<!-- END head_col -->
diff --git a/calendar/templates/jerryr/images/view.png b/calendar/templates/jerryr/images/view.png
deleted file mode 100644
index 7229acfa02..0000000000
Binary files a/calendar/templates/jerryr/images/view.png and /dev/null differ
diff --git a/calendar/templates/jerryr/index.tpl b/calendar/templates/jerryr/index.tpl
deleted file mode 100644
index 2dcb447959..0000000000
--- a/calendar/templates/jerryr/index.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- $Id$ -->
-{printer_friendly}
-<table border="0" width="100%" cols="5" class="calDayViewShadowBox">
- <tr>
-  <td align="left" valign="top" width="20%">
-   {small_calendar_prev}</td>
-  <td align="center" valign="middle" width="20%">
-   <b>{prev_month_link}</b></td>
-  <td align="center" width="20%">
-   <font size="+2" color="#000000"><b>{month_identifier}</b></font>
-   <font size="+1" color="#000000"><br>{username}</font></td>
-  <td align="center" valign="middle" width="20%">
-   {next_month_link}</td>
-  <td align="right" valign="top" width="20%">
-   {small_calendar_next}</td>
- </tr>
- <tr>
-  <td colspan=5 width=100%>
-	<table width=100% class="calDayViewSideBoxes">
-		<tr>
-			<td>{large_month}</td>
-		</tr>
-	</table><p style="font-size:10px; text-align:center">{print}</p>
-</td>
-</tr>
-</table>
-
-
diff --git a/calendar/templates/jerryr/mini_cal.tpl b/calendar/templates/jerryr/mini_cal.tpl
deleted file mode 100644
index e3f249cbf4..0000000000
--- a/calendar/templates/jerryr/mini_cal.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN mini_cal -->
-<table width=100%><tr>
-						<td>
-							<table align="center" border=0 width="200" cellpadding=0 cellspacing=0 bgcolor="#faf8f3">
-								<tr>
-									<td width=8 class="calLtLtTitleBeige"></td>
-									<td width=8 class="calLtMidTitleBeige"></td>
-									<td  nowrap class="calDayTitleBeige" >{month}</td>
-									<td width=8 class="calRtMidTitleBeige" ></td>
-									<td width=8 class="calRtRtTitleBeige" ></td>
-								</tr>
-								<tr>
-									<td width=8 class="calLeftShadow"></td>
-									<td valign="top" colspan=3 ><table border="0" width="100%" cellspacing="7" cellpadding="0" valign="top" cols="7">
-    <tr>{daynames}    </tr>{display_monthweek}   </table></td>
-									<td width=8 class="calRightShadow"></td>
-								</tr>
-								
-								<tr class="calRowBottomShadow">
-									<td width=8 class="calLtLtFoot"></td>
-									<td width=8 class="calLtMidFoot"></td>
-									<td>&nbsp;</td>
-									<td width=8 class="calRtMidFoot"></td>
-									<td width=8 class="calRtRtFoot"></td>
-								</tr>	
-							</table>
-						</td>
-</tr></table>
-<!-- END mini_cal -->
-<!-- BEGIN mini_week -->
-    <tr>{monthweek_day}
-    </tr>
-<!-- END mini_week -->
-<!-- BEGIN mini_day -->
-     <td align="center"{day_image}><font size="-2">{dayname}</font></td>
-<!-- END mini_day -->
diff --git a/calendar/templates/jerryr/view.tpl b/calendar/templates/jerryr/view.tpl
deleted file mode 100644
index 617b2eab9f..0000000000
--- a/calendar/templates/jerryr/view.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN view_event -->
-<center>
-<table border="0" width="100%" class="calDayViewShadowBox">
-<tr>
-<td>
-<table border="0" width="100%">
-  {row}
-  <tr>
-   <td><table cellspacing="5"><tr>{button_left}</tr></table></td>
-   <td align="center"><table cellspacing="5"><tr>{button_center}</tr></table></td>
-   <td align="right"><table cellspacing="5"><tr>{button_right}</tr></table></td>
-  </tr>
- </table>
-</td>
-</tr>
-</table>
-</center>
-<!-- END view_event -->
-
-<!-- BEGIN list -->
-  <tr bgcolor="{tr_color}">
-   <td valign="top" width="30%">&nbsp;<b>{field}:</b></td>
-   <td colspan="2" valign="top" width="70%">{data}</td>
-  </tr>
-<!-- END list -->
-
-<!-- BEGIN hr -->
- <tr>
-  <td colspan="3" bgcolor="{th_bg}" align="center">
-   <b>{hr_text}</b>
-  </td>
- </tr>
-<!-- END hr -->
diff --git a/calendar/templates/jerryr/week.tpl b/calendar/templates/jerryr/week.tpl
deleted file mode 100644
index 4ca5c5098c..0000000000
--- a/calendar/templates/jerryr/week.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- $Id$ -->
-{printer_friendly}
-<table border=0 align="center" class="calDayViewShadowBox" width="100%" cols="5" >
-<tr>
-<td>
-
-
-<table border=0 align="center" width="100%" cols="5" >
-<tr>
-
-  <td align="left" valign="top">
-   {small_calendar_prev}
-  </td>
-  <td align="center" valign="middle" >
-   <b>{prev_week_link}</b>
-  </td>
-  <td align="center" valign="top" >
-   {small_calendar_this}
-  </td>
-  <td align="center" valign="middle" >
-   <b>{next_week_link}</b>
-  </td>
-  <td align="right" valign="top" >
-   {small_calendar_next}
-  </td>
- </tr>
-</table>
-
-
-
-
-<table><tr><td height="5"></td></tr></table>
-<table border=0  align="center" width=100%>
-	<tr>
-		<td>
-			<table  border="0" width="100%" cellpadding=0 cellspacing=0>
-				<tr>
-					<td width=8 class="calLtLtTitleBlue"></td>
-					<td width=8 class="calLtMidTitleBlue"></td>
-  					<td align="center" class="calDayTitleBlue"><b>{week_identifier}</b>&nbsp;&nbsp;{username}</td>
-					<td width=8 class="calRtMidTitleBlue" ></td>
-					<td width=8 class="calRtRtTitleBlue" ></td>
-				</tr>
-				<tr>
-					<td width=8 class="calLeftShadow"></td>
-					<td colspan=3>{week_display}</td>
-					<td width=8 class="calRightShadow"></td>
-				</tr>
-				<tr class="calRowBottomShadow">
-						<td class="calLtLtFoot"></td>
-						<td class="calLtMidFoot"></td>
-						<td>&nbsp;</td>
-						<td class="calRtMidFoot"></td>
-						<td class="calRtRtFoot"></td>
-					</tr>	
-			</table><p style="font-size:10px; text-align:center;">{print}</p>
-</td>
-	</tr>
-</table>
-</td>
-</tr>
-</table>
diff --git a/calendar/templates/jerryr/year.tpl b/calendar/templates/jerryr/year.tpl
deleted file mode 100644
index 932eff1428..0000000000
--- a/calendar/templates/jerryr/year.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- BEGIN year -->
-{print}
-<center>
-<table border="0" width="100%" class="calDayViewShadowBox">
-	<tr>
-		<td>
-<table width=100% border="0" cellspacing="3" cellpadding="4" cols=4>
- <tr>
-  <td align="center">
-   {left_link}
-  </td>
-  <td align="center">
-   <font face="{font}" size="+1">{year_text}</font>
-  </td>
-  <td align="center">
-   {right_link}
-  </td>
-   {row}
- </tr>
-</table><p>{printer_friendly}
-</td>
-</tr>
-</table>
-</center>
-
-<!-- END year -->
-<!-- BEGIN month -->
-<td valign="top">
- {mini_month}
-</td>
-<!-- END month -->
-<!-- BEGIN month_sep -->
- </tr>
- <tr valign="top">
-<!-- END month_sep -->
-
diff --git a/calendar/templates/literati/images/view.png b/calendar/templates/literati/images/view.png
deleted file mode 100644
index 2e9e2dcf1a..0000000000
Binary files a/calendar/templates/literati/images/view.png and /dev/null differ
diff --git a/calendar/templates/prisma/alarm.tpl b/calendar/templates/prisma/alarm.tpl
deleted file mode 100644
index 90ba695990..0000000000
--- a/calendar/templates/prisma/alarm.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN alarm_management -->
-<form id="calendar_alarmform" action="{action_url}" method="post" name="alarmform">
-{hidden_vars}
-	<table id="calendar_alarmform_table" border="0" width="90%" align="center">
-		{rows}
-		<tr>
-			<td colspan="4">
-				<br>&nbsp;{input_days}&nbsp;{input_hours}&nbsp;{input_minutes}&nbsp;{input_owner}&nbsp;{input_add}<br>&nbsp;
-			</td>
-			<td align="right">
-				{input_cancel}
-			</td>
-		</tr>
-	</table>
-</form>
-<!-- END alarm_management -->
-
-<!-- BEGIN alarm_headers -->
-	<tr bgcolor="{tr_color}">
-		<th align="left" width="25%">{lang_time}</th>
-		<th align="left" width="30%">{lang_text}</th>
-		<th align="left" width="25%">{lang_owner}</th>
-		<th width="10%">{lang_enabled}</th>
-		<th width="10%">{lang_select}</th>
-	</tr>
-<!-- END alarm_headers -->
-
-<!-- BEGIN list -->
-	<tr bgcolor="{tr_color}">
-		<td>
-			<b>{field}:</b>
-		</td>
-		<td>
-			{data}
-		</td>
-		<td>
-			{owner}
-		</td>
-		<td align="center">
-			{enabled}
-		</td>
-		<td align="center">
-			{select}
-		</td>
-	</tr>
-<!-- END list -->
-
-<!-- BEGIN hr -->
-	<tr bgcolor="{th_bg}">
-		<td colspan="5" align="center">
-			<b>{hr_text}</b>
-		</td>
-	</tr>
-<!-- END hr -->
-
-<!-- BEGIN buttons -->
-	<tr>
-		<td colspan="6" align="right">
-			{enable_button}&nbsp;{disable_button}&nbsp;{delete_button}
-		</td>
-	</tr>
-<!-- END buttons -->
diff --git a/calendar/templates/prisma/app.css b/calendar/templates/prisma/app.css
deleted file mode 100644
index 9f69c41696..0000000000
--- a/calendar/templates/prisma/app.css
+++ /dev/null
@@ -1,470 +0,0 @@
-/* CSS Document */
-
-/*
- * CSS settings for the new uiviews code
- */
-
-/* timeGridWidget, contains timeRow's and dayCol's
- */
-.calTimeGrid{
-	position: relative;
-	top: 0px;
-	left: 0px;
-	border:1px solid gray;
-	margin-top: 20px;	/* contains the dayColHeader */
-/* set via inline style on runtime:
- *  width:
- */
-}
-
-/* single row in the time-line, always used in conjunction with row_{on|off}, you dont need to set a bgcolor, but you can
- */
-.calTimeRow,.calTimeRowOff{
-	position: relative;
-	width: 100%;
-/* set via inline style on runtime:
- *  height:
- */
-}
-.calTimeRow{
-/*	background-color: silver; */
-}
-
-/* time in a timeRow
- */
-.calTimeRowTime{
-	padding-left: 5px;
-	height: 100%;
-}
-
-/* contains (multiple) dayCol's
- */
-.calDayCols{
-	position: absolute;
-	top: 0px;
-	height: 100;
-/* set via inline style on runtime:
- *  left:  width(calTimeRowTime)
- *  width: 100% - width(calTimeRowTime)
- */
-}
-
-/* contains (multiple) eventCol's
- */
-.calDayCol{
-	position: absolute;
-	top: 0px;
-	height: 100%;
-/* set via inline style on runtime:
- *  left:
- *  width:
- */
-	border-left: 1px solid gray;
-}
-
-/* header for the dayCol
- */
-.calDayColHeader,.calGridHeader{
-	position: absolute;
-	top: -20px;
-	width: 100%;
-	text-align: center;
-	font-size: 100%;
-	white-space: nowrap;
-	border: 1px solid gray;
-	height: 16px;
-	left: -1px;
-	padding-top: 2px;
-}
-.calToday{
-	background: #ffffcc;
-}
-.calHoliday{
-	background: #dac0c0;
-}
-
-.calViewUserNameBox {
-	position: absolute;
-	top: -1px;
-	width: 95%;
-	text-align: left;
-	font-size: 120%;
-	white-space: nowrap;
-	border: 1px solid gray;
-	height: 17px;
-	left: -1px;
-	padding-top: 0px;
-	padding-left: 10px;
-	background: #dac0c0;
-}
-.calViewUserName {
-	font-weight: normal;
-}
-.calViewUserName:first-letter {
-	text-transform:uppercase;
-}
-.calViewUserNameFirst {
-}
-.calViewUserNameFirst:after {
-	content: ", ";
-}
-	
-/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers)
- */
-.calGridHeader{
-	text-align: left;
-	padding-left: 3px;
-}
-
-/* contains (multiple) events's
- */
-.calEventCol{
-	position: absolute;
-	top: 0px;
-	height: 100%;
-/* set via inline style on runtime:
- *  left:
- *  width:
- */
-/*	border: 1px dotted red; */
-}
-
-/* contains one event: header-row & -body
- */
-.calEvent,.calEvent:hover{
-	position: absolute;
-/*	background-color: #ffffC0;*/
-	left: 0px;
-	width: 100%;
-	overflow: hidden;
-/* set via inline style on runtime:
- *  top: depending on startime
- *  top: depending on length
- */
-}
-.calEvent:hover{
-/*	background-color: #ffff80;*/
-	cursor: pointer;
-	cursor: hand;
-}
-
-/* header-row of the event
- */
-.calEventHeader,.calEventHeaderSmall{
-	font-weight: bold;
-	font-size: 14px;
-	background-color: #0000ff;
-	color: white;
-	text-align: center;
-	white-space: nowrap;
-}
-.calEventHeaderSmall{
-	font-size: 10px;
-}
-
-/* body of the event
- */
-.calEventBody,.calEventBodySmall{
-	padding: 0px 3px 0px;
-}
-
-.calEventBodySmall{
-	font-size: 95%;
-}
-
-.calEventLabel
-{
-	font-weight: bold;
-	font-size: 90%;
-}
-
-.calEventTitle
-{
-	font-weight: bold;
-	font-size: 110%;
-}
-
-/* cal day-view's todo column
- */
-.calDayToDos {
-	width: 240px;
-	text-align: center;
-}
-/* header row
-*/
-.calDayTodosHeader {
-	margin: 0px; 
-	width: 240px;	
-	padding: 1px;
-	font-weight: bold;
-}
-/* div containing the table with the ToDo's
-*/
-.calDayTodos .calDayTodosTable {
-	overflow: auto; 
-	max-height: 400px;
-}
-
-/*
- * From here on, settings for the "old" uicalendar code
- */
-.to_continue
-{
-	font-size: 9px;
-}
-
-A.minicalendar 
-{ 
-	color: #000000; 
-	font-size: 9px;
-	
-}
-
-A.bminicalendar 
-{ 
-	color: #336699; 
-	font-style: italic;
-	font-weight: bold;
-	font-size: 9px;
-}
-
-A.minicalendargrey 
-{ 
-	color: #999999; 
-	font-size: 10px;
-	font-weight: bold;
-}
-
-A.bminicalendargrey 
-{ 
-	color: #336699; 
-	font-style: italic; 
-	font-size:10px;
-}
-
-A.minicalhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #000000; 
-	font-size: 10px;
-}
-
-A.bminicalhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #336699; 
-	font-size: 10px;
-}
-
-A.minicalgreyhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #999999; 
-	font-size: 10px;
-}
-
-A.bminicalgreyhol
-{ 
-	padding-left:3px;
-	padding-right:3px;
-	background: #dab0b0;
-	color: #999999; 
-	font-size: 10px;
-}
-
-
-.event-on
-{ 
-	background: #D3DCE3;
-	border: #E8F0F0 1px solid;
-}
-
-.event-off
-{ 
-	background: #E8F0F0;
-	border: #D3DCE3 1px solid;
-}
-
-.event-holiday
-{
-	font-size: 100%;
-	background: #dac0c0;
-	color:#000000;
-	vertical-align: middle;
-}
-
-.time
-{
-	background: #D3DCE3;
-	color:#000000;
-	font-size: 10px;
-	font-weight: bold;
-	vertical-align: middle;
-	width: 5.2%;
-	text-align: right;
-	padding-right: 5px;
-	line-height: 11px;
-	border: #E8F0F0 1px solid;
-}
-
-
-.planner-cell
-{
-	cursor: pointer;
-	cursor: hand;
-	border: thin solid black;
-}
-
-/* common */
-.calendar_link_print
-{
-	text-align: center;
-	font-size: 10px;
-}
-
-//Mini Calendar
-
-.calendar_minical_table
-{
-	width: 180px;
-	font-weight: bold;
-}
-
-.calendar_minical_daytable
-{
-	width: 100%;
-}
-
-.calendar_minical_dayname
-{
-	font-size: 9px;
-	text-align: right;
-}
-
-.calendar_minical_hrule
-{
-	width: 96%;
-}
-
-/* Header */
-.calendar_dropbuttons
-{
-	align: center;
-	text-align: center;
-	vertical-align: bottom;
-	font-weight: bold;
-	font-size: 8px;
-}
-
-.calendar-weekidentifier
-{
-	font-size:16px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_header
-{
-	font-size: 16px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_dayview_table_header
-{
-	font-size: 13px;
-	font-weight: bold;
-	text-align: center;
-}
-
-.calendar_dayview_todo_header
-{
-	margin: 0px; 
-	padding: 2px;
-	font-weight: bold;
-}
-
-/* week view */
-.calendar_week_identifier_table
-{
-	border: 0px solid black;
-	width: 100%;
-}
-
-.calendar_week_identifier
-{
-	font-size: 13px;
-	text-align: center;
-	font-weight: bold;
-}
-
-.calendar_weekview_daytitle
-{
-	font-weight: bold;
-	font-size: 12px;
-	background: #D3DCE3;
-}
-
-.calendar_m_w_table
-{
-	table-layout:fixed;
-	overflow:auto;
-	height: 100%;
-	width: 100%;
-	border: 0px #000000 solid;
-}
-
-.calendar_m_w_table_row
-{
-	height: 80px;
-}
-
-.calendar_m_w_tablecell
-{
-	vertical-align: top;
-	padding-left: 4px;
-	padding-right: 4px;
-	padding-bottom: 6px;
-}
-
-A.event_entry
-{
-	font-size:10px;
-}
-
-/* month view */
-
-.calendar_month_identifier
-{
-	font-size:14px;
-	font-weight: bold;
-}
-
-.calendar_user_identifier
-{
-	font-size:12px;
-	color: #009999;
-	font-weight: bold;
-}
-
-.calendar_week_minical_table
-{
-	width:100%;
-	border: 0px solid #000000
-}
-
-.calendar_weekinfo
-{
-	color: #000000;
-	padding-left: 2px;
-	padding-right: 2px;
-	font-size: 10px;
-	font-weight: bold;
-	font-style: italic;
-}
diff --git a/calendar/templates/prisma/config.tpl b/calendar/templates/prisma/config.tpl
deleted file mode 100644
index ab7e04825b..0000000000
--- a/calendar/templates/prisma/config.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- BEGIN header -->
-<form method="POST" action="{action_url}">
-<table border="0" align="center">
-   <tr bgcolor="{th_bg}">
-    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
-   </tr>
-<!-- END header -->
-
-<!-- BEGIN body -->
-   <tr bgcolor="{row_on}">
-    <td colspan="2">&nbsp;</td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td colspan="2"><b>{lang_Calendar_settings}</b></td>
-   </tr>
-   <tr bgcolor="{row_on}">
-    <td>{lang_Do_you_wish_to_autoload_calendar_holidays_files_dynamically?}</td>
-    <td>
-     <select name="newsettings[auto_load_holidays]">
-      <option value=""{selected_auto_load_holidays_False}>{lang_No}</option>
-      <option value="True"{selected_auto_load_holidays_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
-   <tr bgcolor="{row_off}">
-    <td>{lang_Location_to_autoload_from}:</td>
-    <td>
-     <select name="newsettings[holidays_url_path]">
-      <option value="localhost"{selected_holidays_url_path_localhost}>localhost</option>
-      <option value="http://www.egroupware.org/cal"{selected_holidays_url_path_http://www.egroupware.org/cal}>www.egroupware.org</option>
-     </select>
-    </td>
-   </tr>
-<!-- END body -->
-
-<!-- BEGIN footer -->
-  <tr bgcolor="{th_bg}">
-    <td colspan="2">
-&nbsp;
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" align="center">
-      <input type="submit" name="submit" value="{lang_submit}">
-      <input type="submit" name="cancel" value="{lang_cancel}">
-    </td>
-  </tr>
-</table>
-</form>
-<!-- END footer -->
diff --git a/calendar/templates/prisma/csv_import.tpl b/calendar/templates/prisma/csv_import.tpl
deleted file mode 100644
index b186ce50a8..0000000000
--- a/calendar/templates/prisma/csv_import.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- BEGIN filename -->
-	  		<TR>
-	    		<TD>{lang_csvfile}</td>
-				<td><INPUT NAME="csvfile" SIZE=30 TYPE="file" VALUE="{csvfile}"></td>
-			</tr>
-			<tr>
-				<td>{lang_fieldsep}</td>
-				<td><input name="fieldsep" size=1 value="{fieldsep}"></td>
-			</tr>
-			<tr>
-				<td>{lang_charset}</td>
-				<td>
-			{select_charset}
-				</td>
-			</tr>
-			<tr><td>&nbsp;</td>
-				<td><INPUT NAME="convert" TYPE="submit" VALUE="{submit}"></TD>
-			</TR>
-<!-- END filename -->
-
-<!-- BEGIN fheader -->
-			<tr>
-				<td><b>{lang_csv_fieldname}</b></td>
-				<td><b>{lang_info_fieldname}</b></td>
-				<td><b>{lang_translation}</b></td>
-			</tr>
-<!-- END fheader -->
-
-<!-- BEGIN fields -->
-			<tr>
-				<td>{csv_field}</td>
-				<td><SELECT name="cal_fields[{csv_idx}]">{cal_fields}</select></td>
-				<td><input name="trans[{csv_idx}]" size=60 value="{trans}"></td>
-			</tr>
-<!-- END fields -->
-
-<!-- BEGIN ffooter -->
-			<tr>
-				<td rowspan="2" valign="middle" nowrap><br>{submit}</TD>
-				<td colspan="2"><br>
-					{lang_start} <INPUT name="start" type="text" size="5" value="{start}"> &nbsp; &nbsp;
-					{lang_max} <INPUT name="max" type="text" size="3" value="{max}"><td>
-			</tr>
-			<tr>
-				<td colspan="2"><INPUT name="debug" type="checkbox" value="1"{debug}> {lang_debug}</td>
-			</TR>
-			<tr><td colspan="3">&nbsp;<p>
-				{help_on_trans}
-			</td></tr>
-<!-- END ffooter -->
-
-<!-- BEGIN imported -->
-			<tr>
-				<td colspan=2 align=center>
-					{log}<p>
-					{anz_imported}
-				</td>
-			</TR>
-<!-- END imported -->
-
-<!-- BEGIN import -->
-<br/>
-<center>
-		<form {enctype} action="{action_url}" method="post">
-		<table>
-
-		{rows}
-
-		</table>
-		{hiddenvars}
-		</form>
-
-</center>
-<!-- END import -->
diff --git a/calendar/templates/prisma/custom_fields.tpl b/calendar/templates/prisma/custom_fields.tpl
deleted file mode 100644
index 57bba92875..0000000000
--- a/calendar/templates/prisma/custom_fields.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN custom_fields -->
-{lang_error}<br>
-<form action="{action_url}" method="post">
- {hidden_vars}
- <center>
-  <table border="0" width="90%">
-   <tr class="th">
-    <th align="left" width="30%">{lang_name}</th>
-    <th>{lang_length}</th>
-    <th>{lang_shown}</th>
-    <th>{lang_order}</th>
-    <th>{lang_title}</th>
-    <th>{lang_disabled}</th>
-    <th>&nbsp;</th>
-   </tr>
-   {rows}
-   <tr class="th">
-    <td>{name}</td>
-    <td align="center">{length}</td>
-    <td align="center">{shown}</td>
-    <td align="center">{order}</td>
-    <td align="center">{title}</td>
-    <td align="center">{disabled}</td>
-    <td align="center">{button}</td>
-   </tr>
-   <tr>
-    <td>{save_button} &nbsp; {cancel_button}</td>
-   </tr>
-  </table>
- </center>
-</form>
-<br>
-<!-- END custom_fields -->
-
-<!-- BEGIN row -->
-   <tr bgcolor="{tr_color}">
-    <td>{name}</td>
-    <td align="center">{length}</td>
-    <td align="center">{shown}</td>
-    <td align="center">{order}</td>
-    <td align="center">{title}</td>
-    <td align="center">{disabled}</td>
-    <td align="center">{button}</td>
-   </tr>
-<!-- END row -->
diff --git a/calendar/templates/prisma/day.tpl b/calendar/templates/prisma/day.tpl
deleted file mode 100644
index df9f66738a..0000000000
--- a/calendar/templates/prisma/day.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day -->
-{printer_friendly}
-<table id="calendar_dayview_table" class="calendar_dayview_table" border="0" width="100%">
-	<tr>
-		<td valign="top" width="70%">
-			<table id="calendar_dayview1" border="0" width=100%>
-				<tr>
-					<td class="calendar_dayview_table_header">
-      					{date}&nbsp;<span class="calendar_user_identifier">:&nbsp;{username}&nbsp;:</span>
-						<br />
-     				</td>
-    			</tr>
-				{day_events}
-   			</table>
-   			<p align="center">{print}</p>
-  		</td>
- 		 <td align="center" valign="top">
-  			 <table id="calendar_dayview2" width="100%">
-    			<tr>
-     				<td align="center">
-						{small_calendar}
-     				</td>
-    			</tr>
-    			<tr>
-     				<td align="center">
-      					<div class="th">
-       						<p class="calendar_dayview_todo_header">{lang_todos}</p>
-								{todos}
-      					</div>
-     				</td>
-    			</tr>
-   			</table>
-  		</td>
- 	</tr>
-</table>
-<!-- END day -->
-
-<!-- BEGIN day_event -->
-	<tr>
-		<td>
-
-			{daily_events}
-
-		</td>
-	</tr>
-<!-- END day_event -->
diff --git a/calendar/templates/prisma/day_cal.tpl b/calendar/templates/prisma/day_cal.tpl
deleted file mode 100644
index 552b309cf2..0000000000
--- a/calendar/templates/prisma/day_cal.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day -->
-<div class="th">
- <table class="calendar_dayview_maintable" width="100%" cellpadding="0">
-{row}
-</table>
- </div>
-<!-- END day -->
-<!-- BEGIN day_row -->
-    <tr>{time}{event}
-    </tr>
-<!-- END day_row -->
-<!-- BEGIN day_event_on -->
-     <td class="event-on"{extras}>&nbsp;{event}</td>
-<!-- END day_event_on -->
-<!-- BEGIN day_event_off -->
-     <td class="event-off"{extras}>&nbsp;{event}</td>
-<!-- END day_event_off -->
-<!-- BEGIN day_event_holiday -->
-     <td class="event-holiday"{extras}>&nbsp;{event}</td>
-<!-- END day_event_holiday -->
-<!-- BEGIN day_time -->
-     <td class="time" nowrap>{open_link}{time}{close_link}</td>
-<!-- END day_time -->
-
diff --git a/calendar/templates/prisma/day_list.tpl b/calendar/templates/prisma/day_list.tpl
deleted file mode 100644
index e1263b2cb2..0000000000
--- a/calendar/templates/prisma/day_list.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day -->
-<div class="event-off">
-<table border="0" width="100%" cellpadding="0">
-	<tr>
-		<td class="event-on">
-{row}
-		</td>
-	</tr>
-</table>
-</div>
-<!-- END day -->
-<!-- BEGIN day_row -->
-    <font style="font-size: 8pt;">{event}</font>
-<!-- END day_row -->
-<!-- BEGIN day_event_on -->
-	<font class="event-on">{event}</font>
-<!-- END day_event_on -->
-<!-- BEGIN day_event_off -->
-	<font class="event-on">{event}</font>
-<!-- END day_event_off -->
-<!-- BEGIN day_event_holiday -->
-	{event}
-<!-- END day_event_holiday -->
-<!-- BEGIN day_time -->
-	{time}
-     <!--<td class="time" nowrap>{open_link}{time}{close_link}</td>-->
-<!-- END day_time -->
-
diff --git a/calendar/templates/prisma/delete_common.tpl b/calendar/templates/prisma/delete_common.tpl
deleted file mode 100644
index 94e7026403..0000000000
--- a/calendar/templates/prisma/delete_common.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- BEGIN form -->
- <center>
-  <table border="0" with="65%">
-   <tr>
-    <td colspan="2" align="center">
-     {messages}
-    </td>
-   </tr>
-   <tr>
-    <td align="center">{no}</td>
-    <td align="center">{yes}</td>
-   </tr>
-  </table>
- </center>
-<!-- END form -->
-
diff --git a/calendar/templates/prisma/edit.tpl b/calendar/templates/prisma/edit.tpl
deleted file mode 100644
index dfd700a9d9..0000000000
--- a/calendar/templates/prisma/edit.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN edit_entry -->
-<center>
-<font color="#000000" face="{font}">
-
-<form action="{action_url}" method="post" name="app_form">
-{common_hidden}
-<table border="0" width="98%">
- <tr>
-  <td colspan="2">
-   <center><font size="+1"><b>{errormsg}</b></font></center>
-  </td>
- </tr>
-{row}
- <tr>
-  <td>
-  <table><tr valign="top">
-  <td>
-  <div style="padding-right: 2px">
-  	<input style="font-size:10px" type="submit" value="{submit_button}"></div></form>
-  </td>
-  <td>{cancel_button}</td>
-  </tr></table>
-  </td>
-  <td valign="top" align="right">{delete_button}</td>
- </tr>
-</table>
-</font>
-</center>
-<!-- END edit_entry -->
-<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
-  <td valign="top" width="35%" align="right">&nbsp;<b>{field}&nbsp;:&nbsp;</b></td>
-  <td valign="top" width="65%" align="left">{data}</td>
- </tr>
-<!-- END list -->
-<!-- BEGIN hr -->
- <tr bgcolor="{tr_color}">
-  <td colspan="2">
-   {hr_text}
-  </td>
- </tr>
-<!-- END hr -->
diff --git a/calendar/templates/prisma/event_widget.tpl b/calendar/templates/prisma/event_widget.tpl
deleted file mode 100644
index a49ae3900d..0000000000
--- a/calendar/templates/prisma/event_widget.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- BEGIN event_widget -->
-<table style="width: 99%; margin: 0px; padding: 0px;" cellpadding="0" cellspacing="0" border="0" align="center" {tooltip}>
-	<tr style="height: {header_height};" valign="top">
-		<td valign="middle" class="calEventHeader{Small}" style="height: {header_height}; border-top: {border} px solid {bordercolor}; background-color: {headerbgcolor};">{header}</td>
-	</tr>
-	<tr valign="top" style="height: {body_height} " >
-		<td class="calEventBody{Small}" style="background: {bodybackground}; border-left: {border}px solid {bordercolor};  height: {body_height};"><p style="margin: 0px;">{body_icons}<span class="calEventTitle">
-		{title}</span>
-		<br>
-		<br>
-		{description}
-		</td>
-	</tr>
-	<tr style="height: {corner_radius};">
-		<td class="calEventBody{Small}" style="border-left: {border}px solid {bordercolor}; background: {bodybackground};">&nbsp;</td>	
-	</tr>
-</table>
-<!-- END event_widget -->
-
-<!-- BEGIN event_tooltip -->
-<table style="width: 100%; margin: 0px; padding: 0px;" cellpadding="0" cellspacing="0" border="0" align="center">
-	<tr style="height: {header_height};" valign="top">
-		<td valign="middle" class="calEventHeader{Small}" style="height: {header_height}; border-top: {border} px solid {bordercolor}; background-color: {headerbgcolor};">{header_icons} {header}</td>
-	</tr>
-	<tr valign="top">
-		<td class="calEventBody{Small}" style="background: {bodybackground}; border-left: {border}px solid {bordercolor}; border-right: {border}px solid {bordercolor};"><p style="margin: 0px;">{body_icons}<span class="calEventTitle">{title}</span><br>{description}</p><p style="margin: 2px 0px;">{multidaytimes}{location}{category}{participants}</p></td>
-	</tr>
-	<tr style="height: {corner_radius};">
-		<td style="border-left: {border}px solid {bordercolor}; border-right: {border}px solid {bordercolor};border-bottom: {border}px solid {bordercolor}; background: {bodybackground};">&nbsp;</td>
-	</tr>
-</table>
-<!-- END event_tooltip -->
-
diff --git a/calendar/templates/prisma/footer.tpl b/calendar/templates/prisma/footer.tpl
deleted file mode 100644
index 473bb42557..0000000000
--- a/calendar/templates/prisma/footer.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN footer_table -->
-       <hr clear="all">
-       <font size="-1">
-       <table border="0" width="100%" cellpadding="0" cellspacing="0">
-        <tr valign="top">
-{table_row}
-	</tr>
-       </table>
-<!-- END footer_table -->
-<!-- BEGIN footer_row -->
-         <td width="33%">
-          <font size="-1">
-           <form action="{action_url}" method="post" name="{form_name}">
-            <B>{label}:</B>
-			{hidden_vars}
-            <select name="{form_label}" onchange="{form_onchange}">
-	     {row}
-	    </select>
-            <noscript><input type="submit" value="{go}"></noscript>
-	   </form>
-	  </font>
-	 </td>
-<!-- END footer_row -->
-<!-- BEGIN blank_row -->
-         <td>
-          {b_row}
-         </td>
-<!-- END blank_row -->
-
-
diff --git a/calendar/templates/prisma/form_button_dropdown.tpl b/calendar/templates/prisma/form_button_dropdown.tpl
deleted file mode 100644
index 785962f861..0000000000
--- a/calendar/templates/prisma/form_button_dropdown.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- $Id$ -->
-<form action="{form_link}" method="post" name="{form_name}form">
-<td width="{form_width}%" align="center" valign="top" style="padding-top:16px">
-	<span style="font-size:10px"><b>{title}:</b>
-    {hidden_vars}    
-    <select name="{form_name}" onchange="document.{form_name}form.submit()">
-		{form_options}
-	</select>
-    <noscript>
-    	<input type="submit" value="{button_value}">
-    </noscript>
-	</span>
-</td>
-</form>
\ No newline at end of file
diff --git a/calendar/templates/prisma/form_button_script.tpl b/calendar/templates/prisma/form_button_script.tpl
deleted file mode 100644
index 322c951881..0000000000
--- a/calendar/templates/prisma/form_button_script.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN form_button -->
-
-<form action="{action_url_button}" method="post" name="{action_text_button}form">
-<div style="padding-right: 2px">
-	{action_extra_field} 
-	<input style="font-size:10px" type="submit" value="{action_text_button}" {action_confirm_button}>
-</div>
-</form>
-
-<!-- END form_button -->
diff --git a/calendar/templates/prisma/head.tpl b/calendar/templates/prisma/head.tpl
deleted file mode 100644
index c3d44ccbad..0000000000
--- a/calendar/templates/prisma/head.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN head -->
-{row}<br />
-<!-- END head -->
-
-<!-- BEGIN head_table -->
-<table id="calendar_head_table" class="calendar_head_table" border="0" width="100%" cols="{cols}" cellpadding="0" cellspacing="0">
-	<tr>
-		{header_column}
-	</tr>
-</table>
-<!-- END head_table -->
-
-<!-- BEGIN head_col -->
-{str}
-<!-- END head_col -->
\ No newline at end of file
diff --git a/calendar/templates/prisma/header.inc.php b/calendar/templates/prisma/header.inc.php
deleted file mode 100644
index 2cc683d5e8..0000000000
--- a/calendar/templates/prisma/header.inc.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare                                                               *
-  * http://www.egroupware.org                                                *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	function add_col(&$tpl,$str)
-	{
-		$tpl->set_var('str',$str);
-		$tpl->parse('header_column','head_col',True);
-	}
-
-	function add_image_ahref($link,$image,$alt)
-	{
-		return '<a href="'.$link.'"><img src="'.$GLOBALS['phpgw']->common->image('calendar',$image).'" alt="'.$alt.'" title="'.$alt.'" border="0"></a>';
-	}
-
-	$refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
-	$referrer = $refer[2];
-
-	$templates = Array(
-		'head_tpl'	=> 'head.tpl',
-		'form_button_dropdown'	=> 'form_button_dropdown.tpl',
-		'form_button_script'	=> 'form_button_script.tpl'
-	);
-	$tpl->set_file($templates);
-	$tpl->set_block('head_tpl','head','head');
-	$tpl->set_block('head_tpl','head_table','head_table');
-	$tpl->set_block('head_tpl','head_col','head_col');
-	$tpl->set_block('form_button_script','form_button');
-return;
-	if(floor(phpversion()) >= 4)
-	{
-		$tpl->set_var('cols',8);
-	}
-	else
-	{
-		$tpl->set_var('cols',7);
-	}
-
-	$today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
-
-	$col_width = 12;
-
-	add_col($tpl,'  <td width="2%">&nbsp;</td>');
-
-	add_col($tpl,'  <td width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today',lang('Today')).'</td>');
-
-	add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('week','&date='.$today),'week',lang('This week')).'</td>');
-
-	add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('month','&date='.$today),'month',lang('This month')).'</td>');
-
-	add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('year','&date='.$today),'year',lang('This Year')).'</td>');
-
-	if(floor(phpversion()) >= 4)
-	{
-		add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
-		$col_width += 2;
-	}
-
-	add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily Matrix View')).'</td>');
-
-	add_col($tpl,'  <td width="'.(100 - $col_width).'%" align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'>&nbsp;</td>');
-
-	$tpl->parse('row','head_table',True);
-
-	$tpl->set_var('header_column','');
-	$tpl->set_var('cols',$cols);
-
-	if($referrer!='view')
-	{
-		$remainder = 72;
-		
-		$date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
-		$date = (isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
-		$date = ($date=='' && isset($GLOBALS['HTTP_POST_VARS']['date'])?$GLOBALS['HTTP_POST_VARS']['date']:$date);
-
-		$base_hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
-		if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) && $GLOBALS['HTTP_GET_VARS']['cal_id'] != 0)
-		{
-			$base_hidden_vars .= '    <input type="hidden" name="cal_id" value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
-		}
-		if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords'])
-		{
-			$base_hidden_vars .= '    <input type="hidden" name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
-		}
-		if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) && $GLOBALS['HTTP_POST_VARS']['matrixtype'])
-		{
-			$base_hidden_vars .= '    <input type="hidden" name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
-		}
-		if($date)
-		{
-			$base_hidden_vars .= '    <input type="hidden" name="date" value="'.$date.'">'."\n";
-		}
-		$base_hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
-		$base_hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
-		$base_hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
-		
-		if(isset($GLOBALS['HTTP_POST_VARS']['participants']) && $GLOBALS['HTTP_POST_VARS']['participants'])
-		{
-			for ($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
-			{
-				$base_hidden_vars .= '    <input type="hidden" name="participants[]" value="'.$GLOBALS['HTTP_POST_VARS']['participants'][$i].'">'."\n";
-			}
-		}
-
-		$var = Array(
-			'form_width' => '28',
-			'form_link'	=> $this->page($referrer),
-			'form_name'	=> 'cat_id',
-			'title'	=> lang('Category'),
-			'hidden_vars'	=> $base_hidden_vars,
-			'form_options'	=> '<option value="0">'.lang('All').'</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
-			'button_value'	=> lang('Go!')
-		);
-		$tpl->set_var($var);
-		$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
-		$tpl->parse('header_column','head_col',True);
-
-		if($GLOBALS['HTTP_GET_VARS']['menuaction'] == 'calendar.uicalendar.planner')
-		{
-			$remainder -= 28;
-			print_debug('Sort By',$this->bo->sortby);
-
-			$form_options = '<option value="user"'.($this->bo->sortby=='user'?' selected':'').'>'.lang('User').'</option>'."\n";
-			$form_options .= '     <option value="category"'.((!isset($this->bo->sortby) || !$this->bo->sortby) || $this->bo->sortby=='category'?' selected':'').'>'.lang('Category').'</option>'."\n";
-
-			$var = Array(
-				'form_width' => '28',
-				'form_link'	=> $this->page($referrer),
-				'form_name'	=> 'sortby',
-				'title'	=> lang('Sort By'),
-				'hidden_vars'	=> $base_hidden_vars,
-				'form_options'	=> $form_options,
-				'button_value'	=> lang('Go!')
-			);
-			$tpl->set_var($var);
-			$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
-			$tpl->parse('header_column','head_col',True);
-		}
-
-		if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
-		{
-			$remainder -= 28;
-			$form_options = '<option value=" all "'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
-			$form_options .= '     <option value=" private "'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter==' private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
-
-			$var = Array(
-				'form_width' => '28',
-				'form_link'	=> $this->page($referrer),
-				'form_name'	=> 'filter',
-				'title'	=> lang('Filter'),
-				'hidden_vars'	=> $base_hidden_vars,
-				'form_options'	=> $form_options,
-				'button_value'	=> lang('Go!')
-			);
-			$tpl->set_var($var);
-			$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
-			$tpl->parse('header_column','head_col',True);
-		}
-
-		if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && count($this->bo->grants) > 0)
-		{
-			$form_options = '';
-			$drop_down = $this->bo->list_cals();
-			foreach($drop_down as $key => $grant)
-			{
-				$form_options .= '    <option value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?' selected':'').'>'.$grant['name'].'</option>'."\n";
-			}
-
-			$var = Array(
-				'form_width' => $remainder,
-				'form_link'	=> $this->page($referrer),
-				'form_name'	=> 'owner',
-				'title'	=> lang('User'),
-				'hidden_vars'	=> $base_hidden_vars,
-				'form_options'	=> $form_options,
-				'button_value'	=> lang('Go!')
-			);
-			$tpl->set_var($var);
-			$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
-			$tpl->parse('header_column','head_col',True);
-		}
-	}
-
-	$hidden_vars = '    <input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
-	if(isset($GLOBALS['HTTP_GET_VARS']['date']) && $GLOBALS['HTTP_GET_VARS']['date'])
-	{
-		$hidden_vars .= '    <input type="hidden" name="date" value="'.$GLOBALS['HTTP_GET_VARS']['date'].'">'."\n";
-	}
-	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
-	if(isset($this->bo->filter) && $this->bo->filter)
-	{
-		$hidden_vars .= '    <input type="hidden" name="filter" value="'.$this->bo->filter.'">'."\n";
-	}
-	if(isset($this->bo->sortby) && $this->bo->sortby)
-	{
-		$hidden_vars .= '    <input type="hidden" name="sortby" value="'.$this->bo->sortby.'">'."\n";
-	}
-	if(isset($this->bo->num_months) && $this->bo->num_months)
-	{
-		$hidden_vars .= '    <input type="hidden" name="num_months" value="'.$this->bo->num_months.'">'."\n";
-	}
-	$hidden_vars .= '    <input name="keywords"'.($GLOBALS['HTTP_POST_VARS']['keywords']?' value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'"':'').'>';
-
-	$var = Array(
-		'action_url_button'	=> $this->page('search'),
-		'action_text_button'	=> lang('Search'),
-		'action_confirm_button'	=> '',
-		'action_extra_field'	=> $hidden_vars
-	);
-	$tpl->set_var($var);
-	$button = $tpl->fp('out','form_button');
-	$tpl->set_var('str','<td align="right" valign="bottom">'.$button.'</td>');
-	$tpl->parse('header_column','head_col',True);
-	$tpl->parse('row','head_table',True);
-?>
diff --git a/calendar/templates/prisma/holiday.tpl b/calendar/templates/prisma/holiday.tpl
deleted file mode 100644
index 534acbeb81..0000000000
--- a/calendar/templates/prisma/holiday.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN form -->
-<center>
-{message}<br>
-<table border="0" width="80%" cellspacing="2" cellpadding="2"> 
- <form name="form" action="{actionurl}" method="POST">
-  {hidden_vars}
-{rows}
- <tr>
-  <td colspan="2">
-   <table width="100%" border="0" cellspacing="5">
-    <tr>
-     <td>
-      <input type="submit" name="submit" value="{lang_add}"></form>
-     </td>
-     <td>
-      {cancel_button}
-     </td>
-     <td align="right" width="80%">
-      {delete_button}
-     </td>
-    </tr>
-   </table>
-  <td>
- </tr>
-</table>
-</center>
-<!-- END form -->
-<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
-  <td valign="top" width="35%"><b>{field}:</b></td>
-  <td valign="top" width="65%">{data}</td>
- </tr>
-<!-- END list -->
diff --git a/calendar/templates/prisma/hr.tpl b/calendar/templates/prisma/hr.tpl
deleted file mode 100644
index fdbb59c224..0000000000
--- a/calendar/templates/prisma/hr.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Id$ -->
- <tr>
-  <td colspan="2">
-   {hr_text}
-  </td>
- </tr>
-
diff --git a/calendar/templates/prisma/images/alarm.gif b/calendar/templates/prisma/images/alarm.gif
deleted file mode 100644
index 743f2c77b3..0000000000
Binary files a/calendar/templates/prisma/images/alarm.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/alarm.png b/calendar/templates/prisma/images/alarm.png
deleted file mode 100644
index 7a3fcae59a..0000000000
Binary files a/calendar/templates/prisma/images/alarm.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/circle.gif b/calendar/templates/prisma/images/circle.gif
deleted file mode 100644
index e211e6c869..0000000000
Binary files a/calendar/templates/prisma/images/circle.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/circle.png b/calendar/templates/prisma/images/circle.png
deleted file mode 100644
index e7e6518ff4..0000000000
Binary files a/calendar/templates/prisma/images/circle.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/delete.png b/calendar/templates/prisma/images/delete.png
deleted file mode 100755
index 6d0d29d760..0000000000
Binary files a/calendar/templates/prisma/images/delete.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/disabled.gif b/calendar/templates/prisma/images/disabled.gif
deleted file mode 100644
index f776b68be1..0000000000
Binary files a/calendar/templates/prisma/images/disabled.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/disabled.png b/calendar/templates/prisma/images/disabled.png
deleted file mode 100644
index 2415dfc78b..0000000000
Binary files a/calendar/templates/prisma/images/disabled.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/enabled.gif b/calendar/templates/prisma/images/enabled.gif
deleted file mode 100644
index 3003103d5b..0000000000
Binary files a/calendar/templates/prisma/images/enabled.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/enabled.png b/calendar/templates/prisma/images/enabled.png
deleted file mode 100644
index 543710fb7b..0000000000
Binary files a/calendar/templates/prisma/images/enabled.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/high.gif b/calendar/templates/prisma/images/high.gif
deleted file mode 100644
index 6156073d89..0000000000
Binary files a/calendar/templates/prisma/images/high.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/high.png b/calendar/templates/prisma/images/high.png
deleted file mode 100644
index 429ee98186..0000000000
Binary files a/calendar/templates/prisma/images/high.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/mini-calendar-bar.gif b/calendar/templates/prisma/images/mini-calendar-bar.gif
deleted file mode 100644
index 33dd895024..0000000000
Binary files a/calendar/templates/prisma/images/mini-calendar-bar.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/mini-calendar-bar.png b/calendar/templates/prisma/images/mini-calendar-bar.png
deleted file mode 100644
index e6df98d7f0..0000000000
Binary files a/calendar/templates/prisma/images/mini-calendar-bar.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/mini_day_block.gif b/calendar/templates/prisma/images/mini_day_block.gif
deleted file mode 100644
index d31fa09acb..0000000000
Binary files a/calendar/templates/prisma/images/mini_day_block.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/mini_day_block.png b/calendar/templates/prisma/images/mini_day_block.png
deleted file mode 100644
index 0db414dd5c..0000000000
Binary files a/calendar/templates/prisma/images/mini_day_block.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/month.gif b/calendar/templates/prisma/images/month.gif
deleted file mode 100644
index 0b7982a5f8..0000000000
Binary files a/calendar/templates/prisma/images/month.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/month.png b/calendar/templates/prisma/images/month.png
deleted file mode 100644
index 20b66c2393..0000000000
Binary files a/calendar/templates/prisma/images/month.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/multi_3.gif b/calendar/templates/prisma/images/multi_3.gif
deleted file mode 100644
index bca0e9baa5..0000000000
Binary files a/calendar/templates/prisma/images/multi_3.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/multi_3.png b/calendar/templates/prisma/images/multi_3.png
deleted file mode 100644
index 7109febe0c..0000000000
Binary files a/calendar/templates/prisma/images/multi_3.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/navbar.gif b/calendar/templates/prisma/images/navbar.gif
deleted file mode 100644
index c58ac30e41..0000000000
Binary files a/calendar/templates/prisma/images/navbar.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/navbar.png b/calendar/templates/prisma/images/navbar.png
deleted file mode 100644
index 7b9c92e33c..0000000000
Binary files a/calendar/templates/prisma/images/navbar.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/new.gif b/calendar/templates/prisma/images/new.gif
deleted file mode 100644
index 3406ddfddd..0000000000
Binary files a/calendar/templates/prisma/images/new.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/new.png b/calendar/templates/prisma/images/new.png
deleted file mode 100644
index 616a415d8c..0000000000
Binary files a/calendar/templates/prisma/images/new.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/new2.gif b/calendar/templates/prisma/images/new2.gif
deleted file mode 100644
index e3cf313418..0000000000
Binary files a/calendar/templates/prisma/images/new2.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/new2.png b/calendar/templates/prisma/images/new2.png
deleted file mode 100644
index 9aef0c2879..0000000000
Binary files a/calendar/templates/prisma/images/new2.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/new3.gif b/calendar/templates/prisma/images/new3.gif
deleted file mode 100644
index 687f6aaf75..0000000000
Binary files a/calendar/templates/prisma/images/new3.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/new3.png b/calendar/templates/prisma/images/new3.png
deleted file mode 100644
index 0fc23618ca..0000000000
Binary files a/calendar/templates/prisma/images/new3.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/pix.gif b/calendar/templates/prisma/images/pix.gif
deleted file mode 100644
index 3a46969559..0000000000
Binary files a/calendar/templates/prisma/images/pix.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/pix.png b/calendar/templates/prisma/images/pix.png
deleted file mode 100644
index 2980a0fdd7..0000000000
Binary files a/calendar/templates/prisma/images/pix.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/planner.gif b/calendar/templates/prisma/images/planner.gif
deleted file mode 100644
index 84b3410970..0000000000
Binary files a/calendar/templates/prisma/images/planner.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/planner.png b/calendar/templates/prisma/images/planner.png
deleted file mode 100644
index 32729ad90a..0000000000
Binary files a/calendar/templates/prisma/images/planner.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/private.gif b/calendar/templates/prisma/images/private.gif
deleted file mode 100644
index edd12658ed..0000000000
Binary files a/calendar/templates/prisma/images/private.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/private.png b/calendar/templates/prisma/images/private.png
deleted file mode 100644
index 242ef0d552..0000000000
Binary files a/calendar/templates/prisma/images/private.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/recur.gif b/calendar/templates/prisma/images/recur.gif
deleted file mode 100644
index 7f8c03cbf7..0000000000
Binary files a/calendar/templates/prisma/images/recur.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/recur.png b/calendar/templates/prisma/images/recur.png
deleted file mode 100644
index eb0388df4c..0000000000
Binary files a/calendar/templates/prisma/images/recur.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/rpt.gif b/calendar/templates/prisma/images/rpt.gif
deleted file mode 100644
index b3401110cb..0000000000
Binary files a/calendar/templates/prisma/images/rpt.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/rpt.png b/calendar/templates/prisma/images/rpt.png
deleted file mode 100644
index b80c72091f..0000000000
Binary files a/calendar/templates/prisma/images/rpt.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/single.gif b/calendar/templates/prisma/images/single.gif
deleted file mode 100644
index 3d72533a24..0000000000
Binary files a/calendar/templates/prisma/images/single.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/single.png b/calendar/templates/prisma/images/single.png
deleted file mode 100644
index 20d6aaf18d..0000000000
Binary files a/calendar/templates/prisma/images/single.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/today.gif b/calendar/templates/prisma/images/today.gif
deleted file mode 100644
index 65d68c8873..0000000000
Binary files a/calendar/templates/prisma/images/today.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/today.png b/calendar/templates/prisma/images/today.png
deleted file mode 100644
index 3c9e085eae..0000000000
Binary files a/calendar/templates/prisma/images/today.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/view.gif b/calendar/templates/prisma/images/view.gif
deleted file mode 100644
index 3d9691db2f..0000000000
Binary files a/calendar/templates/prisma/images/view.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/view.png b/calendar/templates/prisma/images/view.png
deleted file mode 100644
index ed18a6cd7f..0000000000
Binary files a/calendar/templates/prisma/images/view.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/week.gif b/calendar/templates/prisma/images/week.gif
deleted file mode 100644
index e0fcf77766..0000000000
Binary files a/calendar/templates/prisma/images/week.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/week.png b/calendar/templates/prisma/images/week.png
deleted file mode 100644
index 8d9de14858..0000000000
Binary files a/calendar/templates/prisma/images/week.png and /dev/null differ
diff --git a/calendar/templates/prisma/images/year.gif b/calendar/templates/prisma/images/year.gif
deleted file mode 100644
index d8b22ee911..0000000000
Binary files a/calendar/templates/prisma/images/year.gif and /dev/null differ
diff --git a/calendar/templates/prisma/images/year.png b/calendar/templates/prisma/images/year.png
deleted file mode 100644
index 8888a410e2..0000000000
Binary files a/calendar/templates/prisma/images/year.png and /dev/null differ
diff --git a/calendar/templates/prisma/index.tpl b/calendar/templates/prisma/index.tpl
deleted file mode 100644
index 0d0b69b86d..0000000000
--- a/calendar/templates/prisma/index.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- $Id$ -->
-{printer_friendly}
-<table id="calendar_index_table" border="0" width="100%" cols="5">
-	<tr>
-		<td align="left" valign="top" width="20%">
-			{small_calendar_prev}
-		</td>
-		<td align="center" valign="middle" width="15%">
-			<b>{prev_month_link}</b>
-		</td>
-		<td align="center" width="30%">
-			<span class="calendar_month_identifier">
-				{month_identifier}
-			</span>
-				<br />
-			<span class="calendar_user_identifier">
-				:&nbsp;{username}&nbsp;:
-			</span>
-		</td>
-		<td align="center" valign="middle" width="15%">
-			{next_month_link}
-		</td>
-		<td align="right" valign="top" width="20%">
-			{small_calendar_next}
-		</td>
-	</tr>
-</table>
-{large_month}
-<p>
-<p>
-<div class="calendar_link_print">
-	{print}
-</div>
diff --git a/calendar/templates/prisma/link_pict.tpl b/calendar/templates/prisma/link_pict.tpl
deleted file mode 100755
index 486e4f13a3..0000000000
--- a/calendar/templates/prisma/link_pict.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- $Id$    link_pict -->
-
-<!-- BEGIN link_pict -->
-{picture}
-<!-- END link_pict -->
-
-<!-- BEGIN link_open -->
-<div id="calendar_event_entry">
-<a class="event_entry" href="{link_link}" onMouseOver="window.status='{lang_view}'; return true;" onMouseOut="window.status=''; return true;"><br>
-<!-- removed for favour of tooltip (NDEE) title="{desc}" -->
-<!-- END link_open -->
-
-<!-- BEGIN pict -->
- <img src="{pic_image}" width="{width}" height="{height}" title="{title}" border="0" />
-<!-- END pict -->
-
-<!-- BEGIN link_text_old -->
-<nobr>&nbsp;{time}&nbsp;</nobr> {title}&nbsp;{users_status}: <i>{desc}</i><!--({location})-->
-<!-- END link_text_old -->
-
-<!-- BEGIN link_text -->
-<nobr>&nbsp;<span style="color: black">{time}</span> {users_status}</nobr><br><div  onmouseover="this.T_STATIC=true;this.T_OFFSETX=-2;this.T_OFFSETY=36;return escape('<table width=200 cellpadding=3 cellspacing=0 border=0><tr><td style=\'color: white;\' bgcolor=#606060>{time}::<b>{title}</b></td></tr><tr><td><br>{desc}<br><br></td></tr><tr><td bgcolor=#c7c7c7>{location}</td></tr></table>');"><b>{title}</b><br><i>{desc}</i><br><b>{location}</b></div>
-<!-- END link_text -->
-
-<!-- BEGIN link_close -->
-</a></div>
-<!-- END link_close -->
diff --git a/calendar/templates/prisma/list.tpl b/calendar/templates/prisma/list.tpl
deleted file mode 100644
index 0ad7059a4e..0000000000
--- a/calendar/templates/prisma/list.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN list -->
- <tr>
-  <td valign="top" width="35%"><b>{field}:</b></td>
-  <td valign="top" width="65%">{data}</td>
- </tr>
-<!-- END list -->
diff --git a/calendar/templates/prisma/locales.tpl b/calendar/templates/prisma/locales.tpl
deleted file mode 100644
index 89cf69f022..0000000000
--- a/calendar/templates/prisma/locales.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- BEGIN list -->
-<p>
- <table border="0" width="45%" align="center">
-  <tr>
-   <td align="left">{left_next_matchs}</td>
-   {center}
-   <td align="right">{right_next_matchs}</td>
-  </tr>
- </table>
-
- <table border="0" width="70%" align="center">
-  <tr bgcolor="{th_bg}">
-   <td>&nbsp;{sort_name}</td>
-   {header_rule}
-   <td>{header_edit}</td>
-   <td>{header_delete}</td>
-   <td>{header_extra}</td>
-  </tr>
-
-  {rows}
-
- </table>
-
- <table border="0" width="70%" cellspacing="5" align="center">
-  <tr>
-   <td align="left">
-    <form method="POST" action="{new_action}">
-     <input type="submit" value="{lang_add}">
-    </form>
-   </td>
-   {back_button}
-   <td width="80%" align="right">
-    <form method="POST" action="{search_action}">
-     {lang_search}&nbsp;<input name="query">
-    </form>
-   </td>
-  </tr>
- </table>
-<!-- END list -->
-<!-- BEGIN row -->
- <tr bgcolor="{tr_color}">
-  <td>&nbsp;{group_name}</td>
-  {rule}
-  <td width="5%">{edit_link}</td>
-  <td width="5%">{delete_link}</td>
-  <td align="center" {extra_width}>{extra_link}</td>
- </tr>
-<!-- END row -->
-<!-- BEGIN row_empty -->
-   <tr>
-    <td colspan="5" align="center">{message}</td>
-   </tr>
-<!-- END row_empty -->
-<!-- BEGIN back_button_form -->
-   <td align="center">
-    <form method="POST" action="{back_action}">
-     <input type="submit" value="{lang_back}">
-    </form>
-   </td>
-<!-- END back_button_form -->
diff --git a/calendar/templates/prisma/matrix_query.tpl b/calendar/templates/prisma/matrix_query.tpl
deleted file mode 100644
index 7002028a86..0000000000
--- a/calendar/templates/prisma/matrix_query.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN matrix_query -->
-<script language="javascript">
-<!--
-function removeSelectedOptions(id)
-{
-    for(i=0; i<document.matrixform.participants.options.length;i++)
-    {	
-	if(document.matrixform.participants.options[i].selected==true) 
-	{
-	    document.matrixform.participants.options[i]=null;
-	    i--;
-	}
-    }
-}
-function selectAll(id)
-{
-
-    for(i=0; i<document.matrixform.participants.options.length;i++)
-    {	
-	document.matrixform.participants.options[i].selected = true ;
-	
-    }
-/*
-    openerSelectBox = document.getElementById(id);
-
-    if (openerSelectBox == null) 
-	window.close();
-
-    
-    for (i=0; i < openerSelectBox.length; i++) 
-	openerSelectBox.options[i].selected = 1 ;
-*/
-    document.matrixform.submit();
-}
-
--->																				
-</script>
-<center>
-<form action="{action_url}" method="post" name="matrixform">
-<table border="0" width="98%">
- <tr bgcolor="{th_bg}">
-  <td colspan="2" align="center"><b>{title}</b></td>
- </tr>
- {rows}
- <tr bgcolor="#EEEEEE">
-    <td align="right">{delete_participants}&nbsp;:</td>
-    <td align="left"><a href="#" onClick="javascript:removeSelectedOptions('uicalendar_matrix_users')"><img  src="/calendar/templates/prisma/images/delete.png" border="0"></a></td>
- </tr>
- 
- <tr>
-  <td colspan="2" align="center">
-    <input type="button" value="{submit_button}" onClick="javascript:selectAll('uicalendar_matrix_users')">
-  </td>
- </tr>
-</table>
-</form>
-</center>
-<!-- END matrix_query -->
-<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
-  <td valign="top" width="35%" align="right"><b>&nbsp;{field}&nbsp;:&nbsp;</b></td>
-  <td valign="top" width="65%" align="left">{data}</td>
- </tr>
-<!-- END list -->
diff --git a/calendar/templates/prisma/mini_cal.tpl b/calendar/templates/prisma/mini_cal.tpl
deleted file mode 100644
index ab0c06d0f8..0000000000
--- a/calendar/templates/prisma/mini_cal.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN mini_cal -->
-
-	<table id="calendar_minical_table" class="calendar_minical_table" border=0 cellspacing="0" cellpadding="0">
-		<tr>
-			<td style="padding-left: 8px; font-weight: bold; text-align: left;">
-				{month}
-			</td>
-			<td align="right">
-				<!-- why empty? -->
-				{prevmonth}&nbsp;&nbsp;{nextmonth}
-			</td>
-		</tr>
-		<tr>
-			<td  style="padding-left: 8px; text-align: left;">
-<!--				<img src="{cal_img_root}" width="90%" height="1"> -->
-					<hr class="calendar_minical_hrule">
-			</td>
-		</tr>
-		<tr valign="top">
-			<td>
-				<table id="calendar_minical_daytable" class="calendar_minical_daytable" cellspacing="5" cellpadding="0">
-					<tr>{daynames}</tr>
-						{display_monthweek}
-				</table>
-
-			</td>
-	 	</tr>
-	</table>
-<!-- END mini_cal -->
-
-<!-- BEGIN mini_week -->
-	<tr>
-		{monthweek_day}
-	</tr>
-<!-- END mini_week -->
-
-<!-- BEGIN mini_day -->
-		<td class="calendar_minical_dayname" {day_image}>
-			{dayname}
-		</td>
-<!-- END mini_day -->
diff --git a/calendar/templates/prisma/month.tpl b/calendar/templates/prisma/month.tpl
deleted file mode 100644
index 248f065fc1..0000000000
--- a/calendar/templates/prisma/month.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Id$ -->
-
-<table id="calendar_month_table" width="100%" border="0" bordercolor="#FFFFFF" cellspacing="2" cellpadding="2" cols={cols}>
-	{row}
-</table>
-
-
diff --git a/calendar/templates/prisma/month_column.tpl b/calendar/templates/prisma/month_column.tpl
deleted file mode 100644
index d5940298df..0000000000
--- a/calendar/templates/prisma/month_column.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- $Id$   month_column -->
-
-<td valign="top" colspan="1" width="{col_width}%"{extra}>
-	{column_data}
-</td>
diff --git a/calendar/templates/prisma/month_day.tpl b/calendar/templates/prisma/month_day.tpl
deleted file mode 100644
index 24c54f62ae..0000000000
--- a/calendar/templates/prisma/month_day.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- $Id$    month_day -->
-
-<!-- BEGIN m_w_table -->
-
-<table id="calendar_m_w_table" class="calendar_m_w_table">
-	<! from month_header.tpl -->
-	{row}
-</table>
-<!-- END m_w_table -->
-
-<!-- BEGIN month_daily -->
-<span id="calendar_m_w_table_daynumber" style="font-size:10px">[ {day_number} ]</span>{new_event_link}<br />
-    {daily_events}
-<!-- END month_daily -->
-
-<!-- BEGIN day_event -->
-{events}
-<!-- END day_event -->
-
-<!-- BEGIN event -->
-{day_events}
-<!-- END event -->
diff --git a/calendar/templates/prisma/month_header.tpl b/calendar/templates/prisma/month_header.tpl
deleted file mode 100644
index d12dd6ed89..0000000000
--- a/calendar/templates/prisma/month_header.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN monthly_header -->
-<tr class="calendar_m_w_table_header" colspan="{cols}" width="{col_width}%">
-{column_header}</tr>
-<!-- END monthly_header -->
-
-<!-- BEGIN monthly_row -->
-<tr class="calendar_m_w_table_row" colspan="{cols}" width="{col_width}%">
-{column_row}</tr>
-<!-- END monthly_row -->
-
-<!-- BEGIN column_title -->
-<th class="calendar_weekview_daytitle" width="14.28%">{col_title}</th>
-<!-- END column_title -->
-
-<!-- BEGIN month_column -->
-<td class="calendar_m_w_tablecell" colspan="1" width="{col_width}%"{extra}>{column_data}</td>
-<!-- END month_column -->
diff --git a/calendar/templates/prisma/overlap.tpl b/calendar/templates/prisma/overlap.tpl
deleted file mode 100644
index 9899bc814b..0000000000
--- a/calendar/templates/prisma/overlap.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN overlap -->
-<center><br />
-<table id="calendar_overlap_table">
-	<tr>
-		<td>
-			{overlap_text}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<ul>{overlap_list}</ul>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<table id="calendar_overlap_table2" cellspacing="5">
-				<tr>
-					<td>
-						{resubmit_button}
-					</td>
-					<td>
-						{reedit_button}
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</center>
-<!-- END overlap -->
diff --git a/calendar/templates/prisma/pref.tpl b/calendar/templates/prisma/pref.tpl
deleted file mode 100644
index df3b6308f7..0000000000
--- a/calendar/templates/prisma/pref.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- BEGIN pref -->
-<p><b>{title}:</b><hr><p>
-<form action="{action_url}" method="POST">
- <table border="0" align="center" width="90%">
-  {row}
- </table>
- <center><input type="submit" name="submit" value="{submit_lang}"></center>
-</form>
-<!-- END pref -->
-
-<!-- BEGIN pref_colspan -->
-  <tr bgcolor="{bg_color}">
-   <td colspan="2">{text}</td>
-  </tr>
-<!-- END pref_colspan -->
-
-<!-- BEGIN pref_list -->
-  <tr bgcolor="{bg_color}">
-   <td align="right">{field}</td>
-   <td align="center">{data}</td>
-  </tr>
-<!-- END pref_list -->
diff --git a/calendar/templates/prisma/preference_acl.tpl b/calendar/templates/prisma/preference_acl.tpl
deleted file mode 100644
index 6d9380e8e6..0000000000
--- a/calendar/templates/prisma/preference_acl.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{errors}
-{title}
-<table border="0" align="center" width="70%">
- <tr>
-  {nml}
-  <td width="40%">
-   <div align="center">
-    <form method="POST" action="{action_url}">
-{common_hidden_vars}
-     <input type="text" name="query" value="{search_value}">
-     <input type="submit" name="search" value="{search}">
-    </form>
-   </div>
-  </td>
-  {nmr}
- </tr>
-</table>
-<form method="POST" action="{action_url}">
- <table border="0" align="center" width="50%" cols="4">
-{row}
- </table>
-{common_hidden_vars_form}
- <input type="hidden" name="processed" value="{processed}">
- <center><input type="submit" name="submit" value="{submit_lang}"></center>
-</form>
-
-
diff --git a/calendar/templates/prisma/preference_acl_row.tpl b/calendar/templates/prisma/preference_acl_row.tpl
deleted file mode 100644
index 01b22d84b5..0000000000
--- a/calendar/templates/prisma/preference_acl_row.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- $Id$ -->
-   <tr bgcolor="{row_color}">
-    <td>{user}</td>
-    <td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
-    <td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
-    <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
-    <td align="center"><input type="checkbox" name="{delete}" value="Y"{delete_selected}></td>
-    <td align="center"><input type="checkbox" name="{private}" value="Y"{private_selected}></td>
-   </tr>
diff --git a/calendar/templates/prisma/preference_colspan.tpl b/calendar/templates/prisma/preference_colspan.tpl
deleted file mode 100644
index 4b97c5dbd8..0000000000
--- a/calendar/templates/prisma/preference_colspan.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-  <tr bgcolor="{bg_color}">
-    <td>{string}</td>
-    <td align="center">{lang_read}</td>
-    <td align="center">{lang_add}</td>
-    <td align="center">{lang_edit}</td>
-    <td align="center">{lang_delete}</td>
-    <td align="center">{lang_private}</td>
-  </tr>
diff --git a/calendar/templates/prisma/search.tpl b/calendar/templates/prisma/search.tpl
deleted file mode 100644
index 9ec9abd665..0000000000
--- a/calendar/templates/prisma/search.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN search -->
-<table id="calendar_search_table" width="90%">
-	<tr>
-		<td colspan="2" align="center" bgcolor="{th_bg}">
-			<b>{quantity}</b>
-		</td>
-	</tr>
-	{rows}
-</table>
-<!-- END search -->
-
-<!-- BEGIN search_list_header -->
-
-<!-- END search_list_header -->
-
-<!-- BEGIN search_list -->
-	<tr bgcolor="{tr_color}">
-		<td width="20%">
-			&nbsp;{date}
-		</td>
-		<td>
-			{link}
-		</td>
-	</tr>
-<!-- END search_list -->
-
-<!-- BEGIN search_list_footer -->
-
-<!-- END search_list_footer -->
diff --git a/calendar/templates/prisma/vcal_import.tpl b/calendar/templates/prisma/vcal_import.tpl
deleted file mode 100644
index bab84907bc..0000000000
--- a/calendar/templates/prisma/vcal_import.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- vcardin form -->
-{vcal_header}
-    <form ENCTYPE="multipart/form-data" method="POST" action="{action_url}">
-      <table border=0>
-      <tr>
-       <td>{ical_lang}: <input type="file" name="uploadedfile"></td>
-       <td><input type="submit" name="action" value="{load_vcal}"></td>
-      </tr>
-      </table>
-     </form>
diff --git a/calendar/templates/prisma/view.tpl b/calendar/templates/prisma/view.tpl
deleted file mode 100644
index 092e185c61..0000000000
--- a/calendar/templates/prisma/view.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- $Id$ -->
-
-<!-- BEGIN view_event -->
-<table id="calendar_view_event" border="0" width="98%" align="center">
-	{row}
-	<tr>
-		<td>
-			<table id="calendar_viewevent_button_left" cellspacing="5">
-				<tr>
-					{button_left}
-				</tr>
-			</table>
-		</td>
-	   <td align="center">
-			<table id="calendar_viewevent_button_center" cellspacing="5">
-				<tr>
-					{button_center}
-				</tr>
-			</table>
-		</td>
-		<td align="right">
-			<table id="calendar_viewevent_button_right" cellspacing="5">
-				<tr>
-					{button_right}
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-<!-- END view_event -->
-
-<!-- BEGIN list -->
-	<tr bgcolor="{tr_color}">
-		<td valign="top" width="30%" align="right">&nbsp;<b>{field}&nbsp;:&nbsp;</b></td>
-		<td colspan="2" valign="top" width="70%" align="left">{data}</td>
-	</tr>
-<!-- END list -->
-
-<!-- BEGIN hr -->
-	<tr>
-		<td colspan="3" bgcolor="{th_bg}" align="center">
-			<b>{hr_text}</b>
-		</td>
-	</tr>
-<!-- END hr -->
diff --git a/calendar/templates/prisma/week.tpl b/calendar/templates/prisma/week.tpl
deleted file mode 100644
index efffc2941d..0000000000
--- a/calendar/templates/prisma/week.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- $Id$ -->
-
-{printer_friendly}
-
-<!-- head table with mini calendars -->
-
-<table id="calendar_week_minical_table" class="calendar_week_minical_table">
-	<tr>
-		<td id="small_calendar_prev" align="left" valign="top" width="20%">
-			{small_calendar_prev}
-		</td>
-		<td  id="prev_week_link"  align="center" valign="middle" width="20%">
-			<b>{prev_week_link}</b>
-		</td>
-		<td  id="small_calendar_this"  align="center" valign="top" width="20%">
-			{small_calendar_this}
-		</td>
-		<td  id="next_week_link"  align="center" valign="middle" width="20%">
-			<b>{next_week_link}</b>
-		</td>
-		<td  id="small_calendar_right"  align="right" valign="top" width="20%">
-			{small_calendar_next}
-		</td>
-	</tr>
-</table>
-<br />
-<table id="calendar_week_identifier_table" class="calendar_week_identifier_table">
-	<tr>
-		<td align="center">
-			<span class="calendar_week_identifier">{week_identifier}&nbsp;&nbsp;</span>
-			<span class="calendar_user_identifier">::&nbsp;{username}&nbsp;::</span>
-		</td>
-	</tr>
-</table>
-<!-- from month_day.tpl -->
-{week_display}
-
-<div class="calendar_link_print">
-<br />
-{print}
-</div>
\ No newline at end of file
diff --git a/calendar/templates/prisma/year.tpl b/calendar/templates/prisma/year.tpl
deleted file mode 100644
index 2529bc1b02..0000000000
--- a/calendar/templates/prisma/year.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- BEGIN year -->
-{print}
-<center>
-<table id="calendar_year_table" border="0" cellspacing="3" cellpadding="4" cols=4>
-	<tr>
-		<td align="center">
-			{left_link}
-		</td>
-		<td align="center">
-			<font face="{font}" size="+1">{year_text}</font>
-		</td>
-		<td align="center">
-			{right_link}
-		</td>
-		{row}
-	</tr>
-</table>
-</center>
-<p>
-<div class="calendar_link_print">
-{printer_friendly}
-</div>
-<!-- END year -->
-
-<!-- BEGIN month -->
-<td valign="top">
-	{mini_month}
-</td>
-<!-- END month -->
-
-<!-- BEGIN month_sep -->
-</tr>
-<tr valign="top">
-<!-- END month_sep -->
-