From ef700b00618e5041acb5a02e91582828d193b61b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 7 Jun 2008 17:45:33 +0000
Subject: [PATCH] new class naming schema

---
 addressbook/inc/class.addressbook_bo.inc.php  |    5 +-
 calendar/csv_import.php                       |    8 +-
 calendar/freebusy.php                         |  132 +-
 .../class.import_events_csv.inc.php           |   94 +-
 calendar/inc/class.bocalendar.inc.php         |   22 +-
 calendar/inc/class.boical.inc.php             | 1552 ---------
 ...ar.inc.php => class.calendar_ajax.inc.php} |   30 +-
 ...ocal.inc.php => class.calendar_bo.inc.php} |   56 +-
 ...nc.php => class.calendar_boupdate.inc.php} |   10 +-
 ....php => class.calendar_datasource.inc.php} |   62 +-
 calendar/inc/class.calendar_groupdav.inc.php  |    6 +-
 calendar/inc/class.calendar_ical.inc.php      | 1546 +++++++++
 calendar/inc/class.calendar_sif.inc.php       |  503 +++
 ...ocal.inc.php => class.calendar_so.inc.php} |   17 +-
 ...ical.inc.php => class.calendar_ui.inc.php} |   75 +-
 ...inc.php => class.calendar_uiforms.inc.php} |   32 +-
 ....inc.php => class.calendar_uilist.inc.php} |   42 +-
 ...inc.php => class.calendar_uiviews.inc.php} |  206 +-
 calendar/inc/class.sifcalendar.inc.php        |  502 ---
 calendar/inc/hook_admin.inc.php               |   25 -
 calendar/inc/hook_deleteaccount.inc.php       |   15 -
 calendar/inc/hook_home.inc.php                |   77 -
 calendar/inc/hook_preferences.inc.php         |   23 -
 calendar/inc/hook_settings.inc.php            |  374 --
 calendar/index.php                            |   34 +-
 calendar/js/dragDropFunctions.js              |   23 +-
 calendar/setup/etemplates.inc.php             |   59 +-
 calendar/setup/setup.inc.php                  |  129 +-
 calendar/setup/tables_current.inc.php         |  192 +-
 calendar/setup/tables_update.inc.php          | 3081 +++++++++--------
 calendar/templates/default/edit.xet           |   12 +-
 calendar/templates/default/list.xet           |   32 +-
 32 files changed, 4170 insertions(+), 4806 deletions(-)
 delete mode 100644 calendar/inc/class.boical.inc.php
 rename calendar/inc/{class.ajaxcalendar.inc.php => class.calendar_ajax.inc.php} (76%)
 rename calendar/inc/{class.bocal.inc.php => class.calendar_bo.inc.php} (97%)
 rename calendar/inc/{class.bocalupdate.inc.php => class.calendar_boupdate.inc.php} (99%)
 rename calendar/inc/{class.datasource_calendar.inc.php => class.calendar_datasource.inc.php} (63%)
 create mode 100644 calendar/inc/class.calendar_ical.inc.php
 create mode 100644 calendar/inc/class.calendar_sif.inc.php
 rename calendar/inc/{class.socal.inc.php => class.calendar_so.inc.php} (98%)
 rename calendar/inc/{class.uical.inc.php => class.calendar_ui.inc.php} (93%)
 rename calendar/inc/{class.uiforms.inc.php => class.calendar_uiforms.inc.php} (98%)
 rename calendar/inc/{class.uilist.inc.php => class.calendar_uilist.inc.php} (95%)
 rename calendar/inc/{class.uiviews.inc.php => class.calendar_uiviews.inc.php} (97%)
 delete mode 100644 calendar/inc/class.sifcalendar.inc.php
 delete mode 100755 calendar/inc/hook_admin.inc.php
 delete mode 100755 calendar/inc/hook_deleteaccount.inc.php
 delete mode 100755 calendar/inc/hook_home.inc.php
 delete mode 100644 calendar/inc/hook_preferences.inc.php
 delete mode 100644 calendar/inc/hook_settings.inc.php

diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index 1a56b740e5..7079e7e7a2 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -366,7 +366,7 @@ class addressbook_bo extends addressbook_so
 		if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
 		{
 			static $fb_url;
-			if (!$fb_url && @is_dir(EGW_SERVER_ROOT.'/calendar/inc')) $fb_url = ExecMethod('calendar.bocal.freebusy_url','');
+			if (!$fb_url && @is_dir(EGW_SERVER_ROOT.'/calendar/inc')) $fb_url = calendar_bo::freebusy_url('');
 			if ($fb_url) $data['freebusy_uri'] = $fb_url.urlencode($GLOBALS['egw']->accounts->id2name($data['account_id']));
 		}
 		return $data;
@@ -944,8 +944,7 @@ class addressbook_bo extends addressbook_so
 		}
 		if (!$uids) return array();
 
-		include_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocal.inc.php');
-		$bocal = new bocal;
+		$bocal = new calendar_bo();
 		$events = $bocal->search(array(
 			'users' => $uids,
 			'enum_recuring' => true,
diff --git a/calendar/csv_import.php b/calendar/csv_import.php
index 3d81db889b..b5e1692927 100644
--- a/calendar/csv_import.php
+++ b/calendar/csv_import.php
@@ -37,7 +37,7 @@
 		$GLOBALS['egw']->redirect_link('/admin/index.php');
 	}
 	$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File');
-	$cal =& CreateObject('calendar.uical',true);
+	$cal = new calendar_ui(true);
 	$GLOBALS['egw']->common->egw_header();
 
 	$GLOBALS['egw']->template->set_file(array('import_t' => 'csv_import.tpl'));
@@ -62,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 = new contacts();
 
 		$addrs = $contacts->read(0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name");
 		if(!count($addrs))
@@ -102,7 +102,7 @@
 				if (is_numeric($cat) && $GLOBALS['egw']->categories->id2name($cat) != '--')
 				{
 					$cat2id[$cat] = $ids[$cat] = $cat;
-				}	
+				}
 				elseif ($id = $GLOBALS['egw']->categories->name2id( addslashes($cat) ))
 				{	// cat exists
 					$cat2id[$cat] = $ids[$cat] = $id;
@@ -472,7 +472,7 @@
 				$action = $values['id'] ? 'updating' : 'adding';
 				//echo $action.'<pre>'.print_r($values,True)."</pre>\n";
 				$cal_id = $cal->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
diff --git a/calendar/freebusy.php b/calendar/freebusy.php
index bb54ec710c..389b0258c7 100644
--- a/calendar/freebusy.php
+++ b/calendar/freebusy.php
@@ -1,76 +1,74 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - freebusy times as iCals                                     *
-	* http://www.egroupware.org                                                *
-	* Written by 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.                                              *
-	\**************************************************************************/
+/**
+ * iCal import and export via Horde iCalendar classes
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package calendar
+ * @subpackage export
+ * @version $Id$
+ */
 
-	/* $Id$ */
+$GLOBALS['egw_info'] = array(
+	'flags' => array(
+		'currentapp' => 'calendar',
+		'noheader'   => True,
+		'nofooter'   => True,
+	),
+);
+// check if we are loged in, by checking sessionid and kp3, as the sessionid get set automaticaly by php for php4-sessions
+if (!($loged_in = @$_REQUEST['sessionid'] && @$_REQUEST['kp3']))
+{
+	$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
+	$GLOBALS['egw_info']['flags']['noapi'] = True;
+}
+include ('../header.inc.php');
 
-	$GLOBALS['egw_info'] = array(
-		'flags' => array(
-			'currentapp' => 'calendar',
-			'noheader'   => True,
-			'nofooter'   => True,
-		),
-	);
-	// check if we are loged in, by checking sessionid and kp3, as the sessionid get set automaticaly by php for php4-sessions
-	if (!($loged_in = @$_REQUEST['sessionid'] && @$_REQUEST['kp3']))
-	{
-		$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
-		$GLOBALS['egw_info']['flags']['noapi'] = True;
-	}
-	include ('../header.inc.php');
+function fail_exit($msg)
+{
+	echo "<html>\n<head>\n<title>$msg</title>\n<meta http-equiv=\"content-type\" content=\"text/html; charset=".
+		$GLOBALS['egw']->translation->charset()."\" />\n</head>\n<body><h1>$msg</h1>\n</body>\n</html>\n";
 
-	function fail_exit($msg)
-	{
-		echo "<html>\n<head>\n<title>$msg</title>\n<meta http-equiv=\"content-type\" content=\"text/html; charset=".
-			$GLOBALS['egw']->translation->charset()."\" />\n</head>\n<body><h1>$msg</h1>\n</body>\n</html>\n";
+	$GLOBALS['egw']->common->egw_exit();
+}
 
-		$GLOBALS['egw']->common->egw_exit();
-	}
+if (!$loged_in)
+{
+	include ('../phpgwapi/inc/functions.inc.php');
+	$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
+}
+// fix for SOGo connector, which does not decode the = in our f/b url
+if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
+{
+	$_GET['user'] = substr($_GET['user'],2);
+	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
+}
+$user  = is_numeric($_GET['user']) ? (int) $_GET['user'] : $GLOBALS['egw']->accounts->name2id($_GET['user'],'account_lid','u');
 
-	if (!$loged_in)
-	{
-		include ('../phpgwapi/inc/functions.inc.php');
-		$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
-	}
-	// fix for SOGo connector, which does not decode the = in our f/b url
-	if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
-	{
-		$_GET['user'] = substr($_GET['user'],2);
-		if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	}
-	$user  = is_numeric($_GET['user']) ? (int) $_GET['user'] : $GLOBALS['egw']->accounts->name2id($_GET['user'],'account_lid','u');
+if (!($username = $GLOBALS['egw']->accounts->id2name($user)))
+{
+	fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)",$_GET['user']));
+}
+if (!$loged_in)
+{
+	$GLOBALS['egw']->preferences->account_id = $user;
+	$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
+	$GLOBALS['egw_info']['user']['account_id'] = $user;
+	$GLOBALS['egw_info']['user']['account_lid'] = $username;
 
-	if (!($username = $GLOBALS['egw']->accounts->id2name($user)))
+	$cal_prefs = &$GLOBALS['egw_info']['user']['preferences']['calendar'];
+	if (!$cal_prefs['freebusy'] || !empty($cal_prefs['freebusy_pw']) && $cal_prefs['freebusy_pw'] != $_GET['password'])
 	{
-		fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)",$_GET['user']));
+		fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!",$_GET['user']));
 	}
-	if (!$loged_in)
-	{
-		$GLOBALS['egw']->preferences->account_id = $user;
-		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
-		$GLOBALS['egw_info']['user']['account_id'] = $user;
-		$GLOBALS['egw_info']['user']['account_lid'] = $username;
-
-		$cal_prefs = &$GLOBALS['egw_info']['user']['preferences']['calendar'];
-		if (!$cal_prefs['freebusy'] || !empty($cal_prefs['freebusy_pw']) && $cal_prefs['freebusy_pw'] != $_GET['password'])
-		{
-			fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!",$_GET['user']));
-		}
-	}
-	if ($_GET['debug'])
-	{
-		echo "<pre>";
-	}
-	else
-	{
-		ExecMethod2('phpgwapi.browser.content_header','freebusy.ifb','text/calendar');
-	}
-	echo ExecMethod2('calendar.boical.freebusy',$user,$_GET['end']);
+}
+if ($_GET['debug'])
+{
+	echo "<pre>";
+}
+else
+{
+	ExecMethod2('phpgwapi.browser.content_header','freebusy.ifb','text/calendar');
+}
+echo ExecMethod2('calendar.calendar_ical.freebusy',$user,$_GET['end']);
diff --git a/calendar/importexport/class.import_events_csv.inc.php b/calendar/importexport/class.import_events_csv.inc.php
index add2d94894..1c659791fb 100644
--- a/calendar/importexport/class.import_events_csv.inc.php
+++ b/calendar/importexport/class.import_events_csv.inc.php
@@ -18,69 +18,69 @@ require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.import_csv.inc.php');
  * class import_csv for addressbook
  */
 class import_events_csv implements iface_import_plugin  {
-	
+
 	private static $plugin_options = array(
 		'fieldsep', 			// char
 		'charset', 				// string
 		'event_owner', 			// int account_id or -1 for leave untuched
 		'owner_joins_event',	// bool
-		'update_cats', 			// string {override|add} overides record 
+		'update_cats', 			// string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines',		// int number of header lines
 		'trash_users_records',	// trashes all events of events owner before import
 		'field_conversion', 	// array( $csv_col_num => conversion)
 		'field_mapping',		// array( $csv_col_num => adb_filed)
-		'conditions',			/* => array containing condition arrays: 
+		'conditions',			/* => array containing condition arrays:
 				'type' => exists, // record['uid'] exists
 				'true' => array(
 					'action' => update,
 					'last' => true,
 				),
 				'false' => array(
-					'action' => insert, 
+					'action' => insert,
 					'last' => true,
 				),*/
-				
+
 	);
-	
+
 	/**
 	 * actions wich could be done to data entries
 	 */
 	private static $actions = array( 'none', 'update', 'insert', 'delete', );
-	
+
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
 	private static $conditions = array( 'exists', 'empty', );
-	
+
 	/**
 	 * @var definition
 	 */
 	private $definition;
-	
+
 	/**
 	 * @var bocalupdate
 	 */
 	private $bocalupdate;
-	
+
 	/**
 	 * @var bool
 	 */
 	private $dry_run = false;
-	
+
 	/**
 	 * @var bool is current user admin?
 	 */
 	private $is_admin = false;
-	
+
 	/**
 	 * @var int
 	 */
 	private $user = null;
-	
+
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
@@ -92,7 +92,7 @@ class import_events_csv implements iface_import_plugin  {
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
-		
+
 		$this->definition = $_definition;
 
 		// user, is admin ?
@@ -100,79 +100,79 @@ class import_events_csv implements iface_import_plugin  {
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false; 
-		
+		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+
 		// fetch the calendar bo
-		$this->bocalupdate = CreateObject('calendar.bocalupdate');
-		
+		$this->bocalupdate = new calendar_boupdate();
+
 		// set FieldMapping.
 		$import_csv->mapping = $_definition->plugin_options['field_mapping'];
-		
+
 		// set FieldConversion
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
-		
+
 		//check if file has a header lines
 		if ( isset( $_definition->plugin_options['num_header_lines'] ) ) {
 			$import_csv->skip_records( $_definition->plugin_options['num_header_lines'] );
 		}
-		
+
 		// set eventOwner
-		$_definition->plugin_options['events_owner'] = isset( $_definition->plugin_options['events_owner'] ) ? 
+		$_definition->plugin_options['events_owner'] = isset( $_definition->plugin_options['events_owner'] ) ?
 			$_definition->plugin_options['events_owner'] : $this->user;
-		
+
 		// trash_users_records ?
 		if ( $_definition->plugin_options['trash_users_records'] === true ) {
 			if ( !$_definition->plugin_options['dry_run'] ) {
-				$socal = CreateObject( 'calendar.socal' );
-				$socal->change_delete_user( $_definition->plugin_options['events_owner'], false );
+				$socal = new calendar_socal();
+				$this->bocalupdate->so->deleteaccount( $_definition->plugin_options['events_owner']);
 				unset( $socal );
 			} else {
 				$lid = $GLOBALS['egw']->accounts->id2name( $_definition->plugin_options['events_owner'] );
 				echo "Attension: All Events of '$lid' would be deleted!\n";
 			}
 		}
-		
+
 		while ( $record = $import_csv->get_record() ) {
 
 			// don't import empty events
 			if( count( array_unique( $record ) ) < 2 ) continue;
-			
+
 			if ( $_definition->plugin_options['events_owner'] != -1 ) {
 				$record['owner'] = $_definition->plugin_options['events_owner'];
 			} else unset( $record['owner'] );
-			
+
 			if ( $_definition->plugin_options['conditions'] ) {
 				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
 					switch ( $condition['type'] ) {
 						// exists
 						case 'exists' :
-						
+
 							if ( is_array( $event = $this->bocalupdate->read( $record['uid'], null, $this->is_admin ) ) ) {
 								// apply action to event matching this exists condition
 								$record['id'] = $event['id'];
-								
+
 								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
 									if ( !is_array( $event['cat_id'] ) ) $event['cat_id'] = explode( ',', $event['cat_id'] );
 									if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
 									$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $event['cat_id'] ) ) );
 								}
-								
+
 								// check if entry is modiefied
 								$event = array_intersect_key( $event, $record );
 								$diff = array_diff( $event, $record );
 								if( !empty( $diff ) ) $record['modified'] = time();
-								
+
 								$action = $condition['true'];
 							} else $action = $condition['false'];
-							
+
 							$this->action( $action['action'], $record );
 							break;
 						case 'empty' :
 							$action = empty( $record[$condition['string']] ) ? $condition['true'] : $condition['false'];
 							$this->action( $action['action'], $record );
 							break;
-							
-						// not supported action	
+
+						// not supported action
 						default :
 							throw new Exception('condition not supported!!!');
 							break;
@@ -185,7 +185,7 @@ class import_events_csv implements iface_import_plugin  {
 			}
 		}
 	}
-	
+
 	/**
 	 * perform the required action
 	 *
@@ -197,10 +197,10 @@ class import_events_csv implements iface_import_plugin  {
 		switch ( $_action ) {
 			case 'none' :
 				return true;
-				
+
 			case 'update' :
 			case 'insert' :
-				
+
 				// paticipants handling
 				$participants = $_data['participants'] ? split( '[,;]', $_data['participants'] ) : array();
 				$_data['participants'] = array();
@@ -219,18 +219,18 @@ class import_events_csv implements iface_import_plugin  {
 				if ( empty( $_data['participants'] ) ) {
 					$_data['participants'][$this->user] = 'A';
 				}
-				
+
 				// are we serious?
 				if ( $this->dry_run ) {
 					print_r($_data);
 				} else {
-					return $this->bocalupdate->update( $_data, true, !$_data['modified'], $this->is_admin);	
+					return $this->bocalupdate->update( $_data, true, !$_data['modified'], $this->is_admin);
 				}
-				
+
 			case 'delete' :
 		}
 	}
-	
+
 	/**
 	 * returns translated name of plugin
 	 *
@@ -239,7 +239,7 @@ class import_events_csv implements iface_import_plugin  {
 	public static function get_name() {
 		return lang('Calendar CSV export');
 	}
-	
+
 	/**
 	 * returns translated (user) description of plugin
 	 *
@@ -248,7 +248,7 @@ class import_events_csv implements iface_import_plugin  {
 	public static function get_description() {
 		return lang("Imports events into your Calendar from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
-	
+
 	/**
 	 * retruns file suffix(s) plugin can handle (e.g. csv)
 	 *
@@ -257,12 +257,12 @@ class import_events_csv implements iface_import_plugin  {
 	public static function get_filesuffix() {
 		return 'csv';
 	}
-	
+
 	/**
 	 * return etemplate components for options.
 	 * @abstract We can't deal with etemplate objects here, as an uietemplate
 	 * objects itself are scipt orientated and not "dialog objects"
-	 * 
+	 *
 	 * @return array (
 	 * 		name 		=> string,
 	 * 		content		=> array,
@@ -273,7 +273,7 @@ class import_events_csv implements iface_import_plugin  {
 	public function get_options_etpl() {
 		// lets do it!
 	}
-	
+
 	/**
 	 * returns etemplate name for slectors of this plugin
 	 *
diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
index 588faf625c..66236cba0a 100755
--- a/calendar/inc/class.bocalendar.inc.php
+++ b/calendar/inc/class.bocalendar.inc.php
@@ -2,16 +2,16 @@
 /**
  * eGroupWare - Calendar's XMLRPC or SOAP access
  *
+ * Please note: dont use addressbook_... naming convention, as it would break the existing xmlrpc clients
+ *
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2005-7 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2005-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocalupdate.inc.php');
-
 /**
  * Class to access AND manipulate calendar data via XMLRPC or SOAP
  *
@@ -19,7 +19,7 @@ require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocalupdate.inc.php');
  *
  * @link http://egroupware.org/wiki/xmlrpc
  */
-class bocalendar 
+class bocalendar
 {
 	var $xmlrpc_date_format = 'Y-m-d\\TH:i:s';
 	var $debug = false;	// log function call to the apache error_log
@@ -33,9 +33,9 @@ class bocalendar
 		'list_methods' => True,
 	);
 
-	function bocalendar()
+	function __construct()
 	{
-		$this->cal =& new bocalupdate();
+		$this->cal =& new calendar_boupdate();
 
 		if (is_object($GLOBALS['server']) && $GLOBALS['server']->simpledate)
 		{
@@ -112,7 +112,7 @@ class bocalendar
 						'out' => array('array')
 					),
 				);
-		}		
+		}
 		return array();
 	}
 
@@ -127,7 +127,7 @@ class bocalendar
 		if ($this->debug) error_log('bocalendar::read('.print_r($id,true).')');
 
 		$events =& $this->cal->read($id,null,true,$this->xmlrpc_date_format);	// true = ignore acl!!!
-	
+
 		if (!$events)	// only id not found, as ignore_acl=true
 		{
 			// xmlrpc_error does NOT return
@@ -217,7 +217,7 @@ class bocalendar
 					$user = $GLOBALS['egw']->accounts->name2id($data['email'],'account_email');
 				}
 				if (!$user) continue;
-				
+
 				$event['participants'][$user] = in_array($data['status'],array('U','A','R','T')) ? $data['status'] : 'U';
 			}
 		}
@@ -252,7 +252,7 @@ class bocalendar
 		unset($params['ignore_acl']);
 
 		$events =& $this->cal->search($params);
-		
+
 		foreach($events as $key => $event)
 		{
 			$events[$key] = $this->xmlrpc_prepare($event);
@@ -311,7 +311,7 @@ class bocalendar
 		}
 		// using access={public|private} in all modules via xmlrpc
 		$event['access'] = $event['public'] ? 'public' : 'private';
