EGroupware / egroupware

calendar/setup/tables_current.inc.php

Spacing +64 added lines, -64 removed lines

@@ -12,45 +12,45 @@ 
 $phpgw_baseline = array(
 	'egw_cal' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False,'comment' => 'calendar id'),
-			'cal_uid' => array('type' => 'ascii','precision' => '128','nullable' => False,'comment' => 'unique id of event(-series)'),
-			'cal_owner' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
-			'cal_category' => array('type' => 'ascii','meta' => 'category','precision' => '64','comment' => 'category id(s)'),
-			'cal_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'ts of last modification'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2','comment' => 'priority: 1=Low, 2=Normal, 3=High'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1','comment' => '1=public, 0=private event'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'title of event'),
-			'cal_description' => array('type' => 'varchar','precision' => '16384','comment' => 'description'),
-			'cal_location' => array('type' => 'varchar','precision' => '255','comment' => 'location'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'cal_id of series for exception'),
-			'cal_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'user who last modified event'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0','comment' => '1 for non-blocking events'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag for optimistic locking'),
-			'cal_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'creating user'),
-			'cal_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
-			'cal_recurrence' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
-			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
-			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted'),
-			'caldav_name' => array('type' => 'ascii','precision' => '128','comment' => 'name part of CalDAV URL, if specified by client'),
-			'range_start' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'startdate (of range)'),
-			'range_end' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'enddate (of range, UNTIL of RRULE)')
+			'cal_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'calendar id'),
+			'cal_uid' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False, 'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'ascii', 'meta' => 'category', 'precision' => '64', 'comment' => 'category id(s)'),
+			'cal_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2', 'comment' => 'priority: 1=Low, 2=Normal, 3=High'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1', 'comment' => '1=public, 0=private event'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'title of event'),
+			'cal_description' => array('type' => 'varchar', 'precision' => '16384', 'comment' => 'description'),
+			'cal_location' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'location'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'user who last modified event'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'comment' => '1 for non-blocking events'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag for optimistic locking'),
+			'cal_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'cal_start of original recurrence for exception'),
+			'tz_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'key into egw_cal_timezones'),
+			'cal_deleted' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts when event was deleted'),
+			'caldav_name' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'name part of CalDAV URL, if specified by client'),
+			'range_start' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'startdate (of range)'),
+			'range_end' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'enddate (of range, UNTIL of RRULE)')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner','cal_modified','cal_reference','cal_deleted','caldav_name'),
+		'ix' => array('cal_uid', 'cal_owner', 'cal_modified', 'cal_reference', 'cal_deleted', 'caldav_name'),
 		'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')
+			'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(),
@@ -59,10 +59,10 @@ 
 	),
 	'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_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -71,53 +71,53 @@ 
 	),
 	'egw_cal_user' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_recur_date' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_user_type' => array('type' => 'ascii','precision' => '1','nullable' => False,'default' => 'u','comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
-			'cal_user_id' => array('type' => 'ascii','meta' => array("cal_user_type='u'" => 'account'),'precision' => '32','nullable' => False,'comment' => 'id or md5(email-address) for type=e'),
-			'cal_status' => array('type' => 'ascii','precision' => '1','default' => 'A','comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
-			'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1','comment' => 'only for certain types (eg. resources)'),
-			'cal_role' => array('type' => 'ascii','precision' => '64','default' => 'REQ-PARTICIPANT','comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
-			'cal_user_modified' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'automatic timestamp of last update'),
-			'cal_user_auto' => array('type' => 'auto','nullable' => False),
-			'cal_user_attendee' => array('type' => 'varchar','precision' => '255','comment' => 'email or json object with attr. cn, url, ...')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_recur_date' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_user_type' => array('type' => 'ascii', 'precision' => '1', 'nullable' => False, 'default' => 'u', 'comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
+			'cal_user_id' => array('type' => 'ascii', 'meta' => array("cal_user_type='u'" => 'account'), 'precision' => '32', 'nullable' => False, 'comment' => 'id or md5(email-address) for type=e'),
+			'cal_status' => array('type' => 'ascii', 'precision' => '1', 'default' => 'A', 'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
+			'cal_quantity' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'comment' => 'only for certain types (eg. resources)'),
+			'cal_role' => array('type' => 'ascii', 'precision' => '64', 'default' => 'REQ-PARTICIPANT', 'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
+			'cal_user_modified' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'automatic timestamp of last update'),
+			'cal_user_auto' => array('type' => 'auto', 'nullable' => False),
+			'cal_user_attendee' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'email or json object with attr. cn, url, ...')
 		),
 		'pk' => array('cal_user_auto'),
 		'fk' => array(),
-		'ix' => array('cal_user_modified',array('cal_user_type','cal_user_id')),
-		'uc' => array(array('cal_id','cal_recur_date','cal_user_type','cal_user_id'))
+		'ix' => array('cal_user_modified', array('cal_user_type', 'cal_user_id')),
+		'uc' => array(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'))
 	),
 	'egw_cal_extra' => array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '40','nullable' => False),
-			'cal_extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '255','nullable' => False,'default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '40', 'nullable' => False),
+			'cal_extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('cal_id','cal_extra_name'),
+		'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','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'starttime in server time'),
-			'cal_end' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'endtime in server time'),
-			'recur_exception' => array('type' => 'bool','nullable' => False,'default' => '','comment' => 'date is an exception')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_start' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'starttime in server time'),
+			'cal_end' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'endtime in server time'),
+			'recur_exception' => array('type' => 'bool', 'nullable' => False, 'default' => '', 'comment' => 'date is an exception')
 		),
-		'pk' => array('cal_id','cal_start'),
+		'pk' => array('cal_id', 'cal_start'),
 		'fk' => array(),
-		'ix' => array(array('recur_exception','cal_id')),
+		'ix' => array(array('recur_exception', 'cal_id')),
 		'uc' => array()
 	),
 	'egw_cal_timezones' => array(
 		'fd' => array(
-			'tz_id' => array('type' => 'auto','nullable' => False),
-			'tz_tzid' => array('type' => 'ascii','precision' => '128','nullable' => False),
-			'tz_alias' => array('type' => 'int','precision' => '4','comment' => 'tz_id for data'),
-			'tz_latitude' => array('type' => 'int','precision' => '4'),
-			'tz_longitude' => array('type' => 'int','precision' => '4'),
-			'tz_component' => array('type' => 'ascii','precision' => '8192','comment' => 'iCal VTIMEZONE component')
+			'tz_id' => array('type' => 'auto', 'nullable' => False),
+			'tz_tzid' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False),
+			'tz_alias' => array('type' => 'int', 'precision' => '4', 'comment' => 'tz_id for data'),
+			'tz_latitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_longitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_component' => array('type' => 'ascii', 'precision' => '8192', 'comment' => 'iCal VTIMEZONE component')
 		),
 		'pk' => array('tz_id'),
 		'fk' => array(),

calendar/setup/etemplates.inc.php

Spacing +29 added lines, -29 removed lines

@@ -10,55 +10,55 @@ 
  * @version $Id$
  */
 
-$templ_version=1;
+$templ_version = 1;
 
-$templ_data[] = array('name' => 'calendar.cat_acl','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:3:{i:0;a:4:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:12:"Category ACL";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:140:"Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!";}}i:1;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:24:"Restrict add category to";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:22:"Restrict set status to";}}i:2;a:3:{s:1:"A";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:14:"${row}[cat_id]";s:4:"size";s:10:"Select one";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"size";s:6:"5,both";s:4:"name";s:11:"${row}[add]";}s:1:"C";a:3:{s:4:"type";s:14:"select-account";s:4:"size";s:6:"5,both";s:4:"name";s:14:"${row}[status]";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"name";s:4:"rows";s:7:"options";a:0:{}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";}}}','size' => '','style' => '','modified' => '1259850038',);
+$templ_data[] = array('name' => 'calendar.cat_acl', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.7.001', 'data' => 'a:3:{i:0;a:4:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:12:"Category ACL";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:140:"Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!";}}i:1;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Category";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:24:"Restrict add category to";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:22:"Restrict set status to";}}i:2;a:3:{s:1:"A";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:14:"${row}[cat_id]";s:4:"size";s:10:"Select one";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:4:"size";s:6:"5,both";s:4:"name";s:11:"${row}[add]";}s:1:"C";a:3:{s:4:"type";s:14:"select-account";s:4:"size";s:6:"5,both";s:4:"name";s:14:"${row}[status]";}}}s:4:"rows";i:2;s:4:"cols";i:3;s:4:"name";s:4:"rows";s:7:"options";a:0:{}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";}i:2;a:3:{s:4:"type";s:6:"button";s:4:"name";s:13:"button[apply]";s:5:"label";s:5:"Apply";}i:3;a:3:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[cancel]";s:5:"label";s:6:"Cancel";}}}', 'size' => '', 'style' => '', 'modified' => '1259850038',);
 
-$templ_data[] = array('name' => 'calendar.confirm_edit_series','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:7:{s:4:"rows";s:1:"1";s:4:"cols";s:1:"1";s:4:"name";s:20:"#confirm_edit_series";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"class";s:12:"promptheader";s:4:"name";s:14:"#dialogHeader";s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}}i:2;a:6:{s:5:"class";s:6:"prompt";s:4:"name";s:14:"dialog-content";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:189:"Do you really want to change the start of this series? If you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.";}i:2;a:6:{s:5:"align";s:6:"center";s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:19:"Create a new series";s:4:"name";s:27:"button[confirm_edit_series]";s:4:"type";s:6:"button";s:4:"help";s:73:"The original series will be terminated today and a new series be created.";}i:2;a:4:{s:5:"label";s:13:"Re-Edit event";s:4:"name";s:14:"button[reedit]";s:4:"type";s:6:"button";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";s:4:"help";s:26:"Keep the series unchanged.";}}}}}','size' => '','style' => '','modified' => '1276104491',);
+$templ_data[] = array('name' => 'calendar.confirm_edit_series', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.7.003', 'data' => 'a:1:{i:0;a:7:{s:4:"rows";s:1:"1";s:4:"cols";s:1:"1";s:4:"name";s:20:"#confirm_edit_series";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"class";s:12:"promptheader";s:4:"name";s:14:"#dialogHeader";s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}}i:2;a:6:{s:5:"class";s:6:"prompt";s:4:"name";s:14:"dialog-content";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:189:"Do you really want to change the start of this series? If you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.";}i:2;a:6:{s:5:"align";s:6:"center";s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:19:"Create a new series";s:4:"name";s:27:"button[confirm_edit_series]";s:4:"type";s:6:"button";s:4:"help";s:73:"The original series will be terminated today and a new series be created.";}i:2;a:4:{s:5:"label";s:13:"Re-Edit event";s:4:"name";s:14:"button[reedit]";s:4:"type";s:6:"button";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";s:4:"help";s:26:"Keep the series unchanged.";}}}}}', 'size' => '', 'style' => '', 'modified' => '1276104491',);
 
-$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:",calendar_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.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:",calendar_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.delete_series','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:8:{s:4:"type";s:4:"vbox";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:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}s:4:"name";s:14:"#dialogHeader";s:4:"span";s:13:",promptheader";}i:2;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:59:"Do you want to keep the series exceptions in your calendar?";}s:4:"span";s:7:",prompt";s:4:"name";s:14:"dialog-content";i:2;a:6:{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:"Keep exceptions";s:4:"help";s:48:"All exceptions are converted into single events.";s:4:"name";s:30:"button[delete_keep_exceptions]";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:17:"Delete exceptions";s:4:"help";s:52:"The exceptions are deleted together with the series.";s:4:"name";s:25:"button[delete_exceptions]";}i:3;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:7:"onclick";s:64:"document.getElementById(\'delete_series\').style.display = \'none\';";}s:5:"align";s:6:"center";}}s:4:"name";s:14:"#delete_series";}}','size' => '','style' => '','modified' => '1273136129',);
+$templ_data[] = array('name' => 'calendar.delete_series', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.7.003', 'data' => 'a:1:{i:0;a:8:{s:4:"type";s:4:"vbox";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:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}s:4:"name";s:14:"#dialogHeader";s:4:"span";s:13:",promptheader";}i:2;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:59:"Do you want to keep the series exceptions in your calendar?";}s:4:"span";s:7:",prompt";s:4:"name";s:14:"dialog-content";i:2;a:6:{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:"Keep exceptions";s:4:"help";s:48:"All exceptions are converted into single events.";s:4:"name";s:30:"button[delete_keep_exceptions]";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:17:"Delete exceptions";s:4:"help";s:52:"The exceptions are deleted together with the series.";s:4:"name";s:25:"button[delete_exceptions]";}i:3;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:7:"onclick";s:64:"document.getElementById(\'delete_series\').style.display = \'none\';";}s:5:"align";s:6:"center";}}s:4:"name";s:14:"#delete_series";}}', 'size' => '', 'style' => '', 'modified' => '1273136129',);
 
