EGroupware / egroupware

calendar/setup/tables_current.inc.php

Spacing +56 added lines, -56 removed lines

@@ -12,41 +12,41 @@ 
 $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_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(),
@@ -55,53 +55,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' => '16384','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' => '16384', '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/tz_aliases.inc.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	'Arab Standard Time' => 'Asia/Riyadh',
 	'Arabian Standard Time' => 'Asia/Dubai',
 	'Arabic Standard Time' => 'Asia/Baghdad',
-	'Argentina Standard Time' => 'America/Argentina/Buenos_Aires',	// was 'America/Buenos_Aires',
+	'Argentina Standard Time' => 'America/Argentina/Buenos_Aires', // was 'America/Buenos_Aires',
 	'Atlantic Standard Time' => 'America/Halifax',
 	'Azerbaijan Standard Time' => 'Asia/Baku',
 	'Azores Standard Time' => 'Atlantic/Azores',
@@ -59,7 +59,7 @@ 
 	'Greenland Standard Time' => 'America/Godthab',
 	'Greenwich Standard Time' => 'Atlantic/Reykjavik',
 	'Hawaiian Standard Time' => 'Pacific/Honolulu',
-	'India Standard Time' => 'Asia/Kolkata',	// Asia/Calcutta is an alias to Asia/Kolkata
+	'India Standard Time' => 'Asia/Kolkata', // Asia/Calcutta is an alias to Asia/Kolkata
 	'Iran Standard Time' => 'Asia/Tehran',
 	'Israel Standard Time' => 'Asia/Jerusalem',
 	'Jordan Standard Time' => 'Asia/Amman',
@@ -198,7 +198,7 @@ 
 	'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein',
 
 	// various aliases collected over time
-	'America/Creston' => 'America/Dawson_Creek',	// not in sqlight DB of Thunderbird version 1.2011n, Dawson Creek is also UTC-7 without DS
+	'America/Creston' => 'America/Dawson_Creek', // not in sqlight DB of Thunderbird version 1.2011n, Dawson Creek is also UTC-7 without DS
 	'Armenian Standard Time' => 'Asia/Yerevan',
 	'Asia/Katmandu' => 'Asia/Kathmandu',
 	'Asia/Calcutta' => 'Asia/Kolkata',

calendar/setup/default_records.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,17 +10,17 @@
  */
 
 // enable auto-loading of holidays from localhost by default
-foreach(array(
+foreach (array(
 	'auto_load_holidays' => 'True',
 	'holidays_url_path'  => 'localhost',
 ) as $name => $value)
 {
-	$oProc->insert($GLOBALS['egw_setup']->config_table,array(
+	$oProc->insert($GLOBALS['egw_setup']->config_table, array(
 		'config_value' => $value,
-	),array(
+	), array(
 		'config_app' => 'phpgwapi',
 		'config_name' => $name,
-	),__FILE__,__LINE__);
+	), __FILE__, __LINE__);
 }
 
 // import timezone data

calendar/freebusy.php

Spacing +13 added lines, -13 removed lines

@@ -41,23 +41,23 @@ 
 	$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 }
 // fix for SOGo connector, which does not decode the = in our f/b url
-if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
+if (strpos($_SERVER['QUERY_STRING'], '=3D') !== false && substr($_GET['user'], 0, 2) == '3D')
 {
-	$_GET['user'] = substr($_GET['user'],2);
-	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
+	$_GET['user'] = substr($_GET['user'], 2);
+	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'], 2);
+	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'], 2);
 }
 if (!is_numeric($user = $_GET['user']))
 {
 	// check if user contains the current domain --> remove it
-	list(,$domain) = explode('@',$user);
+	list(,$domain) = explode('@', $user);
 	if ($domain === $GLOBALS['egw_info']['user']['domain'])
-	list($user) = explode('@',$user);
-	$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
+	list($user) = explode('@', $user);
+	$user = $GLOBALS['egw']->accounts->name2id($user, 'account_lid', 'u');
 }
 if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))
 {
-	fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)",$_GET['user']));
+	fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)", $_GET['user']));
 }
 if (!$loged_in)
 {
@@ -78,11 +78,11 @@ 
 		if (strpos($authuser, '@') === false)
 		{
 			$domain = $GLOBALS['egw_info']['server']['default_domain'];
-			$authuser .= '@' . $domain;
+			$authuser .= '@'.$domain;
 		}
 		else
 		{
-			list(, $domain) = explode('@',$authuser, 2);
+			list(, $domain) = explode('@', $authuser, 2);
 		}
 		if (array_key_exists($domain, $GLOBALS['egw_domain']))
 		{
@@ -92,8 +92,8 @@ 
 			$GLOBALS['egw_info']['user']['domain'] = $domain;
 			$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
 			$GLOBALS['egw_info']['flags']['noapi'] = false;
-			require_once(EGW_API_INC . '/functions.inc.php');
-			$loged_in =  $GLOBALS['egw']->session->create($authuser, $password, 'text');
+			require_once(EGW_API_INC.'/functions.inc.php');
+			$loged_in = $GLOBALS['egw']->session->create($authuser, $password, 'text');
 			session_unset();
 			session_destroy();
 		}
@@ -109,7 +109,7 @@ 
 }
 else
 {
-	Api\Header\Content::type('freebusy.ifb','text/calendar');
+	Api\Header\Content::type('freebusy.ifb', 'text/calendar');
 }
 $ical = new calendar_ical();
 echo $ical->freebusy($user, $_GET['end']);

Braces +12 added lines, -4 removed lines

@@ -44,15 +44,23 @@
 if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
 {
 	$_GET['user'] = substr($_GET['user'],2);
-	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
-}
+	if (isset($_GET['password']))
+	{
+		$_GET['password'] = substr($_GET['password'],2);
+	}
+	if (isset($_GET['cred']))
+	{
+		$_GET['cred'] = substr($_GET['cred'],2);
+	}
+	}
 if (!is_numeric($user = $_GET['user']))
 {
 	// check if user contains the current domain --> remove it
 	list(,$domain) = explode('@',$user);
 	if ($domain === $GLOBALS['egw_info']['user']['domain'])
-	list($user) = explode('@',$user);
+	{
+		list($user) = explode('@',$user);
+	}
 	$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
 }
 if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))

calendar/inc/class.calendar_zpush.inc.php

Indentation +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	 * @param int $cutoffdate =null
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();

Spacing +176 added lines, -177 removed lines

@@ -84,19 +84,19 @@ 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		$cals_pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
-		$cals = $cals_pref ? explode(',',$cals_pref) : array('P');	// implicit default of 'P'
+		$cals = $cals_pref ? explode(',', $cals_pref) : array('P'); // implicit default of 'P'
 		$folderlist = array();
 
 		foreach ($this->calendar->list_cals() as $entry)
 		{
 			$account_id = $entry['grantor'];
-			if (in_array('A',$cals) || in_array($account_id,$cals) ||
-				$account_id == $GLOBALS['egw_info']['user']['account_id'] ||	// always incl. own calendar!
-				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$cals))
+			if (in_array('A', $cals) || in_array($account_id, $cals) ||
+				$account_id == $GLOBALS['egw_info']['user']['account_id'] || // always incl. own calendar!
+				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G', $cals))
 			{
 				$folderlist[] = $f = array(
-					'id'	=>	$this->backend->createID('calendar',$account_id),
-					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id,'account_fullname'),
+					'id'	=>	$this->backend->createID('calendar', $account_id),
+					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id, 'account_fullname'),
 					'parent'=>	'0',
 				);
 			}
@@ -120,7 +120,7 @@ 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
 		$folderObj->parentid = '0';
-		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner,'account_fullname');
+		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname');
 		if ($owner == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_APPOINTMENT;
@@ -154,7 +154,7 @@ 
 
 		$stat = array(
 			'id'	 => $id,
-			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner,'account_fullname'),
+			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname'),
 			'parent' => '0',
 		);
 		//error_log(__METHOD__."('$id') folderObj=".array2string($stat));
@@ -178,19 +178,19 @@ 
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
+	function GetMessageList($id, $cutoffdate = NULL, array $not_uids = null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id',$cutoffdate)");
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 
-		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100*24*3600;	// default three month back -30 breaks all sync recurrences
+		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100 * 24 * 3600; // default three month back -30 breaks all sync recurrences
 
 		$filter = array(
 			'users' => $user,
-			'start' => $cutoffdate,	// default one month back -30 breaks all sync recurrences
+			'start' => $cutoffdate, // default one month back -30 breaks all sync recurrences
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
@@ -199,13 +199,13 @@ 
 			'filter' => $user == $GLOBALS['egw_info']['user']['account_id'] ? (is_array($not_uids) ? 'unknown' : 'default') : 'default',
 			// @todo return only etag relevant information (seems not to work ...)
 			//'cols'		=> array('egw_cal.cal_id', 'cal_start',	'recur_type', 'cal_modified', 'cal_uid', 'cal_etag'),
-			'query' => array('cal_recurrence' => 0),	// do NOT return recurrence exceptions
+			'query' => array('cal_recurrence' => 0), // do NOT return recurrence exceptions
 		);
 
 		$messagelist = array();
 		// reading events in chunks of 100, to keep memory down for huge calendars
 		$num_rows = 100;
-		for($start=0; ($events = $this->calendar->search($filter+array(
+		for ($start = 0; ($events = $this->calendar->search($filter + array(
 			'offset'   => $start,
 			'num_rows' => $num_rows,
 		))); $start += $num_rows)
@@ -240,7 +240,7 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
 	 */
-	function GetMeetingRequests(array $not_uids, $cutoffdate=NULL)
+	function GetMeetingRequests(array $not_uids, $cutoffdate = NULL)
 	{
 		unset($not_uids, $cutoffdate);
 		return array();
@@ -266,7 +266,7 @@ 
 	 */
 	function StatMeetingRequest($id)
 	{
-		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']);	// users personal calendar
+		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']); // users personal calendar
 
 		$ret = $this->StatMessage($folderid, abs($id));
 		$ret['id'] = $id;
@@ -285,9 +285,9 @@ 
 	 * @param bool $mimesupport
 	 * @return SyncMail
 	 */
-	function GetMeetingRequest($id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	function GetMeetingRequest($id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
-		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
+		unset($truncsize, $optionbodypreference, $mimesupport); // not used, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -300,13 +300,13 @@ 
 			$message = new SyncMail();
 			$message->read = false;
 			$message->subject = $event['title'];
-			$message->importance = 1;	// 0=Low, 1=Normal, 2=High
+			$message->importance = 1; // 0=Low, 1=Normal, 2=High
 			$message->datereceived = $event['created'];
 			$message->to = $message->displayto = $GLOBALS['egw_info']['user']['account_email'];
-			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname').
-				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'],'account_email').'>';
+			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname').
+				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email').'>';
 			$message->internetcpid = 65001;
-			$message->contentclass="urn:content-classes:message";
+			$message->contentclass = "urn:content-classes:message";
 
 			$message->meetingrequest = self::meetingRequest($event);
 			$message->messageclass = "IPM.Schedule.Meeting.Request";
@@ -321,7 +321,7 @@ 
 			else
 			{
 				$message->airsyncbasebody = new SyncAirSyncBaseBody();
-				$message->airsyncbasenativebodytype=1;
+				$message->airsyncbasenativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
 			}
 		}
@@ -356,12 +356,12 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// ignore exception, simply set no timezone, as it is optional
 		}
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -371,10 +371,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'location' => 'location',
 		) as $key => $attr)
@@ -383,16 +383,16 @@ 
 		}
 		$message->organizer = $event['organizer'];
 
-		$message->sensitivity = $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		// ToDo: recurring events: InstanceType, RecurrenceId, Recurrences; ...
-		$message->instancetype = 0;	// 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
+		$message->instancetype = 0; // 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
 
-		$message->responserequested = 1;	//0=No, 1=Yes
-		$message->disallownewtimeproposal = 1;	//1=forbidden, 0=allowed
+		$message->responserequested = 1; //0=No, 1=Yes
+		$message->disallownewtimeproposal = 1; //1=forbidden, 0=allowed
 		//$message->messagemeetingtype;	// email2
 
 		// ToDo: alarme: Reminder
@@ -438,14 +438,14 @@ 
 			// check if event already exist (invitation of or already imported by other user)
 			if (!($event = $this->calendar->read($parsed_event['uid'], 0, false, 'server')))
 			{
-				$event = $parsed_event;	// create new event from external invitation
+				$event = $parsed_event; // create new event from external invitation
 			}
-			elseif(!isset($event['participants'][$uid]))
+			elseif (!isset($event['participants'][$uid]))
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) current user ($uid) is NO participant of event ".array2string($event));
 				// maybe we should silently add him, as he might not have the rights to add him himself with calendar->update ...
 			}
-			elseif($event['deleted'])
+			elseif ($event['deleted'])
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) event ($uid) deleted on server --> return false");
 				return false;
@@ -468,7 +468,7 @@ 
 		else
 		{
 			$event['participants'][$uid] = $status;
-			$ret = $this->calendar->update($event, true);	// true = ignore conflicts, as there seems no conflict handling in AS
+			$ret = $this->calendar->update($event, true); // true = ignore conflicts, as there seems no conflict handling in AS
 		}
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", '$folderid', $response) returning ".array2string($ret));
 		return $ret;
@@ -480,10 +480,10 @@ 
 	 * @var array
 	 */
 	static $status2as = array(
-		'U' => 0,	// unknown
-		'T' => 2,	// tentative
-		'A' => 3,	// accepted
-		'R' => 4,	// decline
+		'U' => 0, // unknown
+		'T' => 2, // tentative
+		'A' => 3, // accepted
+		'R' => 4, // decline
 		// 5 = not responded
 	);
 	/**
@@ -492,9 +492,9 @@ 
 	 * @var array
 	 */
 	static $role2as = array(
-		'REQ-PARTICIPANT' => 1,	// required
-		'CHAIR' => 1,			// required
-		'OPT-PARTICIPANT' => 2,	// optional
+		'REQ-PARTICIPANT' => 1, // required
+		'CHAIR' => 1, // required
+		'OPT-PARTICIPANT' => 2, // optional
 		'NON-PARTICIPANT' => 2,
 		// 3 = ressource
 	);
@@ -506,8 +506,8 @@ 
 	static $recur_type2as = array(
 		calendar_rrule::DAILY => 0,
 		calendar_rrule::WEEKLY => 1,
-		calendar_rrule::MONTHLY_MDAY => 2,	// monthly
-		calendar_rrule::MONTHLY_WDAY => 3,	// monthly on nth day
+		calendar_rrule::MONTHLY_MDAY => 2, // monthly
+		calendar_rrule::MONTHLY_WDAY => 3, // monthly on nth day
 		calendar_rrule::YEARLY => 5,
 		// 6 = yearly on nth day (same as 5 on non-leapyears or before March on leapyears)
 	);
@@ -534,7 +534,7 @@ 
 	 */
 	public function ChangeMessage($folderid, $_id, $message, $contentParameters)
 	{
-		unset($contentParameters);	// unused, but required by function signature
+		unset($contentParameters); // unused, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -544,7 +544,7 @@ 
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $_id, ".array2string($message).") type='$type', account=$account");
 
-		list($id,$recur_date) = explode(':', $_id);
+		list($id, $recur_date) = explode(':', $_id);
 
 		if ($type != 'calendar' || $id && !($old_event = $this->calendar->read($id, $recur_date, false, 'server')))
 		{
@@ -557,21 +557,21 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 			//error_log(__METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 		}
-		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0,$account))
+		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0, $account))
 		{
 			// @todo: write in users calendar and make account only a participant
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) no rights to add/edit event!");
 			//error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $old_event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id) $old_event['owner'] = $account; // we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $old_event);
 
 		// store event, ignore conflicts and skip notifications, as AS clients do their own notifications
 		$skip_notification = false;
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='send')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'send')
 		{
 			$skip_notification = true; // to avoid double notification from client AND Server
 		}
@@ -584,16 +584,16 @@ 
 		// store non-delete exceptions
 		if ($message->exceptions)
 		{
-			foreach($message->exceptions as $exception)
+			foreach ($message->exceptions as $exception)
 			{
 				if (!$exception->deleted)
 				{
 					$ex_event = $event;
 					unset($ex_event['id']);
 					unset($ex_event['etag']);
-					foreach(array_keys($ex_event) as $name)
+					foreach (array_keys($ex_event) as $name)
 					{
-						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+						if (substr($name, 0, 6) == 'recur_') unset($ex_event[$name]);
 					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
@@ -601,10 +601,10 @@ 
 						'user' => $account,
 						'enum_recuring' => false,
 						'daywise' => false,
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'query' => array(
 							'cal_uid' => $event['uid'],
-							'cal_recurrence' => $exception->exceptionstarttime,	// in servertime
+							'cal_recurrence' => $exception->exceptionstarttime, // in servertime
 						),
 					))))
 					{
@@ -616,7 +616,7 @@ 
 						$participants = $event['participants'];
 					}
 					$save_event = $this->message2event($exception, $account, $ex_event);
-					$save_event['participants'] = $participants;	// not contained in $exception
+					$save_event['participants'] = $participants; // not contained in $exception
 					$save_event['reference'] = $event['id'];
 					$save_event['recurrence'] = Api\DateTime::server2user($exception->exceptionstarttime);
 					$ex_ok = $this->calendar->save($save_event);
@@ -638,10 +638,10 @@ 
 	 * @param array $event =array()
 	 * @return array
 	 */
-	private function message2event(SyncAppointment $message, $account, $event=array())
+	private function message2event(SyncAppointment $message, $account, $event = array())
 	{
 		// timestamps (created & modified are updated automatically)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end' => 'endtime',
 		) as $key => $attr)
@@ -649,7 +649,7 @@ 
 			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -664,7 +664,7 @@ 
 		{
 			$event['description'] = $description;
 		}
-		$event['public'] = (int)($message->sensitivity < 1);	// 0=normal, 1=personal, 2=private, 3=confidential
+		$event['public'] = (int)($message->sensitivity < 1); // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		if (isset($message->busystatus))
@@ -674,21 +674,21 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
-			$event['end']--;	// otherwise our whole-day event code in save makes it one more day!
+			if ($event['end'] == $event['start']) $event['end'] += 24 * 3600; // some clients send equal start&end for 1day
+			$event['end']--; // otherwise our whole-day event code in save makes it one more day!
 		}
 
 		$participants = array();
-		foreach((array)$message->attendees as $attendee)
+		foreach ((array)$message->attendees as $attendee)
 		{
-			if ($attendee->type == 3) continue;	// we can not identify resources and re-add them anyway later
+			if ($attendee->type == 3) continue; // we can not identify resources and re-add them anyway later
 
 			$matches = null;
-			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
+			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/', $attendee->email, $matches))
 			{
 				$uid = $matches[1];
 			}
-			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email,'account_email')))
+			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email, 'account_email')))
 			{
 				$search = array(
 					'email' => $attendee->email,
@@ -698,13 +698,13 @@ 
 				// search addressbook for participant
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 				if ((list($data) = $this->addressbook->search($search,
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 				}
-				elseif($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
+				elseif ($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
 				{
 					$uid = 'e'.$attendee->email;
 				}
@@ -722,8 +722,8 @@ 
 				//ZLog::Write(LOGLEVEL_DEBUG, "old status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
 			// check if just email is an existing attendee (iOS returns email as name too!), keep it to keep status/role if not set
-			elseif ($event['id'] && (isset($event['participants'][$u='e'.$attendee->email]) ||
-				(isset($event['participants'][$u='e'.$attendee->name.' <'.$attendee->email.'>']))))
+			elseif ($event['id'] && (isset($event['participants'][$u = 'e'.$attendee->email]) ||
+				(isset($event['participants'][$u = 'e'.$attendee->name.' <'.$attendee->email.'>']))))
 			{
 				$status = $event['participants'][$u];
 				calendar_so::split_status($status, $quantity, $role);
@@ -736,9 +736,9 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//ZLog::Write(LOGLEVEL_DEBUG, "default status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
-			if ($role == 'CHAIR') $chair_set = true;	// by role from existing participant
+			if ($role == 'CHAIR') $chair_set = true; // by role from existing participant
 
-			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
+			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus, self::$status2as)))
 			{
 				$status = $s;
 			}
@@ -748,29 +748,29 @@ 
 				$chair_set = true;
 			}
 			elseif (isset($attendee->attendeetype) &&
-				!($role == 'CHAIR' && !is_numeric($uid)) &&	// do not override our external ORGANIZER
-				($r = array_search($attendee->attendeetype,self::$role2as)) &&
+				!($role == 'CHAIR' && !is_numeric($uid)) && // do not override our external ORGANIZER
+				($r = array_search($attendee->attendeetype, self::$role2as)) &&
 				(int)self::$role2as[$role] != $attendee->attendeetype)	// if old role gives same type, use old role, as we have a lot more roles then AS
 			{
 				$role = $r;
 			}
 			//ZLog::Write(LOGLEVEL_DEBUG, "-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
-			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
+			$participants[$uid] = calendar_so::combine_status($status, $quantitiy, $role);
 		}
 		// if organizer is not already participant, add him as chair
-		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail,'account_email')) && !isset($participants[$uid]))
+		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail, 'account_email')) && !isset($participants[$uid]))
 		{
 			$participants[$uid] = calendar_so::combine_status($uid == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,'CHAIR');
+				'A' : 'U', 1, 'CHAIR');
 			$chair_set = true;
 		}
 		// preserve all resource types not account, contact or email (eg. resources) for existing events
 		// $account is also preserved, as AS does not add him as participant!
-		foreach((array)$event['participant_types'] as $type => $parts)
+		foreach ((array)$event['participant_types'] as $type => $parts)
 		{
-			if (in_array($type,array('c','e'))) continue;	// they are correctly representable in AS
+			if (in_array($type, array('c', 'e'))) continue; // they are correctly representable in AS
 
-			foreach($parts as $id => $status)
+			foreach ($parts as $id => $status)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
 				if ($type == 'u' && $id != $account) continue;
@@ -786,13 +786,13 @@ 
 		if (!$event['id'] || !$participants || !isset($participants[$account]))
 		{
 			$participants[$account] = calendar_so::combine_status($account == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,!$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
+				'A' : 'U', 1, !$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
 		}
 		$event['participants'] = $participants;
 
 		if (isset($message->categories))
 		{
-			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event),'strlen'));
+			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event), 'strlen'));
 		}
 
 		// check if event is recurring and import recur information (incl. timezone)
@@ -802,8 +802,7 @@ 
 			{
 				$event['tzid'] = self::as2tz(self::_getTZFromSyncBlob(base64_decode($message->timezone)));
 			}
-			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY :
-				array_search($message->recurrence->type, self::$recur_type2as);
+			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY : array_search($message->recurrence->type, self::$recur_type2as);
 			$event['recur_interval'] = $message->recurrence->interval;
 
 			switch ($event['recur_type'])
@@ -812,7 +811,7 @@ 
 					// $message->recurrence->weekofmonth is not explicitly stored in egw, just taken from start date
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$event['recur_data'] = $message->recurrence->dayofweek;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$event['recur_data'] = $message->recurrence->dayofweek; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
 					// $message->recurrence->dayofmonth is not explicitly stored in egw, just taken from start date
@@ -828,7 +827,7 @@ 
 			$event['recur_exceptions'] = array();
 			if ($message->exceptions)
 			{
-				foreach($message->exceptions as $exception)
+				foreach ($message->exceptions as $exception)
 				{
 					$event['recur_exception'][] = Api\DateTime::server2user($exception->exceptionstarttime);
 				}
@@ -838,7 +837,7 @@ 
 			{
 				// calculate enddate from occurences count, as we only support enddate
 				$count = $message->recurrence->occurrences;
-				foreach(calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
+				foreach (calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
 				{
 					if (--$count <= 0) break;
 				}
@@ -848,11 +847,11 @@ 
 		// only import alarms in own calendar
 		if ($message->reminder && $account == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$event['alarm'] as $alarm)
+			foreach ((array)$event['alarm'] as $alarm)
 			{
-				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60*$message->reminder)
+				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60 * $message->reminder)
 				{
-					$alarm = true;	// alarm already exists --> do nothing
+					$alarm = true; // alarm already exists --> do nothing
 					break;
 				}
 			}
@@ -861,16 +860,16 @@ 
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
 				// --> if a later alarm is returned, user probably modifed an existing alarm
-				foreach((array)$event['alarm'] as $key => $alarm)
+				foreach ((array)$event['alarm'] as $key => $alarm)
 				{
-					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
+					if ($alarm['owner'] == $account && $alarm['offset'] > 60 * $message->reminder)
 					{
 						unset($event['alarm'][$key]);
 					}
 				}
 				$event['alarm'][] = $alarm = array(
 					'owner' => $account,
-					'offset' => 60*$message->reminder,
+					'offset' => 60 * $message->reminder,
 				);
 			}
 		}
@@ -944,7 +943,7 @@ 
 	 */
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
 
@@ -972,7 +971,7 @@ 
 	 */
 	function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id, ".array2string($flags)." NOT supported!");
 		return false;
@@ -1006,7 +1005,7 @@ 
 	 * @param string $class ='SyncAppointment' or 'SyncAppointmentException'
 	 * @return SyncAppointment|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
+	public function GetMessage($folderid, $id, $contentparameters, $class = 'SyncAppointment')
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
@@ -1024,17 +1023,17 @@ 
 		}
 		else
 		{
-			list($id,$recur_date) = explode(':',$id);
-			if ($type != 'calendar' || !($event = $this->calendar->read($id,$recur_date,false,'server',$account)))
+			list($id, $recur_date) = explode(':', $id);
+			if ($type != 'calendar' || !($event = $this->calendar->read($id, $recur_date, false, 'server', $account)))
 			{
 				error_log(__METHOD__."('$folderid', $id, ...) read($id,null,false,'server',$account) returned false");
 				return false;
 			}
 		}