-		
+
 		// unset everything not known in version 1.0
 		foreach(array('public','participant_types') as $key)
 		{
diff --git a/calendar/inc/class.boical.inc.php b/calendar/inc/class.boical.inc.php
deleted file mode 100644
index 31a3c20d4b..0000000000
--- a/calendar/inc/class.boical.inc.php
+++ /dev/null
@@ -1,1552 +0,0 @@
-<?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 $recur_days_1_0 = array(
-			MCAL_M_MONDAY    => 'MO',
-			MCAL_M_TUESDAY   => 'TU',
-			MCAL_M_WEDNESDAY => 'WE',
-			MCAL_M_THURSDAY  => 'TH',
-			MCAL_M_FRIDAY    => 'FR',
-			MCAL_M_SATURDAY  => 'SA',
-			MCAL_M_SUNDAY    => 'SU',
-		);
-
-		/**
-		 * @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, 2 => 3, 3 => 3, 1 => 3,	// high
-		);
-
-		/**
-		 * @var array $recur_egw2ical_2_0 converstaion of egw recur-type => ical FREQ
-		 */
-		var $recur_egw2ical_2_0 = 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',
-		);
-
-		/**
-		 * @var array $recur_egw2ical_1_0 converstaion of egw recur-type => ical FREQ
-		 */
-		var $recur_egw2ical_1_0 = array(
-			MCAL_RECUR_DAILY        => 'D',
-			MCAL_RECUR_WEEKLY       => 'W',
-			MCAL_RECUR_MONTHLY_MDAY => 'MD',	// BYMONHTDAY={1..31}
-			MCAL_RECUR_MONTHLY_WDAY => 'MP',	// BYDAY={1..5}{MO..SO}
-			MCAL_RECUR_YEARLY       => 'YM',
-		);
-
-		/**
-		 * manufacturer and name of the sync-client
-		 *
-		 * @var string
-		 */
-		var $productManufacturer = 'file';
-		var $productName = '';
-
-		/**
-		 * Exports one calendar event to an iCalendar item
-		 *
-		 * @param int/array $events (array of) cal_id or array of the events
-		 * @param string $version='1.0' could be '2.0' too
-		 * @param string $method='PUBLISH'
-		 * @param boolean $force_own_uid=true ignore the stored and maybe from the client transfered uid and generate a new one
-		 * RalfBecker: GroupDAV/CalDAV requires to switch that non RFC conform behavior off, dont know if SyncML still needs it
-		 * @return string/boolean string with vCal or false on error (eg. no permission to read the event)
-		 */
-		function &exportVCal($events,$version='1.0', $method='PUBLISH',$force_own_uid=true)
-		{
-			$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();
-			}
-
-			if($this->productManufacturer == '' )
-			{	// syncevolution is broken
-				$version = "2.0";
-			}
-
-			$palm_enddate_workaround=False;
-			if($this->productManufacturer == 'Synthesis AG'
-				&& strpos($this->productName, "PalmOS") )
-			{
-				// This workaround adds 1 day to the recur_enddate if it exists, to fix a palm bug
-				$palm_enddate_workaround=True;
-			}
-
-			$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',$version);
-			$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);
-
-				// correct daylight saving time
-				/* causes times wrong by one hour, if exporting events with DST different from the current date,
-				which this fix is suppost to fix. Maybe the problem has been fixed in the horde code too.
-				$currentDST = date('I', mktime());
-				$eventDST = date('I', $event['start']);
-				$DSTCorrection = ($currentDST - $eventDST) * 3600;
-				$event['start']	= $event['start'] + $DSTCorrection;
-				$event['end']	= $event['end'] + $DSTCorrection;
-				*/
-				$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':
-								//if (count($event['participants']) == 1 && isset($event['participants'][$this->user])) break;
-								foreach((array)$event['participants'] as $uid => $status)
-								{
-									if (!($info = $this->resource_info($uid))) continue;
-									// RB: MAILTO href contains only the email-address, NO cn!
-									$attributes['ATTENDEE'][]	= $info['email'] ? 'MAILTO:'.$info['email'] : '';
-									// 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}
-									switch ($info['type'])
-									{
-										case 'g':
-											$cutype = 'GROUP';
-											break;
-										case 'r':
-											$cutype = 'RESOURCE';
-											break;
-										case 'u':	// account
-										case 'c':	// contact
-										case 'e':	// email address
-											$cutype = 'INDIVIDUAL';
-											break;
-										default:
-											$cutype = 'UNKNOWN';
-											break;
-									};
-									$parameters['ATTENDEE'][] = array(
-										'CN'       => $info['cn'] ? $info['cn'] : $info['name'],
-										'ROLE'     => $role,
-										'PARTSTAT' => $status,
-										'CUTYPE'   => $cutype,
-										'RSVP'     => $rsvp,
-									)+($info['type'] != 'e' ? array('X-EGROUPWARE-UID' => $uid) : array());
-								}
-								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 ($event['owner'] != $this->user)
-            					//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']++;
-								if(date('H:i:s',$event['end']) == '23:59:00') $event['end']+=60; // needed by old eGW whole-day events
-								$attributes[$icalFieldName]	= $event['end'];
-								break;
-
-							case 'RRULE':
-								if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
-								if ($version == '1.0') {
-									$interval = ($event['recur_interval'] > 1) ? $event['recur_interval'] : 1;
-									$rrule = array('FREQ' => $this->recur_egw2ical_1_0[$event['recur_type']].$interval);
-									switch ($event['recur_type'])
-									{
-	            								case MCAL_RECUR_WEEKLY:
-	            									$days = array();
-	            									foreach($this->recur_days_1_0 as $id => $day)
-	            									{
-	            										if ($event['recur_data'] & $id) $days[] = strtoupper(substr($day,0,2));
-													}
-		            								$rrule['BYDAY'] = implode(' ',$days);
-		            								$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
-		            								break;
-
-	        	    							case MCAL_RECUR_MONTHLY_MDAY:	// date of the month: BYMONTDAY={1..31}
-	            									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));
-		            								$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
-											break;
-									}
-
-									if ($event['recur_enddate'])
-									{
-										$recur_enddate = (int)$event['recur_enddate'];
-										if ($palm_enddate_workaround)
-										{
-											$recur_enddate += 86400;
-										}
-										# append T and the Endtime, since the RRULE seems not to be understood by the client without it
-										$rrule['UNTIL'] = date('Ymd',$recur_enddate).'T'.date('His',($event['end']?$event['end']:$event['start'])) ;
-									}
-									else
-									{
-										$rrule['UNTIL'] = '#0';
-									}
-
-									$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
-								} else {
-									$rrule = array('FREQ' => $this->recur_egw2ical_2_0[$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':
-								if ($version == '1.0') {
-									$attributes['TRANSP'] = $event['non_blocking'] ? 1 : 0;
-								} else {
-									$attributes['TRANSP'] = $event['non_blocking'] ? 'TRANSPARENT' : 'OPAQUE';
-								}
-								break;
-
-							case 'CATEGORIES':
-								if ($event['category'])
-								{
-									$attributes['CATEGORIES'] = implode(',',$this->get_categories($event['category']));
-								}
-								break;
-
-							default:
-								if ($event[$egwFieldInfo['dbName']])	// dont write empty fields
-								{
-									$attributes[$icalFieldName]	= $event[$egwFieldInfo['dbName']];
-								}
-								break;
-						}
-					}
-				}
-
-				if(strtolower($this->productManufacturer) == 'nokia') {
-					if($event['special'] == '1') {
-						$attributes['X-EPOCAGENDAENTRYTYPE'] = 'ANNIVERSARY';
-						$attributes['DTEND'] = $attributes['DTSTART'];
-					} else {
-						$attributes['X-EPOCAGENDAENTRYTYPE'] = 'APPOINTMENT';
-					}
-				}
-
-				$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;
-
-				foreach($event['alarm'] as $alarmID => $alarmData)
-				{
-					if ($version == '1.0')
-					{
-						$attributes['DALARM'] = $vcal->_exportDateTime($alarmData['time']);
-						$attributes['AALARM'] = $vcal->_exportDateTime($alarmData['time']);
-						// lets take only the first alarm
-						break;
-					}
-					else
-					{
-						// VCalendar 2.0 / RFC 2445
-
-						// skip over alarms that don't have the minimum required info
-						if (!$alarmData['offset'] && !$alarmData['time'])
-						{
-							error_log("Couldn't add VALARM (no alarm time info)");
-							continue;
-						}
-
-						// RFC requires DESCRIPTION for DISPLAY
-						if (!$event['title'] && !$event['description'])
-						{
-							error_log("Couldn't add VALARM (no description)");
-							continue;
-						}
-
-						$valarm = Horde_iCalendar::newComponent('VALARM',$vevent);
-						if ($alarmData['offset'])
-						{
-							$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
-									array('VALUE' => 'DURATION', 'RELATED' => 'START'));
-						}
-						else
-						{
-							$valarm->setAttribute('TRIGGER', $alarmData['time'],
-									array('VALUE' => 'DATE-TIME'));
-						}
-
-						$valarm->setAttribute('ACTION','DISPLAY');
-						$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $event['description']);
-						$vevent->addComponent($valarm);
-					}
-				}
-
-				$attributes['UID'] = $force_own_uid ? $eventGUID : $event['uid'];
-
-				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();
-		}
-
-		/**
-		 * Import an iCal
-		 *
-		 * @param string $_vcalData
-		 * @param int $cal_id=-1 must be -1 for new entrys!
-		 * @param string $etag=null if an etag is given, it has to match the current etag or the import will fail
-		 * @return int|boolean cal_id > 0 on success, false on failure or 0 for a failed etag
-		 */
-		function importVCal($_vcalData, $cal_id=-1,$etag=null)
-		{
-			// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
-			$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
-
-			$vcal = &new Horde_iCalendar;
-			if(!$vcal->parsevCalendar($_vcalData))
-			{
-				return FALSE;
-			}
-
-			$version = $vcal->getAttribute('VERSION');
-
-			if(!is_array($this->supportedFields))
-			{
-				$this->setSupportedFields();
-			}
-			//echo "supportedFields="; _debug_array($this->supportedFields);
-
-			$syncevo_enddate_fix = False;
-			if( $this->productManufacturer == '' && $this->productName == '' )
-			{
-				// syncevolution needs an adjusted recur_enddate
-				$syncevo_enddate_fix = True;
-			}
-
-			$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('participants' => array());
-					$event		= array();
-					$alarms		= array();
-					$vcardData	= array(
-						'recur_type'		=> MCAL_RECUR_NONE,
-						'recur_exception'	=> array(),
-					);
-
-					// lets see what we can get from the vcard
-					foreach($component->_attributes as $attributes)
-					{
-						switch($attributes['name'])
-						{
-							case 'AALARM':
-							case 'DALARM':
-								if (preg_match('/.*Z$/',$attributes['value'],$matches)) {
-									$alarmTime = $vcal->_parseDateTime($attributes['value']);
-									$alarms[$alarmTime] = array(
-										'time' => $alarmTime
-									);
-								} elseif (preg_match('/(........T......);;(\d*);$/',$attributes['value'],$matches)) {
-									//error_log(print_r($matches,true));
-									$alarmTime = $vcal->_parseDateTime($matches[1]);
-									$alarms[$alarmTime] = array(
-										'time' => $alarmTime
-									);
-								} elseif (preg_match('/(........T......Z);;(\d*);$/',$attributes['value'],$matches)) {
-									//error_log(print_r($matches,true));
-									$alarmTime = $vcal->_parseDateTime($matches[1]);
-									$alarms[$alarmTime] = array(
-										'time' => $alarmTime
-									);
-								} elseif (preg_match('/(........T......)$/',$attributes['value'],$matches)) {
-									$alarmTime = $vcal->_parseDateTime($attributes['value']);
-									$alarms[$alarmTime] = array(
-										'time' => $alarmTime
-									);
-								}
-								break;
-							case 'CLASS':
-								$vcardData['public']		= (int)(strtolower($attributes['value']) == 'public');
-								break;
-							case 'DESCRIPTION':
-								$vcardData['description']	= $attributes['value'];
-								break;
-							case 'DTEND':
-								$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-								if(date('H:i:s',$dtend_ts) == '00:00:00') {
-									$dtend_ts -= 60;
-								}
-								$vcardData['end']		= $dtend_ts;
-								break;
-							case 'DTSTART':
-								$vcardData['start']		= $attributes['value'];
-								break;
-							case 'LOCATION':
-								$vcardData['location']	= $attributes['value'];
-								break;
-							case 'RRULE':
-								$recurence = $attributes['value'];
-								$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
-								// vCard 2.0 values for all types
-								if (preg_match('/UNTIL=([0-9T]+)/',$recurence,$matches))
-								{
-									$vcardData['recur_enddate'] = $vcal->_parseDateTime($matches[1]);
-								}
-								elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
-								{
-									$vcardData['recur_count'] = (int)$matches[1];
-								}
-								if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
-								{
-									// 1 is invalid,, egw uses 0 for interval
-									$vcardData['recur_interval'] = (int) $matches[1] != 0 ? (int) $matches[1] : 0;
-								}
-								if (!isset($vcardData['start']))	// it might not yet be set, because the RRULE is before it
-								{
-									$vcardData['start'] = self::_get_attribute($component->_attributes,'DTSTART');
-									$vcardData['end'] = self::_get_attribute($component->_attributes,'DTEND');
-								}
-								$vcardData['recur_data'] = 0;
-								switch($type)
-								{
-									case 'W':
-									case 'WEEKLY':
-										$days = array();
-										if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))		// 1.0
-										{
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-											$days = explode(' ',trim($recurenceMatches[2]));
-											if($recurenceMatches[3] != '#0')
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[3]);
-											$recur_days = $this->recur_days_1_0;
-										}
-										elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
-										{
-											$days = explode(',',$recurenceMatches[1]);
-											$recur_days = $this->recur_days;
-										}
-										else	// no day given, use the day of dtstart
-										{
-											$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
-											$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
-										}
-										if ($days)
-										{
-											foreach($recur_days as $id => $day)
-		            						{
-		            							if (in_array(strtoupper(substr($day,0,2)),$days))
-	        									{
-	        										$vcardData['recur_data'] |= $id;
-	        									}
-	        								}
-											$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
-										}
-
-										if (!empty($vcardData['recur_count']))
-										{
-											$vcardData['recur_enddate'] = mktime(0,0,0,
-												date('m',$vcardData['start']),
-												date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)*7),
-												date('Y',$vcardData['start']));
-										}
-										break;
-
-									case 'D':	// 1.0
-										if(preg_match('/D(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[2] > 0 && $vcardData['end']) {
-												$vcardData['recur_enddate'] = mktime(
-													date('H', $vcardData['end']),
-													date('i', $vcardData['end']),
-													date('s', $vcardData['end']),
-													date('m', $vcardData['end']),
-													date('d', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
-													date('Y', $vcardData['end'])
-												);
-											}
-										} elseif(preg_match('/D(\d+) (.*)/', $recurence, $recurenceMatches)) {
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[2] != '#0') {
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-											}
-										} else {
-											break;
-										}
-										// fall-through
-									case 'DAILY':	// 2.0
-										$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-
-										if (!empty($vcardData['recur_count']))
-										{
-											$vcardData['recur_enddate'] = mktime(0,0,0,
-												date('m',$vcardData['start']),
-												date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
-												date('Y',$vcardData['start']));
-										}
-										break;
-
-									case 'M':
-										if(preg_match('/MD(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
-											$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[2] > 0 && $vcardData['end']) {
-												$vcardData['recur_enddate'] = mktime(
-													date('H', $vcardData['end']),
-													date('i', $vcardData['end']),
-													date('s', $vcardData['end']),
-													date('m', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
-													date('d', $vcardData['end']),
-													date('Y', $vcardData['end'])
-												);
-											}
-										} elseif(preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches)) {
-											$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
-											if($recurenceMatches[1] > 1)
-												$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[2] != '#0')
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-										} elseif(preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches)) {
-											$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
-											if($recurenceMatches[1] > 1)
-												$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[4] != '#0')
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[4]);
-										}
-										break;
-									case 'MONTHLY':
-										$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
-											MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
-
-										if (!empty($vcardData['recur_count']))
-										{
-											$vcardData['recur_enddate'] = mktime(0,0,0,
-												date('m',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
-												date('d',$vcardData['start']),
-												date('Y',$vcardData['start']));
-										}
-										break;
-
-									case 'Y':		// 1.0
-										if(preg_match('/YM(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[2] > 0 && $vcardData['end']) {
-												$vcardData['recur_enddate'] = mktime(
-													date('H', $vcardData['end']),
-													date('i', $vcardData['end']),
-													date('s', $vcardData['end']),
-													date('m', $vcardData['end']),
-													date('d', $vcardData['end']),
-													date('Y', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval'])
-												);
-											}
-										} elseif(preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches)) {
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[2] != '#0') {
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-											}
-										} else {
-											break;
-										}
-										// fall-through
-									case 'YEARLY':	// 2.0
-										$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
-
-										if (!empty($vcardData['recur_count']))
-										{
-											$vcardData['recur_enddate'] = mktime(0,0,0,
-												date('m',$vcardData['start']),
-												date('d',$vcardData['start']),
-												date('Y',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)));
-										}
-										break;
-								}
-								if( $syncevo_enddate_fix && $vcardData['recur_enddate'] )
-								{
-									// Does syncevolution need to adjust recur_enddate
-									$vcardData['recur_enddate'] = (int)$vcardData['recur_enddate'] + 86400;
-								}
-								break;
-							case 'EXDATE':
-								$vcardData['recur_exception'] = array_merge($vcardData['recur_exception'],$attributes['value']);
-								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'])))
-								{
-									$cal_id = $event['id'] = $uid_event['id'];
-									unset($uid_event);
-								}
-								break;
-	 						case 'TRANSP':
-	 							if($version == '1.0') {
-	 								$vcardData['non_blocking'] = $attributes['value'] == 1;
-	 							} else {
-									$vcardData['non_blocking'] = $attributes['value'] == 'TRANSPARENT';
-								}
-								break;
-							case 'PRIORITY':
-	 							$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
-	 							break;
-	 						case 'CATEGORIES':
-	 							if ($attributes['value'])
-	 							{
-	 								$vcardData['category'] = $this->find_or_add_categories(explode(',',$attributes['value']));
-	 							}
-								else
-								{
-	 								$vcardData['category'] = array();
-								}
-	 							break;
-	 						case 'ATTENDEE':
-	 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) ||
-	 								preg_match('/<([@.a-z0-9_-]+)>/i',$attributes['value'],$matches))
- 								{
- 									$email = $matches[1];
- 								}
- 								elseif(strpos($attributes['value'],'@') !== false)
- 								{
- 									$email = $attributes['value'];
- 								}
-	 							if (($uid = $attributes['params']['X-EGROUPWARE-UID']) &&
-	 								($info = $this->resource_info($uid)) && $info['email'] == $email)
-	 							{
-	 								// we use the (checked) X-EGROUPWARE-UID
-	 							}
-	 							/*elseif($attributes['params']['CUTYPE'] == 'RESOURCE')
-	 							{
-
-	 							}*/
-		 						elseif($attributes['value'] == 'Unknown')
-	 							{
-	 								$uid = $GLOBALS['egw_info']['user']['account_id'];
-	 							}
-	 							elseif (($uid = $GLOBALS['egw']->accounts->name2id($email,'account_email')))
-	 							{
-	 								// we use the account we found
-	 							}
-								elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',array(
-									'email' => $email,
-									'email_home' => $email,
-								),true,'','','',false,'OR')))
-								{
-									$uid = 'c'.$data['id'];
-								}
-	 							else
-	 							{
-	 								$uid = 'e'.($attributes['params']['CN'] ? $attributes['params']['CN'].' <'.$email.'>' : $email);
-	 							}
-	 							$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
-	 									$this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])] :
-	 									($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],'account_email')))
-	 							{
-	 								$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;
-						}
-					}
-
-					// check if the entry is a birthday
-					// this field is only set from NOKIA clients
-					$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
-					if (!is_a($agendaEntryType, 'PEAR_Error')) {
-						if(strtolower($agendaEntryType) == 'anniversary') {
-							$event['special'] = '1';
-							// make it a whole day event for eGW
-							$vcardData['end'] = $vcardData['start'] + 86399;
-						}
-					}
-
-					if(!empty($vcardData['recur_enddate']))
-					{
-						// reset recure_enddate to 00:00:00 on the last day
-						$vcardData['recur_enddate'] = mktime(0, 0, 0,
-							date('m',$vcardData['recur_enddate']),
-							date('d',$vcardData['recur_enddate']),
-							date('Y',$vcardData['recur_enddate'])
-						);
-					}
-					//echo "event=";_debug_array($vcardData);
-
-					// 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 'alarms':
-								// not handled here
-								break;
-							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[$r]))
-										{
-											$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');
-	 				}
-
-					// If this is an updated meeting, and the client doesn't support
-					// participants, add them back
-					if( $cal_id > 0 && !isset($this->supportedFields['participants']))
-					{
-						if (($egw_event = $this->read($cal_id)))
-						{
-							$event['participants'] = $egw_event['participants'];
-							$event['participant_types'] = $egw_event['participant_types'];
-						}
-					}
-
-					// Check for resources, and don't remove them
-					if( $cal_id > 0 )
-					{
-						// for each existing participant:
-						if (($egw_event = $this->read($cal_id)))
-						{
-							foreach( $egw_event['participants'] as $uid => $status )
-							{
-								// Is it a resource and not longer present in the event?
-								if ( $uid[0] == 'r' && !isset($event['participants'][$uid]) )
-								{
-									// Add it back in
-									$event['participants'][$uid] = $event['participant_types']['r'][substr($uid,1)] = $status;
-								}
-							}
-						}
-					}
-
-					// check if iCal changes the organizer, which is not allowed
-					if ($cal_id > 0 && ($egw_event = $this->read($cal_id)) && $event['owner'] != $egw_event['owner'])
-					{
-						$event['owner'] = $egw_event['owner'];	// set it back to the original owner
-					}
-
-					#error_log('ALARMS');
-					#error_log(print_r($event, true));
-
-					// if an etag is given, include it in the update
-					if (!is_null($etag))
-					{
-						$event['etag'] = $etag;
-					}
-					if (!($Ok = $this->update($event, TRUE)))
-					{
-						// check if current user is an attendee and tried to change his status
-						if ($Ok === false && $cal_id && ($egw_event = $this->read($cal_id)) && isset($egw_event['participants'][$this->user]) &&
-							$egw_event['participants'][$this->user] !== $event['participants'][$this->user])
-						{
-							$this->set_status($egw_event,$this->user,
-								$status = $event['participants'][$this->user] ? $event['participants'][$this->user] : 'R');
-
-							$Ok = $cal_id;
-							continue;
-						}
-						break;	// stop with the first error
-					}
-					else
-					{
-						$eventID =& $Ok;
-
-						// handle the alarms
-						foreach ($component->getComponents() as $valarm)
-						{
-							if (is_a($valarm, 'Horde_iCalendar_valarm'))
-							{
-								$this->valarm2egw($alarms,$valarm);
-							}
-						}
-
-						if(count($alarms) > 0 || (isset($this->supportedFields['alarms'])  && count($alarms) == 0))
-						{
-							// delete the old alarms
-							$updatedEvent = $this->read($eventID);
-							foreach($updatedEvent['alarm'] as $alarmID => $alarmData)
-							{
-								$this->delete_alarm($alarmID);
-							}
-						}
-
-						foreach($alarms as $alarm)
-						{
-							$alarm['offset'] = $event['start'] - $alarm['time'];
-							$alarm['owner'] = $GLOBALS['egw_info']['user']['account_id'];
-							$this->save_alarm($eventID, $alarm);
-						}
-					}
-				}
-			}
-			return $Ok;
-		}
-
-		/**
-		 * get the value of an attribute by its name
-		 *
-		 * @param array $attributes
-		 * @param string $name eg. 'DTSTART'
-		 * @param string $what='value'
-		 * @return mixed
-		 */
-		static function _get_attribute($components,$name,$what='value')
-		{
-			foreach($components as $attribute)
-			{
-				if ($attribute['name'] == $name)
-				{
-					return !$what ? $attribute : $attribute[$what];
-				}
-			}
-			return false;
-		}
-
-		static function valarm2egw(&$alarms, &$valarm)
-		{
-			$count = 0;
-			foreach($valarm->_attributes as $vattr)
-			{
-				switch($vattr['name'])
-				{
-					case 'TRIGGER':
-						$vtype = (isset($vattr['params']['VALUE']))
-							? $vattr['params']['VALUE'] : 'DURATION'; //default type
-						switch ($vtype)
-						{
-							case 'DURATION':
-								if (isset($vattr['params']['RELATED'])
-									&& $vattr['params']['RELATED'] != 'START')
-								{
-									error_log("Unsupported VALARM offset anchor ".$vattr['params']['RELATED']);
-								}
-								else
-								{
-									$alarms[] = array('offset' => -$vattr['value']);
-									$count++;
-								}
-								break;
-							case 'DATE-TIME':
-								$alarms[] = array('time' => $vattr['value']);
-								$count++;
-								break;
-							default:
-								// we should also do ;RELATED=START|END
-								error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
-						}
-						break;
-					// case 'ACTION':
-					// 	break;
-					// case 'DISPLAY':
-					// 	break;
-
-					default:
-						error_log('VALARM field:' .$vattr['name'] .':' . print_r($vattrval,true) . ' HAS NO CONVERSION YET');
-				}
-			}
-			return $count;
-		}
-
-		function setSupportedFields($_productManufacturer='file', $_productName='')
-		{
-			// save them vor later use
-			$this->productManufacturer = $_productManufacturer;
-			$this->productName = $_productName;
-
-			$defaultFields['minimal'] = 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',
-				'alarms'			=> 'alarms',
-			);
-
-			$defaultFields['basic'] = $defaultFields['minimal'] + array(
-				'recur_exception'	=> 'recur_exception',
-				'priority'			=> 'priority',
-			);
-
-			$defaultFields['nexthaus'] = $defaultFields['basic'] + array(
-				'participants'		=> 'participants',
-			);
-
-			$defaultFields['synthesis'] = $defaultFields['basic'] + array(
-				'non_blocking'		=> 'non_blocking',
-				'category'			=> 'category',
-			);
-
-			$defaultFields['evolution'] = $defaultFields['basic'] + array(
-				'participants'		=> 'participants',
-				'owner'				=> 'owner',
-				'category'			=> 'category',
-			);
-
-			$defaultFields['full'] = $defaultFields['basic'] + array(
-				'participants'		=> 'participants',
-				'owner'				=> 'owner',
-				'category'			=> 'category',
-				'non_blocking'		=> 'non_blocking',
-			);
-
-
-			switch(strtolower($_productManufacturer))
-			{
-				case 'nexthaus corporation':
-				case 'nexthaus corp':
-					switch(strtolower($_productName))
-					{
-						default:
-							$this->supportedFields = $defaultFields['nexthaus'];
-							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['basic'];
-							break;
-					}
-					break;
-
-				case 'nokia':
-					switch(strtolower($_productName))
-					{
-						case 'e61':
-							$this->supportedFields = $defaultFields['minimal'];
-							break;
-						default:
-							error_log("Unknown Nokia phone '$_productName', assuming E61");
-							$this->supportedFields = $defaultFields['minimal'];
-							break;
-					}
-					break;
-
-				case 'sonyericsson':
-				case 'sony ericsson':
-					switch(strtolower($_productName))
-					{
-						case 'd750i':
-						case 'p910i':
-							$this->supportedFields = $defaultFields['basic'];
-							break;
-						default:
-							error_log("Unknown Sony Ericsson phone '$_productName' assuming d750i");
-							$this->supportedFields = $defaultFields['basic'];
-							break;
-					}
-					break;
-
-				case 'synthesis ag':
-					switch(strtolower($_productName))
-					{
-						case 'sysync client pocketpc std':
-						case 'sysync client pocketpc pro':
-							$this->supportedFields = $defaultFields['full'];
-							break;
-						default:
-							$this->supportedFields = $defaultFields['synthesis'];
-							break;
-					}
-					break;
-
-				//Syncevolution compatibility
-				case 'patrick ohly':
-					$this->supportedFields = $defaultFields['evolution'];
-					break;
-
-				case '': // seems syncevolution 0.5 doesn't send a manufacturer
-					error_log("No vendor name, assuming syncevolution 0.5");
-					$this->supportedFields = $defaultFields['evolution'];
-					break;
-
-				case 'file':	// used outside of SyncML, eg. by the calendar itself ==> all possible fields
-					$this->supportedFields = $defaultFields['full'];
-					break;
-
-				// the fallback for SyncML
-				default:
-					error_log("Unknown calendar SyncML client: manufacturer='$_productManufacturer'  product='$_productName'");
-					$this->supportedFields = $defaultFields['full'];
-					break;
-			}
-		}
-
-		function icaltoegw($_vcalData)
-		{
-			// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
-			$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
-
-			$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('participants' => array());
-					$event		= array();
-					$alarms		= array();
-					$vcardData	= array('recur_type' => 0);
-
-					// lets see what we can get from the vcard
-					foreach($component->_attributes as $attributes)
-					{
-						switch($attributes['name'])
-						{
-							case 'AALARM':
-							case 'DALARM':
-								if (preg_match('/.*Z$/',$attributes['value'],$matches))
-								{
-									$alarmTime = $vcal->_parseDateTime($attributes['value']);
-									$alarms[$alarmTime] = array(
-										'time' => $alarmTime
-									);
-								}
-								break;
-							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'];
-								$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
-								// vCard 2.0 values for all types
-								if (preg_match('/UNTIL=([0-9T]+)/',$recurence,$matches))
-								{
-									$vcardData['recur_enddate'] = $vcal->_parseDateTime($matches[1]);
-								}
-								if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
-								{
-									$vcardData['recur_interval'] = (int) $matches[1];
-								}
-								$vcardData['recur_data'] = 0;
-								switch($type)
-								{
-									case 'W':
-									case 'WEEKLY':
-										$days = array();
-										if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))		// 1.0
-										{
-											$vcardData['recur_interval'] = $recurenceMatches[1];
-											$days = explode(' ',trim($recurenceMatches[2]));
-											if($recurenceMatches[3] != '#0')
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[3]);
-											$recur_days = $this->recur_days_1_0;
-										}
-										elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
-										{
-											$days = explode(',',$recurenceMatches[1]);
-											$recur_days = $this->recur_days;
-										}
-										if ($days)
-										{
-											foreach($recur_days as $id => $day)
-				            						{
-				            							if (in_array(strtoupper(substr($day,0,2)),$days))
-		            									{
-		            										$vcardData['recur_data'] |= $id;
-		            									}
-		            								}
-											$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
-										}
-										break;
-
-									case 'D':		// 1.0
-										if(!preg_match('/D(\d+) (.*)/',$recurence, $recurenceMatches)) break;
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-										// fall-through
-									case 'DAILY':	// 2.0
-										$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-										break;
-
-									case 'M':
-										if(preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches))
-										{
-											$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
-											if($recurenceMatches[1] > 1)
-												$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[2] != '#0')
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-										}
-										elseif(preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
-										{
-											$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
-											if($recurenceMatches[1] > 1)
-												$vcardData['recur_interval'] = $recurenceMatches[1];
-											if($recurenceMatches[4] != '#0')
-												$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[4]);
-										}
-										break;
-									case 'MONTHLY':
-										$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
-											MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
-										break;
-
-									case 'Y':		// 1.0
-										if(!preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches)) break;
-										$vcardData['recur_interval'] = $recurenceMatches[1];
-										if($recurenceMatches[2] != '#0')
-											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
-										// fall-through
-									case 'YEARLY':	// 2.0
-										$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
-										break;
-								}
-								break;
-							case 'EXDATE':
-								$vcardData['recur_exception'] = $attributes['value'];
-								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':
-								if ($this->productManufacturer == 'nexthaus corporation'
-									|| $this->productManufacturer == 'nexthaus corp')
-								{
-									$vcardData['priority'] = $attributes['value'] == 1 ? 3 : 2; // 1=high, 2=normal
-								}
-								else
-								{
-	 								$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
-								}
-	 							break;
-	 						case 'CATEGORIES':
-	 							if ($attributes['value'])
-	 							{
-									$vcardData['category'] = $this->find_or_add_categories(explode(',',$attributes['value']));
-								}
-								else
-								{
-	 								$vcardData['category'] = array();
-								}
-	 							break;
-	 						case 'ATTENDEE':
-	 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
-	 								($uid = $GLOBALS['egw']->accounts->name2id($matches[1],'account_email')))
-	 							{
-	 								$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
-	 									$this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])] :
-	 									($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],'account_email')))
-	 							{
-	 								$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;
-						}
-					}
-
-					// check if the entry is a birthday
-					// this field is only set from NOKIA clients
-					$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
-					if (!is_a($agendaEntryType, 'PEAR_Error')) {
-						if(strtolower($agendaEntryType) == 'anniversary') {
-							$event['special'] = '1';
-							$vcardData['end'] = $vcardData['start'] + 86399;
-						}
-					}
-
-					if(!empty($vcardData['recur_enddate']))
-					{
-						// reset recure_enddate to 00:00:00 on the last day
-						$vcardData['recur_enddate'] = mktime(0, 0, 0,
-							date('m',$vcardData['recur_enddate']),
-							date('d',$vcardData['recur_enddate']),
-							date('Y',$vcardData['recur_enddate'])
-						);
-					}
-					//echo "event=";_debug_array($vcardData);
-
-					while(($fieldName = array_shift($supportedFields)))
-					{
-						switch($fieldName)
-						{
-							case 'recur_interval':
-							case 'recur_enddate':
-							case 'recur_data':
-							case 'recur_exception':
-							case 'alarms':
-								// not handled here
-								break;
-							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[$r]))
-										{
-											$event[$r] = $vcardData[$r];
-										}
-									}
-								}
-								break;
-							default:
-								if (isset($vcardData[$fieldName]))
-								{
-									$event[$fieldName] = $vcardData[$fieldName];
-								}
-								break;
-						}
-					}
-
-					return $event;
-				}
-			}
-
-			return false;
-		}
-
-		function search($_vcalData)
-		{
-			if(!$event = $this->icaltoegw($_vcalData)) {
-				return false;
-			}
-
-			$query = array(
-				'cal_start='.$this->date2ts($event['start'],true),	// true = Server-time
-				'cal_end='.$this->date2ts($event['end'],true),
-			);
-
-			#foreach(array('title','location','priority','public','non_blocking') as $name) {
-			foreach(array('title','location','public','non_blocking') as $name) {
-				if (isset($event[$name])) $query['cal_'.$name] = $event[$name];
-			}
-
-			if($foundEvents = parent::search(array(
-				'user'  => $this->user,
-				'query' => $query,
-			))) {
-				if(is_array($foundEvents)) {
-					$event = array_shift($foundEvents);
-					return $event['id'];
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * Create a freebusy vCal for the given user(s)
-		 *
-		 * @param int $user account_id
-		 * @param mixed $end=null end-date, default now+1 month
-		 * @return string
-		 */
-		function freebusy($user,$end=null)
-		{
-			if (!$end) $end = $this->now_su + 100*DAY_s;	// default next 100 days
-
-			$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');
-
-			$vfreebusy = Horde_iCalendar::newComponent('VFREEBUSY',$vcal);
-			$parameters = array(
-				'ORGANIZER' => $GLOBALS['egw']->translation->convert(
-					$GLOBALS['egw']->accounts->id2name($user,'account_firstname').' '.
-					$GLOBALS['egw']->accounts->id2name($user,'account_lastname'),
-					$GLOBALS['egw']->translation->charset(),'utf-8'),
-			);
-			foreach(array(
-				'URL' => $this->freebusy_url($user),
-				'DTSTART' => $this->date2ts($this->now_su,true),	// true = server-time
-				'DTEND' => $this->date2ts($end,true),	// true = server-time
-			  	'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
-				'DTSTAMP' => time(),
-			) as $attr => $value)
-			{
-				$vfreebusy->setAttribute($attr, $value, $parameters[$name]);
-			}
-			$fbdata = parent::search(array(
-						'start' => $this->now_su,
-						'end'   => $end,
-						'users' => $user,
-						'date_format' => 'server',
-						'show_rejected' => false,
-					));
-			if (is_array($fbdata))
-			{
-				foreach ($fbdata as $event)
-				{
-					if ($event['non_blocking']) continue;
-
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
-						'start' => $event['start'],
-						'end' => $event['end'],
-					)));
-				}
-			}
-			$vcal->addComponent($vfreebusy);
-
-			return $vcal->exportvCalendar();
-		}
-	}
diff --git a/calendar/inc/class.ajaxcalendar.inc.php b/calendar/inc/class.calendar_ajax.inc.php
similarity index 76%
rename from calendar/inc/class.ajaxcalendar.inc.php
rename to calendar/inc/class.calendar_ajax.inc.php
index a640d64646..2206f95da2 100644
--- a/calendar/inc/class.ajaxcalendar.inc.php
+++ b/calendar/inc/class.calendar_ajax.inc.php
@@ -7,34 +7,26 @@
  * @package calendar
  * @copyright (c) 2006 by Christian Binder <christian.binder@freakmail.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id: class.ajaxcalendar.inc.php 22777 2006-11-26 20:55:00Z jaytraxx $ 
+ * @version $Id: class.ajaxcalendar.inc.php 22777 2006-11-26 20:55:00Z jaytraxx $
  */
 
-require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocalupdate.inc.php');
-
 /**
  * General object of the calendar ajax class
- *
- * @package calendar
- * @author Christian Binder <christian.binder@freakmail.de>
- * @copyright (c) 2006 by Christian Binder <christian.binder@freakmail.de>
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
+class calendar_ajax {
 
-class ajaxcalendar {
-	
 	/**
 	 * calendar object to handle events
-	 * 
-	 * @var bocalupdate
+	 *
+	 * @var calendar_boupdate
 	 */
 	var $calendar;
 
-	function ajaxcalendar() 
+	function __construct()
 	{
-		$this->calendar = new bocalupdate;
+		$this->calendar = new calendar_boupdate();
 	}
-	
+
 	/**
 	 * moves an event to another date/time
 	 *
@@ -54,22 +46,22 @@ class ajaxcalendar {
 
 		$event=$this->calendar->read($eventId);
 		$duration=$event['end']-$event['start'];
-		
+
 		$event['start'] = $this->calendar->date2ts($targetDateTime);
 		$event['end'] = $event['start']+$duration;
-		
+
 		$conflicts=$this->calendar->update($event);
 
 		$response =& new xajaxResponse();
 		if(!is_array($conflicts))
 		{
-			$response->addRedirect($PHP_SELF);
+			$response->addRedirect('');
 		}
 		else
 		{
 			$response->addScriptCall(
 				'egw_openWindowCentered2',
-				$GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.uiforms.edit
+				$GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit
 					&cal_id='.$event['id']
 					.'&start='.$event['start']
 					.'&end='.$event['end']
diff --git a/calendar/inc/class.bocal.inc.php b/calendar/inc/class.calendar_bo.inc.php
similarity index 97%
rename from calendar/inc/class.bocal.inc.php
rename to calendar/inc/class.calendar_bo.inc.php
index 19713ebb63..1f1153ddb0 100644
--- a/calendar/inc/class.bocal.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -5,13 +5,11 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2004-7 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2004-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-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
 {
 	define('ACL_TYPE_IDENTIFER','***ACL***');
@@ -27,8 +25,6 @@ define('WEEK_s',7*DAY_s);
  */
 define('EGW_ACL_READ_FOR_PARTICIPANTS',EGW_ACL_CUSTOM_1);
 
-require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.socal.inc.php');
-
 /**
  * Class to access all calendar data
  *
@@ -47,7 +43,7 @@ require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.socal.inc.php');
  *
  * All permanent debug messages of the calendar-code should done via the debug-message method of this class !!!
  */
-class bocal
+class calendar_bo
 {
 	/**
 	 * @var int $debug name of method to debug or level of debug-messages:
@@ -152,11 +148,11 @@ class bocal
 	/**
 	 * Constructor
 	 */
-	function bocal()
+	function __construct()
 	{
 		if ($this->debug > 0) $this->debug_message('bocal::bocal() started',True,$param);
 
-		$this->so = new socal();
+		$this->so = new calendar_so();
 		$this->datetime = $GLOBALS['egw']->datetime;
 
 		$this->common_prefs =& $GLOBALS['egw_info']['user']['preferences']['common'];
@@ -1737,31 +1733,6 @@ class bocal
 		return $result;
 	}
 
-	/**
-	 * Hook called by link-class to include calendar 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.edit',
-			),
-			'view_id'    => 'cal_id',
-			'view_popup' => '750x400',
-			'add'        => array(
-				'menuaction' => 'calendar.uiforms.edit',
-			),
-			'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)
 	 *
@@ -1826,7 +1797,7 @@ class bocal
 	 * @param int/string $user account_id or account_lid
 	 * @param string $pw=null password
 	 */
-	function freebusy_url($user,$pw=null)
+	static function freebusy_url($user,$pw=null)
 	{
 		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
 
@@ -1836,20 +1807,3 @@ class bocal
 			($pw ? '&password='.urlencode($pw) : '');
 	}
 }
-
-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((array)$arr);
-		}
-		foreach(call_user_func_array('array_intersect',$keys) as $key)
-		{
-			$intersection[$key] = $array1[$key];
-		}
-		return $intersection;
-	}
-}
diff --git a/calendar/inc/class.bocalupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
similarity index 99%
rename from calendar/inc/class.bocalupdate.inc.php
rename to calendar/inc/class.calendar_boupdate.inc.php
index a6af70dcd6..c05ed330d3 100644
--- a/calendar/inc/class.bocalupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -5,13 +5,11 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2005-7 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2005-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-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);
@@ -39,7 +37,7 @@ define('MSG_DISINVITE',7);
  * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
  */
 