-$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:1:"A";s:3:"100";s:1:"B";s:3:"300";s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:2:"h2";s:2:"28";s:2:"h4";s:8:",!@owner";s:2:"h6";s:13:",!@recur_type";}i:1;a:4:{s:1:"A";a:5:{s:4:"span";s:13:"all,message";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:4:"type";s:4:"html";}s:1:"B";a:1:{s:4:"type";s:5:"label";}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:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:74:{s:4:"size";s:6:"2,,0,0";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"size";s:6:"75,255";s:6:"needed";s:1:"1";s:4:"name";s:5:"title";s:4:"type";s:4:"text";s:8:"tabindex";i:1;}i:2;a:4:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:2:"id";s:4:"size";s:1:"b";}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";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:5:{s:4:"span";s:3:"all";s:4:"name";s:76:"tabs=general|description|participants|recurrence|custom|links|alarms|history";s:4:"type";s:3:"tab";s:5:"label";s:71:"General|Description|Participants|Recurrence|Custom|Links|Alarms|History";s:4:"help";s:173:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}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: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:8:"readonly";s:4:"true";s:4:"name";s:5:"owner";}s:1:"C";a:7:{s:5:"label";s:7:"Updated";s:8:"readonly";s:4:"true";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:8:"modified";s:4:"type";s:9:"date-time";s:4:"span";s:8:",noBreak";}s:1:"D";a:6:{s:5:"class";s:7:"noBreak";s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:8:"readonly";s:4:"true";s:5:"align";s:5:"right";s:4:"name";s:8:"modifier";}}i:5;a:4:{s:1:"A";a:8:{s:4:"span";s:1:"3";s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:4:{s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"type";s:6:"button";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"type";s:6:"button";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";s:4:"help";s:16:"Close the window";}i:4;a:5:{s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";s:4:"name";s:6:"action";s:4:"size";s:10:"Actions...";s:4:"type";s:6:"select";s:4:"help";s:39:"Execute a further action for this entry";}i:5;a:4:{s:4:"type";s:8:"checkbox";s:5:"label";s:30:"Do not notify of these changes";s:4:"name";s:16:"no_notifications";s:4:"span";s:1:"2";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:150:"if ($cont[query_delete_exceptions]) { getElementById(\'delete_series\').style.display=\'block\'; return false; } else return confirm(\'Delete this event\');";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"type";s:6:"button";s:4:"help";s:17:"Delete this event";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:22:"calendar.delete_series";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:4;s:4:"rows";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.end_hide { display: block; white-space: nowrap; margin-left: 10px; }
+$templ_data[] = array('name' => 'calendar.edit', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.001', 'data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:1:"A";s:3:"100";s:1:"B";s:3:"300";s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:2:"h2";s:2:"28";s:2:"h4";s:8:",!@owner";s:2:"h6";s:13:",!@recur_type";}i:1;a:4:{s:1:"A";a:5:{s:4:"span";s:13:"all,message";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:4:"type";s:4:"html";}s:1:"B";a:1:{s:4:"type";s:5:"label";}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:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:74:{s:4:"size";s:6:"2,,0,0";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"size";s:6:"75,255";s:6:"needed";s:1:"1";s:4:"name";s:5:"title";s:4:"type";s:4:"text";s:8:"tabindex";i:1;}i:2;a:4:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:2:"id";s:4:"size";s:1:"b";}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";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:5:{s:4:"span";s:3:"all";s:4:"name";s:76:"tabs=general|description|participants|recurrence|custom|links|alarms|history";s:4:"type";s:3:"tab";s:5:"label";s:71:"General|Description|Participants|Recurrence|Custom|Links|Alarms|History";s:4:"help";s:173:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}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: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:8:"readonly";s:4:"true";s:4:"name";s:5:"owner";}s:1:"C";a:7:{s:5:"label";s:7:"Updated";s:8:"readonly";s:4:"true";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:8:"modified";s:4:"type";s:9:"date-time";s:4:"span";s:8:",noBreak";}s:1:"D";a:6:{s:5:"class";s:7:"noBreak";s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:8:"readonly";s:4:"true";s:5:"align";s:5:"right";s:4:"name";s:8:"modifier";}}i:5;a:4:{s:1:"A";a:8:{s:4:"span";s:1:"3";s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:4:{s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"type";s:6:"button";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"type";s:6:"button";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";s:4:"help";s:16:"Close the window";}i:4;a:5:{s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";s:4:"name";s:6:"action";s:4:"size";s:10:"Actions...";s:4:"type";s:6:"select";s:4:"help";s:39:"Execute a further action for this entry";}i:5;a:4:{s:4:"type";s:8:"checkbox";s:5:"label";s:30:"Do not notify of these changes";s:4:"name";s:16:"no_notifications";s:4:"span";s:1:"2";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:150:"if ($cont[query_delete_exceptions]) { getElementById(\'delete_series\').style.display=\'block\'; return false; } else return confirm(\'Delete this event\');";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"type";s:6:"button";s:4:"help";s:17:"Delete this event";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:22:"calendar.delete_series";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:4;s:4:"rows";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}', 'size' => '100%', 'style' => '.end_hide { display: block; white-space: nowrap; margin-left: 10px; }
 .noBreak { white-space: nowrap; }
 .CatTree { width:200px; height:200px; overflow: auto;}','modified' => '1292883792',);
 
-$templ_data[] = array('name' => 'calendar.edit.alarms','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:3:"row";s:1:"A";s:5:"120px";s:2:"h1";s:16:"20,@no_add_alarm";s:2:"c2";s:4:",top";s:2:"h2";s:8:",!@alarm";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"before_after";s:5:"label";s:12:"%s the event";}s:1:"B";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:4:",0,7";s:4:"name";s:15:"new_alarm[days]";s:4:"help";s:4:"days";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[days]";s:5:"label";s:4:"days";}i:3;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:16:"new_alarm[hours]";s:4:"size";s:5:",0,23";s:4:"help";s:5:"hours";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"size";s:19:",,,new_alarm[hours]";s:5:"label";s:5:"hours";}i:5;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:15:"new_alarm[mins]";s:4:"size";s:7:",0,55,5";s:4:"help";s:7:"Minutes";}i:6;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[mins]";s:5:"label";s:7:"Minutes";}i:7;a:5:{s:4:"type";s:6:"select";s:4:"name";s:16:"new_alarm[owner]";s:7:"no_lang";s:1:"1";s:5:"label";s:3:"for";s:4:"help";s:31:"Select who should get the alarm";}i:8;a:3:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[add_alarm]";s:5:"label";s:9:"Add alarm";}}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Alarms";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"All participants";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[time]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[offset]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:11:"${row}[all]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"E";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:27:"delete_alarm[$row_cont[id]]";s:4:"help";s:17:"Delete this alarm";s:7:"onclick";s:36:"return confirm(\'Delete this alarm\');";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:4:"name";s:5:"alarm";s:7:"options";a:0:{}}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}','size' => '100%,210,,,,,auto','style' => '','modified' => '1286382659',);
+$templ_data[] = array('name' => 'calendar.edit.alarms', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.001', 'data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:5:{s:2:"c1";s:3:"row";s:1:"A";s:5:"120px";s:2:"h1";s:16:"20,@no_add_alarm";s:2:"c2";s:4:",top";s:2:"h2";s:8:",!@alarm";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:6:"select";s:4:"name";s:12:"before_after";s:5:"label";s:12:"%s the event";}s:1:"B";a:10:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"8";i:1;a:4:{s:4:"type";s:13:"select-number";s:4:"size";s:4:",0,7";s:4:"name";s:15:"new_alarm[days]";s:4:"help";s:4:"days";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[days]";s:5:"label";s:4:"days";}i:3;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:16:"new_alarm[hours]";s:4:"size";s:5:",0,23";s:4:"help";s:5:"hours";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"size";s:19:",,,new_alarm[hours]";s:5:"label";s:5:"hours";}i:5;a:4:{s:4:"type";s:13:"select-number";s:4:"name";s:15:"new_alarm[mins]";s:4:"size";s:7:",0,55,5";s:4:"help";s:7:"Minutes";}i:6;a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,new_alarm[mins]";s:5:"label";s:7:"Minutes";}i:7;a:5:{s:4:"type";s:6:"select";s:4:"name";s:16:"new_alarm[owner]";s:7:"no_lang";s:1:"1";s:5:"label";s:3:"for";s:4:"help";s:31:"Select who should get the alarm";}i:8;a:3:{s:4:"type";s:6:"button";s:4:"name";s:17:"button[add_alarm]";s:5:"label";s:9:"Add alarm";}}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Alarms";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"before the event";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"All participants";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[time]";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"name";s:14:"${row}[offset]";s:7:"no_lang";s:1:"1";}s:1:"C";a:4:{s:4:"type";s:8:"checkbox";s:5:"align";s:6:"center";s:4:"name";s:11:"${row}[all]";s:8:"readonly";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:13:"${row}[owner]";s:8:"readonly";s:1:"1";}s:1:"E";a:7:{s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:5:"align";s:6:"center";s:4:"name";s:27:"delete_alarm[$row_cont[id]]";s:4:"help";s:17:"Delete this alarm";s:7:"onclick";s:36:"return confirm(\'Delete this alarm\');";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:4:"name";s:5:"alarm";s:7:"options";a:0:{}}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}', 'size' => '100%,210,,,,,auto', 'style' => '', 'modified' => '1286382659',);
 
-$templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}','size' => '100%,210,,,,,auto','style' => '','modified' => '1184167751',);
+$templ_data[] = array('name' => 'calendar.edit.custom', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.4.001', 'data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}', 'size' => '100%,210,,,,,auto', 'style' => '', 'modified' => '1184167751',);
 
-$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%,210";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"210";}}}','size' => '100%,210','style' => '','modified' => '1118480337',);
+$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%,210";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"210";}}}', 'size' => '100%,210', 'style' => '', 'modified' => '1118480337',);
 
-$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.9.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:3:"for";s:5:"start";s:5:"width";s:2:"95";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";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:"align";s:6:"center";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:2;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"duration";s:5:"width";s:1:"0";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:220:"set_style_by_class(\'table\',\'end_hide\',\'display\',this.value == \'\' ? \'block\' : \'none\'); 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:5:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:85:"ajax_submit(this.form,\'calendar.calendar_uiforms.ajax_freetimesearch\'); return false;";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:3:"for";s:8:"location";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:4:{s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"span";s:15:",calendar_inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"priority";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}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:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:7:"Options";}s:1:"B";a:5:{s:5:"label";s:12:"non blocking";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:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:5:"label";s:7:"Private";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%,210";}i:2;a:6:{s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";s:4:"span";s:7:",row_on";i:1;a:4:{s:3:"for";s:8:"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:8:"tree-cat";s:4:"name";s:8:"category";s:4:"span";s:8:",CatTree";}}}}','size' => '','style' => '','modified' => '1343065389',);
+$templ_data[] = array('name' => 'calendar.edit.general', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.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:3:"for";s:5:"start";s:5:"width";s:2:"95";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";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:"align";s:6:"center";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:2;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"duration";s:5:"width";s:1:"0";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:220:"set_style_by_class(\'table\',\'end_hide\',\'display\',this.value == \'\' ? \'block\' : \'none\'); 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:5:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:85:"ajax_submit(this.form,\'calendar.calendar_uiforms.ajax_freetimesearch\'); return false;";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:3:"for";s:8:"location";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:4:{s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"span";s:15:",calendar_inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"priority";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}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:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:7:"Options";}s:1:"B";a:5:{s:5:"label";s:12:"non blocking";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:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:5:"label";s:7:"Private";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%,210";}i:2;a:6:{s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";s:4:"span";s:7:",row_on";i:1;a:4:{s:3:"for";s:8:"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:8:"tree-cat";s:4:"name";s:8:"category";s:4:"span";s:8:",CatTree";}}}}', 'size' => '', 'style' => '', 'modified' => '1343065389',);
 
-$templ_data[] = array('name' => 'calendar.edit.history','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";s:4:"size";s:14:"history_status";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}','size' => '100%,210,,,,,auto','style' => '','modified' => '1265901708',);
+$templ_data[] = array('name' => 'calendar.edit.history', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.7.002', 'data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";s:4:"size";s:14:"history_status";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}', 'size' => '100%,210,,,,,auto', 'style' => '', 'modified' => '1265901708',);
 
-$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:"c1";s:2:"th";s:2:"h1";s:6:",@view";s:2:"c2";s:3:"row";s:2:"h2";s:6:",@view";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:"span";s:3:"all";s:4:"type";s:5:"label";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:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";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:"span";s:3:"all";s:4:"type";s:5:"label";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:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:4;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}','size' => '100%,210,,,,,auto','style' => '','modified' => '1231922193',);
+$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:"c1";s:2:"th";s:2:"h1";s:6:",@view";s:2:"c2";s:3:"row";s:2:"h2";s:6:",@view";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:"span";s:3:"all";s:4:"type";s:5:"label";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:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";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:"span";s:3:"all";s:4:"type";s:5:"label";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:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:4;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}', 'size' => '100%,210,,,,,auto', 'style' => '', 'modified' => '1231922193',);
 
-$templ_data[] = array('name' => 'calendar.edit.participants','template' => '','lang' => '','group' => '0','version' => '1.7.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:2:"70";}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:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:6:"select";s:4:"name";s:4:"role";s:4:"span";s:11:",selectRole";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:5:"align";s:6:"center";}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:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";s:5:"align";s:6:"center";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Role";}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:5:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:4:"name";s:18:"${row}[role_label]";}s:1:"E";a:3:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";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:28:"delete[$row_cont[delete_id]]";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%,210,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}','size' => '100%,210,,,,,auto','style' => '.selectRole select { width: 100%; }','modified' => '1248274661',);
+$templ_data[] = array('name' => 'calendar.edit.participants', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.7.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:2:"70";}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:4:{s:4:"type";s:3:"int";s:4:"size";s:4:"1,,3";s:4:"name";s:8:"quantity";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:6:"select";s:4:"name";s:4:"role";s:4:"span";s:11:",selectRole";}s:1:"E";a:4:{s:4:"type";s:6:"button";s:5:"label";s:3:"Add";s:4:"name";s:3:"add";s:5:"align";s:6:"center";}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:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"Quantity";s:5:"align";s:6:"center";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Role";}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:5:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:4:"name";s:18:"${row}[role_label]";}s:1:"E";a:3:{s:4:"type";s:6:"select";s:4:"name";s:14:"${row}[status]";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:28:"delete[$row_cont[delete_id]]";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%,210,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}', 'size' => '100%,210,,,,,auto', 'style' => '.selectRole select { width: 100%; }', 'modified' => '1248274661',);
 
-$templ_data[] = array('name' => 'calendar.edit.print','template' => '','lang' => '','group' => '0','version' => '1.6.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: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' => '1229280346',);
+$templ_data[] = array('name' => 'calendar.edit.print', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.6.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: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' => '1229280346',);
 
-$templ_data[] = array('name' => 'calendar.edit.recurrence','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:11:{s:1:"A";s:2:"95";s:1:"D";s:3:"50%";s:2:"c1";s:3:"row";s:2:"h1";s:12:",!@reference";s:2:"c2";s:2:"th";s:2:"h2";s:2:"12";s:2:"c3";s:3:"row";s:2:"h3";s:2:"12";s:2:"c4";s:3:"row";s:2:"h4";s:2:"12";s:2:"c5";s:7:"row,top";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Exception";}s:1:"B";a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:10:"recurrence";s:4:"type";s:9:"date-time";s:4:"span";s:5:",gray";}s:1:"C";a:3:{s:4:"name";s:9:"reference";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}s:1:"D";a:3:{s:4:"name";s:3:"uid";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}}i:2;a:4:{s:1:"A";a:3:{s:4:"span";s:8:"all,gray";s:4:"type";s:5:"label";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_type";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat type";}s:1:"B";a:3:{s:8:"onchange";s:34:"check_recur_type(\'recur_type\', 2);";s:4:"name";s:10:"recur_type";s:4:"type";s:6:"select";}s:1:"C";a:3:{s:4:"size";s:17:",,,recur_interval";s:4:"type";s:5:"label";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:"size";s:9:"None,2,31";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";}}i:4;a:4:{s:1:"A";a:3:{s:4:"size";s:16:",,,recur_enddate";s:4:"type";s:5:"label";s:5:"label";s:8:"End date";}s:1:"B";a:4:{s:4:"name";s:13:"recur_enddate";s:4:"type";s:4:"date";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";s:7:"onclick";s:136:"if(window.calendar.params.inputField.value == \'\') window.calendar.parseDate(document.getElementById(form::name(\'start\')+\'[str]\').value);";}s:1:"C";a:3:{s:4:"size";s:7:",,,tzid";s:4:"type";s:5:"label";s:5:"label";s:8:"Timezone";}s:1:"D";a:3:{s:4:"type";s:15:"select-timezone";s:4:"name";s:4:"tzid";s:4:"help";s:49:"Timezone in which recurrences have identical time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_data";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"name";s:10:"recur_data";s:4:"size";s:3:"6,1";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:5:"label";s:16:"@exception_label";s:7:"no_lang";s:1:"1";s:4:"name";s:17:"button[exception]";s:4:"type";s:6:"button";s:4:"help";s:38:"Create an exception for the given date";}}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:8:"readonly";s:4:"true";s:4:"name";s:4:"$row";s:4:"type";s:9:"date-time";}s:1:"B";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:21:"Delete this exception";}}}s:4:"cols";i:2;s:4:"rows";i:1;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"cols";i:4;s:4:"rows";i:5;s:4:"size";s:8:"100%,210";}}','size' => '100%,210','style' => '','modified' => '1350420142',);
+$templ_data[] = array('name' => 'calendar.edit.recurrence', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.001', 'data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:11:{s:1:"A";s:2:"95";s:1:"D";s:3:"50%";s:2:"c1";s:3:"row";s:2:"h1";s:12:",!@reference";s:2:"c2";s:2:"th";s:2:"h2";s:2:"12";s:2:"c3";s:3:"row";s:2:"h3";s:2:"12";s:2:"c4";s:3:"row";s:2:"h4";s:2:"12";s:2:"c5";s:7:"row,top";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Exception";}s:1:"B";a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:10:"recurrence";s:4:"type";s:9:"date-time";s:4:"span";s:5:",gray";}s:1:"C";a:3:{s:4:"name";s:9:"reference";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}s:1:"D";a:3:{s:4:"name";s:3:"uid";s:4:"type";s:5:"label";s:4:"span";s:5:",gray";}}i:2;a:4:{s:1:"A";a:3:{s:4:"span";s:8:"all,gray";s:4:"type";s:5:"label";s:5:"label";s:27:"Repeating Event Information";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_type";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat type";}s:1:"B";a:3:{s:8:"onchange";s:34:"check_recur_type(\'recur_type\', 2);";s:4:"name";s:10:"recur_type";s:4:"type";s:6:"select";}s:1:"C";a:3:{s:4:"size";s:17:",,,recur_interval";s:4:"type";s:5:"label";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:"size";s:9:"None,2,31";s:4:"help";s:53:"repeating interval, eg. 2 to repeat every second week";}}i:4;a:4:{s:1:"A";a:3:{s:4:"size";s:16:",,,recur_enddate";s:4:"type";s:5:"label";s:5:"label";s:8:"End date";}s:1:"B";a:4:{s:4:"name";s:13:"recur_enddate";s:4:"type";s:4:"date";s:4:"help";s:57:"repeat the event until which date (empty means unlimited)";s:7:"onclick";s:136:"if(window.calendar.params.inputField.value == \'\') window.calendar.parseDate(document.getElementById(form::name(\'start\')+\'[str]\').value);";}s:1:"C";a:3:{s:4:"size";s:7:",,,tzid";s:4:"type";s:5:"label";s:5:"label";s:8:"Timezone";}s:1:"D";a:3:{s:4:"type";s:15:"select-timezone";s:4:"name";s:4:"tzid";s:4:"help";s:49:"Timezone in which recurrences have identical time";}}i:5;a:4:{s:1:"A";a:3:{s:4:"size";s:13:",,,recur_data";s:4:"type";s:5:"label";s:5:"label";s:11:"Repeat days";}s:1:"B";a:4:{s:4:"type";s:10:"select-dow";s:4:"name";s:10:"recur_data";s:4:"size";s:3:"6,1";s:4:"help";s:44:"Days of the week for a weekly repeated event";}s:1:"C";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Exceptions";}i:2;a:5:{s:5:"label";s:16:"@exception_label";s:7:"no_lang";s:1:"1";s:4:"name";s:17:"button[exception]";s:4:"type";s:6:"button";s:4:"help";s:38:"Create an exception for the given date";}}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:8:"readonly";s:4:"true";s:4:"name";s:4:"$row";s:4:"type";s:9:"date-time";}s:1:"B";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:40:"return confirm(\'Delete this exception\');";s:4:"name";s:27:"delete_exception[$row_cont]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:21:"Delete this exception";}}}s:4:"cols";i:2;s:4:"rows";i:1;s:4:"name";s:15:"recur_exception";s:7:"options";a:0:{}}}}s:4:"cols";i:4;s:4:"rows";i:5;s:4:"size";s:8:"100%,210";}}', 'size' => '100%,210', 'style' => '', 'modified' => '1350420142',);
 
-$templ_data[] = array('name' => 'calendar.edit_series','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:8:{s:4:"type";s:4:"vbox";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:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}s:4:"name";s:13:"dialogHeader";s:4:"span";s:13:",promptheader";}i:2;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:67:"Do you want to edit this event as an exception or the whole series?";}s:4:"span";s:7:",prompt";s:4:"name";s:14:"dialog-content";i:2;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:14:"Edit exception";s:7:"onclick";s:17:"open_edit(false);";}i:2;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:11:"Edit series";s:7:"onclick";s:16:"open_edit(true);";}i:3;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:7:"onclick";s:62:"document.getElementById(\'edit_series\').style.display = \'none\';";}s:5:"align";s:6:"center";}}s:4:"name";s:11:"edit_series";}}','size' => '','style' => '','modified' => '1272449924',);
+$templ_data[] = array('name' => 'calendar.edit_series', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.7.003', 'data' => 'a:1:{i:0;a:8:{s:4:"type";s:4:"vbox";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:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}s:4:"name";s:13:"dialogHeader";s:4:"span";s:13:",promptheader";}i:2;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:67:"Do you want to edit this event as an exception or the whole series?";}s:4:"span";s:7:",prompt";s:4:"name";s:14:"dialog-content";i:2;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:14:"Edit exception";s:7:"onclick";s:17:"open_edit(false);";}i:2;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:11:"Edit series";s:7:"onclick";s:16:"open_edit(true);";}i:3;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:7:"onclick";s:62:"document.getElementById(\'edit_series\').style.display = \'none\';";}s:5:"align";s:6:"center";}}s:4:"name";s:11:"edit_series";}}', 'size' => '', 'style' => '', 'modified' => '1272449924',);
 