-		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s',$event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s',$event['recurrence']));
-		foreach((array)$event['recur_exception'] as $ex)
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s', $event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s', $event['recurrence']));
+		foreach ((array)$event['recur_exception'] as $ex)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s',$ex));
+			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s', $ex));
 		}
 		$message = new $class();
 
@@ -1043,14 +1042,14 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// z-push (2.3 at least) requires a timezone for recurring events
 			if ($event['recur_type']) $message->timezone = self::UTC_BLOB;
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -1061,10 +1060,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -1086,21 +1085,21 @@ 
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, "airsyncbasebody!");
 				$message->asbody = new SyncBaseBody();
-				$message->nativebodytype=1;
+				$message->nativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->asbody);
 			}
 		}
-		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname');
+		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname');
 		// at least iOS calendar crashes, if organizer has no email address (true = generate an email, if user has none)
 		$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email', true);
 
-		$message->sensitivity = $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		$message->attendees = array();
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			// AS does NOT want calendar owner as participant
 			if ($uid == $account) continue;
@@ -1112,13 +1111,13 @@ 
 			$attendee->attendeetype = (int)self::$role2as[$role];
 			if (is_numeric($uid))
 			{
-				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid,'account_fullname');
+				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid, 'account_fullname');
 				$attendee->email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email', true);
 			}
 			else
 			{
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
-					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
+					ExecMethod($this->calendar->resources[$uid[0]]['info'], substr($uid, 1)) : array(false);
 
 				if (!$info) continue;
 
@@ -1136,7 +1135,7 @@ 
 					$message->organizeremail = $attendee->email;
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, $id, ...) external organizer detected (role=$role, uid=$uid), set as AS organizer: $message->organizername <$message->organizeremail>");
 				}
-				if ($uid[0] == 'r') $attendee->type = 3;	// 3 = resource
+				if ($uid[0] == 'r') $attendee->type = 3; // 3 = resource
 			}
 			// email must NOT be empty, but MAY be an arbitrary text
 			if (empty($attendee->email)) $attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
@@ -1144,7 +1143,7 @@ 
 			$message->attendees[] = $attendee;
 		}
 		$message->categories = array();
-		foreach($event['category'] ? explode(',',$event['category']) : array() as $cat_id)
+		foreach ($event['category'] ? explode(',', $event['category']) : array() as $cat_id)
 		{
 			$message->categories[] = Api\Categories::id2name($cat_id);
 		}
@@ -1153,25 +1152,25 @@ 
 		if ($event['recur_type'] != calendar_rrule::NONE && !$recur_date)
 		{
 			$message->recurrence = $recurrence = new SyncRecurrence();
-			$rrule = calendar_rrule::event2rrule($event,false);	// false = timestamps in $event are servertime
+			$rrule = calendar_rrule::event2rrule($event, false); // false = timestamps in $event are servertime
 			$recurrence->type = (int)self::$recur_type2as[$rrule->type];
 			$recurrence->interval = $rrule->interval;
 			switch ($rrule->type)
 			{
 				case calendar_rrule::MONTHLY_WDAY:
 					$recurrence->weekofmonth = $rrule->monthly_byday_num >= 1 ?
-						$rrule->monthly_byday_num : 5;	// 1..5=last week of month, not -1
+						$rrule->monthly_byday_num : 5; // 1..5=last week of month, not -1
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$recurrence->dayofweek = $rrule->weekdays;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$recurrence->dayofweek = $rrule->weekdays; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
-					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ?	// 1..31
-						$rrule->monthly_bymonthday : 31;	// not -1 for last day of month!
+					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ? // 1..31
+						$rrule->monthly_bymonthday : 31; // not -1 for last day of month!
 					break;
 				case calendar_rrule::YEARLY:
-					$recurrence->dayofmonth = (int)$rrule->time->format('d');	// 1..31
-					$recurrence->monthofyear = (int)$rrule->time->format('m');	// 1..12
+					$recurrence->dayofmonth = (int)$rrule->time->format('d'); // 1..31
+					$recurrence->monthofyear = (int)$rrule->time->format('m'); // 1..12
 					break;
 			}
 			if ($rrule->enddate)	// enddate is only a date, but AS needs a time incl. correct starttime!
@@ -1187,9 +1186,9 @@ 
 				// search real / non-virtual exceptions
 				if (!empty($event['uid']))
 				{
-					$ex_events =& $this->calendar->search(array(
+					$ex_events = & $this->calendar->search(array(
 						'query' => array('cal_uid' => $event['uid']),
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'daywise' => false,
 						'date_format' => 'server',
 					));
@@ -1198,36 +1197,36 @@ 
 				{
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events) >= 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
 
 				$message->exceptions = array();
-				foreach($ex_events as $ex_event)
+				foreach ($ex_events as $ex_event)
 				{
-					if ($ex_event['id'] == $event['id']) continue;	// ignore series master
+					if ($ex_event['id'] == $event['id']) continue; // ignore series master
 					$exception = $this->GetMessage($folderid, $ex_event, $contentparameters, 'SyncAppointmentException');
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
-					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
+					foreach (array('attendees', 'recurrence', 'uid', 'timezone', 'organizername', 'organizeremail') as $not_supported)
 					{
-						$exception->$not_supported = null;	// not allowed in exceptions :-(
+						$exception->$not_supported = null; // not allowed in exceptions :-(
 					}
 					$exception->deleted = 0;
-					if (($key = array_search($exception_time,$event['recur_exception'])) !== false)
+					if (($key = array_search($exception_time, $event['recur_exception'])) !== false)
 					{
 						unset($event['recur_exception'][$key]);
 					}
-					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 					$message->exceptions[] = $exception;
 				}
 				// add rest of exceptions as deleted
-				foreach($event['recur_exception'] as $exception_time)
+				foreach ($event['recur_exception'] as $exception_time)
 				{
 					if (!empty($exception_time))
 					{
 						if (empty($event['uid'])) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
-						$exception = new SyncAppointmentException();	// exceptions seems to be full SyncAppointments, with only starttime required
+						$exception = new SyncAppointmentException(); // exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
-						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 						$message->exceptions[] = $exception;
 					}
 				}
@@ -1249,12 +1248,12 @@ 
 		// only return alarms if in own calendar
 		if ($account == $GLOBALS['egw_info']['user']['account_id'] && $event['alarm'])
 		{
-			foreach($event['alarm'] as $alarm)
+			foreach ($event['alarm'] as $alarm)
 			{
 				if ($alarm['all'] || $alarm['owner'] == $account)
 				{
-					$message->reminder = $alarm['offset']/60;	// is in minutes, not seconds as in EGw
-					break;	// AS supports only one alarm! (we use the next/earliest one)
+					$message->reminder = $alarm['offset'] / 60; // is in minutes, not seconds as in EGw
+					break; // AS supports only one alarm! (we use the next/earliest one)
 				}
 			}
 		}
@@ -1277,7 +1276,7 @@ 
 	 */
 	public function StatMessage($folderid, $id)
 	{
-		unset($folderid);	// not used ($id is unique), but required by function signature
+		unset($folderid); // not used ($id is unique), but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -1288,7 +1287,7 @@ 
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
-			list($id) = explode(':',$id);
+			list($id) = explode(':', $id);
 			$this->calendar->check_perms(calendar_bo::ACL_FREEBUSY, $id, 0, 'server');
 			$this->calendar->debug = $backup;
 		}
@@ -1322,7 +1321,7 @@ 
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
-		$syncstate = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
+		$syncstate = $this->calendar->get_ctag($owner, false, true); // we only want to fetch the owners events, where he is a participant too
 		// workaround for syncstate = 0 when calendar is empty causes synctate to not return 0 but array resulting in foldersync loop
 		if ($syncstate == 0) $syncstate = 1;
 
@@ -1402,8 +1401,8 @@ 
 
 		if ($tz === 'UTC') return $data;
 
-		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		$name = $component = is_a($tz, 'DateTimeZone') ? $tz->getName() : $tz;
+		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name, 'component');
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1412,11 +1411,11 @@ 
 		if (!isset($standard))
 		{
 			$matches = null;
-			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i',$name,$matches))
+			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i', $name, $matches))
 			{
 				$standard = array(
-					'TZOFFSETTO'   => sprintf('%s%02d00',$matches[1],$matches[2]),
-					'TZOFFSETFROM' => sprintf('%s%02d00',$matches[1],$matches[2]),
+					'TZOFFSETTO'   => sprintf('%s%02d00', $matches[1], $matches[2]),
+					'TZOFFSETFROM' => sprintf('%s%02d00', $matches[1], $matches[2]),
 				);
 				unset($daylight);
 			}
@@ -1427,15 +1426,15 @@ 
 		}
 		// get bias and dstbias from standard component, which is present in all tz's
 		// (dstbias is relative to bias and almost always 60 or 0)
-		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'],0,-2) + substr($standard['TZOFFSETTO'],-2));
-		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'],0,-2) + substr($standard['TZOFFSETFROM'],-2) + $data['bias']);
+		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'], 0, -2) + substr($standard['TZOFFSETTO'], -2));
+		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'], 0, -2) + substr($standard['TZOFFSETFROM'], -2) + $data['bias']);
 
 		// check if we have an additional DAYLIGHT component and both have a RRULE component --> tz uses daylight saving
 		if (isset($standard['RRULE']) && isset($daylight) && isset($daylight['RRULE']))
 		{
-			foreach(array('dststart' => $daylight,'dstend' => $standard) as $prefix => $comp)
+			foreach (array('dststart' => $daylight, 'dstend' => $standard) as $prefix => $comp)
 			{
-				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/',$comp['RRULE'],$matches))
+				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/', $comp['RRULE'], $matches))
 				{
 					$data[$prefix.'month'] = (int)$matches[2];
 					$data[$prefix.'week'] = (int)$matches[1];
@@ -1452,20 +1451,20 @@ 
 						$data[$prefix.'week'] = 5;
 						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
 					}
-					static $day2int = array('SU'=>0,'MO'=>1,'TU'=>2,'WE'=>3,'TH'=>4,'FR'=>5,'SA'=>6);
-					$data[$prefix.'day'] = (int)$day2int[substr($matches[1],-2)];
+					static $day2int = array('SU'=>0, 'MO'=>1, 'TU'=>2, 'WE'=>3, 'TH'=>4, 'FR'=>5, 'SA'=>6);
+					$data[$prefix.'day'] = (int)$day2int[substr($matches[1], -2)];
 				}
-				if (preg_match('/^\d{8}T(\d{6})$/',$comp['DTSTART'],$matches))
+				if (preg_match('/^\d{8}T(\d{6})$/', $comp['DTSTART'], $matches))
 				{
-					$data[$prefix.'hour'] = (int)substr($matches[1],0,2)+($prefix=='dststart'?-1:1)*$data['dstbias']/60;
-					$data[$prefix.'minute'] = (int)substr($matches[1],2,2)+($prefix=='dststart'?-1:1)*$data['dstbias']%60;
-					$data[$prefix.'second'] = (int)substr($matches[1],4,2);
+					$data[$prefix.'hour'] = (int)substr($matches[1], 0, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] / 60;
+					$data[$prefix.'minute'] = (int)substr($matches[1], 2, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] % 60;
+					$data[$prefix.'second'] = (int)substr($matches[1], 4, 2);
 				}
 			}
 			// for southern hermisphere, were DST is in January, we have to swap start- and end-hour/-minute
 			if ($data['dststartmonth'] > $data['dstendmonth'])
 			{
-				$start = $data['dststarthour'];   $data['dststarthour'] = $data['dstendhour'];     $data['dstendhour'] = $start;
+				$start = $data['dststarthour']; $data['dststarthour'] = $data['dstendhour']; $data['dstendhour'] = $start;
 				$end = $data['dststartminute']; $data['dststartminute'] = $data['dstendminute']; $data['dstendminute'] = $end;
 			}
 		}
@@ -1523,20 +1522,20 @@ 
 	 * @param string|array $ical lines of ical file
 	 * @return array with parsed ical components
 	 */
-	static public function ical2array(&$ical,$section=null)
+	static public function ical2array(&$ical, $section = null)
 	{
 		$arr = array();
 		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
 		while (($line = array_shift($ical)))
 		{
-			list($name,$value) = explode(':',$line,2);
+			list($name, $value) = explode(':', $line, 2);
 			if ($name == 'BEGIN')
 			{
-				$arr[$value] = self::ical2array($ical,$value);
+				$arr[$value] = self::ical2array($ical, $value);
 			}
-			elseif($name == 'END')
+			elseif ($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section == $value) return $arr;
 				break;
 			}
 			else
@@ -1559,13 +1558,13 @@ 
 	 */
 	public static function as2tz(array $data)
 	{
-		static $cache=null;	// some caching withing the request
+		static $cache = null; // some caching withing the request
 
-		unset($data['name']);	// not used, but can stall the match
+		unset($data['name']); // not used, but can stall the match
 
 		$key = serialize($data);
 
-		for($n = 0; !isset($cache[$key]); ++$n)
+		for ($n = 0; !isset($cache[$key]); ++$n)
 		{
 			if (!$n)	// check users timezone first
 			{
@@ -1584,7 +1583,7 @@ 
 					break;
 				}
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				// simpy ignore that, as it only means $tz can NOT be converted, because it has no VTIMEZONE component
 			}
@@ -1599,8 +1598,8 @@ 
 	 */
 	static public function _getTZFromSyncBlob($data)
 	{
-		$tz = unpack(	"lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
-						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/" .
+		$tz = unpack("lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/".
+						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/".
 						"ldstbias", $data);
 
 		return $tz;
@@ -1613,7 +1612,7 @@ 
 	 */
 	static public function _getSyncBlobFromTZ($tz)
 	{
-		$packed = pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l",
+		$packed = pack("la64vvvvvvvv"."la64vvvvvvvv"."l",
 				$tz["bias"], "", 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"],
 				$tz["stdbias"], "", 0, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"], $tz["dststartmillis"],
 				$tz["dstbias"]);
@@ -1637,7 +1636,7 @@ 
 				$account_id = $entry['grantor'];
 				$cals[$account_id] = $entry['name'];
 			}
-			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]);	// skip current user
+			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]); // skip current user
 		}
 		$cals['G'] = lang('Primary group');
 		$cals['A'] = lang('All');
@@ -1673,8 +1672,8 @@ 
 		)
 	);
 	require_once('../../header.inc.php');
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	ini_set('display_errors', 1);
+	error_reporting(E_ALL&~E_NOTICE);
 
 	echo "<html><head><title>Conversation of ActiveSync Timezone Blobs to TZID's</title></head>\n<body>\n";
 	echo "<h3>Conversation of ActiveSync Timezone Blobs to TZID's</h3>\n";
@@ -1688,7 +1687,7 @@ 
 	</script>\n";
 
 	// TZID => AS timezone blobs reported by various devices
-	foreach(array(
+	foreach (array(
 		'Europe/Berlin'    => 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAMAAAAAAAAAxP///w==',
 		'Europe/Helsinki'  => 'iP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAQAAAAAAAAAxP///w==',
 		'Asia/Tokyo'       => '5P3//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///w==',
@@ -1702,7 +1701,7 @@ 
 	) as $tz => $sync_blob)
 	{
 		// get as timezone data for a given timezone
-		$ical = calendar_timezones::tz2id($tz,'component');
+		$ical = calendar_timezones::tz2id($tz, 'component');
 		//echo "<pre>".print_r($ical,true)."</pre>\n";
 		$ical_tz = $ical;
 		$ical_arr = calendar_zpush::ical2array($ical_tz);
@@ -1719,22 +1718,22 @@ 
 		//echo array2string($matched);
 
 		echo "<tr><td><b onclick='toggle_display(this.nextSibling);' style='cursor:pointer;'>$tz</b><pre style='margin:0; font-size: 90%; display:none;'>$ical</pre></td><td>$as_tz_org[bias]<br/>$as_tz[bias]</td><td>$as_tz_org[dstbias]<br/>$as_tz[dstbias]</td>\n";
-		foreach(array('dststart','dstend') as $prefix)
+		foreach (array('dststart', 'dstend') as $prefix)
 		{
 			echo "<td>\n";
-			foreach(array($as_tz_org,$as_tz) as $n => $arr)
+			foreach (array($as_tz_org, $as_tz) as $n => $arr)
 			{
 				$parts = array();
-				foreach(array('year','month','day','week','hour','minute','second') as $postfix)
+				foreach (array('year', 'month', 'day', 'week', 'hour', 'minute', 'second') as $postfix)
 				{
 					$failed = $n && $as_tz_org[$prefix.$postfix] !== $as_tz[$prefix.$postfix];
-					$parts[] = ($failed?'<font color="red">':'').$arr[$prefix.$postfix].($failed?'</font>':'');
+					$parts[] = ($failed ? '<font color="red">' : '').$arr[$prefix.$postfix].($failed ? '</font>' : '');
 				}
-				echo implode(' ', $parts).(!$n?'<br/>':'');
+				echo implode(' ', $parts).(!$n ? '<br/>' : '');
 			}
 			echo "</td>\n";
 		}
-		echo "<td>&nbsp;<br/>".($matched=='UTC'?'<font color="red">':'').$matched.($matched=='UTC'?'</font>':'')."</td></tr>\n";
+		echo "<td>&nbsp;<br/>".($matched == 'UTC' ? '<font color="red">' : '').$matched.($matched == 'UTC' ? '</font>' : '')."</td></tr>\n";
 	}
 	echo "</tbody></table>\n";
 	echo "</body></html>\n";

Braces +235 added lines, -57 removed lines

@@ -20,8 +20,12 @@ 
  */
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
 {
-	interface activesync_plugin_write {}
-	interface activesync_plugin_meeting_requests {}
+	interface activesync_plugin_write
+	{
+}
+	interface activesync_plugin_meeting_requests
+	{
+}
 }
 
 /**
@@ -81,7 +85,10 @@ 
 	 */
 	public function GetFolderList()
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$cals_pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
 		$cals = $cals_pref ? explode(',',$cals_pref) : array('P');	// implicit default of 'P'
@@ -180,13 +187,20 @@ 
   	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id',$cutoffdate)");
 		$type = $user = null;
 		$this->backend->splitID($id,$type,$user);
 
-		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100*24*3600;	// default three month back -30 breaks all sync recurrences
+		if (!$cutoffdate)
+		{
+			$cutoffdate = $this->bo->now - 100*24*3600;
+		}
+		// default three month back -30 breaks all sync recurrences
 
 		$filter = array(
 			'users' => $user,
@@ -212,7 +226,10 @@ 
 		{
 			foreach ($events as $event)
 			{
-				if ($not_uids && in_array($event['uid'], $not_uids)) continue;
+				if ($not_uids && in_array($event['uid'], $not_uids))
+				{
+					continue;
+				}
 				$messagelist[] = $this->StatMessage($id, $event);
 
 				// add virtual exceptions for recuring events too
@@ -227,7 +244,10 @@ 
 					}
 				}*/
 			}
-			if (count($events) < $num_rows) break;
+			if (count($events) < $num_rows)
+			{
+				break;
+			}
 		}
 		//error_log(__METHOD__."($id, $cutoffdate, ".array2string($not_uids).") type=$type, user=$user returning ".count($messagelist)." messages ".function_backtrace());
 		return $messagelist;
@@ -289,7 +309,10 @@ 
 	{
 		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		if (!($event = $this->calendar->read(abs($id), 0, false, 'server')))
 		{
@@ -367,7 +390,10 @@ 
 			'created' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -379,7 +405,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		$message->organizer = $event['organizer'];
 
@@ -414,7 +443,10 @@ 
 	 */
 	function MeetingResponse($folderid, $requestid, $response)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		static $as2status = array(	// different from self::$status2as!
 			1 => 'A',
@@ -424,9 +456,12 @@ 
 		$status_in = isset($as2status[$response]) ? $as2status[$response] : 'U';
 		$uid = $GLOBALS['egw_info']['user']['account_id'];
 
-		if (!is_numeric($requestid))	// iCal from fmail
+		if (!is_numeric($requestid))
+		{
+			// iCal from fmail
 		{
 			$ical = new calendar_ical();
+		}
 			if (!($events = $ical->icaltoegw($requestid, '', 'utf-8')) || count($events) != 1)
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, '$requestid') error parsing iCal!");
@@ -536,7 +571,10 @@ 
 	{
 		unset($contentParameters);	// unused, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$old_event = array();
 		$type = $account = null;
@@ -551,10 +589,13 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) Folder wrong or event does not existing");
 			return false;
 		}
-		if ($recur_date)	// virtual exception
+		if ($recur_date)
+		{
+			// virtual exception
 		{
 			// @todo check if virtual exception needs to be saved as real exception, or only stati need to be changed
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
+		}
 			//error_log(__METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 		}
 		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0,$account))
@@ -564,7 +605,11 @@ 
 			//error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $old_event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id)
+		{
+			$old_event['owner'] = $account;
+		}
+		// we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $old_event);
 
@@ -593,7 +638,10 @@ 
 					unset($ex_event['etag']);
 					foreach(array_keys($ex_event) as $name)
 					{
-						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+						if (substr($name,0,6) == 'recur_')
+						{
+							unset($ex_event[$name]);
+						}
 					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
@@ -646,7 +694,10 @@ 
 			'end' => 'endtime',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
+			if (isset($message->$attr))
+			{
+				$event[$key] = Api\DateTime::server2user($message->$attr);
+			}
 		}
 		// copying strings
 		foreach(array(
@@ -655,7 +706,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = $message->$attr;
+			if (isset($message->$attr))
+			{
+				$event[$key] = $message->$attr;
+			}
 		}
 
 		// only change description, if one given, as iOS5 skips description in ChangeMessage after MeetingResponse
@@ -674,14 +728,22 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
+			if ($event['end'] == $event['start'])
+			{
+				$event['end'] += 24*3600;
+			}
+			// some clients send equal start&end for 1day
 			$event['end']--;	// otherwise our whole-day event code in save makes it one more day!
 		}
 
 		$participants = array();
 		foreach((array)$message->attendees as $attendee)
 		{
-			if ($attendee->type == 3) continue;	// we can not identify resources and re-add them anyway later
+			if ($attendee->type == 3)
+			{
+				continue;
+			}
+			// we can not identify resources and re-add them anyway later
 
 			$matches = null;
 			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
@@ -696,7 +758,10 @@ 
 					//'n_fn' => $attendee->name,	// not sure if we want matches without email
 				);
 				// search addressbook for participant
-				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new Api\Contacts();
+				}
 				if ((list($data) = $this->addressbook->search($search,
 					array('id','egw_addressbook.account_id as account_id','n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
@@ -704,10 +769,13 @@ 
 				{
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 				}
-				elseif($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
+				elseif($attendee->name === $attendee->email || empty($attendee->name))
+				{
+					// dont store empty or email as name
 				{
 					$uid = 'e'.$attendee->email;
 				}
+				}
 				else	// store just the email
 				{
 					$uid = 'e'.$attendee->name.' <'.$attendee->email.'>';
@@ -736,7 +804,11 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//ZLog::Write(LOGLEVEL_DEBUG, "default status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
-			if ($role == 'CHAIR') $chair_set = true;	// by role from existing participant
+			if ($role == 'CHAIR')
+			{
+				$chair_set = true;
+			}
+			// by role from existing participant
 
 			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
 			{
@@ -750,10 +822,13 @@ 
 			elseif (isset($attendee->attendeetype) &&
 				!($role == 'CHAIR' && !is_numeric($uid)) &&	// do not override our external ORGANIZER
 				($r = array_search($attendee->attendeetype,self::$role2as)) &&
-				(int)self::$role2as[$role] != $attendee->attendeetype)	// if old role gives same type, use old role, as we have a lot more roles then AS
+				(int)self::$role2as[$role] != $attendee->attendeetype)
+			{
+				// if old role gives same type, use old role, as we have a lot more roles then AS
 			{
 				$role = $r;
 			}
+			}
 			//ZLog::Write(LOGLEVEL_DEBUG, "-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
 			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
 		}
@@ -768,12 +843,19 @@ 
 		// $account is also preserved, as AS does not add him as participant!
 		foreach((array)$event['participant_types'] as $type => $parts)
 		{
-			if (in_array($type,array('c','e'))) continue;	// they are correctly representable in AS
+			if (in_array($type,array('c','e')))
+			{
+				continue;
+			}
+			// they are correctly representable in AS
 
 			foreach($parts as $id => $status)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
-				if ($type == 'u' && $id != $account) continue;
+				if ($type == 'u' && $id != $account)
+				{
+					continue;
+				}
 
 				$uid = calendar_so::combine_user($type, $id);
 				if (!isset($participants[$uid]))
@@ -798,10 +880,13 @@ 
 		// check if event is recurring and import recur information (incl. timezone)
 		if ($message->recurrence)
 		{
-			if ($message->timezone && !$event['id'])	// dont care for timezone, if no new and recurring event
+			if ($message->timezone && !$event['id'])
+			{
+				// dont care for timezone, if no new and recurring event
 			{
 				$event['tzid'] = self::as2tz(self::_getTZFromSyncBlob(base64_decode($message->timezone)));
 			}
+			}
 			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY :
 				array_search($message->recurrence->type, self::$recur_type2as);
 			$event['recur_interval'] = $message->recurrence->interval;
@@ -838,10 +923,13 @@ 
 			{
 				// calculate enddate from occurences count, as we only support enddate
 				$count = $message->recurrence->occurrences;
-				foreach(calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
+				foreach(calendar_rrule::event2rrule($event, true) as $rtime)
+				{
+					// true = timestamps are user time here, because of save!
 				{
 					if (--$count <= 0) break;
 				}
+				}
 				$event['recur_enddate'] = $rtime->format('ts');
 			}
 		}
@@ -856,7 +944,9 @@ 
 					break;
 				}
 			}
-			if ($alarm !== true)	// new alarm
+			if ($alarm !== true)
+			{
+				// new alarm
 			{
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
@@ -866,6 +956,7 @@ 
 					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
 					{
 						unset($event['alarm'][$key]);
+			}
 					}
 				}
 				$event['alarm'][] = $alarm = array(
@@ -946,7 +1037,10 @@ 
 	{
 		unset($contentParameters);	// not used, but required by function signature
 
-		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->caledar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$ret = $this->calendar->delete($id);
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -1008,7 +1102,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 		//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
 		$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		$mimesupport = $contentparameters->GetMimeSupport();
@@ -1046,7 +1143,10 @@ 
 		catch(Exception $e) {
 			unset($e);
 			// z-push (2.3 at least) requires a timezone for recurring events
-			if ($event['recur_type']) $message->timezone = self::UTC_BLOB;
+			if ($event['recur_type'])
+			{
+				$message->timezone = self::UTC_BLOB;
+			}
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
@@ -1057,7 +1157,10 @@ 
 			'modified' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -1070,7 +1173,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 
 		// appoint description
@@ -1103,7 +1209,10 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			// AS does NOT want calendar owner as participant
-			if ($uid == $account) continue;
+			if ($uid == $account)
+			{
+				continue;
+			}
 			$quantity = $role = null;
 			calendar_so::split_status($status, $quantity, $role);
 
@@ -1120,7 +1229,10 @@ 
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
 					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
 
-				if (!$info) continue;
+				if (!$info)
+				{
+					continue;
+				}
 
 				if (!$info['email'] && $info['responsible'])
 				{
@@ -1136,10 +1248,17 @@ 
 					$message->organizeremail = $attendee->email;
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, $id, ...) external organizer detected (role=$role, uid=$uid), set as AS organizer: $message->organizername <$message->organizeremail>");
 				}
-				if ($uid[0] == 'r') $attendee->type = 3;	// 3 = resource
+				if ($uid[0] == 'r')
+				{
+					$attendee->type = 3;
+				}
+				// 3 = resource
 			}
 			// email must NOT be empty, but MAY be an arbitrary text
-			if (empty($attendee->email)) $attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
+			if (empty($attendee->email))
+			{
+				$attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
+			}
 
 			$message->attendees[] = $attendee;
 		}
@@ -1174,9 +1293,12 @@ 
 					$recurrence->monthofyear = (int)$rrule->time->format('m');	// 1..12
 					break;
 			}
-			if ($rrule->enddate)	// enddate is only a date, but AS needs a time incl. correct starttime!
+			if ($rrule->enddate)
+			{
+				// enddate is only a date, but AS needs a time incl. correct starttime!
 			{
 				$enddate = clone $rrule->time;
+			}
 				$enddate->setDate($rrule->enddate->format('Y'), $rrule->enddate->format('m'),
 					$rrule->enddate->format('d'));
 				$recurrence->until = $enddate->format('server');
@@ -1198,12 +1320,19 @@ 
 				{
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events)>=1)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				}
 
 				$message->exceptions = array();
 				foreach($ex_events as $ex_event)
 				{
-					if ($ex_event['id'] == $event['id']) continue;	// ignore series master
+					if ($ex_event['id'] == $event['id'])
+					{
+						continue;
+					}
+					// ignore series master
 					$exception = $this->GetMessage($folderid, $ex_event, $contentparameters, 'SyncAppointmentException');
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
 					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
@@ -1223,7 +1352,10 @@ 
 				{
 					if (!empty($exception_time))
 					{
-						if (empty($event['uid'])) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						if (empty($event['uid']))
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						}
 						$exception = new SyncAppointmentException();	// exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
@@ -1279,12 +1411,18 @@ 
 	{
 		unset($folderid);	// not used ($id is unique), but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$nul = null;
-		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))	// last true: $only_master=true
+		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))
+		{
+			// last true: $only_master=true
 		{
 			$stat = false;
+		}
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
@@ -1318,13 +1456,22 @@ 
 		$type = $owner = null;
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'calendar') return false;
+		if ($type != 'calendar')
+		{
+			return false;
+		}
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
 		$syncstate = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
 		// workaround for syncstate = 0 when calendar is empty causes synctate to not return 0 but array resulting in foldersync loop
-		if ($syncstate == 0) $syncstate = 1;
+		if ($syncstate == 0)
+		{
+			$syncstate = 1;
+		}
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', ...) type='$type', owner=$owner --> syncstate='$syncstate'");
 	}
@@ -1400,10 +1547,16 @@ 
 			'dstendhour' => 0, 'dstendminute' => 0, 'dstendsecond' => 0, 'dstendmillis' => 0,
 		);
 
-		if ($tz === 'UTC') return $data;
+		if ($tz === 'UTC')
+		{
+			return $data;
+		}
 
 		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		if (strpos($component, 'VTIMEZONE') === false)
+		{
+			$component = calendar_timezones::tz2id($name,'component');
+		}
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1446,11 +1599,17 @@ 
 						$data[$prefix.'week'] = 5;
 					}
 					// if both start and end use 1SU use week=5 and decrement month