-class bocalupdate extends bocal
+class calendar_boupdate extends calendar_bo
 {
 	/**
 	 * name of method to debug or level of debug-messages:
@@ -60,11 +58,11 @@ class bocalupdate extends bocal
 	/**
 	 * Constructor
 	 */
-	function bocalupdate()
+	function __construct()
 	{
 		if ($this->debug > 0) $this->debug_message('bocalupdate::bocalupdate() started',True);
 
-		$this->bocal();	// calling the parent constructor
+		parent::__construct();	// calling the parent constructor
 
 		if ($this->debug > 0) $this->debug_message('bocalupdate::bocalupdate() finished',True);
 	}
diff --git a/calendar/inc/class.datasource_calendar.inc.php b/calendar/inc/class.calendar_datasource.inc.php
similarity index 63%
rename from calendar/inc/class.datasource_calendar.inc.php
rename to calendar/inc/class.calendar_datasource.inc.php
index 46428c68b8..9dc0352668 100644
--- a/calendar/inc/class.datasource_calendar.inc.php
+++ b/calendar/inc/class.calendar_datasource.inc.php
@@ -1,56 +1,50 @@
 <?php
-/**************************************************************************\
-* eGroupWare - ProjectManager - DataSource for InfoLog                     *
-* 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$ */
+/**
+ * DataSource for the Calendar
+ *
+ * @link http://www.egroupware.org
+ * @package calendar
+ * @author RalfBecker-AT-outdoor-training.de
+ * @copyright (c) 2005-8 by RalfBecker-AT-outdoor-training.de
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
 include_once(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.datasource.inc.php');
 
 /**
  * DataSource for the Calendar
- *
- * @package calendar
- * @author 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 datasource_calendar extends datasource
+class calendar_datasource extends datasource
 {
 	/**
 	 * Constructor
 	 */
-	function datasource_calendar()
+	function __construct()
 	{
 		$this->datasource('calendar');
-		
+
 		$this->valid = PM_PLANNED_START|PM_PLANNED_END|PM_PLANNED_TIME|PM_RESOURCES;
 	}
-	
+
 	/**
 	 * get an entry from the underlaying app (if not given) and convert it into a datasource array
-	 * 
+	 *
 	 * @param mixed $data_id id as used in the link-class for that app, or complete entry as array
 	 * @return array/boolean array with the data supported by that source or false on error (eg. not found, not availible)
 	 */
 	function get($data_id)
 	{
-		// we use $GLOBALS['bocal'] as an already running instance is availible there
-		if (!is_object($GLOBALS['bocal']))
+		// we use $cal as an already running instance is availible there
+		if (!is_object($GLOBALS['calendar_bo']))
 		{
-			include_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocal.inc.php');
-			$GLOBALS['bocal'] =& new bocal();
+			$GLOBALS['calendar_bo'] = new calendar_bo();
 		}
+		$cal = $GLOBALS['calendar_bo'];
+
 		if (!is_array($data_id))
 		{
-			if (!(int) $data_id || !($data = $GLOBALS['bocal']->read((int) $data_id)))
+			if (!(int) $data_id || !($data = $cal->read((int) $data_id)))
 			{
 				return false;
 			}
@@ -60,9 +54,9 @@ class datasource_calendar extends datasource
 			$data =& $data_id;
 		}
 		$ds = array(
-			'pe_title' => $GLOBALS['bocal']->link_title($data),
-			'pe_planned_start' => $GLOBALS['bocal']->date2ts($data['start']),
-			'pe_planned_end'   => $GLOBALS['bocal']->date2ts($data['end']),
+			'pe_title' => $cal->link_title($data),
+			'pe_planned_start' => $cal->date2ts($data['start']),
+			'pe_planned_end'   => $cal->date2ts($data['end']),
 			'pe_resources'     => array(),
 			'pe_details'       => $data['description'] ? nl2br($data['description']) : '',
 		);
@@ -74,14 +68,14 @@ class datasource_calendar extends datasource
 		{
 			foreach(array('start','end') as $name)
 			{
-				$$name = $GLOBALS['bocal']->date2array($ds['pe_planned_'.$name]);
+				$$name = $cal->date2array($ds['pe_planned_'.$name]);
 				${$name}['hour'] = 12;
 				${$name}['minute'] = ${$name}['second'] = 0;
 				unset(${$name}['raw']);
-				$$name = $GLOBALS['bocal']->date2ts($$name);
+				$$name = $cal->date2ts($$name);
 			}
 			$nights = round(($end - $start) / DAY_s);
-			
+
 			if (!is_array($this->pm_config))
 			{
 				$c =& CreateObject('phpgwapi.config','projectmanager');
@@ -103,7 +97,7 @@ class datasource_calendar extends datasource
 		$ds['pe_planned_time'] *= count($ds['pe_resources']);
 
 /*
-		// ToDO: this does not change automatically after the event is over, 
+		// ToDO: this does not change automatically after the event is over,
 		// maybe we need a flag for that in egw_pm_elements
 		if ($data['end']['raw'] <= time()+$GLOBALS['egw']->datetime->tz_offset)
 		{
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 1f679935d5..7e589fc421 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -11,8 +11,6 @@
  * @version $Id$
  */
 
-require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocalupdate.inc.php');
-
 /**
  * eGroupWare: GroupDAV access: calendar handler
  */
@@ -21,7 +19,7 @@ class calendar_groupdav extends groupdav_handler
 	/**
 	 * bo class of the application
 	 *
-	 * @var bocalupdate
+	 * @var calendar_boupdate
 	 */
 	var $bo;
 
@@ -49,7 +47,7 @@ class calendar_groupdav extends groupdav_handler
 	{
 		parent::__construct($app,$debug,$base_uri);
 
-		$this->bo =& new bocalupdate();
+		$this->bo =& new calendar_boupdate();
 	}
 
 	/**
diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
new file mode 100644
index 0000000000..ba2703570d
--- /dev/null
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -0,0 +1,1546 @@
+<?php
+/**
+ * iCal import and export via Horde iCalendar classes
+ *
+ * @link http://www.egroupware.org
+ * @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
+ * @package calendar
+ * @subpackage export
+ * @version $Id$
+ */
+
+require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php';
+
+/**
+ * iCal import and export via Horde iCalendar classes
+ */
+class boical extends calendar_boupdate
+{
+	/**
+	 * @var array $supportedFields array containing the supported fields of the importing device
+	 */
+	var $supportedFields;
+
+	var $recur_days_1_0 = array(
+		MCAL_M_MONDAY    => 'MO',
+		MCAL_M_TUESDAY   => 'TU',
+		MCAL_M_WEDNESDAY => 'WE',
+		MCAL_M_THURSDAY  => 'TH',
+		MCAL_M_FRIDAY    => 'FR',
+		MCAL_M_SATURDAY  => 'SA',
+		MCAL_M_SUNDAY    => 'SU',
+	);
+
+	/**
+	 * @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, 2 => 3, 3 => 3, 1 => 3,	// high
+	);
+
+	/**
+	 * @var array $recur_egw2ical_2_0 converstaion of egw recur-type => ical FREQ
+	 */
+	var $recur_egw2ical_2_0 = 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',
+	);
+
+	/**
+	 * @var array $recur_egw2ical_1_0 converstaion of egw recur-type => ical FREQ
+	 */
+	var $recur_egw2ical_1_0 = array(
+		MCAL_RECUR_DAILY        => 'D',
+		MCAL_RECUR_WEEKLY       => 'W',
+		MCAL_RECUR_MONTHLY_MDAY => 'MD',	// BYMONHTDAY={1..31}
+		MCAL_RECUR_MONTHLY_WDAY => 'MP',	// BYDAY={1..5}{MO..SO}
+		MCAL_RECUR_YEARLY       => 'YM',
+	);
+
+	/**
+	 * manufacturer and name of the sync-client
+	 *
+	 * @var string
+	 */
+	var $productManufacturer = 'file';
+	var $productName = '';
+
+	/**
+	 * Exports one calendar event to an iCalendar item
+	 *
+	 * @param int/array $events (array of) cal_id or array of the events
+	 * @param string $version='1.0' could be '2.0' too
+	 * @param string $method='PUBLISH'
+	 * @param boolean $force_own_uid=true ignore the stored and maybe from the client transfered uid and generate a new one
+	 * RalfBecker: GroupDAV/CalDAV requires to switch that non RFC conform behavior off, dont know if SyncML still needs it
+	 * @return string/boolean string with vCal or false on error (eg. no permission to read the event)
+	 */
+	function &exportVCal($events,$version='1.0', $method='PUBLISH',$force_own_uid=true)
+	{
+		$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();
+		}
+
+		if($this->productManufacturer == '' )
+		{	// syncevolution is broken
+			$version = "2.0";
+		}
+
+		$palm_enddate_workaround=False;
+		if($this->productManufacturer == 'Synthesis AG'
+			&& strpos($this->productName, "PalmOS") )
+		{
+			// This workaround adds 1 day to the recur_enddate if it exists, to fix a palm bug
+			$palm_enddate_workaround=True;
+		}
+
+		$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',$version);
+		$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);
+
+			// correct daylight saving time
+			/* causes times wrong by one hour, if exporting events with DST different from the current date,
+			which this fix is suppost to fix. Maybe the problem has been fixed in the horde code too.
+			$currentDST = date('I', mktime());
+			$eventDST = date('I', $event['start']);
+			$DSTCorrection = ($currentDST - $eventDST) * 3600;
+			$event['start']	= $event['start'] + $DSTCorrection;
+			$event['end']	= $event['end'] + $DSTCorrection;
+			*/
+			$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':
+							//if (count($event['participants']) == 1 && isset($event['participants'][$this->user])) break;
+							foreach((array)$event['participants'] as $uid => $status)
+							{
+								if (!($info = $this->resource_info($uid))) continue;
+								// RB: MAILTO href contains only the email-address, NO cn!
+								$attributes['ATTENDEE'][]	= $info['email'] ? 'MAILTO:'.$info['email'] : '';
+								// 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}
+								switch ($info['type'])
+								{
+									case 'g':
+										$cutype = 'GROUP';
+										break;
+									case 'r':
+										$cutype = 'RESOURCE';
+										break;
+									case 'u':	// account
+									case 'c':	// contact
+									case 'e':	// email address
+										$cutype = 'INDIVIDUAL';
+										break;
+									default:
+										$cutype = 'UNKNOWN';
+										break;
+								};
+								$parameters['ATTENDEE'][] = array(
+									'CN'       => $info['cn'] ? $info['cn'] : $info['name'],
+									'ROLE'     => $role,
+									'PARTSTAT' => $status,
+									'CUTYPE'   => $cutype,
+									'RSVP'     => $rsvp,
+								)+($info['type'] != 'e' ? array('X-EGROUPWARE-UID' => $uid) : array());
+							}
+							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 ($event['owner'] != $this->user)
+        					//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']++;
+							if(date('H:i:s',$event['end']) == '23:59:00') $event['end']+=60; // needed by old eGW whole-day events
+							$attributes[$icalFieldName]	= $event['end'];
+							break;
+
+						case 'RRULE':
+							if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+							if ($version == '1.0') {
+								$interval = ($event['recur_interval'] > 1) ? $event['recur_interval'] : 1;
+								$rrule = array('FREQ' => $this->recur_egw2ical_1_0[$event['recur_type']].$interval);
+								switch ($event['recur_type'])
+								{
+            								case MCAL_RECUR_WEEKLY:
+            									$days = array();
+            									foreach($this->recur_days_1_0 as $id => $day)
+            									{
+            										if ($event['recur_data'] & $id) $days[] = strtoupper(substr($day,0,2));
+												}
+	            								$rrule['BYDAY'] = implode(' ',$days);
+	            								$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
+	            								break;
+
+        	    							case MCAL_RECUR_MONTHLY_MDAY:	// date of the month: BYMONTDAY={1..31}
+            									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));
+	            								$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
+										break;
+								}
+
+								if ($event['recur_enddate'])
+								{
+									$recur_enddate = (int)$event['recur_enddate'];
+									if ($palm_enddate_workaround)
+									{
+										$recur_enddate += 86400;
+									}
+									# append T and the Endtime, since the RRULE seems not to be understood by the client without it
+									$rrule['UNTIL'] = date('Ymd',$recur_enddate).'T'.date('His',($event['end']?$event['end']:$event['start'])) ;
+								}
+								else
+								{
+									$rrule['UNTIL'] = '#0';
+								}
+
+								$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
+							} else {
+								$rrule = array('FREQ' => $this->recur_egw2ical_2_0[$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':
+							if ($version == '1.0') {
+								$attributes['TRANSP'] = $event['non_blocking'] ? 1 : 0;
+							} else {
+								$attributes['TRANSP'] = $event['non_blocking'] ? 'TRANSPARENT' : 'OPAQUE';
+							}
+							break;
+
+						case 'CATEGORIES':
+							if ($event['category'])
+							{
+								$attributes['CATEGORIES'] = implode(',',$this->get_categories($event['category']));
+							}
+							break;
+
+						default:
+							if ($event[$egwFieldInfo['dbName']])	// dont write empty fields
+							{
+								$attributes[$icalFieldName]	= $event[$egwFieldInfo['dbName']];
+							}
+							break;
+					}
+				}
+			}
+
+			if(strtolower($this->productManufacturer) == 'nokia') {
+				if($event['special'] == '1') {
+					$attributes['X-EPOCAGENDAENTRYTYPE'] = 'ANNIVERSARY';
+					$attributes['DTEND'] = $attributes['DTSTART'];
+				} else {
+					$attributes['X-EPOCAGENDAENTRYTYPE'] = 'APPOINTMENT';
+				}
+			}
+
+			$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;
+
+			foreach($event['alarm'] as $alarmID => $alarmData)
+			{
+				if ($version == '1.0')
+				{
+					$attributes['DALARM'] = $vcal->_exportDateTime($alarmData['time']);
+					$attributes['AALARM'] = $vcal->_exportDateTime($alarmData['time']);
+					// lets take only the first alarm
+					break;
+				}
+				else
+				{
+					// VCalendar 2.0 / RFC 2445
+
+					// skip over alarms that don't have the minimum required info
+					if (!$alarmData['offset'] && !$alarmData['time'])
+					{
+						error_log("Couldn't add VALARM (no alarm time info)");
+						continue;
+					}
+
+					// RFC requires DESCRIPTION for DISPLAY
+					if (!$event['title'] && !$event['description'])
+					{
+						error_log("Couldn't add VALARM (no description)");
+						continue;
+					}
+
+					$valarm = Horde_iCalendar::newComponent('VALARM',$vevent);
+					if ($alarmData['offset'])
+					{
+						$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
+								array('VALUE' => 'DURATION', 'RELATED' => 'START'));
+					}
+					else
+					{
+						$valarm->setAttribute('TRIGGER', $alarmData['time'],
+								array('VALUE' => 'DATE-TIME'));
+					}
+
+					$valarm->setAttribute('ACTION','DISPLAY');
+					$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $event['description']);
+					$vevent->addComponent($valarm);
+				}
+			}
+
+			$attributes['UID'] = $force_own_uid ? $eventGUID : $event['uid'];
+
+			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();
+	}
+
+	/**
+	 * Import an iCal
+	 *
+	 * @param string $_vcalData
+	 * @param int $cal_id=-1 must be -1 for new entrys!
+	 * @param string $etag=null if an etag is given, it has to match the current etag or the import will fail
+	 * @return int|boolean cal_id > 0 on success, false on failure or 0 for a failed etag
+	 */
+	function importVCal($_vcalData, $cal_id=-1,$etag=null)
+	{
+		// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
+		$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
+
+		$vcal = &new Horde_iCalendar;
+		if(!$vcal->parsevCalendar($_vcalData))
+		{
+			return FALSE;
+		}
+
+		$version = $vcal->getAttribute('VERSION');
+
+		if(!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
+		//echo "supportedFields="; _debug_array($this->supportedFields);
+
+		$syncevo_enddate_fix = False;
+		if( $this->productManufacturer == '' && $this->productName == '' )
+		{
+			// syncevolution needs an adjusted recur_enddate
+			$syncevo_enddate_fix = True;
+		}
+
+		$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('participants' => array());
+				$event		= array();
+				$alarms		= array();
+				$vcardData	= array(
+					'recur_type'		=> MCAL_RECUR_NONE,
+					'recur_exception'	=> array(),
+				);
+
+				// lets see what we can get from the vcard
+				foreach($component->_attributes as $attributes)
+				{
+					switch($attributes['name'])
+					{
+						case 'AALARM':
+						case 'DALARM':
+							if (preg_match('/.*Z$/',$attributes['value'],$matches)) {
+								$alarmTime = $vcal->_parseDateTime($attributes['value']);
+								$alarms[$alarmTime] = array(
+									'time' => $alarmTime
+								);
+							} elseif (preg_match('/(........T......);;(\d*);$/',$attributes['value'],$matches)) {
+								//error_log(print_r($matches,true));
+								$alarmTime = $vcal->_parseDateTime($matches[1]);
+								$alarms[$alarmTime] = array(
+									'time' => $alarmTime
+								);
+							} elseif (preg_match('/(........T......Z);;(\d*);$/',$attributes['value'],$matches)) {
+								//error_log(print_r($matches,true));
+								$alarmTime = $vcal->_parseDateTime($matches[1]);
+								$alarms[$alarmTime] = array(
+									'time' => $alarmTime
+								);
+							} elseif (preg_match('/(........T......)$/',$attributes['value'],$matches)) {
+								$alarmTime = $vcal->_parseDateTime($attributes['value']);
+								$alarms[$alarmTime] = array(
+									'time' => $alarmTime
+								);
+							}
+							break;
+						case 'CLASS':
+							$vcardData['public']		= (int)(strtolower($attributes['value']) == 'public');
+							break;
+						case 'DESCRIPTION':
+							$vcardData['description']	= $attributes['value'];
+							break;
+						case 'DTEND':
+							$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
+							if(date('H:i:s',$dtend_ts) == '00:00:00') {
+								$dtend_ts -= 60;
+							}
+							$vcardData['end']		= $dtend_ts;
+							break;
+						case 'DTSTART':
+							$vcardData['start']		= $attributes['value'];
+							break;
+						case 'LOCATION':
+							$vcardData['location']	= $attributes['value'];
+							break;
+						case 'RRULE':
+							$recurence = $attributes['value'];
+							$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
+							// vCard 2.0 values for all types
+							if (preg_match('/UNTIL=([0-9T]+)/',$recurence,$matches))
+							{
+								$vcardData['recur_enddate'] = $vcal->_parseDateTime($matches[1]);
+							}
+							elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
+							{
+								$vcardData['recur_count'] = (int)$matches[1];
+							}
+							if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
+							{
+								// 1 is invalid,, egw uses 0 for interval
+								$vcardData['recur_interval'] = (int) $matches[1] != 0 ? (int) $matches[1] : 0;
+							}
+							if (!isset($vcardData['start']))	// it might not yet be set, because the RRULE is before it
+							{
+								$vcardData['start'] = self::_get_attribute($component->_attributes,'DTSTART');
+								$vcardData['end'] = self::_get_attribute($component->_attributes,'DTEND');
+							}
+							$vcardData['recur_data'] = 0;
+							switch($type)
+							{
+								case 'W':
+								case 'WEEKLY':
+									$days = array();
+									if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))		// 1.0
+									{
+										$vcardData['recur_interval'] = $recurenceMatches[1];
+										$days = explode(' ',trim($recurenceMatches[2]));
+										if($recurenceMatches[3] != '#0')
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[3]);
+										$recur_days = $this->recur_days_1_0;
+									}
+									elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+									{
+										$days = explode(',',$recurenceMatches[1]);
+										$recur_days = $this->recur_days;
+									}
+									else	// no day given, use the day of dtstart
+									{
+										$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
+										$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
+									}
+									if ($days)
+									{
+										foreach($recur_days as $id => $day)
+	            						{
+	            							if (in_array(strtoupper(substr($day,0,2)),$days))
+        									{
+        										$vcardData['recur_data'] |= $id;
+        									}
+        								}
+										$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
+									}
+
+									if (!empty($vcardData['recur_count']))
+									{
+										$vcardData['recur_enddate'] = mktime(0,0,0,
+											date('m',$vcardData['start']),
+											date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)*7),
+											date('Y',$vcardData['start']));
+									}
+									break;
+
+								case 'D':	// 1.0
+									if(preg_match('/D(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
+										$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[2] > 0 && $vcardData['end']) {
+											$vcardData['recur_enddate'] = mktime(
+												date('H', $vcardData['end']),
+												date('i', $vcardData['end']),
+												date('s', $vcardData['end']),
+												date('m', $vcardData['end']),
+												date('d', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
+												date('Y', $vcardData['end'])
+											);
+										}
+									} elseif(preg_match('/D(\d+) (.*)/', $recurence, $recurenceMatches)) {
+										$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[2] != '#0') {
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
+										}
+									} else {
+										break;
+									}
+									// fall-through
+								case 'DAILY':	// 2.0
+									$vcardData['recur_type'] = MCAL_RECUR_DAILY;
+
+									if (!empty($vcardData['recur_count']))
+									{
+										$vcardData['recur_enddate'] = mktime(0,0,0,
+											date('m',$vcardData['start']),
+											date('d',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
+											date('Y',$vcardData['start']));
+									}
+									break;
+
+								case 'M':
+									if(preg_match('/MD(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
+										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
+										$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[2] > 0 && $vcardData['end']) {
+											$vcardData['recur_enddate'] = mktime(
+												date('H', $vcardData['end']),
+												date('i', $vcardData['end']),
+												date('s', $vcardData['end']),
+												date('m', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']),
+												date('d', $vcardData['end']),
+												date('Y', $vcardData['end'])
+											);
+										}
+									} elseif(preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches)) {
+										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
+										if($recurenceMatches[1] > 1)
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[2] != '#0')
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
+									} elseif(preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches)) {
+										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
+										if($recurenceMatches[1] > 1)
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[4] != '#0')
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[4]);
+									}
+									break;
+								case 'MONTHLY':
+									$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
+										MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
+
+									if (!empty($vcardData['recur_count']))
+									{
+										$vcardData['recur_enddate'] = mktime(0,0,0,
+											date('m',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)),
+											date('d',$vcardData['start']),
+											date('Y',$vcardData['start']));
+									}
+									break;
+
+								case 'Y':		// 1.0
+									if(preg_match('/YM(\d+) #(.\d)/', $recurence, $recurenceMatches)) {
+										$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[2] > 0 && $vcardData['end']) {
+											$vcardData['recur_enddate'] = mktime(
+												date('H', $vcardData['end']),
+												date('i', $vcardData['end']),
+												date('s', $vcardData['end']),
+												date('m', $vcardData['end']),
+												date('d', $vcardData['end']),
+												date('Y', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval'])
+											);
+										}
+									} elseif(preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches)) {
+										$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[2] != '#0') {
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
+										}
+									} else {
+										break;
+									}
+									// fall-through
+								case 'YEARLY':	// 2.0
+									$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
+
+									if (!empty($vcardData['recur_count']))
+									{
+										$vcardData['recur_enddate'] = mktime(0,0,0,
+											date('m',$vcardData['start']),
+											date('d',$vcardData['start']),
+											date('Y',$vcardData['start']) + ($vcardData['recur_interval']*($vcardData['recur_count']-1)));
+									}
+									break;
+							}
+							if( $syncevo_enddate_fix && $vcardData['recur_enddate'] )
+							{
+								// Does syncevolution need to adjust recur_enddate
+								$vcardData['recur_enddate'] = (int)$vcardData['recur_enddate'] + 86400;
+							}
+							break;
+						case 'EXDATE':
+							$vcardData['recur_exception'] = array_merge($vcardData['recur_exception'],$attributes['value']);
+							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'])))
+							{
+								$cal_id = $event['id'] = $uid_event['id'];
+								unset($uid_event);
+							}
+							break;
+ 						case 'TRANSP':
+ 							if($version == '1.0') {
+ 								$vcardData['non_blocking'] = $attributes['value'] == 1;
+ 							} else {
+								$vcardData['non_blocking'] = $attributes['value'] == 'TRANSPARENT';
+							}
+							break;
+						case 'PRIORITY':
+ 							$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+ 							break;
+ 						case 'CATEGORIES':
+ 							if ($attributes['value'])
+ 							{
+ 								$vcardData['category'] = $this->find_or_add_categories(explode(',',$attributes['value']));
+ 							}
+							else
+							{
+ 								$vcardData['category'] = array();
+							}
+ 							break;
+ 						case 'ATTENDEE':
+ 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) ||
+ 								preg_match('/<([@.a-z0-9_-]+)>/i',$attributes['value'],$matches))
+								{
+									$email = $matches[1];
+								}
+								elseif(strpos($attributes['value'],'@') !== false)
+								{
+									$email = $attributes['value'];
+								}
+ 							if (($uid = $attributes['params']['X-EGROUPWARE-UID']) &&
+ 								($info = $this->resource_info($uid)) && $info['email'] == $email)
+ 							{
+ 								// we use the (checked) X-EGROUPWARE-UID
+ 							}
+ 							/*elseif($attributes['params']['CUTYPE'] == 'RESOURCE')
+ 							{
+
+ 							}*/
+	 						elseif($attributes['value'] == 'Unknown')
+ 							{
+ 								$uid = $GLOBALS['egw_info']['user']['account_id'];
+ 							}
+ 							elseif (($uid = $GLOBALS['egw']->accounts->name2id($email,'account_email')))
+ 							{
+ 								// we use the account we found
+ 							}
+							elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',array(
+								'email' => $email,
+								'email_home' => $email,
+							),true,'','','',false,'OR')))
+							{
+								$uid = 'c'.$data['id'];
+							}
+ 							else
+ 							{
+ 								$uid = 'e'.($attributes['params']['CN'] ? $attributes['params']['CN'].' <'.$email.'>' : $email);
+ 							}
+ 							$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
+ 									$this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])] :
+ 									($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],'account_email')))
+ 							{
+ 								$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;
+					}
+				}
+
+				// check if the entry is a birthday
+				// this field is only set from NOKIA clients
+				$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
+				if (!is_a($agendaEntryType, 'PEAR_Error')) {
+					if(strtolower($agendaEntryType) == 'anniversary') {
+						$event['special'] = '1';
+						// make it a whole day event for eGW
+						$vcardData['end'] = $vcardData['start'] + 86399;
+					}
+				}
+
+				if(!empty($vcardData['recur_enddate']))
+				{
+					// reset recure_enddate to 00:00:00 on the last day
+					$vcardData['recur_enddate'] = mktime(0, 0, 0,
+						date('m',$vcardData['recur_enddate']),
+						date('d',$vcardData['recur_enddate']),
+						date('Y',$vcardData['recur_enddate'])
+					);
+				}
+				//echo "event=";_debug_array($vcardData);
+
+				// 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 'alarms':
+							// not handled here
+							break;
+						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[$r]))
+									{
+										$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');
+ 				}
+
+				// If this is an updated meeting, and the client doesn't support
+				// participants, add them back
+				if( $cal_id > 0 && !isset($this->supportedFields['participants']))
+				{
+					if (($egw_event = $this->read($cal_id)))
+					{
+						$event['participants'] = $egw_event['participants'];
+						$event['participant_types'] = $egw_event['participant_types'];
+					}
+				}
+
+				// Check for resources, and don't remove them
+				if( $cal_id > 0 )
+				{
+					// for each existing participant:
+					if (($egw_event = $this->read($cal_id)))
+					{
+						foreach( $egw_event['participants'] as $uid => $status )
+						{
+							// Is it a resource and not longer present in the event?
+							if ( $uid[0] == 'r' && !isset($event['participants'][$uid]) )
+							{
+								// Add it back in
+								$event['participants'][$uid] = $event['participant_types']['r'][substr($uid,1)] = $status;
+							}
+						}
+					}
+				}
+
+				// check if iCal changes the organizer, which is not allowed
+				if ($cal_id > 0 && ($egw_event = $this->read($cal_id)) && $event['owner'] != $egw_event['owner'])
+				{
+					$event['owner'] = $egw_event['owner'];	// set it back to the original owner
+				}
+
+				#error_log('ALARMS');
+				#error_log(print_r($event, true));
+
+				// if an etag is given, include it in the update
+				if (!is_null($etag))
+				{
+					$event['etag'] = $etag;
+				}
+				if (!($Ok = $this->update($event, TRUE)))
+				{
+					// check if current user is an attendee and tried to change his status
+					if ($Ok === false && $cal_id && ($egw_event = $this->read($cal_id)) && isset($egw_event['participants'][$this->user]) &&
+						$egw_event['participants'][$this->user] !== $event['participants'][$this->user])
+					{
+						$this->set_status($egw_event,$this->user,
+							$status = $event['participants'][$this->user] ? $event['participants'][$this->user] : 'R');
+
+						$Ok = $cal_id;
+						continue;
+					}
+					break;	// stop with the first error
+				}
+				else
+				{
+					$eventID =& $Ok;
+
+					// handle the alarms
+					foreach ($component->getComponents() as $valarm)
+					{
+						if (is_a($valarm, 'Horde_iCalendar_valarm'))
+						{
+							$this->valarm2egw($alarms,$valarm);
+						}
+					}
+
+					if(count($alarms) > 0 || (isset($this->supportedFields['alarms'])  && count($alarms) == 0))
+					{
+						// delete the old alarms
+						$updatedEvent = $this->read($eventID);
+						foreach($updatedEvent['alarm'] as $alarmID => $alarmData)
+						{
+							$this->delete_alarm($alarmID);
+						}
+					}
+
+					foreach($alarms as $alarm)
+					{
+						$alarm['offset'] = $event['start'] - $alarm['time'];
+						$alarm['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						$this->save_alarm($eventID, $alarm);
+					}
+				}
+			}
+		}
+		return $Ok;
+	}
+
+	/**
+	 * get the value of an attribute by its name
+	 *
+	 * @param array $attributes
+	 * @param string $name eg. 'DTSTART'
+	 * @param string $what='value'
+	 * @return mixed
+	 */
+	static function _get_attribute($components,$name,$what='value')
+	{
+		foreach($components as $attribute)
+		{
+			if ($attribute['name'] == $name)
+			{
+				return !$what ? $attribute : $attribute[$what];
+			}
+		}
+		return false;
+	}
+
+	static function valarm2egw(&$alarms, &$valarm)
+	{
+		$count = 0;
+		foreach($valarm->_attributes as $vattr)
+		{
+			switch($vattr['name'])
+			{
+				case 'TRIGGER':
+					$vtype = (isset($vattr['params']['VALUE']))
+						? $vattr['params']['VALUE'] : 'DURATION'; //default type
+					switch ($vtype)
+					{
+						case 'DURATION':
+							if (isset($vattr['params']['RELATED'])
+								&& $vattr['params']['RELATED'] != 'START')
+							{
+								error_log("Unsupported VALARM offset anchor ".$vattr['params']['RELATED']);
+							}
+							else
+							{
+								$alarms[] = array('offset' => -$vattr['value']);
+								$count++;
+							}
+							break;
+						case 'DATE-TIME':
+							$alarms[] = array('time' => $vattr['value']);
+							$count++;
+							break;
+						default:
+							// we should also do ;RELATED=START|END
+							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
+					}
+					break;
+				// case 'ACTION':
+				// 	break;
+				// case 'DISPLAY':
+				// 	break;
+
+				default:
+					error_log('VALARM field:' .$vattr['name'] .':' . print_r($vattrval,true) . ' HAS NO CONVERSION YET');
+			}
+		}
+		return $count;
+	}
+
+	function setSupportedFields($_productManufacturer='file', $_productName='')
+	{
+		// save them vor later use
+		$this->productManufacturer = $_productManufacturer;
+		$this->productName = $_productName;
+
+		$defaultFields['minimal'] = 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',
+			'alarms'			=> 'alarms',
+		);
+
+		$defaultFields['basic'] = $defaultFields['minimal'] + array(
+			'recur_exception'	=> 'recur_exception',
+			'priority'			=> 'priority',
+		);
+
+		$defaultFields['nexthaus'] = $defaultFields['basic'] + array(
+			'participants'		=> 'participants',
+		);
+
+		$defaultFields['synthesis'] = $defaultFields['basic'] + array(
+			'non_blocking'		=> 'non_blocking',
+			'category'			=> 'category',
+		);
+
+		$defaultFields['evolution'] = $defaultFields['basic'] + array(
+			'participants'		=> 'participants',
+			'owner'				=> 'owner',
+			'category'			=> 'category',
+		);
+
+		$defaultFields['full'] = $defaultFields['basic'] + array(
+			'participants'		=> 'participants',
+			'owner'				=> 'owner',
+			'category'			=> 'category',
+			'non_blocking'		=> 'non_blocking',
+		);
+
+
+		switch(strtolower($_productManufacturer))
+		{
+			case 'nexthaus corporation':
+			case 'nexthaus corp':
+				switch(strtolower($_productName))
+				{
+					default:
+						$this->supportedFields = $defaultFields['nexthaus'];
+						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['basic'];
+						break;
+				}
+				break;
+
+			case 'nokia':
+				switch(strtolower($_productName))
+				{
+					case 'e61':
+						$this->supportedFields = $defaultFields['minimal'];
+						break;
+					default:
+						error_log("Unknown Nokia phone '$_productName', assuming E61");
+						$this->supportedFields = $defaultFields['minimal'];
+						break;
+				}
+				break;
+
+			case 'sonyericsson':
+			case 'sony ericsson':
+				switch(strtolower($_productName))
+				{
+					case 'd750i':
+					case 'p910i':
+						$this->supportedFields = $defaultFields['basic'];
+						break;
+					default:
+						error_log("Unknown Sony Ericsson phone '$_productName' assuming d750i");
+						$this->supportedFields = $defaultFields['basic'];
+						break;
+				}
+				break;
+
+			case 'synthesis ag':
+				switch(strtolower($_productName))
+				{
+					case 'sysync client pocketpc std':
+					case 'sysync client pocketpc pro':
+						$this->supportedFields = $defaultFields['full'];
+						break;
+					default:
+						$this->supportedFields = $defaultFields['synthesis'];
+						break;
+				}
+				break;
+
+			//Syncevolution compatibility
+			case 'patrick ohly':
+				$this->supportedFields = $defaultFields['evolution'];
+				break;
+
+			case '': // seems syncevolution 0.5 doesn't send a manufacturer
+				error_log("No vendor name, assuming syncevolution 0.5");
+				$this->supportedFields = $defaultFields['evolution'];
+				break;
+
+			case 'file':	// used outside of SyncML, eg. by the calendar itself ==> all possible fields
+				$this->supportedFields = $defaultFields['full'];
+				break;
+
+			// the fallback for SyncML
+			default:
+				error_log("Unknown calendar SyncML client: manufacturer='$_productManufacturer'  product='$_productName'");
+				$this->supportedFields = $defaultFields['full'];
+				break;
+		}
+	}
+
+	function icaltoegw($_vcalData)
+	{
+		// our (patched) horde classes, do NOT unfold folded lines, which causes a lot trouble in the import
+		$_vcalData = preg_replace("/[\r\n]+ /",'',$_vcalData);
+
+		$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('participants' => array());
+				$event		= array();
+				$alarms		= array();
+				$vcardData	= array('recur_type' => 0);
+
+				// lets see what we can get from the vcard
+				foreach($component->_attributes as $attributes)
+				{
+					switch($attributes['name'])
+					{
+						case 'AALARM':
+						case 'DALARM':
+							if (preg_match('/.*Z$/',$attributes['value'],$matches))
+							{
+								$alarmTime = $vcal->_parseDateTime($attributes['value']);
+								$alarms[$alarmTime] = array(
+									'time' => $alarmTime
+								);
+							}
+							break;
+						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'];
+							$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
+							// vCard 2.0 values for all types
+							if (preg_match('/UNTIL=([0-9T]+)/',$recurence,$matches))
+							{
+								$vcardData['recur_enddate'] = $vcal->_parseDateTime($matches[1]);
+							}
+							if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
+							{
+								$vcardData['recur_interval'] = (int) $matches[1];
+							}
+							$vcardData['recur_data'] = 0;
+							switch($type)
+							{
+								case 'W':
+								case 'WEEKLY':
+									$days = array();
+									if(preg_match('/W(\d+) (.*) (.*)/',$recurence, $recurenceMatches))		// 1.0
+									{
+										$vcardData['recur_interval'] = $recurenceMatches[1];
+										$days = explode(' ',trim($recurenceMatches[2]));
+										if($recurenceMatches[3] != '#0')
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[3]);
+										$recur_days = $this->recur_days_1_0;
+									}
+									elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+									{
+										$days = explode(',',$recurenceMatches[1]);
+										$recur_days = $this->recur_days;
+									}
+									if ($days)
+									{
+										foreach($recur_days as $id => $day)
+			            						{
+			            							if (in_array(strtoupper(substr($day,0,2)),$days))
+	            									{
+	            										$vcardData['recur_data'] |= $id;
+	            									}
+	            								}
+										$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
+									}
+									break;
+
+								case 'D':		// 1.0
+									if(!preg_match('/D(\d+) (.*)/',$recurence, $recurenceMatches)) break;
+									$vcardData['recur_interval'] = $recurenceMatches[1];
+									if($recurenceMatches[2] != '#0')
+										$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
+									// fall-through
+								case 'DAILY':	// 2.0
+									$vcardData['recur_type'] = MCAL_RECUR_DAILY;
+									break;
+
+								case 'M':
+									if(preg_match('/MD(\d+) (.*)/',$recurence, $recurenceMatches))
+									{
+										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
+										if($recurenceMatches[1] > 1)
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[2] != '#0')
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
+									}
+									elseif(preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
+									{
+										$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
+										if($recurenceMatches[1] > 1)
+											$vcardData['recur_interval'] = $recurenceMatches[1];
+										if($recurenceMatches[4] != '#0')
+											$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[4]);
+									}
+									break;
+								case 'MONTHLY':
+									$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
+										MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
+									break;
+
+								case 'Y':		// 1.0
+									if(!preg_match('/YM(\d+) (.*)/',$recurence, $recurenceMatches)) break;
+									$vcardData['recur_interval'] = $recurenceMatches[1];
+									if($recurenceMatches[2] != '#0')
+										$vcardData['recur_enddate'] = $vcal->_parseDateTime($recurenceMatches[2]);
+									// fall-through
+								case 'YEARLY':	// 2.0
+									$vcardData['recur_type'] = MCAL_RECUR_YEARLY;
+									break;
+							}
+							break;
+						case 'EXDATE':
+							$vcardData['recur_exception'] = $attributes['value'];
+							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':
+							if ($this->productManufacturer == 'nexthaus corporation'
+								|| $this->productManufacturer == 'nexthaus corp')
+							{
+								$vcardData['priority'] = $attributes['value'] == 1 ? 3 : 2; // 1=high, 2=normal
+							}
+							else
+							{
+ 								$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+							}
+ 							break;
+ 						case 'CATEGORIES':
+ 							if ($attributes['value'])
+ 							{
+								$vcardData['category'] = $this->find_or_add_categories(explode(',',$attributes['value']));
+							}
+							else
+							{
+ 								$vcardData['category'] = array();
+							}
+ 							break;
+ 						case 'ATTENDEE':
+ 							if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) &&
+ 								($uid = $GLOBALS['egw']->accounts->name2id($matches[1],'account_email')))
+ 							{
+ 								$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
+ 									$this->status_ical2egw[strtoupper($attributes['params']['PARTSTAT'])] :
+ 									($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],'account_email')))
+ 							{
+ 								$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;
+					}
+				}
+
+				// check if the entry is a birthday
+				// this field is only set from NOKIA clients
+				$agendaEntryType = $component->getAttribute('X-EPOCAGENDAENTRYTYPE');
+				if (!is_a($agendaEntryType, 'PEAR_Error')) {
+					if(strtolower($agendaEntryType) == 'anniversary') {
+						$event['special'] = '1';
+						$vcardData['end'] = $vcardData['start'] + 86399;
+					}
+				}
+
+				if(!empty($vcardData['recur_enddate']))
+				{
+					// reset recure_enddate to 00:00:00 on the last day
+					$vcardData['recur_enddate'] = mktime(0, 0, 0,
+						date('m',$vcardData['recur_enddate']),
+						date('d',$vcardData['recur_enddate']),
+						date('Y',$vcardData['recur_enddate'])
+					);
+				}
+				//echo "event=";_debug_array($vcardData);
+
+				while(($fieldName = array_shift($supportedFields)))
+				{
+					switch($fieldName)
+					{
+						case 'recur_interval':
+						case 'recur_enddate':
+						case 'recur_data':
+						case 'recur_exception':
+						case 'alarms':
+							// not handled here
+							break;
+						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[$r]))
+									{
+										$event[$r] = $vcardData[$r];
+									}
+								}
+							}
+							break;
+						default:
+							if (isset($vcardData[$fieldName]))
+							{
+								$event[$fieldName] = $vcardData[$fieldName];
+							}
+							break;
+					}
+				}
+
+				return $event;
+			}
+		}
+
+		return false;
+	}
+
+	function search($_vcalData)
+	{
+		if(!$event = $this->icaltoegw($_vcalData)) {
+			return false;
+		}
+
+		$query = array(
+			'cal_start='.$this->date2ts($event['start'],true),	// true = Server-time
+			'cal_end='.$this->date2ts($event['end'],true),
+		);
+
+		#foreach(array('title','location','priority','public','non_blocking') as $name) {
+		foreach(array('title','location','public','non_blocking') as $name) {
+			if (isset($event[$name])) $query['cal_'.$name] = $event[$name];
+		}
+
+		if($foundEvents = parent::search(array(
+			'user'  => $this->user,
+			'query' => $query,
+		))) {
+			if(is_array($foundEvents)) {
+				$event = array_shift($foundEvents);
+				return $event['id'];
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Create a freebusy vCal for the given user(s)
+	 *
+	 * @param int $user account_id
+	 * @param mixed $end=null end-date, default now+1 month
+	 * @return string
+	 */
+	function freebusy($user,$end=null)
+	{
+		if (!$end) $end = $this->now_su + 100*DAY_s;	// default next 100 days
+
+		$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');
+
+		$vfreebusy = Horde_iCalendar::newComponent('VFREEBUSY',$vcal);
+		$parameters = array(
+			'ORGANIZER' => $GLOBALS['egw']->translation->convert(
+				$GLOBALS['egw']->accounts->id2name($user,'account_firstname').' '.
+				$GLOBALS['egw']->accounts->id2name($user,'account_lastname'),
+				$GLOBALS['egw']->translation->charset(),'utf-8'),
+		);
+		foreach(array(
+			'URL' => $this->freebusy_url($user),
+			'DTSTART' => $this->date2ts($this->now_su,true),	// true = server-time
+			'DTEND' => $this->date2ts($end,true),	// true = server-time
+		  	'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
+			'DTSTAMP' => time(),
+		) as $attr => $value)
+		{
+			$vfreebusy->setAttribute($attr, $value, $parameters[$name]);
+		}
+		$fbdata = parent::search(array(
+					'start' => $this->now_su,
+					'end'   => $end,
+					'users' => $user,
+					'date_format' => 'server',
+					'show_rejected' => false,
+				));
+		if (is_array($fbdata))
+		{
+			foreach ($fbdata as $event)
+			{
+				if ($event['non_blocking']) continue;
+
+				$vfreebusy->setAttribute('FREEBUSY',array(array(
+					'start' => $event['start'],
+					'end' => $event['end'],
+				)));
+			}
+		}
+		$vcal->addComponent($vfreebusy);
+
+		return $vcal->exportvCalendar();
+	}
+}
diff --git a/calendar/inc/class.calendar_sif.inc.php b/calendar/inc/class.calendar_sif.inc.php
new file mode 100644
index 0000000000..119118344e
--- /dev/null
+++ b/calendar/inc/class.calendar_sif.inc.php
@@ -0,0 +1,503 @@
+<?php
+/**
+ * eGroupWare calendar - SIF Parser for SyncML
+ *
+ * @link http://www.egroupware.org
+ * @author Lars Kneschke <lkneschke@egroupware.org>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package calendar
+ * @subpackage export
+ * @version $Id$
+ */
+
+require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php';
+
+/**
+ * SIF Parser for SyncML
+ */
+class sifcalendar extends calendar_boupdate
+{
+	var $sifMapping = array(
+		'Start'				=> 'start',
+		'End'				=> 'end',
+		'AllDayEvent'			=> 'alldayevent',
+		'BillingInformation'		=> '',
+		'Body'				=> 'description',
+		'BusyStatus'			=> '',
+		'Categories'			=> 'category',
+		'Companies'			=> '',
+		'Importance'			=> 'priority',
+		'IsRecurring'			=> 'isrecurring',
+		'Location'			=> 'location',
+		'MeetingStatus'			=> '',
+		'Mileage'			=> '',
+		'ReminderMinutesBeforeStart'	=> 'reminderstart',
+		'ReminderSet'			=> 'reminderset',
+		'ReplyTime'			=> '',
+		'Sensitivity'			=> 'public',
+		'Subject'			=> 'title',
+		'RecurrenceType'		=> 'recur_type',
+		'Interval'			=> 'recur_interval',
+		'MonthOfYear'			=> '',
+		'DayOfMonth'			=> '',
+		'DayOfWeekMask'			=> 'recur_weekmask',
+		'Instance'			=> '',
+		'PatternStartDate'		=> '',
+		'NoEndDate'			=> 'recur_noenddate',
+		'PatternEndDate'		=> 'recur_enddate',
+		'Occurrences'			=> '',
+	);
+
+	// the calendar event array
+	var $event;
+
+	// constants for recurence type
+	const olRecursDaily	= 0;
+	const olRecursWeekly	= 1;
+	const olRecursMonthly	= 2;
+	const olRecursMonthNth	= 3;
+	const olRecursYearly	= 5;
+	const olRecursYearNth	= 6;
+
+	// constants for weekdays
+	const olSunday = 1;
+	const olMonday = 2;
+	const olTuesday = 4;
+	const olWednesday = 8;
+	const olThursday = 16;
+	const olFriday = 32;
+	const olSaturday = 64;
+
+	function startElement($_parser, $_tag, $_attributes) {
+	}
+
+	function endElement($_parser, $_tag) {
+		//error_log('endElem: ' . $_tag .' => '. trim($this->sifData));
+		if(!empty($this->sifMapping[$_tag])) {
+			$this->event[$this->sifMapping[$_tag]] = trim($this->sifData);
+		}
+		unset($this->sifData);
+	}
+
+	function characterData($_parser, $_data) {
+		$this->sifData .= $_data;
+	}
+
+	function siftoegw($_sifdata) {
+		$vcal		= &new Horde_iCalendar;
+		$finalEvent	= array();
+		$sysCharSet	= $GLOBALS['egw']->translation->charset();
+		$sifData	= base64_decode($_sifdata);
+		#error_log($sifData);
+
+		$tmpfname = tempnam('/tmp/sync/contents','sife_');
+
+		$handle = fopen($tmpfname, "w");
+		fwrite($handle, $sifData);
+		fclose($handle);
+
+		$this->xml_parser = xml_parser_create('UTF-8');
+		xml_set_object($this->xml_parser, $this);
+		xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, false);
+		xml_set_element_handler($this->xml_parser, "startElement", "endElement");
+		xml_set_character_data_handler($this->xml_parser, "characterData");
+		$this->strXmlData = xml_parse($this->xml_parser, $sifData);
+		if(!$this->strXmlData) {
+			error_log(sprintf("XML error: %s at line %d",
+				xml_error_string(xml_get_error_code($this->xml_parser)),
+				xml_get_current_line_number($this->xml_parser)));
+			return false;
+		}
+		#error_log(print_r($this->event, true));
+
+		foreach($this->event as $key => $value) {
+			$value = $GLOBALS['egw']->translation->convert($value, 'utf-8', $sysCharSet);
+			#error_log("$key => $value");
+			switch($key) {
+				case 'alldayevent':
+					if($value == 1) {
+						$startParts = explode('-',$this->event['start']);
+						$finalEvent['start'] = mktime(0, 0, 0, $startParts[1], $startParts[2], $startParts[0]);
+						$endParts = explode('-',$this->event['end']);
+						$finalEvent['end'] = mktime(23, 59, 59, $endParts[1], $endParts[2], $endParts[0]);
+					}
+					break;
+
+				case 'public':
+					$finalEvent[$key] = ((int)$value > 0) ? 0 : 1;
+					break;
+
+				case 'category':
+					if(!empty($value)) {
+						$finalEvent[$key] = implode(',',$this->find_or_add_categories(explode(';', $value)));
+					}
+					break;
+
+				case 'end':
+				case 'start':
+					if($this->event['alldayevent'] < 1) {
+						$finalEvent[$key] = $vcal->_parseDateTime($value);
+						error_log("event ".$key." val=".$value.", parsed=".$finalEvent[$key]);
+					}
+					break;
+
+				case 'isrecurring':
+					if($value == 1) {
+						$finalEvent['recur_interval'] = $this->event['recur_interval'];
+						if($this->event['recur_noenddate'] == 0) {
+							$finalEvent['recur_enddate'] = $vcal->_parseDateTime($this->event['recur_enddate']);
+						}
+						switch($this->event['recur_type']) {
+							case self::olRecursDaily:
+								$finalEvent['recur_type']	= MCAL_RECUR_DAILY;
+								break;
+
+							case self::olRecursWeekly:
+								$finalEvent['recur_type']	= MCAL_RECUR_WEEKLY;
+								$finalEvent['recur_data']	= $this->event['recur_weekmask'];
+								break;
+
+							case self::olRecursMonthly:
+								$finalEvent['recur_type']	= MCAL_RECUR_MONTHLY_MDAY;
+								break;
+
+							case self::olRecursMonthNth:
+								$finalEvent['recur_type']	= MCAL_RECUR_MONTHLY_WDAY;
+								break;
+
+							case self::olRecursYearly:
+								$finalEvent['recur_type']	= MCAL_RECUR_YEARLY;
+								$finalEvent['recur_interval'] = 1;
+								break;
+						}
+					}
+					break;
+
+				case 'priority':
+					$finalEvent[$key] = $value+1;
+					break;
+
+				case 'reminderset':
+					if($value == 1) {
+						$finalEvent['alarm'] = $this->event['reminderstart'];
+					}
+					break;
+
+				case 'recur_type':
+				case 'recur_enddate':
+				case 'recur_interval':
+				case 'recur_weekmask':
+				case 'reminderstart':
+					// do nothing, get's handled in isrecuring clause
+					break;
+
+				default:
+					$finalEvent[$key] = $value;
+					break;
+			}
+		}
+
+		#$middleName = ($finalEvent['n_middle']) ? ' '.trim($finalEvent['n_middle']) : '';
+		#$finalEvent['fn']  = trim($finalEvent['n_given']. $middleName .' '. $finalEvent['n_family']);
+
+		#error_log(print_r($finalEvent, true));
+
+		return $finalEvent;
+	}
+
+	function search($_sifdata) {
+		if(!$event = $this->siftoegw($_sifdata)) {
+			return false;
+		}
+
+		$query = array(
+			'cal_start='.$this->date2ts($event['start'],true),	// true = Server-time
+			'cal_end='.$this->date2ts($event['end'],true),
+		);
+
+		#foreach(array('title','location','priority','public','non_blocking') as $name) {
+		foreach(array('title','location','public','non_blocking') as $name) {
+			if (isset($event[$name])) $query['cal_'.$name] = $event[$name];
+		}
+
+		if($foundEvents = parent::search(array(
+			'user'  => $this->user,
+			'query' => $query,
+		))) {
+			if(is_array($foundEvents)) {
+				$event = array_shift($foundEvents);
+				return $event['id'];
+			}
+		}
+		return false;
+
+		$search['start'] = $event['start'];
+		$search['end']	= $event['end'];
+
+		unset($event['description']);
+		unset($event['start']);
+		unset($event['end']);
+
+		foreach($event as $key => $value) {
+			if (substr($key,0,6) != 'recur_' && substr($key,0,5) != 'alarm') {
+				$search['query']['cal_'.$key] = $value;
+			} else {
+				#$search['query'][$key] = $value;
+			}
+		}
+
+		if($foundEvents = parent::search($search)) {
+			if(is_array($foundEvents)) {
+				$event = array_shift($foundEvents);
+				return $event['id'];
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* @return int contact id
+	* @param string	$_vcard		the vcard
+	* @param int	$_abID		the internal addressbook id
+	* @desc import a vard into addressbook
+	*/
+	function addSIF($_sifdata, $_calID)
+	{
+		$calID = false;
+
+		#error_log('ABID: '.$_abID);
+		#error_log(base64_decode($_sifdata));
+
+		if(!$event = $this->siftoegw($_sifdata)) {
+			return false;
+		}
+
+		if(isset($event['alarm'])) {
+			$alarm = $event['alarm'];
+			unset($event['alarm']);
+		}
+
+		if($_calID > 0)
+		{
+			// update entry
+			$event['id'] = $_calID;
+		}
+
+		if($eventID = $this->update($event, TRUE)) {
+			$updatedEvent = $this->read($eventID);
+			foreach($updatedEvent['alarm'] as $alarmID => $alarmData)
+			{
+				$this->delete_alarm($alarmID);
+			}
+
+			if(isset($alarm)) {
+				$alarmData['time']	= $event['start'] - ($alarm*60);
+				$alarmData['offset']	= $alarm*60;
+				$alarmData['all']	= 1;
+				$alarmData['owner']	= $GLOBALS['egw_info']['user']['account_id'];
+				$this->save_alarm($eventID, $alarmData);
+			}
+		}
+
+		return $eventID;
+	}
+
+	/**
+	* return a vcard
+	*
+	* @param int	$_id		the id of the contact
+	* @param int	$_vcardProfile	profile id for mapping from vcard values to egw addressbook
+	* @return string containing the vcard
+	*/
+	function getSIF($_id)
+	{
+		$fields = array_unique(array_values($this->sifMapping));
+		sort($fields);
+
+		#$event = $this->read($_id,null,false,'server');
+		#error_log("FOUND EVENT: ". print_r($event, true));
+
+		if($event = $this->read($_id,null,false,'server')) {
+			$sysCharSet	= $GLOBALS['egw']->translation->charset();
+			$vcal		= &new Horde_iCalendar;
+
+
+			$sifEvent = '<appointment>';
+
+			foreach($this->sifMapping as $sifField => $egwField)
+			{
+				if(empty($egwField)) continue;
+
+				#error_log("$sifField => $egwField");
+				#error_log('VALUE1: '.$event[$egwField]);
+				$value = $GLOBALS['egw']->translation->convert($event[$egwField], $sysCharSet, 'utf-8');
+				#error_log('VALUE2: '.$value);
+
+				switch($sifField)
+				{
+					case 'Categories':
+						if(!empty($value)) {
+							$value = implode('; ', $this->get_categories(explode(',',$value)));
+							$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
+						}
+						$sifEvent .= "<$sifField>$value</$sifField>";
+						break;
+
+					case 'Importance':
+						$value = $value-1;
+						$sifEvent .= "<$sifField>$value</$sifField>";
+						break;
+
+					case 'RecurrenceType':
+					case 'Interval':
+					case 'PatternStartDate':
+					case 'NoEndDate':
+					case 'DayOfWeekMask':
+					case 'PatternEndDate':
+						break;
+
+					case 'IsRecurring':
+						switch($event['recur_type']) {
+							case MCAL_RECUR_NONE:
+								$sifEvent .= "<$sifField>0</$sifField>";
+								break;
+
+							case MCAL_RECUR_DAILY:
+								$eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1);
+								$recurStartDate = mktime(0,0,0,date('m',$event['start']), date('d', $event['start']), date('Y', $event['start']));
+
+								$sifEvent .= "<$sifField>1</$sifField>";
+								$sifEvent .= '<RecurrenceType>'. self::olRecursDaily .'</RecurrenceType>';
+								$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
+								$sifEvent .= '<PatternStartDate>'. $vcal->_exportDateTime($recurStartDate) .'</PatternStartDate>';
+								if($event['recur_enddate'] == 0) {
+									$sifEvent .= '<NoEndDate>1</NoEndDate>';
+								} else {
+									$recurEndDate = mktime(24,0,0,date('m',$event['recur_enddate']), date('d', $event['recur_enddate']), date('Y', $event['recur_enddate']));
+
+									$sifEvent .= '<NoEndDate>0</NoEndDate>';
+									$sifEvent .= '<PatternEndDate>'. $vcal->_exportDateTime($recurEndDate) .'</PatternEndDate>';
+									$totalDays = ($recurEndDate - $recurStartDate) / 86400;
+									$occurrences = ceil($totalDays / $eventInterval);
+									$sifEvent .= '<Occurrences>'. $occurrences .'</Occurrences>';
+								}
+								break;
+
+							case MCAL_RECUR_WEEKLY:
+								$eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1);
+								$recurStartDate = mktime(0,0,0,date('m',$event['start']), date('d', $event['start']), date('Y', $event['start']));
+
+								$sifEvent .= "<$sifField>1</$sifField>";
+								$sifEvent .= '<RecurrenceType>'. self::olRecursWeekly .'</RecurrenceType>';
+								$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
+								$sifEvent .= '<PatternStartDate>'. $vcal->_exportDateTime($recurStartDate) .'</PatternStartDate>';
+								$sifEvent .= '<DayOfWeekMask>'. $event['recur_data'] .'</DayOfWeekMask>';
+								if($event['recur_enddate'] == 0) {
+									$sifEvent .= '<NoEndDate>1</NoEndDate>';
+								} else {
+									$recurEndDate = mktime(24, 0, 0, date('m',$event['recur_enddate']), date('d', $event['recur_enddate']), date('Y', $event['recur_enddate']));
+
+									$daysPerWeek = substr_count(decbin($event['recur_data']),'1');
+									$sifEvent .= '<NoEndDate>0</NoEndDate>';
+									$sifEvent .= '<PatternEndDate>'. $vcal->_exportDateTime($recurEndDate) .'</PatternEndDate>';
+									$totalWeeks = floor(($recurEndDate - $recurStartDate) / (86400*7));
+									#error_log("AAA: $daysPerWeek $totalWeeks");
+									$occurrences = ($totalWeeks / $eventInterval) * $daysPerWeek;
+									for($i = $recurEndDate; $i > $recurStartDate + ($totalWeeks * 86400*7); $i = $i - 86400) {
+										switch(date('w', $i-1)) {
+											case 0:
+												if($event['recur_data'] & 1) $occurrences++;
+												break;
+											// monday
+											case 1:
+												if($event['recur_data'] & 2) $occurrences++;
+												break;
+											case 2:
+												if($event['recur_data'] & 4) $occurrences++;
+												break;
+											case 3:
+												if($event['recur_data'] & 8) $occurrences++;
+												break;
+											case 4:
+												if($event['recur_data'] & 16) $occurrences++;
+												break;
+											case 5:
+												if($event['recur_data'] & 32) $occurrences++;
+												break;
+											case 6:
+												if($event['recur_data'] & 64) $occurrences++;
+												break;
+										}
+									}
+									$sifEvent .= '<Occurrences>'. $occurrences .'</Occurrences>';
+								}
+								break;
+						}
+						break;
+
+					case 'Sensitivity':
+						$value = (!$value ? '2' : '0');
+						$sifEvent .= "<$sifField>$value</$sifField>";
+						break;
+
+					case 'Folder':
+						# skip currently. This is the folder where Outlook stores the contact.
+						#$sifEvent .= "<$sifField>/</$sifField>";
+						break;
+
+					case 'AllDayEvent':
+					case 'End':
+						// get's handled by Start clause
+						break;
+
+					case 'Start':
+						if($event['end'] - $event['start'] == 86399 && date('Y-m-d', $event['end']) == date('Y-m-d', $event['start'])) {
+							$value = date('Y-m-d', $event['start']);
+							$sifEvent .= "<Start>$value</Start>";
+							$sifEvent .= "<End>$value</End>";
+							$sifEvent .= "<AllDayEvent>1</AllDayEvent>";
+						} else {
+							$value = $vcal->_exportDateTime($event['start']);
+							$sifEvent .= "<Start>$value</Start>";
+							$value = $vcal->_exportDateTime($event['end']);
+							$sifEvent .= "<End>$value</End>";
+							$sifEvent .= "<AllDayEvent>0</AllDayEvent>";
+						}
+						break;
+
+					case 'ReminderMinutesBeforeStart':
+						break;
+
+					case 'ReminderSet':
+						if(count((array)$event['alarm']) > 0) {
+							$sifEvent .= "<$sifField>1</$sifField>";
+							foreach($event['alarm'] as $alarmID => $alarmData)
+							{
+								$sifEvent .= '<ReminderMinutesBeforeStart>'. $alarmData['offset']/60 .'</ReminderMinutesBeforeStart>';
+								// lets take only the first alarm
+								break;
+							}
+						} else {
+							$sifEvent .= "<$sifField>0</$sifField>";
+						}
+						break;
+
+					default:
+						$sifEvent .= "<$sifField>$value</$sifField>";
+						break;
+				}
+			}
+			$sifEvent .= '</appointment>';
+
+			return base64_encode($sifEvent);
+		}
+
+		if($this->xmlrpc)
+		{
+			$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['no_access'],$GLOBALS['xmlrpcstr']['no_access']);
+		}
+		return False;
+	}
+
+}
diff --git a/calendar/inc/class.socal.inc.php b/calendar/inc/class.calendar_so.inc.php
similarity index 98%
rename from calendar/inc/class.socal.inc.php
rename to calendar/inc/class.calendar_so.inc.php
index d0842987de..cea5feb0fa 100644
--- a/calendar/inc/class.socal.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -58,7 +58,7 @@ define('ACCEPTED',3);
  *  BO's functions take and return user-time only (!), they convert internaly everything to servertime, because
  *  SO operates only on server-time
  */
-class socal
+class calendar_so
 {
 	/**
 	 * name of the main calendar table and prefix for all other calendar tables
@@ -82,7 +82,7 @@ class socal
 	/**
 	 * Constructor of the socal class
 	 */
-	function socal()
+	function __construct()
 	{
 		$this->async = $GLOBALS['egw']->asyncservice;
 		$this->db = $GLOBALS['egw']->db;
@@ -1045,8 +1045,19 @@ ORDER BY cal_user_type, cal_usre_id
 		return $this->async->cancel_timer($id);
 	}
 
-	function change_delete_user($old_user,$new_user=false)
+	/**
+	 * Delete account hook
+	 *
+	 * @param array|int $old_user integer old user or array with keys 'account_id' and 'new_owner' as the deleteaccount hook uses it
+	 * @param int $new_user=null
+	 */
+	function deleteaccount($data)
 	{
+		if (is_array($old_user))
+		{
+			$new_user = $old_user['new_owner'];
+			$old_user = $old_user['account_id'];
+		}
 		if (!(int)$new_user)
 		{
 			$this->split_user($old_user,$user_type,$user_id);
diff --git a/calendar/inc/class.uical.inc.php b/calendar/inc/class.calendar_ui.inc.php
similarity index 93%
rename from calendar/inc/class.uical.inc.php
rename to calendar/inc/class.calendar_ui.inc.php
index 3dd9d8c237..0a6f87360d 100644
--- a/calendar/inc/class.uical.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -22,7 +22,7 @@
  *
  * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
  */
-class uical
+class calendar_ui
 {
 	/**
 	 * @var $debug mixed integer level or string function-name
@@ -31,7 +31,7 @@ class uical
 	/**
 	 * instance of the bocal or bocalupdate class
 	 *
-	 * @var bocalupdate
+	 * @var calendar_boupdate
 	 */
 	var $bo;
 	/**
@@ -40,12 +40,6 @@ class uical
 	 * @var jscalendar
 	 */
 	var $jscal;
-	/**
-	 * Reference to global html class
-	 *
-	 * @var html
-	 */
-	var $html;
 	/**
 	 * Reference to global datetime class
 	 *
@@ -129,14 +123,19 @@ class uical
 	/**
 	 * Constructor
 	 *
-	 * @param boolean $use_bocalupdate use bocalupdate as parenent instead of bocal
+	 * @param boolean $use_boupdate 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($use_bocalupdate=false,$set_states=NULL)
+	function __construct($use_boupdate=false,$set_states=NULL)
 	{
-		$bo_class = $use_bocalupdate ? 'bocalupdate' : 'bocal';
-		require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.'.$bo_class.'.inc.php');
-		$this->bo = new $bo_class();
+		if ($use_boupdate)
+		{
+			$this->bo = new calendar_boupdate();
+		}
+		else
+		{
+			$this->bo = new calendar_bo();
+		}
 		$this->jscal = $GLOBALS['egw']->jscalendar;
 		$this->datetime = $GLOBALS['egw']->datetime;
 		$this->accountsel = $GLOBALS['egw']->uiaccountsel;
@@ -299,7 +298,7 @@ class uical
 					}
 				}
 				// for the uiforms class (eg. edit), dont store the (new) owner, as it might change the view
-				if (substr($_GET['menuaction'],0,16) == 'calendar.uiforms')
+				if (substr($_GET['menuaction'],0,16) == 'calendar.calendar_uiforms')
 				{
 					$this->owner = $set_states[$state];
 					continue;
@@ -359,7 +358,7 @@ class uical
 			}
 			$this->view = $states['view'] = $func;
 		}
-		$this->view_menuaction = $this->view == 'listview' ? 'calendar.uilist.listview' : 'calendar.uiviews.'.$this->view;
+		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.'.$this->view;
 
 		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1) session was %2, states now %3',True,$set_states,$states_session,$states);
 		// save the states in the session
@@ -464,7 +463,7 @@ class uical
 	function add_link($content,$date=null,$hour=null,$minute=0)
 	{
 		$vars = array(
-			'menuaction'=>'calendar.uiforms.edit',
+			'menuaction'=>'calendar.calendar_uiforms.edit',
 			'date' => $date ? $date : $this->date,
 		);
 		if (!is_null($hour))
@@ -537,11 +536,11 @@ class uical
 		$views = '<table style="width: 100%;"><tr>'."\n";
 		foreach(array(
 			'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),
-			'list' => array('icon'=>'list','text'=>'Listview','menuaction'=>'calendar.uilist.listview'),
+			'day' => array('icon'=>'today','text'=>'Today','menuaction' => 'calendar.calendar_uiviews.day','date' => $this->bo->date2string($this->bo->now_su)),
+			'week' => array('icon'=>'week','text'=>'Weekview','menuaction' => 'calendar.calendar_uiviews.week'),
+			'month' => array('icon'=>'month','text'=>'Monthview','menuaction' => 'calendar.calendar_uiviews.month'),
+			'planner' => array('icon'=>'planner','text'=>'Group planner','menuaction' => 'calendar.calendar_uiviews.planner','sortby' => $this->sortby),
+			'list' => array('icon'=>'list','text'=>'Listview','menuaction'=>'calendar.calendar_uilist.listview'),
 		) as $view => $data)
 		{
 			$icon = array_shift($data);
@@ -562,49 +561,49 @@ class uical
 		foreach(array(
 			array(
 				'text' => lang('dayview'),
-				'value' => 'menuaction=calendar.uiviews.day',
+				'value' => 'menuaction=calendar.calendar_uiviews.day',
 				'selected' => $this->view == 'day',
 			),
 			array(
 				'text' => lang('four days view'),
-				'value' => 'menuaction=calendar.uiviews.day4',
+				'value' => 'menuaction=calendar.calendar_uiviews.day4',
 				'selected' => $this->view == 'day4',
 			),
 			array(
 				'text' => lang('weekview with weekend'),
-				'value' => 'menuaction=calendar.uiviews.week&days=7',
+				'value' => 'menuaction=calendar.calendar_uiviews.week&days=7',
 				'selected' => $this->view == 'week' && $this->cal_prefs['days_in_weekview'] != 5,
 			),
 			array(
 				'text' => lang('weekview without weekend'),
-				'value' => 'menuaction=calendar.uiviews.week&days=5',
+				'value' => 'menuaction=calendar.calendar_uiviews.week&days=5',
 				'selected' => $this->view == 'week' && $this->cal_prefs['days_in_weekview'] == 5,
 			),
 			array(
 				'text' => lang('Multiple week view'),
-				'value' => 'menuaction=calendar.uiviews.weekN',
+				'value' => 'menuaction=calendar.calendar_uiviews.weekN',
 				'selected' => $this->view == 'weekN',
 			),
 			array(
 				'text' => lang('monthview'),
-				'value' => 'menuaction=calendar.uiviews.month',
+				'value' => 'menuaction=calendar.calendar_uiviews.month',
 				'selected' => $this->view == 'month',
 			),
 			array(
 				'text' => lang('planner by category'),
-				'value' => 'menuaction=calendar.uiviews.planner&sortby=category'.
+				'value' => 'menuaction=calendar.calendar_uiviews.planner&sortby=category'.
 					($planner_days_for_view !== false ? '&planner_days='.$planner_days_for_view : ''),
 				'selected' => $this->view == 'planner' && $this->sortby != 'user',
 			),
 			array(
 				'text' => lang('planner by user'),
-				'value' => 'menuaction=calendar.uiviews.planner&sortby=user'.
+				'value' => 'menuaction=calendar.calendar_uiviews.planner&sortby=user'.
 					($planner_days_for_view !== false ? '&planner_days='.$planner_days_for_view : ''),
 				'selected' => $this->view == 'planner' && $this->sortby == 'user',
 			),
 			array(
 				'text' => lang('listview'),
-				'value' => 'menuaction=calendar.uilist.listview',
+				'value' => 'menuaction=calendar.calendar_uilist.listview',
 				'selected' => $this->view == 'listview',
 			),
 		) as $data)
@@ -620,16 +619,16 @@ class uical
 			'text' => 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').'">',
-				'','/index.php',array('menuaction'=>'calendar.uilist.listview')),
+				'','/index.php',array('menuaction'=>'calendar.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.calendar_uiviews.day',
+			'week'  => 'calendar.calendar_uiviews.week',
+			'month' => 'calendar.calendar_uiviews.month') as $view => $menuaction)
 		{
 			if ($this->view == 'planner' || $this->view == 'listview')
 			{
@@ -715,7 +714,7 @@ function load_cal(url,id) {
 		}
 		// Import & Export
 		$file[] = array(
-			'text' => lang('Export').': '.html::a_href(lang('iCal'),'calendar.uiforms.export',$this->first ? array(
+			'text' => lang('Export').': '.html::a_href(lang('iCal'),'calendar.calendar_uiforms.export',$this->first ? array(
 				'start' => $this->bo->date2string($this->first),
 				'end'   => $this->bo->date2string($this->last),
 			) : false),
@@ -723,15 +722,15 @@ function load_cal(url,id) {
 			'link' => False,
 		);
 		$file[] = array(
-			'text' => lang('Import').': '.html::a_href(lang('iCal'),'calendar.uiforms.import').
+			'text' => lang('Import').': '.html::a_href(lang('iCal'),'calendar.calendar_uiforms.import').
 				' &amp; '.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',
+			'calendar.calendar_uiviews.day'	=> 'calendar.pdfcal.day',
+			'calendar.calendar_uiviews.week'	=> 'calendar.pdfcal.week',
 		);
 		if (isset($print_functions[$_GET['menuaction']]))
 		{
diff --git a/calendar/inc/class.uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
similarity index 98%
rename from calendar/inc/class.uiforms.inc.php
rename to calendar/inc/class.calendar_uiforms.inc.php
index 6e135f5aba..8fd0eae99e 100644
--- a/calendar/inc/class.uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -5,13 +5,11 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2004-7 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2004-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
-
 /**
  * calendar UserInterface forms: view and edit events, freetime search
  *
@@ -24,7 +22,7 @@ include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
  *
  * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
  */
-class uiforms extends uical
+class calendar_uiforms extends calendar_ui
 {
 	var $public_functions = array(
 		'freetimesearch'  => True,
@@ -32,12 +30,6 @@ class uiforms extends uical
 		'export' => true,
 		'import' => true,
 	);
-	/**
-	 * Reference to link-class of bocal
-	 *
-	 * @var bolink
-	 */
-	var $link;
 
 	/**
 	 * Standard durations used in edit and freetime search
@@ -63,11 +55,9 @@ class uiforms extends uical
 	/**
 	 * Constructor
 	 */
-	function uiforms()
+	function __construct()
 	{
-		$this->uical(true);	// call the parent's constructor
-
-		$this->link =& $this->bo->link;
+		parent::__construct(true);	// call the parent's constructor
 
 		for ($n=15; $n <= 8*60; $n+=($n < 60 ? 15 : ($n < 240 ? 30 : 60)))
 		{
@@ -436,7 +426,7 @@ class uiforms extends uical
 				$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
 							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
 								htmlspecialchars($GLOBALS['egw']->link('/index.php',array(
-								'menuaction' => 'calendar.uiforms.edit',
+								'menuaction' => 'calendar.calendar_uiforms.edit',
 									'cal_id'    => $content['id'],
 									'referer'    => $referer,
 									))).'">','</a>');
@@ -745,7 +735,7 @@ class uiforms extends uical
 			elseif(egw_vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',false,false))
 			{
 				// install ajax handler to unlock the entry again, if the window get's closed by the user
-				$GLOBALS['egw']->js->set_onunload("xajax_doXMLHTTP('calendar.uiforms.ajax_unlock',$event[id],'$preserv[lock_token]');");
+				$GLOBALS['egw']->js->set_onunload("xajax_doXMLHTTP('calendar.calendar_uiforms.ajax_unlock',$event[id],'$preserv[lock_token]');");
 			}
 			else
 			{
@@ -952,7 +942,7 @@ class uiforms extends uical
 		}
 		else
 		{
-			$etpl->exec('calendar.uiforms.process_edit',$content,$sel_options,$readonlys,$preserv,$preserv['no_popup'] ? 0 : 2);
+			$etpl->exec('calendar.calendar_uiforms.process_edit',$content,$sel_options,$readonlys,$preserv,$preserv['no_popup'] ? 0 : 2);
 		}
 	}
 
@@ -1007,7 +997,7 @@ class uiforms extends uical
 		);
 		$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);
+		$etpl->exec('calendar.calendar_uiforms.process_edit',$content,false,false,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
 	}
 
 	/**
@@ -1169,7 +1159,7 @@ class uiforms extends uical
 		// 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('table','end_hide','visibility','".($content['duration'] && isset($sel_options['duration'][$content['duration']]) ? 'hidden' : 'visible')."');");
 
-		$etpl->exec('calendar.uiforms.freetimesearch',$content,$sel_options,'',array(
+		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,'',array(
 				'participants'	=> $content['participants'],
 				'cal_id'		=> $content['cal_id'],
 				'recur_type'	=> $content['recur_type'],
@@ -1389,7 +1379,7 @@ class uiforms extends uical
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
 		$etpl =& CreateObject('etemplate.etemplate','calendar.export');
 
-		$etpl->exec('calendar.uiforms.export',$content);
+		$etpl->exec('calendar.calendar_uiforms.export',$content);
 	}
 
 	/**
@@ -1423,6 +1413,6 @@ class uiforms extends uical
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Import');
 		$etpl =& CreateObject('etemplate.etemplate','calendar.import');
 
-		$etpl->exec('calendar.uiforms.import',$content);
+		$etpl->exec('calendar.calendar_uiforms.import',$content);
 	}
 }
diff --git a/calendar/inc/class.uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
similarity index 95%
rename from calendar/inc/class.uilist.inc.php
rename to calendar/inc/class.calendar_uilist.inc.php
index 9b43b241e6..061aa9def8 100644
--- a/calendar/inc/class.uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -5,13 +5,11 @@
  * @link http://www.egroupware.org
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2005-7 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2005-8 by RalfBecker-At-outdoor-training.de
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
-
 /**
  * Class to generate the calendar listview and the search
  *
@@ -24,20 +22,20 @@ include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
  *
  * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
  */
-class uilist extends uical
+class calendar_uilist extends calendar_ui
 {
 	var $public_functions = array(
 		'listview'  => True,
 	);
 	/**
 	 * integer level or string function- or widget-name
-	 * 
+	 *
 	 * @var mixed
 	 */
 	var $debug=false;
 	/**
 	 * Filternames
-	 * 
+	 *
 	 * @var array
 	 */
 	var $date_filters = array(
@@ -52,22 +50,22 @@ class uilist extends uical
 	 *
 	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function uilist($set_states=null)
+	function __construct($set_states=null)
 	{
-		$this->uical(true,$set_states);	// call the parent's constructor
+		parent::__construct(true,$set_states);	// call the parent's constructor
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Listview').
 			// for a single owner we add it's name to the app-header
 			(count(explode(',',$this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
-		
+
 		foreach($this->date_filters as $name => $label)
 		{
 			$this->date_filters[$name] = lang($label);
 		}
-		
+
 		$this->check_owners_access();
 	}
-	
+
 	/**
 	 * Show the calendar on the home page
 	 *
@@ -82,13 +80,13 @@ class uilist extends uical
 			'filter'     => 'all',
 			'owner'      => $this->user,
 			'multiple'   => 0,
-			'view'       => $this->bo->cal_prefs['defaultcalendar'],			
+			'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
 	 */
@@ -112,12 +110,12 @@ class uilist extends uical
 		if (is_array($content) && $content['deleteall'])
 		{
 			//_debug_array($content);
-			
+
 			foreach($content['nm']['rows']['checked'] as $num => $id)
 			{
 				if ($this->bo->delete($id))
 				{
-					$msg .= lang('Event deleted');	
+					$msg .= lang('Event deleted');
 				}
 			}
 		}
@@ -128,7 +126,7 @@ class uilist extends uical
 		if (!is_array($content['nm']))
 		{
 			$content['nm'] = array(
-				'get_rows'       =>	'calendar.uilist.get_rows',
+				'get_rows'       =>	'calendar.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
@@ -145,11 +143,11 @@ class uilist extends uical
 		{
 			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
 		}
-		return $etpl->exec('calendar.uilist.listview',$content,array(
+		return $etpl->exec('calendar.calendar_uilist.listview',$content,array(
 			'filter' => &$this->date_filters,
 		),$readonlys,'',$home ? -1 : 0);
 	}
-	
+
 	/**
 	 * set filter for search, so that everything is shown
 	 */
@@ -174,7 +172,7 @@ class uilist extends uical
 	/**
 	 * query calendar for nextmatch in the listview
 	 *
-	 * @internal 
+	 * @internal
 	 * @param array &$params parameters
 	 * @param array &$rows returned rows/events
 	 * @param array &$readonlys eg. to disable buttons based on acl
@@ -214,7 +212,7 @@ class uilist extends uical
 			$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,
@@ -311,7 +309,7 @@ class uilist extends uical
             $rows['format'] = '16';
 			$dv=1;
         }
-		if ($wv&&$dv) 
+		if ($wv&&$dv)
 		{
 			$rows['format'] = '64';
 		}
diff --git a/calendar/inc/class.uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
similarity index 97%
rename from calendar/inc/class.uiviews.inc.php
rename to calendar/inc/class.calendar_uiviews.inc.php
index 44386630dd..bc242a302b 100644
--- a/calendar/inc/class.uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -10,12 +10,9 @@
  * @version $Id$
  */
 
-include_once(EGW_INCLUDE_ROOT . '/calendar/inc/class.uical.inc.php');
-require_once(EGW_INCLUDE_ROOT . '/phpgwapi/inc/class.dragdrop.inc.php');
-
 /**
  * Class to generate the calendar views and the necesary widgets
- * 
+ *
  * The listview is in a separate class uilist!
  *
  * The new UI, BO and SO classes have a strikt definition, in which time-zone they operate:
@@ -27,7 +24,7 @@ require_once(EGW_INCLUDE_ROOT . '/phpgwapi/inc/class.dragdrop.inc.php');
  *
  * All permanent debug messages of the calendar-code should done via the debug-message method of the bocal class !!!
  */
-class uiviews extends uical
+class calendar_uiviews extends calendar_ui
 {
 	var $public_functions = array(
 		'day'   => True,
@@ -36,32 +33,33 @@ class uiviews extends uical
 		'weekN' => True,
 		'month' => True,
 		'planner' => True,
+		'index' => True,
 	);
 
 	/**
 	 * integer level or string function- or widget-name
-	 * 
+	 *
 	 * @var mixed
 	 */
 	var $debug=false;
 
 	/**
 	 * minimum width for an event
-	 * 
+	 *
 	 * @var int
 	 */
 	var $eventCol_min_width = 80;
-	
+
 	/**
 	 * extra rows above and below the workday
-	 * 
+	 *
 	 * @var int
 	 */
 	var $extraRows = 2;
 
 	/**
 	 * extra rows original (save original value even if it gets changed in the class)
-	 * 
+	 *
 	 * @var int
 	 */
 	var $extraRowsOriginal;
@@ -70,46 +68,46 @@ class uiviews extends uical
 
 	/**
 	 * how many rows per day get displayed, gets set be the timeGridWidget
-	 * 
+	 *
 	 * @var int
 	 */
 	var $rowsToDisplay;
 
 	/**
 	 * height in percent of one row, gets set be the timeGridWidget
-	 * 
+	 *
 	 * @var int
 	 */
 	var $rowHeight;
-	
+
 	/**
 	 * standard params for calling bocal::search for all views, set by the constructor
-	 * 
+	 *
 	 * @var array
 	 */
 	var $search_params;
-	
+
 	/**
 	 * should we use a time grid, can be set for week- and month-view to false by the cal_pref no_time_grid
-	 * 
+	 *
 	 * @var boolean
 	 */
 	var $use_time_grid=true;
-	
+
 	/**
 	 * Dragdrop Object
 	 *
 	 * @var dragdrop;
 	 */
 	var $dragdrop;
- 
+
 	/**
 	 * Can we display the whole day in a timeGrid of the size of the workday and just scroll to workday start
 	 *
 	 * @var boolean
 	 */
 	var $scroll_to_wdstart=false;
-	
+
 	/**
 	 * counter for the current whole day event of a single day
 	 *
@@ -122,9 +120,9 @@ class uiviews extends uical
 	 *
 	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function uiviews($set_states=null)
+	function __construct($set_states=null)
 	{
-		$this->uical(false,$set_states);	// call the parent's constructor
+		parent::__construct(false,$set_states);	// call the parent's constructor
 		$this->extraRowsOriginal = $this->extraRows; //save original extraRows value
 
 		$GLOBALS['egw_info']['flags']['nonavbar'] = False;
@@ -149,7 +147,7 @@ class uiviews extends uical
 			'daywise' => True,
 		);
 		$this->holidays = $this->bo->read_holidays($this->year);
-		
+
 		$this->check_owners_access();
 
 		if($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop'])
@@ -160,7 +158,7 @@ class uiviews extends uical
 			if(!$this->dragdrop->validateBrowser()) { $this->dragdrop = false; }
 		}
 	}
-	
+
 	/**
 	 * Show the last view or the default one, if no last
 	 */
@@ -175,10 +173,10 @@ class uiviews extends uical
 		}
 		// 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
 	 *
@@ -191,12 +189,12 @@ class uiviews extends uical
 			'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'] ? 
+			'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'],			
+			'view'       => $this->bo->cal_prefs['defaultcalendar'],
 		));
-		
+
 		if (($error = $this->check_owners_access()))
 		{
 			return $error;
@@ -218,12 +216,12 @@ class uiviews extends uical
 			default:
 			case 'week':
 				return $group_warning.$this->week(0,true);
-				
+
 			case 'day':
 				return $group_warning.$this->day(true);
 		}
 	}
-	
+
 	/**
 	 * Displays the planner view
 	 *
@@ -265,7 +263,7 @@ class uiviews extends uical
 			$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;
@@ -280,12 +278,12 @@ class uiviews extends uical
 		if (!$home)
 		{
 			$this->do_header();
-		
+
 			echo $content;
 		}
 		return $content;
 	}
-	
+
 	/**
 	 * Displays a multiple week-view
 	 *
@@ -339,7 +337,7 @@ class uiviews extends uical
 				$week[$day_ymd] = array_shift($days);
 			}
 			$week_view = array(
-				'menuaction' => 'calendar.uiviews.week',
+				'menuaction' => 'calendar.calendar_uiviews.week',
 				'date' => $this->bo->date2string($week_start),
 			);
 			$title = lang('Wk').' '.adodb_date('W',$week_start);
@@ -350,7 +348,7 @@ class uiviews extends uical
 		if (!$home)
 		{
 			$this->do_header();
-		
+
 			echo $content;
 		}
 
@@ -378,17 +376,17 @@ class uiviews extends uical
 		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['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);
 	}
-	
+
 	/**
 	 * Four days view, everythings done by the week-view code ...
 	 *
@@ -445,7 +443,7 @@ class uiviews extends uical
 						break;
 				}
 			}
-			$this->last = strtotime("+$days days",$this->first) - 1; 
+			$this->last = strtotime("+$days days",$this->first) - 1;
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
 		}
 
@@ -473,7 +471,7 @@ class uiviews extends uical
 
 		$users = $this->search_params['users'];
 		if (!is_array($users)) $users = array($users);
-		
+
 		if (count($users) == 1 || count($users) > 5)	// for more then 3 users, show all in one row
 		{
 			$content =& $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)),$this->cal_prefs['interval']);
@@ -488,11 +486,11 @@ class uiviews extends uical
 				$content .= $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)),
 					count($users) * $this->cal_prefs['interval'],400 / count($users),'','',$uid);
 			}
-		}		
+		}
 		if (!$home)
 		{
 			$this->do_header();
-			
+
 			echo $content;
 		}
 
@@ -513,20 +511,20 @@ class uiviews extends uical
 
 		$this->last = $this->first = $this->bo->date2ts((string)$this->date);
 		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$this->bo->long_date($this->first,0,false,true);
-		
+
 		$this->use_time_grid = true;    // day-view always uses a time-grid, independent what's set in the prefs!
-		
+
 		$this->search_params['end'] = $this->last = $this->first+DAY_s-1;
-		
+
 		if (!$home)
 		{
 			$this->do_header();
-	
+
 			$users = $this->search_params['users'];
 			if (!is_array($users)) $users = array($users);
 
 			// for more then 5 users, show all in one row
-			if (count($users) == 1 || count($users) > 5) 
+			if (count($users) == 1 || count($users) > 5)
 			{
 				$dayEvents =& $this->bo->search($this->search_params);
 				$owner = 0;
@@ -577,7 +575,7 @@ class uiviews extends uical
 		else
 		{
 			$content = $this->timeGridWidget($this->bo->search($this->search_params),$this->cal_prefs['interval'],300);
-			
+
 			// make wz_dragdrop elements work
 			if(is_object($this->dragdrop)) { $this->dragdrop->setJSCode(); }
 
@@ -658,7 +656,7 @@ class uiviews extends uical
 		}
 		return $todo_label ? '' : false;
 	}
-		
+
 	/**
 	 * Calculates the vertical position based on the time
 	 *
@@ -735,10 +733,10 @@ class uiviews extends uical
 		// determine if the browser supports scrollIntoView: IE4+, firefox1.0+ and safari2.0+ does
 		// then show all hours in a div of the size of the workday and scroll to the workday start
 		// still disabled, as things need to be re-aranged first, to that the column headers are not scrolled
-		$this->scroll_to_wdstart = false;/*$this->use_time_grid && (html::$user_agent == 'msie' || 
+		$this->scroll_to_wdstart = false;/*$this->use_time_grid && (html::$user_agent == 'msie' ||
 			html::$user_agent == 'mozilla' && html::ua_version >= 5.0 ||
 			html::$user_agent == 'safari' && html::ua_version >= 2.0);*/
-	
+
 		if ($this->scroll_to_wdstart)
 		{
 			$this->extraRows = 0;	// no extra rows necessary
@@ -752,7 +750,7 @@ class uiviews extends uical
 		$totalDisplayMinutes	= $this->wd_end - $this->wd_start;
 		$this->rowsToDisplay	= ($totalDisplayMinutes/$granularity_m)+2+2*$this->extraRows;
 		$this->rowHeight		= round(100/$this->rowsToDisplay,1);
-		
+
 		// ensure a minimum height of each row
 		if ($height < ($this->rowsToDisplay+1) * 12)
 		{
@@ -767,7 +765,7 @@ class uiviews extends uical
 		{
 			$off = false;	// Off-row means a different bgcolor
 			$add_links = count($daysEvents) == 1;
-	
+
 			// the hour rows
 			for($t = $this->scroll_to_wdstart ? 0 : $this->wd_start,$i = 1+$this->extraRows;
 				$t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24*60;
@@ -814,12 +812,12 @@ class uiviews extends uical
 			{
 				// 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!!! Without the second div you can't use 
+				// To make IE6 happy!!! Without the second div you can't use
 				// style="left: 50px; right: 0px;"
 				//$html .= '<div style="width=100%; height: 100%;">'."\n";
 
 				// Ralf Becker 2006-06-19
-				// Lars original typo "width=100%; height: 100%;" is important ;-) 
+				// Lars original typo "width=100%; height: 100%;" is important ;-)
 				// means you width: 100% does NOT work, you need no width!
 				$html .= '<div style="height: 100%;">'."\n";
 			}
@@ -845,7 +843,7 @@ class uiviews extends uical
 			$html .= $indent."\t</div>\n";	// calDayCols
 		}
 		$html .= $indent."</div>\n";	// calTimeGrid
-		
+
 		if ($this->scroll_to_wdstart)
 		{
 			$html .= "<script>\n\tdocument.getElementById('$id').scrollIntoView();\n";
@@ -878,7 +876,7 @@ class uiviews extends uical
 		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);
 
 		$day_start = $this->bo->date2ts((string)$day_ymd);
-		
+
 		// if daylight saving is switched on or off, correct $day_start
 		// gives correct times after 2am, times between 0am and 2am are wrong
 		if(($daylight_diff = $day_start + 12*HOUR_s - ($this->bo->date2ts($day_ymd."T120000"))))
@@ -921,9 +919,9 @@ class uiviews extends uical
 		$ts = $this->bo->date2ts((string)$day_ymd);
 		$title = !is_bool($short_title) ? $short_title :
 			($short_title ? lang(adodb_date('l',$ts)).' '.adodb_date('d.',$ts) : $this->bo->long_date($ts,0,false,true));
-		
+
 		$day_view = array(
-			'menuaction' => 'calendar.uiviews.day',
+			'menuaction' => 'calendar.calendar_uiviews.day',
 			'date' => $day_ymd,
 		);
 		$this->_day_class_holiday($day_ymd,$class,$holidays);
@@ -966,7 +964,7 @@ class uiviews extends uical
 				$t += $this->granularity_m,++$i)
 			{
 				$linkData = array(
-					'menuaction'	=>'calendar.uiforms.edit',
+					'menuaction'	=>'calendar.calendar_uiforms.edit',
 					'date'		=> $day_ymd,
 					'hour'		=> sprintf("%02d",floor($t / 60)),
 					'minute'	=> sprintf("%02d",floor($t % 60)),
@@ -975,9 +973,9 @@ class uiviews extends uical
 
 				$droppableDateTime = $linkData['date'] . "T" . $linkData['hour'] . $linkData['minute'];
 				$droppableID='drop_'.$droppableDateTime.'_O'.$owner;
-				
+
 				$html .= $indent."\t".'<div id="' . $droppableID . '" style="height:'. $this->rowHeight .'%; top: '. $i*$this->rowHeight .
-					'%;" class="calAddEvent" onclick="'.$this->popup($GLOBALS['egw']->link('/index.php',$linkData)).';return false;"></div>'."\n";				
+					'%;" class="calAddEvent" onclick="'.$this->popup($GLOBALS['egw']->link('/index.php',$linkData)).';return false;"></div>'."\n";
 
 				if(is_object($this->dragdrop) && $dropPermission)
 				{
@@ -1002,7 +1000,7 @@ class uiviews extends uical
 
 		return $html;
 	}
-	
+
 	/**
 	 * get the CSS class and holidays for a given day
 	 *
@@ -1040,7 +1038,7 @@ class uiviews extends uical
 			else
 			{
 				$day = (int) date('w',$this->bo->date2ts((string) $day_ymd));
-	
+
 				if ($only_weekend)
 				{
 					$class = $day == 0 || $day == 6 ? 'th' : 'row_off';
@@ -1091,7 +1089,7 @@ class uiviews extends uical
 	 * @param int $owner owner of the calendar the event is in
 	 * @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 
+	 * @return string/array
 	 */
 	function eventWidget($event,$width,$indent,$owner,$return_array=false,$block='event_widget')
 	{
@@ -1103,7 +1101,7 @@ class uiviews extends uical
 		if (!$tpl)
 		{
 			$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');
@@ -1142,7 +1140,7 @@ class uiviews extends uical
 		// the body-colors (gradient) are calculated from the headercolor, which depends on the cat of an event
 		$bodybgcolor1 = $this->brighter($headerbgcolor,$headerbgcolor == '#808080' ? 100 : 170);
 		$bodybgcolor2 = $this->brighter($headerbgcolor,220);
-		
+
 		// seperate each participant types
 		$part_array = array();
 		foreach($this->bo->participants($event) as $part_key => $participant)
@@ -1164,7 +1162,7 @@ class uiviews extends uical
 		$small = $this->view != 'day' || $width < 50;
 		// $small = $width <= $small_trigger_width
 
-		$small_height = $this->use_time_grid && ( $event['end_m']-$event['start_m'] < 2*$this->granularity_m || 
+		$small_height = $this->use_time_grid && ( $event['end_m']-$event['start_m'] < 2*$this->granularity_m ||
 			$event['end_m'] <= $this->wd_start || $event['start_m'] >= $this->wd_end);
 
 		$tpl->set_var(array(
@@ -1222,11 +1220,11 @@ class uiviews extends uical
 		$tpl->set_var('tooltip',html::tooltip($tooltip,False,array('BorderWidth'=>0,'Padding'=>0)));
 		$html = $tpl->fp('out',$block);
 
-		$view_link = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
+		$view_link = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
 
-		if ($event['recur_type']!= MCAL_RECUR_NONE) 
+		if ($event['recur_type']!= MCAL_RECUR_NONE)
 		{
-			$view_link_confirm_abort = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start']),'exception'=>1));
+			$view_link_confirm_abort = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start']),'exception'=>1));
 			$view_link_confirm_text=lang('do you want to edit serialevent als exception? - Ok = Edit Exception, Abort = Edit Serial');
 			$popup = $is_private ? '' : ' onclick="'.$this->popup($view_link_confirm_abort,null,750,410,$view_link,$view_link_confirm_text).'; return false;"';
 
@@ -1237,8 +1235,8 @@ class uiviews extends uical
 		}
 		//_debug_array($event);
 		//echo $event['id']."?<br>";
-		
-		
+
+
 		if ($return_array)
 		{
 			return array(
@@ -1354,8 +1352,8 @@ 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
 	 *
@@ -1371,13 +1369,13 @@ class uiviews extends uical
 	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
@@ -1406,7 +1404,7 @@ class uiviews extends uical
 		}
 		$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
@@ -1451,10 +1449,10 @@ class uiviews extends uical
 			$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
 	 *
@@ -1488,13 +1486,13 @@ class uiviews extends uical
 		}
 		asort($users);
 		asort($resources);
-		
+
 		return $users+$resources;
 	}
-	
+
 	/**
 	 * 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
@@ -1504,7 +1502,7 @@ class uiviews extends uical
 	function _get_planner_cats($cats,&$sort2label)
 	{
 		static $cat2sort;
-		
+
 		if (!is_array($cat2sort))
 		{
 			$cat2sort = array();
@@ -1518,7 +1516,7 @@ class uiviews extends uical
 				elseif(isset($cat2sort[$data['parent']]))	// parent is already in the array => add us with same target
 				{
 					$cat2sort[$data['id']] = $cat2sort[$data['parent']];
-				} 
+				}
 			}
 		}
 		$ret = array();
@@ -1627,7 +1625,7 @@ class uiviews extends uical
 
 		return $content;
 	}
-	
+
 	/**
 	 * Creates a week scale for the planner
 	 *
@@ -1647,7 +1645,7 @@ class uiviews extends uical
 			if ($days > 7)
 			{
 				$title = html::a_href($title,array(
-					'menuaction' => 'calendar.uiviews.planner',
+					'menuaction' => 'calendar.calendar_uiviews.planner',
 					'planner_days' => 7,
 					'date'       => date('Ymd',$t),
 				),false,' title="'.html::htmlspecialchars(lang('Weekview')).'"');
@@ -1672,7 +1670,7 @@ class uiviews extends uical
 
 		return $content;
 	}
-	
+
 	/**
 	 * Creates day scale for the planner
 	 *
@@ -1700,12 +1698,12 @@ class uiviews extends uical
 			}
 			else
 			{
-				$title = substr(lang(date('D',$t)),0,2).'<br />'.date('j',$t);	
+				$title = substr(lang(date('D',$t)),0,2).'<br />'.date('j',$t);
 			}
 			if ($days > 1)
 			{
 				$title = html::a_href($title,array(
-					'menuaction'   => 'calendar.uiviews.planner',
+					'menuaction'   => 'calendar.calendar_uiviews.planner',
 					'planner_days' => 1,
 					'date'         => date('Ymd',$t),
 				),false,strpos($class,'calHoliday') !== false || strpos($class,'calBirthday') !== false ? '' : ' title="'.html::htmlspecialchars(lang('Dayview')).'"');
@@ -1734,7 +1732,7 @@ class uiviews extends uical
 
 		return $content;
 	}
-	
+
 	/**
 	 * Creates hour scale for the planner
 	 *
@@ -1761,7 +1759,7 @@ class uiviews extends uical
 			$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)
 		{
@@ -1774,7 +1772,7 @@ class uiviews extends uical
 
 		return $content;
 	}
-	
+
 	/**
 	 * Creates a row for one user or category, with a header (user or category name) and (multiple) rows with non-overlapping events
 	 *
@@ -1794,7 +1792,7 @@ class uiviews extends uical
 
 		// 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();
@@ -1814,7 +1812,7 @@ class uiviews extends uical
 		$content .= $indent."\t</div>\n";	// end of the eventRows
 
 		$content .= $indent."</div>\n";		// end of the plannerRowWidget
-		
+
 		return $content;
 	}
 
@@ -1832,16 +1830,16 @@ class uiviews extends uical
 	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
 	 *
@@ -1857,7 +1855,7 @@ class uiviews extends uical
 	{
 		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);
@@ -1867,7 +1865,7 @@ class uiviews extends uical
 			$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)
 			{
@@ -1886,7 +1884,7 @@ class uiviews extends uical
 			}
 		}
 		$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;
 	}
@@ -1913,7 +1911,7 @@ class uiviews extends uical
 		$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'].' '.
 			html::tooltip($data['tooltip'],False,array('BorderWidth'=>0,'Padding'=>0)).'>'."\n".$data['html'].$indent."</div>\n";
@@ -1952,7 +1950,7 @@ class uiviews extends uical
 			// check after every day if we have to increase $this->extraRows
 			if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows) { $this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd); }
 			}
-				
+
 		return $dayEvents;
  	}
 
diff --git a/calendar/inc/class.sifcalendar.inc.php b/calendar/inc/class.sifcalendar.inc.php
deleted file mode 100644
index 0a5a8b3617..0000000000
--- a/calendar/inc/class.sifcalendar.inc.php
+++ /dev/null
@@ -1,502 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - SIF Parser                                                  *
-	* http://www.egroupware.org                                                *
-	* Written by Lars Kneschke <l.kneschke@metaways.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; 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';
-
-	class sifcalendar extends bocalupdate
-	{
-		var $sifMapping = array(
-			'Start'				=> 'start',
-			'End'				=> 'end',
-			'AllDayEvent'			=> 'alldayevent',
-			'BillingInformation'		=> '',
-			'Body'				=> 'description',
-			'BusyStatus'			=> '',
-			'Categories'			=> 'category',
-			'Companies'			=> '',
-			'Importance'			=> 'priority',
-			'IsRecurring'			=> 'isrecurring',
-			'Location'			=> 'location',
-			'MeetingStatus'			=> '',
-			'Mileage'			=> '',
-			'ReminderMinutesBeforeStart'	=> 'reminderstart',
-			'ReminderSet'			=> 'reminderset',
-			'ReplyTime'			=> '',
-			'Sensitivity'			=> 'public',
-			'Subject'			=> 'title',
-			'RecurrenceType'		=> 'recur_type',
-			'Interval'			=> 'recur_interval',
-			'MonthOfYear'			=> '',
-			'DayOfMonth'			=> '',
-			'DayOfWeekMask'			=> 'recur_weekmask',
-			'Instance'			=> '',
-			'PatternStartDate'		=> '',
-			'NoEndDate'			=> 'recur_noenddate',
-			'PatternEndDate'		=> 'recur_enddate',
-			'Occurrences'			=> '',
-		);
-		
-		// the calendar event array
-		var $event;
-		
-		// constants for recurence type
-		const olRecursDaily	= 0;
-		const olRecursWeekly	= 1;
-		const olRecursMonthly	= 2;
-		const olRecursMonthNth	= 3;
-		const olRecursYearly	= 5;
-		const olRecursYearNth	= 6;
-		
-		// constants for weekdays
-		const olSunday = 1;
-		const olMonday = 2;
-		const olTuesday = 4;
-		const olWednesday = 8;
-		const olThursday = 16;
-		const olFriday = 32;
-		const olSaturday = 64;
-
-		function startElement($_parser, $_tag, $_attributes) {
-		}
-
-		function endElement($_parser, $_tag) {
-			//error_log('endElem: ' . $_tag .' => '. trim($this->sifData));
-			if(!empty($this->sifMapping[$_tag])) {
-				$this->event[$this->sifMapping[$_tag]] = trim($this->sifData);
-			}
-			unset($this->sifData);
-		}
-		
-		function characterData($_parser, $_data) {
-			$this->sifData .= $_data;
-		}
-		
-		function siftoegw($_sifdata) {
-			$vcal		= &new Horde_iCalendar;
-			$finalEvent	= array();
-			$sysCharSet	= $GLOBALS['egw']->translation->charset();
-			$sifData	= base64_decode($_sifdata);
-			#error_log($sifData);
-
-			$tmpfname = tempnam('/tmp/sync/contents','sife_');
-
-			$handle = fopen($tmpfname, "w");
-			fwrite($handle, $sifData);
-			fclose($handle);
-
-			$this->xml_parser = xml_parser_create('UTF-8');
-			xml_set_object($this->xml_parser, $this);
-			xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, false);
-			xml_set_element_handler($this->xml_parser, "startElement", "endElement");
-			xml_set_character_data_handler($this->xml_parser, "characterData");
-			$this->strXmlData = xml_parse($this->xml_parser, $sifData);
-			if(!$this->strXmlData) {
-				error_log(sprintf("XML error: %s at line %d",
-					xml_error_string(xml_get_error_code($this->xml_parser)),
-					xml_get_current_line_number($this->xml_parser)));
-				return false;
-			}
-			#error_log(print_r($this->event, true));
-
-			foreach($this->event as $key => $value) {
-				$value = $GLOBALS['egw']->translation->convert($value, 'utf-8', $sysCharSet);
-				#error_log("$key => $value");
-				switch($key) {
-					case 'alldayevent':
-						if($value == 1) {
-							$startParts = explode('-',$this->event['start']);
-							$finalEvent['start'] = mktime(0, 0, 0, $startParts[1], $startParts[2], $startParts[0]);
-							$endParts = explode('-',$this->event['end']);
-							$finalEvent['end'] = mktime(23, 59, 59, $endParts[1], $endParts[2], $endParts[0]);
-						}
-						break;
-						
-					case 'public':
-						$finalEvent[$key] = ((int)$value > 0) ? 0 : 1;
-						break;
-						
-					case 'category':
-						if(!empty($value)) {
-							$finalEvent[$key] = implode(',',$this->find_or_add_categories(explode(';', $value)));
-						}
-						break;
-						
-					case 'end':
-					case 'start':
-						if($this->event['alldayevent'] < 1) {
-							$finalEvent[$key] = $vcal->_parseDateTime($value);
-							error_log("event ".$key." val=".$value.", parsed=".$finalEvent[$key]);
-						}
-						break;
-					
-					case 'isrecurring':
-						if($value == 1) {
-							$finalEvent['recur_interval'] = $this->event['recur_interval'];
-							if($this->event['recur_noenddate'] == 0) {
-								$finalEvent['recur_enddate'] = $vcal->_parseDateTime($this->event['recur_enddate']);
-							}
-							switch($this->event['recur_type']) {
-								case self::olRecursDaily:
-									$finalEvent['recur_type']	= MCAL_RECUR_DAILY;
-									break;
-								
-								case self::olRecursWeekly:
-									$finalEvent['recur_type']	= MCAL_RECUR_WEEKLY;
-									$finalEvent['recur_data']	= $this->event['recur_weekmask'];
-									break;
-								
-								case self::olRecursMonthly:
-									$finalEvent['recur_type']	= MCAL_RECUR_MONTHLY_MDAY;
-									break;
-								
-								case self::olRecursMonthNth:
-									$finalEvent['recur_type']	= MCAL_RECUR_MONTHLY_WDAY;
-									break;
-								
-								case self::olRecursYearly:
-									$finalEvent['recur_type']	= MCAL_RECUR_YEARLY;
-									$finalEvent['recur_interval'] = 1;
-									break;
-							}
-						}
-						break;
-					
-					case 'priority':
-						$finalEvent[$key] = $value+1;
-						break;
-						
-					case 'reminderset':
-						if($value == 1) {
-							$finalEvent['alarm'] = $this->event['reminderstart'];
-						}
-						break;
-						
-					case 'recur_type':
-					case 'recur_enddate':
-					case 'recur_interval':
-					case 'recur_weekmask':
-					case 'reminderstart':
-						// do nothing, get's handled in isrecuring clause
-						break;
-					
-					default:
-						$finalEvent[$key] = $value;
-						break;
-				}
-			}
-			
-			#$middleName = ($finalEvent['n_middle']) ? ' '.trim($finalEvent['n_middle']) : '';
-			#$finalEvent['fn']  = trim($finalEvent['n_given']. $middleName .' '. $finalEvent['n_family']);
-
-			#error_log(print_r($finalEvent, true));
-			
-			return $finalEvent;
-		}
-		
-		function search($_sifdata) {
-			if(!$event = $this->siftoegw($_sifdata)) {
-				return false;
-			}
-
-			$query = array(
-				'cal_start='.$this->date2ts($event['start'],true),	// true = Server-time
-				'cal_end='.$this->date2ts($event['end'],true),
-			);
-			
-			#foreach(array('title','location','priority','public','non_blocking') as $name) {
-			foreach(array('title','location','public','non_blocking') as $name) {
-				if (isset($event[$name])) $query['cal_'.$name] = $event[$name];
-			}
-
-			if($foundEvents = parent::search(array(
-				'user'  => $this->user,
-				'query' => $query,
-			))) {
-				if(is_array($foundEvents)) {
-					$event = array_shift($foundEvents);
-					return $event['id'];
-				}
-			}
-			return false;
-
-			$search['start'] = $event['start'];
-			$search['end']	= $event['end'];
-
-			unset($event['description']);
-			unset($event['start']);
-			unset($event['end']);
-
-			foreach($event as $key => $value) {
-				if (substr($key,0,6) != 'recur_' && substr($key,0,5) != 'alarm') {
-					$search['query']['cal_'.$key] = $value;
-				} else {
-					#$search['query'][$key] = $value;
-				}
-			}
-
-			if($foundEvents = parent::search($search)) {
-				if(is_array($foundEvents)) {
-					$event = array_shift($foundEvents);
-					return $event['id'];
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		* @return int contact id
-		* @param string	$_vcard		the vcard
-		* @param int	$_abID		the internal addressbook id
-		* @desc import a vard into addressbook
-		*/
-		function addSIF($_sifdata, $_calID)
-		{
-			$calID = false;
-			
-			#error_log('ABID: '.$_abID);
-			#error_log(base64_decode($_sifdata));
-			
-			if(!$event = $this->siftoegw($_sifdata)) {
-				return false;
-			}
-			
-			if(isset($event['alarm'])) {
-				$alarm = $event['alarm'];
-				unset($event['alarm']);
-			}
-			
-			if($_calID > 0)
-			{
-				// update entry
-				$event['id'] = $_calID;
-			}
-			
-			if($eventID = $this->update($event, TRUE)) {
-				$updatedEvent = $this->read($eventID);
-				foreach($updatedEvent['alarm'] as $alarmID => $alarmData)
-				{
-					$this->delete_alarm($alarmID);
-				}
-				
-				if(isset($alarm)) {
-					$alarmData['time']	= $event['start'] - ($alarm*60);
-					$alarmData['offset']	= $alarm*60;
-					$alarmData['all']	= 1;
-					$alarmData['owner']	= $GLOBALS['egw_info']['user']['account_id'];
-					$this->save_alarm($eventID, $alarmData);
-				}
-			}
-			
-			return $eventID;
-		}
-
-		/**
-		* return a vcard
-		*
-		* @param int	$_id		the id of the contact
-		* @param int	$_vcardProfile	profile id for mapping from vcard values to egw addressbook
-		* @return string containing the vcard
-		*/
-		function getSIF($_id)
-		{
-			$fields = array_unique(array_values($this->sifMapping));
-			sort($fields);
-
-			#$event = $this->read($_id,null,false,'server');
-			#error_log("FOUND EVENT: ". print_r($event, true));
-
-			if($event = $this->read($_id,null,false,'server')) {
-				$sysCharSet	= $GLOBALS['egw']->translation->charset();
-				$vcal		= &new Horde_iCalendar;
-
-
-				$sifEvent = '<appointment>';
-
-				foreach($this->sifMapping as $sifField => $egwField)
-				{
-					if(empty($egwField)) continue;
-					
-					#error_log("$sifField => $egwField");
-					#error_log('VALUE1: '.$event[$egwField]);
-					$value = $GLOBALS['egw']->translation->convert($event[$egwField], $sysCharSet, 'utf-8');
-					#error_log('VALUE2: '.$value);
-
-					switch($sifField)
-					{
-						case 'Categories':
-							if(!empty($value)) {
-								$value = implode('; ', $this->get_categories(explode(',',$value)));
-								$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
-							}
-							$sifEvent .= "<$sifField>$value</$sifField>";							
-							break;
-							
-						case 'Importance':
-							$value = $value-1;
-							$sifEvent .= "<$sifField>$value</$sifField>";							
-							break;
-							
-						case 'RecurrenceType':
-						case 'Interval':
-						case 'PatternStartDate':
-						case 'NoEndDate':
-						case 'DayOfWeekMask':
-						case 'PatternEndDate':
-							break;
-						
-						case 'IsRecurring':
-							switch($event['recur_type']) {
-								case MCAL_RECUR_NONE:
-									$sifEvent .= "<$sifField>0</$sifField>";							
-									break;
-
-								case MCAL_RECUR_DAILY:
-									$eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1);
-									$recurStartDate = mktime(0,0,0,date('m',$event['start']), date('d', $event['start']), date('Y', $event['start']));
-									
-									$sifEvent .= "<$sifField>1</$sifField>";							
-									$sifEvent .= '<RecurrenceType>'. self::olRecursDaily .'</RecurrenceType>';							
-									$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';							
-									$sifEvent .= '<PatternStartDate>'. $vcal->_exportDateTime($recurStartDate) .'</PatternStartDate>';
-									if($event['recur_enddate'] == 0) {
-										$sifEvent .= '<NoEndDate>1</NoEndDate>';
-									} else {
-										$recurEndDate = mktime(24,0,0,date('m',$event['recur_enddate']), date('d', $event['recur_enddate']), date('Y', $event['recur_enddate']));
-										
-										$sifEvent .= '<NoEndDate>0</NoEndDate>';
-										$sifEvent .= '<PatternEndDate>'. $vcal->_exportDateTime($recurEndDate) .'</PatternEndDate>';
-										$totalDays = ($recurEndDate - $recurStartDate) / 86400;
-										$occurrences = ceil($totalDays / $eventInterval);
-										$sifEvent .= '<Occurrences>'. $occurrences .'</Occurrences>';
-									}
-									break;
-
-								case MCAL_RECUR_WEEKLY:
-									$eventInterval = ($event['recur_interval'] > 1 ? $event['recur_interval'] : 1);
-									$recurStartDate = mktime(0,0,0,date('m',$event['start']), date('d', $event['start']), date('Y', $event['start']));
-									
-									$sifEvent .= "<$sifField>1</$sifField>";							
-									$sifEvent .= '<RecurrenceType>'. self::olRecursWeekly .'</RecurrenceType>';							
-									$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';							
-									$sifEvent .= '<PatternStartDate>'. $vcal->_exportDateTime($recurStartDate) .'</PatternStartDate>';
-									$sifEvent .= '<DayOfWeekMask>'. $event['recur_data'] .'</DayOfWeekMask>';
-									if($event['recur_enddate'] == 0) {
-										$sifEvent .= '<NoEndDate>1</NoEndDate>';
-									} else {
-										$recurEndDate = mktime(24, 0, 0, date('m',$event['recur_enddate']), date('d', $event['recur_enddate']), date('Y', $event['recur_enddate']));
-										
-										$daysPerWeek = substr_count(decbin($event['recur_data']),'1');
-										$sifEvent .= '<NoEndDate>0</NoEndDate>';
-										$sifEvent .= '<PatternEndDate>'. $vcal->_exportDateTime($recurEndDate) .'</PatternEndDate>';
-										$totalWeeks = floor(($recurEndDate - $recurStartDate) / (86400*7));
-										#error_log("AAA: $daysPerWeek $totalWeeks");
-										$occurrences = ($totalWeeks / $eventInterval) * $daysPerWeek;
-										for($i = $recurEndDate; $i > $recurStartDate + ($totalWeeks * 86400*7); $i = $i - 86400) {
-											switch(date('w', $i-1)) {
-												case 0:
-													if($event['recur_data'] & 1) $occurrences++;
-													break;
-												// monday
-												case 1:
-													if($event['recur_data'] & 2) $occurrences++;
-													break;
-												case 2:
-													if($event['recur_data'] & 4) $occurrences++;
-													break;
-												case 3:
-													if($event['recur_data'] & 8) $occurrences++;
-													break;
-												case 4:
-													if($event['recur_data'] & 16) $occurrences++;
-													break;
-												case 5:
-													if($event['recur_data'] & 32) $occurrences++;
-													break;
-												case 6:
-													if($event['recur_data'] & 64) $occurrences++;
-													break;
-											}
-										}
-										$sifEvent .= '<Occurrences>'. $occurrences .'</Occurrences>';
-									}
-									break;
-							}
-							break;
-						
-						case 'Sensitivity':
-							$value = (!$value ? '2' : '0');
-							$sifEvent .= "<$sifField>$value</$sifField>";							
-							break;
-							
-						case 'Folder':
-							# skip currently. This is the folder where Outlook stores the contact.
-							#$sifEvent .= "<$sifField>/</$sifField>";
-							break;
-							
-						case 'AllDayEvent':
-						case 'End':
-							// get's handled by Start clause
-							break;
-
-						case 'Start':
-							if($event['end'] - $event['start'] == 86399 && date('Y-m-d', $event['end']) == date('Y-m-d', $event['start'])) {
-								$value = date('Y-m-d', $event['start']);
-								$sifEvent .= "<Start>$value</Start>";
-								$sifEvent .= "<End>$value</End>";
-								$sifEvent .= "<AllDayEvent>1</AllDayEvent>";
-							} else {
-								$value = $vcal->_exportDateTime($event['start']);
-								$sifEvent .= "<Start>$value</Start>";
-								$value = $vcal->_exportDateTime($event['end']);
-								$sifEvent .= "<End>$value</End>";
-								$sifEvent .= "<AllDayEvent>0</AllDayEvent>";
-							}
-							break;
-							
-						case 'ReminderMinutesBeforeStart':
-							break;
-							
-						case 'ReminderSet':
-							if(count((array)$event['alarm']) > 0) {
-								$sifEvent .= "<$sifField>1</$sifField>";
-								foreach($event['alarm'] as $alarmID => $alarmData)
-								{
-									$sifEvent .= '<ReminderMinutesBeforeStart>'. $alarmData['offset']/60 .'</ReminderMinutesBeforeStart>';
-									// lets take only the first alarm
-									break;
-								}
-							} else {
-								$sifEvent .= "<$sifField>0</$sifField>";
-							}
-							break;
-						
-						default:
-							$sifEvent .= "<$sifField>$value</$sifField>";
-							break;
-					}
-				}
-				$sifEvent .= '</appointment>';
-
-				return base64_encode($sifEvent);
-			}
-
-			if($this->xmlrpc)
-			{
-				$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['no_access'],$GLOBALS['xmlrpcstr']['no_access']);
-			}
-			return False;
-		}
-
-	}
diff --git a/calendar/inc/hook_admin.inc.php b/calendar/inc/hook_admin.inc.php
deleted file mode 100755
index 6980f703a8..0000000000
--- a/calendar/inc/hook_admin.inc.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Calendar                                                    *
-	* 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$ */
-{
-// Only Modify the $file and $title variables.....
-	$title = $appname;
-	$file = Array(
-		'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
deleted file mode 100755
index a85d01d883..0000000000
--- a/calendar/inc/hook_deleteaccount.inc.php
+++ /dev/null
@@ -1,15 +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$ */
-
-	$socal =& CreateObject('calendar.socal');
-	$socal->change_delete_user((int)$_POST['account_id'],(int)$_POST['new_owner']);
-	unset($socal);
diff --git a/calendar/inc/hook_home.inc.php b/calendar/inc/hook_home.inc.php
deleted file mode 100755
index 08d1cfdd86..0000000000
--- a/calendar/inc/hook_home.inc.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**************************************************************************\
-* 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$ */
-
-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')
-	{
-		if (!file_exists(EGW_SERVER_ROOT.($et_css_file ='/etemplate/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/app.css')))
-		{
-			$et_css_file = '/etemplate/templates/default/app.css';
-		}
-		$content =& ExecMethod('calendar.uilist.home');
-	}
-	else
-	{
-		unset($et_css_file);
-		$content =& ExecMethod('calendar.uiviews.home');
-	}
-	$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">
-<!--';
-	if ($et_css_file)	// listview
-	{
-		echo '
-@import url('.$GLOBALS['egw_info']['server']['webserver_url'].$et_css_file.');';
-	}
-	echo '
-@import url('.$GLOBALS['egw_info']['server']['webserver_url'].$css_file.');
--->
-</style>
-'.$portalbox->draw($content)."\n".'<!-- END Calendar info -->'."\n";
-	
-	unset($css_file); unset($et_css_file);
-	unset($key);
-	unset($app_id);
-	unset($content); 
-	unset($portalbox);
-}
diff --git a/calendar/inc/hook_preferences.inc.php b/calendar/inc/hook_preferences.inc.php
deleted file mode 100644
index d247439fb2..0000000000
--- a/calendar/inc/hook_preferences.inc.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                              *
-  * 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$ */
-{
-// Only Modify the $file and $title variables.....
-	$title = $appname;
-	$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'),
-		'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
deleted file mode 100644
index 818cea069f..0000000000
--- a/calendar/inc/hook_settings.inc.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-/**
- * eGroupWare - Calendar Preferences
- *
- * @link http://www.egroupware.org
- * @package calendar
- * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @author Mark Peters <skeeter@phpgroupware.org> 
- *	Originally based on Webcalendar by Craig Knudsen <cknudsen@radix.net>
- *	http://www.radix.net/~cknudsen
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id$
- */
-
-	$bocal =& CreateObject('calendar.bocal');
-	$bocal->check_set_default_prefs();
-
-	$default = array(
-		'day'          => lang('Dayview'),
-		'day4'         => lang('Four days view'),
-		'week'         => lang('Weekview'),
-		'weekN'        => lang('Multiple week view'),
-		'month'        => lang('Monthview'),
-		'planner_cat'  => lang('Planner by category'),
-		'planner_user' => lang('Planner by user'),
-		'listview'     => lang('Listview'),
-	);
-	$grid_views = array(
-		'all' => lang('all'),
-		'day_week' => lang('Dayview').', '.lang('Four days view').' &amp; '.lang('Weekview'),
-		'day4' => lang('Dayview').' &amp; '.lang('Four days view'),
-		'day' => lang('Dayview'),
-	);
-	/* Select list with number of day by week */
-	$week_view = array(
-		'5' => lang('Weekview without weekend'),
-		'7' => lang('Weekview with weekend'),
-	);
-
-	$mainpage = array(
-		'1' => lang('Yes'),
-		'0' => lang('No'),
-	);
-/*
-	$summary = array(
-		'no'     => lang('Never'),
-		'daily'  => lang('Daily'),
-		'weekly' => lang('Weekly')
-	);
-	create_select_box('Receive summary of appointments','summary',$summary,
-		'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.');
-*/
-	$updates = array(
-		'no'             => lang('Never'),
-		'add_cancel'     => lang('on invitation / cancelation only'),
-		'time_change_4h' => lang('on time change of more than 4 hours too'),
-		'time_change'    => lang('on any time change too'),
-		'modifications'  => lang('on all modification, but responses'),
-		'responses'      => lang('on participant responses too')
-	);
-	$update_formats = array(
-		'none'     => lang('None'),
-		'extended' => lang('Extended'),
-		'ical'     => lang('iCal / rfc2445')
-	);
-	$event_details = array(
-		'to-fullname' => lang('Fullname of person to notify'),
-		'to-firstname'=> lang('Firstname of person to notify'),
-		'to-lastname' => lang('Lastname of person to notify'),
-		'title'       => lang('Title of the event'),
-		'description' => lang('Description'),
-		'startdate'   => lang('Start Date/Time'),
-		'enddate'     => lang('End Date/Time'),
-		'olddate'     => lang('Old Startdate'),
-		'category'    => lang('Category'),
-		'location'    => lang('Location'),
-		'priority'    => lang('Priority'),
-		'participants'=> lang('Participants'),
-		'owner'       => lang('Owner'),
-		'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'),
-		'Sunday'   => lang('Sunday'),
-		'Saturday' => lang('Saturday')
-	);
-
-	for ($i=0; $i < 24; ++$i)
-	{
-		$times[$i] = $GLOBALS['egw']->common->formattime($i,'00');
-	}
-	
-	for ($i = 2; $i <= 9; ++$i)
-	{
-		$muliple_weeks[$i.' weeks'] = lang('%1 weeks',$i);
-	}
-
-	$intervals = array(
-		5	=> '5',
-		10	=> '10',
-		15	=> '15',
-		20	=> '20',
-		30	=> '30',
-		45	=> '45',
-		60	=> '60'
-	);
-	$groups = $GLOBALS['egw']->accounts->membership($GLOBALS['egw_info']['user']['account_id']);
-	$options = array('0' => lang('none'));
-	if (is_array($groups))
-	{
-		foreach($groups as $group)
-		{
-			$options[$group['account_id']] = $GLOBALS['egw']->common->grab_owner_name($group['account_id']);
-		}
-	}
-	$defaultfilter = array(
-		'all'     => lang('all'),
-		'private' => lang('private only'),
-//		'public'  => lang('global public only'),
-//		'group'   => lang('group public only'),
-//		'private+public' => lang('private and global public'),
-//		'private+group'  => lang('private and group public'),
-//		'public+group'   => lang('global public and group public')
-	);
-	$freebusy_url = $bocal->freebusy_url($GLOBALS['egw_info']['user']['account_lid'],$GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
-	$freebusy_help = lang('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.','<a href="'.$freebusy_url.'" target="_blank">'.$freebusy_url.'</a>');
-
-	$GLOBALS['settings'] = array(
-		'defaultcalendar' => array(
-			'type'   => 'select',
-			'label'  => 'default calendar view',
-			'name'   => 'defaultcalendar',
-			'values' => $default,
-			'help'   => 'Which of calendar view do you want to see, when you start calendar ?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'days_in_weekview' => array(
-			'type'   => 'select',
-			'label'  => 'default week view',
-			'name'   => 'days_in_weekview',
-			'values' => $week_view,
-			'help'   => 'Do you want a weekview with or without weekend?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'multiple_weeks' => array(
-			'type'   => 'select',
-			'label'  => 'Weeks in multiple week view',
-			'name'   => 'multiple_weeks',
-			'values' => $muliple_weeks,
-			'help'   => 'How many weeks should the multiple week view show?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'mainscreen_showevents' => array(
-			'type'   => 'select',
-			'label'  => 'show default view on main screen',
-			'name'   => 'mainscreen_showevents',
-			'values' => $mainpage,
-			'help'   => 'Displays your default calendar view on the startpage (page you get when you enter eGroupWare or click on the homepage icon)?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'show_rejected' => array(
-			'type'   => 'check',
-			'label'  => 'Show invitations you rejected',
-			'name'   => 'show_rejected',
-			'help'   => '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!'
-		),
-		'weekdaystarts' => array(
-			'type'   => 'select',
-			'label'  => 'weekday starts on',
-			'name'   => 'weekdaystarts',
-			'values' => $weekdaystarts,
-			'help'   => 'This day is shown as first day in the week or month view.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'workdaystarts' => array(
-			'type'   => 'select',
-			'label'  => 'work day starts on',
-			'name'   => 'workdaystarts',
-			'values' => $times,
-			'help'   => '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.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'workdayends' => array(
-			'type'   => 'select',
-			'label'  => 'work day ends on',
-			'name'   => 'workdayends',
-			'values' => $times,
-			'help'   => 'This defines the end of your dayview. Events after this time, are shown below the dayview.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'use_time_grid' => array(
-			'type'   => 'select',
-			'label'  => 'Views with fixed time intervals',
-			'name'   => 'use_time_grid',
-			'values' => $grid_views,
-			'help'   => 'For which views should calendar show distinct lines with a fixed time interval.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'interval' => array(
-			'type'   => 'select',
-			'label'  => 'Length of the time interval',
-			'name'   => 'interval',
-			'values' => $intervals,
-			'help'   => 'How many minutes should each interval last?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'defaultlength' => array(
-			'type'    => 'input',
-			'label'   => 'default appointment length (in minutes)',
-			'name'    => 'defaultlength',
-			'help'    => 'Default length of newly created events. The length is in minutes, eg. 60 for 1 hour.',
-			'default' => '',
-			'size'    => 3,
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'planner_start_with_group' => array(
-			'type'   => 'select',
-			'label'  => 'Preselected group for entering the planner',
-			'name'   => 'planner_start_with_group',
-			'values' => $options,
-			'help'   => 'This group that is preselected when you enter the planner. You can change it in the planner anytime you want.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'planner_show_empty_rows' => array(
-			'type'   => 'select',
-			'label'  => 'Show empty rows in Planner',
-			'name'   => 'planner_show_empty_rows',
-			'values' => array(
-				0 => lang('no'),
-				'user' => lang('Planner by user'),
-				'cat'  => lang('Planner by category'),
-				'both' => lang('All'),
-			),
-			'help'   => 'Should the planner display an empty row for users or categories without any appointment.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'default_private' => array(
-			'type'  => 'check',
-			'label' => 'Set new events to private',
-			'name'  => 'default_private',
-			'help'  => 'Should new events created as private by default ?',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'receive_updates' => array(
-			'type'   => 'select',
-			'label'  => 'Receive email updates',
-			'name'   => 'receive_updates',
-			'values' => $updates,
-			'help'   => "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.",
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'update_format' => array(
-			'type'   => 'select',
-			'label'  => 'Format of event updates',
-			'name'   => 'update_format',
-			'values' => $update_formats,
-			'help'   => 'Extended updates always include the complete event-details. iCal\'s can be imported by certain other calendar-applications.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'notifyAdded' => array(
-			'type'   => 'notify',
-			'label'  => 'Notification messages for added events ',
-			'name'   => 'notifyAdded',
-			'rows'   => 5,
-			'cols'   => 50,
-			'help'   => '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.',
-			'default' => '',
-			'values' => $event_details,
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'notifyCanceled' => array(
-			'type'   => 'notify',
-			'label'  => 'Notification messages for canceled events ',
-			'name'   => 'notifyCanceled',
-			'rows'   => 5,
-			'cols'   => 50,
-			'help'   => 'This message is sent for canceled or deleted events.',
-			'default' => '',
-			'values' => $event_details,
-			'subst_help' => False,
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'notifyModified' => array(
-			'type'   => 'notify',
-			'label'  => 'Notification messages for modified events ',
-			'name'   => 'notifyModified',
-			'rows'   => 5,
-			'cols'   => 50,
-			'help'   => 'This message is sent for modified or moved events.',
-			'default' => '',
-			'values' => $event_details,
-			'subst_help' => False,
-			'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 ',
-			'name'   => 'notifyResponse',
-			'rows'   => 5,
-			'cols'   => 50,
-			'help'   => 'This message is sent when you accept, tentative accept or reject an event.',
-			'default' => '',
-			'values' => $event_details,
-			'subst_help' => False,
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'notifyAlarm' => array(
-			'type'   => 'notify',
-			'label'  => 'Notification messages for your alarms',
-			'name'   => 'notifyAlarm',
-			'rows'   => 5,
-			'cols'   => 50,
-			'help'   => 'This message is sent when you set an Alarm for a certain event. Include all information you might need.',
-			'default' => '',
-			'values' => $event_details,
-			'subst_help' => False,
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'freebusy' => array(
-			'type'  => 'check',
-			'label' => 'Make freebusy information available to not loged in persons?',
-			'name'  => 'freebusy',
-			'help'  => $freebusy_help,
-			'run_lang' => false,
-			'default' => '',
-			'subst_help' => False,
-			'xmlrpc' => True,
-			'admin'  => False,
-		),
-		'freebusy_pw' => array(
-			'type'  => 'input',
-			'label' => 'Password for not loged in users to your freebusy information?',
-			'name'  => 'freebusy_pw',
-			'help'  => 'If you dont set a password here, the information is available to everyone, who knows the URL!!!',
-			'xmlrpc' => True,
-			'admin'  => False
-		)
-	);
diff --git a/calendar/index.php b/calendar/index.php
index 2b8c7f90b2..31a6c39ce7 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -1,25 +1,13 @@
 <?php
-/**************************************************************************\
-* 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.                                              *
-\**************************************************************************/
+/**
+ * eGroupWare Calendar
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @package calendar
+ * @copyright (c) 2005-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-/* $Id$ */
-
-$GLOBALS['egw_info'] = array('flags' => array(
-	'currentapp'=>	'calendar',
-	'noheader'	=>	True,
-	'nonavbar'	=>	True,
-));
-
-include('../header.inc.php');
-
-ExecMethod('calendar.uiviews.index');
-
-$GLOBALS['egw']->common->egw_footer();
+header('Location: ../index.php?menuaction=calendar.calendar_uiviews.index');
diff --git a/calendar/js/dragDropFunctions.js b/calendar/js/dragDropFunctions.js
index d8a953de61..caecf213f8 100644
--- a/calendar/js/dragDropFunctions.js
+++ b/calendar/js/dragDropFunctions.js
@@ -1,10 +1,21 @@
+/**
+ * Calendar - dragNdrop
+ *
+ * @link http://www.egroupware.org
+ * @author Christian Binder <christian.binder@freakmail.de>
+ * @package calendar
+ * @copyright (c) 2006 by Christian Binder <christian.binder@freakmail.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
 function dragEvent()
 {
 	if(minOffset())
 	{
 		// make a snapshot of the old (original) innerHTML of the dragged event
 		if(!dd.obj.oldInnerHTML)
-		{	
+		{
 			dd.obj.oldInnerHTML = dd.obj.div.innerHTML;
 		}
 
@@ -26,10 +37,10 @@ function dragEvent()
 }
 
 function dropEvent()
-{	
+{
 	// minimum requirements for ajax call
-	if(	minOffset() && 
-		(dropTarget = dd.obj.getEltBelow()) && 
+	if(	minOffset() &&
+		(dropTarget = dd.obj.getEltBelow()) &&
 		(dropTarget.my_datetime) &&
 		(dd.obj.my_calendarOwner == dropTarget.my_owner)
 	)
@@ -37,7 +48,7 @@ function dropEvent()
 		dd.obj.div.innerHTML = '<div style="height: 100%; width: 100%; text-align: center;">' + dd.obj.my_loaderImage + '</div>';
 
 		xajax_doXMLHTTP(
-			'calendar.ajaxcalendar.moveEvent',
+			'calendar.calendar_ajax.moveEvent',
 			dd.obj.my_eventId,
 			dd.obj.my_calendarOwner,
 			dropTarget.my_datetime,
@@ -59,7 +70,7 @@ function minOffset()
 {
 	var offsetX = Math.abs(dd.obj.defx - dd.obj.x);
 	var offsetY = Math.abs(dd.obj.defy - dd.obj.y);
-	
+
 	if(offsetX > 5 || offsetY > 5) { return true; }
 	return false;
 }
diff --git a/calendar/setup/etemplates.inc.php b/calendar/setup/etemplates.inc.php
index 2073f92193..c467976245 100644
--- a/calendar/setup/etemplates.inc.php
+++ b/calendar/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application calendar
 	* http://www.egroupware.org 
-	* generated by soetemplate::dump4setup() 2008-05-09 10:25
+	* generated by soetemplate::dump4setup() 2008-06-07 13:28
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package calendar
@@ -14,18 +14,6 @@ $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:7:{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";s:2:"h2";s:2:"28";}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','template' => '','lang' => '','group' => '0','version' => '1.0.1.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:7:{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";s:2:"h2";s:2:"28";}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:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:15:"Edit this event";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:9:"Exception";s:4:"help";s:42:"Create an exception at this recuring 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:6:{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:5:"align";s:5:"right";}}}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' => '1132776053',);
-
-$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:7:{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";s:2:"h2";s:2:"28";}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:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:15:"Edit this event";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:9:"Exception";s:4:"help";s:42:"Create an exception at this recuring 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:6:{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:5:"align";s:5:"right";}}}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' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1149292820',);
-
-$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.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:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}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:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;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:2;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:3;a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{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:5:"align";s:5:"right";}}}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' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1166691126',);
-
-$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.003','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:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}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:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;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:2;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:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{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:5:"align";s:5:"right";}}}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' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1168898663',);
-
 $templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.004','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:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}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:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;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:2;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:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{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:5:"align";s:5:"right";}}}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' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1181140110',);
 
 $templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.3.005','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:"h4";s:8:",!@owner";s:1:"B";s:3:"300";s:2:"h2";s:2:"28";}i:1;a:3:{s:1:"A";a:5:{s:4:"type";s:4:"html";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:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";s:4:"span";s:1:"2";i:1;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:2;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:3;a:5:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}i:4;a:5:{s:4:"type";s:6:"select";s:4:"name";s:6:"action";s:4:"help";s:39:"Execute a further action for this entry";s:4:"size";s:10:"Actions...";s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:6:{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:5:"align";s:5:"right";}}}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' => '.end_hide { visibility: visible; white-space: nowrap; margin-left: 10px; }','modified' => '1199959741',);
@@ -38,49 +26,24 @@ $templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' =
 
 $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.general','template' => '','lang' => '','group' => '0','version' => '1.3.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:"50%";}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:11:",,,duration";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:6:{s:4:"type";s:6:"select";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:7:"no_lang";s:1:"1";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:92:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\');";}i:2;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"span";s:9:",end_hide";}}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:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,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.general','template' => '','lang' => '','group' => '0','version' => '1.3.002','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:"50%";}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:11:",,,duration";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:6:{s:4:"type";s:6:"select";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:7:"no_lang";s:1:"1";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";}i:2;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"span";s:9:",end_hide";}}s:1:"C";a:5:{s:4:"type";s:10:"buttononly";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:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,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.general','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c4";s:3:"row";s:2:"c6";s:3:"row";s:2:"c5";s:7:"row,top";s:2:"c2";s:3:"row";s:1:"B";s:3:"50%";s:2:"c7";s:3:"row";s:2:"h5";s:2:"60";}i:1;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:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:6:"needed";s:1:"1";}i:2;a:6:{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";s:5:"align";s:5:"right";}}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,duration";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:6:{s:4:"type";s:6:"select";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:7:"no_lang";s:1:"1";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";}i:2;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";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:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";}}i:4;a:2:{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";}}i:5;a:2:{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";}}i:6;a:2:{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";}}i:7;a:2:{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:4:"rows";i:7;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' => '1118477982',);
-
-$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.3.005','data' => 'a:1:{i:0;a:105:{s:4:"type";s:4:"hbox";s:4:"data";a:8:{i:0;a:9:{s:2:"c1";s:3:"row";s:1:"A";s:2:"95";s:2:"c4";s:3:"row";s:2:"c6";s:3:"row";s:2:"c5";s:7:"row,top";s:2:"c2";s:3:"row";s:1:"B";s:3:"50%";s:2:"c7";s:3:"row";s:2:"h5";s:2:"60";}i:1;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:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:6:"needed";s:1:"1";}i:2;a:6:{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";s:5:"align";s:5:"right";}}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,duration";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:6:{s:4:"type";s:6:"select";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:7:"no_lang";s:1:"1";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";}i:2;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";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:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";}}i:4;a:2:{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";}}i:5;a:2:{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";}}i:6;a:2:{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";}}i:7;a:2:{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:4:"rows";i:7;s:4:"cols";i:2;s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,start";s:5:"label";s:5:"Start";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:6:"needed";s:1:"1";}i:2;a:6:{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";s:5:"align";s:5:"right";}}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}i:46;a:1:{s:4:"type";s:5:"label";}i:47;a:1:{s:4:"type";s:5:"label";}i:48;a:1:{s:4:"type";s:5:"label";}i:49;a:1:{s:4:"type";s:5:"label";}i:50;a:1:{s:4:"type";s:5:"label";}i:51;a:1:{s:4:"type";s:5:"label";}i:52;a:1:{s:4:"type";s:5:"label";}i:53;a:1:{s:4:"type";s:5:"label";}i:54;a:1:{s:4:"type";s:5:"label";}i:55;a:1:{s:4:"type";s:5:"label";}i:56;a:1:{s:4:"type";s:5:"label";}i:57;a:1:{s:4:"type";s:5:"label";}i:58;a:1:{s:4:"type";s:5:"label";}i:59;a:1:{s:4:"type";s:5:"label";}i:60;a:1:{s:4:"type";s:5:"label";}i:61;a:1:{s:4:"type";s:5:"label";}i:62;a:1:{s:4:"type";s:5:"label";}i:63;a:1:{s:4:"type";s:5:"label";}i:64;a:1:{s:4:"type";s:5:"label";}i:65;a:1:{s:4:"type";s:5:"label";}i:66;a:1:{s:4:"type";s:5:"label";}i:67;a:1:{s:4:"type";s:5:"label";}i:68;a:1:{s:4:"type";s:5:"label";}i:69;a:1:{s:4:"type";s:5:"label";}i:70;a:1:{s:4:"type";s:5:"label";}i:71;a:1:{s:4:"type";s:5:"label";}i:72;a:1:{s:4:"type";s:5:"label";}i:73;a:1:{s:4:"type";s:5:"label";}i:74;a:1:{s:4:"type";s:5:"label";}i:75;a:1:{s:4:"type";s:5:"label";}i:76;a:1:{s:4:"type";s:5:"label";}i:77;a:1:{s:4:"type";s:5:"label";}i:78;a:1:{s:4:"type";s:5:"label";}i:79;a:1:{s:4:"type";s:5:"label";}i:80;a:1:{s:4:"type";s:5:"label";}i:81;a:1:{s:4:"type";s:5:"label";}i:82;a:1:{s:4:"type";s:5:"label";}i:83;a:1:{s:4:"type";s:5:"label";}i:84;a:1:{s:4:"type";s:5:"label";}i:85;a:1:{s:4:"type";s:5:"label";}i:86;a:1:{s:4:"type";s:5:"label";}i:87;a:1:{s:4:"type";s:5:"label";}i:88;a:1:{s:4:"type";s:5:"label";}i:89;a:1:{s:4:"type";s:5:"label";}i:90;a:1:{s:4:"type";s:5:"label";}i:91;a:1:{s:4:"type";s:5:"label";}i:92;a:1:{s:4:"type";s:5:"label";}i:93;a:1:{s:4:"type";s:5:"label";}i:94;a:1:{s:4:"type";s:5:"label";}i:95;a:1:{s:4:"type";s:5:"label";}i:96;a:1:{s:4:"type";s:5:"label";}i:97;a:1:{s:4:"type";s:5:"label";}i:98;a:1:{s:4:"type";s:5:"label";}i:99;a:1:{s:4:"type";s:5:"label";}i:100;a:1:{s:4:"type";s:5:"label";}}}','size' => '100%,200','style' => '','modified' => '1118477982',);
-
 $templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:3:"row";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:5:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";}}}i:3;a:2:{s:1:"A";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}s:1:"B";a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"60,255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"non blocking";s:5:"width";s:1:"0";}s:1:"B";a:4:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";}}i:7;a:2:{s:1:"A";a:3:{s:4:"size";s:9:",,,public";s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"B";a:3:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:8:"Category";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
 
 $templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.4.002','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:248:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"60,255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
 
+$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";}}}i:2;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:257:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.freetimesearch\')+values2url(this.form,\'start,end,duration,participants,recur_type,whole_day\'),\'ft_search\',\'dependent=yes,width=700,height=500,scrollbars=yes,status=yes\'); return false;";s:5:"width";s:1:"0";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"size";s:6:"60,255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,200";}i:2;a:6:{s:5:"class";s:6:"row_on";s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:4:"size";s:11:",,,category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:4:"size";s:1:"9";}}}}','size' => '','style' => '','modified' => '1181145149',);
+
 $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.participants','template' => '','lang' => '','group' => '0','version' => '1.0.1.003','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:12:"14,calendar+";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.participants','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"1,,0,0";i:1;a:3:{s:4:"type";s:4:"hbox";s:4:"size";s:18:"User or group,both";s:4:"name";s:7:"account";}}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"size";s:18:"User or group,both";s:4:"name";s:7:"account";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"status recurrence";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";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:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:2:{s:4:"type";s:6:"select";s:4:"name";s:25:"${row}[status_recurrence]";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";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:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";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' => '1172430059',);
-
 $templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:22:"User or group,both,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";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:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";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:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";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' => '1172430059',);
 
 $templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:6:{s:1:"A";s:2:"95";s:2:"c3";s:4:",top";s:2:"c1";s:3:"row";s:2:"c2";s:2:"th";s:2:"h1";s:8:",@no_add";s:1:"D";s:24:",@hide_status_recurrence";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"New";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"size";s:27:"User or group,calendar+,,10";s:4:"name";s:7:"account";s:4:"help";s:13:"User or group";}i:2;a:3:{s:4:"type";s:10:"link-entry";s:4:"name";s:8:"resource";s:4:"size";s:14:"@cal_resources";}}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:2;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"All future";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Status";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";}}i:3;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[app]";}s:1:"B";a:6:{s:4:"type";s:5:"label";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:13:"${row}[title]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";}s:1:"D";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";}s:1:"E";a:4:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";s:7:"no_lang";s:1:"1";s:8:"onchange";i:1;}s:1:"F";a:9:{s:4:"type";s:6:"button";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:22:"delete[$row_cont[uid]]";s:5:"align";s:6:"center";s:5:"label";s:6:"Delete";s:8:"onchange";i:1;s:4:"size";s:6:"delete";}}}s:4:"rows";i:3;s:4:"cols";i:6;s:4:"size";s:17:"100%,200,,,,,auto";s:4:"name";s:12:"participants";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' => '1172430059',);
 
-$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.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.3.001','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:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:16:"@exception_label";s:4:"help";s:38:"Create an exception for the given date";s:7:"no_lang";s:1:"1";}}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.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.3.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,31";}}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:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[exception]";s:5:"label";s:16:"@exception_label";s:4:"help";s:38:"Create an exception for the given date";s:7:"no_lang";s:1:"1";}}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' => '1210321464',);
 
 $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: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',);
@@ -97,19 +60,11 @@ $templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','g
 
 $templ_data[] = array('name' => 'calendar.list','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:4:{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";}}i:3;a:1:{s:1:"A";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";s:5:"align";s:5:"right";i:1;a:6:{s:4:"type";s:6:"button";s:4:"name";s:9:"deleteall";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:23:"Delete selected Envents";s:7:"onclick";s:43:"return confirm(\'Delete selected Envents?\');";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:6:"needed";s:1:"1";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }','modified' => '1200671585',);
 
+$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{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";}}i:3;a:1:{s:1:"A";a:9:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";i:1;a:6:{s:4:"type";s:6:"button";s:4:"name";s:9:"deleteall";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:23:"Delete selected Envents";s:7:"onclick";s:43:"return confirm(\'Delete selected Envents?\');";}i:2;a:7:{s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:70:"toggle_all(this.form,form::name(\'nm[rows][checked][]\')); return false;";s:4:"span";s:14:",checkAllArrow";}}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }','modified' => '1200671585',);
+
 $templ_data[] = array('name' => 'calendar.list.dates','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:4:"hbox";s:4:"data";a:2:{i:0;a:0:{}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:1:"4";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}i:2;a:2:{s:4:"type";s:4:"date";s:4:"name";s:9:"startdate";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"End";}i:4;a:2:{s:4:"type";s:4:"date";s:4:"name";s:7:"enddate";}s:4:"span";s:12:",custom_hide";}}','size' => '','style' => '.custom_hide { visibility: hidden; }','modified' => '1173420675',);
 
-$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',);
-
-$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.003','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:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}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:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";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";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";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:6:{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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.view&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:"span";s:8:",noPrint";}}}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',);
-
-$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','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:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}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:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";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";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";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:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"E";a:6:{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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.view&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:"span";s:8:",noPrint";}}}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',);
-
-$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.3.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:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}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:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";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";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";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:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"E";a:6:{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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:"span";s:8:",noPrint";}}}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',);
-
-$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.3.003','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:"B";s:3:"40%";}i:1;a:7:{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:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"E";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:"F";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"G";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:7:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";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";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"D";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}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:"F";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"G";a:6:{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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:7;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1128457387',);
-
 $templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.3.004','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:"B";s:3:"40%";}i:1;a:12:{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:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"H";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:"I";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";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}s:1:"K";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"L";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:12:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";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";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";}s:1:"F";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"G";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}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:"I";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"L";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:197:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:"span";s:8:",noPrint";i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:12;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1200064350',);
 
+$templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.5.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:"B";s:3:"40%";}i:1;a:12:{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:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Project";s:4:"name";s:5:"pm_id";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";}s:1:"H";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:"I";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";}s:1:"J";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:12:"cal_location";s:5:"label";s:8:"Location";}s:1:"K";a:4:{s:4:"size";s:3:"All";s:4:"name";s:11:"participant";s:4:"type";s:23:"nextmatch-accountfilter";s:5:"label";s:12:"Participants";}s:1:"L";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:4:"span";s:8:",noPrint";}}i:2;a:12:{s:1:"A";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";s:4:"size";s:14:",$cont[format]";s:4:"span";s:7:",noWrap";}s:4:"name";s:5:"start";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";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";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";s:7:"no_lang";s:1:"1";}}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:19:"${row}[description]";s:7:"no_lang";s:1:"1";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[recure]";}s:1:"F";a:3:{s:4:"type";s:11:"link-string";s:4:"size";s:23:"calendar,projectmanager";s:4:"name";s:10:"${row}[id]";}s:1:"G";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:16:"${row}[category]";s:8:"readonly";s:1:"1";}s:1:"H";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}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:"I";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";s:4:"span";s:7:",noWrap";}s:1:"J";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[location]";s:7:"no_lang";s:1:"1";}s:1:"K";a:4:{s:4:"type";s:4:"html";s:4:"name";s:13:"${row}[parts]";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"L";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";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:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'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:"span";s:8:",noPrint";i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}}}}s:4:"rows";i:2;s:4:"cols";i:12;s:7:"options";a:0:{}s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1200064350',);
+
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 06b6040322..83a97e3d69 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -1,83 +1,60 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - Calendar                                                    *
-	* 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$ */
-
-	$setup_info['calendar']['name']    = 'calendar';
-	$setup_info['calendar']['version'] = '1.5.002';
-	$setup_info['calendar']['app_order'] = 3;
-	$setup_info['calendar']['enable']  = 1;
-
-	$setup_info['calendar']['license']  = 'GPL';
-	$setup_info['calendar']['description'] =
-		'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'][] = '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'][] = 'home';
-	$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('1.3','1.4','1.5')
-	);
-	$setup_info['calendar']['depends'][] = array(
-		 'appname' => 'etemplate',
-		 'versions' => Array('1.3','1.4','1.5')
-	);
-	
-	// installation checks for calendar
-	$setup_info['calendar']['check_install'] = array(
-		// check if PEAR is availible
-		'' => array(
-			'func' => 'pear_check',
-			'from' => 'Calendar (iCal import+export)',
-		),
-	);	
-	
-
-
-
-
-
-
-
-
-
-
-
-
-
+/**
+ * eGroupWare - Calendar setup
+ *
+ * @link http://www.egroupware.org
+ * @package calendar
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
+$setup_info['calendar']['name']    = 'calendar';
+$setup_info['calendar']['version'] = '1.6';
+$setup_info['calendar']['app_order'] = 3;
+$setup_info['calendar']['enable']  = 1;
 
+$setup_info['calendar']['license']  = 'GPL';
+$setup_info['calendar']['description'] =
+	'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'][] = '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']['admin'] = 'calendar_hooks::admin';
+$setup_info['calendar']['hooks']['deleteaccount'] = 'calendar.calendar_so.deleteaccount';
+$setup_info['calendar']['hooks']['home'] = 'calendar_hooks::home';
+$setup_info['calendar']['hooks']['preferences'] = 'calendar_hooks::preferences';
+$setup_info['calendar']['hooks']['settings'] = 'calendar_hooks::settings';
+$setup_info['calendar']['hooks']['sidebox_menu'] = 'calendar.calendar_ui.sidebox_menu';
+$setup_info['calendar']['hooks']['search_link'] = 'calendar_hooks::search_link';
 
+/* Dependencies for this app to work */
+$setup_info['calendar']['depends'][] = array(
+	 'appname' => 'phpgwapi',
+	 'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+);
+$setup_info['calendar']['depends'][] = array(
+	 'appname' => 'etemplate',
+	 'versions' => Array('1.3','1.4','1.5','1.6','1.7')
+);
 
+// installation checks for calendar
+$setup_info['calendar']['check_install'] = array(
+	// check if PEAR is availible
+	'' => array(
+		'func' => 'pear_check',
+		'from' => 'Calendar (iCal import+export)',
+	),
+);
diff --git a/calendar/setup/tables_current.inc.php b/calendar/setup/tables_current.inc.php
index 5c296d6f76..a22a844153 100644
--- a/calendar/setup/tables_current.inc.php
+++ b/calendar/setup/tables_current.inc.php
@@ -1,104 +1,102 @@
 <?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.                                              *
-  \**************************************************************************/
+/**
+ * eGroupWare - Calendar setup
+ *
+ * @link http://www.egroupware.org
+ * @package calendar
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-  /* $Id$ */
-
-	$phpgw_baseline = 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' => '4','nullable' => False),
-				'cal_category' => array('type' => 'varchar','precision' => '30'),
-				'cal_modified' => array('type' => 'int','precision' => '8'),
-				'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' => '4','nullable' => False,'default' => '0'),
-				'cal_modifier' => array('type' => 'int','precision' => '4'),
-				'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-				'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-				'cal_etag' => array('type' => 'int','precision' => '4','default' => '0')
-			),
-			'pk' => array('cal_id'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array()
+$phpgw_baseline = 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' => '4','nullable' => False),
+			'cal_category' => array('type' => 'varchar','precision' => '30'),
+			'cal_modified' => array('type' => 'int','precision' => '8'),
+			'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' => '4','nullable' => False,'default' => '0'),
+			'cal_modifier' => array('type' => 'int','precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
+			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
+			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0')
 		),
-		'egw_cal_holidays' => array(
-			'fd' => array(
-				'hol_id' => array('type' => 'auto','nullable' => False),
-				'hol_locale' => array('type' => 'char','precision' => '2','nullable' => False),
-				'hol_name' => array('type' => 'varchar','precision' => '50','nullable' => False),
-				'hol_mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'hol_month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'hol_occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'hol_dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'hol_observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
-			),
-			'pk' => array('hol_id'),
-			'fk' => array(),
-			'ix' => array('hol_locale'),
-			'uc' => array()
+		'pk' => array('cal_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	),
+	'egw_cal_holidays' => array(
+		'fd' => array(
+			'hol_id' => array('type' => 'auto','nullable' => False),
+			'hol_locale' => array('type' => 'char','precision' => '2','nullable' => False),
+			'hol_name' => array('type' => 'varchar','precision' => '50','nullable' => False),
+			'hol_mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'hol_month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'hol_occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'hol_dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'hol_observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
 		),
-		'egw_cal_repeats' => array(
-			'fd' => array(
-				'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' => '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()
+		'pk' => array('hol_id'),
+		'fk' => array(),
+		'ix' => array('hol_locale'),
+		'uc' => array()
+	),
+	'egw_cal_repeats' => array(
+		'fd' => array(
+			'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' => '2','default' => '1'),
+			'recur_data' => array('type' => 'int','precision' => '2','default' => '1'),
+			'recur_exception' => array('type' => 'text')
 		),
-		'egw_cal_user' => array(
-			'fd' => array(
-				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-				'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' => 'varchar','precision' => '128','nullable' => False),
-				'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-				'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1')
-			),
-			'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array()
+		'pk' => array('cal_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	),
+	'egw_cal_user' => array(
+		'fd' => array(
+			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
+			'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' => 'varchar','precision' => '128','nullable' => False),
+			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
+			'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1')
 		),
-		'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),
-				'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
-			),
-			'pk' => array('cal_id','cal_extra_name'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array()
+		'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => 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),
+			'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
 		),
-		'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()
-		)
-	);
+		'pk' => array('cal_id','cal_extra_name'),
+		'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 259059eba2..59b935a2fb 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -1,1620 +1,1621 @@
 <?php
-  /**************************************************************************\
-  * eGroupWare - Setup                                                       *
-  * 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.                                              *
-  \**************************************************************************/
+/**
+ * eGroupWare - Calendar setup
+ *
+ * @link http://www.egroupware.org
+ * @package calendar
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-  /* $Id$ */
-
-	function calendar_v0_9_2to0_9_3update_owner($table, $field)
+function calendar_v0_9_2to0_9_3update_owner($table, $field)
+{
+	$GLOBALS['egw_setup']->oProc->query("select distinct($field) from $table");
+	if ($GLOBALS['egw_setup']->oProc->num_rows())
 	{
-		$GLOBALS['egw_setup']->oProc->query("select distinct($field) from $table");
-		if ($GLOBALS['egw_setup']->oProc->num_rows())
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			while ($GLOBALS['egw_setup']->oProc->next_record())
+			$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
+		}
+		if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
+		{
+			$acctstbl = 'accounts';
+		}
+		else
+		{
+			$acctstbl = 'phpgw_accounts';
+		}
+		for($i=0;$i<count($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['egw_setup']->oProc->AlterColumn($table, $field, array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => 0));
+}
+
+
+function calendar_upgrade0_9_3pre1()
+{
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry','cal_create_by');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user','cal_login');
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre2';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre2()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre3';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre3()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre4';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre4()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre5';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre5()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre6';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre6()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre7';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre7()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre8';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre8()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre9';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre9()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre10';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3pre10()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_3()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre1';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_4pre1()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre2';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_4pre2()
+{
+	$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'];
+}
+
+
+function calendar_upgrade0_9_4pre3()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre4';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_4pre4()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre5';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_4pre5()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_4()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.5pre1';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_5pre1()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.5pre2';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_5pre2()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.5pre3';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_5()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.6';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_6()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre1';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_7pre1()
+{
+	$db2 = clone($GLOBALS['egw_setup']->db);
+
+	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry',
+		Array(
+			'fd' => array(
+				'cal_id' => array('type' => 'auto', 'nullable' => false),
+				'cal_owner' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_group' => array('type' => 'varchar', 'precision' => 255),
+				'cal_datetime' => array('type' => 'int', 'precision' => 4),
+				'cal_mdatetime' => array('type' => 'int', 'precision' => 4),
+				'cal_duration' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_priority' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '2'),
+				'cal_type' => array('type' => 'varchar', 'precision' => 10),
+				'cal_access' => array('type' => 'varchar', 'precision' => 10),
+				'cal_name' => array('type' => 'varchar', 'precision' => 80, 'nullable' => false),
+				'cal_description' => array('type' => 'text')
+			),
+			'pk' => array("cal_id"),
+			'ix' => array(),
+			'fk' => array(),
+			'uc' => array()
+		)
+	);
+
+	$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['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['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');
+			$db2->query('INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) '
+				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
+		}
+	}
+
+	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_groups');
+	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry');
+
+	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_user',
+		Array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_login' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
+				'cal_status' => array('type' => 'char', 'precision' => 1, 'default' => 'A')
+			),
+			'pk' => array('cal_id', 'cal_login'),
+			'ix' => array(),
+			'fk' => array(),
+			'uc' => array()
+		)
+	);
+
+	$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['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['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['egw_setup']->oProc->DropTable('webcal_entry_user');
+
+	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_repeats',
+		Array(
+			'fd' => array(
+				'cal_id' => array('type' => 'int', 'precision' => 4, 'default' => '0', 'nullable' => false),
+				'cal_type' => array('type' => 'varchar', 'precision' => 20, 'default' => 'daily', 'nullable' => false),
+				'cal_use_end' => array('type' => 'int', 'precision' => 4, 'default' => '0'),
+				'cal_end' => array('type' => 'int', 'precision' => 4),
+				'cal_frequency' => array('type' => 'int', 'precision' => 4, 'default' => '1'),
+				'cal_days' => array('type' => 'char', 'precision' => 7)
+			),
+			'pk' => array(),
+			'ix' => array(),
+			'fk' => array(),
+			'uc' => array()
+		)
+	);
+
+	$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['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['egw_setup']->oProc->f('cal_id');
+			$cal_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
+			if(isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
 			{
-				$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
-			}
-			if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
-			{
-				$acctstbl = 'accounts';
+				$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
 			{
-				$acctstbl = 'phpgw_accounts';
-			}
-			for($i=0;$i<count($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]."'");
+				$enddate = 0;
+				$useend = 0;
 			}
+			$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['egw_setup']->oProc->AlterColumn($table, $field, array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => 0));
 	}
 
-	$test[] = '0.9.3pre1';
-	function calendar_upgrade0_9_3pre1()
-	{
-		calendar_v0_9_2to0_9_3update_owner('webcal_entry','cal_create_by');
-		calendar_v0_9_2to0_9_3update_owner('webcal_entry_user','cal_login');
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre2';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
+	$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__);
 
-	$test[] = "0.9.3pre2";
-	function calendar_upgrade0_9_3pre2()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre3';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
 
-	$test[] = "0.9.3pre3";
-	function calendar_upgrade0_9_3pre3()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre4';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
 
-	$test[] = "0.9.3pre4";
-	function calendar_upgrade0_9_3pre4()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre5';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
+function calendar_upgrade0_9_7pre2()
+{
+	$db2 = $GLOBALS['egw_setup']->db;
 
-	$test[] = "0.9.3pre5";
-	function calendar_upgrade0_9_3pre5()
+	$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())
 	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre6';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = "0.9.3pre6";
-	function calendar_upgrade0_9_3pre6()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre7';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = "0.9.3pre7";
-	function calendar_upgrade0_9_3pre7()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre8';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = "0.9.3pre8";
-	function calendar_upgrade0_9_3pre8()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre9';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = "0.9.3pre9";
-	function calendar_upgrade0_9_3pre9()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre10';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = "0.9.3pre10";
-	function calendar_upgrade0_9_3pre10()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = "0.9.3";
-	function calendar_upgrade0_9_3()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre1';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = "0.9.4pre1";
-	function calendar_upgrade0_9_4pre1()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre2';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.4pre2';
-	function calendar_upgrade0_9_4pre2()
-	{
-		$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'];
-	}
-
-	$test[] = "0.9.4pre3";
-	function calendar_upgrade0_9_4pre3()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre4';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.4pre4";
-	function calendar_upgrade0_9_4pre4()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4pre5';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.4pre5";
-	function calendar_upgrade0_9_4pre5()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.4';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.4";
-	function calendar_upgrade0_9_4()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.5pre1';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.5pre1";
-	function calendar_upgrade0_9_5pre1()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.5pre2';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.5pre2";
-	function calendar_upgrade0_9_5pre2()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.5pre3';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.5";
-	function calendar_upgrade0_9_5()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.6';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.6";
-	function calendar_upgrade0_9_6()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre1';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.7pre1';
-	function calendar_upgrade0_9_7pre1()
-	{
-		$db2 = clone($GLOBALS['egw_setup']->db);
-
-		$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry',
-			Array(
-				'fd' => array(
-					'cal_id' => array('type' => 'auto', 'nullable' => false),
-					'cal_owner' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
-					'cal_group' => array('type' => 'varchar', 'precision' => 255),
-					'cal_datetime' => array('type' => 'int', 'precision' => 4),
-					'cal_mdatetime' => array('type' => 'int', 'precision' => 4),
-					'cal_duration' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
-					'cal_priority' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '2'),
-					'cal_type' => array('type' => 'varchar', 'precision' => 10),
-					'cal_access' => array('type' => 'varchar', 'precision' => 10),
-					'cal_name' => array('type' => 'varchar', 'precision' => 80, 'nullable' => false),
-					'cal_description' => array('type' => 'text')
-				),
-				'pk' => array("cal_id"),
-				'ix' => array(),
-				'fk' => array(),
-				'uc' => array()
-			)
-		);
-
-		$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))
+		while($GLOBALS['egw_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['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');
-				$db2->query('INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) '
-					.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__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['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__);
 		}
-
-		$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_groups');
-		$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry');
-
-		$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_user',
-			Array(
-				'fd' => array(
-					'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
-					'cal_login' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
-					'cal_status' => array('type' => 'char', 'precision' => 1, 'default' => 'A')
-				),
-				'pk' => array('cal_id', 'cal_login'),
-				'ix' => array(),
-				'fk' => array(),
-				'uc' => array()
-			)
-		);
-
-		$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['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['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['egw_setup']->oProc->DropTable('webcal_entry_user');
-
-		$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_repeats',
-			Array(
-				'fd' => array(
-					'cal_id' => array('type' => 'int', 'precision' => 4, 'default' => '0', 'nullable' => false),
-					'cal_type' => array('type' => 'varchar', 'precision' => 20, 'default' => 'daily', 'nullable' => false),
-					'cal_use_end' => array('type' => 'int', 'precision' => 4, 'default' => '0'),
-					'cal_end' => array('type' => 'int', 'precision' => 4),
-					'cal_frequency' => array('type' => 'int', 'precision' => 4, 'default' => '1'),
-					'cal_days' => array('type' => 'char', 'precision' => 7)
-				),
-				'pk' => array(),
-				'ix' => array(),
-				'fk' => array(),
-				'uc' => array()
-			)
-		);
-
-		$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['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['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['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
-				{
-					$enddate = 0;
-					$useend = 0;
-				}
-				$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['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'];
 	}
 
-	$test[] = "0.9.7pre2";
-	function calendar_upgrade0_9_7pre2()
-	{
-		$db2 = $GLOBALS['egw_setup']->db;
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre3';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
 
-		$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['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['egw_setup']->db->f('cal_owner'),__LINE__,__FILE__);
-				$db2->next_record();
-				$tz = $db2->f('preference_value');
-				$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__);
-			}
-		}
 
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre3';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
+function calendar_upgrade0_9_7pre3()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
 
-	$test[] = "0.9.7pre3";
-	function calendar_upgrade0_9_7pre3()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.7";
-	function calendar_upgrade0_9_7()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre1';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.8pre1";
-	function calendar_upgrade0_9_8pre1()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre2';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.8pre2";
-	function calendar_upgrade0_9_8pre2()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre3';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.8pre3";
-	function calendar_upgrade0_9_8pre3()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre4';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.8pre4";
-	function calendar_upgrade0_9_8pre4()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre5';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.8pre5';
-	function calendar_upgrade0_9_8pre5()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.9pre1';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.9pre1";
-	function calendar_upgrade0_9_9pre1()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.9';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.9";
-	function calendar_upgrade0_9_9()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre1';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre1";
-	function calendar_upgrade0_9_10pre1()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre2';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre2";
-	function calendar_upgrade0_9_10pre2()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre3';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre3";
-	function calendar_upgrade0_9_10pre3()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre4';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre4";
-	function calendar_upgrade0_9_10pre4()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre5';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre5";
-	function calendar_upgrade0_9_10pre5()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre6';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre6";
-	function calendar_upgrade0_9_10pre6()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre7';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre7";
-	function calendar_upgrade0_9_10pre7()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre8';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = "0.9.10pre8";
-	function calendar_upgrade0_9_10pre8()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre9';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre9';
-	function calendar_upgrade0_9_10pre9()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre10';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre10';
-	function calendar_upgrade0_9_10pre10()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre11';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre11';
-	function calendar_upgrade0_9_10pre11()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre12';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre12';
-	function calendar_upgrade0_9_10pre12()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre13';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre13';
-	function calendar_upgrade0_9_10pre13()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre14';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre14';
-	function calendar_upgrade0_9_10pre14()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre15';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre15';
-	function calendar_upgrade0_9_10pre15()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre16';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre16';
-	function calendar_upgrade0_9_10pre16()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre17';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre17';
-	function calendar_upgrade0_9_10pre17()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre18';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre18';
-	function calendar_upgrade0_9_10pre18()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre19';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre19';
-	function calendar_upgrade0_9_10pre19()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre20';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre20';
-	function calendar_upgrade0_9_10pre20()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre21';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre21';
-	function calendar_upgrade0_9_10pre21()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre22';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre22';
-	function calendar_upgrade0_9_10pre22()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre23';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre23';
-	function calendar_upgrade0_9_10pre23()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre24';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre24';
-	function calendar_upgrade0_9_10pre24()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre25';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre25';
-	function calendar_upgrade0_9_10pre25()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre26';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre26';
-	function calendar_upgrade0_9_10pre26()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre27';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre27';
-	function calendar_upgrade0_9_10pre27()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre28';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10pre28';
-	function calendar_upgrade0_9_10pre28()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.10';
-	function calendar_upgrade0_9_10()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.001';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.11';
-	function calendar_upgrade0_9_11()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.001';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
+function calendar_upgrade0_9_7()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre1';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
 
-	$test[] = '0.9.11.001';
-	function calendar_upgrade0_9_11_001()
+function calendar_upgrade0_9_8pre1()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre2';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_8pre2()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre3';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_8pre3()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre4';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_8pre4()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.8pre5';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_8pre5()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.9pre1';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_9pre1()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.9';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_9()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre1';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre1()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre2';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre2()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre3';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre3()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre4';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre4()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre5';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre5()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre6';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre6()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre7';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre7()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre8';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre8()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre9';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre9()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre10';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre10()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre11';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre11()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre12';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre12()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre13';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre13()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre14';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre14()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre15';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre15()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre16';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre16()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre17';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre17()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre18';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre18()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre19';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre19()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre20';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre20()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre21';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre21()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre22';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre22()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre23';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre23()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre24';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre24()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre25';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre25()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre26';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre26()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre27';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre27()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10pre28';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10pre28()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.10';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_10()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.001';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_11()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.001';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_11_001()
+{
+	$db2 = $GLOBALS['egw_setup']->db;
+
+	if(extension_loaded('mcal') == False)
 	{
-		$db2 = $GLOBALS['egw_setup']->db;
+		define(RECUR_NONE,0);
+		define(RECUR_DAILY,1);
+		define(RECUR_WEEKLY,2);
+		define(RECUR_MONTHLY_MDAY,3);
+		define(RECUR_MONTHLY_WDAY,4);
+		define(RECUR_YEARLY,5);
 
-		if(extension_loaded('mcal') == False)
-		{
-			define(RECUR_NONE,0);
-			define(RECUR_DAILY,1);
-			define(RECUR_WEEKLY,2);
-			define(RECUR_MONTHLY_MDAY,3);
-			define(RECUR_MONTHLY_WDAY,4);
-			define(RECUR_YEARLY,5);
-
-			define(M_SUNDAY,1);
-			define(M_MONDAY,2);
-			define(M_TUESDAY,4);
-			define(M_WEDNESDAY,8);
-			define(M_THURSDAY,16);
-			define(M_FRIDAY,32);
-			define(M_SATURDAY,64);
-		}
+		define(M_SUNDAY,1);
+		define(M_MONDAY,2);
+		define(M_TUESDAY,4);
+		define(M_WEDNESDAY,8);
+		define(M_THURSDAY,16);
+		define(M_FRIDAY,32);
+		define(M_SATURDAY,64);
+	}
 
 // calendar_entry => phpgw_cal
-		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal',
-			Array(
-				'fd' => array(
-					'cal_id' => array('type' => 'auto', 'nullable' => False),
-					'owner' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
-					'category' => array('type' => 'int', 'precision' => 8, 'default' => '0', 'nullable' => True),
-					'groups' => array('type' => 'varchar', 'precision' => 255, 'nullable' => True),
-					'datetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
-					'mdatetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
-					'edatetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
-					'priority' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '2'),
-					'cal_type' => array('type' => 'varchar', 'precision' => 10, 'nullable' => True),
-					'is_public' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '1'),
-					'title' => array('type' => 'varchar', 'precision' => 80, 'nullable' => False, 'default' => '1'),
-					'description' => array('type' => 'text', 'nullable' => True)
-				),
-				'pk' => array('cal_id'),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-		);
-
-		$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
-		{
-			$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':
-					$is_public = 0;
-					break;
-				case 'public':
-					$is_public = 1;
-					break;
-				case 'group':
-					$is_public = 2;
-					break;
-			}
-			$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['egw_setup']->oProc->DropTable('calendar_entry');
-
-// calendar_entry_repeats => phpgw_cal_repeats
-		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_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,'nullable' => True),
-					'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-					'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'),
-					'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1')
-				),
-				'pk' => array(),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-		);
-		$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
-		{
-			$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
-			$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-			switch($recur_type)
-			{
-				case 'daily':
-					$recur_type_num = RECUR_DAILY;
-					break;
-				case 'weekly':
-					$recur_type_num = RECUR_WEEKLY;
-					break;
-				case 'monthlybydate':
-					$recur_type_num = RECUR_MONTHLY_MDAY;
-					break;
-				case 'monthlybyday':
-					$recur_type_num = RECUR_MONTHLY_WDAY;
-					break;
-				case 'yearly':
-					$recur_type_num = RECUR_YEARLY;
-					break;
-			}
-			$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);
-			$recur_data += (substr($days,2,1)=='Y'?M_TUESDAY:0);
-			$recur_data += (substr($days,3,1)=='Y'?M_WEDNESDAY:0);
-			$recur_data += (substr($days,4,1)=='Y'?M_THURSDAY:0);
-			$recur_data += (substr($days,5,1)=='Y'?M_FRIDAY:0);
-			$recur_data += (substr($days,6,1)=='Y'?M_SATURDAY:0);
-			$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['egw_setup']->oProc->DropTable('calendar_entry_repeats');
-
-// 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'];
-	}
-
-	$test[] = '0.9.11.002';
-	function calendar_upgrade0_9_11_002()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.003';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.11.003';
-	function calendar_upgrade0_9_11_003()
-	{
-		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
-			Array(
-				'fd' => array(
-					'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-					'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-					'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
-				),
-				'pk' => array('locale','name'),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-		);
-
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.004';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.11.004';
-	function calendar_upgrade0_9_11_004()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.005';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.11.005';
-	function calendar_upgrade0_9_11_005()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.006';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.11.006';
-	function calendar_upgrade0_9_11_006()
-	{
-		$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),
-					'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-					'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-					'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
-				),
-				'pk' => array('hol_id'),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-		);
-
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.007';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.11.007';
-	function calendar_upgrade0_9_11_007()
-	{
-		$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'];
-	}
-
-	$test[] = '0.9.11.008';
-	function calendar_upgrade0_9_11_008()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.009';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.11.009';
-	function calendar_upgrade0_9_11_009()
-	{
-		$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'];
-	}
-
-	$test[] = '0.9.11.010';
-	function calendar_upgrade0_9_11_010()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.011';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.11.011';
-	function calendar_upgrade0_9_11_011()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.001';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.12';
-	function calendar_upgrade0_9_12()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.001';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-	$test[] = '0.9.13.001';
-	function calendar_upgrade0_9_13_001()
-	{
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.002';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-	$test[] = '0.9.13.002';
-	function calendar_upgrade0_9_13_002()
-	{
-		$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'];
-	}
-
-	$test[] = '0.9.13.003';
-	function calendar_upgrade0_9_13_003()
-	{
-		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
-			Array(
-				'fd' => array(
-					'alarm_id' => array('type' => 'auto','nullable' => False),
-					'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
-					'cal_owner'	=> array('type' => 'int', 'precision' => 8, 'nullable' => False),
-					'cal_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
-					'cal_text' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False)
-				),
-				'pk' => array('alarm_id'),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-		);
-
-		$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'];
-	}
-
-	$test[] = '0.9.13.004';
-	function calendar_upgrade0_9_13_004()
-	{
-		$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'];
-	}
-
-	$test[] = '0.9.13.005';
-	function calendar_upgrade0_9_13_005()
-	{
-		$calendar_data = Array();
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
-		{
-			$calendar_data[$GLOBALS['egw_setup']->oProc->f('cal_id')] = $GLOBALS['egw_setup']->oProc->f('category');
-		}
-
-		$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['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'];
-	}
-
-	$test[] = '0.9.13.006';
-	function calendar_upgrade0_9_13_006()
-	{
-		$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'];
-	}
-
-
-	$test[] = '0.9.13.007';
-	function calendar_upgrade0_9_13_007()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
-			'type' => 'varchar',
-			'precision' => '1',
-			'nullable' => False,
-			'default' => 'u'
-		));
-
-		$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal',
+		Array(
 			'fd' => array(
-				'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-				'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-				'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+				'cal_id' => array('type' => 'auto', 'nullable' => False),
+				'owner' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'category' => array('type' => 'int', 'precision' => 8, 'default' => '0', 'nullable' => True),
+				'groups' => array('type' => 'varchar', 'precision' => 255, 'nullable' => True),
+				'datetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'mdatetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'edatetime' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'priority' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '2'),
+				'cal_type' => array('type' => 'varchar', 'precision' => 10, 'nullable' => True),
+				'is_public' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '1'),
+				'title' => array('type' => 'varchar', 'precision' => 80, 'nullable' => False, 'default' => '1'),
+				'description' => array('type' => 'text', 'nullable' => True)
 			),
-			'pk' => array('cal_id','cal_extra_name'),
+			'pk' => array('cal_id'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
-		));
+		)
+	);
 
-		$GLOBALS['egw_setup']->oProc->DropTable('phpgw_cal_alarm');
-
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.002';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-
-	$test[] = '0.9.16.001';
-	function calendar_upgrade0_9_16_001()
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
+	while($GLOBALS['egw_setup']->oProc->next_record())
 	{
-		// this is to set the default as schema_proc was not setting an empty default
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
-			'type' => 'varchar',
-			'precision' => '1',
-			'nullable' => False,
-			'default' => 'u'
-		));
+		$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':
+				$is_public = 0;
+				break;
+			case 'public':
+				$is_public = 1;
+				break;
+			case 'group':
+				$is_public = 2;
+				break;
+		}
+		$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');
 
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.002';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
+		$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['egw_setup']->oProc->DropTable('calendar_entry');
 
-
-	// the following series of updates add some indices, to speedup the selects
-
-	$test[] = '0.9.16.002';
-	function calendar_upgrade0_9_16_002()
-	{
-		$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+// calendar_entry_repeats => phpgw_cal_repeats
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_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'),
-				'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' => '')
+				'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,'nullable' => True),
+				'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True),
+				'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'),
+				'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1')
 			),
 			'pk' => array(),
 			'fk' => array(),