-$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:2:{s:2:"h5";s:2:",1";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:"all,message";s:4:"name";s:3:"msg";}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.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:2:{s:2:"h5";s:2:",1";s:2:"h1";s:6:",!@msg";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:"all,message";s:4:"name";s:3:"msg";}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.export_csv_select','template' => '','lang' => '','group' => '0','version' => '1.9.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:2:{s:2:"h1";s:6:",!@msg";s:1:"A";s:3:"150";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:"all,message";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"radio";s:4:"size";s:14:"search_results";s:4:"span";s:3:"all";s:5:"label";s:18:"Use search results";s:4:"name";s:9:"selection";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:6:{s:4:"type";s:5:"radio";s:4:"size";s:6:"filter";s:4:"span";s:3:"all";s:5:"label";s:21:"Use definition filter";s:4:"name";s:9:"selection";s:7:"onclick";s:50:"\\$j(\'div.filters\').show();\\$j(\'.criteria\').hide();";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:6:{s:4:"type";s:5:"radio";s:4:"size";s:8:"criteria";s:4:"span";s:3:"all";s:5:"label";s:19:"Use given criteria:";s:4:"name";s:9:"selection";s:8:"onchange";s:50:"\\$j(\'.criteria\').show();\\$j(\'div.filters\').hide();";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"grid";s:4:"name";s:8:"criteria";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"size";s:1:"1";s:5:"label";s:5:"Start";i:1;a:1:{s:4:"type";s:3:"box";}}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:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";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:3;a:2:{s:1:"A";a:4:{s:4:"type";s:14:"select-account";s:4:"span";s:9:"2,shorter";s:4:"name";s:5:"owner";s:4:"size";s:6:"5,both";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:4:"span";s:3:"all";s:4:"size";s:11:",,,criteria";s:7:"options";a:1:{i:3;s:8:"criteria";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '.shorter select {
+$templ_data[] = array('name' => 'calendar.export_csv_select', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.003', 'data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:2:{s:2:"h1";s:6:",!@msg";s:1:"A";s:3:"150";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:11:"all,message";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"radio";s:4:"size";s:14:"search_results";s:4:"span";s:3:"all";s:5:"label";s:18:"Use search results";s:4:"name";s:9:"selection";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:6:{s:4:"type";s:5:"radio";s:4:"size";s:6:"filter";s:4:"span";s:3:"all";s:5:"label";s:21:"Use definition filter";s:4:"name";s:9:"selection";s:7:"onclick";s:50:"\\$j(\'div.filters\').show();\\$j(\'.criteria\').hide();";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:4;a:2:{s:1:"A";a:6:{s:4:"type";s:5:"radio";s:4:"size";s:8:"criteria";s:4:"span";s:3:"all";s:5:"label";s:19:"Use given criteria:";s:4:"name";s:9:"selection";s:8:"onchange";s:50:"\\$j(\'.criteria\').show();\\$j(\'div.filters\').hide();";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"grid";s:4:"name";s:8:"criteria";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"size";s:1:"1";s:5:"label";s:5:"Start";i:1;a:1:{s:4:"type";s:3:"box";}}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:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";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:3;a:2:{s:1:"A";a:4:{s:4:"type";s:14:"select-account";s:4:"span";s:9:"2,shorter";s:4:"name";s:5:"owner";s:4:"size";s:6:"5,both";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;s:4:"span";s:3:"all";s:4:"size";s:11:",,,criteria";s:7:"options";a:1:{i:3;s:8:"criteria";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}', 'size' => '', 'style' => '.shorter select {
   width: 170px;
 }','modified' => '1358792945',);
 
-$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.3.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:",calendar_size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",message";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:6:{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";s:8:"onchange";s:92:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\');";s:4:"size";s:12:"Use end date";}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' => '.calendar_size120b { text-size: 120%; font-weight: bold; }
+$templ_data[] = array('name' => 'calendar.freetimesearch', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.3.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:",calendar_size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",message";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:6:{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";s:8:"onchange";s:92:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\');";s:4:"size";s:12:"Use end date";}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' => '.calendar_size120b { text-size: 120%; font-weight: bold; }
 .message { color: red; font-style: italic; }
 .end_hide { visibility: hidden; }','modified' => '1149297367',);
 
-$templ_data[] = array('name' => 'calendar.freetimesearch.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Select";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"size";s:3:",16";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[start]";s:4:"help";s:13:"select a time";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Select";s:4:"name";s:12:"select[$row]";s:4:"help";s:41:"use the selected time and close the popup";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1097183756',);
+$templ_data[] = array('name' => 'calendar.freetimesearch.rows', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.0.1.001', 'data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Select";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"size";s:3:",16";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[start]";s:4:"help";s:13:"select a time";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Select";s:4:"name";s:12:"select[$row]";s:4:"help";s:41:"use the selected time and close the popup";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:4;}}', 'size' => '', 'style' => '', 'modified' => '1097183756',);
 
-$templ_data[] = array('name' => 'calendar.import','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,message";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"iCal file";}s:1:"B";a:3:{s:4:"type";s:4:"file";s:4:"name";s:9:"ical_file";s:6:"needed";s:1:"1";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131469789',);
+$templ_data[] = array('name' => 'calendar.import', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.0.1.001', 'data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,message";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"iCal file";}s:1:"B";a:3:{s:4:"type";s:4:"file";s:4:"name";s:9:"ical_file";s:6:"needed";s:1:"1";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}', 'size' => '', 'style' => '', 'modified' => '1131469789',);
 
-$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.9.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:6:",!@msg";s:2:"h1";s:6:",!@css";s:2:"c4";s:7:"noPrint";s:1:"B";s:3:"30%";s:2:"h4";s:34:",!@nm[selectcols]=/legacy_actions/";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}}i:2;a:2:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:13:"all,message";}s:1:"B";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:10:",message";}}i:3;a:2:{s:1:"A";a:4:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";s:4:"span";s:3:"all";}s:1:"B";a:3:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";}}i:4;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"label";s:13:"Select action";s:7:"onclick";s:183:"if (!egw_globalObjectManager.getObjectById(\'calendar.list.rows\').executeActionImplementation(this, \'popup\')) alert(egw::lang(\'You need to select some entries first!\')); return false;;";s:4:"name";s:14:"legacy_actions";s:4:"type";s:10:"buttononly";s:4:"help";s:13:"Select action";}i:2;a:8:{s:5:"label";s:9:"Check all";s:7:"onclick";s:94:"egw_globalObjectManager.getObjectById(\'calendar.list.rows\').toggleAllSelected(); return false;";s:6:"needed";s:1:"1";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:4:"help";s:9:"Check all";s:4:"span";s:14:",checkAllArrow";}s:5:"align";s:5:"right";}}i:5;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:12:"delete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:77:"Do you want to delete this event as an exception, or delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:16:"Delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:6:"delete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:13:"Delete series";s:7:"onclick";s:74:"nm_popup_action.id = \'delete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:13:"delete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:35:"nm_hide_popup(this,\'delete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:14:"undelete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Un-delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:83:"Do you want to Un-delete this event as an exception, or un-delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:19:"Un-delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:8:"undelete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:16:"Un-delete series";s:7:"onclick";s:76:"nm_popup_action.id = \'undelete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:15:"undelete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:37:"nm_hide_popup(this,\'undelete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }
+$templ_data[] = array('name' => 'calendar.list', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.003', 'data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:6:",!@msg";s:2:"h1";s:6:",!@css";s:2:"c4";s:7:"noPrint";s:1:"B";s:3:"30%";s:2:"h4";s:34:",!@nm[selectcols]=/legacy_actions/";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}}i:2;a:2:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:13:"all,message";}s:1:"B";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:10:",message";}}i:3;a:2:{s:1:"A";a:4:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";s:4:"span";s:3:"all";}s:1:"B";a:3:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";}}i:4;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"label";s:13:"Select action";s:7:"onclick";s:183:"if (!egw_globalObjectManager.getObjectById(\'calendar.list.rows\').executeActionImplementation(this, \'popup\')) alert(egw::lang(\'You need to select some entries first!\')); return false;;";s:4:"name";s:14:"legacy_actions";s:4:"type";s:10:"buttononly";s:4:"help";s:13:"Select action";}i:2;a:8:{s:5:"label";s:9:"Check all";s:7:"onclick";s:94:"egw_globalObjectManager.getObjectById(\'calendar.list.rows\').toggleAllSelected(); return false;";s:6:"needed";s:1:"1";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:4:"help";s:9:"Check all";s:4:"span";s:14:",checkAllArrow";}s:5:"align";s:5:"right";}}i:5;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:12:"delete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:77:"Do you want to delete this event as an exception, or delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:16:"Delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:6:"delete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:13:"Delete series";s:7:"onclick";s:74:"nm_popup_action.id = \'delete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:13:"delete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:35:"nm_hide_popup(this,\'delete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:14:"undelete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Un-delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:83:"Do you want to Un-delete this event as an exception, or un-delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:19:"Un-delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:8:"undelete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:16:"Un-delete series";s:7:"onclick";s:76:"nm_popup_action.id = \'undelete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:15:"undelete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:37:"nm_hide_popup(this,\'undelete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:4:"100%";}}', 'size' => '100%', 'style' => '.noWrap { white-space: nowrap; }
 
 .image16 img {
   height: 16px;
@@ -72,11 +72,11 @@ 
   display:none;
 }','modified' => '1357766044',);
 