-					if ($prefix == 'dststart') $start_byday = $matches[1];
+					if ($prefix == 'dststart')
+					{
+						$start_byday = $matches[1];
+					}
 					if ($prefix == 'dstend' && $matches[1] == '1SU' && $start_byday == '1SU')
 					{
 						$data[$prefix.'week'] = 5;
-						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
+						if ($prefix == 'dstend')
+						{
+							$data[$prefix.'month'] -= 1;
+						}
 					}
 					static $day2int = array('SU'=>0,'MO'=>1,'TU'=>2,'WE'=>3,'TH'=>4,'FR'=>5,'SA'=>6);
 					$data[$prefix.'day'] = (int)$day2int[substr($matches[1],-2)];
@@ -1526,7 +1685,10 @@ 
 	static public function ical2array(&$ical,$section=null)
 	{
 		$arr = array();
-		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
+		if (!is_array($ical))
+		{
+			$ical = preg_split("/[\r\n]+/m", $ical);
+		}
 		while (($line = array_shift($ical)))
 		{
 			list($name,$value) = explode(':',$line,2);
@@ -1536,7 +1698,10 @@ 
 			}
 			elseif($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section==$value)
+				{
+					return $arr;
+				}
 				break;
 			}
 			else
@@ -1567,13 +1732,19 @@ 
 
 		for($n = 0; !isset($cache[$key]); ++$n)
 		{
-			if (!$n)	// check users timezone first
+			if (!$n)
+			{
+				// check users timezone first
 			{
 				$tz = Api\DateTime::$user_timezone->getName();
 			}
-			elseif (!($tz = calendar_timezones::id2tz($n)))	// no further timezones to check
+			}
+			elseif (!($tz = calendar_timezones::id2tz($n)))
+			{
+				// no further timezones to check
 			{
 				$cache[$key] = 'UTC';
+			}
 				error_log(__METHOD__.'('.array2string($data).') NO matching timezone found --> using UTC now!');
 				break;
 			}
@@ -1637,7 +1808,11 @@ 
 				$account_id = $entry['grantor'];
 				$cals[$account_id] = $entry['name'];
 			}
-			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]);	// skip current user
+			if ($hook_data['account_id'] > 0)
+			{
+				unset($cals[$hook_data['account_id']]);
+			}
+			// skip current user
 		}
 		$cals['G'] = lang('Primary group');
 		$cals['A'] = lang('All');
@@ -1665,13 +1840,16 @@ 
  *
  * You need to comment implements activesync_plugin_write
  */
-if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
+{
+	// some tests
 {
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
 			'currentapp' => 'login'
 		)
 	);
+}
 	require_once('../../header.inc.php');
 	ini_set('display_errors',1);
 	error_reporting(E_ALL & ~E_NOTICE);

Doc Comments +3 added lines, -2 removed lines

@@ -282,7 +282,7 @@ 
 	 * @param int $truncsize
 	 * @param int $bodypreference
 	 * @param $optionbodypreference