-			'ix' => array('cal_id'),
+			'ix' => array(),
 			'uc' => array()
-		));
-
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.003';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-
-	$test[] = '0.9.16.003';
-	function calendar_upgrade0_9_16_003()
+		)
+	);
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
+	while($GLOBALS['egw_setup']->oProc->next_record())
 	{
-		$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
+		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
+		$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
+		switch($recur_type)
+		{
+			case 'daily':
+				$recur_type_num = RECUR_DAILY;
+				break;
+			case 'weekly':
+				$recur_type_num = RECUR_WEEKLY;
+				break;
+			case 'monthlybydate':
+				$recur_type_num = RECUR_MONTHLY_MDAY;
+				break;
+			case 'monthlybyday':
+				$recur_type_num = RECUR_MONTHLY_WDAY;
+				break;
+			case 'yearly':
+				$recur_type_num = RECUR_YEARLY;
+				break;
+		}
+		$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);
+		$recur_data += (substr($days,2,1)=='Y'?M_TUESDAY:0);
+		$recur_data += (substr($days,3,1)=='Y'?M_WEDNESDAY:0);
+		$recur_data += (substr($days,4,1)=='Y'?M_THURSDAY:0);
+		$recur_data += (substr($days,5,1)=='Y'?M_FRIDAY:0);
+		$recur_data += (substr($days,6,1)=='Y'?M_SATURDAY:0);
+		$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['egw_setup']->oProc->DropTable('calendar_entry_repeats');
+
+// 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'];
+}
+
+
+function calendar_upgrade0_9_11_002()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.003';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_11_003()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
+		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'),
-				'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-				'cal_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
 			),