-$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.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.9.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"B";s:3:"40%";s:2:"c1";s:2:"th";s:2:"c2";s:40:"$row_cont[category] $row_cont[class],top";}i:1;a:13:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:3:"End";s:4:"name";s:7:"cal_end";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"C";a:3:{s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:3:{s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"E";a:3:{s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"F";a:3:{s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";s:4:"type";s:16:"nextmatch-header";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:5:"label";s:5:"Owner";s:8:"readonly";s:4:"true";s:4:"name";s:9:"cal_owner";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:8:"Location";s:4:"name";s:12:"cal_location";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"H";a:4:{s:5:"label";s:5:"Owner";s:8:"readonly";s:4:"true";s:4:"name";s:9:"cal_owner";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:5:"label";s:8:"Location";s:4:"name";s:12:"cal_location";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"J";a:4:{s:5:"label";s:12:"Participants";s:4:"name";s:11:"participant";s:4:"size";s:3:"All";s:4:"type";s:23:"nextmatch-accountfilter";}s:1:"K";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:11:"cal_created";}i:2;a:4:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:11:"cal_creator";s:4:"size";s:7:"Creator";s:5:"label";s:7:"Creator";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Last changed";}}s:1:"L";a:4:{s:5:"label";s:13:"Custom fields";s:8:"readonly";s:4:"true";s:4:"name";s:3:"cfs";s:4:"type";s:22:"nextmatch-customfields";}s:1:"M";a:7:{s:5:"label";s:7:"Actions";s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Actions";s:4:"help";s:9:"Check all";s:4:"span";s:8:",noPrint";s:4:"name";s:14:"legacy_actions";}i:2;a:8:{s:5:"label";s:9:"Check all";s:7:"onclick";s:94:"egw_globalObjectManager.getObjectById(\'calendar.list.rows\').toggleAllSelected(); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:4:"help";s:9:"Check all";}s:4:"span";s:8:",noPrint";}}i:2;a:13:{s:1:"A";a:5:{s:4:"name";s:5:"start";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[start]";s:4:"size";s:14:",$cont[format]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:8:"readonly";s:4:"true";s:4:"name";s:11:"${row}[end]";s:4:"size";s:14:",$cont[format]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:6:{s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"2";s:4:"type";s:4:"hbox";i:1;a:5:{s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"size";s:1:"b";s:4:"type";s:5:"label";}i:2;a:5:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:10:"${row}[id]";s:4:"size";s:1:"b";s:5:"align";s:5:"right";}}i:2;a:5:{s:7:"no_lang";s:1:"1";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[description]";s:4:"type";s:5:"label";}s:4:"span";s:16:",listDescription";}i:3;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[recure]";s:4:"type";s:5:"label";}s:4:"span";s:9:",listVbox";}s:1:"C";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"name";s:13:"${row}[title]";s:4:"type";s:5:"label";}i:2;a:5:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:10:"${row}[id]";s:4:"size";s:1:"b";s:5:"align";s:5:"right";}}s:1:"D";a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[description]";s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"name";s:14:"${row}[recure]";s:4:"type";s:5:"label";}s:1:"F";a:3:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:16:"${row}[category]";}s:1:"G";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:5:"class";s:6:"noWrap";s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";}i:2;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";s:4:"type";s:5:"label";}}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:5:"class";s:6:"noWrap";s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";}s:1:"I";a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";s:4:"type";s:5:"label";}s:1:"J";a:4:{s:8:"readonly";s:4:"true";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[parts]";s:4:"type";s:4:"html";}s:1:"K";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";}}s:1:"L";a:2:{s:4:"name";s:4:"$row";s:4:"type";s:17:"customfields-list";}s:1:"M";a:5:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:7:{s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:5:"label";s:4:"View";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;";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:4:"help";s:15:"View this event";}i:2;a:6:{s:5:"label";s:4:"Edit";s:7:"onclick";s:20:"$row_cont[edit_link]";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:4:"help";s:15:"Edit this event";}i:3;a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:17:"Delete this event";}i:4;a:5:{s:5:"align";s:5:"right";s:4:"name";s:9:"checked[]";s:4:"size";s:35:"$row_cont[id]:$row_cont[recur_date]";s:4:"type";s:8:"checkbox";s:4:"help";s:45:"Select multiple contacts for a further action";}}i:2;a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"hbox";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:15:"etemplate/merge";s:5:"label";s:5:"merge";s:4:"name";s:45:"document[$row_cont[id]:$row_cont[recur_date]]";}i:2;a:6:{s:5:"label";s:11:"Filemanager";s:4:"size";s:18:"filemanager/navbar";s:4:"type";s:6:"button";s:4:"name";s:26:"filemanager[$row_cont[id]]";s:4:"span";s:8:",image16";s:7:"onclick";s:139:"window.location.href=egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.index&path=/apps/calendar/$row_cont[id]\'); return false;";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:267:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=$row_cont[app]&cat_id=$row_cont[category]&link_id[]=$row_cont[app_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}s:4:"span";s:8:",noPrint";}}}s:4:"cols";i:13;s:4:"rows";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1298450177',);
+$templ_data[] = array('name' => 'calendar.list.rows', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.004', 'data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"B";s:3:"40%";s:2:"c1";s:2:"th";s:2:"c2";s:40:"$row_cont[category] $row_cont[class],top";}i:1;a:13:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:3:"End";s:4:"name";s:7:"cal_end";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"C";a:3:{s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:3:{s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"E";a:3:{s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"F";a:3:{s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";s:4:"type";s:16:"nextmatch-header";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:5:"label";s:5:"Owner";s:8:"readonly";s:4:"true";s:4:"name";s:9:"cal_owner";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:8:"Location";s:4:"name";s:12:"cal_location";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"H";a:4:{s:5:"label";s:5:"Owner";s:8:"readonly";s:4:"true";s:4:"name";s:9:"cal_owner";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:5:"label";s:8:"Location";s:4:"name";s:12:"cal_location";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"J";a:4:{s:5:"label";s:12:"Participants";s:4:"name";s:11:"participant";s:4:"size";s:3:"All";s:4:"type";s:23:"nextmatch-accountfilter";}s:1:"K";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:11:"cal_created";}i:2;a:4:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:11:"cal_creator";s:4:"size";s:7:"Creator";s:5:"label";s:7:"Creator";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Last changed";}}s:1:"L";a:4:{s:5:"label";s:13:"Custom fields";s:8:"readonly";s:4:"true";s:4:"name";s:3:"cfs";s:4:"type";s:22:"nextmatch-customfields";}s:1:"M";a:7:{s:5:"label";s:7:"Actions";s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Actions";s:4:"help";s:9:"Check all";s:4:"span";s:8:",noPrint";s:4:"name";s:14:"legacy_actions";}i:2;a:8:{s:5:"label";s:9:"Check all";s:7:"onclick";s:94:"egw_globalObjectManager.getObjectById(\'calendar.list.rows\').toggleAllSelected(); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:4:"help";s:9:"Check all";}s:4:"span";s:8:",noPrint";}}i:2;a:13:{s:1:"A";a:5:{s:4:"name";s:5:"start";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[start]";s:4:"size";s:14:",$cont[format]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:8:"readonly";s:4:"true";s:4:"name";s:11:"${row}[end]";s:4:"size";s:14:",$cont[format]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:6:{s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"2";s:4:"type";s:4:"hbox";i:1;a:5:{s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"size";s:1:"b";s:4:"type";s:5:"label";}i:2;a:5:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:10:"${row}[id]";s:4:"size";s:1:"b";s:5:"align";s:5:"right";}}i:2;a:5:{s:7:"no_lang";s:1:"1";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[description]";s:4:"type";s:5:"label";}s:4:"span";s:16:",listDescription";}i:3;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[recure]";s:4:"type";s:5:"label";}s:4:"span";s:9:",listVbox";}s:1:"C";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"name";s:13:"${row}[title]";s:4:"type";s:5:"label";}i:2;a:5:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:10:"${row}[id]";s:4:"size";s:1:"b";s:5:"align";s:5:"right";}}s:1:"D";a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[description]";s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"name";s:14:"${row}[recure]";s:4:"type";s:5:"label";}s:1:"F";a:3:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:16:"${row}[category]";}s:1:"G";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:5:"class";s:6:"noWrap";s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";}i:2;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";s:4:"type";s:5:"label";}}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:5:"class";s:6:"noWrap";s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";}s:1:"I";a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";s:4:"type";s:5:"label";}s:1:"J";a:4:{s:8:"readonly";s:4:"true";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[parts]";s:4:"type";s:4:"html";}s:1:"K";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";}}s:1:"L";a:2:{s:4:"name";s:4:"$row";s:4:"type";s:17:"customfields-list";}s:1:"M";a:5:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:7:{s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:5:"label";s:4:"View";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;";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:4:"help";s:15:"View this event";}i:2;a:6:{s:5:"label";s:4:"Edit";s:7:"onclick";s:20:"$row_cont[edit_link]";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:4:"help";s:15:"Edit this event";}i:3;a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:17:"Delete this event";}i:4;a:5:{s:5:"align";s:5:"right";s:4:"name";s:9:"checked[]";s:4:"size";s:35:"$row_cont[id]:$row_cont[recur_date]";s:4:"type";s:8:"checkbox";s:4:"help";s:45:"Select multiple contacts for a further action";}}i:2;a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"hbox";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:15:"etemplate/merge";s:5:"label";s:5:"merge";s:4:"name";s:45:"document[$row_cont[id]:$row_cont[recur_date]]";}i:2;a:6:{s:5:"label";s:11:"Filemanager";s:4:"size";s:18:"filemanager/navbar";s:4:"type";s:6:"button";s:4:"name";s:26:"filemanager[$row_cont[id]]";s:4:"span";s:8:",image16";s:7:"onclick";s:139:"window.location.href=egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.index&path=/apps/calendar/$row_cont[id]\'); return false;";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:267:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=$row_cont[app]&cat_id=$row_cont[category]&link_id[]=$row_cont[app_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}s:4:"span";s:8:",noPrint";}}}s:4:"cols";i:13;s:4:"rows";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}', 'size' => '100%', 'style' => '', 'modified' => '1298450177',);
 
-$templ_data[] = array('name' => 'calendar.meeting','template' => '','lang' => '','group' => '0','version' => '1.9.002','data' => 'a:4:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:19:",message leftPad5";}i:1;a:6:{s:4:"type";s:4:"grid";s:4:"size";s:3:",,0";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",!@ics_method=request";s:2:"h2";s:19:",!@ics_method=reply";}i:1;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:36:"This mail contains a meeting request";}s:1:"B";a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Accept";s:4:"name";s:14:"button[accept]";i:1;a:1:{s:4:"type";s:4:"hbox";}s:4:"span";s:9:",leftPad5";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[tentativ]";s:5:"label";s:9:"Tentative";s:4:"span";s:9:",leftPad5";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reject]";s:5:"label";s:6:"Reject";s:4:"span";s:9:",leftPad5";}s:1:"E";a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:22:"Edit event in calendar";s:7:"onclick";s:184:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=750,height=410,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:9:",leftPad5";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:47:"This mail contains a reply to a meeting request";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"span";s:9:",leftPad5";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:7:"options";a:1:{i:2;s:1:"0";}}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:2:"th";s:1:"A";s:3:"100";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c3";s:3:"row";s:2:"c6";s:3:"row";s:2:"c7";s:7:"row,top";s:2:"c5";s:3:"row";s:2:"c8";s:7:"row,top";s:2:"h5";s:9:",!@recure";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:4:"name";s:16:"ics_method_label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"title";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"location";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:"-";}}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Recurrence";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"recure";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Organizer";}s:1:"B";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:9:"organizer";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"description";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"all_participants";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:21:"100%,,,meetingRequest";s:7:"options";a:2:{i:3;s:14:"meetingRequest";i:0;s:4:"100%";}}}','size' => ',,0','style' => '#popupMainDiv {
+$templ_data[] = array('name' => 'calendar.meeting', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.9.002', 'data' => 'a:4:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:19:",message leftPad5";}i:1;a:6:{s:4:"type";s:4:"grid";s:4:"size";s:3:",,0";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",!@ics_method=request";s:2:"h2";s:19:",!@ics_method=reply";}i:1;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:36:"This mail contains a meeting request";}s:1:"B";a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Accept";s:4:"name";s:14:"button[accept]";i:1;a:1:{s:4:"type";s:4:"hbox";}s:4:"span";s:9:",leftPad5";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[tentativ]";s:5:"label";s:9:"Tentative";s:4:"span";s:9:",leftPad5";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reject]";s:5:"label";s:6:"Reject";s:4:"span";s:9:",leftPad5";}s:1:"E";a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:22:"Edit event in calendar";s:7:"onclick";s:184:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=750,height=410,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:9:",leftPad5";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:47:"This mail contains a reply to a meeting request";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"span";s:9:",leftPad5";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:7:"options";a:1:{i:2;s:1:"0";}}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:2:"th";s:1:"A";s:3:"100";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c3";s:3:"row";s:2:"c6";s:3:"row";s:2:"c7";s:7:"row,top";s:2:"c5";s:3:"row";s:2:"c8";s:7:"row,top";s:2:"h5";s:9:",!@recure";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:4:"name";s:16:"ics_method_label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"title";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"location";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:"-";}}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Recurrence";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"recure";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Organizer";}s:1:"B";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:9:"organizer";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"description";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"all_participants";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:21:"100%,,,meetingRequest";s:7:"options";a:2:{i:3;s:14:"meetingRequest";i:0;s:4:"100%";}}}', 'size' => ',,0', 'style' => '#popupMainDiv {
  border: none;
  margin: 0;
 }
@@ -103,11 +103,11 @@ 
 
 ','modified' => '1338903760',);
 
-$templ_data[] = array('name' => 'calendar.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{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:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;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:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{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";s:8:"readonly";s:1:"1";}}}i:4;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:7:{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";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;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:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",calendar_inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;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:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;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:6:{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";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{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:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:20:"calendar.print.links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}','size' => '','style' => '','modified' => '1229596125',);
+$templ_data[] = array('name' => 'calendar.print', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.6.001', 'data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{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:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;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:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{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";s:8:"readonly";s:1:"1";}}}i:4;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:7:{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";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;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:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",calendar_inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;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:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;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:6:{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";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{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:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:20:"calendar.print.links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}', 'size' => '', 'style' => '', 'modified' => '1229596125',);
 
-$templ_data[] = array('name' => 'calendar.print.links','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:2:"95";s:2:"c1";s:2:"th";s:2:"c2";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:2;s:4:"size";s:17:"100%,200,,,,,auto";}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1231922363',);
+$templ_data[] = array('name' => 'calendar.print.links', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.6.001', 'data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:2:"95";s:2:"c1";s:2:"th";s:2:"c2";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:2;s:4:"size";s:17:"100%,200,,,,,auto";}}', 'size' => '100%,200,,,,,auto', 'style' => '', 'modified' => '1231922363',);
 
-$templ_data[] = array('name' => 'calendar.print.participants','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c3";s:4:",top";s:1:"D";s:24:",@hide_status_recurrence";s:2:"c2";s:2:"th";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";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:1:{s:4:"type";s:5:"label";}}i:2;a:5:{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";}}i:3;a:5:{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:4:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";s:8:"readonly";s:1:"1";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}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:4:"rows";i:3;s:4:"cols";i:5;s:4:"size";s:14:"100%,,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:2:{i:0;s:4:"100%";i:6;s:4:"auto";}}}','size' => '100%,,,,,,auto','style' => '','modified' => '1229357325',);
+$templ_data[] = array('name' => 'calendar.print.participants', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '1.6.001', 'data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c3";s:4:",top";s:1:"D";s:24:",@hide_status_recurrence";s:2:"c2";s:2:"th";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:5:"label";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:1:{s:4:"type";s:5:"label";}}i:2;a:5:{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";}}i:3;a:5:{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:4:{s:4:"type";s:3:"int";s:4:"name";s:16:"${row}[quantity]";s:4:"size";s:4:"1,,3";s:8:"readonly";s:1:"1";}s:1:"D";a:4:{s:4:"type";s:8:"checkbox";s:4:"name";s:25:"${row}[status_recurrence]";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}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:4:"rows";i:3;s:4:"cols";i:5;s:4:"size";s:14:"100%,,,,,,auto";s:4:"name";s:12:"participants";s:7:"options";a:2:{i:0;s:4:"100%";i:6;s:4:"auto";}}}', 'size' => '100%,,,,,,auto', 'style' => '', 'modified' => '1229357325',);
 
-$templ_data[] = array('name' => 'calendar.test','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"name";s:8:"#project";s:6:"needed";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:10:"link-entry";s:4:"name";s:4:"test";s:6:"needed";s:1:"1";s:4:"size";s:14:"projectmanager";}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1305704690',);
+$templ_data[] = array('name' => 'calendar.test', 'template' => '', 'lang' => '', 'group' => '0', 'version' => '', 'data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"name";s:8:"#project";s:6:"needed";s:1:"1";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:10:"link-entry";s:4:"name";s:4:"test";s:6:"needed";s:1:"1";s:4:"size";s:14:"projectmanager";}}}s:4:"rows";i:2;s:4:"cols";i:1;}}', 'size' => '', 'style' => '', 'modified' => '1305704690',);
 

calendar/setup/tables_update.inc.php

Spacing +430 added lines, -430 removed lines

@@ -18,7 +18,7 @@ 
 		{
 			$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
 		}
-		if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
+		if ($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'], '0.9.10pre4'))
 		{
 			$acctstbl = 'accounts';
 		}
@@ -26,7 +26,7 @@ 
 		{
 			$acctstbl = 'phpgw_accounts';
 		}
-		for($i=0;$i<count($owner);$i++)
+		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();
@@ -39,8 +39,8 @@ 
 
 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');
+	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'];
 }
@@ -207,12 +207,12 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
+	$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))
+	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())
+		$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');
@@ -222,13 +222,13 @@ 
 			$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__);
+			$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__);
+				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -249,17 +249,17 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
+	$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))
+	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())
+		$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__);
+			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -282,18 +282,18 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
+	$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))
+	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())
+		$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']))
+			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)));
+				$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
@@ -303,12 +303,12 @@ 
 			}
 			$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__);
+			$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['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'];
@@ -320,19 +320,19 @@ 
 	$db2 = $GLOBALS['egw_setup']->db;
 
 	$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['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())
+		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->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__);
+			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 		}
 	}
 
@@ -580,22 +580,22 @@ 
 {
 	$db2 = $GLOBALS['egw_setup']->db;
 
-	if(extension_loaded('mcal') == False)
+	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(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);
 	}
 
 // calendar_entry => phpgw_cal
@@ -622,13 +622,13 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$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)
+		switch ($access)
 		{
 			case 'private':
 				$is_public = 0;
@@ -650,7 +650,7 @@ 
 		$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__);
+			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry');
 
@@ -658,12 +658,12 @@ 
 	$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')
+				'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(),
@@ -671,12 +671,12 @@ 
 			'uc' => array()
 		)
 	);
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-		switch($recur_type)
+		switch ($recur_type)
 		{
 			case 'daily':
 				$recur_type_num = RECUR_DAILY;
@@ -699,20 +699,20 @@ 
 		$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);
+		$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__);
+			. "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['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'];
@@ -731,11 +731,11 @@ 
 	$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')
+				'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'),
+			'pk' => array('locale', 'name'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
@@ -767,10 +767,10 @@ 
 	$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')
+				'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(),
@@ -787,10 +787,10 @@ 
 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['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'mday', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'month_num', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'occurence', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'dow', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.008';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -807,7 +807,7 @@ 
 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['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'];
@@ -842,7 +842,7 @@ 
 
 function calendar_upgrade0_9_13_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','reference',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'reference', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -854,7 +854,7 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
 		Array(
 			'fd' => array(
-				'alarm_id' => array('type' => 'auto','nullable' => False),
+				'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),
@@ -867,8 +867,8 @@ 
 		)
 	);
 
-	$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['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'];
@@ -877,7 +877,7 @@ 
 
 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['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'];
@@ -887,18 +887,18 @@ 
 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())
+	$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));
+	$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))
+	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['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'];
@@ -907,7 +907,7 @@ 
 
 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['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'];
@@ -917,20 +917,20 @@ 
 
 function calendar_upgrade0_9_13_007()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u'
 	));
 
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-			'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'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'),
+		'pk' => array('cal_id', 'cal_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -947,7 +947,7 @@ 
 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(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
@@ -964,15 +964,15 @@ 
 
 function calendar_upgrade0_9_16_002()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'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', '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(),
@@ -988,14 +988,14 @@ 
 
 function calendar_upgrade0_9_16_003()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_login' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-			'cal_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+			'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'),
+		'pk' => array('cal_id', 'cal_login', 'cal_type'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1009,16 +1009,16 @@ 
 
 function calendar_upgrade0_9_16_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays', array(
 		'fd' => array(
-			'hol_id' => array('type' => 'auto','nullable' => False),
-			'locale' => array('type' => 'char','precision' => '2','nullable' => False),
-			'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')
+			'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(),
@@ -1036,13 +1036,13 @@ 
 {
 	// 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__);
+	$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->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=''");
@@ -1065,7 +1065,7 @@ 
 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['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays', 'hol_id');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1075,19 +1075,19 @@ 
 
 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['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'];
@@ -1097,13 +1097,13 @@ 
 
 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['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'];
@@ -1113,8 +1113,8 @@ 
 
 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['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'];
@@ -1124,7 +1124,7 @@ 
 
 function calendar_upgrade1_0_0_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -1139,15 +1139,15 @@ 
 
 function calendar_upgrade1_0_0_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'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', '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(),
@@ -1164,19 +1164,19 @@ 
 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)
+	foreach (array('cal_user', 'cal_repeats', 'cal_extra', 'cal_holidays', 'cal') as $name)
 	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name,'egw_'.$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(
+	$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)
+			'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'),
+		'pk' => array('cal_id', 'cal_start'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1184,49 +1184,49 @@ 
 	$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(
+	$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_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')
+			'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(
+	), '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_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')
+			'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');
+	), 'cal_endtime');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1242,15 +1242,15 @@ 
 		'precision' => '8',
 		'default' => '0'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$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')
+			'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'),
+		'pk' => array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1264,50 +1264,50 @@ 
 
 function calendar_upgrade1_0_1_002()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$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_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')
+			'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(
+	), '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(
+	$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(
+	$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(
+	$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(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_modifier', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
@@ -1320,36 +1320,36 @@ 
 
 function calendar_upgrade1_0_1_003()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$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' => '')
+			'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(
+	), '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(
+	$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(
+	$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(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_data', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
@@ -1363,13 +1363,13 @@ 
 
 function calendar_upgrade1_0_1_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$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(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -1384,7 +1384,7 @@ 
 
 function calendar_upgrade1_0_1_005()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1'
@@ -1398,7 +1398,7 @@ 
 
 function calendar_upgrade1_0_1_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_non_blocking',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_non_blocking', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1412,9 +1412,9 @@ 
 
 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']->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(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_exception', array(
 		'type' => 'text'
 	));
 
@@ -1431,11 +1431,11 @@ 
 	{
 		$customfields = array();
 		$order = 0;
-		foreach($config_data['fields'] as $name => $data)
+		foreach ($config_data['fields'] as $name => $data)
 		{
 			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
 			{
-				$customfields[substr($name,1)] = array(
+				$customfields[substr($name, 1)] = array(
 					'type'  => 'text',
 					'len'   => $data['length'].($data['shown'] ? ','.$data['shown'] : ''),
 					'label' => $data['name'],
@@ -1458,38 +1458,38 @@ 
 function calendar_upgrade1_0_1_009()
 {
 	$db2 = clone($GLOBALS['egw_setup']->db);
-	$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)))
+	$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)
+		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');
+			$db2->insert('egw_cal_user', array('cal_status' => 'U'), $row, __LINE__, __FILE__, 'calendar');
 		}
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$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_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_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');
+	), 'cal_groups');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2';
 }
@@ -1499,7 +1499,7 @@ 
 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__);
+	$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';
 }
@@ -1507,7 +1507,7 @@ 
 
 function calendar_upgrade1_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_special',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_special', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1525,7 +1525,7 @@ 
 
 function calendar_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_etag',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
@@ -1537,59 +1537,59 @@ 
 
 function calendar_upgrade1_5()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$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_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')
+			'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(
+	), '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_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_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(
+	), '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__);
+	$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';
 }