-	 * @param bool $mimesupport
+	 * @param integer $mimesupport
 	 * @return SyncMail
 	 */
 	function GetMeetingRequest($id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
@@ -900,7 +900,7 @@ 
 	 * @param string $id of the folder to delete
 	 *
 	 * @return
-	 * @TODO check what is to be returned
+	 boolean @TODO check what is to be returned
 	 */
 	public function DeleteFolder($parentid, $id)
 	{
@@ -1596,6 +1596,7 @@ 
 	 * Unpack timezone info from Sync
 	 *
 	 * copied from backend/ics.php
+	 * @param string $data
 	 */
 	static public function _getTZFromSyncBlob($data)
 	{

calendar/inc/class.calendar_egw_record.inc.php

Spacing +12 added lines, -12 removed lines

@@ -24,8 +24,8 @@ 
 
 	public static $types = array(
 		'select-cat'    => array('category'),
-		'select-account'=> array('owner','creator', 'modifier'),
-		'date-time'     => array('modified', 'created','start','end','recur_date'),
+		'select-account'=> array('owner', 'creator', 'modifier'),
+		'date-time'     => array('modified', 'created', 'start', 'end', 'recur_date'),
 		'date'			=> array('recur_enddate'),
 		'select-bool'	=> array('public', 'non_blocking'),
 		'select'	=> array('priority'),
@@ -37,12 +37,12 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
-		if(!is_object($this->bo)) {
+		if (!is_object($this->bo)) {
 			$this->bo = new calendar_bo();
 		}
-		if($this->identifier) {
+		if ($this->identifier) {
 			$this->record = $this->bo->read($this->identifier);
 		}
 	}
@@ -96,7 +96,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->record = $_record;
 	}
 
@@ -124,7 +124,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -135,8 +135,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used
 	}
 
 	/**
@@ -146,15 +146,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +34 added lines, -17 removed lines

@@ -37,12 +37,15 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
-		if(!is_object($this->bo)) {
+		if(!is_object($this->bo))
+		{
 			$this->bo = new calendar_bo();
 		}
-		if($this->identifier) {
+		if($this->identifier)
+		{
 			$this->record = $this->bo->read($this->identifier);
 		}
 	}
@@ -52,7 +55,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->record[$_attribute_name];
 	}
 
@@ -62,11 +66,13 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->record[$_attribute_name] = $data;
 	}
 
-	public function __unset($_attribute_name) {
+	public function __unset($_attribute_name)
+	{
 		unset($this->record[$_attribute_name]);
 	}
 
@@ -78,7 +84,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->record;
 	}
 
@@ -87,8 +94,10 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
-		if (empty($this->record)) {
+	public function get_title()
+	{
+		if (empty($this->record))
+		{
 			$this->get_record();
 		}
 		return $this->record['title'];
@@ -100,7 +109,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->record = $_record;
 	}
 
@@ -109,7 +119,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -119,7 +130,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'calendar/navbar';
 	}
 
@@ -128,7 +140,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -139,7 +152,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used
 	}
 
@@ -150,7 +164,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used
 	}
 
@@ -158,7 +173,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -166,7 +182,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 	}
 
 }
\ No newline at end of file

calendar/inc/class.calendar_ui.inc.php

Indentation +5 added lines, -5 removed lines

@@ -387,11 +387,11 @@
 	}
 
 	/**
-	* gets the icons displayed for a given event
-	*
-	* @param array $event
-	* @return array of 'img' / 'title' pairs
-	*/
+	 * gets the icons displayed for a given event
+	 *
+	 * @param array $event
+	 * @return array of 'img' / 'title' pairs
+	 */
 	function event_icons($event)
 	{
 		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ,$event);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site configuration' => Egw::link('/index.php',array(
 					'menuaction' => 'infolog.infolog_ui.admin' )),
 				'Global Categories'  => Egw::link('/index.php',array(

Braces +49 added lines, -13 removed lines

@@ -166,7 +166,10 @@ 
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','calendar')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit','calendar'))
+		{
+			Api\Hooks::read(true);
+		}
 	}
 
 	/**
@@ -279,11 +282,15 @@ 
 				{
 					// only change the owners of the same resource-type as given in set_state[owner]
 					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',',$set_states['owner']);
-					if ((string)$set_owners[0] === '0')	// set exactly the specified owners (without the 0)
+					if ((string)$set_owners[0] === '0')
+					{
+						// set exactly the specified owners (without the 0)
 					{
 						if ($set_states['owner'] === '0,r0')	// small fix for resources
 						{
-							$set_states['owner'] = $default;	// --> set default, instead of none
+							$set_states['owner'] = $default;
+					}
+					// --> set default, instead of none
 						}
 						else
 						{
@@ -369,7 +376,10 @@ 
 		}
 		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.index';
 
-		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
+		if ($this->debug > 0 || $this->debug == 'manage_states')
+		{
+			$this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
+		}
 		// save the states in the session only when we are in calendar
 		if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
 		{
@@ -505,8 +515,11 @@ 
 
 		// resources menu hooks
  		foreach ($this->bo->resources as $resource)
-		{
-			if(!is_array($resource['cal_sidebox'])) continue;
+ 		{
+			if(!is_array($resource['cal_sidebox']))
+			{
+				continue;
+			}
 			$menu_title = $resource['cal_sidebox']['menu_title'] ? $resource['cal_sidebox']['menu_title'] : lang($resource['app']);
 			$file = ExecMethod($resource['cal_sidebox']['file'],array(
 				'menuaction' => $this->view_menuaction,
@@ -553,7 +566,10 @@ 
 		$sidebox = new Etemplate('calendar.sidebox');
 
 		$cont = $this->cal_prefs['saved_states'];
-		if (!is_array($cont)) $cont = array();
+		if (!is_array($cont))
+		{
+			$cont = array();
+		}
 		$cont['view'] = $this->view ? $this->view : 'week';
 		$cont['date'] = $this->date ? $this->date : Api\DateTime();
 
@@ -612,7 +628,10 @@ 
 	 */
 	public function update_client($event_id, Api\DateTime $recurrence_date = null)
 	{
-		if(!$event_id) return false;
+		if(!$event_id)
+		{
+			return false;
+		}
 
 		// Directly update stored data.
 		// Make sure we have the whole event
@@ -678,7 +697,10 @@ 
 	 */
 	public function to_client(&$event)
 	{
-		if(!$event || !is_array($event)) return false;
+		if(!$event || !is_array($event))
+		{
+			return false;
+		}
 
 		if (!$this->bo->check_perms(Acl::EDIT,$event))
 		{
@@ -699,8 +721,16 @@ 
 
 		$event['recure'] = $this->bo->recure2string($event);
 
-		if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-		if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+		if (empty($event['description']))
+		{
+			$event['description'] = ' ';
+		}
+		// no description screws the titles horz. alignment
+		if (empty($event['location']))
+		{
+			$event['location'] = ' ';
+		}
+		// no location screws the owner horz. alignment
 
 		// respect category permissions
 		if(!empty($event['category']))
@@ -777,8 +807,14 @@ 
 			if(!$timespan)
 			{
 				// Try to make time span into appropriate ranges to match
-				if(stripos($_GET['merge'],'month') !== false || stripos($_GET['merge'],lang('month')) !== false) $template = 'month';
-				if(stripos($_GET['merge'],'week') !== false || stripos($_GET['merge'],lang('week')) !== false) $template = 'week';
+				if(stripos($_GET['merge'],'month') !== false || stripos($_GET['merge'],lang('month')) !== false)
+				{
+					$template = 'month';
+				}
+				if(stripos($_GET['merge'],'week') !== false || stripos($_GET['merge'],lang('week')) !== false)
+				{
+					$template = 'week';
+				}
 				//error_log("Detected template $template");
 				switch ($template)
 				{

Spacing +139 added lines, -139 removed lines

@@ -33,7 +33,7 @@ 
 	/**
 	 * @var $debug mixed integer level or string function-name
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * instance of the bocal or bocalupdate class
 	 *
@@ -127,7 +127,7 @@ 
 	/**
 	 * @var array $states_to_save all states that will be saved to the user prefs
 	 */
-	var $states_to_save = array('owner','status_filter','filter','cat_id','view','sortby','planner_view','weekend');
+	var $states_to_save = array('owner', 'status_filter', 'filter', 'cat_id', 'view', 'sortby', 'planner_view', 'weekend');
 
 	/**
 	 * Constructor
@@ -135,7 +135,7 @@ 
 	 * @param boolean $use_boupdate use bocalupdate as parenent instead of bocal
 	 * @param array $set_states to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($use_boupdate=false,$set_states=NULL)
+	function __construct($use_boupdate = false, $set_states = NULL)
 	{
 		if ($use_boupdate)
 		{
@@ -146,27 +146,27 @@ 
 			$this->bo = new calendar_bo();
 		}
 
-		$this->categories = new Api\Categories($this->user,'calendar');
+		$this->categories = new Api\Categories($this->user, 'calendar');
 
-		$this->common_prefs	= &$GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->common_prefs = &$GLOBALS['egw_info']['user']['preferences']['common'];
 		$this->cal_prefs	= &$GLOBALS['egw_info']['user']['preferences']['calendar'];
 		$this->bo->check_set_default_prefs();
 
-		$this->wd_start		= 60*$this->cal_prefs['workdaystarts'];
-		$this->wd_end		= 60*$this->cal_prefs['workdayends'];
-		$this->interval_m	= $this->cal_prefs['interval'];
+		$this->wd_start		= 60 * $this->cal_prefs['workdaystarts'];
+		$this->wd_end = 60 * $this->cal_prefs['workdayends'];
+		$this->interval_m = $this->cal_prefs['interval'];
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->manage_states($set_states);
 
-		$GLOBALS['uical'] = &$this;	// make us available for ExecMethod, else it creates a new instance
+		$GLOBALS['uical'] = &$this; // make us available for ExecMethod, else it creates a new instance
 
 		// calendar does not work with hidden sidebox atm.
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','calendar')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit', 'calendar')) Api\Hooks::read(true);
 	}
 
 	/**
@@ -179,21 +179,21 @@ 
 	function check_owners_access($users = null, &$no_access = array())
 	{
 		$no_access = $no_access_group = array();
-		$owner_array = $users ? $users : explode(',',$this->owner);
-		foreach($owner_array as $idx => $owner)
+		$owner_array = $users ? $users : explode(',', $this->owner);
+		foreach ($owner_array as $idx => $owner)
 		{
 			$owner = trim($owner);
 			if (is_numeric($owner) && $GLOBALS['egw']->accounts->get_type($owner) == 'g')
 			{
-				foreach($GLOBALS['egw']->accounts->members($owner, true) as $member)
+				foreach ($GLOBALS['egw']->accounts->members($owner, true) as $member)
 				{
-					if (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY,0,$member))
+					if (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY, 0, $member))
 					{
 						$no_access_group[$member] = $this->bo->participant_name($member);
 					}
 				}
 			}
-			elseif (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY,0,$owner))
+			elseif (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY, 0, $owner))
 			{
 				$no_access[$owner] = $this->bo->participant_name($owner);
 				unset($owner_array[$idx]);
@@ -201,14 +201,14 @@ 
 		}
 		if (count($no_access))
 		{
-			$message = lang('Access denied to the calendar of %1 !!!',implode(', ',$no_access));
-			Framework::message($message,'error');
-			$this->owner = implode(',',$owner_array);
+			$message = lang('Access denied to the calendar of %1 !!!', implode(', ', $no_access));
+			Framework::message($message, 'error');
+			$this->owner = implode(',', $owner_array);
 			return $message;
 		}
 		if (count($no_access_group))
 		{
-			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.',implode(', ',$no_access_group));
+			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.', implode(', ', $no_access_group));
 		}
 		return false;
 	}
@@ -227,7 +227,7 @@ 
 	 *	- view: the actual view, where dialogs should return to or which they refresh
 	 * @param array $set_states array to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function manage_states($set_states=NULL)
+	function manage_states($set_states = NULL)
 	{
 		// retrieve saved states from prefs
 		$states = is_array($this->bo->cal_prefs['saved_states']) ?
@@ -247,12 +247,12 @@ 
 				}
 				else
 				{
-					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states);	// cut off "/index.php?"
+					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states); // cut off "/index.php?"
 				}
 			}
 			else
 			{
-				$set_states = substr($_GET['menuaction'],0,9) == 'calendar.' ? $_REQUEST : array();
+				$set_states = substr($_GET['menuaction'], 0, 9) == 'calendar.' ? $_REQUEST : array();
 			}
 		}
 		if (!$states['date'] && $states['year'] && $states['month'] && $states['day'])
@@ -260,16 +260,16 @@ 
 			$states['date'] = $this->bo->date2string($states);
 		}
 
-		foreach(array(
+		foreach (array(
 			'date'       => $this->bo->date2string($this->bo->now_su),
 			'cat_id'     => 0,
 			'status_filter'     => 'default',
 			'owner'      => $this->user,
 			'save_owner' => 0,
 			'sortby'     => 'category',
-			'planner_view'=> 'month',	// full month
-			'view'       => ($this->bo->cal_prefs['defaultcalendar']?$this->bo->cal_prefs['defaultcalendar']:'day'), // use pref, if exists else use the dayview
-			'listview_days'=> '',	// no range
+			'planner_view'=> 'month', // full month
+			'view'       => ($this->bo->cal_prefs['defaultcalendar'] ? $this->bo->cal_prefs['defaultcalendar'] : 'day'), // use pref, if exists else use the dayview
+			'listview_days'=> '', // no range
 			'test'       => 'false',
 		) as $state => $default)
 		{
@@ -278,42 +278,42 @@ 
 				if ($state == 'owner')
 				{
 					// only change the owners of the same resource-type as given in set_state[owner]
-					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',',$set_states['owner']);
+					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',', $set_states['owner']);
 					if ((string)$set_owners[0] === '0')	// set exactly the specified owners (without the 0)
 					{
 						if ($set_states['owner'] === '0,r0')	// small fix for resources
 						{
-							$set_states['owner'] = $default;	// --> set default, instead of none
+							$set_states['owner'] = $default; // --> set default, instead of none
 						}
 						else
 						{
-							$set_states['owner'] = substr($set_states['owner'],2);
+							$set_states['owner'] = substr($set_states['owner'], 2);
 						}
 					}
 					else	// change only the owners of the given type
 					{
 						$res_type = is_numeric($set_owners[0]) ? false : $set_owners[0][0];
 						$owners = $states['owner'] ? $states['owner'] : $default;
-						if(!is_array($owners))
+						if (!is_array($owners))
 						{
-							$owners = explode(',',$owners);
+							$owners = explode(',', $owners);
 						}
-						foreach($owners as $key => $owner)
+						foreach ($owners as $key => $owner)
 						{
 							if (!$res_type && is_numeric($owner) || $res_type && $owner[0] == $res_type)
 							{
 								unset($owners[$key]);
 							}
 						}
-						if (!$res_type || !in_array($res_type.'0',$set_owners))
+						if (!$res_type || !in_array($res_type.'0', $set_owners))
 						{
-							$owners = array_merge($owners,$set_owners);
+							$owners = array_merge($owners, $set_owners);
 						}
-						$set_states['owner'] = implode(',',$owners);
+						$set_states['owner'] = implode(',', $owners);
 					}
 				}
 				// for the uiforms class (eg. edit), dont store the (new) owner, as it might change the view
-				if (substr($_GET['menuaction'],0,25) == 'calendar.calendar_uiforms')
+				if (substr($_GET['menuaction'], 0, 25) == 'calendar.calendar_uiforms')
 				{
 					$this->owner = $set_states[$state];
 					continue;
@@ -327,7 +327,7 @@ 
 			if ($state == 'date')
 			{
 				$date_arr = $this->bo->date2array($states['date']);
-				foreach(array('year','month','day') as $name)
+				foreach (array('year', 'month', 'day') as $name)
 				{
 					$this->$name = $states[$name] = $date_arr[$name];
 				}
@@ -335,16 +335,16 @@ 
 			$this->$state = $states[$state];
 		}
 		// remove a given calendar from the view
-		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners=explode(',',$this->owner))) !== false)
+		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners = explode(',', $this->owner))) !== false)
 		{
 			unset($owners[$k]);
-			$this->owner = $states['owner'] = implode(',',$owners);
+			$this->owner = $states['owner'] = implode(',', $owners);
 		}
-		if(is_array($this->owner))
+		if (is_array($this->owner))
 		{
-			$this->owner = implode(',',$this->owner);
+			$this->owner = implode(',', $this->owner);
 		}
-		if (substr($this->view,0,8) == 'planner_')
+		if (substr($this->view, 0, 8) == 'planner_')
 		{
 			$states['sortby'] = $this->sortby = $this->view == 'planner_cat' ? 'category' : 'user';
 			$states['view'] = $this->view = 'planner';
@@ -352,10 +352,10 @@ 
 		// set the actual view as return_to
 		if (isset($_GET['menuaction']))
 		{
-			list(,$class,$func) = explode('.',$_GET['menuaction']);
+			list(,$class, $func) = explode('.', $_GET['menuaction']);
 			if ($func == 'index')
 			{
-				$func = $this->view; $this->view = 'index';	// switch to the default view
+				$func = $this->view; $this->view = 'index'; // switch to the default view
 			}
 		}
 		else	// eg. calendar/index.php
@@ -369,18 +369,18 @@ 
 		}
 		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.index';
 
-		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
+		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3', True, $set_states, $states);
 		// save the states in the session only when we are in calendar
-		if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'calendar')
 		{
 			// save defined states into the user-prefs
-			if(!empty($states) && is_array($states))
+			if (!empty($states) && is_array($states))
 			{
-				$saved_states = array_intersect_key($states,array_flip($this->states_to_save));
+				$saved_states = array_intersect_key($states, array_flip($this->states_to_save));
 				if ($saved_states != $this->cal_prefs['saved_states'])
 				{
-					$GLOBALS['egw']->preferences->add('calendar','saved_states',$saved_states);
-					$GLOBALS['egw']->preferences->save_repository(false,'user',true);
+					$GLOBALS['egw']->preferences->add('calendar', 'saved_states', $saved_states);
+					$GLOBALS['egw']->preferences->save_repository(false, 'user', true);
 				}
 			}
 		}
@@ -394,35 +394,35 @@ 
 	*/
 	function event_icons($event)
 	{
-		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ,$event);
+		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ, $event);
 
 		$icons = array();
 		if (!$is_private)
 		{
-			if($event['priority'] == 3)
+			if ($event['priority'] == 3)
 			{
-				$icons[] = Api\Html::image('calendar','high',lang('high priority'));
+				$icons[] = Api\Html::image('calendar', 'high', lang('high priority'));
 			}
-			if($event['recur_type'] != MCAL_RECUR_NONE)
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$icons[] = Api\Html::image('calendar','recur',lang('recurring event'));
+				$icons[] = Api\Html::image('calendar', 'recur', lang('recurring event'));
 			}
 			// icons for single user, multiple users or group(s) and resources
-			foreach(array_keys($event['participants']) as  $uid)
+			foreach (array_keys($event['participants']) as  $uid)
 			{
-				if(is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
+				if (is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
 				{
 					if (isset($icons['single']) || $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 					{
 						unset($icons['single']);
-						$icons['multiple'] = Api\Html::image('calendar','users');
+						$icons['multiple'] = Api\Html::image('calendar', 'users');
 					}
 					elseif (!isset($icons['multiple']))
 					{
-						$icons['single'] = Api\Html::image('calendar','single');
+						$icons['single'] = Api\Html::image('calendar', 'single');
 					}
 				}
-				elseif(!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
+				elseif (!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
 				{
 				 	$icons[$uid[0]] = Api\Html::image($this->bo->resources[$uid[0]]['app'],
 				 		($this->bo->resources[$uid[0]]['icon'] ? $this->bo->resources[$uid[0]]['icon'] : 'navbar'),
@@ -431,21 +431,21 @@ 
 				}
 			}
 		}
-		if($event['non_blocking'])
+		if ($event['non_blocking'])
 		{
-			$icons[] = Api\Html::image('calendar','nonblocking',lang('non blocking'));
+			$icons[] = Api\Html::image('calendar', 'nonblocking', lang('non blocking'));
 		}
-		if($event['public'] == 0)
+		if ($event['public'] == 0)
 		{
-			$icons[] = Api\Html::image('calendar','private',lang('private'));
+			$icons[] = Api\Html::image('calendar', 'private', lang('private'));
 		}
-		if(isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
+		if (isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
 		{
-			$icons[] = Api\Html::image('calendar','alarm',lang('alarm'));
+			$icons[] = Api\Html::image('calendar', 'alarm', lang('alarm'));
 		}
-		if($event['participants'][$this->user][0] == 'U')
+		if ($event['participants'][$this->user][0] == 'U')
 		{
-			$icons[] = Api\Html::image('calendar','needs-action',lang('Needs action'));
+			$icons[] = Api\Html::image('calendar', 'needs-action', lang('Needs action'));
 		}
 		return $icons;
 	}
@@ -460,17 +460,17 @@ 
 	 * @param array $vars
 	 * @return string the link incl. content
 	 */
-	function add_link($content,$date=null,$hour=null,$minute=0,array $vars=null)
+	function add_link($content, $date = null, $hour = null, $minute = 0, array $vars = null)
 	{
 		$vars['menuaction'] = 'calendar.calendar_uiforms.edit';
-		$vars['date'] =  $date ? $date : $this->date;
+		$vars['date'] = $date ? $date : $this->date;
 
 		if (!is_null($hour))
 		{
 			$vars['hour'] = $hour;
 			$vars['minute'] = $minute;
 		}
-		return Api\Html::a_href($content,'',$vars,' data-date="' .$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
+		return Api\Html::a_href($content, '', $vars, ' data-date="'.$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
 				. '" title="'.Api\Html::htmlspecialchars(lang('Add')).'"');
 	}
 
@@ -482,7 +482,7 @@ 
 		// Magic etemplate2 favorites menu (from framework)
 		display_sidebox('calendar', lang('Favorites'), Framework\Favorites::list_favorites('calendar'));
 
-		$file = array('menuOpened' => true);	// menu open by default
+		$file = array('menuOpened' => true); // menu open by default
 
 		// Target for etemplate
 		$file[] = array(
@@ -495,38 +495,38 @@ 
 		// Merge print placeholders (selectbox in etemplate)
 		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
 		{
-			$file['Placeholders'] = Egw::link('/index.php','menuaction=calendar.calendar_merge.show_replacements');
+			$file['Placeholders'] = Egw::link('/index.php', 'menuaction=calendar.calendar_merge.show_replacements');
 		}
 		$appname = 'calendar';
 		$menu_title = lang('Calendar Menu');
-		display_sidebox($appname,$menu_title,$file);
+		display_sidebox($appname, $menu_title, $file);
 
 		$this->sidebox_etemplate();
 
 		// resources menu hooks
  		foreach ($this->bo->resources as $resource)
 		{
-			if(!is_array($resource['cal_sidebox'])) continue;
+			if (!is_array($resource['cal_sidebox'])) continue;
 			$menu_title = $resource['cal_sidebox']['menu_title'] ? $resource['cal_sidebox']['menu_title'] : lang($resource['app']);
-			$file = ExecMethod($resource['cal_sidebox']['file'],array(
+			$file = ExecMethod($resource['cal_sidebox']['file'], array(
 				'menuaction' => $this->view_menuaction,
 				'owner' => $this->owner,
 			));
-			display_sidebox($appname,$menu_title,$file);
+			display_sidebox($appname, $menu_title, $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site configuration'=>Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
-				'Custom Fields'=>Egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar&ajax=true'),
-				'Global Categories' =>Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
+				'Site configuration'=>Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
+				'Custom Fields'=>Egw::link('/index.php', 'menuaction=admin.customfields.index&appname=calendar&ajax=true'),
+				'Global Categories' =>Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
 			);
-			$GLOBALS['egw']->framework->sidebox($appname,lang('Admin'),$file,'admin');
+			$GLOBALS['egw']->framework->sidebox($appname, lang('Admin'), $file, 'admin');
 		}
 		display_sidebox('calendar', lang('Utilities'), array('Category report' => "javascript:egw_openWindowCentered2('".
-					Egw::link('/index.php',array('menuaction'=>'calendar.calendar_category_report.index','ajax'=>true),false).
-					"','_blank',870,500,'yes')" ));
+					Egw::link('/index.php', array('menuaction'=>'calendar.calendar_category_report.index', 'ajax'=>true), false).
+					"','_blank',870,500,'yes')"));
 	}
 
 	/**
@@ -534,15 +534,15 @@ 
 	 */
 	function sidebox_etemplate($content = array())
 	{
-		if($content['merge'])
+		if ($content['merge'])
 		{
 			// View from sidebox is JSON encoded
-			$this->manage_states(array_merge($content,json_decode($content['view'],true)));
-			if($content['first'])
+			$this->manage_states(array_merge($content, json_decode($content['view'], true)));
+			if ($content['first'])
 			{
-				$this->first = Api\DateTime::to($content['first'],'ts');
+				$this->first = Api\DateTime::to($content['first'], 'ts');
 			}
-			if($content['last'])
+			if ($content['last'])
 			{
 				$this->last = new Api\DateTime($content['last']);
 				$this->last->setTime(23, 59, 59);
@@ -560,25 +560,25 @@ 
 		$cont['view'] = $this->view ? $this->view : 'week';
 		$cont['date'] = $this->date ? $this->date : new Api\DateTime();
 
-		$cont['year'] = (int)Api\DateTime::to($cont['date'],'Y');
+		$cont['year'] = (int)Api\DateTime::to($cont['date'], 'Y');
 		$cont['holidays'] = $this->bo->read_holidays($cont['year']);
 
 		$readonlys = array();
 		$sel_options['status_filter'] = array(
-			array('value' => 'default',     'label' => lang('Not rejected'), 'title' => lang('Show all status, but rejected')),
-			array('value' => 'accepted',    'label' => lang('Accepted'), 'title' => lang('Show only accepted events')),
-			array('value' => 'unknown',     'label' => lang('Invitations'), 'title' => lang('Show only invitations, not yet accepted or rejected')),
-			array('value' => 'tentative',   'label' => lang('Tentative'), 'title' => lang('Show only tentative accepted events')),
-			array('value' => 'delegated',   'label' => lang('Delegated'), 'title' => lang('Show only delegated events')),
-			array('value' => 'rejected',    'label' => lang('Rejected'),'title' => lang('Show only rejected events')),
-			array('value' => 'owner',       'label' => lang('Owner too'),'title' => lang('Show also events just owned by selected user')),
-			array('value' => 'all',         'label' => lang('All incl. rejected'),'title' => lang('Show all status incl. rejected events')),
-			array('value' => 'hideprivate', 'label' => lang('Hide private infos'),'title' => lang('Show all events, as if they were private')),
-			array('value' => 'showonlypublic',  'label' => lang('Hide private events'),'title' => lang('Show only events flagged as public, (not checked as private)')),
-			array('value' => 'no-enum-groups', 'label' => lang('only group-events'),'title' => lang('Do not include events of group members')),
-			array('value' => 'not-unknown', 'label' => lang('No meeting requests'),'title' => lang('Show all status, but unknown')),
+			array('value' => 'default', 'label' => lang('Not rejected'), 'title' => lang('Show all status, but rejected')),
+			array('value' => 'accepted', 'label' => lang('Accepted'), 'title' => lang('Show only accepted events')),
+			array('value' => 'unknown', 'label' => lang('Invitations'), 'title' => lang('Show only invitations, not yet accepted or rejected')),
+			array('value' => 'tentative', 'label' => lang('Tentative'), 'title' => lang('Show only tentative accepted events')),
+			array('value' => 'delegated', 'label' => lang('Delegated'), 'title' => lang('Show only delegated events')),
+			array('value' => 'rejected', 'label' => lang('Rejected'), 'title' => lang('Show only rejected events')),
+			array('value' => 'owner', 'label' => lang('Owner too'), 'title' => lang('Show also events just owned by selected user')),
+			array('value' => 'all', 'label' => lang('All incl. rejected'), 'title' => lang('Show all status incl. rejected events')),
+			array('value' => 'hideprivate', 'label' => lang('Hide private infos'), 'title' => lang('Show all events, as if they were private')),
+			array('value' => 'showonlypublic', 'label' => lang('Hide private events'), 'title' => lang('Show only events flagged as public, (not checked as private)')),
+			array('value' => 'no-enum-groups', 'label' => lang('only group-events'), 'title' => lang('Do not include events of group members')),
+			array('value' => 'not-unknown', 'label' => lang('No meeting requests'), 'title' => lang('Show all status, but unknown')),
 		);
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$sel_options['status_filter'][] = array('value' => 'deleted', 'label' => lang('Deleted'), 'title' => lang('Show events that have been deleted'));
 		}
@@ -586,7 +586,7 @@ 
 		// Merge print
 		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
 		{
-			$sel_options['merge'] = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null,'calendar');
+			$sel_options['merge'] = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null, 'calendar');
 		}
 		else
 		{
@@ -615,10 +615,10 @@ 
 	 */
 	public function update_client($event_id, Api\DateTime $recurrence_date = null)
 	{
-		if(!$event_id) return false;
-		if(is_string($event_id) && strpos($event_id,':') !== FALSE)
+		if (!$event_id) return false;
+		if (is_string($event_id) && strpos($event_id, ':') !== FALSE)
 		{
-			list($event_id, $date) = explode(':',$event_id);
+			list($event_id, $date) = explode(':', $event_id);
 			$recurrence_date = new Api\DateTime($date);
 		}
 
@@ -631,7 +631,7 @@ 
 		// Check filters to see if they still match, may have to remove
 		// the event because it should no longer be displayed
 		$filter_match = true;
-		if($event && ($this->cal_prefs['saved_states']['status_filter'] != 'all' ||
+		if ($event && ($this->cal_prefs['saved_states']['status_filter'] != 'all' ||
 			$this->cal_prefs['saved_states']['cat_id']))
 		{
 			$filter_check = array(
@@ -644,20 +644,20 @@ 
 			$filter_match = count($this->bo->search($filter_check, $this->bo->so->cal_table.".cal_id = {$event['id']}")) > 0;
 		}
 
-		if(!$event || !$filter_match)
+		if (!$event || !$filter_match)
 		{
 			// Sending null will trigger a removal
 			$response->generic('data', array('uid' => 'calendar::'.$event_id, 'data' => null));
 			return false;
 		}
 
-		if(!$event['recur_type'] || $recurrence_date)
+		if (!$event['recur_type'] || $recurrence_date)
 		{
 			$this->to_client($event);
 			$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => $event));
 		}
 		// If it's recurring, try to send the next month or so
-		else if($event['recur_type'] )
+		else if ($event['recur_type'])
 		{
 			$this_month = new Api\DateTime('next month');
 			$rrule = calendar_rrule::event2rrule($event, true);
@@ -670,7 +670,7 @@ 
 				$response->generic('data', array('uid' => 'calendar::'.$converted['row_id'], 'data' => $converted));
 				$rrule->next();
 			}
-			while ($rrule->valid() && $occurrence <= $this_month );
+			while ($rrule->valid() && $occurrence <= $this_month);
 		}
 		return true;
 	}
@@ -686,15 +686,15 @@ 
 	 */
 	public function to_client(&$event)
 	{
-		if(!$event || !is_array($event)) return false;
+		if (!$event || !is_array($event)) return false;
 
-		if (!$this->bo->check_perms(Acl::EDIT,$event))
+		if (!$this->bo->check_perms(Acl::EDIT, $event))
 		{
 			$event['class'] .= 'rowNoEdit ';
 		}
 
 		// Delete disabled for other applications
-		if (!$this->bo->check_perms(Acl::DELETE,$event) || !is_numeric($event['id']))
+		if (!$this->bo->check_perms(Acl::DELETE, $event) || !is_numeric($event['id']))
 		{
 			$event['class'] .= 'rowNoDelete ';
 		}
@@ -707,32 +707,32 @@ 
 
 		$event['recure'] = $this->bo->recure2string($event);
 
-		if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-		if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+		if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
+		if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
 
 		// respect category permissions
-		if(!empty($event['category']))
+		if (!empty($event['category']))
 		{
 			$event['category'] = $this->categories->check_list(Acl::READ, $event['category']);
 		}
 		$event['non_blocking'] = (bool)$event['non_blocking'];
 
 		$matches = null;
-		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+		if (!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i', $event['id'], $matches))
 		{
 			$app = $matches[1];
 			$app_id = $matches[2];
 			$icons = array();
-			if(!($is_private = calendar_bo::integration_get_private($app,$app_id,$event)))
+			if (!($is_private = calendar_bo::integration_get_private($app, $app_id, $event)))
 			{
-				$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
+				$icons = calendar_uiviews::integration_get_icons($app, $app_id, $event);
 			}
 			$event['app'] = $app;
 			$event['app_id'] = $app_id;
 		}
 		else
 		{
-			$is_private = !$this->bo->check_perms(Acl::READ,$event);
+			$is_private = !$this->bo->check_perms(Acl::READ, $event);
 		}
 		if ($is_private)
 		{
@@ -740,27 +740,27 @@ 
 			$event['class'] .= 'rowNoView ';
 		}
 
-		if(!$event['app'])
+		if (!$event['app'])
 		{
 			$event['app'] = 'calendar';
 		}
-		if(!$event['app_id'])
+		if (!$event['app_id'])
 		{
 			$event['app_id'] = $event['id'];
 		}
 
 		if ($event['recur_type'] != MCAL_RECUR_NONE)
 		{
-			$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts');
+			$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'], 'ts');
 		}
 		// set id for grid
-		$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts') : '');
+		$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'], 'ts') : '');
 
 		// Set up participant section of tooltip
-		$participants = $this->bo->participants($event,false);
-		$event['parts'] = implode("\n",$participants);
+		$participants = $this->bo->participants($event, false);
+		$event['parts'] = implode("\n", $participants);
 		$event['participant_types'] = array();
-		foreach($participants as $uid => $text)
+		foreach ($participants as $uid => $text)
 		{
 			$user_type = $user_id = null;
 			calendar_so::split_user($uid, $user_type, $user_id);
@@ -770,9 +770,9 @@ 
 		$event['date'] = $this->bo->date2string($event['start']);
 
 		// Change dates
-		foreach(calendar_egw_record::$types['date-time'] as $field)
+		foreach (calendar_egw_record::$types['date-time'] as $field)
 		{
-			if(is_int($event[$field]))
+			if (is_int($event[$field]))
 			{
 				$event[$field] = Api\DateTime::to($event[$field], Api\DateTime::ET2);
 			}
@@ -790,13 +790,13 @@ 
 	public function merge($timespan = array())
 	{
 		// Merge print
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
-			if(!$timespan)
+			if (!$timespan)
 			{
 				// Try to make time span into appropriate ranges to match
-				if(stripos($_GET['merge'],'month') !== false || stripos($_GET['merge'],lang('month')) !== false) $template = 'month';
-				if(stripos($_GET['merge'],'week') !== false || stripos($_GET['merge'],lang('week')) !== false) $template = 'week';
+				if (stripos($_GET['merge'], 'month') !== false || stripos($_GET['merge'], lang('month')) !== false) $template = 'month';
+				if (stripos($_GET['merge'], 'week') !== false || stripos($_GET['merge'], lang('week')) !== false) $template = 'week';
 				//error_log("Detected template $template");
 				switch ($template)
 				{
@@ -804,8 +804,8 @@ 
 						// Trim to _only_ the month, do not pad to week start / end
 						$time = new Api\DateTime($this->date);
 						$timespan = array(array(
-							'start' => Api\DateTime::to($time->format('Y-m-01 00:00:00'),'ts'),
-							'end'	=> Api\DateTime::to($time->format('Y-m-t 23:59:59'),'ts')
+							'start' => Api\DateTime::to($time->format('Y-m-01 00:00:00'), 'ts'),
+							'end'	=> Api\DateTime::to($time->format('Y-m-t 23:59:59'), 'ts')
 						));
 						break;
 					case 'week':
@@ -813,7 +813,7 @@ 
 						$start = new Api\DateTime($this->first);
 						$t = clone $start;
 						$t->modify('+1 week')->modify('-1 second');
-						if($t->format('ts') < Api\DateTime::to($this->last,'ts'))
+						if ($t->format('ts') < Api\DateTime::to($this->last, 'ts'))
 						{
 							do
 							{
@@ -823,7 +823,7 @@ 
 								);
 								$start->modify('+1 week');
 								$t->modify('+1 week');
-							} while( $start->format('ts') < $this->last);
+							} while ($start->format('ts') < $this->last);
 							break;
 						}
 						// Fall through
@@ -841,7 +841,7 @@ 
 			Framework::refresh_opener($error, 'calendar');
 		}
 		unset($_GET['merge']);
-		if($error)
+		if ($error)
 		{
 			// This doesn't give message either, but at least it doesn't give a blank screen
 			Framework::redirect_link('/index.php', array(

calendar/inc/class.calendar_rrule.inc.php

Spacing +90 added lines, -90 removed lines

@@ -76,8 +76,8 @@ 
 	static private $recur_egw2ical_2_0 = array(
 		self::DAILY        => 'DAILY',
 		self::WEEKLY       => 'WEEKLY',
-		self::MONTHLY_WDAY => 'MONTHLY',	// BYDAY={1..7, -1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MONTHLY',	// BYMONHTDAY={1..31, -1 for last day of month}
+		self::MONTHLY_WDAY => 'MONTHLY', // BYDAY={1..7, -1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MONTHLY', // BYMONHTDAY={1..31, -1 for last day of month}
 		self::YEARLY       => 'YEARLY',
 	);
 
@@ -87,8 +87,8 @@ 
 	static private $recur_egw2ical_1_0 = array(
 		self::DAILY        => 'D',
 		self::WEEKLY       => 'W',
-		self::MONTHLY_WDAY => 'MP',	// BYDAY={1..7,-1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MD',	// BYMONHTDAY={1..31,-1}
+		self::MONTHLY_WDAY => 'MP', // BYDAY={1..7,-1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MD', // BYMONHTDAY={1..31,-1}
 		self::YEARLY       => 'YM',
 	);
 
@@ -144,7 +144,7 @@ 
 	const THURSDAY  = 16;
 	const FRIDAY    = 32;
 	const SATURDAY  = 64;
-	const WORKDAYS  = 62;	// Mo, ..., Fr
+	const WORKDAYS  = 62; // Mo, ..., Fr
 	const ALLDAYS   = 127;
 	/**
 	 * Translate weekday bitmasks to labels
@@ -172,14 +172,14 @@ 
 	 *
 	 * @var array
 	 */
-	public $exceptions=array();
+	public $exceptions = array();
 
 	/**
 	 * Array of exceptions as DateTime/egw_time objects
 	 *
 	 * @var array
 	 */
-	public $exceptions_objs=array();
+	public $exceptions_objs = array();
 
 	/**
 	 * Starttime of series
@@ -222,9 +222,9 @@ 
 	 * @param int $weekdays =0 self::SUNDAY=1|self::MONDAY=2|...|self::SATURDAY=64
 	 * @param array $exceptions =null DateTime objects with exceptions
 	 */
-	public function __construct(DateTime $time,$type,$interval=1,DateTime $enddate=null,$weekdays=0,array $exceptions=null)
+	public function __construct(DateTime $time, $type, $interval = 1, DateTime $enddate = null, $weekdays = 0, array $exceptions = null)
 	{
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$this->lastdayofweek = self::SATURDAY;
@@ -238,7 +238,7 @@ 
 
 		$this->time = $time instanceof Api\DateTime ? $time : new Api\DateTime($time);
 
-		if (!in_array($type,array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
+		if (!in_array($type, array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
@@ -248,16 +248,16 @@ 
 		if ($type == self::MONTHLY_WDAY)
 		{
 			// check for last week of month
-			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time)-7)
+			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time) - 7)
 			{
 				$this->monthly_byday_num = -1;
 			}
 			else
 			{
-				$this->monthly_byday_num = 1 + floor(($this->time->format('d')-1) / 7);
+				$this->monthly_byday_num = 1 + floor(($this->time->format('d') - 1) / 7);
 			}
 		}
-		elseif($type == self::MONTHLY_MDAY)
+		elseif ($type == self::MONTHLY_MDAY)
 		{
 			$this->monthly_bymonthday = (int)$this->time->format('d');
 			// check for last day of month
@@ -274,7 +274,7 @@ 
 
 		if ((int)$interval < 1)
 		{
-			$interval = 1;	// calendar stores no (extra) interval as null, so using default 1 here
+			$interval = 1; // calendar stores no (extra) interval as null, so using default 1 here
 		}
 		$this->interval = (int)$interval;
 
@@ -304,7 +304,7 @@ 
 		}
 		if ($exceptions)
 		{
-			foreach($exceptions as $exception)
+			foreach ($exceptions as $exception)
 			{
 				$exception->setTimezone($this->time->getTimezone());
 				$this->exceptions[] = $exception->format('Ymd');
@@ -320,22 +320,22 @@ 
 	 * @param int $interval =1
 	 * @return int
 	 */
-	public static function recurrence_interval($type, $interval=1)
+	public static function recurrence_interval($type, $interval = 1)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case self::DAILY:
-				$duration = 24*3600;
+				$duration = 24 * 3600;
 				break;
 			case self::WEEKLY:
-				$duration = 7*24*3600;
+				$duration = 7 * 24 * 3600;
 				break;
 			case self::MONTHLY_MDAY:
 			case self::MONTHLY_WDAY:
-				$duration = 31*24*3600;
+				$duration = 31 * 24 * 3600;
 				break;
 			case self::YEARLY:
-				$duration = 366*24*3600;
+				$duration = 366 * 24 * 3600;
 				break;
 		}
 		if ($interval > 1) $duration *= $interval;
@@ -351,9 +351,9 @@ 
 	 */
 	private static function daysInMonth(DateTime $time)
 	{
-		list($year,$month) = explode('-',$time->format('Y-m'));
+		list($year, $month) = explode('-', $time->format('Y-m'));
 		$last_day = new Api\DateTime();
-		$last_day->setDate($year,$month+1,0);
+		$last_day->setDate($year, $month + 1, 0);
 
 		return (int)$last_day->format('d');
 	}
@@ -383,7 +383,7 @@ 
 	 */
 	public function next_no_exception()
 	{
-		switch($this->type)
+		switch ($this->type)
 		{
 			case self::NONE:	// need to add at least one day, to end "series", as enddate == current date
 			case self::DAILY:
@@ -398,28 +398,28 @@ 
 					// --> on the last day of the week we have to additionally advance interval-1 weeks
 					if ($this->interval > 1 && self::getWeekday($this->current) == $this->lastdayofweek)
 					{
-						$this->current->modify(($this->interval-1).' week');
+						$this->current->modify(($this->interval - 1).' week');
 					}
 					$this->current->modify('1 day');
 					//echo __METHOD__.'() '.$this->current->format('l').', '.$this->current.": $this->weekdays & ".self::getWeekday($this->current)."<br />\n";
 				}
-				while(!($this->weekdays & self::getWeekday($this->current)));
+				while (!($this->weekdays&self::getWeekday($this->current)));
 				break;
 
 			case self::MONTHLY_WDAY:	// iCal: BYDAY={1, ..., 5, -1}{MO..SO}
 				// advance to start of next month
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$month += $this->interval+($this->monthly_byday_num < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$this->monthly_byday_num < 0 ? 0 : 1);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$month += $this->interval + ($this->monthly_byday_num < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $this->monthly_byday_num < 0 ? 0 : 1);
 				//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).": setDate($year,$month,1): ".$this->current->format('l').', '.$this->current."<br />\n";
 				// now advance to n-th week
 				if ($this->monthly_byday_num > 1)
 				{
-					$this->current->modify(($this->monthly_byday_num-1).' week');
+					$this->current->modify(($this->monthly_byday_num - 1).' week');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify('.($this->monthly_byday_num-1).' week): '.$this->current->format('l').', '.$this->current."<br />\n";
 				}
 				// advance to given weekday
-				while(!($this->weekdays & self::getWeekday($this->current)))
+				while (!($this->weekdays&self::getWeekday($this->current)))
 				{
 					$this->current->modify(($this->monthly_byday_num < 0 ? -1 : 1).' day');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify(1 day): '.$this->current->format('l').', '.$this->current."<br />\n";
@@ -427,10 +427,10 @@ 
 				break;
 
 			case self::MONTHLY_MDAY:	// iCal: monthly_bymonthday={1, ..., 31, -1}
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$day = $this->monthly_bymonthday+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$month += $this->interval+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$day);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$day = $this->monthly_bymonthday + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$month += $this->interval + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $day);
 				//echo __METHOD__."() setDate($year,$month,$day): ".$this->current->format('l').', '.$this->current."<br />\n";
 				break;
 
@@ -452,7 +452,7 @@ 
 		{
 			$this->next_no_exception();
 		}
-		while($this->exceptions && in_array($this->current->format('Ymd'),$this->exceptions));
+		while ($this->exceptions && in_array($this->current->format('Ymd'), $this->exceptions));
 	}
 
 	/**
@@ -484,7 +484,7 @@ 
 		if (isset($this->current)) $backup = $this->current;
 		$this->rewind();
 
-		while(--$count > 0)
+		while (--$count > 0)
 		{
 			$this->next_no_exception();
 		}
@@ -509,7 +509,7 @@ 
 		// if enddate is now before next acurrence, but not on same day, we use previous recurrence
 		// this can happen if client gives an enddate which is NOT a recurrence date
 		// eg. for a on Monday recurring weekly event a Tuesday as enddate
-		if ($this->enddate < $this->current  && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
+		if ($this->enddate < $this->current && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
 		{
 			$last = $previous;
 		}
@@ -528,7 +528,7 @@ 
 		$this->current = clone $this->time;
 		while ($this->valid() &&
 			$this->exceptions &&
-			in_array($this->current->format('Ymd'),$this->exceptions))
+			in_array($this->current->format('Ymd'), $this->exceptions))
 		{
 			$this->next_no_exception();
 		}
@@ -539,7 +539,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		return $this->current->format('Ymd') <= $this->enddate_ymd;
 	}
@@ -553,9 +553,9 @@ 
 	{
 		$str = '';
 		// Repeated Events
-		if($this->type != self::NONE)
+		if ($this->type != self::NONE)
 		{
-			list($str) = explode(' (',lang(self::$types[$this->type]));	// remove (by day/date) from Monthly
+			list($str) = explode(' (', lang(self::$types[$this->type])); // remove (by day/date) from Monthly
 
 			$str_extra = array();
 			switch ($this->type)
@@ -571,7 +571,7 @@ 
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('all') : lang('day');
 					}
-					elseif($this->weekdays == self::WORKDAYS)
+					elseif ($this->weekdays == self::WORKDAYS)
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('workdays') : lang('workday');
 					}
@@ -579,24 +579,24 @@ 
 					{
 						foreach (self::$days as $mask => $label)
 						{
-							if ($this->weekdays & $mask)
+							if ($this->weekdays&$mask)
 							{
 								$repeat_days[] = lang($label);
 							}
 						}
 					}
-					if($this->type == self::WEEKLY && count($repeat_days))
+					if ($this->type == self::WEEKLY && count($repeat_days))
 					{
-						$str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
+						$str_extra[] = lang('days repeated').': '.implode(', ', $repeat_days);
 					}
-					elseif($this->type == self::MONTHLY_WDAY)
+					elseif ($this->type == self::MONTHLY_WDAY)
 					{
-						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ',$repeat_days);
+						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ', $repeat_days);
 					}
 					break;
 
 			}
-			if($this->interval > 1)
+			if ($this->interval > 1)
 			{
 				$str_extra[] = lang('Interval').': '.$this->interval;
 			}
@@ -612,9 +612,9 @@ 
 			{
 				$str_extra[] = $this->time->getTimezone()->getName();
 			}
-			if(count($str_extra))
+			if (count($str_extra))
 			{
-				$str .= ' ('.implode(', ',$str_extra).')';
+				$str .= ' ('.implode(', ', $str_extra).')';
 			}
 		}
 		return $str;
@@ -626,24 +626,24 @@ 
 	 *
 	 * $return array	vCalendar RRULE
 	 */
-	public function generate_rrule($version='2.0')
+	public function generate_rrule($version = '2.0')
 	{
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE) return false; // no recuring event
 
 		if ($version == '1.0')
 		{
-			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type] . $this->interval;
+			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type].$this->interval;
 			switch ($this->type)
 			{
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(' ', $repeat_days);
@@ -656,7 +656,7 @@ 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}+ {MO..SO}
 					$rrule['BYDAY'] = abs($this->monthly_byday_num);
 					$rrule['BYDAY'] .= ($this->monthly_byday_num < 0) ? '- ' : '+ ';
-					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'), 0, 2));
 					$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
 					break;
 			}
@@ -674,9 +674,9 @@ 
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(',', $repeat_days);
@@ -687,8 +687,8 @@ 
 					break;
 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}{MO..SO}
-					$rrule['BYDAY'] = $this->monthly_byday_num .
-						strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] = $this->monthly_byday_num.
+						strtoupper(substr($this->time->format('l'), 0, 2));
 					break;
 			}
 			if ($this->interval > 1)
@@ -723,12 +723,12 @@ 
 	 *
 	 * @return calendar_rrule		false on error
 	 */
-	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
+	public static function event2rrule(array $event, $usertime = true, $to_tz = null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
+		if (!is_array($event) || !isset($event['tzid'])) return false;
 		if (!$to_tz) $to_tz = $event['tzid'];
 		$timestamp_tz = $usertime ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
-		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
+		$time = is_a($event['start'], 'DateTime') ? $event['start'] : new Api\DateTime($event['start'], $timestamp_tz);
 
 		if (!isset(self::$tz_cache[$to_tz]))
 		{
@@ -741,16 +741,16 @@ 
 
 		if ($event['recur_enddate'])
 		{
-			$enddate = is_a($event['recur_enddate'],'DateTime') ? $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'],$timestamp_tz);
+			$enddate = is_a($event['recur_enddate'], 'DateTime') ? $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], $timestamp_tz);
 		}
 		if (is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $exception)
+			foreach ($event['recur_exception'] as $exception)
 			{
-				$exceptions[] = is_a($exception,'DateTime') ? $exception : new Api\DateTime($exception,$timestamp_tz);
+				$exceptions[] = is_a($exception, 'DateTime') ? $exception : new Api\DateTime($exception, $timestamp_tz);
 			}
 		}
-		return new calendar_rrule($time,$event['recur_type'],$event['recur_interval'],$enddate,$event['recur_data'],$exceptions);
+		return new calendar_rrule($time, $event['recur_type'], $event['recur_interval'], $enddate, $event['recur_data'], $exceptions);
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 * @param DateTime/string		starttime of the event (in servertime)
 	 * @param string $to_tz			new timezone
 	 */
-	public static function rrule2tz(array &$event,$starttime,$to_tz)
+	public static function rrule2tz(array &$event, $starttime, $to_tz)
 	{
 		// We assume that the difference between timezones can result
 		// in a maximum of one day
@@ -797,7 +797,7 @@ 
 			self::$tz_cache[$to_tz] = calendar_timezones::DateTimeZone($to_tz);
 		}
 
-		$time = is_a($starttime,'DateTime') ?
+		$time = is_a($starttime, 'DateTime') ?
 			$starttime : new Api\DateTime($starttime, Api\DateTime::$server_timezone);
 		$time->setTimezone(self::$tz_cache[$event['tzid']]);
 		$remote = clone $time;
@@ -815,11 +815,11 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask&128) $mask = $mask - 127; // overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask&1) $mask = $mask + 128; // underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -830,15 +830,15 @@ 
 
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
 {
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	ini_set('display_errors', 1);
+	error_reporting(E_ALL&~E_NOTICE);
 	function lang($str) { return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
 	require_once('../../api/src/autoload.php');
 
 	if (!isset($_REQUEST['time']))
 	{
-		$now = new Api\DateTime('now',new DateTimeZone($_REQUEST['tz'] = 'UTC'));
+		$now = new Api\DateTime('now', new DateTimeZone($_REQUEST['tz'] = 'UTC'));
 		$_REQUEST['time'] = $now->format();
 		$_REQUEST['type'] = calendar_rrule::WEEKLY;
 		$_REQUEST['interval'] = 2;
@@ -847,29 +847,29 @@ 
 		$_REQUEST['user-tz'] = 'Europe/Berlin';
 	}
 	echo "<html>\n<head>\n\t<title>Test calendar_rrule class</title>\n</head>\n<body>\n<form method='GET'>\n";
-	echo "<p>Date+Time: ".Api\Html::input('time',$_REQUEST['time']).
-		Api\Html::select('tz',$_REQUEST['tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>Type: ".Api\Html::select('type',$_REQUEST['type'],calendar_rrule::$types)."\n".
-		"Interval: ".Api\Html::input('interval',$_REQUEST['interval'])."</p>\n";
+	echo "<p>Date+Time: ".Api\Html::input('time', $_REQUEST['time']).
+		Api\Html::select('tz', $_REQUEST['tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>Type: ".Api\Html::select('type', $_REQUEST['type'], calendar_rrule::$types)."\n".
+		"Interval: ".Api\Html::input('interval', $_REQUEST['interval'])."</p>\n";
 	echo "<table><tr><td>\n";
-	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays',$_REQUEST['weekdays'],calendar_rrule::$days,false,'','7',false,'height: 150px;')."\n";
+	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays', $_REQUEST['weekdays'], calendar_rrule::$days, false, '', '7', false, 'height: 150px;')."\n";
 	echo "</td><td>\n";
-	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions',$_REQUEST['exceptions'],'style="height: 150px;"')."\n";
+	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions', $_REQUEST['exceptions'], 'style="height: 150px;"')."\n";
 	echo "</td></tr></table>\n";
-	echo "<p>Enddate: ".Api\Html::input('enddate',$_REQUEST['enddate'])."</p>\n";
-	echo "<p>Display recurances in ".Api\Html::select('user-tz',$_REQUEST['user-tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>".Api\Html::submit_button('calc','Calculate')."</p>\n";
+	echo "<p>Enddate: ".Api\Html::input('enddate', $_REQUEST['enddate'])."</p>\n";
+	echo "<p>Display recurances in ".Api\Html::select('user-tz', $_REQUEST['user-tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>".Api\Html::submit_button('calc', 'Calculate')."</p>\n";
 	echo "</form>\n";
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
-	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
+	$time = new Api\DateTime($_REQUEST['time'], $tz);
+	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'], $tz);
+	$weekdays = 0; foreach ((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
+	if ($_REQUEST['exceptions']) foreach (preg_split("/[,\r\n]+ ?/", $_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
 
-	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
+	$rrule = new calendar_rrule($time, $_REQUEST['type'], $_REQUEST['interval'], $enddate, $weekdays, $exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";
-	foreach($rrule as $rtime)
+	foreach ($rrule as $rtime)
 	{
 		$rtime->setTimezone(Api\DateTime::$user_timezone);
 		echo ++$n.': '.$rtime->format('l').', '.$rtime."<br />\n";

Braces +58 added lines, -14 removed lines

@@ -338,7 +338,10 @@ 
 				$duration = 366*24*3600;
 				break;
 		}
-		if ($interval > 1) $duration *= $interval;
+		if ($interval > 1)
+		{
+			$duration *= $interval;
+		}
 
 		return $duration;
 	}
@@ -481,7 +484,10 @@ 
 		{
 			return clone $this->time;
 		}
-		if (isset($this->current)) $backup = $this->current;
+		if (isset($this->current))
+		{
+			$backup = $this->current;
+		}
 		$this->rewind();
 
 		while(--$count > 0)
@@ -489,7 +495,10 @@ 
 			$this->next_no_exception();
 		}
 		$ret = clone $this->current;
-		if ($backup) $this->current = $backup;
+		if ($backup)
+		{
+			$this->current = $backup;
+		}
 		return $ret;
 	}
 
@@ -631,7 +640,11 @@ 
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE)
+		{
+			return false;
+		}
+		// no recuring event
 
 		if ($version == '1.0')
 		{
@@ -725,8 +738,14 @@ 
 	 */
 	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
-		if (!$to_tz) $to_tz = $event['tzid'];
+		if (!is_array($event)  || !isset($event['tzid']))
+		{
+			return false;
+		}
+		if (!$to_tz)
+		{
+			$to_tz = $event['tzid'];
+		}
 		$timestamp_tz = $usertime ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
 		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
 
@@ -786,7 +805,10 @@ 
 			$event['recur_type'] == self::NONE ||
 			empty($event['recur_data']) || $event['recur_data'] == ALLDAYS ||
 			empty($event['tzid']) || empty($to_tz) ||
-			$event['tzid'] == $to_tz) return;
+			$event['tzid'] == $to_tz)
+		{
+			return;
+		}
 
 		if (!isset(self::$tz_cache[$event['tzid']]))
 		{
@@ -815,11 +837,19 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask & 128)
+						{
+							$mask = $mask - 127;
+						}
+						// overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask & 1)
+						{
+							$mask = $mask + 128;
+						}
+						// underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -828,11 +858,16 @@ 
 	}
 }
 
-if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
+{
+	// some tests
 {
 	ini_set('display_errors',1);
+}
 	error_reporting(E_ALL & ~E_NOTICE);
-	function lang($str) { return $str; }
+	function lang($str)
+	{
+return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
 	require_once('../../api/src/autoload.php');
 
@@ -863,9 +898,18 @@ 
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
 	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
+	if ($_REQUEST['enddate'])
+	{
+		$enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
+	}
+	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask)
+	{
+$weekdays |= $mask; }
+	if ($_REQUEST['exceptions'])
+	{
+		foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception);
+	}
+	}
 
 	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 *
 	 * @var array
 	 */
-	static public $types = Array(
+	static public $types = array(
 		self::NONE         => 'None',
 		self::DAILY        => 'Daily',
 		self::WEEKLY       => 'Weekly',

calendar/inc/class.calendar_bo.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1490,13 +1490,13 @@ 
 	}
 
 	/**
-	* Converts a participant into a (readable) user- or resource-name
-	*
-	* @param string|int $id id of user or resource
-	* @param string|boolean $use_type =false type-letter or false
-	* @param boolean $append_email =false append email (Name <email>)
-	* @return string with name
-	*/
+	 * Converts a participant into a (readable) user- or resource-name
+	 *
+	 * @param string|int $id id of user or resource
+	 * @param string|boolean $use_type =false type-letter or false
+	 * @param boolean $append_email =false append email (Name <email>)
+	 * @return string with name
+	 */
 	function participant_name($id,$use_type=false, $append_email=false)
 	{
 		static $id2lid = array();
@@ -1525,13 +1525,13 @@ 
 	}
 
 	/**
-	* Converts participants array of an event into array of (readable) participant-names with status
-	*
-	* @param array $event event-data
-	* @param boolean $long_status =false should the long/verbose status or an icon be use
-	* @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
-	* @return array with id / names with status pairs
-	*/
+	 * Converts participants array of an event into array of (readable) participant-names with status
+	 *
+	 * @param array $event event-data
+	 * @param boolean $long_status =false should the long/verbose status or an icon be use
+	 * @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
+	 * @return array with id / names with status pairs
+	 */
 	function participants($event,$long_status=false,$show_group_invitation=false)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($event['participants']));
@@ -1601,12 +1601,12 @@ 
 	}
 
 	/**
-	* Converts category string of an event into array of (readable) category-names
-	*
-	* @param string $category cat-id (multiple id's commaseparated)
-	* @param int $color color of the category, if multiple cats, the color of the last one with color is returned
-	* @return array with id / names
-	*/
+	 * Converts category string of an event into array of (readable) category-names
+	 *
+	 * @param string $category cat-id (multiple id's commaseparated)
+	 * @param int $color color of the category, if multiple cats, the color of the last one with color is returned
+	 * @return array with id / names
+	 */
 	function categories($category,&$color)
 	{
 		static $id2cat = array();

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
 	/**
 	 * @var array recur_types translates MCAL recur-types to verbose labels
 	 */
-	var $recur_types = Array(
+	var $recur_types = array(
 		MCAL_RECUR_NONE         => 'No recurrence',
 		MCAL_RECUR_DAILY        => 'Daily',
 		MCAL_RECUR_WEEKLY       => 'Weekly',
@@ -1897,7 +1897,7 @@ 
 	 * @param string $pattern pattern to search
 	 * @return array with cal_id - title pairs of the matching entries
 	 */
-	function link_query($pattern, Array &$options = array())
+	function link_query($pattern, array &$options = array())
 	{
 		$result = array();
 		$query = array(

Braces +206 added lines, -51 removed lines

@@ -15,10 +15,13 @@ 
 use EGroupware\Api\Link;
 use EGroupware\Api\Acl;
 
-if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
+if (!defined('ACL_TYPE_IDENTIFER'))
+{
+	// used to mark ACL-values for the debug_message methode
 {
 	define('ACL_TYPE_IDENTIFER','***ACL***');
 }
+}
 
 define('HOUR_s',60*60);
 define('DAY_s',24*HOUR_s);
@@ -222,7 +225,10 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_bo::bocal() started',True);
+		}
 
 		$this->so = new calendar_so();
 
@@ -308,7 +314,10 @@ 
 	 */
 	static function email_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach((array)$ids as $id)
@@ -391,10 +400,13 @@ 
 				$contact = 'c'.$contact['id'];
 				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact,$contact_list))
+					{
+						// already added?
 					{
 						$contact_list[] = $contact;
 					}
+					}
 				}
 			}
 		}
@@ -454,31 +466,43 @@ 
 			{
 				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact,$users))
+					{
+						// already added?
 					{
 						$users[] = $contact;
 					}
+					}
 				}
 				continue;
 			}
 			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					$users[] = $user;
 				}
+				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
 				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
-			if (!is_numeric($user)) continue;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
 			{
-				if ($no_enum_groups) continue;
+				if ($no_enum_groups)
+				{
+					continue;
+				}
 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
@@ -558,11 +582,14 @@ 
 		}
 
 		if (!isset($params['users']) || !$params['users'] ||
-			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
+			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])
+		{
+			// null or '' casted to an array
 		{
 			// for a search use all account you have read grants from
 			$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
 		}
+		}
 		// resolve users to add memberships for users and members for groups
 		// for search, do NOT use freebusy rights, as it would allow to probe the content of event entries
 		$users = $this->resolve_users($params['users'], $params['filter'] == 'no-enum-groups', $params['ignore_acl'], empty($params['query']));
@@ -573,7 +600,10 @@ 
 			$params['private_grants'] = array();
 			foreach($this->grants as $user => $rights)
 			{
-				if ($rights & Acl::PRIVAT) $params['private_grants'][] = $user;
+				if ($rights & Acl::PRIVAT)
+				{
+					$params['private_grants'][] = $user;
+				}
 			}
 		}
 
@@ -588,7 +618,10 @@ 
 		{
 			return false;
 		}
-		if (isset($params['start'])) $start = $this->date2ts($params['start']);
+		if (isset($params['start']))
+		{
+			$start = $this->date2ts($params['start']);
+		}
 
 		if (isset($params['end']))
 		{
@@ -652,10 +685,13 @@ 
 				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
 			}
 			// create empty entries for each day in the reported time
-			for($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
+			for($ts = $start; $ts <= $end; $ts += DAY_s)
+			{
+				// good enough for array creation, but see while loop below.
 			{
 				$daysEvents[$this->date2string($ts)] = array();
 			}
+			}
 			foreach($events as $k => $event)
 			{
 				$e_start = max($this->date2ts($event['start']),$start);
@@ -707,7 +743,10 @@ 
 			$integration_data = calendar_so::get_integration_data();
 		}
 
-		if (!isset($integration_data[$app])) return null;
+		if (!isset($integration_data[$app]))
+		{
+			return null;
+		}
 
 		return $part ? $integration_data[$app][$part] : $integration_data[$app];
 	}
@@ -754,8 +793,14 @@ 
 	 */
 	function clear_private_infos(&$event,$allowed_participants = array())
 	{
-		if ($event == false) return;
-		if (!is_array($event['participants'])) error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
+		if ($event == false)
+		{
+			return;
+		}
+		if (!is_array($event['participants']))
+		{
+			error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
+		}
 
 		$event = array(
 			'id'    => $event['id'],
@@ -800,19 +845,29 @@ 
 		}
 		$new_horizont = $this->date2ts($_new_horizont,true);	// now we are in server-time, where this function operates
 
-		if ($new_horizont <= $this->config['horizont'])	// no move necessary
+		if ($new_horizont <= $this->config['horizont'])
+		{
+			// no move necessary
 		{
 			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do',true,$new_horizont,(int)$this->config['horizont']);
+		}
 			return;
 		}
 		if (!empty($GLOBALS['egw_info']['server']['calendar_horizont']))
 		{
 			$maxdays = abs($GLOBALS['egw_info']['server']['calendar_horizont']);
 		}
-		if (empty($maxdays)) $maxdays = 1000; // old default
-		if ($new_horizont > time()+$maxdays*DAY_s)		// some user tries to "look" more then the maximum number of days in the future
+		if (empty($maxdays))
+		{
+			$maxdays = 1000;
+		}
+		// old default
+		if ($new_horizont > time()+$maxdays*DAY_s)
+		{
+			// some user tries to "look" more then the maximum number of days in the future
 		{
 			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
+		}
 			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont,true), $maxdays);
 			return;
 		}
@@ -840,7 +895,10 @@ 
 		// update the horizont
 		Api\Config::save_value('horizont',$this->config['horizont'],'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont')
+		{
+			$this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		}
 	}
 
 	/**
@@ -871,7 +929,10 @@ 
 				$event['end'] = $event_read['end'];
 			}
 		}
-		if (!$start) $start = $event['start'];
+		if (!$start)
+		{
+			$start = $event['start'];
+		}
 
 		$events = array();
 		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);
@@ -911,7 +972,10 @@ 
 	 */
 	function db2data(&$events,$date_format='ts')
 	{
-		if (!is_array($events)) echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
+		if (!is_array($events))
+		{
+			echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
+		}
 		foreach ($events as &$event)
 		{
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
@@ -995,7 +1059,10 @@ 
 	 */
 	function date2usertime($ts,$date_format='ts')
 	{
-		if (empty($ts) || $date_format == 'server') return $ts;
+		if (empty($ts) || $date_format == 'server')
+		{
+			return $ts;
+		}
 
 		return Api\DateTime::server2user($ts,$date_format);
 	}
@@ -1013,9 +1080,15 @@ 
 	 */
 	function read($ids,$date=null,$ignore_acl=False,$date_format='ts',$clear_private_infos_users=null)
 	{
-		if (!$ids) return false;
+		if (!$ids)
+		{
+			return false;
+		}
 
-		if ($date) $date = $this->date2ts($date);
+		if ($date)
+		{
+			$date = $this->date2ts($date);
+		}
 
 		$return = null;
 
@@ -1180,7 +1253,10 @@ 
 	{
 		static $res_info_cache = array();
 
-		if (!is_scalar($uid)) throw new Api\Exception\WrongParameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		if (!is_scalar($uid))
+		{
+			throw new Api\Exception\WrongParameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		}
 
 		if (!isset($res_info_cache[$uid]))
 		{
@@ -1235,7 +1311,10 @@ 
 	 */
 	function check_perms($needed,$event=0,$other=0,$date_format='ts',$date_to_read=null,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1274,7 +1353,10 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
+		if ($grant & ~self::ACL_INVITE)
+		{
+			$grant |= self::ACL_FREEBUSY;
+		}
 
 		if (is_array($event) && ($needed == Acl::READ || $needed == self::ACL_FREEBUSY))
 		{
@@ -1300,7 +1382,10 @@ 
 					elseif (!is_numeric($uid))
 					{
 						// if the owner only grants self::ACL_FREEBUSY we are not interested in the recources explicit rights
-						if ($grant == self::ACL_FREEBUSY) continue;
+						if ($grant == self::ACL_FREEBUSY)
+						{
+							continue;
+						}
 						// if we have a resource as participant
 						$resource = $this->resource_info($uid);
 						$grant |= $resource['rights'];
@@ -1451,14 +1536,20 @@ 
 						$param = $param ? 'True' : 'False';
 						break;
 					case 'integer':
-						if ($param >= mktime(0,0,0,1,1,2000)) $param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						if ($param >= mktime(0,0,0,1,1,2000))
+						{
+							$param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						}
 						break;
 				}
 			}
 			$msg = str_replace('%'.($i-1),$param,$msg);
 		}
 		error_log($msg);
-		if ($backtrace) error_log(function_backtrace(1));
+		if ($backtrace)
+		{
+			error_log(function_backtrace(1));
+		}
 	}
 
 	/**
@@ -1566,14 +1657,20 @@ 
 	function timespan($start_m,$end_m,$both=false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
+		if ($end_m == 24*60-1)
+		{
+			++$duration;
+		}
 		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
 
 		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d',$start_m/60).sprintf('%02d',$start_m%60).'00', false);
 
-		if ($both)	// end-time too
+		if ($both)
+		{
+			// end-time too
 		{
 			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d',$end_m/60).sprintf('%02d',$end_m%60).'00', false);
+		}
 			// dont double am/pm if they are the same in both times
 			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
 			{
@@ -1597,7 +1694,10 @@ 
 		static $id2lid = array();
 		static $id2email = array();
 
-		if ($use_type && $use_type != 'u') $id = $use_type.$id;
+		if ($use_type && $use_type != 'u')
+		{
+			$id = $use_type.$id;
+		}
 
 		if (!isset($id2lid[$id]))
 		{
@@ -1607,7 +1707,10 @@ 
 				if (($info = $this->resource_info($id)))
 				{
 					$id2lid[$id] = $info['name'] ? $info['name'] : $info['email'];
-					if ($info['name']) $id2email[$id] = $info['email'];
+					if ($info['name'])
+					{
+						$id2email[$id] = $info['email'];
+					}
 				}
 			}
 			else
@@ -1633,11 +1736,18 @@ 
 		$names = array();
 		foreach((array)$event['participants'] as $id => $status)
 		{
-			if (!is_string($status)) continue;
+			if (!is_string($status))
+			{
+				continue;
+			}
 			$quantity = $role = null;
 			calendar_so::split_status($status,$quantity,$role);
 
-			if ($status == 'G' && !$show_group_invitation) continue;	// dont show group-invitation
+			if ($status == 'G' && !$show_group_invitation)
+			{
+				continue;
+			}
+			// dont show group-invitation
 
 			$lang_status = lang($this->verbose_status[$status]);
 			if (!$long_status)
@@ -1710,7 +1820,10 @@ 
 
 		foreach(explode(',',$category) as $cat_id)
 		{
-			if (!$cat_id) continue;
+			if (!$cat_id)
+			{
+				continue;
+			}
 
 			if (!isset($id2cat[$cat_id]))
 			{
@@ -1776,7 +1889,10 @@ 
 	 */
 	public static function list_calendars($user, array $grants=null)
 	{
-		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		if (is_null($grants))
+		{
+			$grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		}
 
 		$users = $groups = array();
 		foreach(array_keys($grants) as $id)
@@ -1824,7 +1940,10 @@ 
 	 */
 	function recure2string($event)
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		return (string)calendar_rrule::event2rrule($event);
 	}
 
@@ -1843,12 +1962,18 @@ 
 	 */
 	function read_holidays($year=0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year)
+		{
+			$year = (int) date('Y',$this->now_su);
+		}
 
-		if (!$this->cached_holidays)	// try reading the holidays from the session
+		if (!$this->cached_holidays)
+		{
+			// try reading the holidays from the session
 		{
 			$this->cached_holidays = Api\Cache::getSession('calendar', 'holidays');
 		}
+		}
 		if (!isset($this->cached_holidays[$year]))
 		{
 			$this->cached_holidays[$year] = calendar_holidays::read(
@@ -1891,7 +2016,11 @@ 
 							continue;
 						}
 						list($y,$m,$d) = explode('-',$pers['bday']);
-						if ($y > $year) continue; 	// not yet born
+						if ($y > $year)
+						{
+							continue;
+						}
+						// not yet born
 						$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
 							'day'       => $d,
 							'month'     => $m,
@@ -1984,7 +2113,10 @@ 
 				}
 			}
 			$str_fields = implode(', ',$extra_fields);
-			if (is_array($extra_fields)) return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			if (is_array($extra_fields))
+			{
+				return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			}
 		}
 		return $this->format_date($event['start']) . ': ' . $event['title'];
 	}
@@ -2005,7 +2137,8 @@ 
 			'offset' =>	$options['start'],
 			'order' => 'cal_start DESC',
 		);
-		if($options['num_rows']) {
+		if($options['num_rows'])
+		{
 			$query['num_rows'] = $options['num_rows'];
 		}
 		foreach((array) $this->search($query) as $event)
@@ -2066,7 +2199,10 @@ 
 			if ((!isset($default_prefs[$var]) || (string)$default_prefs[$var] === '') && (!isset($forced_prefs[$var]) || (string)$forced_prefs[$var] === ''))
 			{
 				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');	// always store default, even if we have a forced too
-				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				if ($type == 'forced')
+				{
+					$GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				}
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
@@ -2086,7 +2222,10 @@ 
 	 */
 	static function freebusy_url($user='',$pw=null)
 	{
-		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
+		if (is_numeric($user))
+		{
+			$user = $GLOBALS['egw']->accounts->id2name($user);
+		}
 
 		$credentials = '';
 
@@ -2154,13 +2293,19 @@ 
 	 */
 	public function get_ctag($user, $filter='owner', $master_only=false)
 	{
-		if ($this->debug > 1) $startime = microtime(true);
+		if ($this->debug > 1)
+		{
+			$startime = microtime(true);
+		}
 
 		// resolve users to add memberships for users and members for groups
 		$users = $this->resolve_users($user);
 		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0;	// no rights, return 0 as ctag (otherwise we get SQL error!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		}
 		return $ctag;
 	}
 
@@ -2202,15 +2347,21 @@ 
 				$content['link_app'][] = $link['app'];
 				$content['link_id'][]  = $link['id'];
 			}
-			if ($link['app'] == 'addressbook')	// prefering contact as primary contact over calendar entry set above
+			if ($link['app'] == 'addressbook')
+			{
+				// prefering contact as primary contact over calendar entry set above
 			{
 				$content['info_contact'] = 'addressbook:'.$link['id'];
 			}
+			}
 		}
 		// Copy same custom fields
 		foreach(array_keys(Api\Storage\Customfields::get('infolog')) as $name)
 		{
-			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
+			if ($this->customfields[$name])
+			{
+				$content['#'.$name] = $calendar['#'.$name];
+			}
 		}
 		//error_log(__METHOD__.'('.array2string($data).') calendar='.array2string($calendar).' returning '.array2string($content));
 		return $content;
@@ -2233,7 +2384,11 @@ 
 			$set['ts_title'] = $this->link_title($event);
 			$set['start_time'] = Api\DateTime::to($event['start'],'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event))
+			{
+				$event['end']++;
+			}
+			// whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
 			$set['end_time'] = null;	// unset end-time

Doc Comments +7 added lines, -12 removed lines

@@ -632,8 +632,8 @@ 
 	 * or an ExecMethod callback with parameters $id,$event
 	 *
 	 * @param string $app
-	 * @param int|string $id
-	 * @return string
+	 * @param string $id
+	 * @return boolean
 	 */
 	static function integration_get_private($app,$id,$event)
 	{
@@ -762,7 +762,7 @@ 
 	 * This methods operates in usertime, while $this->config['horizont'] is in servertime!
 	 *
 	 * @param array $event
-	 * @param mixed $start =0 minimum start-time for new recurrences or !$start = since the start of the event
+	 * @param integer $start =0 minimum start-time for new recurrences or !$start = since the start of the event
 	 */
 	function set_recurrences($event,$start=0)
 	{
@@ -982,10 +982,9 @@ 
 	 * Recurrences get calculated by rrule iterator implemented in calendar_rrule class.
 	 *
 	 * @param array $event repeating event whos repetions should be inserted
-	 * @param mixed $start start-date
+	 * @param mixed $_start start-date
 	 * @param mixed $end end-date
 	 * @param array $events where the repetions get inserted
-	 * @param array $recur_exceptions with date (in Ymd) as key (and True as values), seems not to be used anymore
 	 */
 	function insert_all_recurrences($event,$_start,$end,&$events)
 	{
@@ -1139,7 +1138,7 @@ 
 	 *	even if you have no general read-grant from that user.
 	 *
 	 * @param int $needed necessary ACL right: Acl::{READ|EDIT|DELETE}
-	 * @param mixed $event event as array or the event-id or 0 for a general check
+	 * @param integer $event event as array or the event-id or 0 for a general check
 	 * @param int $other uid to check (if event==0) or 0 to check against $this->user
 	 * @param string $date_format ='ts' date-format used for reading: 'ts'=timestamp, 'array'=array, 'string'=iso8601 string for xmlrpc
 	 * @param mixed $date_to_read =null date used for reading, internal param for the caching
@@ -1312,8 +1311,6 @@ 
 	 * @param string $msg message with parameters/variables like lang(), eg. '%1'
 	 * @param boolean $backtrace =True include a function-backtrace, default True=On
 	 *	should only be set to False=Off, if your code ensures a call with backtrace=On was made before !!!
-	 * @param mixed $param a variable number of parameters, to be inserted in $msg
-	 *	arrays get serialized with print_r() !
 	 */
 	static function debug_message($msg,$backtrace=True)
 	{
@@ -1378,7 +1375,7 @@ 
 	 * Formats one or two dates (range) as long date (full monthname), optionaly with a time
 	 *
 	 * @param mixed $_first first date
-	 * @param mixed $last =0 last date if != 0 (default)
+	 * @param integer $last =0 last date if != 0 (default)
 	 * @param boolean $display_time =false should a time be displayed too
 	 * @param boolean $display_day =false should a day-name prefix the date, eg. monday June 20, 2006
 	 * @return string with formated date
@@ -1847,7 +1844,6 @@ 
 	 *
 	 * Is called as hook to participate in the linking
 	 *
-	 * @param int|array $entry int cal_id or array with event
 	 * @param string|boolean string with title, null if not found or false if not read perms
 	 */
 	function link_title($event)
@@ -2036,6 +2032,7 @@ 
 	 *
 	 * @param array|int|string $entry array with event or cal_id, or cal_id:recur_date for virtual exceptions
 	 * @param string &$schedule_tag=null on return schedule-tag (egw_cal.cal_id:egw_cal.cal_etag, no participant modifications!)
+	 * @param string $schedule_tag
 	 * @return string|boolean string with etag or false
 	 */
 	function get_etag($entry, &$schedule_tag=null)
@@ -2076,7 +2073,6 @@ 
 	 * Hook for infolog  to set some extra data and links
 	 *
 	 * @param array $data event-array preset by infolog plus
-	 * @param int $data[id] cal_id
 	 * @return array with key => value pairs to set in new event and link_app/link_id arrays
 	 */
 	function infolog_set($data)
@@ -2128,7 +2124,6 @@ 
 	 * Hook for timesheet to set some extra data and links
 	 *
 	 * @param array $data
-	 * @param int $data[id] cal_id:recurrence
 	 * @return array with key => value pairs to set in new timesheet and link_app/link_id arrays
 	 */
 	function timesheet_set($data)

Spacing +308 added lines, -309 removed lines

@@ -17,12 +17,12 @@ 
 
 if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
 {
-	define('ACL_TYPE_IDENTIFER','***ACL***');
+	define('ACL_TYPE_IDENTIFER', '***ACL***');
 }
 
-define('HOUR_s',60*60);
-define('DAY_s',24*HOUR_s);
-define('WEEK_s',7*DAY_s);
+define('HOUR_s', 60 * 60);
+define('DAY_s', 24 * HOUR_s);
+define('WEEK_s', 7 * DAY_s);
 
 /**
  * Required (!) include, as we use the MCAL_* constants, BEFORE instanciating (and therefore autoloading) the class
@@ -71,7 +71,7 @@ 
 	 *	4 = function-calls to exported conversation-functions like date2ts, date2array, ...
 	 *	5 = function-calls to private functions
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * @var int $now timestamp in server-time
@@ -101,12 +101,12 @@ 
 	/**
 	 * @var int $user nummerical id of the current user-id
 	 */
-	var $user=0;
+	var $user = 0;
 
 	/**
 	 * @var array $grants grants of the current user, array with user-id / ored-ACL-rights pairs
 	 */
-	var $grants=array();
+	var $grants = array();
 
 	/**
 	 * @var array $verbose_status translated 1-char status values to a verbose name, run through lang() by the constructor
@@ -222,15 +222,15 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started',True);
+		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started', True);
 
 		$this->so = new calendar_so();
 
-		$this->common_prefs =& $GLOBALS['egw_info']['user']['preferences']['common'];
-		$this->cal_prefs =& $GLOBALS['egw_info']['user']['preferences']['calendar'];
+		$this->common_prefs = & $GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->cal_prefs = & $GLOBALS['egw_info']['user']['preferences']['calendar'];
 
 		$this->now = time();
-		$this->now_su = Api\DateTime::server2user($this->now,'ts');
+		$this->now_su = Api\DateTime::server2user($this->now, 'ts');
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
@@ -239,7 +239,7 @@ 
 		if (!is_array($this->resources = Api\Cache::getSession('calendar', 'resources')))
 		{
 			$this->resources = array();
-			foreach(Api\Hooks::process('calendar_resources') as $app => $data)
+			foreach (Api\Hooks::process('calendar_resources') as $app => $data)
 			{
 				if ($data && $data['type'])
 				{
@@ -252,8 +252,8 @@ 
 				'app'  => 'email',
 			);
 			$this->resources['l'] = array(
-				'type' => 'l',// one char type-identifier for this resources
-				'info' => __CLASS__ .'::mailing_lists',// info method, returns array with id, type & name for a given id
+				'type' => 'l', // one char type-identifier for this resources
+				'info' => __CLASS__.'::mailing_lists', // info method, returns array with id, type & name for a given id
 				'app' => 'Distribution list'
 			);
 			$this->resources[''] = array(
@@ -261,22 +261,22 @@ 
 				'app' => 'api-accounts',
 			);
 			$this->resources['l'] = array(
-				'type' => 'l',// one char type-identifier for this resources
-				'info' => __CLASS__ .'::mailing_lists',// info method, returns array with id, type & name for a given id
+				'type' => 'l', // one char type-identifier for this resources
+				'info' => __CLASS__.'::mailing_lists', // info method, returns array with id, type & name for a given id
 				'app' => 'Distribution list'
 			);
 			Api\Cache::setSession('calendar', 'resources', $this->resources);
 		}
 		//error_log(__METHOD__ . " registered resources=". array2string($this->resources));
 
-		$this->config = Api\Config::read('calendar');	// only used for horizont, regular calendar config is under phpgwapi
+		$this->config = Api\Config::read('calendar'); // only used for horizont, regular calendar config is under phpgwapi
 		$this->require_acl_invite = $GLOBALS['egw_info']['server']['require_acl_invite'];
 
-		$this->categories = new Api\Categories($this->user,'calendar');
+		$this->categories = new Api\Categories($this->user, 'calendar');
 
 		$this->customfields = Api\Storage\Customfields::get('calendar');
 
-		foreach($this->alarms as $secs => &$label)
+		foreach ($this->alarms as $secs => &$label)
 		{
 			$label = self::secs2label($secs);
 		}
@@ -292,15 +292,15 @@ 
 	{
 		if ($secs <= 3600)
 		{
-			$label = lang('%1 minutes', $secs/60);
+			$label = lang('%1 minutes', $secs / 60);
 		}
-		elseif($secs <= 86400)
+		elseif ($secs <= 86400)
 		{
-			$label = lang('%1 hours', $secs/3600);
+			$label = lang('%1 hours', $secs / 3600);
 		}
 		else
 		{
-			$label = lang('%1 days', $secs/86400);
+			$label = lang('%1 days', $secs / 86400);
 		}
 		return $label;
 	}
@@ -316,12 +316,12 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			$email = $id;
 			$name = '';
 			$matches = null;
-			if (preg_match('/^(.*) *<([a-z0-9_.@-]{8,})>$/iU',$email,$matches))
+			if (preg_match('/^(.*) *<([a-z0-9_.@-]{8,})>$/iU', $email, $matches))
 			{
 				$name = $matches[1];
 				$email = $matches[2];
@@ -345,7 +345,7 @@ 
 	 */
 	static function mailing_lists($ids)
 	{
-		if(!is_array($ids))
+		if (!is_array($ids))
 		{
 			$ids = array($ids);
 		}
@@ -354,7 +354,7 @@ 
 		// Email list
 		$contacts_obj = new Api\Contacts();
 		$bo = new calendar_bo();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			$list = $contacts_obj->read_list((int)$id);
 
@@ -381,22 +381,22 @@ 
 	 *
 	 * @return array
 	 */
-	public function enum_mailing_list($id, $ignore_acl= false, $use_freebusy = true)
+	public function enum_mailing_list($id, $ignore_acl = false, $use_freebusy = true)
 	{
 		$contact_list = array();
 		$contacts = new Api\Contacts();
-		if($contacts->check_list((int)substr($id,1), ACL::READ))
+		if ($contacts->check_list((int)substr($id, 1), ACL::READ))
 		{
-			$options = array('list' => substr($id,1));
-			$lists = $contacts->search('',true,'','','',false,'AND',false,$options);
-			if(!$lists)
+			$options = array('list' => substr($id, 1));
+			$lists = $contacts->search('', true, '', '', '', false, 'AND', false, $options);
+			if (!$lists)
 			{
 				return $contact_list;
 			}
-			foreach($lists as &$contact)
+			foreach ($lists as &$contact)
 			{
 				// Check for user account
-				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'],'person_id')))
+				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'], 'person_id')))
 				{
 					$contact = ''.$account_id;
 				}
@@ -404,9 +404,9 @@ 
 				{
 					$contact = 'c'.$contact['id'];
 				}
-				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
+				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ? self::ACL_FREEBUSY : 0), 0, $contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact, $contact_list))	// already added?
 					{
 						$contact_list[] = $contact;
 					}
@@ -425,12 +425,12 @@ 
 	function enum_groups(&$event)
 	{
 		$added = 0;
-		foreach(array_keys($event['participants']) as $uid)
+		foreach (array_keys($event['participants']) as $uid)
 		{
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
 				($members = $GLOBALS['egw']->accounts->members($uid, true)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					if (!isset($event['participants'][$member]))
 					{
@@ -452,7 +452,7 @@ 
 	 * @param boolean $use_freebusy =true should freebusy rights are taken into account, default true, can be set to false eg. for a search
 	 * @return array of user-ids
 	 */
-	private function resolve_users($_users, $no_enum_groups=true, $ignore_acl=false, $use_freebusy=true)
+	private function resolve_users($_users, $no_enum_groups = true, $ignore_acl = false, $use_freebusy = true)
 	{
 		if (!is_array($_users))
 		{
@@ -460,35 +460,35 @@ 
 		}
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach($_users as $user)
+		foreach ($_users as $user)
 		{
 			$user = trim($user);
 			
 			// Handle email lists
-			if(!is_numeric($user) && $user[0] == 'l')
+			if (!is_numeric($user) && $user[0] == 'l')
 			{
-				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
+				foreach ($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact, $users))	// already added?
 					{
 						$users[] = $contact;
 					}
 				}
 				continue;
 			}
-			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
+			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ? self::ACL_FREEBUSY : 0), 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					// General expansion check
 					if (!is_numeric($user) && $this->resources[$user[0]]['info'])
 					{
 						$info = $this->resource_info($user);
-						if($info && $info['resources'])
+						if ($info && $info['resources'])
 						{
-							foreach($info['resources'] as $_user)
+							foreach ($info['resources'] as $_user)
 							{
-								if($_user && !in_array($_user, $users))
+								if ($_user && !in_array($_user, $users))
 								{
 									$users[] = $_user;
 								}
@@ -501,7 +501,7 @@ 
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
-				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
+				continue; // for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
 			if (!is_numeric($user)) continue;
@@ -514,11 +514,11 @@ 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
 				{
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
 						// use only members which gave the user a read-grant
 						if (!in_array($member, $users) &&
-							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy?self::ACL_FREEBUSY:0),0,$member)))
+							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy ? self::ACL_FREEBUSY : 0), 0, $member)))
 						{
 							$users[] = $member;
 						}
@@ -530,9 +530,9 @@ 
 				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
-						if (!in_array($group,$users))
+						if (!in_array($group, $users))
 						{
 							$users[] = $group;
 						}
@@ -573,18 +573,18 @@ 
 	 * @return iterator|array|boolean array of events or array with YYYYMMDD strings / array of events pairs (depending on $daywise param)
 	 *	or false if there are no read-grants from _any_ of the requested users or iterator/recordset if cols are given
 	 */
-	function &search($params,$sql_filter=null)
+	function &search($params, $sql_filter = null)
 	{
 		$params_in = $params;
 
-		$params['sql_filter'] = $sql_filter;	// dont allow to set it via UI or xmlrpc
+		$params['sql_filter'] = $sql_filter; // dont allow to set it via UI or xmlrpc
 
 		// check if any resource wants to hook into
-		foreach($this->resources as $data)
+		foreach ($this->resources as $data)
 		{
 			if (isset($data['search_filter']))
 			{
-				$params = ExecMethod($data['search_filter'],$params);
+				$params = ExecMethod($data['search_filter'], $params);
 			}
 		}
 
@@ -602,9 +602,9 @@ 
 		if (!empty($params['query']))
 		{
 			$params['private_grants'] = array();
-			foreach($this->grants as $user => $rights)
+			foreach ($this->grants as $user => $rights)
 			{
-				if ($rights & Acl::PRIVAT) $params['private_grants'][] = $user;
+				if ($rights&Acl::PRIVAT) $params['private_grants'][] = $user;
 			}
 		}
 
@@ -630,49 +630,49 @@ 
 		$params['enum_recuring'] = $enum_recuring = $daywise || !isset($params['enum_recuring']) || !!$params['enum_recuring'];
 		$cat_id = isset($params['cat_id']) ? $params['cat_id'] : 0;
 		$filter = isset($params['filter']) ? $params['filter'] : 'all';
-		$offset = isset($params['offset']) && $params['offset'] !== false ? (int) $params['offset'] : false;
+		$offset = isset($params['offset']) && $params['offset'] !== false ? (int)$params['offset'] : false;
 		// socal::search() returns rejected group-invitations, as only the user not also the group is rejected
 		// as we cant remove them efficiantly in SQL, we kick them out here, but only if just one user is displayed
 		$users_in = (array)$params_in['users'];
-		$remove_rejected_by_user = !in_array($filter,array('all','rejected','everything')) &&
+		$remove_rejected_by_user = !in_array($filter, array('all', 'rejected', 'everything')) &&
 			count($users_in) == 1 && $users_in[0] > 0 ? $users_in[0] : null;
 		//error_log(__METHOD__.'('.array2string($params_in).", $sql_filter) params[users]=".array2string($params['users']).' --> remove_rejected_by_user='.array2string($remove_rejected_by_user));
 
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
 		{
 			$this->debug_message('calendar_bo::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, sql_filter=%11)',
-				True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$params['sql_filter']);
+				True, $params, $start, $end, $daywise, $cat_id, $filter, $params['query'], $offset, (int)$params['num_rows'], $params['order'], $params['sql_filter']);
 		}
 		// date2ts(,true) converts to server time, db2data converts again to user-time
-		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
-			$users,$cat_id,$filter,$offset,(int)$params['num_rows'],$params,$remove_rejected_by_user);
+		$events = & $this->so->search(isset($start) ? $this->date2ts($start, true) : null, isset($end) ? $this->date2ts($end, true) : null,
+			$users, $cat_id, $filter, $offset, (int)$params['num_rows'], $params, $remove_rejected_by_user);
 
 		if (isset($params['cols']))
 		{
 			return $events;
 		}
 		$this->total = $this->so->total;
-		$this->db2data($events,isset($params['date_format']) ? $params['date_format'] : 'ts');
+		$this->db2data($events, isset($params['date_format']) ? $params['date_format'] : 'ts');
 
 		//echo "<p align=right>remove_rejected_by_user=$remove_rejected_by_user, filter=$filter, params[users]=".print_r($param['users'])."</p>\n";
-		foreach($events as $id => $event)
+		foreach ($events as $id => $event)
 		{
 			if ($params['enum_groups'] && $this->enum_groups($event))
 			{
 				$events[$id] = $event;
 			}
 			$matches = null;
-			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/',$event['id'],$matches))
+			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/', $event['id'], $matches))
 			{
-				$is_private = self::integration_get_private($matches[1],$matches[2],$event);
+				$is_private = self::integration_get_private($matches[1], $matches[2], $event);
 			}
 			else
 			{
-				$is_private = !$this->check_perms(Acl::READ,$event);
+				$is_private = !$this->check_perms(Acl::READ, $event);
 			}
 			if ($is_private || (!$event['public'] && $filter == 'hideprivate'))
 			{
-				$this->clear_private_infos($events[$id],$users);
+				$this->clear_private_infos($events[$id], $users);
 			}
 		}
 
@@ -680,18 +680,18 @@ 
 		{
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
 			{
-				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
+				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3', False, $start, $end, $events);
 			}
 			// create empty entries for each day in the reported time
-			for($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
+			for ($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
 			{
 				$daysEvents[$this->date2string($ts)] = array();
 			}
-			foreach($events as $k => $event)
+			foreach ($events as $k => $event)
 			{
-				$e_start = max($this->date2ts($event['start']),$start);
+				$e_start = max($this->date2ts($event['start']), $start);
 				// $event['end']['raw']-1 to allow events to end on a full hour/day without the need to enter it as minute=59
-				$e_end   = min($this->date2ts($event['end'])-1,$end);
+				$e_end   = min($this->date2ts($event['end']) - 1, $end);
 
 				// add event to each day in the reported time
 				$ts = $e_start;
@@ -700,23 +700,23 @@ 
 				$ymd = null;
 				while ($ts <= $e_end)
 				{
-					$daysEvents[$ymd = $this->date2string($ts)][] =& $events[$k];
-					$ts = strtotime("+1 day",$ts);
+					$daysEvents[$ymd = $this->date2string($ts)][] = & $events[$k];
+					$ts = strtotime("+1 day", $ts);
 				}
 				if ($ymd != ($last = $this->date2string($e_end)))
 				{
-					$daysEvents[$last][] =& $events[$k];
+					$daysEvents[$last][] = & $events[$k];
 				}
 			}
-			$events =& $daysEvents;
+			$events = & $daysEvents;
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
 			{
-				$this->debug_message('socalendar::search daywise events=%1',False,$events);
+				$this->debug_message('socalendar::search daywise events=%1', False, $events);
 			}
 		}
 		if ($this->debug && ($this->debug > 0 || $this->debug == 'search'))
 		{
-			$this->debug_message('calendar_bo::search(%1)=%2',True,$params,$events);
+			$this->debug_message('calendar_bo::search(%1)=%2', True, $params, $events);
 		}
 		//error_log(__METHOD__."() returning ".count($events)." entries, total=$this->total ".function_backtrace());
 		return $events;
@@ -729,9 +729,9 @@ 
 	 * @param string $part
 	 * @return array
 	 */
-	static function integration_get_data($app,$part=null)
+	static function integration_get_data($app, $part = null)
 	{
-		static $integration_data=null;
+		static $integration_data = null;
 
 		if (!isset($integration_data))
 		{
@@ -753,14 +753,14 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	static function integration_get_private($app,$id,$event)
+	static function integration_get_private($app, $id, $event)
 	{
-		$app_data = self::integration_get_data($app,'is_private');
+		$app_data = self::integration_get_data($app, 'is_private');
 
 		// no method, fall back to link title
 		if (is_null($app_data))
 		{
-			$is_private = !Link::title($app,$id);
+			$is_private = !Link::title($app, $id);
 		}
 		// boolean value to make all events of $app public (false) or private (true)
 		elseif (is_bool($app_data))
@@ -769,7 +769,7 @@ 
 		}
 		else
 		{
-			$is_private = (bool)ExecMethod2($app_data,$id,$event);
+			$is_private = (bool)ExecMethod2($app_data, $id, $event);
 		}
 		//echo '<p>'.__METHOD__."($app,$id,) app_data=".array2string($app_data).' returning '.array2string($is_private)."</p>\n";
 		return $is_private;
@@ -783,7 +783,7 @@ 
 	 * @param array &$event
 	 * @param array $allowed_participants ids of the allowed participants, eg. the ones the search is over or eg. the owner of the calendar
 	 */
-	function clear_private_infos(&$event,$allowed_participants = array())
+	function clear_private_infos(&$event, $allowed_participants = array())
 	{
 		if ($event == false) return;
 		if (!is_array($event['participants'])) error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
@@ -799,19 +799,19 @@ 
 			'owner'		=> $event['owner'],
 			'uid'	=> $event['uid'],
 			'etag'	=> $event['etag'],
-			'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
+			'participants' => array_intersect_key($event['participants'], array_flip($allowed_participants)),
 			'public'=> 0,
-			'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
+			'category' => $event['category'], // category is visible anyway, eg. by using planner by cat
 			'non_blocking' => $event['non_blocking'],
 			'caldav_name' => $event['caldav_name'],
 		// we need full recurrence information, as they are relevant free/busy information
-		)+($event['recur_type'] ? array(
+		) + ($event['recur_type'] ? array(
 			'recur_type'     => $event['recur_type'],
 			'recur_interval' => $event['recur_interval'],
 			'recur_data'     => $event['recur_data'],
 			'recur_enddate'  => $event['recur_enddate'],
 			'recur_exception'=> $event['recur_exception'],
-		):array(
+		) : array(
 			'reference'      => $event['reference'],
 			'recurrence'     => $event['recurrence'],
 		));
@@ -825,15 +825,15 @@ 
 	 */
 	function check_move_horizont($_new_horizont)
 	{
-		if ((int) $this->debug >= 2 || $this->debug == 'check_move_horizont')
+		if ((int)$this->debug >= 2 || $this->debug == 'check_move_horizont')
 		{
-			$this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2',true,$_new_horizont,(int)$this->config['horizont']);
+			$this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2', true, $_new_horizont, (int)$this->config['horizont']);
 		}
-		$new_horizont = $this->date2ts($_new_horizont,true);	// now we are in server-time, where this function operates
+		$new_horizont = $this->date2ts($_new_horizont, true); // now we are in server-time, where this function operates
 
 		if ($new_horizont <= $this->config['horizont'])	// no move necessary
 		{
-			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do',true,$new_horizont,(int)$this->config['horizont']);
+			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do', true, $new_horizont, (int)$this->config['horizont']);
 			return;
 		}
 		if (!empty($GLOBALS['egw_info']['server']['calendar_horizont']))
@@ -841,15 +841,15 @@ 
 			$maxdays = abs($GLOBALS['egw_info']['server']['calendar_horizont']);
 		}
 		if (empty($maxdays)) $maxdays = 1000; // old default
-		if ($new_horizont > time()+$maxdays*DAY_s)		// some user tries to "look" more then the maximum number of days in the future
+		if ($new_horizont > time() + $maxdays * DAY_s)		// some user tries to "look" more then the maximum number of days in the future
 		{
-			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
-			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont,true), $maxdays);
+			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it', true, $new_horizont, (int)$this->config['horizont'], $maxdays);
+			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont, true), $maxdays);
 			return;
 		}
-		if ($new_horizont < time()+31*DAY_s)
+		if ($new_horizont < time() + 31 * DAY_s)
 		{
-			$new_horizont = time()+31*DAY_s;
+			$new_horizont = time() + 31 * DAY_s;
 		}
 		$old_horizont = $this->config['horizont'];
 		$this->config['horizont'] = $new_horizont;
@@ -857,21 +857,21 @@ 
 		// create further recurrences for all recurring and not yet (at the old horizont) ended events
 		if (($recuring = $this->so->unfinished_recuring($old_horizont)))
 		{
-			@set_time_limit(0);	// disable time-limit, in case it takes longer to calculate the recurrences
-			foreach($this->read(array_keys($recuring)) as $cal_id => $event)
+			@set_time_limit(0); // disable time-limit, in case it takes longer to calculate the recurrences
+			foreach ($this->read(array_keys($recuring)) as $cal_id => $event)
 			{
 				if ($this->debug == 'check_move_horizont')
 				{
-					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)',true,$new_horizont,$event,$old_horizont);
+					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)', true, $new_horizont, $event, $old_horizont);
 				}
 				// insert everything behind max(cal_start), which can be less then $old_horizont because of bugs in the past
-				$this->set_recurrences($event,Api\DateTime::server2user($recuring[$cal_id]+1));	// set_recurences operates in user-time!
+				$this->set_recurrences($event, Api\DateTime::server2user($recuring[$cal_id] + 1)); // set_recurences operates in user-time!
 			}
 		}
 		// update the horizont
-		Api\Config::save_value('horizont',$this->config['horizont'],'calendar');
+		Api\Config::save_value('horizont', $this->config['horizont'], 'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting', true, $new_horizont, (int)$this->config['horizont']);
 	}
 
 	/**
@@ -882,11 +882,11 @@ 
 	 * @param array $event
 	 * @param mixed $start =0 minimum start-time for new recurrences or !$start = since the start of the event
 	 */
-	function set_recurrences($event,$start=0)
+	function set_recurrences($event, $start = 0)
 	{
-		if ($this->debug && ((int) $this->debug >= 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont'))
+		if ($this->debug && ((int)$this->debug >= 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont'))
 		{
-			$this->debug_message('calendar_bo::set_recurrences(%1,%2)',true,$event,$start);
+			$this->debug_message('calendar_bo::set_recurrences(%1,%2)', true, $event, $start);
 		}
 		// check if the caller gave us enough information and if not read it from the DB
 		if (!isset($event['participants']) || !isset($event['start']) || !isset($event['end']))
@@ -905,26 +905,26 @@ 
 		if (!$start) $start = $event['start'];
 
 		$events = array();
-		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);
+		$this->insert_all_recurrences($event, $start, $this->date2usertime($this->config['horizont']), $events);
 
 		$exceptions = array();
-		foreach((array)$event['recur_exception'] as $exception)
+		foreach ((array)$event['recur_exception'] as $exception)
 		{
-			$exceptions[] = Api\DateTime::to($exception, true);	// true = date
+			$exceptions[] = Api\DateTime::to($exception, true); // true = date
 		}
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$is_exception = in_array(Api\DateTime::to($event['start'], true), $exceptions);
-			$start = $this->date2ts($event['start'],true);
+			$start = $this->date2ts($event['start'], true);
 			if ($event['whole_day'])
 			{
 				$time = $this->so->startOfDay(new Api\DateTime($event['end'], Api\DateTime::$user_timezone));
 				$time->setTime(23, 59, 59);
-				$end = $this->date2ts($time,true);
+				$end = $this->date2ts($time, true);
 			}
 			else
 			{
-				$end = $this->date2ts($event['end'],true);
+				$end = $this->date2ts($event['end'], true);
 			}
 			//error_log(__METHOD__."() start=".Api\DateTime::to($start).", is_exception=".array2string($is_exception));
 			$this->so->recurrence($event['id'], $start, $end, $event['participants'], $is_exception);
@@ -940,7 +940,7 @@ 
 	 * @param array &$events array of event-arrays (reference)
 	 * @param $date_format ='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 */
-	function db2data(&$events,$date_format='ts')
+	function db2data(&$events, $date_format = 'ts')
 	{
 		if (!is_array($events)) echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
 		foreach ($events as &$event)
@@ -953,65 +953,65 @@ 
 			// database returns timestamps as string, convert them to integer
 			// to avoid misinterpretation by Api\DateTime as Ymd string
 			// (this will fail on 32bit systems for times > 2038!)
-			$event['start'] = (int)$event['start'];	// this is for isWholeDay(), which also calls Api\DateTime
+			$event['start'] = (int)$event['start']; // this is for isWholeDay(), which also calls Api\DateTime
 			$event['end'] = (int)$event['end'];
 			$event['whole_day'] = self::isWholeDay($event);
 			if ($event['whole_day'] && $date_format != 'server')
 			{
 				// Adjust dates to user TZ
-				$stime =& $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
+				$stime = & $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
 				$event['start'] = Api\DateTime::to($stime, $date_format);
-				$time =& $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
+				$time = & $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
 				$time->setTime(23, 59, 59);
 				$event['end'] = Api\DateTime::to($time, $date_format);
 				if (!empty($event['recurrence']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
 					$event['recurrence'] = Api\DateTime::to($time, $date_format);
 				}
 				if (!empty($event['recur_enddate']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
 					$time->setTime(23, 59, 59);
 					$event['recur_enddate'] = Api\DateTime::to($time, $date_format);
 				}
-				$timestamps = array('modified','created');
+				$timestamps = array('modified', 'created');
 			}
 			else
 			{
-				$timestamps = array('start','end','modified','created','recur_enddate','recurrence','recur_date');
+				$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence', 'recur_date');
 			}
 			// we convert here from the server-time timestamps to user-time and (optional) to a different date-format!
 			foreach ($timestamps as $ts)
 			{
 				if (!empty($event[$ts]))
 				{
-					$event[$ts] = $this->date2usertime((int)$event[$ts],$date_format);
+					$event[$ts] = $this->date2usertime((int)$event[$ts], $date_format);
 				}
 			}
 			// same with the recur exceptions
 			if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 			{
-				foreach($event['recur_exception'] as &$date)
+				foreach ($event['recur_exception'] as &$date)
 				{
 					if ($event['whole_day'] && $date_format != 'server')
 					{
 						// Adjust dates to user TZ
-						$time =& $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
+						$time = & $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
 						$date = Api\DateTime::to($time, $date_format);
 					}
 					else
 					{
-						$date = $this->date2usertime((int)$date,$date_format);
+						$date = $this->date2usertime((int)$date, $date_format);
 					}
 				}
 			}
 			// same with the alarms
 			if (isset($event['alarm']) && is_array($event['alarm']))
 			{
-				foreach($event['alarm'] as &$alarm)
+				foreach ($event['alarm'] as &$alarm)
 				{
-					$alarm['time'] = $this->date2usertime((int)$alarm['time'],$date_format);
+					$alarm['time'] = $this->date2usertime((int)$alarm['time'], $date_format);
 				}
 			}
 		}
@@ -1024,11 +1024,11 @@ 
 	 * @param string $date_format ='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return Api\DateTime::server2user($ts,$date_format);
+		return Api\DateTime::server2user($ts, $date_format);
 	}
 
 	/**
@@ -1042,7 +1042,7 @@ 
 	 * 	but call clear_private_infos() with the given users
 	 * @return boolean|array event or array of id => event pairs, false if the acl-check went wrong, null if $ids not found
 	 */
-	function read($ids,$date=null,$ignore_acl=False,$date_format='ts',$clear_private_infos_users=null)
+	function read($ids, $date = null, $ignore_acl = False, $date_format = 'ts', $clear_private_infos_users = null)
 	{
 		if (!$ids) return false;
 
@@ -1051,21 +1051,21 @@ 
 		$return = null;
 
 		$check = $clear_private_infos_users ? self::ACL_FREEBUSY : Acl::READ;
-		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check,$ids,0,$date_format,$date)))
+		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check, $ids, 0, $date_format, $date)))
 		{
 			if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
 				self::$cached_event_date_format != $date_format ||
 				self::$cached_event['recur_type'] != MCAL_RECUR_NONE && self::$cached_event_date != $date)
 			{
-				$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0);
+				$events = $this->so->read($ids, $date ? $this->date2ts($date, true) : 0);
 
 				if ($events)
 				{
-					$this->db2data($events,$date_format);
+					$this->db2data($events, $date_format);
 
 					if (is_array($ids))
 					{
-						$return =& $events;
+						$return = & $events;
 					}
 					else
 					{
@@ -1081,13 +1081,13 @@ 
 				$return = self::$cached_event;
 			}
 		}
-		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ,$return))
+		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ, $return))
 		{
 			$this->clear_private_infos($return, (array)$clear_private_infos_users);
 		}
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'read'))
 		{
-			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6',True,$ids,$date,$ignore_acl,$date_format,$clear_private_infos_users,$return);
+			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6', True, $ids, $date, $ignore_acl, $date_format, $clear_private_infos_users, $return);
 		}
 		return $return;
 	}
@@ -1105,17 +1105,17 @@ 
 	 * @param array $events where the repetions get inserted
 	 * @param array $recur_exceptions with date (in Ymd) as key (and True as values), seems not to be used anymore
 	 */
-	function insert_all_recurrences($event,$_start,$end,&$events)
+	function insert_all_recurrences($event, $_start, $end, &$events)
 	{
-		if ((int) $this->debug >= 3 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences')
+		if ((int)$this->debug >= 3 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences')
 		{
-			$this->debug_message(__METHOD__.'(%1,%2,%3,&$events)',true,$event,$_start,$end);
+			$this->debug_message(__METHOD__.'(%1,%2,%3,&$events)', true, $event, $_start, $end);
 		}
 		$end_in = $end;
 
 		$start = $this->date2ts($_start);
 		$event_start_ts = $this->date2ts($event['start']);
-		$event_length = $this->date2ts($event['end']) - $event_start_ts;	// we use a constant event-length, NOT a constant end-time!
+		$event_length = $this->date2ts($event['end']) - $event_start_ts; // we use a constant event-length, NOT a constant end-time!
 
 		// if $end is before recur_enddate, use it instead
 		if (!$event['recur_enddate'] || $this->date2ts($event['recur_enddate']) > $this->date2ts($end))
@@ -1127,27 +1127,27 @@ 
 		// unset exceptions, as we need to add them as recurrence too, but marked as exception
 		unset($event['recur_exception']);
 		// loop over all recurrences and insert them, if they are after $start
-		$rrule = calendar_rrule::event2rrule($event, true);	// true = we operate in usertime, like the rest of calendar_bo
-		foreach($rrule as $time)
+		$rrule = calendar_rrule::event2rrule($event, true); // true = we operate in usertime, like the rest of calendar_bo
+		foreach ($rrule as $time)
 		{
-			$time->setUser();	// $time is in timezone of event, convert it to usertime used here
-			if (($ts = $this->date2ts($time)) < $start-$event_length)
+			$time->setUser(); // $time is in timezone of event, convert it to usertime used here
+			if (($ts = $this->date2ts($time)) < $start - $event_length)
 			{
 				//echo "<p>".$time." --> ignored as $ts < $start-$event_length</p>\n";
-				continue;	// to early or original event (returned by interator too)
+				continue; // to early or original event (returned by interator too)
 			}
 
 			$ts_end = $ts + $event_length;
 			// adjust ts_end for whole day events in case it does not fit due to
 			// spans over summer/wintertime adjusted days
-			if($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
+			if ($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
 				!($arr_end['hour'] == 23 && $arr_end['minute'] == 59 && $arr_end['second'] == 59))
 			{
 				$arr_end['hour'] = 23;
 				$arr_end['minute'] = 59;
 				$arr_end['second'] = 59;
 				$ts_end_guess = $this->date2ts($arr_end);
-				if($ts_end_guess - $ts_end > DAY_s/2)
+				if ($ts_end_guess - $ts_end > DAY_s / 2)
 				{
 					$ts_end = $ts_end_guess - DAY_s; // $ts_end_guess was one day too far in the future
 				}
@@ -1161,11 +1161,11 @@ 
 			$event['end'] = $ts_end;
 			$events[] = $event;
 		}
-		if ($this->debug && ((int) $this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences'))
+		if ($this->debug && ((int)$this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences'))
 		{
 			$event['start'] = $event_start_ts;
 			$event['end'] = $event_start_ts + $event_length;
-			$this->debug_message(__METHOD__.'(%1,start=%2,end=%3,events) events=%5',True,$event,$_start,$end_in,$events);
+			$this->debug_message(__METHOD__.'(%1,start=%2,end=%3,events) events=%5', True, $event, $_start, $end_in, $events);
 		}
 	}
 
@@ -1176,18 +1176,18 @@ 
 	 * @param array $event event to insert, it has start- and end-date of the first recurrence, not of $date_ymd
 	 * @param int|string $date_ymd of the date of the event
 	 */
-	function add_adjusted_event(&$events,$event,$date_ymd)
+	function add_adjusted_event(&$events, $event, $date_ymd)
 	{
 		$event_in = $event;
 		// calculate the new start- and end-time
 		$length_s = $this->date2ts($event['end']) - $this->date2ts($event['start']);
 		$event_start_arr = $this->date2array($event['start']);
 
-		$date_arr = $this->date2array((string) $date_ymd);
+		$date_arr = $this->date2array((string)$date_ymd);
 		$date_arr['hour'] = $event_start_arr['hour'];
 		$date_arr['minute'] = $event_start_arr['minute'];
 		$date_arr['second'] = $event_start_arr['second'];
-		unset($date_arr['raw']);	// else date2ts would use it
+		unset($date_arr['raw']); // else date2ts would use it
 		$event['start'] = $this->date2ts($date_arr);
 		$event['end'] = $event['start'] + $length_s;
 
@@ -1195,7 +1195,7 @@ 
 
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'add_adjust_event'))
 		{
-			$this->debug_message('calendar_bo::add_adjust_event(,%1,%2) as %3',True,$event_in,$date_ymd,$event);
+			$this->debug_message('calendar_bo::add_adjust_event(,%1,%2) as %3', True, $event_in, $date_ymd, $event);
 		}
 	}
 
@@ -1219,22 +1219,22 @@ 
 			{
 				$info = array(
 					'res_id'    => $uid,
-					'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
-					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
-					$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
+					'email' => $GLOBALS['egw']->accounts->id2name($uid, 'account_email'),
+					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid, 'account_firstname').' '.
+					$GLOBALS['egw']->accounts->id2name($uid, 'account_lastname')),
 					'type'  => $GLOBALS['egw']->accounts->get_type($uid),
 					'app'   => 'accounts',
 				);
 			}
 			else
 			{
-				list($info) = $this->resources[$uid[0]]['info'] ? ExecMethod($this->resources[$uid[0]]['info'],substr($uid,1)) : false;
+				list($info) = $this->resources[$uid[0]]['info'] ? ExecMethod($this->resources[$uid[0]]['info'], substr($uid, 1)) : false;
 				if ($info)
 				{
 					$info['type'] = $uid[0];
 					if (!$info['email'] && $info['responsible'])
 					{
-						$info['email'] = $GLOBALS['egw']->accounts->id2name($info['responsible'],'account_email');
+						$info['email'] = $GLOBALS['egw']->accounts->id2name($info['responsible'], 'account_email');
 					}
 					$info['app'] = $this->resources[$uid[0]]['app'];
 				}
@@ -1243,7 +1243,7 @@ 
 		}
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'resource_info'))
 		{
-			$this->debug_message('calendar_bo::resource_info(%1) = %2',True,$uid,$res_info_cache[$uid]);
+			$this->debug_message('calendar_bo::resource_info(%1) = %2', True, $uid, $res_info_cache[$uid]);
 		}
 		return $res_info_cache[$uid];
 	}
@@ -1264,7 +1264,7 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied or null if event not found
 	 */
-	function check_perms($needed,$event=0,$other=0,$date_format='ts',$date_to_read=null,$user=null)
+	function check_perms($needed, $event = 0, $other = 0, $date_format = 'ts', $date_to_read = null, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1273,13 +1273,13 @@ 
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants('calendar',true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
 		}
 
 		if ($other && !is_numeric($other))
 		{
 			$resource = $this->resource_info($other);
-			return $needed & $resource['rights'];
+			return $needed&$resource['rights'];
 		}
 		if (is_int($event) && $event == 0)
 		{
@@ -1289,15 +1289,15 @@ 
 		{
 			if (!is_array($event))
 			{
-				$event = $this->read($event,$date_to_read,true,$date_format);	// = no ACL check !!!
+				$event = $this->read($event, $date_to_read, true, $date_format); // = no ACL check !!!
 			}
 			if (!is_array($event))
 			{
 				if ($this->xmlrpc)
 				{
-					$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['not_exist'],$GLOBALS['xmlrpcstr']['not_exist']);
+					$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['not_exist'], $GLOBALS['xmlrpcstr']['not_exist']);
 				}
-				return null;	// event not found
+				return null; // event not found
 			}
 			$owner = $event['owner'];
 			$private = !$event['public'];
@@ -1305,7 +1305,7 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
+		if ($grant&~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
 
 		if (is_array($event) && ($needed == Acl::READ || $needed == self::ACL_FREEBUSY))
 		{
@@ -1314,15 +1314,15 @@ 
 			//
 			if ($event['participants'] && is_array($event['participants']))
 			{
-				foreach(array_keys($event['participants']) as $uid)
+				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid,true)))
+					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid, true)))
 					{
 						// if we are a participant, we have an implicite FREEBUSY, READ and PRIVAT grant
-						$grant |= self::ACL_FREEBUSY | Acl::READ | Acl::PRIVAT;
+						$grant |= self::ACL_FREEBUSY|Acl::READ|Acl::PRIVAT;
 						break;
 					}
-					elseif ($grants[$uid] & Acl::READ)
+					elseif ($grants[$uid]&Acl::READ)
 					{
 						// if we have a READ grant from a participant, we dont give an implicit privat grant too
 						$grant |= Acl::READ;
@@ -1341,12 +1341,12 @@ 
 		}
 		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == Acl::ADD)
 		{
-			$access = False;	// a group can't be the owner of an event
+			$access = False; // a group can't be the owner of an event
 		}
 		else
 		{
-			$access = $user == $owner || $grant & $needed
-				&& ($needed == self::ACL_FREEBUSY || !$private || $grant & Acl::PRIVAT);
+			$access = $user == $owner || $grant&$needed
+				&& ($needed == self::ACL_FREEBUSY || !$private || $grant&Acl::PRIVAT);
 		}
 		// do NOT allow users to purge deleted events, if we dont have 'userpurge' enabled
 		if ($access && $needed == Acl::DELETE && $event['deleted'] &&
@@ -1357,7 +1357,7 @@ 
 		}
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'check_perms'))
 		{
-			$this->debug_message('calendar_bo::check_perms(%1,%2,other=%3,%4,%5,user=%6)=%7',True,ACL_TYPE_IDENTIFER.$needed,$event,$other,$date_format,$date_to_read,$user,$access);
+			$this->debug_message('calendar_bo::check_perms(%1,%2,other=%3,%4,%5,user=%6)=%7', True, ACL_TYPE_IDENTIFER.$needed, $event, $other, $date_format, $date_to_read, $user, $access);
 		}
 		//error_log(__METHOD__."($needed,".array2string($event).",$other,...,$user) returning ".array2string($access));
 		return $access;
@@ -1372,9 +1372,9 @@ 
 	 *	array with keys 'second', 'minute', 'hour', 'day' or 'mday' (depricated !), 'month' and 'year'
 	 * @param boolean $user2server =False conversion between user- and server-time; default False == Off
 	 */
-	static function date2ts($date,$user2server=False)
+	static function date2ts($date, $user2server = False)
 	{
-		return $user2server ? Api\DateTime::user2server($date,'ts') : Api\DateTime::to($date,'ts');
+		return $user2server ? Api\DateTime::user2server($date, 'ts') : Api\DateTime::to($date, 'ts');
 	}
 
 	/**
@@ -1384,9 +1384,9 @@ 
 	 * @param boolean $server2user conversation between user- and server-time default False == Off
 	 * @return array with keys 'second', 'minute', 'hour', 'day', 'month', 'year', 'raw' (timestamp) and 'full' (Ymd-string)
 	 */
-	static function date2array($date,$server2user=False)
+	static function date2array($date, $server2user = False)
 	{
-		return $server2user ? Api\DateTime::server2user($date,'array') : Api\DateTime::to($date,'array');
+		return $server2user ? Api\DateTime::server2user($date, 'array') : Api\DateTime::to($date, 'array');
 	}
 
 	/**
@@ -1397,9 +1397,9 @@ 
 	 * @param string $format ='Ymd' format of the date to return, eg. 'Y-m-d\TH:i:sO' (2005-11-01T15:30:00+0100)
 	 * @return string date formatted according to $format
 	 */
-	static function date2string($date,$server2user=False,$format='Ymd')
+	static function date2string($date, $server2user = False, $format = 'Ymd')
 	{
-		return $server2user ? Api\DateTime::server2user($date,$format) : Api\DateTime::to($date,$format);
+		return $server2user ? Api\DateTime::server2user($date, $format) : Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1409,9 +1409,9 @@ 
 	 * @param string|boolean $format ='' default common_prefs[dateformat], common_prefs[timeformat], false=time only, true=date only
 	 * @return string the formated date (incl. time)
 	 */
-	static function format_date($date,$format='')
+	static function format_date($date, $format = '')
 	{
-		return Api\DateTime::to($date,$format);
+		return Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1433,7 +1433,7 @@ 
 	 * @param mixed $param a variable number of parameters, to be inserted in $msg
 	 *	arrays get serialized with print_r() !
 	 */
-	static function debug_message($msg,$backtrace=True)
+	static function debug_message($msg, $backtrace = True)
 	{
 		static $acl2string = array(
 			0               => 'ACL-UNKNOWN',
@@ -1444,22 +1444,22 @@ 
 			Acl::PRIVAT => 'ACL_PRIVATE',
 			self::ACL_FREEBUSY => 'ACL_FREEBUSY',
 		);
-		for($i = 2; $i < func_num_args(); ++$i)
+		for ($i = 2; $i < func_num_args(); ++$i)
 		{
 			$param = func_get_arg($i);
 
 			if (is_null($param))
 			{
-				$param='NULL';
+				$param = 'NULL';
 			}
 			else
 			{
-				switch(gettype($param))
+				switch (gettype($param))
 				{
 					case 'string':
-						if (substr($param,0,strlen(ACL_TYPE_IDENTIFER))== ACL_TYPE_IDENTIFER)
+						if (substr($param, 0, strlen(ACL_TYPE_IDENTIFER)) == ACL_TYPE_IDENTIFER)
 						{
-							$param = (int) substr($param,strlen(ACL_TYPE_IDENTIFER));
+							$param = (int)substr($param, strlen(ACL_TYPE_IDENTIFER));
 							$param = (isset($acl2string[$param]) ? $acl2string[$param] : $acl2string[0])." ($param)";
 						}
 						else
@@ -1482,11 +1482,11 @@ 
 						$param = $param ? 'True' : 'False';
 						break;
 					case 'integer':
-						if ($param >= mktime(0,0,0,1,1,2000)) $param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						if ($param >= mktime(0, 0, 0, 1, 1, 2000)) $param = adodb_date('Y-m-d H:i:s', $param)." ($param)";
 						break;
 				}
 			}
-			$msg = str_replace('%'.($i-1),$param,$msg);
+			$msg = str_replace('%'.($i - 1), $param, $msg);
 		}
 		error_log($msg);
 		if ($backtrace) error_log(function_backtrace(1));
@@ -1501,7 +1501,7 @@ 
 	 * @param boolean $display_day =false should a day-name prefix the date, eg. monday June 20, 2006
 	 * @return string with formated date
 	 */
-	function long_date($_first,$last=0,$display_time=false,$display_day=false)
+	function long_date($_first, $last = 0, $display_time = false, $display_day = false)
 	{
 		$first = $this->date2array($_first);
 		if ($last)
@@ -1516,27 +1516,27 @@ 
 
 		if ($display_day)
 		{
-			$range = lang(adodb_date('l',$first['raw'])).($this->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ');
+			$range = lang(adodb_date('l', $first['raw'])).($this->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ');
 		}
 		for ($i = 0; $i < 5; $i += 2)
 		{
-			switch($datefmt[$i])
+			switch ($datefmt[$i])
 			{
 				case 'd':
-					$range .= $first['day'] . ($datefmt[1] == '.' ? '.' : '');
+					$range .= $first['day'].($datefmt[1] == '.' ? '.' : '');
 					if ($first['month'] != $last['month'] || $first['year'] != $last['year'])
 					{
 						if (!$month_before_day)
 						{
-							$range .= ' '.lang(strftime('%B',$first['raw']));
+							$range .= ' '.lang(strftime('%B', $first['raw']));
 						}
 						if ($first['year'] != $last['year'] && $datefmt[0] != 'Y')
 						{
-							$range .= ($datefmt[0] != 'd' ? ', ' : ' ') . $first['year'];
+							$range .= ($datefmt[0] != 'd' ? ', ' : ' ').$first['year'];
 						}
 						if ($display_time)
 						{
-							$range .= ' '.adodb_date($timefmt,$first['raw']);
+							$range .= ' '.adodb_date($timefmt, $first['raw']);
 						}
 						if (!$last)
 						{
@@ -1546,43 +1546,43 @@ 
 
 						if ($first['year'] != $last['year'] && $datefmt[0] == 'Y')
 						{
-							$range .= $last['year'] . ', ';
+							$range .= $last['year'].', ';
 						}
 
 						if ($month_before_day)
 						{
-							$range .= lang(strftime('%B',$last['raw']));
+							$range .= lang(strftime('%B', $last['raw']));
 						}
 					}
 					else
 					{
 						if ($display_time)
 						{
-							$range .= ' '.adodb_date($timefmt,$first['raw']);
+							$range .= ' '.adodb_date($timefmt, $first['raw']);
 						}
 						$range .= ' - ';
 					}
-					$range .= ' ' . $last['day'] . ($datefmt[1] == '.' ? '.' : '');
+					$range .= ' '.$last['day'].($datefmt[1] == '.' ? '.' : '');
 					break;
 				case 'm':
 				case 'M':
-					$range .= ' '.lang(strftime('%B',$month_before_day ? $first['raw'] : $last['raw'])) . ' ';
+					$range .= ' '.lang(strftime('%B', $month_before_day ? $first['raw'] : $last['raw'])).' ';
 					break;
 				case 'Y':
 					if ($datefmt[0] != 'm')
 					{
-						$range .= ' ' . ($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
+						$range .= ' '.($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
 					}
 					break;
 			}
 		}
 		if ($display_time && $last)
 		{
-			$range .= ' '.adodb_date($timefmt,$last['raw']);
+			$range .= ' '.adodb_date($timefmt, $last['raw']);
 		}
 		if ($datefmt[4] == 'Y' && $datefmt[0] == 'm')
 		{
-			$range .= ', ' . $last['year'];
+			$range .= ', '.$last['year'];
 		}
 		return $range;
 	}
@@ -1594,25 +1594,25 @@ 
 	 * @param int $end_m end time in minutes since 0h
 	 * @param boolean $both =false display the end-time too, duration is always displayed
 	 */
-	function timespan($start_m,$end_m,$both=false)
+	function timespan($start_m, $end_m, $both = false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
-		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+		if ($end_m == 24 * 60 - 1) ++$duration;
+		$duration = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
-		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d',$start_m/60).sprintf('%02d',$start_m%60).'00', false);
+		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d', $start_m / 60).sprintf('%02d', $start_m % 60).'00', false);
 
 		if ($both)	// end-time too
 		{
-			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d',$end_m/60).sprintf('%02d',$end_m%60).'00', false);
+			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d', $end_m / 60).sprintf('%02d', $end_m % 60).'00', false);
 			// dont double am/pm if they are the same in both times
-			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
+			if ($this->common_prefs['timeformat'] == 12 && substr($timespan, -2) == substr($t, -2))
 			{
-				$timespan = str_replace($t,substr($t,0,-3),$timespan);
+				$timespan = str_replace($t, substr($t, 0, -3), $timespan);
 			}
 			$timespan .= ':';
 		}
-		return $timespan . ' ' . $duration;
+		return $timespan.' '.$duration;
 	}
 
 	/**
@@ -1623,7 +1623,7 @@ 
 	* @param boolean $append_email =false append email (Name <email>)
 	* @return string with name
 	*/
-	function participant_name($id,$use_type=false, $append_email=false)
+	function participant_name($id, $use_type = false, $append_email = false)
 	{
 		static $id2lid = array();
 		static $id2email = array();
@@ -1644,7 +1644,7 @@ 
 			else
 			{
 				$id2lid[$id] = Api\Accounts::username($id);
-				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id,'account_email');
+				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id, 'account_email');
 			}
 		}
 		return $id2lid[$id].(($append_email || $id[0] == 'e') && $id2email[$id] ? ' <'.$id2email[$id].'>' : '');
@@ -1658,37 +1658,37 @@ 
 	* @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
 	* @return array with id / names with status pairs
 	*/
-	function participants($event,$long_status=false,$show_group_invitation=false)
+	function participants($event, $long_status = false, $show_group_invitation = false)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($event['participants']));
 		$names = array();
-		foreach((array)$event['participants'] as $id => $status)
+		foreach ((array)$event['participants'] as $id => $status)
 		{
 			if (!is_string($status)) continue;
 			$quantity = $role = null;
-			calendar_so::split_status($status,$quantity,$role);
+			calendar_so::split_status($status, $quantity, $role);
 
-			if ($status == 'G' && !$show_group_invitation) continue;	// dont show group-invitation
+			if ($status == 'G' && !$show_group_invitation) continue; // dont show group-invitation
 
 			$lang_status = lang($this->verbose_status[$status]);
 			if (!$long_status)
 			{
-				switch($status[0])
+				switch ($status[0])
 				{
 					case 'A':	// accepted
-						$status = Api\Html::image('calendar','accepted',$lang_status);
+						$status = Api\Html::image('calendar', 'accepted', $lang_status);
 						break;
 					case 'R':	// rejected
-						$status = Api\Html::image('calendar','rejected',$lang_status);
+						$status = Api\Html::image('calendar', 'rejected', $lang_status);
 						break;
 					case 'T':	// tentative
-						$status = Api\Html::image('calendar','tentative',$lang_status);
+						$status = Api\Html::image('calendar', 'tentative', $lang_status);
 						break;
 					case 'U':	// no response = unknown
-						$status = Api\Html::image('calendar','needs-action',$lang_status);
+						$status = Api\Html::image('calendar', 'needs-action', $lang_status);
 						break;
 					case 'D':	// delegated
-						$status = Api\Html::image('calendar','forward',$lang_status);
+						$status = Api\Html::image('calendar', 'forward', $lang_status);
 						break;
 					case 'G':	// group invitation
 						// Todo: Image, seems not to be used
@@ -1710,13 +1710,13 @@ 
 					$role = lang($this->roles[$role]);
 				}
 				// allow to use cats as roles (beside regular iCal ones)
-				elseif (substr($role,0,6) == 'X-CAT-' && ($cat_id = (int)substr($role,6)) > 0)
+				elseif (substr($role, 0, 6) == 'X-CAT-' && ($cat_id = (int)substr($role, 6)) > 0)
 				{
 					$role = $GLOBALS['egw']->categories->id2name($cat_id);
 				}
 				else
 				{
-					$role = lang(str_replace('X-','',$role));
+					$role = lang(str_replace('X-', '', $role));
 				}
 				$names[$id] .= ' '.$role;
 			}
@@ -1733,13 +1733,13 @@ 
 	* @param int $color color of the category, if multiple cats, the color of the last one with color is returned
 	* @return array with id / names
 	*/
-	function categories($category,&$color)
+	function categories($category, &$color)
 	{
 		static $id2cat = array();
 		$cats = array();
 		$color = 0;
 
-		foreach(explode(',',$category) as $cat_id)
+		foreach (explode(',', $category) as $cat_id)
 		{
 			if (!$cat_id) continue;
 
@@ -1754,7 +1754,7 @@ 
 			{
 				$color = $cat['data']['color'];
 			}
-			elseif(preg_match('/(#[0-9A-Fa-f]{6})/', $cat['description'], $parts))
+			elseif (preg_match('/(#[0-9A-Fa-f]{6})/', $cat['description'], $parts))
 			{
 				$color = $parts[1];
 			}
@@ -1766,12 +1766,12 @@ 
 	/**
 	 *  This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4
 	 */
-	private static function _list_cals_add($id,&$users,&$groups)
+	private static function _list_cals_add($id, &$users, &$groups)
 	{
 		$name = Api\Accounts::username($id);
 		if (!($egw_name = $GLOBALS['egw']->accounts->id2name($id)))
 		{
-			return;	// do not return no longer existing accounts which eg. still mentioned in acl
+			return; // do not return no longer existing accounts which eg. still mentioned in acl
 		}
 		if (($type = $GLOBALS['egw']->accounts->get_type($id)) == 'g')
 		{
@@ -1783,7 +1783,7 @@ 
 		}
 		$arr[$id] = array(
 			'grantor' => $id,
-			'value'   => ($type == 'g' ? 'g_' : '') . $id,
+			'value'   => ($type == 'g' ? 'g_' : '').$id,
 			'name'    => $name,
 			'sname'	  => $egw_name
 		);
@@ -1805,26 +1805,26 @@ 
 	 * @param int $user account_id of user to generate list for
 	 * @param array $grants =null calendar grants from user, or null to query them from acl class
 	 */
-	public static function list_calendars($user, array $grants=null)
+	public static function list_calendars($user, array $grants = null)
 	{
 		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
 
 		$users = $groups = array();
-		foreach(array_keys($grants) as $id)
+		foreach (array_keys($grants) as $id)
 		{
-			self::_list_cals_add($id,$users,$groups);
+			self::_list_cals_add($id, $users, $groups);
 		}
 		if (($memberships = $GLOBALS['egw']->accounts->memberships($user, true)))
 		{
-			foreach($memberships as $group)
+			foreach ($memberships as $group)
 			{
-				self::_list_cals_add($group,$users,$groups);
+				self::_list_cals_add($group, $users, $groups);
 
-				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group,Acl::READ,'calendar')))
+				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group, Acl::READ, 'calendar')))
 				{
-					foreach($account_perms as $id)
+					foreach ($account_perms as $id)
 					{
-						self::_list_cals_add($id,$users,$groups);
+						self::_list_cals_add($id, $users, $groups);
 					}
 				}
 			}
@@ -1832,7 +1832,7 @@ 
 		usort($users, array(__CLASS__, 'name_cmp'));
 		usort($groups, array(__CLASS__, 'name_cmp'));
 
-		return array_merge($users, $groups);	// users first and then groups, both alphabeticaly
+		return array_merge($users, $groups); // users first and then groups, both alphabeticaly
 	}
 
 	/**
@@ -1872,9 +1872,9 @@ 
 	 *	month: numerical month
 	 *	occurence: numerical year or 0 for every year
 	 */
-	function read_holidays($year=0)
+	function read_holidays($year = 0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year) $year = (int)date('Y', $this->now_su);
 
 		if (!$this->cached_holidays)	// try reading the holidays from the session
 		{
@@ -1884,8 +1884,7 @@ 
 		{
 			$this->cached_holidays[$year] = calendar_holidays::read(
 				!empty($GLOBALS['egw_info']['server']['ical_holiday_url']) ?
-				$GLOBALS['egw_info']['server']['ical_holiday_url'] :
-				$GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
+				$GLOBALS['egw_info']['server']['ical_holiday_url'] : $GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
 
 			// search for birthdays
 			if ($GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')
@@ -1895,36 +1894,36 @@ 
 					'n_family' => "!''",
 					'bday' => "!''",
 				);
-				$bdays =& $contacts->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
-					'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter);
+				$bdays = & $contacts->search('', array('id', 'n_family', 'n_given', 'n_prefix', 'n_middle', 'bday'),
+					'contact_bday ASC', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter);
 				// search accounts too, if not stored in contacts repository
 				$extra_accounts_search = $contacts->account_repository == 'ldap' && !is_null($contacts->so_accounts) &&
 					!$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'];
-				if ($extra_accounts_search && ($bdays2 =& $contacts->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
-					'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter+array('owner' => 0))))
+				if ($extra_accounts_search && ($bdays2 = & $contacts->search('', array('id', 'n_family', 'n_given', 'n_prefix', 'n_middle', 'bday'),
+					'contact_bday ASC', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter + array('owner' => 0))))
 				{
-					$bdays = !$bdays ? $bdays2 : array_merge($bdays,$bdays2);
+					$bdays = !$bdays ? $bdays2 : array_merge($bdays, $bdays2);
 				}
 				if ($bdays)
 				{
 					// sort by month and day only
-					usort($bdays,create_function('$a,$b','return (int) $a[\'bday\'] == (int) $b[\'bday\'] ? strcmp($a[\'bday\'],$b[\'bday\']) : (int) $a[\'bday\'] - (int) $b[\'bday\'];'));
-					foreach($bdays as $pers)
+					usort($bdays, create_function('$a,$b', 'return (int) $a[\'bday\'] == (int) $b[\'bday\'] ? strcmp($a[\'bday\'],$b[\'bday\']) : (int) $a[\'bday\'] - (int) $b[\'bday\'];'));
+					foreach ($bdays as $pers)
 					{
-						if (empty($pers['bday']) || $pers['bday']=='0000-00-00 0' || $pers['bday']=='0000-00-00' || $pers['bday']=='0.0.00')
+						if (empty($pers['bday']) || $pers['bday'] == '0000-00-00 0' || $pers['bday'] == '0000-00-00' || $pers['bday'] == '0.0.00')
 						{
 							//error_log(__METHOD__.__LINE__.' Skipping entry for invalid birthday:'.array2string($pers));
 							continue;
 						}
-						list($y,$m,$d) = explode('-',$pers['bday']);
-						if ($y > $year) continue; 	// not yet born
-						$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
+						list($y, $m, $d) = explode('-', $pers['bday']);
+						if ($y > $year) continue; // not yet born
+						$this->cached_holidays[$year][sprintf('%04d%02d%02d', $year, $m, $d)][] = array(
 							'day'       => $d,
 							'month'     => $m,
 							'occurence' => 0,
 							'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
 								$pers['n_family'].($y && !$GLOBALS['egw_info']['server']['hide_birthdays'] ? ' ('.$y.')' : ''),
-							'birthyear' => $y,	// this can be used to identify birthdays from holidays
+							'birthyear' => $y, // this can be used to identify birthdays from holidays
 						);
 					}
 				}
@@ -1932,9 +1931,9 @@ 
 			// store holidays and birthdays in the session
 			Api\Cache::setSession('calendar', 'holidays', $this->cached_holidays);
 		}
-		if ((int) $this->debug >= 2 || $this->debug == 'read_holidays')
+		if ((int)$this->debug >= 2 || $this->debug == 'read_holidays')
 		{
-			$this->debug_message('calendar_bo::read_holidays(%1)=%2',true,$year,$this->cached_holidays[$year]);
+			$this->debug_message('calendar_bo::read_holidays(%1)=%2', true, $year, $this->cached_holidays[$year]);
 		}
 		return $this->cached_holidays[$year];
 	}
@@ -1945,10 +1944,10 @@ 
 	 * @param type $event
 	 * @return array array of selected calendar fields
 	 */
-	public static function get_link_options ($event = array())
+	public static function get_link_options($event = array())
 	{
-		unset($event);	// not used, but required by function signature
-		$options = array (
+		unset($event); // not used, but required by function signature
+		$options = array(
 			'end' => lang('End date'),
 			'id' => lang('ID'),
 			'owner' => lang('Event owner'),
@@ -1975,7 +1974,7 @@ 
 			list($id, $recur) = explode('-', $event, 2);
 			$event = $this->read($id, $recur);
 		}
-		else if (!is_array($event) && (int) $event > 0)
+		else if (!is_array($event) && (int)$event > 0)
 		{
 			$event = $this->read($event);
 		}
@@ -1983,7 +1982,7 @@ 
 		{
 			return $event;
 		}
-		$type = explode(',',$this->cal_prefs['link_title']);
+		$type = explode(',', $this->cal_prefs['link_title']);
 		if (is_array($type))
 		{
 			foreach ($type as &$val)
@@ -2009,10 +2008,10 @@ 
 						$extra_fields [] = $event[$val];
 				}
 			}
-			$str_fields = implode(', ',$extra_fields);
-			if (is_array($extra_fields)) return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			$str_fields = implode(', ', $extra_fields);
+			if (is_array($extra_fields)) return $this->format_date($event['start']).': '.$event['title'].($str_fields ? ', '.$str_fields : '');
 		}
-		return $this->format_date($event['start']) . ': ' . $event['title'];
+		return $this->format_date($event['start']).': '.$event['title'];
 	}
 
 	/**
@@ -2031,10 +2030,10 @@ 
 			'offset' =>	$options['start'],
 			'order' => 'cal_start DESC',
 		);
-		if($options['num_rows']) {
+		if ($options['num_rows']) {
 			$query['num_rows'] = $options['num_rows'];
 		}
-		foreach((array) $this->search($query) as $event)
+		foreach ((array)$this->search($query) as $event)
 		{
 			$result[$event['id']] = $this->link_title($event);
 		}
@@ -2051,11 +2050,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path,$user=null)
+	function file_access($id, $check, $rel_path, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_perms($check,$id,0,'ts',null,$user);
+		return $this->check_perms($check, $id, 0, 'ts', null, $user);
 	}
 
 	/**
@@ -2071,36 +2070,36 @@ 
 		}
 		Api\Cache::setSession('calendar', 'default_prefs_set', 'set');
 
-		$default_prefs =& $GLOBALS['egw']->preferences->default['calendar'];
-		$forced_prefs  =& $GLOBALS['egw']->preferences->forced['calendar'];
+		$default_prefs = & $GLOBALS['egw']->preferences->default['calendar'];
+		$forced_prefs  = & $GLOBALS['egw']->preferences->forced['calendar'];
 
-		$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
+		$subject = lang('Calendar Event').' - $$action$$: $$startdate$$ $$title$$'."\n";
 		$values = array(
-			'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
-			'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
-			'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
-			'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
-			'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
-			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
+			'notifyAdded'     => $subject.lang('You have a meeting scheduled for %1', '$$startdate$$'),
+			'notifyCanceled'  => $subject.lang('Your meeting scheduled for %1 has been canceled', '$$startdate$$'),
+			'notifyModified'  => $subject.lang('Your meeting that had been scheduled for %1 has been rescheduled to %2', '$$olddate$$', '$$startdate$$'),
+			'notifyDisinvited'=> $subject.lang('You have been disinvited from the meeting at %1', '$$startdate$$'),
+			'notifyResponse'  => $subject.lang('On %1 %2 %3 your meeting request for %4', '$$date$$', '$$fullname$$', '$$action$$', '$$startdate$$'),
+			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3', '$$title$$', '$$startdate$$', '$$location$$')."\n".lang('Here is your requested alarm.'),
 			'interval'        => 30,
 		);
-		foreach($values as $var => $default)
+		foreach ($values as $var => $default)
 		{
-			$type = substr($var,0,6) == 'notify' ? 'forced' : 'default';
+			$type = substr($var, 0, 6) == 'notify' ? 'forced' : 'default';
 
 			// only set, if neither default nor forced pref exists
 			if ((!isset($default_prefs[$var]) || (string)$default_prefs[$var] === '') && (!isset($forced_prefs[$var]) || (string)$forced_prefs[$var] === ''))
 			{
-				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');	// always store default, even if we have a forced too
-				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				$GLOBALS['egw']->preferences->add('calendar', $var, $default, 'default'); // always store default, even if we have a forced too
+				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar', $var, $default, 'forced');
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
 		}
 		if ($need_save)
 		{
-			$GLOBALS['egw']->preferences->save_repository(False,'default');
-			$GLOBALS['egw']->preferences->save_repository(False,'forced');
+			$GLOBALS['egw']->preferences->save_repository(False, 'default');
+			$GLOBALS['egw']->preferences->save_repository(False, 'forced');
 		}
 	}
 
@@ -2110,7 +2109,7 @@ 
 	 * @param int|string $user account_id or account_lid
 	 * @param string $pw =null password
 	 */
-	static function freebusy_url($user='',$pw=null)
+	static function freebusy_url($user = '', $pw = null)
 	{
 		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
 
@@ -2123,8 +2122,8 @@ 
 		elseif ($GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy'] == 2)
 		{
 			$credentials = $GLOBALS['egw_info']['user']['account_lid']
-				. ':' . $GLOBALS['egw_info']['user']['passwd'];
-			$credentials = '&cred=' . base64_encode($credentials);
+				. ':'.$GLOBALS['egw_info']['user']['passwd'];
+			$credentials = '&cred='.base64_encode($credentials);
 		}
 		return (!$GLOBALS['egw_info']['server']['webserver_url'] || $GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
 			($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
@@ -2156,11 +2155,11 @@ 
 	 * @param string &$schedule_tag=null on return schedule-tag (egw_cal.cal_id:egw_cal.cal_etag, no participant modifications!)
 	 * @return string|boolean string with etag or false
 	 */
-	function get_etag($entry, &$schedule_tag=null)
+	function get_etag($entry, &$schedule_tag = null)
 	{
 		if (!is_array($entry))
 		{
-			list($id,$recur_date) = explode(':',$entry);
+			list($id, $recur_date) = explode(':', $entry);
 			$entry = $this->read($id, $recur_date, true, 'server');
 		}
 		$etag = $schedule_tag = $entry['id'].':'.$entry['etag'];
@@ -2178,15 +2177,15 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return integer
 	 */
-	public function get_ctag($user, $filter='owner', $master_only=false)
+	public function get_ctag($user, $filter = 'owner', $master_only = false)
 	{
 		if ($this->debug > 1) $startime = microtime(true);
 
 		// resolve users to add memberships for users and members for groups
 		$users = $this->resolve_users($user);
-		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0;	// no rights, return 0 as ctag (otherwise we get SQL error!)
+		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0; // no rights, return 0 as ctag (otherwise we get SQL error!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1) error_log(__METHOD__."($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s', $ctag)." took ".(microtime(true) - $startime)." secs");
 		return $ctag;
 	}
 
@@ -2206,7 +2205,7 @@ 
 
 		$content = array(
 			'info_cat'       => $GLOBALS['egw']->categories->check_list(Acl::READ, $calendar['category']),
-			'info_priority'  => $calendar['priority'] ,
+			'info_priority'  => $calendar['priority'],
 			'info_public'    => $calendar['public'] != 'private',
 			'info_subject'   => $calendar['title'],
 			'info_des'       => $calendar['description'],
@@ -2221,7 +2220,7 @@ 
 		$content['link_app'][] = $calendar['info_link']['app'];
 		$content['link_id'][]  = $calendar['info_link']['id'];
 		// Copy claendar's links
-		foreach(Link::get_links('calendar',$calendar['id'],'','link_lastmod DESC',true) as $link)
+		foreach (Link::get_links('calendar', $calendar['id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != Link::VFS_APPNAME)
 			{
@@ -2234,7 +2233,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(Api\Storage\Customfields::get('infolog')) as $name)
+		foreach (array_keys(Api\Storage\Customfields::get('infolog')) as $name)
 		{
 			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
 		}
@@ -2252,20 +2251,20 @@ 
 	function timesheet_set($data)
 	{
 		$set = array();
-		list($id,$recurrence) = explode(':',$data['id']);
-		if ((int)$id && ($event = $this->read($id,$recurrence)))
+		list($id, $recurrence) = explode(':', $data['id']);
+		if ((int)$id && ($event = $this->read($id, $recurrence)))
 		{
 			$set['ts_start'] = $event['start'];
 			$set['ts_title'] = $this->link_title($event);
-			$set['start_time'] = Api\DateTime::to($event['start'],'H:i');
+			$set['start_time'] = Api\DateTime::to($event['start'], 'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event)) $event['end']++; // whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
-			$set['end_time'] = null;	// unset end-time
+			$set['end_time'] = null; // unset end-time
 			$set['cat_id'] = (int)$event['category'];
 
-			foreach(Link::get_links('calendar',$id,'','link_lastmod DESC',true) as $link)
+			foreach (Link::get_links('calendar', $id, '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != Link::VFS_APPNAME)
 				{