-			'pk' => array('cal_id','cal_login','cal_type'),
+			'pk' => array('locale','name'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
-		));
+		)
+	);
 
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.004';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.004';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
 
 
-	$test[] = '0.9.16.004';
-	function calendar_upgrade0_9_16_004()
-	{
-		$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
+function calendar_upgrade0_9_11_004()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.005';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_11_005()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.006';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_11_006()
+{
+	$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),
-				'locale' => array('type' => 'char','precision' => '2','nullable' => False),
-				'name' => array('type' => 'varchar','precision' => '50','nullable' => False),
-				'mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
 			),
 			'pk' => array('hol_id'),
 			'fk' => array(),
-			'ix' => array('locale'),
+			'ix' => array(),
 			'uc' => array()
-		));
+		)
+	);
 
-		$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.005';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.007';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_11_007()
+{
+	$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'];
+}
+
+
+function calendar_upgrade0_9_11_008()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.009';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_11_009()
+{
+	$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'];
+}
+
+
+function calendar_upgrade0_9_11_010()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.011';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_11_011()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.001';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_12()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.001';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+function calendar_upgrade0_9_13_001()
+{
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.002';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+function calendar_upgrade0_9_13_002()
+{
+	$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'];
+}
+
+
+function calendar_upgrade0_9_13_003()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
+		Array(
+			'fd' => array(
+				'alarm_id' => array('type' => 'auto','nullable' => False),
+				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'cal_owner'	=> array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'cal_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'cal_text' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False)
+			),
+			'pk' => array('alarm_id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		)
+	);
+
+	$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'];
+}
+
+
+function calendar_upgrade0_9_13_004()
+{
+	$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'];
+}
+
+
+function calendar_upgrade0_9_13_005()
+{
+	$calendar_data = Array();
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
+	while($GLOBALS['egw_setup']->oProc->next_record())
+	{
+		$calendar_data[$GLOBALS['egw_setup']->oProc->f('cal_id')] = $GLOBALS['egw_setup']->oProc->f('category');
 	}
 
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','category',array('type' => 'varchar', 'precision' => 30,'nullable' => True));
 
-	$test[] = '0.9.16.005';
-	function calendar_upgrade0_9_16_005()
+	@reset($calendar_data);
+	while($calendar_data && list($cal_id,$category) = each($calendar_data))
 	{
-		// 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['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())
+		$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'];
+}
+
+
+function calendar_upgrade0_9_13_006()
+{
+	$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'];
+}
+
+
+
+function calendar_upgrade0_9_13_007()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+		'type' => 'varchar',
+		'precision' => '1',
+		'nullable' => False,
+		'default' => 'u'
+	));
+
+	$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),
+			'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+		),
+		'pk' => array('cal_id','cal_extra_name'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	));
+
+	$GLOBALS['egw_setup']->oProc->DropTable('phpgw_cal_alarm');
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.002';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade0_9_16_001()
+{
+	// this is to set the default as schema_proc was not setting an empty default
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
+		'type' => 'varchar',
+		'precision' => '1',
+		'nullable' => False,
+		'default' => 'u'
+	));
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.002';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+// the following series of updates add some indices, to speedup the selects
+
+
+function calendar_upgrade0_9_16_002()
+{
+	$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),
+			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
+			'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(),
+		'fk' => array(),
+		'ix' => array('cal_id'),
+		'uc' => array()
+	));
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.003';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade0_9_16_003()
+{
+	$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'),
+			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
+			'cal_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+		),
+		'pk' => array('cal_id','cal_login','cal_type'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	));
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.004';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade0_9_16_004()
+{
+	$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),
+			'name' => array('type' => 'varchar','precision' => '50','nullable' => False),
+			'mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+			'observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+		),
+		'pk' => array('hol_id'),
+		'fk' => array(),
+		'ix' => array('locale'),
+		'uc' => array()
+	));
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.16.005';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade0_9_16_005()
+{
+	// 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['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['egw_setup']->oProc->f(0)] = $GLOBALS['egw_setup']->oProc->f(1);
+	}
+	$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=''");
+
+	// we dont need to do update 0.9.16.007, as UpdateSequenze is called now by RefreshTable
+	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade0_9_16_006()
+{
+	// re-run the update as very old entries only have an empty uid
+	return calendar_upgrade0_9_16_005();
+}
+
+
+
+function calendar_upgrade0_9_16_007()
+{
+	// update the sequenzes for refreshed tables (postgres only)
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade1_0_0()
+{
+	$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'];
+}
+
+
+
+function calendar_upgrade1_0_0_001()
+{
+	$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'];
+}
+
+
+
+function calendar_upgrade1_0_0_002()
+{
+	$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'];
+}
+
+
+
+function calendar_upgrade1_0_0_003()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
+		'type' => 'varchar',
+		'precision' => '255',
+		'nullable' => False,
+		'default' => '1'
+	));
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.004';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade1_0_0_004()
+{
+	$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),
+			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
+			'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()
+	));
+
+	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.005';
+	return $GLOBALS['setup_info']['calendar']['currentver'];
+}
+
+
+
+function calendar_upgrade1_0_0_005()
+{
+	// change prefix of all calendar tables to egw_
+	foreach(array('cal_user','cal_repeats','cal_extra','cal_holidays','cal') 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'];
+}
+
+
+
+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'];
+}
+
+
+
+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'];
+}
+
+
+
+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'];
+}
+
+
+
+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'];
+}
+
+
+
+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'];
+}
+
+
+
+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'];
+}
+
+
+
+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'];
+}
+
+
+
+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)
 		{
-			$config[$GLOBALS['egw_setup']->oProc->f(0)] = $GLOBALS['egw_setup']->oProc->f(1);
-		}
-		$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=''");
-
-		// we dont need to do update 0.9.16.007, as UpdateSequenze is called now by RefreshTable
-		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-
-	$test[] = '0.9.16.006';
-	function calendar_upgrade0_9_16_006()
-	{
-		// re-run the update as very old entries only have an empty uid
-		return calendar_upgrade0_9_16_005();
-	}
-
-
-	$test[] = '0.9.16.007';
-	function calendar_upgrade0_9_16_007()
-	{
-		// update the sequenzes for refreshed tables (postgres only)
-		$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
-
-		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-
-	$test[] = '1.0.0';
-	function calendar_upgrade1_0_0()
-	{
-		$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'];
-	}
-
-
-	$test[] = '1.0.0.001';
-	function calendar_upgrade1_0_0_001()
-	{
-		$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'];
-	}
-
-
-	$test[] = '1.0.0.002';
-	function calendar_upgrade1_0_0_002()
-	{
-		$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'];
-	}
-
-
-	$test[] = '1.0.0.003';
-	function calendar_upgrade1_0_0_003()
-	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
-			'type' => 'varchar',
-			'precision' => '255',
-			'nullable' => False,
-			'default' => '1'
-		));
-
-		$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.004';
-		return $GLOBALS['setup_info']['calendar']['currentver'];
-	}
-
-
-	$test[] = '1.0.0.004';
-	function calendar_upgrade1_0_0_004()
-	{
-		$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),
-				'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-				'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()
-		));
-
-		$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_user','cal_repeats','cal_extra','cal_holidays','cal') 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
 			{
-				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'];
-	}
-
-
-	$test[] = '1.0.1.009';
-	function calendar_upgrade1_0_1_009()
-	{
-		$db2 = clone($GLOBALS['egw_setup']->db);
-		$add_groups = array();
-		$GLOBALS['egw_setup']->db->select('egw_cal','DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date',"cal_groups != ''",__LINE__,__FILE__,
-			False,'','calendar',0,',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
-		while(($row = $GLOBALS['egw_setup']->db->row(true)))
-		{
-			$row['cal_user_type'] = 'u';
-			foreach(explode(',',$row['cal_groups']) as $group)
-			{
-				$row['cal_user_id'] = $group;
-				$db2->insert('egw_cal_user',array('cal_status' => 'U'),$row,__LINE__,__FILE__,'calendar');
+				$customfields[substr($name,1)] = array(
+					'type'  => 'text',
+					'len'   => $data['length'].($data['shown'] ? ','.$data['shown'] : ''),
+					'label' => $data['name'],
+					'order' => ($order += 10),
+				);
 			}
 		}
-		$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' => '4','nullable' => False),
-				'cal_category' => array('type' => 'varchar','precision' => '30'),
-				'cal_modified' => array('type' => 'int','precision' => '8'),
-				'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' => '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()
-		),'cal_groups');
-
-		return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2';
+		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'];
+}
 
 
-	$test[] = '1.2';
-	function calendar_upgrade1_2()
+
+function calendar_upgrade1_0_1_009()
+{
+	$db2 = clone($GLOBALS['egw_setup']->db);
+	$add_groups = array();
+	$GLOBALS['egw_setup']->db->select('egw_cal','DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date',"cal_groups != ''",__LINE__,__FILE__,
+		False,'','calendar',0,',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
+	while(($row = $GLOBALS['egw_setup']->db->row(true)))
 	{
-		// get old alarms (saved before 1.2) working again
-		$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'",__LINE__,__FILE__);
-
-		return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2.001';
+		$row['cal_user_type'] = 'u';
+		foreach(explode(',',$row['cal_groups']) as $group)
+		{
+			$row['cal_user_id'] = $group;
+			$db2->insert('egw_cal_user',array('cal_status' => 'U'),$row,__LINE__,__FILE__,'calendar');
+		}
 	}
+	$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' => '4','nullable' => False),
+			'cal_category' => array('type' => 'varchar','precision' => '30'),
+			'cal_modified' => array('type' => 'int','precision' => '8'),
+			'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' => '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()
+	),'cal_groups');
 