@@ -1597,12 +1597,12 @@ 
 
 function calendar_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$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(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False
@@ -1616,12 +1616,12 @@ 
 {
 	// update the alarm methods
 	$async = new asyncservice();
-	foreach((array)$async->read('cal:%') as $job)
+	foreach ((array)$async->read('cal:%') as $job)
 	{
 		if ($job['method'] == 'calendar.bocalupdate.send_alarm')
 		{
 			$job['method'] = 'calendar.calendar_boupdate.send_alarm';
-			$async->write($job,true);
+			$async->write($job, true);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.6';
@@ -1638,48 +1638,48 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag, cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
 	// Search series exception for nearest exception in series master and add that RECURRENCE-ID
 	// as cal_reference (for 1.6.003 and move it to new field cal_recurrence in 1.7.001)
 	$diff = null;
-	foreach($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
 		JOIN egw_cal_dates ON egw_cal.cal_id=egw_cal_dates.cal_id
 		JOIN egw_cal_repeats ON cal_reference=egw_cal_repeats.cal_id
-		WHERE cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		$recurrence = null;
-		foreach(explode(',',$row['recur_exception']) as $ts)
+		foreach (explode(',', $row['recur_exception']) as $ts)
 		{
-			if (is_null($recurrence) || abs($ts-$row['cal_start']) < $diff)
+			if (is_null($recurrence) || abs($ts - $row['cal_start']) < $diff)
 			{
 				$recurrence = $ts;
-				$diff = abs($ts-$row['cal_start']);
+				$diff = abs($ts - $row['cal_start']);
 			}
 		}
 		if ($recurrence)
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$recurrence.
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 		else
 		{
 			// if we cannot determine the RECURRENCE-ID use cal_start
 			// because RECURRENCE-ID must be present
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$row['cal_start'].
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
@@ -1694,33 +1694,33 @@ 
  */
 function calendar_upgrade1_6_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'creating user'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'comment' => 'creating user'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'creation time of event'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'creation time of event'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_recurrence',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_recurrence', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -1731,14 +1731,14 @@ 
 	// move RECURRENCE-ID from temporarily (1.6.003)
 	// used field cal_reference to new field cal_recurrence
 	// and restore cal_reference field of series exceptions with id of the series master
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id AS cal_id_ex,cal_master.cal_id AS cal_id_master,
 		cal_ex.cal_reference AS cal_reference_ex,cal_ex.cal_uid AS cal_uid_ex,
 		cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master
 		ON cal_ex.cal_uid=cal_master.cal_uid AND cal_master.cal_reference = 0 AND cal_ex.cal_owner = cal_master.cal_owner
-		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_recurrence='.(int)$row['cal_reference_ex'].
 			', cal_reference='.(int)$row['cal_id_master'].
@@ -1755,7 +1755,7 @@ 
  */
 function calendar_upgrade1_7_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT'
@@ -1771,14 +1771,14 @@ 
  */
 function calendar_upgrade1_7_002()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones', array(
 		'fd' => array(
-			'tz_id' => array('type' => 'auto','nullable' => False),
-			'tz_tzid' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'tz_alias' => array('type' => 'int','precision' => '4','comment' => 'tz_id for data'),
-			'tz_latitude' => array('type' => 'int','precision' => '4'),
-			'tz_longitude' => array('type' => 'int','precision' => '4'),
-			'tz_component' => array('type' => 'text','comment' => 'iCal VTIMEZONE component')
+			'tz_id' => array('type' => 'auto', 'nullable' => False),
+			'tz_tzid' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'tz_alias' => array('type' => 'int', 'precision' => '4', 'comment' => 'tz_id for data'),
+			'tz_latitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_longitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_component' => array('type' => 'text', 'comment' => 'iCal VTIMEZONE component')
 		),
 		'pk' => array('tz_id'),
 		'fk' => array(),
@@ -1798,38 +1798,38 @@ 
  */
 function calendar_upgrade1_7_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u',
 		'comment' => 'u=user, g=group, c=contact, r=resource, e=email'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False,
 		'comment' => 'id or email-address for type=e'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_status', array(
 		'type' => 'char',
 		'precision' => '1',
 		'default' => 'A',
 		'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1',
 		'comment' => 'only for certain types (eg. resources)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT',
 		'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_modified', array(
 		'type' => 'timestamp',
 		'default' => 'current_timestamp',
 		'comment' => 'automatic timestamp of last update'
@@ -1845,19 +1845,19 @@ 
  */
 function calendar_upgrade1_7_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'starttime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_end',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'endtime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','tz_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'tz_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'key into egw_cal_timezones'
@@ -1866,7 +1866,7 @@ 
 	// set id of server timezone for existing events, as that's the timezone their recurrences are using
 	if (($tzid = date_default_timezone_get()) && ($tz_id = calendar_timezones::tz2id($tzid)))
 	{
-		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id, __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.005';
 }
@@ -1893,22 +1893,22 @@ 
  */
 function calendar_upgrade1_7_006()
 {
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE (cal_end-cal_start)%86400=86340',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE (cal_end-cal_start)%86400=86340',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end+59
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end-1
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
     $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
-			WHERE recur_interval=0',__LINE__,__FILE__);
+			WHERE recur_interval=0',__LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';
 }
@@ -1924,17 +1924,17 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag,cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.008';
@@ -1947,7 +1947,7 @@ 
  */
 function calendar_upgrade1_7_008()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user',array('cal_user_type','cal_user_id'));
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', array('cal_user_type', 'cal_user_id'));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.009';
 }
@@ -1959,22 +1959,22 @@ 
  */
 function calendar_upgrade1_7_009()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_uid');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_owner');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_owner');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.010';
 }
 
 function calendar_upgrade1_7_010()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_deleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_deleted', array(
 		'type' => 'bool',
 		'nullable' => False,
 		'default' => '0',
 		'comment' => '1 if the event has been deleted, but you want to keep it around'
 	));
 
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';	// was 1.7.011
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001'; // was 1.7.011
 }
 
 function calendar_upgrade1_7_011()
@@ -1999,7 +1999,7 @@ 
 function calendar_upgrade1_9_001()
 {
 	// delete in the past wrongly created entries for a single recurrence, which mess up the update, beside being wrong anyway
-	$GLOBALS['egw_setup']->db->delete('egw_api_content_history',array(
+	$GLOBALS['egw_setup']->db->delete('egw_api_content_history', array(
 		'sync_appname' => 'calendar',
 		"sync_contentid LIKE '%:%'",
 	), __LINE__, __FILE__);
@@ -2010,36 +2010,36 @@ 
 		'precision' => '8',
 		'comment' => 'ts when event was deleted'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'unique id of event(-series)'),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
-			'cal_category' => array('type' => 'varchar','precision' => '30','comment' => 'category id'),
-			'cal_modified' => array('type' => 'int','precision' => '8','comment' => 'ts of last modification'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1','comment' => '1=public, 0=private event'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30', 'comment' => 'category id'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1', 'comment' => '1=public, 0=private event'),
+			'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','comment' => 'cal_id of series for exception'),
-			'cal_modifier' => array('type' => 'int','precision' => '4','comment' => 'user who last modified event'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0','comment' => '1 for non-blocking events'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag for optimistic locking'),
-			'cal_creator' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'creating user'),
-			'cal_created' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
-			'cal_recurrence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
-			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
-			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4', 'comment' => 'user who last modified event'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'comment' => '1 for non-blocking events'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag for optimistic locking'),
+			'cal_creator' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'cal_start of original recurrence for exception'),
+			'tz_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'key into egw_cal_timezones'),
+			'cal_deleted' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts when event was deleted')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner','cal_deleted'),
+		'ix' => array('cal_uid', 'cal_owner', 'cal_deleted'),
 		'uc' => array()
-	),array(
+	), array(
 		// for deleted rows use cal_modified as deleted date, NULL for not deleted ones
-		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true,'bool').' THEN cal_modified ELSE NULL END',
+		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true, 'bool').' THEN cal_modified ELSE NULL END',
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.002';
@@ -2051,16 +2051,16 @@ 
  */
 function calendar_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'name part of CalDAV URL, if specified by client'
 	));
-	$GLOBALS['egw_setup']->db->query($sql='UPDATE egw_cal SET caldav_name='.
+	$GLOBALS['egw_setup']->db->query($sql = 'UPDATE egw_cal SET caldav_name='.
 		$GLOBALS['egw_setup']->db->concat(
-			$GLOBALS['egw_setup']->db->to_varchar('cal_id'),"'.ics'"),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->to_varchar('cal_id'), "'.ics'"), __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','caldav_name');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'caldav_name');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.003';
 }
@@ -2071,8 +2071,8 @@ 
  */
 function calendar_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_modified');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user','cal_user_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', 'cal_user_modified');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.004';
 }
@@ -2084,7 +2084,7 @@ 
  */
 function calendar_upgrade1_9_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates', 'recur_exception', array(
 		'type' => 'bool',
 		'default' => '',
 		'null' => false,
@@ -2092,16 +2092,16 @@ 
 	));
 
 	// migrate existing exceptions to egw_cal_dates
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
 		'egw_cal_repeats.cal_id AS cal_id,egw_cal_repeats.recur_exception AS recur_exception,MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 		'egw_cal_repeats.recur_exception IS NOT NULL', __LINE__, __FILE__, false,
 		'GROUP BY egw_cal_repeats.cal_id,egw_cal_repeats.recur_exception', 'calendar', '',
 		'JOIN egw_cal_dates ON egw_cal_repeats.cal_id=egw_cal_dates.cal_id') as $row)
 	{
-		foreach($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
+		foreach ($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
 		{
 			$GLOBALS['egw_setup']->db->insert('egw_cal_dates', array(
-				'cal_end' => $recur_exception+$row['cal_end']-$row['cal_start'],
+				'cal_end' => $recur_exception + $row['cal_end'] - $row['cal_start'],
 				'recur_exception' => true,
 			), array(
 				'cal_id' => $row['cal_id'],
@@ -2113,11 +2113,11 @@ 
 
 	$GLOBALS['egw_setup']->oProc->DropColumn('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'),
+			'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'),
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -2138,19 +2138,19 @@ 
 	// returns NULL, if there are no rows!
 	if ((int)$max_description_length <= 16384 && $GLOBALS['egw_setup']->oProc->max_varchar_length >= 16384)
 	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_description',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_description', array(
 			'type' => 'varchar',
 			'precision' => '16384'
 		));
 	}
 	// allow more categories
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
 	// remove silly default of 1
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False
@@ -2165,14 +2165,14 @@ 
 {
 	// PostgreSQL needs temporary a nullable column, to not stall on broken events without dates!
 	// We add that constrain in 1.9.007, after deleting all rows with range_start=0 OR range_start IS NULL
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'startdate (of range)'
 	));
 	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_start = (SELECT MIN(cal_start) FROM egw_cal_dates WHERE egw_cal_dates.cal_id=egw_cal.cal_id)', __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_end',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'enddate (of range, UNTIL of RRULE)'
@@ -2188,18 +2188,18 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_end=recur_enddate FROM egw_cal_repeats WHERE egw_cal.cal_id=egw_cal_repeats.cal_id', __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('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_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_enddate');
+	), 'recur_enddate');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.007';
 }
@@ -2211,14 +2211,14 @@ 
  */
 function calendar_upgrade1_9_007()
 {
-	foreach(array('egw_cal_repeats','egw_cal_dates','egw_cal_user','egw_cal_extra') as $table)
+	foreach (array('egw_cal_repeats', 'egw_cal_dates', 'egw_cal_user', 'egw_cal_extra') as $table)
 	{
 		$GLOBALS['egw_setup']->db->query("DELETE FROM $table WHERE cal_id IN (SELECT cal_id FROM egw_cal WHERE range_start=0 OR range_start IS NULL)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->db->query("DELETE FROM egw_cal WHERE range_start=0 OR range_start IS NULL", __LINE__, __FILE__);
 
 	// now we can remove temporary default of 0 from range_start and set it NOT NULL
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -2283,7 +2283,7 @@ 
 
 function calendar_upgrade1_9_010()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '200',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2313,7 +2313,7 @@ 
 SET cal_reference=0,cal_recurrence=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
 WHERE cal_reference != 0 AND cal_id IN (SELECT cal_id FROM egw_cal_repeats)", __LINE__, __FILE__);
 
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT DISTINCT master.cal_id,egw_cal_user.cal_user_type,egw_cal_user.cal_user_id,'E' AS cal_status
 FROM egw_cal_user
 JOIN egw_cal ON egw_cal_user.cal_id=egw_cal.cal_id
@@ -2340,7 +2340,7 @@ 
  */
 function calendar_upgrade14_1_001()
 {
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT egw_cal.cal_id AS cal_id,cal_start,cal_end,range_start,range_end,egw_cal_repeats.*,tz_tzid AS tzid
 FROM egw_cal
 JOIN egw_cal_repeats ON egw_cal_repeats.cal_id=egw_cal.cal_id
@@ -2362,7 +2362,7 @@ 
 		$enddate->modify(($event['end'] - $event['start']).' second');
 		if (($range_end = $enddate->format('server')) != $event['range_end'])
 		{
-			$GLOBALS['egw_setup']->db->update('egw_cal',array(
+			$GLOBALS['egw_setup']->db->update('egw_cal', array(
 				'range_end' => $range_end,
 				'cal_etag=cal_etag+1',
 				'cal_modified' => time(),
@@ -2372,7 +2372,7 @@ 
 			//error_log(__FUNCTION__."() #$event[id], start=".date('Y-m-d H:i:s', $event['start']).', end='.date('Y-m-d H:i:s', $event['end']).', range_end='.date('Y-m-d H:i:s', $event['recur_enddate']).' --> '.date('Y-m-d H:i:s', $range_end));
 		}
 	}
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002';	// skip 14.2.001 update, as query is fixed now
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002'; // skip 14.2.001 update, as query is fixed now
 }
 
 /**
@@ -2396,7 +2396,7 @@ 
 	// if maximum is bigger then 3
 	if ($values[1] > 3)
 	{
-		switch($GLOBALS['egw_setup']->db->Type)
+		switch ($GLOBALS['egw_setup']->db->Type)
 		{
 			case 'mysql':
 				$sql = "UPDATE egw_cal
@@ -2446,7 +2446,7 @@ 
 
 function calendar_upgrade14_2_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_uid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False,
@@ -2458,13 +2458,13 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query("UPDATE egw_cal SET cal_category='' WHERE cal_category NOT REGEXP '^[0-9,]*$'", __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'ascii',
 		'meta' => 'category',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2521,22 +2521,22 @@ 
 		'type' => 'auto',
 		'nullable' => False
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_recur_date' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_user_type' => array('type' => 'ascii','precision' => '1','nullable' => False,'default' => 'u','comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
-			'cal_user_id' => array('type' => 'varchar','meta' => array("cal_user_type='u'" => 'account'),'precision' => '128','nullable' => False,'comment' => 'id or email-address for type=e'),
-			'cal_status' => array('type' => 'ascii','precision' => '1','default' => 'A','comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
-			'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1','comment' => 'only for certain types (eg. resources)'),
-			'cal_role' => array('type' => 'ascii','precision' => '64','default' => 'REQ-PARTICIPANT','comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
-			'cal_user_modified' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'automatic timestamp of last update'),
-			'cal_user_auto' => array('type' => 'auto','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_recur_date' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_user_type' => array('type' => 'ascii', 'precision' => '1', 'nullable' => False, 'default' => 'u', 'comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
+			'cal_user_id' => array('type' => 'varchar', 'meta' => array("cal_user_type='u'" => 'account'), 'precision' => '128', 'nullable' => False, 'comment' => 'id or email-address for type=e'),
+			'cal_status' => array('type' => 'ascii', 'precision' => '1', 'default' => 'A', 'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
+			'cal_quantity' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'comment' => 'only for certain types (eg. resources)'),
+			'cal_role' => array('type' => 'ascii', 'precision' => '64', 'default' => 'REQ-PARTICIPANT', 'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
+			'cal_user_modified' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'automatic timestamp of last update'),
+			'cal_user_auto' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('cal_user_auto'),
 		'fk' => array(),
-		'ix' => array('cal_user_modified',array('cal_user_type','cal_user_id')),
-		'uc' => array(array('cal_id','cal_recur_date','cal_user_type','cal_user_id'))
+		'ix' => array('cal_user_modified', array('cal_user_type', 'cal_user_id')),
+		'uc' => array(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'))
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.005';
@@ -2545,12 +2545,12 @@ 
 
 function calendar_upgrade14_2_005()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_tzid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_tzid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_component',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_component', array(
 		'type' => 'ascii',
 		'precision' => '8192',
 		'comment' => 'iCal VTIMEZONE component'
@@ -2566,7 +2566,7 @@ 
  */
 function calendar_upgrade14_3()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_attendee',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_attendee', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'comment' => 'email or json object with attr. cn, url, ...'
@@ -2577,12 +2577,12 @@ 
 
 	// delete all but one row, which would give a doublicate key, after above normalising of email addresses
 	// by ordering by status we prever accepted over tentative over unknow over deleted
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
 		'cal_user_type' => 'e',
 	), __LINE__, __FILE__, false, "GROUP BY cal_id,cal_recur_date,$email HAVING COUNT(*)>1", 'calendar') as $row)
 	{
 		$n = 0;
-		foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
+		foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
 			'cal_id' => $row['cal_id'],
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
@@ -2590,7 +2590,7 @@ 
 		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
-			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))));
+			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id', 'cal_status'))));
 		}
 	}
 
@@ -2599,7 +2599,7 @@ 
 		"UPDATE egw_cal_user SET cal_user_attendee=cal_user_id,cal_user_id=MD5($email) WHERE cal_user_type='e'",
 		__LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'ascii',
 		'meta' => array(
 			"cal_user_type='u'" => 'account'
@@ -2619,7 +2619,7 @@ 
  */
 function calendar_upgrade14_3_001()
 {
-	foreach($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
+	foreach ($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
 FROM egw_cal_user
 JOIN egw_cal_user euser ON euser.cal_id=egw_cal_user.cal_id AND euser.cal_user_type='e' AND euser.cal_user_id=egw_cal_user.cal_user_id AND euser.cal_user_attendee IS NULL
 WHERE egw_cal_user.cal_user_type='e' AND egw_cal_user.cal_user_attendee IS NOT NULL

files/webdav.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return egw_digest_auth::autocreate_session_callback($account);
 }
@@ -42,8 +42,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use vfs_webdav_server::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use vfs_webdav_server::REALM as autoloading and include path not yet setup!
 	)
 );
 require_once('../phpgwapi/inc/class.egw_digest_auth.inc.php');
@@ -72,12 +72,12 @@ 
 
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
 // so ownCloud dir contains users home-dir by default
-if (strpos($_SERVER['REQUEST_URI'],'/webdav.php/clientsync') !== false &&
-	($fstab=egw_vfs::mount()) && !isset($fstab['/clientsync']))
+if (strpos($_SERVER['REQUEST_URI'], '/webdav.php/clientsync') !== false &&
+	($fstab = egw_vfs::mount()) && !isset($fstab['/clientsync']))
 {
 	$is_root_backup = egw_vfs::$is_root;
 	egw_vfs::$is_root = true;
-	$ok = egw_vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
+	$ok = egw_vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
 	egw_vfs::$is_root = $is_root_backup;
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
 }

filemanager/test.php

Spacing +15 added lines, -15 removed lines

@@ -15,13 +15,13 @@ 
 );
 include('../header.inc.php');
 