-	$test[] = '1.2.001';
-	function calendar_upgrade1_2_001()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_special',array(
-			'type' => 'int',
-			'precision' => '2',
-			'default' => '0'
-		));
-
-		return $GLOBALS['setup_info']['calendar']['currentver'] = '1.3.001';
-	}
-
-	$test[] = '1.3.001';
-	function calendar_upgrade1_3_001()
-	{
-		return $GLOBALS['setup_info']['calendar']['currentver'] = '1.4';
-	}
-
-	$test[] = '1.4';
-	function calendar_upgrade1_4()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_etag',array(
-			'type' => 'int',
-			'precision' => '4',
-			'default' => '0'
-		));
-		// as we no longer create cal_edit_time|user and already set default 0 for cal_etag, we skip the 1.5 update
-		return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
-	}
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2';
+}
 
 
-	$test[] = '1.5';
-	function calendar_upgrade1_5()
-	{
-		$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' => '4','nullable' => False),
-				'cal_category' => array('type' => 'varchar','precision' => '30'),
-				'cal_modified' => array('type' => 'int','precision' => '8'),
-				'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' => '4','nullable' => False,'default' => '0'),
-				'cal_modifier' => array('type' => 'int','precision' => '4'),
-				'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-				'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-				'cal_etag' => array('type' => 'int','precision' => '4'),
-				'cal_edit_time' => array('type' => 'int','precision' => '8')
-			),
-			'pk' => array('cal_id'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array()
-		),'cal_edit_user');
-		$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' => '4','nullable' => False),
-				'cal_category' => array('type' => 'varchar','precision' => '30'),
-				'cal_modified' => array('type' => 'int','precision' => '8'),
-				'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' => '4','nullable' => False,'default' => '0'),
-				'cal_modifier' => array('type' => 'int','precision' => '4'),
-				'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-				'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-				'cal_etag' => array('type' => 'int','precision' => '4')
-			),
-			'pk' => array('cal_id'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array()
-		),'cal_edit_time');
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_etag',array(
-			'type' => 'int',
-			'precision' => '4',
-			'default' => '0'
-		));
-		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL',__LINE__,__FILE__);
 
-		return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
-	}
+function calendar_upgrade1_2()
+{
+	// get old alarms (saved before 1.2) working again
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'",__LINE__,__FILE__);
+
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2.001';
+}
 
 
-	$test[] = '1.5.001';
-	function calendar_upgrade1_5_001()
-	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
-			'type' => 'int',
-			'precision' => '4',
-			'nullable' => False
-		));
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
-			'type' => 'varchar',
-			'precision' => '128',
-			'nullable' => False
-		));
+function calendar_upgrade1_2_001()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_special',array(
+		'type' => 'int',
+		'precision' => '2',
+		'default' => '0'
+	));
 
-		return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.002';
-	}
-?>
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.3.001';
+}
+
+
+function calendar_upgrade1_3_001()
+{
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.4';
+}
+
+
+function calendar_upgrade1_4()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_etag',array(
+		'type' => 'int',
+		'precision' => '4',
+		'default' => '0'
+	));
+	// as we no longer create cal_edit_time|user and already set default 0 for cal_etag, we skip the 1.5 update
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
+}
+
+
+function calendar_upgrade1_5()
+{
+	$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' => '4','nullable' => False),
+			'cal_category' => array('type' => 'varchar','precision' => '30'),
+			'cal_modified' => array('type' => 'int','precision' => '8'),
+			'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' => '4','nullable' => False,'default' => '0'),
+			'cal_modifier' => array('type' => 'int','precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
+			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
+			'cal_etag' => array('type' => 'int','precision' => '4'),
+			'cal_edit_time' => array('type' => 'int','precision' => '8')
+		),
+		'pk' => array('cal_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	),'cal_edit_user');
+	$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' => '4','nullable' => False),
+			'cal_category' => array('type' => 'varchar','precision' => '30'),
+			'cal_modified' => array('type' => 'int','precision' => '8'),
+			'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' => '4','nullable' => False,'default' => '0'),
+			'cal_modifier' => array('type' => 'int','precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
+			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
+			'cal_etag' => array('type' => 'int','precision' => '4')
+		),
+		'pk' => array('cal_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array()
+	),'cal_edit_time');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_etag',array(
+		'type' => 'int',
+		'precision' => '4',
+		'default' => '0'
+	));
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL',__LINE__,__FILE__);
+
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
+}
+
+
+function calendar_upgrade1_5_001()
+{
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+		'type' => 'int',
+		'precision' => '4',
+		'nullable' => False
+	));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+		'type' => 'varchar',
+		'precision' => '128',
+		'nullable' => False
+	));
+
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.002';
+}
+
+
+function calendar_upgrade1_5_002()
+{
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.6';
+}
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index a2fe128373..4f69e3acd1 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="calendar.edit.general" template="" lang="" group="0" version="1.4.002">
+	<template id="calendar.edit.general" template="" lang="" group="0" version="1.5.001">
 		<hbox options="0,0">
 			<grid width="100%" height="200">
 				<columns>