-if (!($path = egw_cache::getSession('filemanger','test')))
+if (!($path = egw_cache::getSession('filemanger', 'test')))
 {
 	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 }
 if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
-echo html::form("<p>Path: ".html::input('path',$path,'text','size="40"').
-	html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
+echo html::form("<p>Path: ".html::input('path', $path, 'text', 'size="40"').
+	html::submit_button('', lang('Submit'))."</p>\n", array(), '', '', '', '', 'GET');
 
 if (isset($path) && !empty($path))
 {
@@ -29,13 +29,13 @@ 
 	{
 		throw new egw_exception_wrong_userinput('Not an absolute path!');
 	}
-	egw_cache::setSession('filemanger','test',$path);
+	egw_cache::setSession('filemanger', 'test', $path);
 
 	echo "<h2>";
-	foreach(explode('/',$path) as $n => $part)
+	foreach (explode('/', $path) as $n => $part)
 	{
 		$p .= ($p != '/' ? '/' : '').$part;
-		echo ($n > 1 ? ' / ' : '').html::a_href($n ? $part : ' / ','/filemanager/test.php',array('path'=>$p));
+		echo ($n > 1 ? ' / ' : '').html::a_href($n ? $part : ' / ', '/filemanager/test.php', array('path'=>$p));
 	}
 	echo "</h2>\n";
 
@@ -47,29 +47,29 @@ 
 
 	$time = microtime(true);
 	$stat = egw_vfs::stat($path);
-	$stime = number_format(1000*(microtime(true)-$time),1);
+	$stime = number_format(1000 * (microtime(true) - $time), 1);
 
 	$time = microtime(true);
 	if ($is_dir)// && ($d = egw_vfs::opendir($path)))
 	{
 		$files = array();
 		//while(($file = readdir($d)))
-		foreach(egw_vfs::scandir($path) as $file)
+		foreach (egw_vfs::scandir($path) as $file)
 		{
-			if (egw_vfs::is_readable($fpath=egw_vfs::concat($path,$file)))
+			if (egw_vfs::is_readable($fpath = egw_vfs::concat($path, $file)))
 			{
-				$file = html::a_href($file,'/filemanager/test.php',array('path'=>$fpath));
+				$file = html::a_href($file, '/filemanager/test.php', array('path'=>$fpath));
 			}
 			$file .= ' ('.egw_vfs::mime_content_type($fpath).')';
 			$files[] = $file;
 		}
 		//closedir($d);
-		$time = number_format(1000*(microtime(true)-$time),1);
+		$time = number_format(1000 * (microtime(true) - $time), 1);
 		echo "<p>".($files ? 'Directory' : 'Empty directory')." took $time ms</p>\n";
-		if($files) echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		if ($files) echo '<ol><li>'.implode("</li>\n<li>", $files).'</ol>'."\n";
 	}
 
-	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.egw_vfs::int2mode($stat['mode']):'NULL').')';
+	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode']) ? sprintf('%o', $stat['mode']).' = '.egw_vfs::int2mode($stat['mode']) : 'NULL').')';
 	if (is_array($stat))
 	{
 		_debug_array($stat);
@@ -86,8 +86,8 @@ 
 	echo "<p><b>readlink('$path')</b>=".array2string(egw_vfs::readlink($path))."</p>\n";
 	$time = microtime(true);
 	$lstat = egw_vfs::lstat($path);
-	$time = number_format(1000*(microtime(true)-$time),1);
-	echo "<p><b>lstat('$path')</b> took $time ms (mode = ".(isset($lstat['mode'])?sprintf('%o',$lstat['mode']).' = '.egw_vfs::int2mode($lstat['mode']):'NULL').')';
+	$time = number_format(1000 * (microtime(true) - $time), 1);
+	echo "<p><b>lstat('$path')</b> took $time ms (mode = ".(isset($lstat['mode']) ? sprintf('%o', $lstat['mode']).' = '.egw_vfs::int2mode($lstat['mode']) : 'NULL').')';
 	if (is_array($lstat))
 	{
 		_debug_array($lstat);

filemanager/cli.php

Spacing +136 added lines, -141 removed lines

@@ -13,9 +13,9 @@ 
  * @todo --domain does NOT work with --user root_* for domains other then the first in header.inc.php
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_DEPRECATED);
+error_reporting(error_reporting()&~E_NOTICE&~E_DEPRECATED);
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling filemanager/cli.php as web-page
 {
@@ -44,7 +44,7 @@ 
  *
  * @param string $error_msg ='' error-message to be printed in front of usage
  */
-function usage($error_msg='')
+function usage($error_msg = '')
 {
 	if ($error_msg)
 	{
@@ -78,8 +78,8 @@ 
 }
 $long = $numeric = $recursive = $perms = $all = $inode = false;
 $args = $_SERVER['argv'];
-$cmd = basename(array_shift($args),'.php');
-if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0],'://') === false)
+$cmd = basename(array_shift($args), '.php');
+if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0], '://') === false)
 {
 	$cmd = array_shift($args);
 }
@@ -87,7 +87,7 @@ 
 if (!$args) $args = array('-h');
 
 $argv = $find_options = array();