@@ -27,7 +27,7 @@
 					</row>
 					<row>
 						<description/>
-						<buttononly label="Freetime search" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.freetimesearch')+values2url(this.form,'start,end,duration,participants,recur_type,whole_day'),'ft_search','dependent=yes,width=700,height=500,scrollbars=yes,status=yes'); return false;" width="0" id="freetime" statustext="Find free timeslots where the selected participants are availible for the given timespan"/>
+						<buttononly label="Freetime search" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.freetimesearch')+values2url(this.form,'start,end,duration,participants,recur_type,whole_day'),'ft_search','dependent=yes,width=700,height=500,scrollbars=yes,status=yes'); return false;" width="0" id="freetime" statustext="Find free timeslots where the selected participants are availible for the given timespan"/>
 					</row>
 					<row class="row">
 						<description options=",,,location" value="Location" width="0"/>
@@ -114,7 +114,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit.recurrence" template="" lang="" group="0" version="1.3.001">
+	<template id="calendar.edit.recurrence" template="" lang="" group="0" version="1.3.002">
 		<grid width="100%" height="200">
 			<columns>
 				<column width="95"/>
@@ -133,7 +133,7 @@
 					</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"/>
+						<menupopup type="select-number" id="recur_interval" statustext="repeating interval, eg. 2 to repeat every second week" options="None,2,31"/>
 					</menulist>
 				</row>
 				<row class="row" height="12">
@@ -258,7 +258,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.edit" template="" lang="" group="0" version="1.3.004">
+	<template id="calendar.edit" template="" lang="" group="0" version="1.3.005">
 		<grid width="100%">
 			<columns>
 				<column width="100"/>
@@ -267,7 +267,7 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<description span="all" class="redItalic" id="msg" no_lang="1" align="center"/>
+					<html span="all" class="redItalic" id="msg" no_lang="1" align="center"/>
 					<description/>
 					<description/>
 				</row>
diff --git a/calendar/templates/default/list.xet b/calendar/templates/default/list.xet
index 1f823756c3..3d94d7743a 100644
--- a/calendar/templates/default/list.xet
+++ b/calendar/templates/default/list.xet
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="calendar.list.rows" template="" lang="" group="0" version="1.3.003">
+	<template id="calendar.list.rows" template="" lang="" group="0" version="1.5.001">
 		<grid width="100%">
 			<columns>
 				<column/>
@@ -11,6 +11,11 @@
 				<column/>
 				<column/>
 				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
+				<column/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -22,12 +27,17 @@
 						<nextmatch-sortheader label="Title" id="cal_title"/>
 						<nextmatch-sortheader label="Description" id="cal_description"/>
 					</vbox>
+					<nextmatch-sortheader label="Title" id="cal_title"/>
+					<nextmatch-sortheader label="Description" id="cal_description"/>
+					<nextmatch-sortheader label="Recurrence" id="recure"/>
 					<nextmatch-header label="Project" id="pm_id"/>
 					<nextmatch-header label="Category" id="cat_id"/>
 					<vbox>
 						<nextmatch-sortheader id="cal_owner" label="Owner" readonly="true"/>
 						<nextmatch-sortheader id="cal_location" label="Location"/>
 					</vbox>
+					<nextmatch-sortheader id="cal_owner" label="Owner" readonly="true"/>
+					<nextmatch-sortheader id="cal_location" label="Location"/>
 					<nextmatch-accountfilter options="All" id="participant" label="Participants"/>
 					<description value="Actions" class="noPrint"/>
 				</row>
@@ -41,6 +51,9 @@
 						<description id="${row}[description]" no_lang="1"/>
 						<description id="${row}[recure]" no_lang="1"/>
 					</vbox>
+					<description id="${row}[title]"/>
+					<description id="${row}[description]" no_lang="1"/>
+					<description id="${row}[recure]"/>
 					<link-string options="calendar,projectmanager" id="${row}[id]"/>
 					<menulist>
 						<menupopup type="select-cat" id="${row}[category]" readonly="true"/>
@@ -51,17 +64,22 @@
 						</menulist>
 						<description id="${row}[location]" no_lang="1"/>
 					</vbox>
+					<menulist class="noWrap">
+						<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
+					</menulist>
+					<description id="${row}[location]" no_lang="1"/>
 					<html id="${row}[parts]" readonly="true" no_lang="1"/>
 					<hbox class="noPrint">
-						<button image="view" label="View" id="view[$row_cont[id]]" statustext="View this event" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.edit&amp;cal_id=$row_cont[id]&amp;date=$row_cont[date]'),'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]&amp;date=$row_cont[date]'),'425','dependent=yes,width=750,height=450,scrollbars=yes,status=yes'); return false;"/>
+						<button image="view" label="View" id="view[$row_cont[id]]" statustext="View this event" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$row_cont[id]&amp;date=$row_cont[date]'),'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.calendar_uiforms.edit&amp;cal_id=$row_cont[id]&amp;date=$row_cont[date]'),'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');"/>
+						<checkbox id="checked[]" options="$row_cont[id]" statustext="Select multiple contacts for a further action" align="right"/>
 					</hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-	<template id="calendar.list" template="" lang="" group="0" version="1.0.1.001">
+	<template id="calendar.list" template="" lang="" group="0" version="1.5.001">
 		<grid width="100%">
 			<columns>
 				<column/>
@@ -73,6 +91,12 @@
 				<row>
 					<nextmatch options="calendar.list.rows" id="nm"/>
 				</row>
+				<row>
+					<hbox label="Check all" id="check_all" statustext="Check all" needed="1" align="right">
+						<button id="deleteall" image="delete" label="Delete" statustext="Delete selected Envents" onclick="return confirm('Delete selected Envents?');"/>
+						<button image="arrow_ltr" label="Check all" id="check_all" statustext="Check all" onclick="toggle_all(this.form,form::name('nm[rows][checked][]')); return false;" class="checkAllArrow"/>
+					</hbox>
+				</row>
 			</rows>
 		</grid>
 		<styles>