-while(!is_null($option = array_shift($args)))
+while (!is_null($option = array_shift($args)))
 {
 	if ($option == '-' || $option[0] != '-')	// no option --> argument
 	{
@@ -95,34 +95,34 @@ 
 		continue;
 	}
 
-	switch($option)
+	switch ($option)
 	{
 		default:
 			if ($cmd == 'find')
 			{
-				if (!in_array($option,array('-type','-depth','-mindepth','-maxdepth','-name','-path',
-					'-uid','-user','-nouser','-gid','-group','-nogroup','-mime',
-					'-empty','-size','-cmin','-ctime','-mmin','-mtime','-limit','-order','-sort',
-					'-hidden','-show-deleted','-name-preg','-path','-path-preg')))
+				if (!in_array($option, array('-type', '-depth', '-mindepth', '-maxdepth', '-name', '-path',
+					'-uid', '-user', '-nouser', '-gid', '-group', '-nogroup', '-mime',
+					'-empty', '-size', '-cmin', '-ctime', '-mmin', '-mtime', '-limit', '-order', '-sort',
+					'-hidden', '-show-deleted', '-name-preg', '-path', '-path-preg')))
 				{
 					usage("Unknown find option '$option'!");
 				}
-				if (in_array($option,array('-empty','-depth','-nouser','-nogroup','-hidden','-show-deleted')))
+				if (in_array($option, array('-empty', '-depth', '-nouser', '-nogroup', '-hidden', '-show-deleted')))
 				{
-					$find_options[substr($option,1)] = true;
+					$find_options[substr($option, 1)] = true;
 				}
 				else
 				{
-					$find_options[str_replace('-','_',substr($option,1))] = array_shift($args);
+					$find_options[str_replace('-', '_', substr($option, 1))] = array_shift($args);
 				}
 				break;
 			}
 			// multiple options, eg. -rp --> -r -p
-			elseif($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
+			elseif ($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
 			{
-				for($i = 1; $i < strlen($option); ++$i)
+				for ($i = 1; $i < strlen($option); ++$i)
 				{
-					array_unshift($args,'-'.$option[$i]);
+					array_unshift($args, '-'.$option[$i]);
 				}
 				break;
 			}
@@ -178,11 +178,11 @@ 
 }
 if ($user && $passwd)
 {
-	load_egw($user,$passwd,$domain ? $domain : 'default');
+	load_egw($user, $passwd, $domain ? $domain : 'default');
 }
 $argc = count($argv);
 
-switch($cmd)
+switch ($cmd)
 {
 	case 'umount':
 		if ($argc != 1 && !$all)
@@ -190,13 +190,13 @@ 
 			usage('Wrong number of parameters!');
 		}
 		if (($url = $argv[0])) load_wrapper($url);
-		if(!egw_vfs::$is_root)
+		if (!egw_vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
 		if ($all)
 		{
-			config::save_value('vfs_fstab',$GLOBALS['egw_info']['server']['vfs_fstab']='','phpgwapi');
+			config::save_value('vfs_fstab', $GLOBALS['egw_info']['server']['vfs_fstab'] = '', 'phpgwapi');
 			echo "Restored default mounts:\n";
 		}
 		elseif (!egw_vfs::umount($url))
@@ -213,16 +213,16 @@ 
 		{
 			usage('Wrong number of parameters!');
 		}
-		load_wrapper($url=$argv[0]);
+		load_wrapper($url = $argv[0]);
 
-		if($argc > 1 && !egw_vfs::$is_root)
+		if ($argc > 1 && !egw_vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
-		$fstab = egw_vfs::mount($url,$path=$argv[1]);
+		$fstab = egw_vfs::mount($url, $path = $argv[1]);
 		if (is_array($fstab))
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
@@ -242,7 +242,7 @@ 
 		break;
 
 	case 'find':
-		do_find($argv,$find_options);
+		do_find($argv, $find_options);
 		break;
 
 	case 'lntree':
@@ -250,14 +250,14 @@ 
 		break;
 
 	case 'cp':
-		do_cp($argv,$recursive,$perms);
+		do_cp($argv, $recursive, $perms);
 		break;
 
 	case 'rename':
 		if (count($argv) != 2) usage('Wrong number of parameters!');
 		load_wrapper($argv[0]);
 		load_wrapper($argv[1]);
-		rename($argv[0],$argv[1]);
+		rename($argv[0], $argv[1]);
 		break;
 
 	case 'migrate-db2fs':
@@ -265,21 +265,21 @@ 
 		{
 			die("\nYou need to be root to do that!\n\n");
 		}
-		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit;	// we need write access, error msg already given
+		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit; // we need write access, error msg already given
 		$fstab = egw_vfs::mount();
-		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'],'storage=db') === false)
+		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'], 'storage=db') === false)
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
 			die("\n/ NOT mounted with 'storage=db' --> no need to convert!\n\n");
 		}
-		$num_files = sqlfs_utils::migrate_db2fs();	// throws exception on error
+		$num_files = sqlfs_utils::migrate_db2fs(); // throws exception on error
 		echo "\n$num_files files migrated from DB to filesystem.\n";
-		$new_url = preg_replace('/storage=db&?/','',$fstab['/']);
-		if (substr($new_url,-1) == '?') $new_url = substr($new_url,0,-1);
-		if (egw_vfs::mount($new_url,'/'))
+		$new_url = preg_replace('/storage=db&?/', '', $fstab['/']);
+		if (substr($new_url, -1) == '?') $new_url = substr($new_url, 0, -1);
+		if (egw_vfs::mount($new_url, '/'))
 		{
 			echo "/ successful re-mounted on $new_url\n";
 		}
@@ -290,24 +290,24 @@ 
 		break;
 
 	default:
-		while($argv)
+		while ($argv)
 		{
 			$url = array_shift($argv);
 
 			load_wrapper($url);
 			echo "$cmd $url (long=".(int)$long.", numeric=".(int)$numeric.", recursive=".(int)$recursive.")\n";
 
-			switch($cmd)
+			switch ($cmd)
 			{
 				case 'rm':
 					if ($recursive)
 					{
 						if (!class_exists('egw_vfs'))
 						{
-							die("rm -r only implemented for eGW streams!");	// dont want to repeat the code here
+							die("rm -r only implemented for eGW streams!"); // dont want to repeat the code here
 						}
-						array_unshift($argv,$url);
-						egw_vfs::remove($argv,true);
+						array_unshift($argv, $url);
+						egw_vfs::remove($argv, true);
 						$argv = array();
 					}
 					else
@@ -321,27 +321,27 @@ 
 					break;
 
 				case 'mkdir':
-					if (!mkdir($url,null,$recursive)) echo "Can't create directory, permission denied!\n";
+					if (!mkdir($url, null, $recursive)) echo "Can't create directory, permission denied!\n";
 					break;
 
 				case 'touch':
 				case 'chmod':
 				case 'chown':
 				case 'chgrp':
-					switch($cmd)
+					switch ($cmd)
 					{
 						case 'touch':
-							$params = array($url,$time);
+							$params = array($url, $time);
 							break;
 						case 'chmod':
 							if (!isset($mode))
 							{
-								$mode = $url;	// first param is mode
+								$mode = $url; // first param is mode
 								$url = array_shift($argv);
 							}
-							if (egw_vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// cant use stat or egw_vfs::mode2int otherwise!
+							if (egw_vfs::parse_url($url, PHP_URL_SCHEME)) load_wrapper($url); // cant use stat or egw_vfs::mode2int otherwise!
 
-							if (strpos($mode,'+') !== false || strpos($mode,'-') !== false)
+							if (strpos($mode, '+') !== false || strpos($mode, '-') !== false)
 							{
 								$stat = stat($url);
 								$set = $stat['mode'];
@@ -352,19 +352,19 @@ 
 							}
 							if (!class_exists('egw_vfs'))
 							{
-								die("chmod only implemented for eGW streams!");	// dont want to repeat the code here
+								die("chmod only implemented for eGW streams!"); // dont want to repeat the code here
 							}
-							$set = egw_vfs::mode2int($mode,$set);
-							$params = array($url,$set);
+							$set = egw_vfs::mode2int($mode, $set);
+							$params = array($url, $set);
 							break;
 						case 'chown':
 						case 'chgrp':
 							$type = $cmd == 'chgrp' ? 'group' : 'user';
 							if (!isset($owner))
 							{
-								$owner = $url;	// first param is owner/group
+								$owner = $url; // first param is owner/group
 								$url = array_shift($argv);
-								if (egw_vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// we need the header loaded
+								if (egw_vfs::parse_url($url, PHP_URL_SCHEME)) load_wrapper($url); // we need the header loaded
 								if ($owner == 'root')
 								{
 									$owner = 0;
@@ -375,34 +375,34 @@ 
 									{
 										die("only numeric user/group-id's allowed for non eGW streams!");
 									}
-									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was=$owner,'account_lid',$type[0])) ||
+									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was = $owner, 'account_lid', $type[0])) ||
 										($owner < 0) != ($cmd == 'chgrp'))
 									{
 										die("Unknown $type '$owner_was'!");
 									}
 								}
-								elseif($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
+								elseif ($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
 										($owner < 0) != ($cmd == 'chgrp')))
 								{
 									die("Unknown $type '$owner_was'!");
 								}
 							}
-							$params = array($url,$owner);
+							$params = array($url, $owner);
 							break;
 					}
-					if (($scheme = egw_vfs::parse_url($url,PHP_URL_SCHEME)))
+					if (($scheme = egw_vfs::parse_url($url, PHP_URL_SCHEME)))
 					{
 						load_wrapper($url);
 					}
 					if ($recursive && class_exists('egw_vfs'))
 					{
-						array_unshift($argv,$url);
-						$params = array($argv,null,$cmd,$params[1]);
-						$cmd = array('egw_vfs','find');
-						$argv = array();	// we processed all url's
+						array_unshift($argv, $url);
+						$params = array($argv, null, $cmd, $params[1]);
+						$cmd = array('egw_vfs', 'find');
+						$argv = array(); // we processed all url's
 					}
 					//echo "calling cmd=".print_r($cmd,true).", params=".print_r($params,true)."\n";
-					call_user_func_array($cmd,$params);
+					call_user_func_array($cmd, $params);
 					break;
 
 				case 'cat':
@@ -412,35 +412,35 @@ 
 					if ($cmd != 'cat' && $recursive && class_exists('egw_vfs'))
 					{
 						load_wrapper($url);
-						array_unshift($argv,$url);
-						egw_vfs::find($argv,array('url'=>true,),'do_stat',array($long,$numeric,true,$inode));
+						array_unshift($argv, $url);
+						egw_vfs::find($argv, array('url'=>true,), 'do_stat', array($long, $numeric, true, $inode));
 						$argv = array();
 					}
 					elseif (is_dir($url) && ($dir = opendir($url)))
 					{
 						if ($argc)
 						{
-							if (!($name = basename(egw_vfs::parse_url($url,PHP_URL_PATH)))) $name = '/';
+							if (!($name = basename(egw_vfs::parse_url($url, PHP_URL_PATH)))) $name = '/';
 							echo "\n$name:\n";
 						}
 						// separate evtl. query part, to re-add it after the file-name
 						unset($query);
-						list($url,$query) = explode('?',$url,2);
+						list($url, $query) = explode('?', $url, 2);
 						if ($query) $query = '?'.$query;
 
-						if (substr($url,-1) == '/')
+						if (substr($url, -1) == '/')
 						{
-							$url = substr($url,0,-1);
+							$url = substr($url, 0, -1);
 						}
-						while(($file = readdir($dir)) !== false)
+						while (($file = readdir($dir)) !== false)
 						{
-							do_stat($url.'/'.$file.$query,$long,$numeric,false,$inode);
+							do_stat($url.'/'.$file.$query, $long, $numeric, false, $inode);
 						}
 						closedir($dir);
 					}
 					elseif ($cmd == 'cat')
 					{
-						if (!($f = fopen($url,'r')))
+						if (!($f = fopen($url, 'r')))
 						{
 							echo "File $url not found !!!\n\n";
 						}
@@ -448,7 +448,7 @@ 
 						{
 							if ($argc)
 							{
-								echo "\n".basename(egw_vfs::parse_url($url,PHP_URL_PATH)).":\n";
+								echo "\n".basename(egw_vfs::parse_url($url, PHP_URL_PATH)).":\n";
 							}
 							fpassthru($f);
 							fclose($f);
@@ -456,7 +456,7 @@ 
 					}
 					else
 					{
-						do_stat($url,$long,$numeric,false,$inode);
+						do_stat($url, $long, $numeric, false, $inode);
 					}
 					if (!$long && $cmd == 'ls') echo "\n";
 					break;
@@ -471,11 +471,11 @@ 
  */
 function load_wrapper($url)
 {
-	$scheme = parse_url($url,PHP_URL_SCHEME);
+	$scheme = parse_url($url, PHP_URL_SCHEME);
 
-	if (!in_array($scheme,stream_get_wrappers()))
+	if (!in_array($scheme, stream_get_wrappers()))
 	{
-		switch($scheme)
+		switch ($scheme)
 		{
 			case 'webdav':
 			case 'webdavs':
@@ -484,9 +484,9 @@ 
 			case '':	// default scheme is file and always available
 				break;
 			default:
-				if (!isset($GLOBALS['egw']) && !in_array($scheme,array('smb','imap')))
+				if (!isset($GLOBALS['egw']) && !in_array($scheme, array('smb', 'imap')))
 				{
-					load_egw(parse_url($url,PHP_URL_USER), parse_url($url,PHP_URL_PASS), parse_url($url,PHP_URL_HOST));
+					load_egw(parse_url($url, PHP_URL_USER), parse_url($url, PHP_URL_PASS), parse_url($url, PHP_URL_HOST));
 				}
 				// get eGW's __autoload() function
 				include_once(EGW_API_INC.'/common_functions.inc.php');
@@ -507,7 +507,7 @@ 
  * @param string $passwd
  * @param string $domain
  */
-function load_egw($user,$passwd,$domain='default')
+function load_egw($user, $passwd, $domain = 'default')
 {
 	//echo "load_egw($user,$passwd,$domain)\n";
 	$_REQUEST['domain'] = $domain;
@@ -519,7 +519,7 @@ 
 
 	if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 	{
-		ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+		ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 	}
 
 	$GLOBALS['egw_info'] = array(
@@ -531,7 +531,7 @@ 
 		)
 	);
 
-	if (substr($user,0,5) != 'root_')
+	if (substr($user, 0, 5) != 'root_')
 	{
 		include('../header.inc.php');
 	}
@@ -557,7 +557,7 @@ 
 	}
 
 	$cmd = $GLOBALS['cmd'];
-	if (!in_array($cmd,array('ls','find','mount','umount','eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
+	if (!in_array($cmd, array('ls', 'find', 'mount', 'umount', 'eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
 	{
 		echo "\nError: eGroupWare's files directory {$GLOBALS['egw_info']['server']['files_dir']} is NOT writable by the user running ".basename(__FILE__)."!\n".
 			"--> Please run it as the same user the webserver uses or root, otherwise the $cmd command will fail!\n\n";
@@ -588,22 +588,22 @@ 
 	}
 	if ($argc == 1)
 	{
-		foreach(egw_vfs::get_eacl($url) as $acl)
+		foreach (egw_vfs::get_eacl($url) as $acl)
 		{
-			$mode = ($acl['rights'] & egw_vfs::READABLE ? 'r' : '-').
-				($acl['rights'] & egw_vfs::WRITABLE ? 'w' : '-').
-				($acl['rights'] & egw_vfs::EXECUTABLE ? 'x' : '-');
+			$mode = ($acl['rights']&egw_vfs::READABLE ? 'r' : '-').
+				($acl['rights']&egw_vfs::WRITABLE ? 'w' : '-').
+				($acl['rights']&egw_vfs::EXECUTABLE ? 'x' : '-');
 			echo $acl['path']."\t$mode\t".$GLOBALS['egw']->accounts->id2name($acl['owner'])."\n";
 		}
 		return;
 	}
 	if ($argc > 1 && !is_numeric($argv[1]))
 	{
-		$mode=$argv[1];
+		$mode = $argv[1];
 		$argv[1] = null;
-		for($i = 0; $mode[$i]; ++$i)
+		for ($i = 0; $mode[$i]; ++$i)
 		{
-			switch($mode[$i])
+			switch ($mode[$i])
 			{
 				case 'x': $argv[1] |= egw_vfs::EXECUTABLE; break;
 				case 'w': $argv[1] |= egw_vfs::WRITABLE; break;
@@ -611,7 +611,7 @@ 
 			}
 		}
 	}
-	if (!egw_vfs::eacl($url,$argv[1],$argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
+	if (!egw_vfs::eacl($url, $argv[1], $argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
 	{
 		echo "Error setting extended acl for $argv[0]!\n";
 	}
@@ -626,10 +626,10 @@ 
  * @param boolean $full_path =false true=give full path instead of just filename
  * @param boolean $inode =false true=display inode (sqlfs id)
  */
-function do_stat($url,$long=false,$numeric=false,$full_path=false,$inode=false)
+function do_stat($url, $long = false, $numeric = false, $full_path = false, $inode = false)
 {
 	//echo "do_stat($url,$long,$numeric,$full_path)\n";
-	$bname = egw_vfs::parse_url($url,PHP_URL_PATH);
+	$bname = egw_vfs::parse_url($url, PHP_URL_PATH);
 
 	if (!$full_path)
 	{
@@ -660,25 +660,23 @@ 
 		{
 			if ($stat['uid'])
 			{
-				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) :
-					(function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
+				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) : (function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
 				if (is_array($uid)) $uid = $uid['name'];
 				if (empty($uid)) $uid = $stat['uid'];
 			}
 			if (!isset($uid)) $uid = 'root';
 			if ($stat['gid'])
 			{
-				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) :
-					(function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
+				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) : (function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
 				if (is_array($gid)) $gid = $gid['name'];
 				if (empty($gid)) $gid = $stat['gid'];
 			}
 			if (!isset($gid)) $gid = 'root';
 		}
 		$size = hsize($stat['size']);
-		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
+		$mtime = date('Y-m-d H:i:s', $stat['mtime']);
 		$nlink = $stat['nlink'];
-		if (($stat['mode'] & 0xA000) == 0xA000)
+		if (($stat['mode']&0xA000) == 0xA000)
 		{
 			$symlink = " -> ".(class_exists('egw_vfs') ? egw_vfs::readlink($url) : readlink($url));
 		}
@@ -697,12 +695,12 @@ 
 function hsize($size)
 {
 	if ($size < 1024) return $size;
-	if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-	return sprintf('%3.1lfM',(float)$size/(1024*1024));
+	if ($size < 1024 * 1024) return sprintf('%3.1lfk', (float)$size / 1024);
+	return sprintf('%3.1lfM', (float)$size / (1024 * 1024));
 }
 
 
-function do_cp($argv,$recursive=false,$perms=false)
+function do_cp($argv, $recursive = false, $perms = false)
 {
 	$to = array_pop($argv);
 	load_wrapper($to);
@@ -714,13 +712,13 @@ 
 		usage("No such directory '$to'!");
 	}
 	$anz_dirs = $anz_files = 0;
-	foreach($argv as $from)
+	foreach ($argv as $from)
 	{
 		if (is_dir($from) && (!file_exists($to) || is_dir($to)) && $recursive && class_exists('egw_vfs'))
 		{
-			foreach(egw_vfs::find($from,array('url' => true)) as $f)
+			foreach (egw_vfs::find($from, array('url' => true)) as $f)
 			{
-				$t = $to.substr($f,strlen($from));
+				$t = $to.substr($f, strlen($from));
 				if (is_dir($f))
 				{
 					++$anz_dirs;
@@ -729,43 +727,43 @@ 
 				else
 				{
 					++$anz_files;
-					_cp($f,$t);
+					_cp($f, $t);
 				}
-				if ($perms) _cp_perms($f,$t);
+				if ($perms) _cp_perms($f, $t);
 			}
-			echo ($anz_dirs?"$anz_dirs dir(s) created and ":'')."$anz_files file(s) copied.\n";
+			echo ($anz_dirs ? "$anz_dirs dir(s) created and " : '')."$anz_files file(s) copied.\n";
 		}
 		else
 		{
-			_cp($from,$to,true);
-			if ($perms) _cp_perms($from,$to);
+			_cp($from, $to, true);
+			if ($perms) _cp_perms($from, $to);
 		}
 	}
 }
 
-function _cp($from,$to,$verbose=false)
+function _cp($from, $to, $verbose = false)
 {
 	load_wrapper($from);
 
 	if (is_dir($to))
 	{
-		$path = egw_vfs::parse_url($from,PHP_URL_PATH);
+		$path = egw_vfs::parse_url($from, PHP_URL_PATH);
 		if (is_dir($to))
 		{
-			list($to,$query) = explode('?',$to,2);
+			list($to, $query) = explode('?', $to, 2);
 			$to .= '/'.basename($path).($query ? '?'.$query : '');
 		}
 	}
-	if (!($from_fp = fopen($from,'r')))
+	if (!($from_fp = fopen($from, 'r')))
 	{
 		die("File $from not found!\n");
 	}
-	if (!($to_fp = fopen($to,'w')))
+	if (!($to_fp = fopen($to, 'w')))
 	{
 		die("Can't open $to for writing!\n");
 	}
 	//stream_filter_append($from_fp,'convert.base64-decode');
-	$count = stream_copy_to_stream($from_fp,$to_fp);
+	$count = stream_copy_to_stream($from_fp, $to_fp);
 
 	if ($verbose) echo hsize($count)." bytes written to $to\n";
 
@@ -778,11 +776,11 @@ 
 }
 
 
-function _cp_perms($from,$to)
+function _cp_perms($from, $to)
 {
 	if (($from_stat = stat($from)) && ($to_stat = stat($to)))
 	{
-		foreach(array(
+		foreach (array(
 			'mode' => 'chmod',
 			'uid'  => 'chown',
 			'gid'  => 'chgrp',
@@ -791,27 +789,27 @@ 
 			if ($from_stat[$perm] != $to_stat[$perm])
 			{
 				//echo "egw_vfs::$cmd($to,{$from_stat[$perm]}\n";
-				call_user_func(array('egw_vfs',$cmd),$to,$from_stat[$perm]);
+				call_user_func(array('egw_vfs', $cmd), $to, $from_stat[$perm]);
 			}
 		}
 	}
 }
 
-function do_find($bases,$options)
+function do_find($bases, $options)
 {
-	foreach($bases as $url)
+	foreach ($bases as $url)
 	{
 		load_wrapper($url);
 	}
-	$options['url'] = true;	// we use url's not vfs pathes in filemanager/cli.php
+	$options['url'] = true; // we use url's not vfs pathes in filemanager/cli.php
 
-	foreach(egw_vfs::find($bases,$options) as $path)
+	foreach (egw_vfs::find($bases, $options) as $path)
 	{
 		echo "$path\n";
 	}
 }
 
-function do_lntree($from,$to)
+function do_lntree($from, $to)
 {
 	echo "lntree $from $to\n";
 	if ($from[0] == '/') $from = 'sqlfs://default'.$from;
@@ -874,33 +872,33 @@ 
  * @param int $mode
  * @return string
  */
-function int2mode( $mode )
+function int2mode($mode)
 {
-	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	if (($mode&0xA000) == 0xA000) // Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif(($mode & 0xC000) == 0xC000) // Socket
+	elseif (($mode&0xC000) == 0xC000) // Socket
 	{
 		$sP = 's';
 	}
-	elseif($mode & 0x1000)     // FIFO pipe
+	elseif ($mode&0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($mode & 0x2000) // Character special
+	elseif ($mode&0x2000) // Character special
 	{
 		$sP = 'c';
 	}
-	elseif($mode & 0x4000) // Directory
+	elseif ($mode&0x4000) // Directory
 	{
 		$sP = 'd';
 	}
-	elseif($mode & 0x6000) // Block special
+	elseif ($mode&0x6000) // Block special
 	{
 		$sP = 'b';
 	}
-	elseif($mode & 0x8000) // Regular
+	elseif ($mode&0x8000) // Regular
 	{
 		$sP = '-';
 	}
@@ -910,22 +908,19 @@ 
 	}
 
 	// owner
-	$sP .= (($mode & 0x0100) ? 'r' : '-') .
-	(($mode & 0x0080) ? 'w' : '-') .
-	(($mode & 0x0040) ? (($mode & 0x0800) ? 's' : 'x' ) :
-	(($mode & 0x0800) ? 'S' : '-'));
+	$sP .= (($mode&0x0100) ? 'r' : '-').
+	(($mode&0x0080) ? 'w' : '-').
+	(($mode&0x0040) ? (($mode&0x0800) ? 's' : 'x') : (($mode&0x0800) ? 'S' : '-'));
 
 	// group
-	$sP .= (($mode & 0x0020) ? 'r' : '-') .
-	(($mode & 0x0010) ? 'w' : '-') .
-	(($mode & 0x0008) ? (($mode & 0x0400) ? 's' : 'x' ) :
-	(($mode & 0x0400) ? 'S' : '-'));
+	$sP .= (($mode&0x0020) ? 'r' : '-').
+	(($mode&0x0010) ? 'w' : '-').
+	(($mode&0x0008) ? (($mode&0x0400) ? 's' : 'x') : (($mode&0x0400) ? 'S' : '-'));
 
 	// world
-	$sP .= (($mode & 0x0004) ? 'r' : '-') .
-	(($mode & 0x0002) ? 'w' : '-') .
-	(($mode & 0x0001) ? (($mode & 0x0200) ? 't' : 'x' ) :
-	(($mode & 0x0200) ? 'T' : '-'));
+	$sP .= (($mode&0x0004) ? 'r' : '-').
+	(($mode&0x0002) ? 'w' : '-').
+	(($mode&0x0001) ? (($mode&0x0200) ? 't' : 'x') : (($mode&0x0200) ? 'T' : '-'));
 
 	return $sP;
 }

filemanager/inc/class.filemanager_admin.inc.php

Spacing +25 added lines, -25 removed lines

@@ -61,7 +61,7 @@ 
 		}
 		// sudo handling
 		parent::__construct();
-		self::$is_setup = egw_session::appsession('is_setup','filemanager');
+		self::$is_setup = egw_session::appsession('is_setup', 'filemanager');
 
 		if (class_exists('EGroupware\Stylite\Vfs\Versioning\StreamWrapper'))
 		{
@@ -75,14 +75,14 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null, $msg='', $msg_type=null)
+	public function index(array $content = null, $msg = '', $msg_type = null)
 	{
 		if (is_array($content))
 		{
 			//_debug_array($content);
 			if ($content['sudo'])
 			{
-				$msg = $this->sudo($content['user'],$content['password'],self::$is_setup) ?
+				$msg = $this->sudo($content['user'], $content['password'], self::$is_setup) ?
 					lang('Root access granted.') : lang('Wrong username or password!');
 				$msg_type = Vfs::$is_root ? 'success' : 'error';
 			}
@@ -93,14 +93,14 @@ 
 				$backup = Vfs::$is_root;
 				Vfs::$is_root = true;
 				$msg = Vfs::mount($url, $path) ?
-					lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+					lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 				Vfs::$is_root = $backup;
 			}
 			elseif (Vfs::$is_root)
 			{
 				if ($content['logout'])
 				{
-					$msg = $this->sudo('','',self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
+					$msg = $this->sudo('', '', self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
 					$msg_type = !Vfs::$is_root ? 'success' : 'error';
 				}
 				if ($content['mounts']['disable'] || self::$is_setup && $content['mounts']['umount'])
@@ -116,18 +116,18 @@ 
 					if (!in_array($path, self::$protected_path) && $path != '/')
 					{
 						$msg = Vfs::umount($path) ?
-							lang('%1 successful unmounted.',$path) : lang('Error unmounting %1!',$path);
+							lang('%1 successful unmounted.', $path) : lang('Error unmounting %1!', $path);
 					}
 					else	// re-mount / with sqlFS, to disable versioning
 					{
-						$msg = Vfs::mount($url=sqlfs_stream_wrapper::SCHEME.'://default'.$path,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url = sqlfs_stream_wrapper::SCHEME.'://default'.$path, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if (($path = $content['mounts']['path']) &&
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
-					$url = str_replace('$path',$path,$content['mounts']['url']);
+					$url = str_replace('$path', $path, $content['mounts']['url']);
 					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
 
 					if ($content['mounts']['enable'] && !$this->versioning)
@@ -137,7 +137,7 @@ 
 					}
 					elseif (!Vfs::file_exists($path) || !Vfs::is_dir($path))
 					{
-						$msg = lang('Path %1 not found or not a directory!',$path);
+						$msg = lang('Path %1 not found or not a directory!', $path);
 						$msg_type = 'error';
 					}
 					// dont allow to change mount of /apps or /templates (eg. switching on versioning)
@@ -148,8 +148,8 @@ 
 					}
 					else
 					{
-						$msg = Vfs::mount($url,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions'])
@@ -194,8 +194,8 @@ 
 								'hidden' => true,
 								'depth' => true,
 								'path_preg' => '#/\.(attic|versions)/#',
-							)+(!(int)$content['mtime'] ? array() : array(
-								'mtime' => ($content['mtime']<0?'-':'+').(int)$content['mtime'],
+							) + (!(int)$content['mtime'] ? array() : array(
+								'mtime' => ($content['mtime'] < 0 ? '-' : '+').(int)$content['mtime'],
 							)), function($path) use (&$deleted, &$errors)
 							{
 								if (($is_dir = Vfs::is_dir($path)) && Vfs::rmdir($path) ||
@@ -209,7 +209,7 @@ 
 								}
 							});
 						}
-						$time = number_format(microtime(true)-$starttime, 1);
+						$time = number_format(microtime(true) - $starttime, 1);
 						$msg = ($errors ? lang('%1 errors deleting!', $errors)."\n\n" : '').
 							lang('%1 files or directories deleted in %2 seconds.', $deleted, $time);
 						$msg_type = $errors ? 'error' : 'info';
@@ -232,10 +232,10 @@ 
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files']) $content['percent_files'] = number_format(100.0 * $content['version_files'] / $content['total_files'], 1).'%';
+			if ($content['total_size']) $content['percent_size'] = number_format(100.0 * $content['version_size'] / $content['total_size'], 1).'%';
 		}
-		if (!($content['is_root']=Vfs::$is_root))
+		if (!($content['is_root'] = Vfs::$is_root))
 		{
 			if (empty($msg))
 			{
@@ -251,16 +251,16 @@ 
 
 		$n = 2;
 		$content['mounts'] = array();
-		foreach(Vfs::mount() as $path => $url)
+		foreach (Vfs::mount() as $path => $url)
 		{
 			$content['mounts'][$n++] = array(
 				'path' => $path,
 				'url'  => $url,
 			);
 			$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
-				Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;
+				Vfs::parse_url($url, PHP_URL_SCHEME) != $this->versioning;
 		}
-		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true;	// do not allow to unmount / or /apps
+		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true; // do not allow to unmount / or /apps
 		$readonlys['url'] = !self::$is_setup;
 
 		$sel_options['allow_delete_versions'] = array(
@@ -271,13 +271,13 @@ 
 		);
 		// show [Mount /etemplates] button for admin, if not already mounted and available
 		$readonlys['etemplates'] = !class_exists('\EGroupware\Stylite\Vfs\Merge\StreamWrapper') ||
-			($fs_tab=Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
+			($fs_tab = Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		//_debug_array($content);
 
 		$tpl = new etemplate_new('filemanager.admin');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('VFS mounts and versioning');
-		$tpl->exec('filemanager.filemanager_admin.index',$content,$sel_options,$readonlys);
+		$tpl->exec('filemanager.filemanager_admin.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -297,9 +297,9 @@ 
 		}
 		$content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n";
 
-		$content .= html::form('<p>'.($check_only&&is_array($msgs)?html::submit_button('fix', lang('Fix reported problems')):'').
+		$content .= html::form('<p>'.($check_only && is_array($msgs) ? html::submit_button('fix', lang('Fix reported problems')) : '').
 			html::submit_button('cancel', lang('Cancel')).'</p>',
-			'','/index.php',array('menuaction'=>'filemanager.filemanager_admin.fsck'));
+			'', '/index.php', array('menuaction'=>'filemanager.filemanager_admin.fsck'));
 
 		$GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true);
 	}

filemanager/inc/class.filemanager_select.inc.php

Spacing +38 added lines, -38 removed lines

@@ -58,7 +58,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	function select(array $content=null)
+	function select(array $content = null)
 	{
 		if (!is_array($content))
 		{
@@ -69,17 +69,17 @@ 
 				$content['msg'] = $_GET['msg'];
 				$_GET['mode'] = 'open';
 				$_GET['method'] = 'ckeditor_return';
-				$_GET['CKEditorFuncNum'] = egw_cache::getSession('filemanager','ckeditorfuncnum');
+				$_GET['CKEditorFuncNum'] = egw_cache::getSession('filemanager', 'ckeditorfuncnum');
 			}
 			$content['mode'] = $_GET['mode'];
-			if (!in_array($content['mode'],array('open','open-multiple','saveas','select-dir')))
+			if (!in_array($content['mode'], array('open', 'open-multiple', 'saveas', 'select-dir')))
 			{
 				throw new egw_exception_wrong_parameter("Wrong or unset required mode parameter!");
 			}
 			$content['path'] = $_GET['path'];
 			if (empty($content['path']))
 			{
-				$content['path'] = egw_session::appsession('select_path','filemanger');
+				$content['path'] = egw_session::appsession('select_path', 'filemanger');
 			}
 			$content['name'] = (string)$_GET['name'];
 			$content['method'] = $_GET['method'];
@@ -87,7 +87,7 @@ 
 			{
 				if (isset($_GET['CKEditorFuncNum']) && is_numeric($_GET['CKEditorFuncNum']))
 				{
-					egw_cache::setSession('filemanager','ckeditorfuncnum',
+					egw_cache::setSession('filemanager', 'ckeditorfuncnum',
 						$content['ckeditorfuncnum'] = $_GET['CKEditorFuncNum']);
 				}
 				else
@@ -95,20 +95,20 @@ 
 					throw new egw_exception_wrong_parameter("chkeditor_return has been specified as a method but some parameters are missing or invalid.");
 				}
 			}
-			$content['id']     = $_GET['id'];
+			$content['id'] = $_GET['id'];
 			$content['label'] = isset($_GET['label']) ? $_GET['label'] : lang('Open');
 			if (($content['options-mime'] = isset($_GET['mime'])))
 			{
 				$sel_options['mime'] = array();
-				foreach((array)$_GET['mime'] as $key => $value)
+				foreach ((array)$_GET['mime'] as $key => $value)
 				{
 					if (is_numeric($key))
 					{
-						$sel_options['mime'][$value] = lang('%1 files',strtoupper(mime_magic::mime2ext($value))).' ('.$value.')';
+						$sel_options['mime'][$value] = lang('%1 files', strtoupper(mime_magic::mime2ext($value))).' ('.$value.')';
 					}
 					else
 					{
-						$sel_options['mime'][$key] = lang('%1 files',strtoupper($value)).' ('.$key.')';
+						$sel_options['mime'][$key] = lang('%1 files', strtoupper($value)).' ('.$key.')';
 					}
 				}
 
@@ -116,11 +116,11 @@ 
 				error_log(array2string($content['options-mime']));
 			}
 		}
-		elseif(isset($content['button']))
+		elseif (isset($content['button']))
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'home':
 					$content['path'] = filemanager_ui::get_home_dir();
@@ -132,10 +132,10 @@ 
 						//Set the "content" name filed accordingly to the uploaded file
 						// encode chars which special meaning in url/vfs (some like / get removed!)
 						$content['name'] = egw_vfs::encodePathComponent($content['file_upload']['name']);
-						$to_path = egw_vfs::concat($content['path'],$content['name']);
+						$to_path = egw_vfs::concat($content['path'], $content['name']);
 
 						$copy_result = (egw_vfs::is_writable($content['path']) || egw_vfs::is_writable($to_path)) &&
-							copy($content['file_upload']['tmp_name'],egw_vfs::PREFIX.$to_path);
+							copy($content['file_upload']['tmp_name'], egw_vfs::PREFIX.$to_path);
 					}
 
 					//Break on an error condition
@@ -154,12 +154,12 @@ 
 						break;
 					}
 
-					switch($content['mode'])
+					switch ($content['mode'])
 					{
 						case 'open-multiple':
-							foreach((array)$content['dir']['selected'] as $name)
+							foreach ((array)$content['dir']['selected'] as $name)
 							{
-								$files[] = egw_vfs::concat($content['path'],$name);
+								$files[] = egw_vfs::concat($content['path'], $name);
 							}
 							//Add an uploaded file to the files result array2string
 							if ($copy_result === true) $files[] = $to_path;
@@ -175,33 +175,33 @@ 
 							// Fall through
 
 						default:
-							$files = egw_vfs::concat($content['path'],$content['name']);
+							$files = egw_vfs::concat($content['path'], $content['name']);
 							break;
 					}
 
 					if ($content['method'] && $content['method'] != 'ckeditor_return')
 					{
-						$js = ExecMethod2($content['method'],$content['id'],$files);
+						$js = ExecMethod2($content['method'], $content['id'], $files);
 					}
 					else if ($content['method'] == 'ckeditor_return')
 					{
-						$download_url = egw_vfs::download_url(egw_vfs::concat($content['path'],$content['name']));
+						$download_url = egw_vfs::download_url(egw_vfs::concat($content['path'], $content['name']));
 						if ($download_url[0] == '/') $download_url = egw::link($download_url);
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
 							htmlspecialchars($download_url)."',".
 							"'');\negw(window).close();";
 					}
-					if(egw_json_response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
+					if (egw_json_response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
 					{
 						$response = egw_json_response::get();
-						if($js)
+						if ($js)
 						{
 							$response->script($js);
 						}
 						// Ahh!
 						// The vfs-select widget looks for this
-						$response->script('this.selected_files = '.json_encode($files) . '; egw(this).close();');
+						$response->script('this.selected_files = '.json_encode($files).'; egw(this).close();');
 					}
 					else
 					{
@@ -213,7 +213,7 @@ 
 
 			$sel_options['mime'] = $content['options-mime'];
 		}
-		elseif(isset($content['apps']))
+		elseif (isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
 			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
@@ -222,7 +222,7 @@ 
 		//Deactivate the opload field if the current directory is not writeable or
 		//we're currently not in the single file open mode.
 		$content['no_upload'] = !egw_vfs::is_writable($content['path']) ||
-			!in_array($content['mode'],array('open'));
+			!in_array($content['mode'], array('open'));
 
 		$content['apps'] = array_keys(self::get_apps());
 
@@ -232,7 +232,7 @@ 
 		}
 
 		// Set a flag for easy detection as we go
-		$favorites_flag = substr($content['path'],0,strlen('/apps/favorites')) == '/apps/favorites';
+		$favorites_flag = substr($content['path'], 0, strlen('/apps/favorites')) == '/apps/favorites';
 
 		if (!$favorites_flag && (!$content['path'] || !egw_vfs::is_dir($content['path'])))
 		{
@@ -246,12 +246,12 @@ 
 			$files = array();
 			$favorites = egw_favorites::get_favorites('filemanager');
 			$n = 0;
-			foreach($favorites as $favorite)
+			foreach ($favorites as $favorite)
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if (!$path) continue;
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$mime = egw_vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -267,29 +267,29 @@ 
 				++$n;
 			}
 		}
-		else if (!($files = egw_vfs::find($content['path'],array(
+		else if (!($files = egw_vfs::find($content['path'], array(
 			'dirsontop' => true,
 			'order' => 'name',
 			'sort' => 'ASC',
 			'maxdepth' => 1,
 		))))
 		{
-			$content['msg'] = lang("Can't open directory %1!",$content['path']);
+			$content['msg'] = lang("Can't open directory %1!", $content['path']);
 		}
 		else
 		{
 			$n = 0;
 			$content['dir'] = array('mode' => $content['mode']);
-			foreach($files as $path)
+			foreach ($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$name = egw_vfs::basename($path);
 				$is_dir = egw_vfs::is_dir($path);
 				$mime = egw_vfs::mime_content_type($path);
 				if ($content['mime'] && !$is_dir && $mime != $content['mime'])
 				{
-					continue;	// does not match mime-filter --> ignore
+					continue; // does not match mime-filter --> ignore
 				}
 				$content['dir'][$n] = array(
 					'name' => $name,
@@ -303,12 +303,12 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n) $readonlys['selected[]'] = true; // remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !egw_vfs::is_writable($content['path']);
 
 		//_debug_array($readonlys);
-		egw_session::appsession('select_path','filemanger',$content['path']);
+		egw_session::appsession('select_path', 'filemanger', $content['path']);
 		$preserve = array(
 			'mode'   => $content['mode'],
 			'method' => $content['method'],
@@ -330,7 +330,7 @@ 
 		{
 			egw_framework::csp_script_src_attrs('unsafe-inline');
 		}
-		$tpl->exec('filemanager.filemanager_select.select',$content,$sel_options,$readonlys,$preserve,2);
+		$tpl->exec('filemanager.filemanager_select.select', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
 	/**
@@ -340,11 +340,11 @@ 
 	 */
 	static function get_apps()
 	{
-		$apps = array(false);	// index starting from 1
+		$apps = array(false); // index starting from 1
 		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
 		$apps += egw_link::app_list('query');
 
-		unset($apps['mydms']);	// they do NOT support adding files to VFS
+		unset($apps['mydms']); // they do NOT support adding files to VFS
 		unset($apps['wiki']);
 		unset($apps['home-accounts']);
 		unset($apps['addressbook-email']);

filemanager/inc/class.filemanager_merge.inc.php

Spacing +35 added lines, -35 removed lines

@@ -56,7 +56,7 @@ 
 	{
 		parent::__construct();
 
-		if($_dir)
+		if ($_dir)
 		{
 			$this->dir = $_dir;
 		}
@@ -72,7 +72,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		if (!($replacements = $this->filemanager_replacements($id, '', $content)))
 		{
@@ -88,27 +88,27 @@ 
 	 * @param string $prefix='' prefix like eg. 'erole'
 	 * @return array|boolean
 	 */
-	public function filemanager_replacements($id,$prefix='', &$content = null)
+	public function filemanager_replacements($id, $prefix = '', &$content = null)
 	{
 		$info = array();
-		$file = egw_vfs::lstat($id,true);
+		$file = egw_vfs::lstat($id, true);
 
 		$file['mtime'] = egw_time::to($file['mtime']);
 		$file['ctime'] = egw_time::to($file['ctime']);
 
 		$file['name'] = egw_vfs::basename($id);
 		$file['dir'] = egw_vfs::decodePath(egw_vfs::dirname($id));
-		$dirlist = explode('/',$file['dir']);
+		$dirlist = explode('/', $file['dir']);
 		$file['folder'] = array_pop($dirlist);
-		$file['folder_file'] = $file['folder'] . '/'.$file['name'];
+		$file['folder_file'] = $file['folder'].'/'.$file['name'];
 		$file['path'] = $id;
 		$file['rel_path'] = str_replace($this->dir.'/', '', $id);
 		$file['hsize'] = egw_vfs::hsize($file['size']);
 		$file['mime'] = egw_vfs::mime_content_type($id);
-		$file['gid'] *= -1;  // our widgets use negative gid's
+		$file['gid'] *= -1; // our widgets use negative gid's
 		if (($props = egw_vfs::propfind($id)))
 		{
-			foreach($props as $prop)
+			foreach ($props as $prop)
 			{
 				$file[$prop['name']] = $prop['val'];
 			}
@@ -118,22 +118,22 @@ 
 			$file['symlink'] = egw_vfs::readlink($id);
 		}
 		// Custom fields
-		if($content && strpos($content, '#') !== 0)
+		if ($content && strpos($content, '#') !== 0)
                 {
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
-			foreach(config::get_customfields('filemanager') as $name => $field)
+			foreach (config::get_customfields('filemanager') as $name => $field)
 			{
 				// Set any missing custom fields, or the marker will stay
-				if(!$file['#'.$name])
+				if (!$file['#'.$name])
 				{
 					$file['#'.$name] = '';
 					continue;
 				}
 
 				// Format date cfs per user preferences
-				if($field['type'] == 'date' || $field['type'] == 'date-time')
+				if ($field['type'] == 'date' || $field['type'] == 'date-time')
 				{
 					$this->date_fields[] = '#'.$name;
 					$file['#'.$name] = egw_time::to($file['#'.$name], $field['type'] == 'date' ? true : '');
@@ -142,51 +142,51 @@ 
 		}
 
 		// If in apps folder, try for app-specific placeholders
-		if($dirlist[1] == 'apps' && count($dirlist) > 1)
+		if ($dirlist[1] == 'apps' && count($dirlist) > 1)
 		{
 			// Try this first - a normal path /apps/appname/id/file
-			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
+			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/') + 5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
-				$resolved = egw_vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
-				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+				$resolved = egw_vfs::resolve_url_symlinks(implode('/', array_slice(explode('/', $file['dir']), 0, 4)));
+				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = egw_vfs::resolve_url_symlinks($file['path']);
-					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 				}
 			}
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				if($app && $GLOBALS['egw_info']['user']['apps'][$app])
+				if ($app && $GLOBALS['egw_info']['user']['apps'][$app])
 				{
 					$app_merge = null;
 					try
 					{
-						$classname = $app .'_merge';
-						if(class_exists($classname))
+						$classname = $app.'_merge';
+						if (class_exists($classname))
 						{
 							$app_merge = new $classname();
-							if($app_merge && method_exists($app_merge, 'get_replacements'))
+							if ($app_merge && method_exists($app_merge, 'get_replacements'))
 							{
 								$app_placeholders = $app_merge->get_replacements($app_id, $content);
 							}
 						}
 					}
 					// Silently discard & continue
-					catch(Exception $e) {
-						unset($e);	// not used
+					catch (Exception $e) {
+						unset($e); // not used
 					}
 				}
 			}
 		}
 		$link = egw_link::mime_open($file['url'], $file['mime']);
-		if(is_array($link))
+		if (is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if ($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
 			$link = egw_session::link('/index.php', $link);
 		}
 		else
@@ -205,12 +205,12 @@ 
 		$file['url'] = $link;
 
 		// Add markers
-		foreach($file as $key => &$value)
+		foreach ($file as $key => &$value)
 		{
-			if(!$value) $value = '';
-			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
+			if (!$value) $value = '';
+			$info['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
-		if($app_placeholders)
+		if ($app_placeholders)
 		{
 			$info = array_merge($app_placeholders, $info);
 		}
@@ -246,7 +246,7 @@ 
 			'hsize' => 'Size',
 			'size' => 'Size (in bytes)',
 		);
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
 			if (!($n&1)) echo '<tr>';
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
@@ -255,7 +255,7 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach(config::get_customfields('filemanager') as $name => $field)
+		foreach (config::get_customfields('filemanager') as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -264,7 +264,7 @@ 
 		echo '<tr><td colspan="4">'.lang('For files linked to an application entry (inside /apps/appname/id/) the placeholders for that application are also available.  See the specific application for a list of available placeholders.').'</td></tr>';
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),