EGroupware / egroupware

addressbook/inc/class.addressbook_sql.inc.php

Doc Comments +8 added lines, -16 removed lines

@@ -60,7 +60,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param egw_db $db=null
 	 */
 	function __construct(egw_db $db=null)
 	{
@@ -244,18 +243,15 @@ 
 	 * For a union-query you call search for each query with $start=='UNION' and one more with only $order_by and $start set to run the union-query.
 	 *
 	 * @param array/string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
-	 * @param boolean/string/array $only_keys=true True returns only keys, False returns all cols. or
+	 * @param boolean/string/array $only_keys True returns only keys, False returns all cols. or
 	 *	comma seperated list or array of columns to return
 	 * @param string $order_by='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
 	 * @param string/array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard='' appended befor and after each criteria
-	 * @param boolean $empty=false False=empty criteria are ignored in query, True=empty have to be empty in row
-	 * @param string $op='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
-	 * @param mixed $start=false if != false, return only maxmatch rows begining with start, or array($start,$num), or 'UNION' for a part of a union query
-	 * @param array $filter=null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
+	 * @param array $filter if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
 	 * @param string $join='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
-	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
+	 * @param boolean $need_full_no_count If true an unlimited query is run to determine the total number of rows, default false
 	 * @return boolean/array of matching rows (the row is an array of the cols) or False
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
@@ -496,9 +492,8 @@ 
 	 *
 	 * @param array $uids array of user or group id's for $uid_column='list_owners', or values for $uid_column,
 	 * 	or whole where array: column-name => value(s) pairs
-	 * @param string $uid_column='list_owner' column-name or null to use $uids as where array
-	 * @param string $member_attr=null null: no members, 'contact_uid', 'contact_id', 'caldav_name' return members as that attribute
-	 * @param boolean|int|array $limit_in_ab=false if true only return members from the same owners addressbook,
+	 * @param string $member_attr null: no members, 'contact_uid', 'contact_id', 'caldav_name' return members as that attribute
+	 * @param boolean|int|array $limit_in_ab if true only return members from the same owners addressbook,
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
@@ -547,7 +542,6 @@ 
 	 *
 	 * @param string|array $keys list-name or array with column-name => value pairs to specify the list
 	 * @param int $owner user- or group-id
-	 * @param array $contacts=array() contacts to add (only for not yet existing lists!)
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
@@ -606,7 +600,7 @@ 
 	 *
 	 * @param int|array $contact contact_id(s)
 	 * @param int $list list-id
-	 * @param array $existing=null array of existing contact-id(s) of list, to not reread it, eg. array()
+	 * @param array $existing array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
 	function add2list($contact,$list,array $existing=null)
@@ -648,7 +642,6 @@ 
 	 * Removes one contact from distribution list(s)
 	 *
 	 * @param int|array $contact contact_id(s)
-	 * @param int $list=null list-id or null to remove from all lists
 	 * @return false on error
 	 */
 	function remove_from_list($contact,$list=null)
@@ -705,7 +698,6 @@ 
 	/**
 	 * Get ctag (max list_modified as timestamp) for lists
 	 *
-	 * @param int|array $owner=null null for all lists user has access too
 	 * @return int
 	 */
 	function lists_ctag($owner=null)
@@ -762,7 +754,7 @@ 
 	 * Saves a contact, reimplemented to check a given etag and set a uid
 	 *
 	 * @param array $keys if given $keys are copied to data before saveing => allows a save as
-	 * @param string|array $extra_where=null extra where clause, eg. to check the etag, returns 'nothing_affected' if not affected rows
+	 * @param string|array $extra_where extra where clause, eg. to check the etag, returns 'nothing_affected' if not affected rows
 	 * @return int 0 on success and errno != 0 else
 	 */
 	function save($keys = NULL, $extra_where = NULL)
@@ -823,7 +815,7 @@ 
 	 * Read data of a distribution list
 	 *
 	 * @param int $list list_id
-	 * @return array of data or false if list does not exist
+	 * @return boolean of data or false if list does not exist
 	 */
 	function read_list($list)
 	{

Indentation +3 added lines, -3 removed lines

@@ -858,9 +858,9 @@
 	}
 
 	/**
-	* Deletes custom field data
-	* Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
-	*/
+	 * Deletes custom field data
+	 * Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
+	 */
 	function delete_customfields($data)
 	{
 		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);

Spacing +115 added lines, -117 removed lines

@@ -39,7 +39,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $contacts_id='id';
+	var $contacts_id = 'id';
 
 	/**
 	 * Name of the table for distribution lists
@@ -62,10 +62,10 @@ 
 	 *
 	 * @param egw_db $db=null
 	 */
-	function __construct(egw_db $db=null)
+	function __construct(egw_db $db = null)
 	{
 		parent::__construct('phpgwapi', 'egw_addressbook', self::EXTRA_TABLE, 'contact_',
-			$extra_key='_name',$extra_value='_value',$extra_id='_id',$db);
+			$extra_key = '_name', $extra_value = '_value', $extra_id = '_id', $db);
 
 		// Get custom fields from addressbook instead of phpgwapi
 		$this->customfields = config::get_customfields('addressbook');
@@ -109,8 +109,8 @@ 
 		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
 		$advanced_search = false;
 		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
-		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		$wildcard = '%';
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard'] ? $param['wildcard'] : '');
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ((int)$filter['cat_id'])
@@ -128,7 +128,7 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int)$filter['owner']]) return false; // we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -137,11 +137,11 @@ 
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "(".$this->table_name.".contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND ".$this->table_name.".contact_owner IN (".
-					implode(',',array_keys($this->grants))."))";
+					implode(',', array_keys($this->grants))."))";
 			}
 		}
 		if ($param['searchletter'])
@@ -150,11 +150,11 @@ 
 		}
 		else
 		{
-			$filter[] = "org_name != ''";// AND org_name IS NOT NULL";
+			$filter[] = "org_name != ''"; // AND org_name IS NOT NULL";
 		}
 		$sort = $param['sort'] == 'DESC' ? 'DESC' : 'ASC';
 
-		list(,$by) = explode(',',$param['org_view']);
+		list(,$by) = explode(',', $param['org_view']);
 		if (!$by)
 		{
 			$extra = array(
@@ -167,49 +167,48 @@ 
 		else	// by adr_one_location or org_unit
 		{
 			// org total for more then one $by
-			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" :
-				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
+			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" : "COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
 			$append = "GROUP BY org_name HAVING $by_expr > 1 ORDER BY org_name $sort";
-			parent::search($param['search'],array('org_name'),$append,array(
+			parent::search($param['search'], array('org_name'), $append, array(
 				"NULL AS $by",
 				'1 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter);
 			// org by location
 			$append = "GROUP BY org_name,$by ORDER BY org_name $sort,$by $sort";
-			parent::search($param['search'],array('org_name'),$append,array(
+			parent::search($param['search'], array('org_name'), $append, array(
 				"CASE WHEN $by IS NULL THEN '' ELSE $by END AS $by",
 				'0 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter);
 			$append = "ORDER BY org_name $sort,is_main DESC,$by $sort";
 		}
-		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
-			array($param['start'],$param['num_rows']),$filter);
+		$rows = parent::search($param['search'], array('org_name'), $append, $extra, $wildcard, false, $op/*'OR'*/,
+			array($param['start'], $param['num_rows']), $filter);
 
 		if (!$rows) return false;
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
-		foreach($rows as $n => $row)
+		foreach ($rows as $n => $row)
 		{
 			if ($row['org_unit_count'] == 1 || $row['adr_one_locality_count'] == 1)
 			{
-				$filter['org_name'][$row['org_name']] = $row['org_name'];	// use as key too to have every org only once
+				$filter['org_name'][$row['org_name']] = $row['org_name']; // use as key too to have every org only once
 			}
-			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count']==1 ? $row[$by] : '|||') : '');
+			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count'] == 1 ? $row[$by] : '|||') : '');
 			$orgs[$org_key] = $row;
 		}
 		unset($rows);
 
 		if (count($filter['org_name']))
 		{
-			foreach((array) parent::search($criteria,array('org_name','org_unit','adr_one_locality'),'GROUP BY org_name,org_unit,adr_one_locality',
-				'',$wildcard,false,$op/*'AND'*/,false,$filter) as $row)
+			foreach ((array)parent::search($criteria, array('org_name', 'org_unit', 'adr_one_locality'), 'GROUP BY org_name,org_unit,adr_one_locality',
+				'', $wildcard, false, $op/*'AND'*/, false, $filter) as $row)
 			{
 				$org_key = $row['org_name'].($by ? '|||'.$row[$by] : '');
 				if ($orgs[$org_key]['org_unit_count'] == 1)
@@ -258,9 +257,9 @@ 
 	 * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false
 	 * @return boolean/array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -276,10 +275,10 @@ 
 		{
 			if ($filter['cat_id'][0] == '!')
 			{
-				$filter['cat_id'] = substr($filter['cat_id'],1);
+				$filter['cat_id'] = substr($filter['cat_id'], 1);
 				$not = 'NOT';
 			}
-			$filter[] = $this->_cat_filter((int)$filter['cat_id'],$not);
+			$filter[] = $this->_cat_filter((int)$filter['cat_id'], $not);
 			unset($filter['cat_id']);
 		}
 
@@ -288,17 +287,17 @@ 
 		{
 			// add read ACL for groupmembers (they have no
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				(!isset($filter['owner']) || in_array('0',(array)$filter['owner'])))
+				(!isset($filter['owner']) || in_array('0', (array)$filter['owner'])))
 			{
 				$groupmembers = array();
-				foreach($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $group_id)
+				foreach ($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $group_id)
 				{
-					if (($members = $GLOBALS['egw']->accounts->members($group_id,true)))
+					if (($members = $GLOBALS['egw']->accounts->members($group_id, true)))
 					{
-						$groupmembers = array_merge($groupmembers,$members);
+						$groupmembers = array_merge($groupmembers, $members);
 					}
 				}
-				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.',array(
+				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.', array(
 					'account_id' => array_unique($groupmembers),
 				));
 			}
@@ -306,34 +305,34 @@ 
 			if (isset($filter['owner']))
 			{
 				// no grants for selected owner/addressbook
-				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants))))
+				if (!($filter['owner'] = array_intersect((array)$filter['owner'], array_keys($this->grants))))
 				{
 					if (!isset($groupmember_sql)) return false;
-					$filter[] = substr($groupmember_sql,4);
+					$filter[] = substr($groupmember_sql, 4);
 					unset($filter['owner']);
 				}
 				// for an owner filter, which does NOT include current user, filter out private entries
-				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'],$filter['owner']))
+				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'], $filter['owner']))
 				{
 					$filter['private'] = 0;
 				}
 				// if multiple addressbooks (incl. current owner) are searched, we need full acl filter
-				elseif(count($filter['owner']) > 1)
+				elseif (count($filter['owner']) > 1)
 				{
 					$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 						" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-						implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+						implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 				}
 			}
 			else	// search all addressbooks, incl. accounts
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-					implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+					implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 			}
 		}
 		if (isset($filter['list']))
@@ -342,34 +341,34 @@ 
 			unset($filter['list']);
 		}
 		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)
-		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository,0,3) == 'sql' &&
-			strpos($join,$GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id',$filter))
+		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository, 0, 3) == 'sql' &&
+			strpos($join, $GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id', $filter))
 		{
 			$join .= self::ACCOUNT_ACTIVE_JOIN;
-			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), self::ACOUNT_ACTIVE_FILTER);
 		}
 		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
 		{
-			switch(gettype($only_keys))
+			switch (gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
 				case 'string':
-					$only_keys = explode(',',$only_keys);
+					$only_keys = explode(',', $only_keys);
 					// fall through
 			}
 			// postgres requires that expressions in order by appear in the columns of a distinct select
-			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",$order_by,$all_matches,PREG_SET_ORDER))
+			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui", $order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
-				foreach($all_matches as $matches)
+				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
+				foreach ($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
+					if ($column[0] == '#') continue; // order by custom field is handeled in so_sql_cf anyway
 					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
-					if (strpos($column,'.') === false)
+					if (strpos($column, '.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
 						if (isset($this->db_cols[$column]))
@@ -385,32 +384,32 @@ 
 					//_debug_array($matches);
 					if (!empty($order_by) && $table) // postgres requires explizit order by
 					{
-						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
+						$order_by = str_replace($matches[0], $table.$column.' '.$matches[2].' '.$matches[3].$matches[4], $order_by);
 					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
 
 			// Understand search by date with wildcard (????.10.??) according to user date preference
-			if(is_string($criteria) && strpos($criteria, '?') !== false)
+			if (is_string($criteria) && strpos($criteria, '?') !== false)
 			{
 				$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
 				// First, check for a 'date', with wildcards, in the user's format
-				$date_regex = str_replace(array('Y','m','d','.','-'), array('(?P<Y>(?:\?|\Q){4})','(?P<m>(?:\?|\Q){2})','(?P<d>(?:\?|\Q){2})','\.','\-'),$date_format);
-				$date_regex = str_replace('Q','d',$date_regex);
-				if(preg_match_all('$'.$date_regex.'$', $criteria, $matches))
+				$date_regex = str_replace(array('Y', 'm', 'd', '.', '-'), array('(?P<Y>(?:\?|\Q){4})', '(?P<m>(?:\?|\Q){2})', '(?P<d>(?:\?|\Q){2})', '\.', '\-'), $date_format);
+				$date_regex = str_replace('Q', 'd', $date_regex);
+				if (preg_match_all('$'.$date_regex.'$', $criteria, $matches))
 				{
-					foreach($matches[0] as $m_id => $match)
+					foreach ($matches[0] as $m_id => $match)
 					{
 						// Birthday is Y-m-d
-						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*",$criteria);
+						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*", $criteria);
 					}
 				}
 			}
 		}
-		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		$rows = & parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0; // so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -422,18 +421,18 @@ 
 	 * @param int $cat_id
 	 * @return string sql to filter by given cat
 	 */
-	function _cat_filter($cat_id, $not='')
+	function _cat_filter($cat_id, $not = '')
 	{
 		if (!is_object($GLOBALS['egw']->categories))
 		{
 			$GLOBALS['egw']->categories = CreateObject('phpgwapi.categories');
 		}
-		foreach($GLOBALS['egw']->categories->return_all_children((int)$cat_id) as $cat)
+		foreach ($GLOBALS['egw']->categories->return_all_children((int)$cat_id) as $cat)
 		{
-			$cat_filter[] = $this->db->concat("','",cat_id,"','")." $not LIKE '%,$cat,%'";
+			$cat_filter[] = $this->db->concat("','", cat_id, "','")." $not LIKE '%,$cat,%'";
 		}
-		$cfilter = '('.implode(' OR ',$cat_filter).')';
-		if(!empty($not))
+		$cfilter = '('.implode(' OR ', $cat_filter).')';
+		if (!empty($not))
 		{
 			$cfilter = "( $cfilter OR cat_id IS NULL )";
 		}
@@ -450,9 +449,9 @@ 
 	function _cat_search($cats)
 	{
 		$cat_filter = array();
-		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
+		foreach (is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',', $cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','", cat_id, "','")." LIKE '%,$cat,%'";
 		}
 		return $cat_filter;
 	}
@@ -463,32 +462,32 @@ 
 	 * @param int $account_id account-id of the old owner
 	 * @param int $new_owner account-id of the new owner
 	 */
-	function change_owner($account_id,$new_owner)
+	function change_owner($account_id, $new_owner)
 	{
 		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
 		{
 			throw egw_exception_wrong_parameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
 		// contacts
-		$this->db->update($this->table_name,array(
+		$this->db->update($this->table_name, array(
 			'contact_owner' => $new_owner,
-		),array(
+		), array(
 			'contact_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		// cfs
 		$this->db->update(self::EXTRA_TABLE, array(
 			'contact_owner' => $new_owner
-		),array(
+		), array(
 			'contact_owner' => $account_id
 		), __LINE__, __FILE__);
 
 		// lists
 		$this->db->update($this->lists_table, array(
 			'list_owner' => $new_owner,
-		),array(
+		), array(
 			'list_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -502,21 +501,21 @@ 
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
-	function get_lists($uids,$uid_column='list_owner',$member_attr=null,$limit_in_ab=false)
+	function get_lists($uids, $uid_column = 'list_owner', $member_attr = null, $limit_in_ab = false)
 	{
 		if (is_array($uids) && array_key_exists('list_id', $uids))
 		{
-			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.',array('list_id' => $uids['list_id']));
+			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.', array('list_id' => $uids['list_id']));
 			unset($uids['list_id']);
 		}
 		$lists = array();
-		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
-			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
+		foreach ($this->db->select($this->lists_table, '*', $uid_column ? array($uid_column=>$uids) : $uids, __LINE__, __FILE__,
+			false, 'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
 			if ($member_attr) $row['members'] = array();
 			$lists[$row['list_id']] = $row;
 		}
-		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
+		if ($lists && $member_attr && in_array($member_attr, array('contact_id', 'contact_uid', 'caldav_name')))
 		{
 			if ($limit_in_ab)
 			{
@@ -530,10 +529,9 @@ 
 					$in_ab_join .= "list_owner=$this->table_name.contact_owner";
 				}
 			}
-			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
+			foreach ($this->db->select($this->ab2list_table, "$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
-				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				__LINE__, __FILE__, false, $member_attr == 'contact_id' ? '' : '', false, 0, "JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}
@@ -551,7 +549,7 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
 		if (!$keys && !$data || !(int)$owner) return false;
@@ -565,7 +563,7 @@ 
 		{
 			$data['list_owner'] = $owner;
 		}
-		if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn()))
+		if (!$keys || !($list_id = $this->db->select($this->lists_table, 'list_id', $keys, __LINE__, __FILE__)->fetchColumn()))
 		{
 			$data['list_created'] = time();
 			$data['list_creator'] = $GLOBALS['egw_info']['user']['account_id'];
@@ -578,9 +576,9 @@ 
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		if (!$data['list_id']) unset($data['list_id']);
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table, $data, $keys, __LINE__, __FILE__)) return false;
 
-		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
+		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table, 'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
 		{
 			$update = array();
@@ -592,9 +590,9 @@ 
 			{
 				$update['list_carddav_name'] = $data['list_carddav_name'] = $data['list_uid'].'.vcf';
 			}
-			$this->db->update($this->lists_table,$update,array('list_id'=>$list_id),__LINE__,__FILE__);
+			$this->db->update($this->lists_table, $update, array('list_id'=>$list_id), __LINE__, __FILE__);
 
-			$this->add2list($list_id,$contacts,array());
+			$this->add2list($list_id, $contacts, array());
 		}
 		if ($keys) $data += $keys;
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
@@ -609,39 +607,39 @@ 
 	 * @param array $existing=null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
 		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
 
 		if (!is_array($existing))
 		{
 			$existing = array();
-			foreach($this->db->select($this->ab2list_table,'contact_id',array('list_id'=>$list),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'contact_id', array('list_id'=>$list), __LINE__, __FILE__) as $row)
 			{
 				$existing[] = $row['contact_id'];
 			}
 		}
-		if (!($to_add = array_diff((array)$contact,$existing)))
+		if (!($to_add = array_diff((array)$contact, $existing)))
 		{
-			return true;	// no need to insert it, would give sql error
+			return true; // no need to insert it, would give sql error
 		}
-		foreach($to_add as $contact)
+		foreach ($to_add as $contact)
 		{
-			$this->db->insert($this->ab2list_table,array(
+			$this->db->insert($this->ab2list_table, array(
 				'contact_id' => $contact,
 				'list_id' => $list,
 				'list_added' => time(),
 				'list_added_by' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(),__LINE__,__FILE__);
+			), array(), __LINE__, __FILE__);
 		}
 		// update etag
-		return $this->db->update($this->lists_table,array(
+		return $this->db->update($this->lists_table, array(
 			'list_etag=list_etag+1',
 			'list_modified' => time(),
 			'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-		),array(
+		), array(
 			'list_id' => $list,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -651,7 +649,7 @@ 
 	 * @param int $list=null list-id or null to remove from all lists
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
 		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
 
@@ -665,24 +663,24 @@ 
 		else
 		{
 			$list = array();
-			foreach($this->db->select($this->ab2list_table,'list_id',$where,__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'list_id', $where, __LINE__, __FILE__) as $row)
 			{
 				$list[] = $row['list_id'];
 			}
 		}
-		if (!$this->db->delete($this->ab2list_table,$where,__LINE__,__FILE__))
+		if (!$this->db->delete($this->ab2list_table, $where, __LINE__, __FILE__))
 		{
 			return false;
 		}
-		foreach((array)$list as $list_id)
+		foreach ((array)$list as $list_id)
 		{
-			$this->db->update($this->lists_table,array(
+			$this->db->update($this->lists_table, array(
 				'list_etag=list_etag+1',
 				'list_modified' => time(),
 				'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(
+			), array(
 				'list_id' => $list_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		return true;
 	}
@@ -695,9 +693,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table, array('list_id' => $list), __LINE__, __FILE__)) return false;
 
-		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
+		$this->db->delete($this->ab2list_table, array('list_id' => $list), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -708,12 +706,12 @@ 
 	 * @param int|array $owner=null null for all lists user has access too
 	 * @return int
 	 */
-	function lists_ctag($owner=null)
+	function lists_ctag($owner = null)
 	{
 		if (is_null($owner)) $owner = array_keys($this->grants);
 
-		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
-			__LINE__,__FILE__)->fetchColumn()))
+		if (!($modified = $this->db->select($this->lists_table, 'MAX(list_modified)', array('list_owner'=>$owner),
+			__LINE__, __FILE__)->fetchColumn()))
 		{
 			return 0;
 		}
@@ -728,7 +726,7 @@ 
 	 * @param string $join
 	 * @return array|boolean
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -741,11 +739,11 @@ 
 			$keys = array('uid' => $keys);
 		}
 		try {
-			$contact = parent::read($keys,$extra_cols,$join);
+			$contact = parent::read($keys, $extra_cols, $join);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(egw_exception_db $e) {
+		catch (egw_exception_db $e) {
 			_egw_log_exception($e);
 			return false;
 		}
@@ -753,7 +751,7 @@ 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
 				|| strlen($contact['uid']) < $minimum_uid_length)) {
-			parent::update(array('uid' => common::generate_uid('addressbook',$contact['id'])));
+			parent::update(array('uid' => common::generate_uid('addressbook', $contact['id'])));
 		}
 		return $contact;
 	}
@@ -781,9 +779,9 @@ 
 		{
 			$etag = $this->data['etag'];
 			unset($this->data['etag']);
-			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
+			if (!($err = parent::save(array('contact_etag=contact_etag+1'), array('contact_etag' => $etag))))
 			{
-				$this->data['etag'] = $etag+1;
+				$this->data['etag'] = $etag + 1;
 			}
 			else
 			{
@@ -803,7 +801,7 @@ 
 		// enforce a minium uid strength
 		if (!isset($this->data['uid']) || strlen($this->data['uid']) < $minimum_uid_length)
 		{
-			$update['uid'] = common::generate_uid('addressbook',$this->data['id']);
+			$update['uid'] = common::generate_uid('addressbook', $this->data['id']);
 			//echo "<p>set uid={$this->data['uid']}, etag={$this->data['etag']}</p>";
 		}
 		// set carddav_name, if not given by caller
@@ -829,7 +827,7 @@ 
 	{
 		if (!$list) return false;
 
-		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
+		return $this->db->select($this->lists_table, '*', array('list_id'=>$list), __LINE__, __FILE__)->fetch();
 	}
 
 	/**
@@ -850,6 +848,6 @@ 
 	*/
 	function delete_customfields($data)
 	{
-		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);
+		$this->db->delete($this->extra_table, $data, __LINE__, __FILE__);
 	}
 }

Braces +127 added lines, -33 removed lines

@@ -111,11 +111,20 @@ 
 	{
 		$filter = is_array($param['col_filter']) ? $param['col_filter'] : array();
 		$op = 'OR';
-		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
+		if (isset($param['op']) && !empty($param['op']))
+		{
+			$op = $param['op'];
+		}
 		$advanced_search = false;
-		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
+		if (isset($param['advanced_search']) && !empty($param['advanced_search']))
+		{
+			$advanced_search = true;
+		}
 		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard'])))
+		{
+			$wildcard = ($param['wildcard']?$param['wildcard']:'');
+		}
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ((int)$filter['cat_id'])
@@ -133,7 +142,11 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int) $filter['owner']])
+				{
+					return false;
+				}
+				// we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -196,7 +209,10 @@ 
 		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
 			array($param['start'],$param['num_rows']),$filter);
 
-		if (!$rows) return false;
+		if (!$rows)
+		{
+			return false;
+		}
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
@@ -266,7 +282,10 @@ 
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		}
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -314,7 +333,10 @@ 
 				// no grants for selected owner/addressbook
 				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants))))
 				{
-					if (!isset($groupmember_sql)) return false;
+					if (!isset($groupmember_sql))
+					{
+						return false;
+					}
 					$filter[] = substr($groupmember_sql,4);
 					unset($filter['owner']);
 				}
@@ -354,13 +376,16 @@ 
 			$join .= self::ACCOUNT_ACTIVE_JOIN;
 			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
 		}
-		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
+		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))
+		{
+			// search also adds a join for custom fields!
 		{
 			switch(gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
+		}
 				case 'string':
 					$only_keys = explode(',',$only_keys);
 					// fall through
@@ -370,13 +395,23 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				if (!is_array($extra_cols))
+				{
+					$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				}
 				foreach($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
-					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
+					if ($column[0] == '#')
+					{
+						continue;
+					}
+					// order by custom field is handeled in so_sql_cf anyway
+					if (($key = array_search($column, $this->db_cols)) !== false)
+					{
+						$column = $key;
+					}
 					if (strpos($column,'.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
@@ -391,10 +426,13 @@ 
 					}
 					$extra_cols[] = $table.$column.' '.$matches[2];
 					//_debug_array($matches);
-					if (!empty($order_by) && $table) // postgres requires explizit order by
+					if (!empty($order_by) && $table)
+					{
+						// postgres requires explizit order by
 					{
 						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
 					}
+					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
@@ -420,7 +458,11 @@ 
 		}
 		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false)
+		{
+			$this->total = is_array($rows) ? count($rows) : 0;
+		}
+		// so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -462,7 +504,10 @@ 
 		$cat_filter = array();
 		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat))
+			{
+				$cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			}
 		}
 		return $cat_filter;
 	}
@@ -475,10 +520,13 @@ 
 	 */
 	function change_owner($account_id,$new_owner)
 	{
-		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
+		if (!$new_owner)
+		{
+			// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
+		}
 		// contacts
 		$this->db->update($this->table_name,array(
 			'contact_owner' => $new_owner,
@@ -523,7 +571,10 @@ 
 		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
 			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
-			if ($member_attr) $row['members'] = array();
+			if ($member_attr)
+			{
+				$row['members'] = array();
+			}
 			$lists[$row['list_id']] = $row;
 		}
 		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
@@ -564,9 +615,15 @@ 
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
-		if (!$keys && !$data || !(int)$owner) return false;
+		if (!$keys && !$data || !(int)$owner)
+		{
+			return false;
+		}
 
-		if ($keys && !is_array($keys)) $keys = array('list_name' => $keys);
+		if ($keys && !is_array($keys))
+		{
+			$keys = array('list_name' => $keys);
+		}
 		if ($keys)
 		{
 			$keys['list_owner'] = $owner;
@@ -586,9 +643,15 @@ 
 		}
 		$data['list_modified'] = time();
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
-		if (!$data['list_id']) unset($data['list_id']);
+		if (!$data['list_id'])
+		{
+			unset($data['list_id']);
+		}
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
@@ -606,7 +669,10 @@ 
 
 			$this->add2list($list_id,$contacts,array());
 		}
-		if ($keys) $data += $keys;
+		if ($keys)
+		{
+			$data += $keys;
+		}
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
 		return $list_id;
 	}
@@ -621,7 +687,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		if (!is_array($existing))
 		{
@@ -663,7 +732,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		$where = array(
 			'contact_id' => $contact,
@@ -705,7 +777,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
 
@@ -720,7 +795,10 @@ 
 	 */
 	function lists_ctag($owner=null)
 	{
-		if (is_null($owner)) $owner = array_keys($this->grants);
+		if (is_null($owner))
+		{
+			$owner = array_keys($this->grants);
+		}
 
 		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
 			__LINE__,__FILE__)->fetchColumn()))
@@ -740,9 +818,12 @@ 
 	 */
 	function read($keys,$extra_cols='',$join='')
 	{
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
@@ -762,7 +843,8 @@ 
 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
-				|| strlen($contact['uid']) < $minimum_uid_length)) {
+				|| strlen($contact['uid']) < $minimum_uid_length))
+		{
 			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
 		}
 		return $contact;
@@ -779,19 +861,28 @@ 
 	{
 		unset($extra_where);	// not used, but required by function signature
 
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		$new_entry = !$this->data['id'];
 
-		if (isset($this->data['etag']))		// do we have an etag in the data to write
+		if (isset($this->data['etag']))
+		{
+			// do we have an etag in the data to write
 		{
 			$etag = $this->data['etag'];
+		}
 			unset($this->data['etag']);
 			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
 			{
@@ -839,7 +930,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!$list) return false;
+		if (!$list)
+		{
+			return false;
+		}
 
 		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
 	}

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

@@ -543,7 +543,7 @@
 			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
 				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				'',false,0,"join $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}

addressbook/inc/class.addressbook_tracking.inc.php

Doc Comments +3 added lines, -9 removed lines

@@ -93,12 +93,7 @@ 
 	/**
 	 * Get a notification-config value
 	 *
-	 * @param string $what
-	 * 	- 'copy' array of email addresses notifications should be copied too, can depend on $data
-	 *  - 'lang' string lang code for copy mail
-	 *  - 'sender' string send email address
 	 * @param array $data current entry
-	 * @param array $old=null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
 	function get_config($name,$data,$old=null)
@@ -134,9 +129,8 @@ 
 	 *
 	 * @internal use only track($data,$old)
 	 * @param array $data current entry
-	 * @param array $old=null old/last state of the entry or null for a new entry
-	 * @param boolean $deleted=null can be set to true to let the tracking know the item got deleted or undelted
-	 * @param array $changed_fields=null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
+	 * @param boolean $deleted can be set to true to let the tracking know the item got deleted or undelted
+	 * @param array $changed_fields changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
 	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
@@ -196,7 +190,7 @@ 
 	 *
 	 * @param array $data
 	 * @param array $old
-	 * @param boolean $deleted=null can be set to true to let the tracking know the item got deleted or undelted
+	 * @param boolean $deleted can be set to true to let the tracking know the item got deleted or undelted
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */

Spacing +20 added lines, -20 removed lines

@@ -101,16 +101,16 @@ 
 	 * @param array $old=null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
 		//echo "<p>addressbook_tracking::get_config($name,".print_r($data,true).",...)</p>\n";
-		switch($name)
+		switch ($name)
 		{
 			case 'copy':
 				if ($data['is_contactform'])
 				{
-					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					$copy = preg_split('/, ?/', $data['email_contactform']);
+					if ($data['email_copytoreceiver']) $copy[] = $data['email'];
 					return $copy;
 				}
 				break;
@@ -139,27 +139,27 @@ 
 	 * @param array $changed_fields=null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 		}
 		if (!$changed_fields) return 0;
 
-		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
+		foreach (array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
 			// Only codes involved, but old text name is automatically added when loaded
-			if($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
+			if ($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
 			{
 				unset($changed_fields[$key]);
 				continue;
 			}
 
 			// Code and a text name
-			if(in_array($name, $changed_fields) && in_array($code, $changed_fields))
+			if (in_array($name, $changed_fields) && in_array($code, $changed_fields))
 			{
-				if($data[$code])
+				if ($data[$code])
 				{
 					$data[$name] = $GLOBALS['egw']->country->get_full_name($data[$code], true);
 				}
@@ -167,7 +167,7 @@ 
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' ChangedFields:'.array2string($changed_fields));
-		return parent::save_history($data,$old,$deleted,$changed_fields);
+		return parent::save_history($data, $old, $deleted, $changed_fields);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
 		if (!$data['modified'] || !$old)
 		{
@@ -200,7 +200,7 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
 		if ($data['is_contactform'])
 		{
@@ -216,13 +216,13 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
 			if (!$data[$name] && $name != 'owner') continue;
 
-			switch($name)
+			switch ($name)
 			{
 				case 'n_prefix': case 'n_given': case 'n_middle': case 'n_family': case 'n_suffix':	// already in n_fn
 				case 'n_fileas': case 'id': case 'tid':
@@ -236,10 +236,10 @@ 
 				case 'bday':
 					if ($data[$name])
 					{
-						list($y,$m,$d) = explode('-',$data[$name]);
+						list($y, $m, $d) = explode('-', $data[$name]);
 						$details[$name] = array(
 							'label' => $label,
-							'value' => common::dateformatorder($y,$m,$d,true),
+							'value' => common::dateformatorder($y, $m, $d, true),
 						);
 					}
 					break;
@@ -253,13 +253,13 @@ 
 					if ($data[$name])
 					{
 						$cats = array();
-						foreach(is_array($data[$name]) ? $data[$name] : explode(',',$data[$name]) as $cat_id)
+						foreach (is_array($data[$name]) ? $data[$name] : explode(',', $data[$name]) as $cat_id)
 						{
 							$cats[] = $GLOBALS['egw']->cats->id2name($cat_id);
 						}
 						$details[$name] = array(
 							'label' => $label,
-							'value' => explode(', ',$cats),
+							'value' => explode(', ', $cats),
 						);
 					}
 				case 'note':

Braces +12 added lines, -3 removed lines

@@ -116,7 +116,10 @@ 
 				if ($data['is_contactform'])
 				{
 					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					if  ($data['email_copytoreceiver'])
+					{
+						$copy[] = $data['email'];
+					}
 					return $copy;
 				}
 				break;
@@ -150,7 +153,10 @@ 
 		{
 			$changed_fields = self::changed_fields($data,$old);
 		}
-		if (!$changed_fields) return 0;
+		if (!$changed_fields)
+		{
+			return 0;
+		}
 
 		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
@@ -231,7 +237,10 @@ 
 
 		foreach($this->contacts->contact_fields as $name => $label)
 		{
-			if (!$data[$name] && $name != 'owner') continue;
+			if (!$data[$name] && $name != 'owner')
+			{
+				continue;
+			}
 
 			switch($name)
 			{

admin/admin-cli.php

Doc Comments +5 added lines, -6 removed lines

@@ -299,8 +299,8 @@ 
 /**
  * Give a usage message and exit
  *
- * @param string $action=null
- * @param int $ret=0 exit-code
+ * @param string $action
+ * @param int $ret exit-code
  */
 function usage($action=null,$ret=0)
 {
@@ -404,7 +404,7 @@ 
  * Edit or add a user to EGroupware. If you specify groups, they *replace* the exiting memberships!
  *                    1:                     2:             3:                         4:         5:        6:       7:    8:                                         9:                                 10:                            11:                                  12
  * @param array $args admin-account[@domain],admin-password,account[=new-account-name],first-name,last-name,password,email,expires{never(default)|YYYY-MM-DD|already},can-change-pw{true(default)|false},anon-user{true|false(default)},primary-group{Default(default)|...}[,groups,...][,homedirectory,loginshell]
- * @param boolean $run_addaccount_hook=null default run hook depending on account existence, true=allways run addaccount hook
+ * @param boolean $run_addaccount_hook default run hook depending on account existence, true=allways run addaccount hook
  */
 function do_edit_user($args,$run_addaccount_hook=null)
 {
@@ -453,8 +453,8 @@ 
  * Delete a given acount from eGW
  *
  * @param int/string $account account-name of -id
- * @param int/string $new_user=0 for users only: account to move the entries too
- * @param boolean $is_user=true are we called for a user or group
+ * @param int/string $new_user for users only: account to move the entries too
+ * @param boolean $is_user are we called for a user or group
  * @return int 0 on success, 2-4 otherwise (see source)
  */
 function do_delete_account($account,$new_user=0,$is_user=true)
@@ -523,7 +523,6 @@ 
 /**
  * Read the IMAP ACLs
  *
- * @param array $args admin-account[@domain],admin-password,accout_lid[,pw]
  * @return int 0 on success
  */
 function do_subscribe_other($account_lid,$pw=null)

Spacing +76 added lines, -76 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling admin-cli as web-page
 {
@@ -29,39 +29,39 @@ 
 }
 
 // allow to specify instance by using a username with appended @domain-name
-$arg0s = explode(',',@array_shift($arguments));
-@list($user,$domain) = explode('@',$arg0s[0]);
-load_egw($user,$arg0s[1],$domain);
+$arg0s = explode(',', @array_shift($arguments));
+@list($user, $domain) = explode('@', $arg0s[0]);
+load_egw($user, $arg0s[1], $domain);
 
-switch($action)
+switch ($action)
 {
 	case '--edit-user':
 		return do_edit_user($arg0s);
 
 	case '--add-user':	// like --edit-account, but always runs addaccount hook
-		return do_edit_user($arg0s,true);
+		return do_edit_user($arg0s, true);
 
 	case '--change-pw':
 		return do_change_pw($arg0s);
 
 	case '--delete-user':
-		return do_delete_account($arg0s[2],$arg0s[3]);
+		return do_delete_account($arg0s[2], $arg0s[3]);
 
 	case '--edit-group':
 		return do_edit_group($arg0s);
 
 	case '--delete-group':
-		return do_delete_account($arg0s[2],0,false);
+		return do_delete_account($arg0s[2], 0, false);
 
 	case '--allow-app':
 	case '--deny-app':
-		return do_account_app($arg0s,$action == '--allow-app');
+		return do_account_app($arg0s, $action == '--allow-app');
 
 	case '--change-account-id':
 		return do_change_account_id($arg0s);
 
 	case '--subscribe-other':
-		return do_subscribe_other($arg0s[2],$arg0s[3]);
+		return do_subscribe_other($arg0s[2], $arg0s[3]);
 
 	case '--check-acl';
 		return do_check_acl();
@@ -74,21 +74,21 @@ 
 
 	default:
 		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
+		if (substr($action, 0, 2) == '--' && class_exists($class = str_replace('-', '_', substr($action, 2))) &&
+			is_subclass_of($class, 'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 		{
 			$args = array();
-			$args['domain'] = array_shift($arg0s);	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arg0s as $arg)
+			$args['domain'] = array_shift($arg0s); // domain must be first argument, to ensure right domain get's selected in header-include
+			foreach ($arg0s as $arg)
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				list($name, $value) = explode('=', $arg, 2);
+				if (property_exists('admin_cmd', $name))		// dont allow to overwrite admin_cmd properties
 				{
-					throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90);
+					throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!", $arg), 90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				if (substr($name, -1) == ']')	// allow 1-dim. arrays
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
+					list($name, $sub) = explode('[', substr($name, 0, -1), 2);
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -112,12 +112,12 @@ 
  */
 function run_command(admin_cmd $cmd)
 {
-	global $arguments,$user,$arg0s,$domain;
+	global $arguments, $user, $arg0s, $domain;
 
 	$skip_checks = false;
 	while ($arguments && ($extra = array_shift($arguments)))
 	{
-		switch($extra)
+		switch ($extra)
 		{
 			case '--schedule':	// schedule the command instead of running it directly
 				$time = admin_cmd::parse_date(array_shift($arguments));
@@ -147,15 +147,15 @@ 
 			case '--header-access':
 				if ($cmd instanceof setup_cmd)
 				{
-					list($user,$pw) = explode(',',array_shift($arguments),2);
-					$cmd->set_header_secret($user,$pw);
+					list($user, $pw) = explode(',', array_shift($arguments), 2);
+					$cmd->set_header_secret($user, $pw);
 				}
 				break;
 
 			default:
 				//fail(99,lang('Unknown option %1',$extra);
-				echo lang('Unknown option %1',$extra)."\n\n";
-				usage('',99);
+				echo lang('Unknown option %1', $extra)."\n\n";
+				usage('', 99);
 				break;
 		}
 	}
@@ -174,7 +174,7 @@ 
 		{
 			$url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache';
 			if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
-			$data = file_get_contents($url, false, egw_framework::proxy_context($user,$arg0s[1]));
+			$data = file_get_contents($url, false, egw_framework::proxy_context($user, $arg0s[1]));
 			//error_log("file_get_contents('$url') returned ".array2string($data));
 			if ($data && strpos($data, '"success"') !== false)
 			{
@@ -213,13 +213,13 @@ 
 	{
 		//fail(1,lang("Wrong admin-account or -password !!!"));
 		echo lang("Wrong admin-account or -password !!!")."\n\n";
-		usage('',1);
+		usage('', 1);
 	}
 	if (!$GLOBALS['egw_info']['user']['apps']['admin'])	// will be tested by the header too, but whould give html error-message
 	{
 		//fail(2,lang("Permission denied !!!"));
 		echo lang("Permission denied !!!")."\n\n";
-		usage('',2);
+		usage('', 2);
 	}
 	return $sessionid;
 }
@@ -231,7 +231,7 @@ 
  * @param string $passwd
  * @param string $domain
  */
-function load_egw($user,$passwd,$domain='default')
+function load_egw($user, $passwd, $domain = 'default')
 {
 	//echo "load_egw($user,$passwd,$domain)\n";
 	$_REQUEST['domain'] = $domain;
@@ -243,7 +243,7 @@ 
 
 	if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 	{
-		ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+		ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 	}
 
 	$GLOBALS['egw_info'] = array(
@@ -255,7 +255,7 @@ 
 		)
 	);
 
-	if (substr($user,0,5) != 'root_')
+	if (substr($user, 0, 5) != 'root_')
 	{
 		include('../header.inc.php');
 	}
@@ -265,9 +265,9 @@ 
 		include('../header.inc.php');
 
 		if ($user == 'root_'.$GLOBALS['egw_info']['server']['header_admin_user'] &&
-			_check_pw($GLOBALS['egw_info']['server']['header_admin_password'],$passwd) ||
+			_check_pw($GLOBALS['egw_info']['server']['header_admin_password'], $passwd) ||
 			$user == 'root_'.$GLOBALS['egw_domain'][$_GET['domain']]['config_user'] &&
-			_check_pw($GLOBALS['egw_domain'][$_GET['domain']]['config_passwd'],$passwd))
+			_check_pw($GLOBALS['egw_domain'][$_GET['domain']]['config_passwd'], $passwd))
 		{
 			echo "\nRoot access granted!\n";
 			egw_vfs::$is_root = true;
@@ -286,10 +286,10 @@ 
  * @param string $pw
  * @return boolean
  */
-function _check_pw($hash_or_cleartext,$pw)
+function _check_pw($hash_or_cleartext, $pw)
 {
 	//echo "_check_pw($hash_or_cleartext,$pw) md5=".md5($pw)."\n";
-	if (preg_match('/^[0-9a-f]{32}$/',$hash_or_cleartext))
+	if (preg_match('/^[0-9a-f]{32}$/', $hash_or_cleartext))
 	{
 		return $hash_or_cleartext == md5($pw);
 	}
@@ -302,7 +302,7 @@ 
  * @param string $action=null
  * @param int $ret=0 exit-code
  */
-function usage($action=null,$ret=0)
+function usage($action = null, $ret = 0)
 {
 	$cmd = basename($_SERVER['argv'][0]);
 	echo "Usage: $cmd --command admin-account[@domain],admin-password,options,... [--schedule {YYYY-mm-dd|+1 week|+5 days}] [--requested 'Name <email>'] [--comment 'comment ...'] [--remote {id|name}] [--skip-checks] [--dry-run]\n\n";
@@ -344,14 +344,14 @@ 
  * @param boolean $allow true=allow, false=deny
  * @return int 0 on success
  */
-function do_account_app($args,$allow)
+function do_account_app($args, $allow)
 {
-	array_shift($args);	// admin-account
-	array_shift($args);	// admin-pw
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
 	$account = array_shift($args);
 
 	include_once(EGW_INCLUDE_ROOT.'/admin/inc/class.admin_cmd_account_app.inc.php');
-	run_command(new admin_cmd_account_app($allow,$account,$args));
+	run_command(new admin_cmd_account_app($allow, $account, $args));
 }
 
 /**
@@ -361,9 +361,9 @@ 
  */
 function do_edit_group($args)
 {
-	array_shift($args);	// admin-account
-	array_shift($args);	// admin-pw
-	list($account,$new_account_name) = explode('=',array_shift($args));	// account[=new-account-name]
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
+	list($account, $new_account_name) = explode('=', array_shift($args)); // account[=new-account-name]
 
 	$data = array(
 		'account_lid' => $new_account_name,
@@ -371,9 +371,9 @@ 
 		'account_members' => $args,
 	);
 	try {
-		admin_cmd::parse_account($account,false);
+		admin_cmd::parse_account($account, false);
 
-		foreach($data as $name => &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach ($data as $name => &$value)	// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
@@ -382,7 +382,7 @@ 
 		$data['account_lid'] = $account;
 		$account = false;
 	};
-	run_command(new admin_cmd_edit_group($account,$data));
+	run_command(new admin_cmd_edit_group($account, $data));
 }
 
 /**
@@ -392,12 +392,12 @@ 
  */
 function do_change_pw($args)
 {
-	array_shift($args);     // admin-account
-	array_shift($args);     // admin-pw
-	$account = array_shift($args);	// account
-	$password = array_shift($args);	// pw
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
+	$account = array_shift($args); // account
+	$password = array_shift($args); // pw
 
-	run_command(new admin_cmd_change_pw($account,$password));
+	run_command(new admin_cmd_change_pw($account, $password));
 }
 
 /**
@@ -406,18 +406,18 @@ 
  * @param array $args admin-account[@domain],admin-password,account[=new-account-name],first-name,last-name,password,email,expires{never(default)|YYYY-MM-DD|already},can-change-pw{true(default)|false},anon-user{true|false(default)},primary-group{Default(default)|...}[,groups,...][,homedirectory,loginshell]
  * @param boolean $run_addaccount_hook=null default run hook depending on account existence, true=allways run addaccount hook
  */
-function do_edit_user($args,$run_addaccount_hook=null)
+function do_edit_user($args, $run_addaccount_hook = null)
 {
-	array_shift($args);	// admin-account
-	array_shift($args);	// admin-pw
-	list($account,$new_account_name) = explode('=',array_shift($args));	// account[=new-account-name]
+	array_shift($args); // admin-account
+	array_shift($args); // admin-pw
+	list($account, $new_account_name) = explode('=', array_shift($args)); // account[=new-account-name]
 
 	$data = array();
 	// do we need to support ldap only attributes: homedirectory and loginshell
 	if (($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' ||
 		 empty($GLOBALS['egw_info']['server']['account_repository']) && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap') &&
-		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 &&	// 9 = primary group
-		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')	// last argument start with a slash
+		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 && // 9 = primary group
+		($last_arg = array_pop($dummy = $args)) && $last_arg[0] == '/')	// last argument start with a slash
 	{
 		$data['loginshell'] = array_pop($args);
 		$data['homedirectory'] = array_pop($args);
@@ -435,9 +435,9 @@ 
 		'account_groups' => $args,
 	);
 	try {
-		admin_cmd::parse_account($account,true);
+		admin_cmd::parse_account($account, true);
 
-		foreach($data as $name => &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach ($data as $name => &$value)	// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
@@ -446,7 +446,7 @@ 
 		$data['account_lid'] = $account;
 		$account = false;
 	}
-	run_command(new admin_cmd_edit_user($account,$data,null,$run_addaccount_hook));
+	run_command(new admin_cmd_edit_user($account, $data, null, $run_addaccount_hook));
 }
 
 /**
@@ -457,9 +457,9 @@ 
  * @param boolean $is_user=true are we called for a user or group
  * @return int 0 on success, 2-4 otherwise (see source)
  */
-function do_delete_account($account,$new_user=0,$is_user=true)
+function do_delete_account($account, $new_user = 0, $is_user = true)
 {
-	run_command(new admin_cmd_delete_account($account,$new_user,$is_user));
+	run_command(new admin_cmd_delete_account($account, $new_user, $is_user));
 }
 
 /**
@@ -480,13 +480,13 @@ 
  */
 function do_change_account_id($args)
 {
-	if (count($args) < 4) usage();	// 4 means at least user,pw,from1,to1
+	if (count($args) < 4) usage(); // 4 means at least user,pw,from1,to1
 
 	$ids2change = array();
-	for($n = 2; $n < count($args); $n += 2)
+	for ($n = 2; $n < count($args); $n += 2)
 	{
 		$from = (int)$args[$n];
-		$to   = (int)$args[$n+1];
+		$to   = (int)$args[$n + 1];
 		$ids2change[$from] = $to;
 	}
 	run_command(new admin_cmd_change_account_id($ids2change));
@@ -502,21 +502,21 @@ 
  */
 function list_exit_codes()
 {
-	error_reporting(error_reporting() & ~E_NOTICE);
+	error_reporting(error_reporting()&~E_NOTICE);
 
 	$codes = array('Ok');
-	foreach(file(__FILE__) as $n => $line)
+	foreach (file(__FILE__) as $n => $line)
 	{
-		if (preg_match('/fail\(([0-9]+),(.*)\);/',$line,$matches))
+		if (preg_match('/fail\(([0-9]+),(.*)\);/', $line, $matches))
 		{
 			//echo "Line $n: $matches[1]: $matches[2]\n";
 			@eval('$codes['.$matches[1].'] = '.$matches[2].';');
 		}
 	}
-	ksort($codes,SORT_NUMERIC);
-	foreach($codes as $num => $msg)
+	ksort($codes, SORT_NUMERIC);
+	foreach ($codes as $num => $msg)
 	{
-		echo $num."\t".str_replace("\n","\n\t",$msg)."\n";
+		echo $num."\t".str_replace("\n", "\n\t", $msg)."\n";
 	}
 }
 
@@ -526,11 +526,11 @@ 
  * @param array $args admin-account[@domain],admin-password,accout_lid[,pw]
  * @return int 0 on success
  */
-function do_subscribe_other($account_lid,$pw=null)
+function do_subscribe_other($account_lid, $pw = null)
 {
 	if (!($account_id = $GLOBALS['egw']->accounts->name2id($account_lid)))
 	{
-		throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$account_lid),15);
+		throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!", $account_lid), 15);
 	}
 	$GLOBALS['egw_info']['user'] = array(
 		'account_id' => $account_id,
@@ -554,13 +554,13 @@ 
 
 	$own_mbox = 'user'.$delimiter.$account_lid;
 
-	foreach($mailboxes as $n => $mailbox)
+	foreach ($mailboxes as $n => $mailbox)
 	{
 //		if ($n < 1) continue;
 
-		if (substr($mailbox,0,5) != 'user'.$delimiter || substr($mailbox,0,strlen($own_mbox)) == $own_mbox) continue;
+		if (substr($mailbox, 0, 5) != 'user'.$delimiter || substr($mailbox, 0, strlen($own_mbox)) == $own_mbox) continue;
 
-		if (!$pw) $mailbox = str_replace('INBOX','user'.$delimiter.$account_lid,$mailbox);
+		if (!$pw) $mailbox = str_replace('INBOX', 'user'.$delimiter.$account_lid, $mailbox);
 
 /*		$rights = $icServer->getACL($mailbox);
 		echo "getACL($mailbox)\n";

Braces +45 added lines, -11 removed lines

@@ -13,10 +13,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling admin-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling admin-cli as web-page
 {
 	die('<h1>admin-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 elseif ($_SERVER['argc'] > 1)
 {
 	$arguments = $_SERVER['argv'];
@@ -82,13 +85,19 @@ 
 			foreach($arg0s as $arg)
 			{
 				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				if(property_exists('admin_cmd',$name))
+				{
+					// dont allow to overwrite admin_cmd properties
 				{
 					throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				}
+				if (substr($name,-1) == ']')
+				{
+					// allow 1-dim. arrays
 				{
 					list($name,$sub) = explode('[',substr($name,0,-1),2);
+				}
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -173,7 +182,10 @@ 
 		if (!$dry_run)
 		{
 			$url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache';
-			if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
+			if ($url[0] == '/')
+			{
+				$url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
+			}
 			$data = file_get_contents($url, false, egw_framework::proxy_context($user,$arg0s[1]));
 			//error_log("file_get_contents('$url') returned ".array2string($data));
 			if ($data && strpos($data, '"success"') !== false)
@@ -215,10 +227,13 @@ 
 		echo lang("Wrong admin-account or -password !!!")."\n\n";
 		usage('',1);
 	}
-	if (!$GLOBALS['egw_info']['user']['apps']['admin'])	// will be tested by the header too, but whould give html error-message
+	if (!$GLOBALS['egw_info']['user']['apps']['admin'])
+	{
+		// will be tested by the header too, but whould give html error-message
 	{
 		//fail(2,lang("Permission denied !!!"));
 		echo lang("Permission denied !!!")."\n\n";
+	}
 		usage('',2);
 	}
 	return $sessionid;
@@ -373,10 +388,13 @@ 
 	try {
 		admin_cmd::parse_account($account,false);
 
-		foreach($data as $name => &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach($data as $name => &$value)
+		{
+			// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
+		}
 	}
 	catch (Exception $e) {	// new group
 		$data['account_lid'] = $account;
@@ -417,9 +435,12 @@ 
 	if (($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' ||
 		 empty($GLOBALS['egw_info']['server']['account_repository']) && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap') &&
 		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 &&	// 9 = primary group
-		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')	// last argument start with a slash
+		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')
+	{
+		// last argument start with a slash
 	{
 		$data['loginshell'] = array_pop($args);
+	}
 		$data['homedirectory'] = array_pop($args);
 	}
 	$data += array(
@@ -437,10 +458,13 @@ 
 	try {
 		admin_cmd::parse_account($account,true);
 
-		foreach($data as $name => &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach($data as $name => &$value)
+		{
+			// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
+		}
 	}
 	catch (Exception $e) {	// new account
 		$data['account_lid'] = $account;
@@ -480,7 +504,11 @@ 
  */
 function do_change_account_id($args)
 {
-	if (count($args) < 4) usage();	// 4 means at least user,pw,from1,to1
+	if (count($args) < 4)
+	{
+		usage();
+	}
+	// 4 means at least user,pw,from1,to1
 
 	$ids2change = array();
 	for($n = 2; $n < count($args); $n += 2)
@@ -558,9 +586,15 @@ 
 	{
 //		if ($n < 1) continue;
 
-		if (substr($mailbox,0,5) != 'user'.$delimiter || substr($mailbox,0,strlen($own_mbox)) == $own_mbox) continue;
+		if (substr($mailbox,0,5) != 'user'.$delimiter || substr($mailbox,0,strlen($own_mbox)) == $own_mbox)
+		{
+			continue;
+		}
 
-		if (!$pw) $mailbox = str_replace('INBOX','user'.$delimiter.$account_lid,$mailbox);
+		if (!$pw)
+		{
+			$mailbox = str_replace('INBOX','user'.$delimiter.$account_lid,$mailbox);
+		}
 
 /*		$rights = $icServer->getACL($mailbox);
 		echo "getACL($mailbox)\n";

admin/inc/class.admin_acl.inc.php

Doc Comments +2 added lines, -3 removed lines

@@ -283,8 +283,7 @@ 
 	 * Check if current user has access to ACL setting of a given location
 	 *
 	 * @param int $account_id numeric account-id
-	 * @param int|string $location=null numeric account-id or "run"
-	 * @param boolean $throw=true if true, throw an exception if no access, instead of just returning false
+	 * @param int|string $location numeric account-id or "run"
 	 * @return boolean true if access is granted, false if notification_bo
 	 * @throws egw_exception_no_permission
 	 */
@@ -330,7 +329,7 @@ 
 	 * Checks access and throws an exception, if a change is attempted without proper access
 	 *
 	 * @param string|array $ids "$app:$account:$location" string used as row-id in list
-	 * @param int $rights=null null to delete, or new rights
+	 * @param int $rights null to delete, or new rights
 	 * @throws egw_exception_no_permission
 	 */
 	public static function ajax_change_acl($ids, $rights=null)

Spacing +28 added lines, -31 removed lines

@@ -50,14 +50,14 @@ 
 		$old_apps = array_keys($this->acl->get_user_applications($content['acl_account'], false, false));
 		// add new apps
 		$added_apps = array_diff($content['apps'], $old_apps);
-		foreach($added_apps as $app)
+		foreach ($added_apps as $app)
 		{
 			$this->acl->add_repository($app, 'run', $content['acl_account'], 1);
 		}
 		// remove no longer checked apps
 		$removed_apps = array_diff($old_apps, $content['apps']);
 		$deleted_ids = array();
-		foreach($removed_apps as $app)
+		foreach ($removed_apps as $app)
 		{
 			$this->acl->delete_repository($app, 'run', $content['acl_account']);
 			$deleted_ids[] = $app.':'.$content['acl_account'].':run';
@@ -91,12 +91,11 @@ 
 	{
 		// assamble rights again
 		$rights = (int)$content['preserve_rights'];
-		foreach($content['acl'] as $right)
+		foreach ($content['acl'] as $right)
 		{
 			$rights |= $right;
 		}
-		$id = !empty($content['id']) ? $content['id'] :
-		$content['acl_appname'].':'.$content['acl_account'].':'.$content['acl_location'];
+		$id = !empty($content['id']) ? $content['id'] : $content['acl_appname'].':'.$content['acl_account'].':'.$content['acl_location'];
 		//error_log(__METHOD__."() id=$id, acl=".array2string($content['acl'])." --> rights=$rights");
 
 		if ($this->acl->get_specific_rights_for_account($content['acl_account'], $content['acl_location'], $content['acl_appname']) == $rights)
@@ -129,14 +128,14 @@ 
 	 * @param array &$rows=null
 	 * @return int total number of rows available
 	 */
-	public static function get_rows(array $query, array &$rows=null)
+	public static function get_rows(array $query, array &$rows = null)
 	{
 		$so_sql = new so_sql('phpgwapi', acl::TABLE, null, '', true);
 
 		// client queries destinct rows by their row-id
 		if (isset($query['col_filter']['id']))
 		{
-			$query['col_filter'][] = $GLOBALS['egw']->db->concat('acl_appname',"':'",'acl_account',"':'",'acl_location').
+			$query['col_filter'][] = $GLOBALS['egw']->db->concat('acl_appname', "':'", 'acl_account', "':'", 'acl_location').
 				' IN ('.implode(',', array_map(array($GLOBALS['egw']->db, 'quote'), (array)$query['col_filter']['id'])).')';
 			unset($query['col_filter']['id']);
 		}
@@ -154,9 +153,9 @@ 
 			if ($GLOBALS['egw_info']['user']['preferences']['admin']['acl_filter'] != $query['filter'])
 			{
 				$GLOBALS['egw']->preferences->add('admin', 'acl_filter', $query['filter']);
-				$GLOBALS['egw']->preferences->save_repository(false,'user',false);
+				$GLOBALS['egw']->preferences->save_repository(false, 'user', false);
 			}
-			switch($query['filter'])
+			switch ($query['filter'])
 			{
 				case 'run':
 					$query['col_filter']['acl_location'] = 'run';
@@ -180,7 +179,7 @@ 
 					if ($not_enum_group_acls)
 					{
 						$sql = '(CASE acl_appname';
-						foreach($not_enum_group_acls as $app => $groups)
+						foreach ($not_enum_group_acls as $app => $groups)
 						{
 							if ($groups === true)
 							{
@@ -190,7 +189,7 @@ 
 							{
 								$check = array_diff($memberships, $groups);
 								//error_log(__METHOD__."() app=$app, array_diff(memberships=".array2string($memberships).", groups=".array2string($groups).")=".array2string($check));
-								if (!$check) continue;	// would give sql error otherwise!
+								if (!$check) continue; // would give sql error otherwise!
 							}
 							$sql .= ' WHEN '.$GLOBALS['egw']->db->quote($app).' THEN '.$GLOBALS['egw']->db->expression(acl::TABLE, array(
 								'acl_account' => $check,
@@ -220,7 +219,7 @@ 
 		$readonlys = array();
 		$total = $so_sql->get_rows($query, $rows, $readonlys);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			// generate a row-id
 			$row['id'] = $row['acl_appname'].':'.$row['acl_account'].':'.$row['acl_location'];
@@ -232,9 +231,9 @@ 
 			else
 			{
 				if ($app !== $row['acl_appname']) translation::add_app($row['app_name']);
-				foreach($query['acl_rights'][$row['acl_appname']] as $val => $label)
+				foreach ($query['acl_rights'][$row['acl_appname']] as $val => $label)
 				{
-					if ($row['acl_rights'] & $val)
+					if ($row['acl_rights']&$val)
 					{
 						$row['acl'.$val] = lang($label);
 					}
@@ -249,11 +248,11 @@ 
 		//error_log(__METHOD__."(".array2string($query).") returning ".$total);
 
 		// Get supporting or all apps for filter2 depending on filter
-		if($query['filter'] == 'run')
+		if ($query['filter'] == 'run')
 		{
 			$rows['sel_options']['filter2'] = array(
 				'' => lang('All applications'),
-			)+etemplate_widget_menupopup::app_options('enabled');
+			) + etemplate_widget_menupopup::app_options('enabled');
 		}
 		else
 		{
@@ -264,14 +263,14 @@ 
 				'location' => 'acl_rights',
 				'owner' => $query['account_id'],
 			), array(), true);
-			foreach($apps as $appname => $rights)
+			foreach ($apps as $appname => $rights)
 			{
 				$rows['sel_options']['filter2'][] = array(
 					'value' => $appname,
 					'label' => lang($appname)
 				);
 			}
-			usort($rows['sel_options']['filter2'], function($a,$b) {
+			usort($rows['sel_options']['filter2'], function($a, $b) {
 				return strcasecmp($a['label'], $b['label']);
 			});
 		}
@@ -288,14 +287,14 @@ 
 	 * @return boolean true if access is granted, false if notification_bo
 	 * @throws egw_exception_no_permission
 	 */
-	public static function check_access($account_id, $location=null, $throw=true)
+	public static function check_access($account_id, $location = null, $throw = true)
 	{
-		static $admin_access=null;
-		static $own_access=null;
+		static $admin_access = null;
+		static $own_access = null;
 		if (is_null($admin_access))
 		{
 			$admin_access = isset($GLOBALS['egw_info']['user']['apps']['admin']) &&
-				!$GLOBALS['egw']->acl->check('account_access', 64, 'admin');	// ! because this denies access!
+				!$GLOBALS['egw']->acl->check('account_access', 64, 'admin'); // ! because this denies access!
 			$own_access = $admin_access || isset($GLOBALS['egw_info']['user']['apps']['preferences']);
 		}
 		if (!(int)$account_id || !((int)$account_id == (int)$GLOBALS['egw_info']['user']['account_id'] && $location !== 'run' ?
@@ -317,9 +316,9 @@ 
 	public static function ajax_get_app_list($account_id)
 	{
 		$list = array();
-		if(self::check_access((int)$account_id,'run',false))
+		if (self::check_access((int)$account_id, 'run', false))
 		{
-			$list = array_keys($GLOBALS['egw']->acl->get_user_applications((int)$account_id,false,false));
+			$list = array_keys($GLOBALS['egw']->acl->get_user_applications((int)$account_id, false, false));
 		}
 		egw_json_response::get()->data($list);
 	}
@@ -333,14 +332,14 @@ 
 	 * @param int $rights=null null to delete, or new rights
 	 * @throws egw_exception_no_permission
 	 */
-	public static function ajax_change_acl($ids, $rights=null)
+	public static function ajax_change_acl($ids, $rights = null)
 	{
 		try {
-			foreach((array)$ids as $id)
+			foreach ((array)$ids as $id)
 			{
 				list($app, $account_id, $location) = explode(':', $id, 3);
 
-				self::check_access($account_id, $location);	// throws exception, if no rights
+				self::check_access($account_id, $location); // throws exception, if no rights
 
 				$acl = $GLOBALS['egw']->acl;
 
@@ -384,7 +383,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		$tpl = new etemplate_new('admin.acl');
 
@@ -394,9 +393,7 @@ 
 		$content['nm'] = array(
 			'get_rows' => 'admin_acl::get_rows',
 			'no_cat' => true,
-			'filter' => !empty($_GET['acl_filter']) ? $_GET['acl_filter'] :
-				($GLOBALS['egw_info']['flags']['currentapp'] != 'admin' ? 'other' :
-					$GLOBALS['egw_info']['user']['preferences']['admin']['acl_filter']),
+			'filter' => !empty($_GET['acl_filter']) ? $_GET['acl_filter'] : ($GLOBALS['egw_info']['flags']['currentapp'] != 'admin' ? 'other' : $GLOBALS['egw_info']['user']['preferences']['admin']['acl_filter']),
 			'filter2' => !empty($_GET['acl_app']) ? $_GET['acl_app'] : '',
 			'lettersearch' => false,
 			'header_row'   => 'admin.acl.add',

Braces +31 added lines, -8 removed lines

@@ -103,9 +103,12 @@ 
 		{
 			// nothing changed --> nothing to do
 		}
-		elseif (!$rights)	// all rights removed --> delete it
+		elseif (!$rights)
+		{
+			// all rights removed --> delete it
 		{
 			$this->acl->delete_repository($content['acl_appname'], $content['acl_location'], $content['acl_account']);
+		}
 			egw_framework::refresh_opener(lang('ACL deleted.'), 'admin', $id, 'delete');
 		}
 		else
@@ -190,7 +193,11 @@ 
 							{
 								$check = array_diff($memberships, $groups);
 								//error_log(__METHOD__."() app=$app, array_diff(memberships=".array2string($memberships).", groups=".array2string($groups).")=".array2string($check));
-								if (!$check) continue;	// would give sql error otherwise!
+								if (!$check)
+								{
+									continue;
+								}
+								// would give sql error otherwise!
 							}
 							$sql .= ' WHEN '.$GLOBALS['egw']->db->quote($app).' THEN '.$GLOBALS['egw']->db->expression(acl::TABLE, array(
 								'acl_account' => $check,
@@ -201,7 +208,10 @@ 
 					$sql .= $GLOBALS['egw']->db->expression(acl::TABLE, array(
 						'acl_account' => $memberships,
 					));
-					if ($not_enum_group_acls) $sql .= ' END)';
+					if ($not_enum_group_acls)
+					{
+						$sql .= ' END)';
+					}
 					$query['col_filter'][] = $sql;
 					break;
 
@@ -231,7 +241,10 @@ 
 			}
 			else
 			{
-				if ($app !== $row['acl_appname']) translation::add_app($row['app_name']);
+				if ($app !== $row['acl_appname'])
+				{
+					translation::add_app($row['app_name']);
+				}
 				foreach($query['acl_rights'][$row['acl_appname']] as $val => $label)
 				{
 					if ($row['acl_rights'] & $val)
@@ -240,10 +253,13 @@ 
 					}
 				}
 			}
-			if (!self::check_access($row['acl_account'], $row['acl_location'], false))	// false: do NOT throw an exception!
+			if (!self::check_access($row['acl_account'], $row['acl_location'], false))
+			{
+				// false: do NOT throw an exception!
 			{
 				$row['class'] = 'rowNoEdit';
 			}
+			}
 			//error_log(__METHOD__."() $n: ".array2string($row));
 		}
 		//error_log(__METHOD__."(".array2string($query).") returning ".$total);
@@ -271,7 +287,8 @@ 
 					'label' => lang($appname)
 				);
 			}
-			usort($rows['sel_options']['filter2'], function($a,$b) {
+			usort($rows['sel_options']['filter2'], function($a,$b)
+			{
 				return strcasecmp($a['label'], $b['label']);
 			});
 		}
@@ -301,7 +318,10 @@ 
 		if (!(int)$account_id || !((int)$account_id == (int)$GLOBALS['egw_info']['user']['account_id'] && $location !== 'run' ?
 				$own_access : $admin_access))
 		{
-			if ($throw) throw new egw_exception_no_permission(lang('Permission denied!!!'));
+			if ($throw)
+			{
+				throw new egw_exception_no_permission(lang('Permission denied!!!'));
+			}
 			return false;
 		}
 		return true;
@@ -344,10 +364,13 @@ 
 
 				$acl = $GLOBALS['egw']->acl;
 
-				if (!(int)$rights)	// this also handles taking away all rights as delete
+				if (!(int)$rights)
+				{
+					// this also handles taking away all rights as delete
 				{
 					$acl->delete_repository($app, $location, $account_id);
 				}
+				}
 				else
 				{
 					$acl->add_repository($app, $location, $account_id, $rights);

admin/inc/class.admin_applications.inc.php

Doc Comments +4 added lines

@@ -185,6 +185,10 @@
 		$order[$next_app] = $old_pos;
 	}
 
+	/**
+	 * @param integer $old_key
+	 * @param boolean $reverse
+	 */
 	function find_next_key($array,$old_key,$reverse)
 	{
 		//error_log("find_next_key($old_key ".$GLOBALS['egw']->applications->id2name($old_key)." position:".$array[$old_key].",".var_dump($reverse).")");

Spacing +48 added lines, -48 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->so = new so_sql(self::APP,self::TABLE,null,'',true);
+		$this->so = new so_sql(self::APP, self::TABLE, null, '', true);
 	}
 
 	/**
@@ -49,20 +49,20 @@ 
 	 * @param array &$readonlys eg. to disable buttons based on acl, not use here, maybe in a derived class
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys)
+	function get_rows($query, &$rows, &$readonlys)
 	{
 		//$query['col_filter'][] = array('app_enabled' => array(1,4));
-		$total = $this->so->get_rows($query,$rows,$readonlys);
+		$total = $this->so->get_rows($query, $rows, $readonlys);
 
-		foreach($rows as $i => &$row)
+		foreach ($rows as $i => &$row)
 		{
 			//_debug_array($GLOBALS['egw_info']['apps'][$app]);
-			$row['image'] = (isset($row['app_icon_app'])?$row['app_icon_app']:$row['app_name']).'/'.
-							(isset($row['app_icon'])?$row['app_icon']:'navbar');
+			$row['image'] = (isset($row['app_icon_app']) ? $row['app_icon_app'] : $row['app_name']).'/'.
+							(isset($row['app_icon']) ? $row['app_icon'] : 'navbar');
 			//_debug_array($row);
-			if($i == 0)
+			if ($i == 0)
 				$readonlys['up['.$row['app_id'].']'] = true;
-			if($i == count($rows) - 1)
+			if ($i == count($rows) - 1)
 				$readonlys['down['.$row['app_id'].']'] = true;
 		}
 
@@ -74,55 +74,55 @@ 
 	 *
 	 * @param array $content
 	 */
-	function index(array $content=null)
+	function index(array $content = null)
 	{
 		//_debug_array($content);
-		if(!isset($content))
+		if (!isset($content))
 		{
 			$content['nm'] = array(
-				'get_rows'       =>	'admin.admin_applications.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-				'no_filter'      => True,	// I  disable the 1. filter
-				'col_filter'     =>	array('app_enabled' => array(1,4),"app_name not in ('admin','manual')"),	// =All	// IO filter, if not 'no_filter' => True
-				'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-				'no_cat'         => True,	// I  disable the cat-selectbox
-				'header_left'    =>	false,	// I  template to show left of the range-value, left-aligned (optional)
-				'header_right'   =>	false,	// I  template to show right of the range-value, right-aligned (optional)
-				'never_hide'     => True,	// I  never hide the nextmatch-line if less then maxmatch entries
-				'lettersearch'   => false,	// I  show a lettersearch
-				'start'          =>	0,		// IO position in list
-				'order'          =>	'app_order',	// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'ASC',	// IO direction of the sort: 'ASC' or 'DESC'
+				'get_rows'       =>	'admin.admin_applications.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+				'no_filter'      => True, // I  disable the 1. filter
+				'col_filter'     =>	array('app_enabled' => array(1, 4), "app_name not in ('admin','manual')"), // =All	// IO filter, if not 'no_filter' => True
+				'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+				'no_cat'         => True, // I  disable the cat-selectbox
+				'header_left'    =>	false, // I  template to show left of the range-value, left-aligned (optional)
+				'header_right'   =>	false, // I  template to show right of the range-value, right-aligned (optional)
+				'never_hide'     => True, // I  never hide the nextmatch-line if less then maxmatch entries
+				'lettersearch'   => false, // I  show a lettersearch
+				'start'          =>	0, // IO position in list
+				'order'          =>	'app_order', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				//'default_cols'   => 	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
-				'csv_fields'     =>	false,	// I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
+				'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 								//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
 			);
 		}
-		elseif(isset($content['nm']['rows']['up']))
+		elseif (isset($content['nm']['rows']['up']))
 		{
 			list($app) = each($content['nm']['rows']['up']);
 			unset($content['nm']['rows']['up']);
 			$this->move_app(-1, $app);
 			egw::invalidate_session_cache();
-			egw::redirect_link('/index.php',array('menuaction'=>'admin.admin_applications.index'));
+			egw::redirect_link('/index.php', array('menuaction'=>'admin.admin_applications.index'));
 			exit;
 		}
-		elseif(isset($content['nm']['rows']['down']))
+		elseif (isset($content['nm']['rows']['down']))
 		{
 			list($app) = each($content['nm']['rows']['down']);
 			unset($content['nm']['rows']['down']);
 			$this->move_app(1, $app);
 			egw::invalidate_session_cache();
-			egw::redirect_link('/index.php',array('menuaction'=>'admin.admin_applications.index'));
+			egw::redirect_link('/index.php', array('menuaction'=>'admin.admin_applications.index'));
 			exit;
 		}
-		elseif(isset($content['number']))
+		elseif (isset($content['number']))
 		{
 			// number apps serially
 			$order = array();
-			foreach($GLOBALS['egw_info']['apps'] as $app)
+			foreach ($GLOBALS['egw_info']['apps'] as $app)
 			{
 				//_debug_array(array($app['name'],$app['status'],$app['order']));
-				if(($app['status'] == 1 || $app['status'] == 4) && $app['name']!='admin' && $app['name']!='manual')
+				if (($app['status'] == 1 || $app['status'] == 4) && $app['name'] != 'admin' && $app['name'] != 'manual')
 				{
 					$order[$app['id']] = $app['order'];
 				}
@@ -130,25 +130,25 @@ 
 			asort($order);
 			$app_ids = array_keys($order);
 			//_debug_array($app_ids);
-			foreach($app_ids as $pos => $app)
+			foreach ($app_ids as $pos => $app)
 			{
 				$app_name = $GLOBALS['egw']->applications->id2name($app);
 				//echo "set $app_name ($app) to ".($pos + 1)."<br>";
-				$newpos= ($pos+1)*5;
-				$GLOBALS['egw']->db->update(self::TABLE,array('app_order' => $newpos),array('app_id' => $app),__LINE__,__FILE__);
+				$newpos = ($pos + 1) * 5;
+				$GLOBALS['egw']->db->update(self::TABLE, array('app_order' => $newpos), array('app_id' => $app), __LINE__, __FILE__);
 				// set the egw_info->apps array as well
-				if(isset($GLOBALS['egw_info']['apps'][$app_name]))
+				if (isset($GLOBALS['egw_info']['apps'][$app_name]))
 				{
 					$GLOBALS['egw_info']['apps'][$app_name]['order'] = $newpos;
 				}
 			}
 			egw::invalidate_session_cache();
-			egw::redirect_link('/index.php',array('menuaction'=>'admin.admin_applications.index'));
+			egw::redirect_link('/index.php', array('menuaction'=>'admin.admin_applications.index'));
 			exit;
 		}
 
 		$tmpl = new etemplate('admin.applications');
-		$tmpl->exec('admin.admin_applications.index',$content,$sel_options,$readonlys,array(
+		$tmpl->exec('admin.admin_applications.index', $content, $sel_options, $readonlys, array(
 			'nm' => $content['nm'],
 		));
 	}
@@ -159,13 +159,13 @@ 
 	 * @param int $dir the direction to move: -1 up, 1 down
 	 * @param int $app id of the app to move
 	 */
-	function move_app($dir,$app)
+	function move_app($dir, $app)
 	{
 		//echo "move_app($dir,$app,$order,$move_only)<br>";
 		$order = array();
-		foreach($GLOBALS['egw_info']['apps'] as $_app)
+		foreach ($GLOBALS['egw_info']['apps'] as $_app)
 		{
-			if(($_app['status'] == 1 || $_app['status'] == 4 ) && $app['name']!='admin' && $_app['name']!='manual')
+			if (($_app['status'] == 1 || $_app['status'] == 4) && $app['name'] != 'admin' && $_app['name'] != 'manual')
 			{
 				$order[$_app['id']] = $_app['order'];
 				//echo '<center>#'.$_app['id'].': '.$_app['title'].'->'.$_app['order'].'</center><br>';
@@ -176,22 +176,22 @@ 
 
 		// switch positions
 		$old_pos = $order[$app];
-		$next_app = $this->find_next_key($order,$app,$dir == -1);
+		$next_app = $this->find_next_key($order, $app, $dir == -1);
 		$new_pos = $order[$next_app];
-		if ($new_pos == $old_pos) $new_pos= $new_pos + $dir;
-		$GLOBALS['egw']->db->update(self::TABLE,array('app_order' => $new_pos),array('app_id' => $app),__LINE__,__FILE__);
+		if ($new_pos == $old_pos) $new_pos = $new_pos + $dir;
+		$GLOBALS['egw']->db->update(self::TABLE, array('app_order' => $new_pos), array('app_id' => $app), __LINE__, __FILE__);
 		$order[$app] = $new_pos;
-		$GLOBALS['egw']->db->update(self::TABLE,array('app_order' => $old_pos),array('app_id' => $next_app),__LINE__,__FILE__);
+		$GLOBALS['egw']->db->update(self::TABLE, array('app_order' => $old_pos), array('app_id' => $next_app), __LINE__, __FILE__);
 		$order[$next_app] = $old_pos;
 	}
 
-	function find_next_key($array,$old_key,$reverse)
+	function find_next_key($array, $old_key, $reverse)
 	{
 		//error_log("find_next_key($old_key ".$GLOBALS['egw']->applications->id2name($old_key)." position:".$array[$old_key].",".var_dump($reverse).")");
 		$next_key = false;
 		$first = true;
 		$neworder = $array[$old_key];
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
 			// remember the first entry
 			if ($first === true)
@@ -199,10 +199,10 @@ 
 				//echo $key.' first app in order ('.$value.')<br>';
 				$first = $key;
 			}
-			if(!$reverse)
+			if (!$reverse)
 			{
 				//error_log( "down $value $value < $neworder && $value > ".$array[$old_key]);
-				if(((int)$value < (int)$neworder && (int)$value > (int)$array[$old_key] && $key != $old_key) || ((int)$value > (int)$array[$old_key] && $next_key === false))
+				if (((int)$value < (int)$neworder && (int)$value > (int)$array[$old_key] && $key != $old_key) || ((int)$value > (int)$array[$old_key] && $next_key === false))
 				{
 					//error_log( "matching down $value");
 					$next_key = $key;
@@ -213,7 +213,7 @@ 
 			else
 			{
 				//error_log( "up $value $value > $neworder && $value < ".$array[$old_key]);
-				if(($value > $neworder && $value < $array[$old_key] && $key != $old_key) || ($value < $array[$old_key] && $next_key === false))
+				if (($value > $neworder && $value < $array[$old_key] && $key != $old_key) || ($value < $array[$old_key] && $next_key === false))
 				{
 					//error_log( "matching up $value");
 					$next_key = $key;

Braces +10 added lines, -3 removed lines

@@ -61,9 +61,13 @@ 
 							(isset($row['app_icon'])?$row['app_icon']:'navbar');
 			//_debug_array($row);
 			if($i == 0)
-				$readonlys['up['.$row['app_id'].']'] = true;
+			{
+							$readonlys['up['.$row['app_id'].']'] = true;
+			}
 			if($i == count($rows) - 1)
-				$readonlys['down['.$row['app_id'].']'] = true;
+			{
+							$readonlys['down['.$row['app_id'].']'] = true;
+			}
 		}
 
 		return $total;
@@ -178,7 +182,10 @@ 
 		$old_pos = $order[$app];
 		$next_app = $this->find_next_key($order,$app,$dir == -1);
 		$new_pos = $order[$next_app];
-		if ($new_pos == $old_pos) $new_pos= $new_pos + $dir;
+		if ($new_pos == $old_pos)
+		{
+			$new_pos= $new_pos + $dir;
+		}
 		$GLOBALS['egw']->db->update(self::TABLE,array('app_order' => $new_pos),array('app_id' => $app),__LINE__,__FILE__);
 		$order[$app] = $new_pos;
 		$GLOBALS['egw']->db->update(self::TABLE,array('app_order' => $old_pos),array('app_id' => $next_app),__LINE__,__FILE__);

admin/inc/class.customfields.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -614,7 +614,7 @@ 
 	 * Validate and create a new content type
 	 *
 	 * @param array $content
-	 * @return string|boolean New type ID, or false for error
+	 * @return false|string New type ID, or false for error
 	 */
 	function create_content_type(&$content)
 	{
@@ -671,7 +671,7 @@ 
 	*
 	* @deprecated use egw_customfields::get() direct, no need to instanciate this UI class
 	* @author Cornelius Weiss
-	* @param boolean $all_private_too=false should all the private fields be returned too
+	* @param boolean $all_private_too should all the private fields be returned too
 	* @return array with customfields
 	*/
 	function get_customfields($all_private_too=false)

Indentation +27 added lines, -27 removed lines

@@ -28,10 +28,10 @@ 
 {
 
 	/**
-	* appname of app which want to add / edit its customfields
-	*
-	* @var string
-	*/
+	 * appname of app which want to add / edit its customfields
+	 *
+	 * @var string
+	 */
 	var $appname;
 
 	/**
@@ -40,10 +40,10 @@ 
 	protected $use_private = false;
 
 	/**
-	* userdefiened types e.g. type of infolog
-	*
-	* @var array
-	*/
+	 * userdefiened types e.g. type of infolog
+	 *
+	 * @var array
+	 */
 	var $types2 = array();
 	var $content_types,$fields;
 
@@ -573,8 +573,8 @@ 
 	}
 
 	/**
-	* deletes custom field from customfield definitions
-	*/
+	 * deletes custom field from customfield definitions
+	 */
 	function delete_field(&$content)
 	{
 		unset($this->fields[key($content['fields']['delete'])]);
@@ -591,8 +591,8 @@ 
 	}
 
 	/**
-	* create a new custom field
-	*/
+	 * create a new custom field
+	 */
 	function create_field(&$content)
 	{
 		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
@@ -653,8 +653,8 @@ 
 	}
 
 	/**
-	* save changes to repository
-	*/
+	 * save changes to repository
+	 */
 	function save_repository()
 	{
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
@@ -667,25 +667,25 @@ 
 	}
 
 	/**
-	* get customfields of using application
-	*
-	* @deprecated use egw_customfields::get() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @param boolean $all_private_too=false should all the private fields be returned too
-	* @return array with customfields
-	*/
+	 * get customfields of using application
+	 *
+	 * @deprecated use egw_customfields::get() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @param boolean $all_private_too=false should all the private fields be returned too
+	 * @return array with customfields
+	 */
 	function get_customfields($all_private_too=false)
 	{
 		return egw_customfields::get($this->appname,$all_private_too);
 	}
 
 	/**
-	* get_content_types of using application
-	*
-	* @deprecated use config::get_content_types() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @return array with content-types
-	*/
+	 * get_content_types of using application
+	 *
+	 * @deprecated use config::get_content_types() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @return array with content-types
+	 */
 	function get_content_types()
 	{
 		return config::get_content_types($this->appname);

Spacing +85 added lines, -86 removed lines

@@ -45,7 +45,7 @@ 
 	* @var array
 	*/
 	var $types2 = array();
-	var $content_types,$fields;
+	var $content_types, $fields;
 
 	/**
 	 * Currently selected content type (if used by app)
@@ -98,14 +98,14 @@ 
 	 *
 	 * @param string $appname
 	 */
-	function __construct($appname='')
+	function __construct($appname = '')
 	{
 		if (($this->appname = $appname))
 		{
-			$this->fields = egw_customfields::get($this->appname,true);
+			$this->fields = egw_customfields::get($this->appname, true);
 			$this->content_types = config::get_content_types($this->appname);
 		}
-		$this->so = new so_sql('phpgwapi','egw_customfields',null,'',true);
+		$this->so = new so_sql('phpgwapi', 'egw_customfields', null, '', true);
 	}
 
 	/**
@@ -115,43 +115,43 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if (!$this->appname) die(lang('Error! No appname found'));
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = egw_customfields::get($this->appname,true);
+		$this->fields = egw_customfields::get($this->appname, true);
 
 		$this->tmpl = new etemplate_new();
 		$this->tmpl->read('admin.customfields');
 
 		// do we manage content-types?
 		$test = new etemplate_new();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		// Handle incoming - types, options, etc.
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
-				$this->content_types = (array)egw_link::get_registry($this->appname,'default_types');
+				$this->content_types = (array)egw_link::get_registry($this->appname, 'default_types');
 			}
 			// Set this now, we need to know it for updates
-			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0,$this->content_types) ? $this->content_types[0] : key($this->content_types));
+			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0, $this->content_types) ? $this->content_types[0] : key($this->content_types));
 
 			// Common type changes - add, delete
-			if($content['content_types']['delete'])
+			if ($content['content_types']['delete'])
 			{
 				$this->delete_content_type($content);
 			}
-			elseif($content['content_types']['create'])
+			elseif ($content['content_types']['create'])
 			{
-				if($new_type = $this->create_content_type($content))
+				if ($new_type = $this->create_content_type($content))
 				{
 					$content['content_types']['types'] = $this->content_type = $new_type;
 				}
@@ -159,18 +159,18 @@ 
 				unset($content['content_types']['name']);
 			}
 			// No common type change and type didn't change, try an update
-			elseif($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
+			elseif ($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
 			{
 				$this->update($content);
 			}
 		}
 
 		// Custom field deleted from nextmatch
-		if($content['nm']['action'] == 'delete')
+		if ($content['nm']['action'] == 'delete')
 		{
-			foreach($this->fields as $name => $data)
+			foreach ($this->fields as $name => $data)
 			{
-				if(in_array($data['id'],$content['nm']['selected']))
+				if (in_array($data['id'], $content['nm']['selected']))
 				{
 					unset($this->fields[$name]);
 				}
@@ -179,7 +179,7 @@ 
 			$this->save_repository();
 		}
 
-		$content['nm']= $GLOBALS['egw']->session->appsession('customfield-index','admin');
+		$content['nm'] = $GLOBALS['egw']->session->appsession('customfield-index', 'admin');
 		if (!is_array($content['nm']))
 		{
 			// Initialize nextmatch
@@ -189,8 +189,8 @@ 
 				'no_filter'      => 'true',
 				'no_filter2'     => 'true',
 				'row_id'         => 'cf_id',
-				'order'          =>	'cf_order',// IO name of the column to sort
-				'sort'           =>	'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'          =>	'cf_order', // IO name of the column to sort
+				'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'actions'        => $this->get_actions()
 			);
 		}
@@ -198,11 +198,11 @@ 
 		$content['nm']['use_private'] = $this->use_private;
 
 		// Set up sub-types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
-				if(!is_array($entry))
+				if (!is_array($entry))
 				{
 					$this->content_types[$type] = array('name' => $entry);
 					$entry = $this->content_types[$type];
@@ -211,7 +211,7 @@ 
 			}
 			$sel_options['types'] = $sel_options['cf_type2'] = $this->types2;
 
-			$content['type_template'] = $this->appname . '.admin.types';
+			$content['type_template'] = $this->appname.'.admin.types';
 			$content['content_types']['appname'] = $this->appname;
 			$content_types = array_keys($this->content_types);
 
@@ -253,15 +253,15 @@ 
 		static::app_index($content, $sel_options, $readonlys, $preserve);
 
 		// Make sure app css gets loaded, extending app might cause et2 to miss it
-		egw_framework::includeCSS('admin','app');
+		egw_framework::includeCSS('admin', 'app');
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 
 		// Some logic to make sure extending class (if there is one) gets called
 		// when etemplate2 comes back instead of parent class
-		$exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname . '.' . get_called_class() . '.index';
+		$exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname.'.'.get_called_class().'.index';
 
-		$this->tmpl->exec($exec,$content,$sel_options,$readonlys,$preserve);
+		$this->tmpl->exec($exec, $content, $sel_options, $readonlys, $preserve);
 	}
 
 	/**
@@ -276,28 +276,28 @@ 
 
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['cf_app'] ? $content['cf_app'] : false));
-		if(!$this->appname)
+		if (!$this->appname)
 		{
-			if($cf_id && $this->so)
+			if ($cf_id && $this->so)
 			{
 				$content = $this->so->read($cf_id);
 				$this->appname = $content['cf_app'];
 			}
 		}
-		if(!$this->appname)
+		if (!$this->appname)
 		{
 			die(lang('Error! No appname found'));
 		}
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = egw_customfields::get($this->appname,true);
+		$this->fields = egw_customfields::get($this->appname, true);
 
 		// Update based on info returned from template
 		if (is_array($content))
 		{
 			list($action) = @each($content['button']);
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$this->so->delete($cf_id);
@@ -306,46 +306,46 @@ 
 					break;
 				case 'save':
 				case 'apply':
-					if(!$cf_id && $this->fields[$content['cf_name']])
+					if (!$cf_id && $this->fields[$content['cf_name']])
 					{
-						egw_framework::message(lang("Field '%1' already exists !!!",$content['cf_name']),'error');
+						egw_framework::message(lang("Field '%1' already exists !!!", $content['cf_name']), 'error');
 						$content['cf_name'] = '';
 						break;
 					}
-					if(empty($content['cf_label']))
+					if (empty($content['cf_label']))
 					{
 						$content['cf_label'] = $content['cf_name'];
 					}
 					if (!empty($content['cf_values']))
 					{
 						$values = array();
-						if($content['cf_values'][0] === '@')
+						if ($content['cf_values'][0] === '@')
 						{
-							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2:1);
+							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2 : 1);
 						}
 						else
 						{
-							foreach(explode("\n",trim($content['cf_values'])) as $line)
+							foreach (explode("\n", trim($content['cf_values'])) as $line)
 							{
-								list($var,$value) = explode('=',trim($line),2);
+								list($var, $value) = explode('=', trim($line), 2);
 								$var = trim($var);
-								$values[$var] = trim($value)==='' ? $var : $value;
+								$values[$var] = trim($value) === '' ? $var : $value;
 							}
 						}
 						$content['cf_values'] = $values;
 					}
 					$update_content = array();
-					foreach($content as $key => $value)
+					foreach ($content as $key => $value)
 					{
-						if(substr($key,0,3) == 'cf_')
+						if (substr($key, 0, 3) == 'cf_')
 						{
-							$update_content[substr($key,3)] = $value;
+							$update_content[substr($key, 3)] = $value;
 						}
 					}
 					egw_customfields::update($update_content);
-					if(!$cf_id)
+					if (!$cf_id)
 					{
-						$this->fields = egw_customfields::get($this->appname,true);
+						$this->fields = egw_customfields::get($this->appname, true);
 						$cf_id = (int)$this->fields[$content['cf_name']]['id'];
 					}
 					egw_framework::refresh_opener('Saved', 'admin', $cf_id, 'edit');
@@ -366,30 +366,30 @@ 
 
 		// do we manage content-types?
 		$test = new etemplate_new();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		$this->tmpl = new etemplate_new();
 		$this->tmpl->read('admin.customfield_edit');
 
-		translation::add_app('infolog');	// til we move the translations
+		translation::add_app('infolog'); // til we move the translations
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 		$sel_options = array();
 		$readonlys = array();
 
 		//echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n";
-		$content['cf_order'] = (count($this->fields)+1) * 10;
+		$content['cf_order'] = (count($this->fields) + 1) * 10;
 		$content['use_private'] = $this->use_private;
 
-		if($cf_id)
+		if ($cf_id)
 		{
 			$content = array_merge($content, $this->so->read($cf_id));
 			$this->appname = $content['cf_app'];
-			if($content['cf_private'])
+			if ($content['cf_private'])
 			{
-				$content['cf_private'] = explode(',',$content['cf_private']);
+				$content['cf_private'] = explode(',', $content['cf_private']);
 			}
-			if($content['cf_name'])
+			if ($content['cf_name'])
 			{
 				$readonlys['cf_name'] = true;
 			}
@@ -402,7 +402,7 @@ 
 		if (is_array($content['cf_values']))
 		{
 			$values = '';
-			foreach($content['cf_values'] as $var => $value)
+			foreach ($content['cf_values'] as $var => $value)
 			{
 				$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 			}
@@ -410,18 +410,18 @@ 
 		}
 
 		// Show sub-type row, and get types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
-				$this->content_types = (array)egw_link::get_registry($this->appname,'default_types');
+				$this->content_types = (array)egw_link::get_registry($this->appname, 'default_types');
 			}
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
 				$this->types2[$type] = is_array($entry) ? $entry['name'] : $entry;
 			}
@@ -433,19 +433,19 @@ 
 		}
 
 		// Include type-specific value help
-		foreach(self::$type_option_help as $key => $value)
+		foreach (self::$type_option_help as $key => $value)
 		{
 			$content['options'][$key] = lang($value);
 		}
 		$content['statustext'] = $content['options'][$content['cf_type']];
 		$content['attributes'] = self::$type_attribute_flags;
 
-		$this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array(
+		$this->tmpl->exec('admin.customfields.edit', $content, $sel_options, $readonlys, array(
 			'cf_id' => $cf_id,
 			'cf_app' => $this->appname,
 			'cf_name' => $content['cf_name'],
 			'use_private' => $this->use_private,
-		),2);
+		), 2);
 	}
 
 	/**
@@ -473,7 +473,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=admin.customfields.edit&cf_id=$id&use_private='.$this->use_private,
 				'popup' => '500x380',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
 			),
 			'add' => array(
@@ -495,7 +495,7 @@ 
 
 	function update_fields(&$content)
 	{
-		foreach($content['fields'] as $field)
+		foreach ($content['fields'] as $field)
 		{
 			$name = trim($field['name']);
 			$old_name = $field['old_name'];
@@ -524,9 +524,9 @@ 
 			$values = array();
 			if (!empty($field['values']))
 			{
-				foreach(explode("\n",$field['values']) as $line)
+				foreach (explode("\n", $field['values']) as $line)
 				{
-					list($var,$value) = explode('=',trim($line),2);
+					list($var, $value) = explode('=', trim($line), 2);
 					$var = trim($var);
 					$values[$var] = empty($value) ? $var : $value;
 				}
@@ -543,22 +543,22 @@ 
 				'private' => $field['private'],
 				'needed' => $field['needed'],
 			);
-			if(!$this->fields[$name]['type2'] && $this->manage_content_types)
+			if (!$this->fields[$name]['type2'] && $this->manage_content_types)
 			{
 				$this->fields[$name]['type2'] = (string)0;
 			}
 		}
 		if (!function_exists('sort_by_order'))
 		{
-			function sort_by_order($arr1,$arr2)
+			function sort_by_order($arr1, $arr2)
 			{
 				return $arr1['order'] - $arr2['order'];
 			}
 		}
-		uasort($this->fields,sort_by_order);
+		uasort($this->fields, sort_by_order);
 
 		$n = 0;
-		foreach($this->fields as $name => $data)
+		foreach ($this->fields as $name => $data)
 		{
 			$this->fields[$name]['order'] = ($n += 10);
 		}
@@ -595,17 +595,16 @@ 
 	*/
 	function create_field(&$content)
 	{
-		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
+		$new_name = trim($content['fields'][count($content['fields']) - 1]['name']);
 		if (empty($new_name) || isset($this->fields[$new_name]))
 		{
 			$content['error_msg'] .= empty($new_name) ?
-				lang('You have to enter a name, to create a new field!!!') :
-				lang("Field '%1' already exists !!!",$new_name);
+				lang('You have to enter a name, to create a new field!!!') : lang("Field '%1' already exists !!!", $new_name);
 		}
 		else
 		{
-			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			$this->fields[$new_name] = $content['fields'][count($content['fields']) - 1];
+			if (!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
 			$this->save_repository();
 		}
 	}
@@ -622,20 +621,20 @@ 
 		$new_type = false;
 		if (empty($new_name))
 		{
-			$this->tmpl->set_validation_error('content_types[name]','You have to enter a name, to create a new type!!!');
+			$this->tmpl->set_validation_error('content_types[name]', 'You have to enter a name, to create a new type!!!');
 		}
 		else
 		{
-			foreach($this->content_types as $letter => $type)
+			foreach ($this->content_types as $letter => $type)
 			{
-				if($type['name'] == $new_name)
+				if ($type['name'] == $new_name)
 				{
-					$this->tmpl->set_validation_error('content_types[name]',lang("type '%1' already exists !!!",$new_name));
+					$this->tmpl->set_validation_error('content_types[name]', lang("type '%1' already exists !!!", $new_name));
 					return false;
 				}
 			}
 			// search free type character
-			for($i=97;$i<=122;$i++)
+			for ($i = 97; $i <= 122; $i++)
 			{
 				if (!$this->content_types[chr($i)] &&
 					// skip letter of deleted type for addressbook content-types, as it gives SQL error
@@ -660,7 +659,7 @@ 
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
 		$config = new config($this->appname);
 		$config->read_repository();
-		$config->value('types',$this->content_types);
+		$config->value('types', $this->content_types);
 		$config->save_repository();
 
 		egw_customfields::save($this->appname, $this->fields);
@@ -674,9 +673,9 @@ 
 	* @param boolean $all_private_too=false should all the private fields be returned too
 	* @return array with customfields
 	*/
-	function get_customfields($all_private_too=false)
+	function get_customfields($all_private_too = false)
 	{
-		return egw_customfields::get($this->appname,$all_private_too);
+		return egw_customfields::get($this->appname, $all_private_too);
 	}
 
 	/**
@@ -702,13 +701,13 @@ 
 		$total = $this->so->get_rows($query, $rows, $readonlys);
 		unset($query['col_filter']['cf_app']);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['cf_values'] = json_decode($row['cf_values'], true);
 			if (is_array($row['cf_values']))
 			{
 				$values = '';
-				foreach($row['cf_values'] as $var => $value)
+				foreach ($row['cf_values'] as $var => $value)
 				{
 					$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 				}

Braces +28 added lines, -7 removed lines

@@ -115,7 +115,10 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if(!$this->appname)
+		{
+			die(lang('Error! No appname found'));
+		}
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
@@ -127,7 +130,10 @@ 
 
 		// do we manage content-types?
 		$test = new etemplate_new();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		// Handle incoming - types, options, etc.
 		if($this->manage_content_types)
@@ -366,7 +372,10 @@ 
 
 		// do we manage content-types?
 		$test = new etemplate_new();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		$this->tmpl = new etemplate_new();
 		$this->tmpl->read('admin.customfield_edit');
@@ -507,20 +516,29 @@ 
 			}
 			if (isset($field['old_name']))
 			{
-				if (empty($name))	// empty name not allowed
+				if (empty($name))
+				{
+					// empty name not allowed
 				{
 					$content['error_msg'] = lang('Name must not be empty !!!');
+				}
 					$name = $old_name;
 				}
-				if (!empty($name) && $old_name != $name)	// renamed
+				if (!empty($name) && $old_name != $name)
+				{
+					// renamed
 				{
 					unset($this->fields[$old_name]);
 				}
+				}
 			}
-			elseif (empty($name))		// new item and empty ==> ignore it
+			elseif (empty($name))
+			{
+				// new item and empty ==> ignore it
 			{
 				continue;
 			}
+			}
 			$values = array();
 			if (!empty($field['values']))
 			{
@@ -605,7 +623,10 @@ 
 		else
 		{
 			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			if(!$this->fields[$new_name]['label'])
+			{
+				$this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			}
 			$this->save_repository();
 		}
 	}

calendar/inc/class.calendar_activesync.inc.php

Doc Comments +10 added lines, -11 removed lines

@@ -171,8 +171,8 @@ 
 	 * will work OK apart from that.
 	 *
 	 * @param string $id folder id
-	 * @param int $cutoffdate=null
-	 * @param array $not_uids=null uids NOT to return for meeting requests
+	 * @param int $cutoffdate
+	 * @param array $not_uids uids NOT to return for meeting requests
 	 * @return array
   	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
@@ -223,7 +223,7 @@ 
 	 * List all meeting requests / invitations of user NOT having a UID in $not_uids (already received by email)
 	 *
 	 * @param array $not_uids
-	 * @param int $cutoffdate=null
+	 * @param int $cutoffdate
 	 * @return array
 	 */
 	function GetMeetingRequests(array $not_uids, $cutoffdate=NULL)
@@ -266,7 +266,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)
@@ -607,7 +607,6 @@ 
 	 *
 	 * @param SyncAppointment $message
 	 * @param int $account
-	 * @param array $event=array()
 	 * @return array
 	 */
 	private function message2event(SyncAppointment $message, $account, $event=array())
@@ -855,7 +854,7 @@ 
 	 * @param string $displayname => new folder name (to be created, or to be renamed to)
 	 * @param string $type folder type, ignored in IMAP
 	 *
-	 * @return array|boolean stat array or false on error
+	 * @return boolean stat array or false on error
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
@@ -870,7 +869,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)
 	{
@@ -958,9 +957,9 @@ 
 	 * @param string $folderid
 	 * @param string|array $id cal_id or event array (used internally)
 	 * @param int $truncsize
-	 * @param int|bool $bodypreference=false
+	 * @param int|bool $bodypreference
 	 * @param $optionbodypreference=false
-	 * @param int $mimesupport=0
+	 * @param int $mimesupport
 	 * @return SyncAppointment|boolean false on error
 	 */
 	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
@@ -1303,7 +1302,6 @@ 
 	 * matching timezones for incomming timezone data. iPhone seems not to care on receiving about the above.
 	 *
 	 * @param string|DateTimeZone $tz timezone, timezone name (eg. "Europe/Berlin") or ical with VTIMEZONE
-	 * @param int|string|DateTime $ts=null time for which active sync timezone data is requested, default current time
 	 * @return array with values for keys:
 	 * - "bias": timezone offset from UTC in minutes for NO DST
 	 * - "dstendmonth", "dstendday", "dstendweek", "dstendhour", "dstendminute", "dstendsecond", "dstendmillis"
@@ -1468,7 +1466,7 @@ 
 	 * )
 	 *
 	 * @param string|array $ical lines of ical file
-	 * @param string $component=null
+	 * @param string $component
 	 * @return array with parsed ical components
 	 */
 	static public function ical2array(&$ical,$component=null)
@@ -1542,6 +1540,7 @@ 
 	 * Unpack timezone info from Sync
 	 *
 	 * copied from backend/ics.php
+	 * @param string $data
 	 */
 	static public function _getTZFromSyncBlob($data)
 	{

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 +182 added lines, -183 removed lines

@@ -81,20 +81,20 @@ 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		$cals = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
-		$cals = $cals ? explode(',',$cals) : array('P');	// implicit default of 'P'
+		$cals = $cals ? explode(',', $cals) : array('P'); // implicit default of 'P'
 		$folderlist = array();
 
 		foreach ($this->calendar->list_cals() as $entry)
 		{
 			$account_id = $entry['grantor'];
 			$label = $entry['name'];
-			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',
 				);
 			}
@@ -117,7 +117,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;
@@ -151,7 +151,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));
@@ -175,18 +175,18 @@ 
 	 * @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();
 
-		debugLog (__METHOD__."('$id',$cutoffdate)");
-		$this->backend->splitID($id,$type,$user);
+		debugLog(__METHOD__."('$id',$cutoffdate)");
+		$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',
@@ -195,7 +195,7 @@ 
 			'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();
@@ -226,14 +226,14 @@ 
 	 * @param int $cutoffdate=null
 	 * @return array
 	 */
-	function GetMeetingRequests(array $not_uids, $cutoffdate=NULL)
+	function GetMeetingRequests(array $not_uids, $cutoffdate = NULL)
 	{
-return array();	// temporary disabling meeting requests from calendar
-		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']);	// users personal calendar
+return array(); // temporary disabling meeting requests from calendar
+		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']); // users personal calendar
 
 		$ret = $this->GetMessageList($folderid, $cutoffdate, $not_uids);
 		// return all id's negative to not conflict with uids from fmail
-		foreach($ret as &$message)
+		foreach ($ret as &$message)
 		{
 			$message['id'] = -$message['id'];
 		}
@@ -250,7 +250,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;
@@ -269,7 +269,7 @@ 
 	 * @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)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -282,13 +282,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";
@@ -303,7 +303,7 @@ 
 			else
 			{
 				$message->airsyncbasebody = new SyncAirSyncBaseBody();
-				$message->airsyncbasenativebodytype=1;
+				$message->airsyncbasenativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
 			}
 		}
@@ -338,11 +338,11 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(calendar_activesync::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $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',
@@ -352,10 +352,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)
@@ -364,16 +364,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
@@ -419,14 +419,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]))
 			{
 				debugLog(__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'])
 			{
 				debugLog(__METHOD__.'('.array2string($requestid).", $folderid, $response) event ($uid) deleted on server --> return false");
 				return false;
@@ -439,7 +439,7 @@ 
 		}
 		// keep role and quantity as AS has no idea about it
 		calendar_so::split_status($event['participants'][$uid], $quantity, $role);
-		$status = calendar_so::combine_status($status,$quantity,$role);
+		$status = calendar_so::combine_status($status, $quantity, $role);
 
 		if ($event['id'] && isset($event['participants'][$uid]))
 		{
@@ -448,7 +448,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
 		}
 		debugLog(__METHOD__.'('.array2string($requestid).", '$folderid', $response) returning ".array2string($ret));
 		return $ret;
@@ -460,10 +460,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
 	);
 	/**
@@ -472,9 +472,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
 	);
@@ -486,8 +486,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)
 	);
@@ -518,9 +518,9 @@ 
 		$event = array();
 		$this->backend->splitID($folderid, $type, $account);
 
-		debugLog (__METHOD__."('$folderid', $id, ".array2string($message).") type='$type', account=$account");
+		debugLog(__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 && !($event = $this->calendar->read($id, $recur_date, false, 'server')))
 		{
@@ -533,25 +533,25 @@ 
 			debugLog(__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 ? EGW_ACL_EDIT : EGW_ACL_ADD,$event ? $event : 0,$account))
+		if (!$this->calendar->check_perms($id ? EGW_ACL_EDIT : EGW_ACL_ADD, $event ? $event : 0, $account))
 		{
 			// @todo: write in users calendar and make account only a participant
 			debugLog(__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) $event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id) $event['owner'] = $account; // we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $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']['felamimail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['felamimail-allowSendingInvitations']=='send')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['felamimail-allowSendingInvitations'] == 'send')
 		{
 			$skip_notification = true; // to avoid double notification from client AND Server
 		}
-		if (!($id = $this->calendar->update($event,$ignore_conflicts=true,$touch_modified=true,$ignore_acl=false,$updateTS=true,$messages=null, $skip_notification)))
+		if (!($id = $this->calendar->update($event, $ignore_conflicts = true, $touch_modified = true, $ignore_acl = false, $updateTS = true, $messages = null, $skip_notification)))
 		{
 			debugLog(__METHOD__."('$folderid',$id,...) error saving event=".array2string($event)."!");
 			return false;
@@ -559,24 +559,24 @@ 
 		// 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($ex_event as $name => $value) if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+					foreach ($ex_event as $name => $value) if (substr($name, 0, 6) == 'recur_') unset($ex_event[$name]);
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
 					if ($event['id'] && ($ex_events = $this->calendar->search(array(
 						'user' => $user,
 						'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
 						),
 					))))
 					{
@@ -588,7 +588,7 @@ 
 						$participants = $event['participants'];
 					}
 					$ex_event = $this->message2event($exception, $account, $ex_event);
-					$ex_event['participants'] = $participants;	// not contained in $exception
+					$ex_event['participants'] = $participants; // not contained in $exception
 					$ex_event['reference'] = $event['id'];
 					$ex_event['recurrence'] = egw_time::server2user($exception->exceptionstarttime);
 					$ex_ok = $this->calendar->save($ex_event);
@@ -610,10 +610,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)
@@ -621,7 +621,7 @@ 
 			if (isset($message->$attr)) $event[$key] = egw_time::server2user($message->$attr);
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -636,7 +636,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))
@@ -646,20 +646,20 @@ 
 
 		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
 
-			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,
@@ -669,13 +669,13 @@ 
 				// search addressbook for participant
 				if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
 				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;
 				}
@@ -692,8 +692,8 @@ 
 				//debugLog("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);
@@ -706,9 +706,9 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//debugLog("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;
 			}
@@ -718,29 +718,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;
 			}
 			//debugLog("-> 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;
@@ -756,13 +756,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)
@@ -772,8 +772,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'])
@@ -782,7 +781,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
@@ -798,7 +797,7 @@ 
 			$event['recur_exceptions'] = array();
 			if ($message->exceptions)
 			{
-				foreach($message->exceptions as $exception)
+				foreach ($message->exceptions as $exception)
 				{
 					$event['recur_exception'][] = egw_time::server2user($exception->exceptionstarttime);
 				}
@@ -808,7 +807,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;
 				}
@@ -818,11 +817,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;
 				}
 			}
@@ -831,16 +830,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,
 				);
 			}
 		}
@@ -963,11 +962,11 @@ 
 	 * @param int $mimesupport=0
 	 * @return SyncAppointment|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	public function GetMessage($folderid, $id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
-		debugLog (__METHOD__."('$folderid', ".array2string($id).", truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
+		debugLog(__METHOD__."('$folderid', ".array2string($id).", truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
 		$this->backend->splitID($folderid, $type, $account);
 		if (is_array($id))
 		{
@@ -976,15 +975,15 @@ 
 		}
 		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;
 			}
 		}
-		debugLog(__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($event['recur_exception'] as $ex) debugLog("exception=$ex=".date('Y-m-d H:i:s',$ex));
+		debugLog(__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 ($event['recur_exception'] as $ex) debugLog("exception=$ex=".date('Y-m-d H:i:s', $ex));
 
 		$message = new SyncAppointment();
 
@@ -993,11 +992,11 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $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',
@@ -1008,10 +1007,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',
@@ -1033,22 +1032,22 @@ 
 			{
 				debugLog("airsyncbasebody!");
 				$message->airsyncbasebody = new SyncAirSyncBaseBody();
-				$message->airsyncbasenativebodytype=1;
+				$message->airsyncbasenativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
 			}
 		}
 		$message->md5body = md5($event['description']);
 
-		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname');
-		$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname');
+		$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email');
 
-		$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;
@@ -1059,19 +1058,19 @@ 
 			$attendee->attendeetype = (int)self::$role2as[$role];
 			if (is_numeric($uid))
 			{
-				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid,'account_fullname');
-				$attendee->email = $GLOBALS['egw']->accounts->id2name($uid,'account_email');
+				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid, 'account_fullname');
+				$attendee->email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email');
 			}
 			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;
 
 				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');
 				}
 				$attendee->name = empty($info['cn']) ? $info['name'] : $info['cn'];
 				$attendee->email = $info['email'];
@@ -1083,7 +1082,7 @@ 
 					$message->organizeremail = $attendee->email;
 					debugLog(__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';
@@ -1091,7 +1090,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[] = categories::id2name($cat_id);
 		}
@@ -1100,25 +1099,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!
@@ -1134,9 +1133,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',
 					));
@@ -1145,36 +1144,36 @@ 
 				{
 					debugLog(__METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) debugLog(__METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events) >= 1) debugLog(__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, $truncsize, $bodypreference, $mimesupport);
 					$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]);
 					}
-					debugLog(__METHOD__."() added exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+					debugLog(__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'])) debugLog(__METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
-						$exception = new SyncAppointment();	// exceptions seems to be full SyncAppointments, with only starttime required
+						$exception = new SyncAppointment(); // exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
-						debugLog(__METHOD__."() added deleted exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+						debugLog(__METHOD__."() added deleted exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 						$message->exceptions[] = $exception;
 					}
 				}
@@ -1196,12 +1195,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)
 				}
 			}
 		}
@@ -1232,7 +1231,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(EGW_ACL_FREEBUSY, $id, 0, 'server');
 			$this->calendar->debug = $backup;
 		}
@@ -1267,10 +1266,10 @@ 
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
-		$ctag = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
+		$ctag = $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 ($ctag == 0) $ctag = 1;
-		$changes = array();	// no change
+		$changes = array(); // no change
 		$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)
@@ -1314,7 +1313,7 @@ 
 	 * @link http://download.microsoft.com/download/5/D/D/5DD33FDF-91F5-496D-9884-0A0B0EE698BB/%5BMS-ASDTYPE%5D.pdf
 	 * @throws egw_exception_assertion_failed if no vtimezone data found for given timezone
 	 */
-	static public function tz2as($tz,$ts=null)
+	static public function tz2as($tz, $ts = null)
 	{
 /*
 BEGIN:VTIMEZONE
@@ -1350,20 +1349,20 @@ 
 			'dstendhour' => 0, 'dstendminute' => 0, 'dstendsecond' => 0, 'dstendmillis' => 0,
 		);
 
-		$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($ical=$component);
+		$ical = self::ical2array($ical = $component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
 		$daylight = $ical['VTIMEZONE']['DAYLIGHT'];
 
 		if (!isset($standard))
 		{
-			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);
 			}
@@ -1374,15 +1373,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];
@@ -1399,20 +1398,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;
 				$start = $data['dststartminute']; $data['dststartminute'] = $data['dstendminute']; $data['dstendminute'] = $start;
 			}
 		}
@@ -1471,18 +1470,18 @@ 
 	 * @param string $component=null
 	 * @return array with parsed ical components
 	 */
-	static public function ical2array(&$ical,$component=null)
+	static public function ical2array(&$ical, $component = 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')
 			{
 				break;
 			}
@@ -1506,13 +1505,13 @@ 
 	 */
 	public static function as2tz(array $data)
 	{
-		static $cache;	// some caching withing the request
+		static $cache; // 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
 			{
@@ -1531,7 +1530,7 @@ 
 					break;
 				}
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				// simpy ignore that, as it only means $tz can NOT be converted, because it has no VTIMEZONE component
 			}
 		}
@@ -1545,8 +1544,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;
@@ -1559,7 +1558,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"]);
@@ -1583,7 +1582,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');
@@ -1619,8 +1618,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";
@@ -1634,7 +1633,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==',
@@ -1647,9 +1646,9 @@ 
 	) 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_arr = calendar_activesync::ical2array($ical_tz=$ical);
+		$ical_arr = calendar_activesync::ical2array($ical_tz = $ical);
 		//echo "<pre>".print_r($ical_arr,true)."</pre>\n";
 		$as_tz = calendar_activesync::tz2as($tz);
 		//echo "$tz=<pre>".print_r($as_tz,true)."</pre>\n";
@@ -1663,22 +1662,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 +223 added lines, -54 removed lines

@@ -17,8 +17,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
+	{
+}
 }
 
 /**
@@ -78,7 +82,10 @@ 
 	 */
 	public function GetFolderList()
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$cals = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
 		$cals = $cals ? explode(',',$cals) : array('P');	// implicit default of 'P'
@@ -177,12 +184,19 @@ 
   	 */
 	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();
+		}
 
 		debugLog (__METHOD__."('$id',$cutoffdate)");
 		$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,
@@ -201,7 +215,10 @@ 
 		$messagelist = array();
 		foreach ($this->calendar->search($filter) 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
@@ -271,7 +288,10 @@ 
 	 */
 	function GetMeetingRequest($id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
 	{
-		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')))
 		{
@@ -348,7 +368,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)))
 		{
@@ -360,7 +383,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'];
 
@@ -395,7 +421,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',
@@ -405,9 +434,12 @@ 
 		$status = 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)
 			{
 				debugLog(__METHOD__."('$event') error parsing iCal!");
@@ -513,7 +545,10 @@ 
 	 */
 	public function ChangeMessage($folderid, $id, $message)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$event = array();
 		$this->backend->splitID($folderid, $type, $account);
@@ -527,10 +562,13 @@ 
 			debugLog(__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
 			debugLog(__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 ? EGW_ACL_EDIT : EGW_ACL_ADD,$event ? $event : 0,$account))
@@ -540,7 +578,11 @@ 
 			error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id)
+		{
+			$event['owner'] = $account;
+		}
+		// we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $event);
 
@@ -566,7 +608,10 @@ 
 					$ex_event = $event;
 					unset($ex_event['id']);
 					unset($ex_event['etag']);
-					foreach($ex_event as $name => $value) if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+					foreach($ex_event as $name => $value)
+					{
+						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
 					if ($event['id'] && ($ex_events = $this->calendar->search(array(
@@ -618,7 +663,10 @@ 
 			'end' => 'endtime',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = egw_time::server2user($message->$attr);
+			if (isset($message->$attr))
+			{
+				$event[$key] = egw_time::server2user($message->$attr);
+			}
 		}
 		// copying strings
 		foreach(array(
@@ -627,7 +675,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
@@ -646,14 +697,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
 
 			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
 			{
@@ -667,7 +726,10 @@ 
 					//'n_fn' => $attendee->name,	// not sure if we want matches without email
 				);
 				// search addressbook for participant
-				if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new addressbook_bo();
+				}
 				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',
@@ -675,10 +737,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.'>';
@@ -706,7 +771,11 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//debugLog("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)))
 			{
@@ -720,10 +789,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;
 			}
+			}
 			//debugLog("-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
 			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
 		}
@@ -738,12 +810,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]))
@@ -768,10 +847,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;
@@ -808,10 +890,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');
 			}
 		}
@@ -826,7 +911,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
@@ -836,6 +923,7 @@ 
 					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
 					{
 						unset($event['alarm'][$key]);
+			}
 					}
 				}
 				$event['alarm'][] = $alarm = array(
@@ -912,7 +1000,10 @@ 
 	 */
 	public function DeleteMessage($folderid, $id)
 	{
-		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->caledar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$ret = $this->calendar->delete($id);
 		debugLog(__METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -965,7 +1056,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		debugLog (__METHOD__."('$folderid', ".array2string($id).", truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
 		$this->backend->splitID($folderid, $type, $account);
@@ -984,7 +1078,10 @@ 
 			}
 		}
 		debugLog(__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($event['recur_exception'] as $ex) debugLog("exception=$ex=".date('Y-m-d H:i:s',$ex));
+		foreach($event['recur_exception'] as $ex)
+		{
+			debugLog("exception=$ex=".date('Y-m-d H:i:s',$ex));
+		}
 
 		$message = new SyncAppointment();
 
@@ -1004,7 +1101,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)))
 		{
@@ -1017,7 +1117,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 
 		// appoint description
@@ -1051,7 +1154,10 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			// AS does NOT want calendar owner as participant
-			if ($uid == $account) continue;
+			if ($uid == $account)
+			{
+				continue;
+			}
 			calendar_so::split_status($status, $quantity, $role);
 
 			$attendee = new SyncAttendee();
@@ -1067,7 +1173,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'])
 				{
@@ -1083,10 +1192,17 @@ 
 					$message->organizeremail = $attendee->email;
 					debugLog(__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;
 		}
@@ -1121,9 +1237,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');
@@ -1145,12 +1264,19 @@ 
 				{
 					debugLog(__METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) debugLog(__METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events)>=1)
+				{
+					debugLog(__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, $truncsize, $bodypreference, $mimesupport);
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
 					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
@@ -1170,7 +1296,10 @@ 
 				{
 					if (!empty($exception_time))
 					{
-						if (empty($event['uid'])) debugLog(__METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						if (empty($event['uid']))
+						{
+							debugLog(__METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						}
 						$exception = new SyncAppointment();	// exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
@@ -1224,11 +1353,17 @@ 
 	 */
 	public function StatMessage($folderid, $id)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
-		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;
@@ -1263,13 +1398,22 @@ 
 		$this->backend->splitID($folderid, $type, $owner);
 		debugLog(__METHOD__."('$folderid','$syncstate') type='$type', owner=$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
 		$ctag = $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 ($ctag == 0) $ctag = 1;
+		if ($ctag == 0)
+		{
+			$ctag = 1;
+		}
 		$changes = array();	// no change
 		$syncstate_was = $syncstate;
 
@@ -1351,7 +1495,10 @@ 
 		);
 
 		$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($ical=$component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1393,11 +1540,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)];
@@ -1474,7 +1627,10 @@ 
 	static public function ical2array(&$ical,$component=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);
@@ -1514,13 +1670,19 @@ 
 
 		for($n = 0; !isset($cache[$key]); ++$n)
 		{
-			if (!$n)	// check users timezone first
+			if (!$n)
+			{
+				// check users timezone first
 			{
 				$tz = egw_time::$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;
 			}
@@ -1583,7 +1745,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');
@@ -1611,13 +1777,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);

calendar/inc/class.calendar_ical.inc.php

Doc Comments +8 added lines, -7 removed lines

@@ -191,7 +191,7 @@ 
 	 *                          default 0 => export whole series (or events, if not recurring)
 	 * @param string $principalURL ='' Used for CalDAV exports
 	 * @param string $charset ='UTF-8' encoding of the vcalendar, default UTF-8
-	 * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY
+	 * @param integer $current_user =0 uid of current user to only export that one as participant for method=REPLY
 	 * @return string|boolean string with iCal or false on error (e.g. no permission to read the event)
 	 */
 	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0)
@@ -1091,16 +1091,13 @@ 
 	 * Import an iCal
 	 *
 	 * @param string|resource $_vcalData
-	 * @param int $cal_id=-1 must be -1 for new entries!
-	 * @param string $etag=null if an etag is given, it has to match the current etag or the import will fail
-	 * @param boolean $merge=false	merge data with existing entry
-	 * @param int $recur_date=0 if set, import the recurrence at this timestamp,
+	 * @param int $cal_id must be -1 for new entries!
+	 * @param int $recur_date if set, import the recurrence at this timestamp,
 	 *                          default 0 => import whole series (or events, if not recurring)
 	 * @param string $principalURL='' Used for CalDAV imports
-	 * @param int $user=null account_id of owner, default null
 	 * @param string $charset  The encoding charset for $text. Defaults to
 	 *                         utf-8 for new format, iso-8859-1 for old format.
-	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
+	 * @param string $caldav_name name from CalDAV client or null (to use default)
 	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
 	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
@@ -3145,6 +3142,10 @@ 
 		return $event;
 	}
 
+	/**
+	 * @param integer $contentID
+	 * @param string $charset
+	 */
 	function search($_vcalData, $contentID=null, $relax=false, $charset=null)
 	{
 		if (($events = $this->icaltoegw($_vcalData, $charset)))

Indentation +49 added lines, -49 removed lines

@@ -480,15 +480,15 @@ 
 									{
 										$user = $this->resource_info($this->user);
 										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
-			    						$parameters['ATTENDEE'][] = array(
-			    							'CN'		=>	$user['name'],
-			    							'ROLE'		=> 'REQ-PARTICIPANT',
+										$parameters['ATTENDEE'][] = array(
+											'CN'		=>	$user['name'],
+											'ROLE'		=> 'REQ-PARTICIPANT',
 											'PARTSTAT'	=> 'NEEDS-ACTION',
 											'CUTYPE'	=> 'INDIVIDUAL',
 											'RSVP'		=> 'TRUE',
 											'X-EGROUPWARE-UID'	=> (string)$this->user,
-			    						);
-			    						$event['participants'][$this->user] = true;
+										);
+										$event['participants'][$this->user] = true;
 									}
 									break;
 								case 'r':
@@ -540,24 +540,24 @@ 
 						}
 						break;
 
-    				case 'ORGANIZER':
-	    				if (!$organizerURL)
-	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
-			    			if ($version == '1.0')
-			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
-			    			}
-			    			else
-			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
-			    			}
-			    			$organizerUID = $event['owner'];
-		    				if (!isset($event['participants'][$event['owner']]))
-		    				{
-			    				$options = array(
+					case 'ORGANIZER':
+						if (!$organizerURL)
+						{
+							$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
+								. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
+							$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+							if ($version == '1.0')
+							{
+								$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+							}
+							else
+							{
+								$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+							}
+							$organizerUID = $event['owner'];
+							if (!isset($event['participants'][$event['owner']]))
+							{
+								$options = array(
 									'ROLE'     => 'CHAIR',
 									'PARTSTAT' => 'DELEGATED',
 									'CUTYPE'   => 'INDIVIDUAL',
@@ -567,20 +567,20 @@ 
 								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
 								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
 								$attributes['ATTENDEE'][] = $organizerURL;
-			    				$parameters['ATTENDEE'][] = $options;
-		    				}
-	    				}
-    					// do NOT use ORGANIZER for events without further participants or a different organizer
-	    				if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
-	    				{
-		    				$attributes['ORGANIZER'] = $organizerURL;
-		    				$parameters['ORGANIZER']['CN'] = $organizerCN;
-		    				if (!empty($organizerUID))
-		    				{
-			    				$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
-		    				}
-	    				}
-	    				break;
+								$parameters['ATTENDEE'][] = $options;
+							}
+						}
+						// do NOT use ORGANIZER for events without further participants or a different organizer
+						if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
+						{
+							$attributes['ORGANIZER'] = $organizerURL;
+							$parameters['ORGANIZER']['CN'] = $organizerCN;
+							if (!empty($organizerUID))
+							{
+								$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
+							}
+						}
+						break;
 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
@@ -989,12 +989,12 @@ 
 				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
 				{
 					$valueData = translation::convert($valueData,translation::charset(),$charset);
-                    $paramData = (array) translation::convert(is_array($value) ?
-                    		$parameters[$key][$valueID] : $parameters[$key],
-                            translation::charset(),$charset);
-                    $valuesData = (array) translation::convert($values[$key],
-                    		translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+					$paramData = (array) translation::convert(is_array($value) ?
+							$parameters[$key][$valueID] : $parameters[$key],
+							translation::charset(),$charset);
+					$valuesData = (array) translation::convert($values[$key],
+							translation::charset(),$charset);
+					$content = $valueData . implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -2230,7 +2230,7 @@ 
 	 * @param string|resource $_vcalData
 	 * @param string $principalURL ='' Used for CalDAV imports
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
 	function icaltoegw($_vcalData, $principalURL='', $charset=null)
@@ -2747,10 +2747,10 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
-				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
-				    }
-				    if (isset($attributes['params']['STATUS']))
+					{
+						$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
+					}
+					if (isset($attributes['params']['STATUS']))
 					{
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
 						if (empty($status)) $status = 'X';
@@ -3141,7 +3141,7 @@ 
 				array2string($event)."\n",3,$this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
-        //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		//    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 

Spacing +265 added lines, -266 removed lines

@@ -61,39 +61,39 @@ 
 	 * @var array $priority_egw2ical conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
-		0 => 0,		// undefined
-		1 => 9,		// low
-		2 => 5,		// normal
-		3 => 1,		// high
+		0 => 0, // undefined
+		1 => 9, // low
+		2 => 5, // normal
+		3 => 1, // high
 	);
 
 	/**
 	 * @var array $priority_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
-		0 => 0,		// undefined
-		9 => 1,	8 => 1, 7 => 1, 6 => 1,	// low
-		5 => 2,		// normal
-		4 => 3, 3 => 3, 2 => 3, 1 => 3,	// high
+		0 => 0, // undefined
+		9 => 1, 8 => 1, 7 => 1, 6 => 1, // low
+		5 => 2, // normal
+		4 => 3, 3 => 3, 2 => 3, 1 => 3, // high
 	);
 
 	/**
 	 * @var array $priority_egw2funambol conversion of the priority egw => funambol
 	 */
 	var $priority_egw2funambol = array(
-		0 => 1,		// undefined (mapped to normal since undefined does not exist)
-		1 => 0,		// low
-		2 => 1,		// normal
-		3 => 2,		// high
+		0 => 1, // undefined (mapped to normal since undefined does not exist)
+		1 => 0, // low
+		2 => 1, // normal
+		3 => 2, // high
 	);
 
 	/**
 	 * @var array $priority_funambol2egw conversion of the priority funambol => egw
 	 */
 	var $priority_funambol2egw = array(
-		0 => 1,		// low
-		1 => 2,		// normal
-		2 => 3,		// high
+		0 => 1, // low
+		1 => 2, // normal
+		2 => 3, // high
 	);
 
 	/**
@@ -163,7 +163,7 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-vcal";
+	var $logfile = "/tmp/log-vcal";
 
 
 	/**
@@ -194,7 +194,7 @@ 
 	 * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY
 	 * @return string|boolean string with iCal or false on error (e.g. no permission to read the event)
 	 */
-	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0)
+	function &exportVCal($events, $version = '1.0', $method = 'PUBLISH', $recur_date = 0, $principalURL = '', $charset = 'UTF-8', $current_user = 0)
 	{
 		if ($this->log)
 		{
@@ -225,13 +225,13 @@ 
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
-		if ($this->productManufacturer == '' )
+		if ($this->productManufacturer == '')
 		{	// syncevolution is broken
 			$version = '2.0';
 		}
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
 		if ($method) $vcal->setAttribute('METHOD', $method);
@@ -261,15 +261,15 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() User does not have the permission to read event ' . $event['id']. "\n",
-								3,$this->logfile);
+								'() User does not have the permission to read event '.$event['id']."\n",
+								3, $this->logfile);
 						}
 						return -1; // Permission denied
 					}
 				}
 				else
 				{
-					$retval = false;  // Entry does not exist
+					$retval = false; // Entry does not exist
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
@@ -283,7 +283,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'() export event UID: ' . $event['uid'] . ".\n",
+					'() export event UID: '.$event['uid'].".\n",
 					3, $this->logfile);
 			}
 
@@ -308,8 +308,8 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id']. ',' . $recurrence . ")\n" .
-					array2string($event)."\n",3,$this->logfile);
+					'('.$event['id'].','.$recurrence.")\n".
+					array2string($event)."\n", 3, $this->logfile);
 			}
 
 			if ($recurrence)
@@ -330,7 +330,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"(, $recurrence) Gratuitous pseudo exception, skipped ...\n",
-								3,$this->logfile);
+								3, $this->logfile);
 						}
 						continue; // unsupported status only exception
 					}
@@ -340,13 +340,13 @@ 
 					$days = $this->so->get_recurrence_exceptions($master, $tzid, 0, 0, 'rrule');
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-							array2string($days)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+							array2string($days)."\n", 3, $this->logfile);
 					}
 					$recurrence = $days[$recurrence]; // use remote representation
 				}
 				// force single event
-				foreach (array('recur_enddate','recur_interval','recur_exception','recur_data','recur_date','id','etag') as $name)
+				foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data', 'recur_date', 'id', 'etag') as $name)
 				{
 					unset($event[$name]);
 				}
@@ -354,7 +354,7 @@ 
 			}
 
 			// check if tzid of event (not only recuring ones) is already added to export
-			if ($tzid && $tzid != 'UTC' && !in_array($tzid,$vtimezones_added))
+			if ($tzid && $tzid != 'UTC' && !in_array($tzid, $vtimezones_added))
 			{
 				// check if we have vtimezone component data for tzid of event, if not default to user timezone (default to server tz)
 				if (calendar_timezones::add_vtimezone($vcal, $tzid) ||
@@ -372,7 +372,7 @@ 
 			{
 				// Append UID to DESCRIPTION
 				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
-					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+					$event['description'] .= "\n[UID:".$event['uid']."]";
 				}
 			}
 
@@ -393,14 +393,14 @@ 
 				$exceptions = array();
 
 				// dont use "virtual" exceptions created by participant status for GroupDAV or file export
-				if (!in_array($this->productManufacturer,array('file','groupdav')))
+				if (!in_array($this->productManufacturer, array('file', 'groupdav')))
 				{
 					$filter = isset($this->supportedFields['participants']) ? 'rrule' : 'tz_rrule';
 					$exceptions = $this->so->get_recurrence_exceptions($event, $tzid, 0, 0, $filter);
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n" .
-							array2string($exceptions)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n".
+							array2string($exceptions)."\n", 3, $this->logfile);
 					}
 				}
 				elseif (is_array($event['recur_exception']))
@@ -417,8 +417,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							'(' . $event['id'] . ") [$icalFieldName] not supported\n",
-							3,$this->logfile);
+							'('.$event['id'].") [$icalFieldName] not supported\n",
+							3, $this->logfile);
 					}
 					continue;
 				}
@@ -435,23 +435,23 @@ 
 
 							if (!($info = $this->resource_info($uid))) continue;
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X', 'E'))) continue; // dont include deleted participants
 
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									'()attendee:' . array2string($info) ."\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									'()attendee:'.array2string($info)."\n", 3, $this->logfile);
 							}
 							$participantCN = str_replace(array('\\', ',', ';', ':'),
 												array('\\\\', '\\,', '\\;', '\\:'),
 												trim(empty($info['cn']) ? $info['name'] : $info['cn']));
 							if ($version == '1.0')
 							{
-								$participantURL = trim('"' . $participantCN . '"' . (empty($info['email']) ? '' : ' <' . $info['email'] .'>'));
+								$participantURL = trim('"'.$participantCN.'"'.(empty($info['email']) ? '' : ' <'.$info['email'].'>'));
 							}
 							else
 							{
-								$participantURL = empty($info['email']) ? '' : 'mailto:' . $info['email'];
+								$participantURL = empty($info['email']) ? '' : 'mailto:'.$info['email'];
 							}
 							// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
 							$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
@@ -479,7 +479,7 @@ 
 										($members = $GLOBALS['egw']->accounts->members($uid, true)) && in_array($this->user, $members))
 									{
 										$user = $this->resource_info($this->user);
-										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
+										$attributes['ATTENDEE'][] = 'mailto:'.$user['email'];
 			    						$parameters['ATTENDEE'][] = array(
 			    							'CN'		=>	$user['name'],
 			    							'ROLE'		=> 'REQ-PARTICIPANT',
@@ -521,7 +521,7 @@ 
 							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
-								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
+								$options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
 							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
 							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
@@ -531,7 +531,7 @@ 
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public']) continue; // public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -543,16 +543,16 @@ 
     				case 'ORGANIZER':
 	    				if (!$organizerURL)
 	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+	    					$organizerCN = '"'.trim($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_firstname')
+			    				. ' '.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_lastname')).'"';
+			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email');
 			    			if ($version == '1.0')
 			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+		    					$organizerURL = trim($organizerCN.(empty($organizerURL) ? '' : ' <'.$organizerURL.'>'));
 			    			}
 			    			else
 			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:'.$organizerEMail;
 			    			}
 			    			$organizerUID = $event['owner'];
 		    				if (!isset($event['participants'][$event['owner']]))
@@ -585,7 +585,7 @@ 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
 						{
-							$attributes['DTSTART'] = self::getDateTime($event['start'],$tzid,$parameters['DTSTART']);
+							$attributes['DTSTART'] = self::getDateTime($event['start'], $tzid, $parameters['DTSTART']);
 						}
 						break;
 
@@ -596,27 +596,27 @@ 
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
 								$attributes['duration'] = $event['end'] - $event['start'];
 							else
-							$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							$attributes['DTEND'] = self::getDateTime($event['end'], $tzid, $parameters['DTEND']);
 						}
 						else
 						{
 							// write start + end of whole day events as dates
-							$event['end-nextday'] = $event['end'] + 12*3600;	// we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
-							foreach (array('start' => 'DTSTART','end-nextday' => 'DTEND') as $f => $t)
+							$event['end-nextday'] = $event['end'] + 12 * 3600; // we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+							foreach (array('start' => 'DTSTART', 'end-nextday' => 'DTEND') as $f => $t)
 							{
-								$time = new egw_time($event[$f],egw_time::$server_timezone);
-								$arr = egw_time::to($time,'array');
-								$vevent->setAttribute($t, array('year' => $arr['year'],'month' => $arr['month'],'mday' => $arr['day']),
+								$time = new egw_time($event[$f], egw_time::$server_timezone);
+								$arr = egw_time::to($time, 'array');
+								$vevent->setAttribute($t, array('year' => $arr['year'], 'month' => $arr['month'], 'mday' => $arr['day']),
 									array('VALUE' => 'DATE'));
 							}
 							unset($attributes['DTSTART']);
 							// Outlook does NOT care about type of DTSTART/END, only setting X-MICROSOFT-CDO-ALLDAYEVENT is used to determine an event is a whole-day event
-							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT','TRUE');
+							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
 						}
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE) break; // no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -635,16 +635,16 @@ 
 						{
 							if ($event['recur_enddate'] && $tzid)
 							{
-								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'],$tzid);
+								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'], $tzid);
 							}
 							$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
 						}
 						else // $version == '2.0'
 						{
 							$attributes['RRULE'] = '';
-							foreach($rrule as $n => $v)
+							foreach ($rrule as $n => $v)
 							{
-								$attributes['RRULE'] .= ($attributes['RRULE']?';':'').$n.'='.$v;
+								$attributes['RRULE'] .= ($attributes['RRULE'] ? ';' : '').$n.'='.$v;
 							}
 						}
 						break;
@@ -659,7 +659,7 @@ 
 								{
 									// current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, so we should not set a timezone here
 									// Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
-									$event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid);//,$parameters['EXDATE']);
+									$event['recur_exception'][$key] = self::getDateTime($timestamp, $tzid); //,$parameters['EXDATE']);
 								}
 							}
 							else
@@ -667,9 +667,9 @@ 
 								// use 'DATE' instead of 'DATE-TIME' on whole day events
 								foreach ($event['recur_exception'] as $id => $timestamp)
 								{
-									$time = new egw_time($timestamp,egw_time::$server_timezone);
+									$time = new egw_time($timestamp, egw_time::$server_timezone);
 									$time->setTimezone(self::$tz_cache[$event['tzid']]);
-									$arr = egw_time::to($time,'array');
+									$arr = egw_time::to($time, 'array');
 									$days[$id] = array(
 										'year'  => $arr['year'],
 										'month' => $arr['month'],
@@ -684,21 +684,21 @@ 
 						break;
 
 					case 'PRIORITY':
-						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority']) continue; // 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2funambol[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2funambol[$event['priority']];
 						}
 						else
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2ical[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2ical[$event['priority']];
 						}
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking']) continue; // OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -737,13 +737,13 @@ 
 							// We handle a pseudo exception
 							if (empty($event['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($recur_date,$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($recur_date, $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new egw_time($recur_date,egw_time::$server_timezone);
+								$time = new egw_time($recur_date, egw_time::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = egw_time::to($time,'array');
+								$arr = egw_time::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -755,17 +755,17 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference']))) break; // referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'],$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'], $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new egw_time($event['recurrence'],egw_time::$server_timezone);
+								$time = new egw_time($event['recurrence'], egw_time::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = egw_time::to($time,'array');
+								$arr = egw_time::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -789,9 +789,9 @@ 
 							$noTruncate = $this->clientProperties[$icalFieldName]['NoTruncate'];
 							if ($this->log && $size > 0)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName Size: $size, NoTruncate: " .
-									($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName Size: $size, NoTruncate: ".
+									($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName Size: $size, NoTruncate: " .
 							//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -809,8 +809,8 @@ 
 							{
 								if ($this->log)
 								{
-									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-										"() $icalFieldName omitted due to maximum size $size\n",3,$this->logfile);
+									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+										"() $icalFieldName omitted due to maximum size $size\n", 3, $this->logfile);
 								}
 								//Horde::logMessage("vCalendar $icalFieldName omitted due to maximum size $size",
 								//	__FILE__, __LINE__, PEAR_LOG_WARNING);
@@ -820,8 +820,8 @@ 
 							$value = substr($value, 0, $size - 1);
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName truncated to maximum size $size\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName truncated to maximum size $size\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName truncated to maximum size $size",
 							//	__FILE__, __LINE__, PEAR_LOG_INFO);
@@ -836,7 +836,7 @@ 
 			// for CalDAV add all X-Properties previously parsed
 			if ($this->productManufacturer == 'groupdav' || $this->productManufacturer == 'file')
 			{
-				foreach($event as $name => $value)
+				foreach ($event as $name => $value)
 				{
 					if (substr($name, 0, 2) == '##')
 					{
@@ -908,8 +908,8 @@ 
 						$values['AALARM']['repeat count'] = '';
 						$values['AALARM']['display text'] = $description;
 					}
-					$attributes['DALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['DALARM']);
-					$attributes['AALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['AALARM']);
+					$attributes['DALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['DALARM']);
+					$attributes['AALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['AALARM']);
 					// lets take only the first alarm
 					break;
 				}
@@ -946,7 +946,7 @@ 
 						$alarmData['offset'] = false;
 					}
 
-					$valarm = Horde_Icalendar::newComponent('VALARM',$vevent);
+					$valarm = Horde_Icalendar::newComponent('VALARM', $vevent);
 					if ($alarmData['offset'] !== false)
 					{
 						$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
@@ -955,7 +955,7 @@ 
 					else
 					{
 						$params = array('VALUE' => 'DATE-TIME');
-						$value = self::getDateTime($alarmData['time'],$tzid,$params);
+						$value = self::getDateTime($alarmData['time'], $tzid, $params);
 						$valarm->setAttribute('TRIGGER', $value, $params);
 					}
 					if (!empty($alarmData['uid']))
@@ -966,7 +966,7 @@ 
 					// set evtl. existing attributes set by iCal clients not used by EGroupware
 					if (isset($alarmData['attrs']))
 					{
-						foreach($alarmData['attrs'] as $attr => $data)
+						foreach ($alarmData['attrs'] as $attr => $data)
 						{
 							$valarm->setAttribute($attr, $data['value'], $data['params']);
 						}
@@ -974,11 +974,11 @@ 
 					// set default ACTION and DESCRIPTION, if not set by a client
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['ACTION']))
 					{
-						$valarm->setAttribute('ACTION','DISPLAY');
+						$valarm->setAttribute('ACTION', 'DISPLAY');
 					}
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['DESCRIPTION']))
 					{
-						$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $description);
+						$valarm->setAttribute('DESCRIPTION', $event['title'] ? $event['title'] : $description);
 					}
 					$vevent->addComponent($valarm);
 				}
@@ -986,15 +986,15 @@ 
 
 			foreach ($attributes as $key => $value)
 			{
-				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
+				foreach (is_array($value) && $parameters[$key]['VALUE'] != 'DATE' ? $value : array($value) as $valueID => $valueData)
 				{
-					$valueData = translation::convert($valueData,translation::charset(),$charset);
-                    $paramData = (array) translation::convert(is_array($value) ?
+					$valueData = translation::convert($valueData, translation::charset(), $charset);
+                    $paramData = (array)translation::convert(is_array($value) ?
                     		$parameters[$key][$valueID] : $parameters[$key],
-                            translation::charset(),$charset);
-                    $valuesData = (array) translation::convert($values[$key],
-                    		translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+                            translation::charset(), $charset);
+                    $valuesData = (array)translation::convert($values[$key],
+                    		translation::charset(), $charset);
+                    $content = $valueData.implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -1044,10 +1044,10 @@ 
 		$retval = $events_exported ? $vcal->exportvCalendar() : false;
  		if ($this->log)
  		{
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"() '$this->productManufacturer','$this->productName'\n",3,$this->logfile);
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"()\n".array2string($retval)."\n",3,$this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productManufacturer','$this->productName'\n", 3, $this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"()\n".array2string($retval)."\n", 3, $this->logfile);
  		}
 		return $retval;
 	}
@@ -1060,15 +1060,15 @@ 
 	 * @param array &$params=null parameter array to set TZID
 	 * @return mixed attribute value to set: integer timestamp if $tzid == 'UTC' otherwise Ymd\THis string IN $tzid
 	 */
-	static function getDateTime($time,$tzid,array &$params=null)
+	static function getDateTime($time, $tzid, array &$params = null)
 	{
 		if (empty($tzid) || $tzid == 'UTC')
 		{
-			return egw_time::to($time,'ts');
+			return egw_time::to($time, 'ts');
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new egw_time($time,egw_time::$server_timezone);
+			$time = new egw_time($time, egw_time::$server_timezone);
 		}
 		if (!isset(self::$tz_cache[$tzid]))
 		{
@@ -1103,11 +1103,11 @@ 
 	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
 	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
-	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
+	function importVCal($_vcalData, $cal_id = -1, $etag = null, $merge = false, $recur_date = 0, $principalURL = '', $user = null, $charset = null, $caldav_name = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(, $cal_id, $etag, $merge, $recur_date, $principalURL, $user, $charset, $caldav_name)");
 		$this->events_imported = 0;
-		$replace = $delete_exceptions= false;
+		$replace = $delete_exceptions = false;
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
@@ -1115,7 +1115,7 @@ 
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events)) $cal_id = -1; // just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1123,7 +1123,7 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
+				if (!is_null($etag)) $events[0]['etag'] = (int)$etag;
 				if ($recur_date) $events[0]['recurrence'] = $recur_date;
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
@@ -1175,7 +1175,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					."($cal_id, $etag, $recur_date, $principalURL, $user, $charset)\n"
-					. array2string($event)."\n",3,$this->logfile);
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			$updated_id = false;
@@ -1198,14 +1198,14 @@ 
 					{
 						if ($delete_exceptions)
 						{
-							$this->delete($id,0,false,$skip_notification);
+							$this->delete($id, 0, false, $skip_notification);
 						}
 						else
 						{
 							if (!($exception = $this->read($id))) continue;
 							$exception['uid'] = common::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
-							$this->update($exception, true,true,false,true,$msg,$skip_notification);
+							$this->update($exception, true, true, false, true, $msg, $skip_notification);
 						}
 					}
 				}
@@ -1222,7 +1222,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. "(UPDATE Event)\n"
-						. array2string($event_info['stored_event'])."\n",3,$this->logfile);
+						. array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 				}
 				if (empty($event['uid']))
 				{
@@ -1244,7 +1244,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore status for $uid\n",3,$this->logfile);
+										"() Restore status for $uid\n", 3, $this->logfile);
 								}
 								$event['participants'][$uid] = $event_info['stored_event']['participants'][$uid];
 							}
@@ -1268,7 +1268,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"()[MERGE]\n",3,$this->logfile);
+							"()[MERGE]\n", 3, $this->logfile);
 					}
 					// overwrite with server data for merge
 					foreach ($event_info['stored_event'] as $key => $value)
@@ -1298,7 +1298,7 @@ 
 				else
 				{
 					// no merge
-					if(!isset($this->supportedFields['category']) || !isset($event['category']))
+					if (!isset($this->supportedFields['category']) || !isset($event['category']))
 					{
 						$event['category'] = $event_info['stored_event']['category'];
 					}
@@ -1310,7 +1310,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() No participants\n",3,$this->logfile);
+							"() No participants\n", 3, $this->logfile);
 						}
 
 						// If this is an updated meeting, and the client doesn't support
@@ -1329,7 +1329,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore resource $uid to status $status\n",3,$this->logfile);
+										"() Restore resource $uid to status $status\n", 3, $this->logfile);
 								}
 								// Add it back in
 								$event['participants'][$uid] = $status;
@@ -1417,8 +1417,7 @@ 
 						}
 						// for resources check which new-status to give (eg. with direct booking permision 'A' instead 'U')
 						$event['participants'][$user] = calendar_so::combine_status(
-							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' :
-							ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
+							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' : ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
 					}
 				}
 				// check if an owner is set and the current user has add rights
@@ -1483,9 +1482,9 @@ 
 
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ . '('
-					. $event_info['type'] . ")\n"
-					. array2string($event)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'('
+					. $event_info['type'].")\n"
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			// Android (any maybe others) delete recurrences by setting STATUS: CANCELLED
@@ -1493,10 +1492,10 @@ 
 			if (in_array($event_info['type'], array('SERIES-EXCEPTION', 'SERIES-EXCEPTION-PROPAGATE', 'SERIES-PSEUDO-EXCEPTION')) &&
 				$event['status'] == 'CANCELLED')
 			{
-				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'],false,$skip_notification))
+				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'], false, $skip_notification))
 				{
 					// delete fails (because no rights), reject recurrence
-					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'],false,true,$skip_notification);
+					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'], false, true, $skip_notification);
 				}
 				continue;
 			}
@@ -1508,7 +1507,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SINGLE\n",3,$this->logfile);
+							"(): event SINGLE\n", 3, $this->logfile);
 					}
 
 					// update the event
@@ -1518,7 +1517,7 @@ 
 						$event['reference'] = 0;
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1527,7 +1526,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-MASTER\n",3,$this->logfile);
+							"(): event SERIES-MASTER\n", 3, $this->logfile);
 					}
 
 					// remove all known pseudo exceptions and update the event
@@ -1537,8 +1536,8 @@ 
 						$days = $this->so->get_recurrence_exceptions($event_info['stored_event'], $this->tzid, 0, 0, $filter);
 						if ($this->log)
 						{
-							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n" .
-								array2string($days)."\n",3,$this->logfile);
+							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n".
+								array2string($days)."\n", 3, $this->logfile);
 						}
 						if (is_array($days))
 						{
@@ -1556,7 +1555,7 @@ 
 
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1566,7 +1565,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-EXCEPTION\n", 3, $this->logfile);
 					}
 
 					// update event
@@ -1622,13 +1621,13 @@ 
 							$event['owner'] = $event_info['master_event']['owner'];
 							$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 							$this->server2usertime($event_to_store);
-							$this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+							$this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 							unset($event_to_store);
 						}
 
 						$event_to_store = $event; // prevent $event from being changed by update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1637,7 +1636,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-PSEUDO-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-PSEUDO-EXCEPTION\n", 3, $this->logfile);
 					}
 					//Horde::logMessage('importVCAL event SERIES-PSEUDO-EXCEPTION',
 					//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1658,7 +1657,7 @@ 
 						// save the series master with the adjusted exceptions
 						$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true, true, false, false,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, false, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 
@@ -1685,13 +1684,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], 0, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['stored_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1703,13 +1702,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'], $recurrence,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], $recurrence, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['master_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['master_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1726,7 +1725,7 @@ 
 					break;
 
 				case 'SERIES-PSEUDO-EXCEPTION':
-					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'] . ':' . $event['recurrence'] : false;
+					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'].':'.$event['recurrence'] : false;
 					break;
 
 				case 'SERIES-EXCEPTION-PROPAGATE':
@@ -1739,7 +1738,7 @@ 
 					{
 						// we did not have sufficient rights to propagate the status only exception to a real one
 						// we have to keep the SERIES-PSEUDO-EXCEPTION id and keep the event untouched
-						$return_id = $event_info['master_event']['id'] . ':' . $event['recurrence'];
+						$return_id = $event_info['master_event']['id'].':'.$event['recurrence'];
 					}
 					break;
 			}
@@ -1753,8 +1752,8 @@ 
 			if ($this->log)
 			{
 				$event_info['stored_event'] = $this->read($event_info['stored_event']['id']);
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n" .
-					array2string($event_info['stored_event'])."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n".
+					array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 			}
 		}
 		date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
@@ -1774,10 +1773,10 @@ 
 	{
 		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
 		$modified = 0;
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			// check if alarm is already stored or from other users
-			foreach($old_alarms as $id => $old_alarm)
+			foreach ($old_alarms as $id => $old_alarm)
 			{
 				// not current users alarm --> ignore
 				if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1814,7 +1813,7 @@ 
 			}
 		}
 		// remove all old alarms left from current user
-		foreach($old_alarms as $id => $old_alarm)
+		foreach ($old_alarms as $id => $old_alarm)
 		{
 			// not current users alarm --> ignore
 			if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1837,7 +1836,7 @@ 
 	 * @param string $what ='value'
 	 * @return mixed
 	 */
-	static function _get_attribute($components,$name,$what='value')
+	static function _get_attribute($components, $name, $what = 'value')
 	{
 		foreach ($components as $attribute)
 		{
@@ -1872,7 +1871,7 @@ 
 						case 'DURATION':
 							if (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] == 'END')
 							{
-								$alarm['offset'] = $duration -$vattr['value'];
+								$alarm['offset'] = $duration - $vattr['value'];
 							}
 							elseif (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] != 'START')
 							{
@@ -1888,7 +1887,7 @@ 
 							$alarm['time'] = $vattr['value'];
 							break;
 						default:
-							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
+							error_log('VALARM/TRIGGER: unsupported value type:'.$vtype);
 					}
 					break;
 
@@ -1913,9 +1912,9 @@ 
 		return 0;
 	}
 
-	function setSupportedFields($_productManufacturer='', $_productName='')
+	function setSupportedFields($_productManufacturer = '', $_productName = '')
 	{
-		$state =& $_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 		if (isset($state))
 		{
 			$deviceInfo = $state->getClientDeviceInfo();
@@ -2212,10 +2211,10 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productManufacturer .
-				', '. $this->productName .', ' .
-				($this->tzid ? $this->tzid : egw_time::$user_timezone->getName()) .
-				', ' . $this->calendarOwner . ")\n" , 3, $this->logfile);
+				'('.$this->productManufacturer.
+				', '.$this->productName.', '.
+				($this->tzid ? $this->tzid : egw_time::$user_timezone->getName()).
+				', '.$this->calendarOwner.")\n", 3, $this->logfile);
 		}
 
 		//Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', '
@@ -2233,12 +2232,12 @@ 
      *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
-	function icaltoegw($_vcalData, $principalURL='', $charset=null)
+	function icaltoegw($_vcalData, $principalURL = '', $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
@@ -2246,7 +2245,7 @@ 
 		// we use egw_ical_iterator only on resources, as calling importVCal() accesses single events like an array (eg. $events[0])
 		if (is_resource($_vcalData))
 		{
-			return new egw_ical_iterator($_vcalData,'VCALENDAR',$charset,array($this,'_ical2egw_callback'),array($this->tzid,$principalURL));
+			return new egw_ical_iterator($_vcalData, 'VCALENDAR', $charset, array($this, '_ical2egw_callback'), array($this->tzid, $principalURL));
 		}
 
 		if ($this->tzid)
@@ -2271,14 +2270,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"(): No vCalendar Container found!\n",3,$this->logfile);
+					"(): No vCalendar Container found!\n", 3, $this->logfile);
 			}
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 			return false;
 		}
 		foreach ($vcal->getComponents() as $component)
 		{
-			if (($event = $this->_ical2egw_callback($component,$this->tzid,$principalURL,$vcal)))
+			if (($event = $this->_ical2egw_callback($component, $this->tzid, $principalURL, $vcal)))
 			{
 				$events[] = $event;
 			}
@@ -2297,13 +2296,13 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean event array or false if $component is no Horde_Icalendar_Vevent
 	 */
-	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL='', Horde_Icalendar $container=null)
+	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL = '', Horde_Icalendar $container = null)
 	{
 		//unset($component->_container); _debug_array($component);
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n", 3, $this->logfile);
 		}
 
 		if (!is_a($component, 'Horde_Icalendar_Vevent') ||
@@ -2352,16 +2351,16 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean			event on success, false on failure
 	 */
-	function vevent2egw($component, $version, $supportedFields, $principalURL='', $check_component='Horde_Icalendar_Vevent', Horde_Icalendar $container=null)
+	function vevent2egw($component, $version, $supportedFields, $principalURL = '', $check_component = 'Horde_Icalendar_Vevent', Horde_Icalendar $container = null)
 	{
-		unset($principalURL);	// not longer used, but required in function signature
+		unset($principalURL); // not longer used, but required in function signature
 
 		if ($check_component && !is_a($component, $check_component))
 		{
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()' .
-					get_class($component)." found\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()'.
+					get_class($component)." found\n", 3, $this->logfile);
 			}
 			return false;
 		}
@@ -2377,11 +2376,11 @@ 
 
 		$isDate = false;
 		$event		= array();
-		$alarms		= array();
-		$vcardData	= array(
+		$alarms = array();
+		$vcardData = array(
 			'recur_type'		=> MCAL_RECUR_NONE,
 			'recur_exception'	=> array(),
-			'priority'          => 0,	// iCalendar default is 0=undefined, not EGroupware 5=normal
+			'priority'          => 0, // iCalendar default is 0=undefined, not EGroupware 5=normal
 		);
 		// we need to parse DTSTART, DTEND or DURATION (in that order!) first
 		foreach (array_merge(
@@ -2398,7 +2397,7 @@ 
 						$isDate = true;
 					}
 					$dtstart_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					$vcardData['start']	= $dtstart_ts;
+					$vcardData['start'] = $dtstart_ts;
 
 					if ($this->tzid)
 					{
@@ -2421,18 +2420,18 @@ 
 								}
 								else
 								{
-									error_log(__METHOD__ . '() unknown TZID='
-										. $attributes['params']['TZID'] . ', defaulting to timezone "'
-										. date_default_timezone_get() . '".'.array2string($tz));
-									$event['tzid'] = date_default_timezone_get();	// default to current timezone
+									error_log(__METHOD__.'() unknown TZID='
+										. $attributes['params']['TZID'].', defaulting to timezone "'
+										. date_default_timezone_get().'".'.array2string($tz));
+									$event['tzid'] = date_default_timezone_get(); // default to current timezone
 								}
 							}
-							catch(Exception $e)
+							catch (Exception $e)
 							{
-								error_log(__METHOD__ . '() unknown TZID='
-									. $attributes['params']['TZID'] . ', defaulting to timezone "'
-									. date_default_timezone_get() . '".'.$e->getMessage());
-								$event['tzid'] = date_default_timezone_get();	// default to current timezone
+								error_log(__METHOD__.'() unknown TZID='
+									. $attributes['params']['TZID'].', defaulting to timezone "'
+									. date_default_timezone_get().'".'.$e->getMessage());
+								$event['tzid'] = date_default_timezone_get(); // default to current timezone
 							}
 						}
 						else
@@ -2447,11 +2446,11 @@ 
 
 				case 'DTEND':
 					$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					if (date('H:i:s',$dtend_ts) == '00:00:00')
+					if (date('H:i:s', $dtend_ts) == '00:00:00')
 					{
 						$dtend_ts -= 1;
 					}
-					$vcardData['end']	= $dtend_ts;
+					$vcardData['end'] = $dtend_ts;
 					break;
 
 				case 'DURATION':	// clients can use DTSTART+DURATION, instead of DTSTART+DTEND
@@ -2471,7 +2470,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. "() DTSTART missing!\n",3,$this->logfile);
+					. "() DTSTART missing!\n", 3, $this->logfile);
 			}
 			return false; // not a valid entry
 		}
@@ -2483,7 +2482,7 @@ 
 				case 'X-MICROSOFT-CDO-ALLDAYEVENT':
 					if (isset($supportedFields['whole_day']))
 					{
-						$event['whole_day'] = (isset($attributes['value'])?strtoupper($attributes['value'])=='TRUE':true);
+						$event['whole_day'] = (isset($attributes['value']) ? strtoupper($attributes['value']) == 'TRUE' : true);
 					}
 					break;
 				case 'AALARM':
@@ -2513,32 +2512,32 @@ 
 					$vcardData['recurrence'] = $attributes['value'];
 					break;
 				case 'LOCATION':
-					$vcardData['location']	= str_replace("\r\n", "\n", $attributes['value']);
+					$vcardData['location'] = str_replace("\r\n", "\n", $attributes['value']);
 					break;
 				case 'RRULE':
 					$recurence = $attributes['value'];
 					$vcardData['recur_interval'] = 1;
-					$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
+					$type = preg_match('/FREQ=([^;: ]+)/i', $recurence, $matches) ? $matches[1] : $recurence[0];
 					// vCard 2.0 values for all types
-					if (preg_match('/UNTIL=([0-9TZ]+)/',$recurence,$matches))
+					if (preg_match('/UNTIL=([0-9TZ]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($matches[1]);
 						// If it couldn't be parsed, treat it as not set
-						if(is_string($vcardData['recur_enddate']))
+						if (is_string($vcardData['recur_enddate']))
 						{
 							unset($vcardData['recur_enddate']);
 						}
 					}
-					elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
+					elseif (preg_match('/COUNT=([0-9]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_count'] = (int)$matches[1];
 					}
-					if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
+					if (preg_match('/INTERVAL=([0-9]+)/', $recurence, $matches))
 					{
-						$vcardData['recur_interval'] = (int) $matches[1] ? (int) $matches[1] : 1;
+						$vcardData['recur_interval'] = (int)$matches[1] ? (int)$matches[1] : 1;
 					}
 					$vcardData['recur_data'] = 0;
-					switch($type)
+					switch ($type)
 					{
 						case 'D':	// 1.0
 							$recurenceMatches = null;
@@ -2562,20 +2561,20 @@ 
 						case 'W':
 						case 'WEEKLY':
 							$days = array();
-							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))		// 1.0
+							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/', $recurence, $recurenceMatches))		// 1.0
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								if (empty($recurenceMatches[2]))
 								{
-									$days[0] = strtoupper(substr(date('D', $vcardData['start']),0,2));
+									$days[0] = strtoupper(substr(date('D', $vcardData['start']), 0, 2));
 								}
 								else
 								{
-									$days = explode(' ',trim($recurenceMatches[2]));
+									$days = explode(' ', trim($recurenceMatches[2]));
 								}
 
 								$repeatMatches = null;
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $repeatMatches))
 								{
 									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
 								}
@@ -2586,21 +2585,21 @@ 
 
 								$recur_days = $this->recur_days_1_0;
 							}
-							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							elseif (preg_match('/BYDAY=([^;: ]+)/', $recurence, $recurenceMatches))	// 2.0
 							{
-								$days = explode(',',$recurenceMatches[1]);
+								$days = explode(',', $recurenceMatches[1]);
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
 							{
-								$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
+								$vcardData['recur_data'] |= 1 << (int)date('w', $vcardData['start']);
 								$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
 							}
 							if ($days)
 							{
 								foreach ($recur_days as $id => $day)
 								{
-									if (in_array(strtoupper(substr($day,0,2)),$days))
+									if (in_array(strtoupper(substr($day, 0, 2)), $days))
 									{
 										$vcardData['recur_data'] |= $id;
 									}
@@ -2616,17 +2615,17 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
 							}
-							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$recurenceMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $recurenceMatches))
 								{
 									$vcardData['recur_count'] = $recurenceMatches[1];
 								}
@@ -2643,7 +2642,7 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
@@ -2657,11 +2656,11 @@ 
 							}
 							// handle FREQ=YEARLY;BYDAY= as FREQ=MONTHLY;BYDAY= with 12*INTERVAL
 							$vcardData['recur_interval'] = $vcardData['recur_interval'] ?
-								12*$vcardData['recur_interval'] : 12;
+								12 * $vcardData['recur_interval'] : 12;
 							// fall-through
 						case 'MONTHLY':
 							// does currently NOT parse BYDAY or BYMONTH, it has to be specified/identical to DTSTART
-							$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
+							$vcardData['recur_type'] = strpos($recurence, 'BYDAY') !== false ?
 								MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
 							break;
 					}
@@ -2717,11 +2716,11 @@ 
 						(strpos($this->productName, 'outlook') !== false
 							|| strpos($this->productName, 'pocket pc') !== false))
 					{
-						$vcardData['priority'] = (int) $this->priority_funambol2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_funambol2egw[$attributes['value']];
 					}
 					else
 					{
-						$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_ical2egw[$attributes['value']];
 					}
 					break;
 				case 'CATEGORIES':
@@ -2735,10 +2734,10 @@ 
 					}
 					break;
 				case 'ORGANIZER':
-					$event['organizer'] = $attributes['value'];	// no egw field, but needed in AS
-					if (strtolower(substr($event['organizer'],0,7)) == 'mailto:')
+					$event['organizer'] = $attributes['value']; // no egw field, but needed in AS
+					if (strtolower(substr($event['organizer'], 0, 7)) == 'mailto:')
 					{
-						$event['organizer'] = substr($event['organizer'],7);
+						$event['organizer'] = substr($event['organizer'], 7);
 					}
 					if (!empty($attributes['params']['CN']))
 					{
@@ -2775,19 +2774,19 @@ 
 					}
 					// try parsing email and cn from attendee
 					elseif (preg_match('/mailto:([@.a-z0-9_-]+)|mailto:"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$email = $matches[1] ? $matches[1] : $matches[3];
-						$cn = isset($matches[2]) ? $matches[2]: '';
+						$cn = isset($matches[2]) ? $matches[2] : '';
 					}
 					elseif (!empty($attributes['value']) &&
 						preg_match('/"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$cn = $matches[1];
 						$email = $matches[2];
 					}
-					elseif (strpos($attributes['value'],'@') !== false)
+					elseif (strpos($attributes['value'], '@') !== false)
 					{
 						$email = $attributes['value'];
 					}
@@ -2804,7 +2803,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "(): Found X-EGROUPWARE-UID: '$uid'\n",3,$this->logfile);
+								. "(): Found X-EGROUPWARE-UID: '$uid'\n", 3, $this->logfile);
 						}
 					}
 					elseif ($attributes['value'] == 'Unknown')
@@ -2822,7 +2821,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Found account: '$uid', '$cn', '$email'\n",3,$this->logfile);
+								. "() Found account: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 						}
 					}
 					if (!$uid)
@@ -2839,9 +2838,9 @@ 
 							$cn = str_replace(array('\\,', '\\;', '\\:', '\\\\'),
 										array(',', ';', ':', '\\'),
 										$attributes['params']['CN']);
-							if ($cn[0] == '"' && substr($cn,-1) == '"')
+							if ($cn[0] == '"' && substr($cn, -1) == '"')
 							{
-								$cn = substr($cn,1,-1);
+								$cn = substr($cn, 1, -1);
 							}
 							// not searching for $cn, as match can be not unique or without an email address
 							// --> notification will fail, better store just as email
@@ -2850,19 +2849,19 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Search participant: '$cn', '$email'\n",3,$this->logfile);
+								. "() Search participant: '$cn', '$email'\n", 3, $this->logfile);
 						}
 
 						//elseif (//$attributes['params']['CUTYPE'] == 'GROUP'
-						if (preg_match('/(.*) '. lang('Group') . '/', $cn, $matches))
+						if (preg_match('/(.*) '.lang('Group').'/', $cn, $matches))
 						{
 							// we found a group
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found group: '$matches[1]', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found group: '$matches[1]', '$cn', '$email'\n", 3, $this->logfile);
 							}
-							if (($uid =  $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
+							if (($uid = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
 							{
 								//Horde::logMessage("vevent2egw: group participant $uid",
 								//			__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -2876,7 +2875,7 @@ 
 										//Horde::logMessage("vevent2egw: set status to " . $status,
 										//		__FILE__, __LINE__, PEAR_LOG_DEBUG);
 										$vcardData['participants'][$this->user] =
-											calendar_so::combine_status($status,$quantity,$role);
+											calendar_so::combine_status($status, $quantity, $role);
 									}
 								}
 								$status = 'U'; // keep the group
@@ -2885,36 +2884,36 @@ 
 						}
 						elseif (empty($searcharray))
 						{
-							continue;	// participants without email AND CN --> ignore it
+							continue; // participants without email AND CN --> ignore it
 						}
 						elseif ((list($data) = $this->addressbook->search($searcharray,
-							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')))
 						{
 							// found an addressbook entry
 							$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found addressbook entry: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found addressbook entry: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 						else
 						{
 							if (!$email)
 							{
-								$email = 'no-email@egroupware.org';	// set dummy email to store the CN
+								$email = 'no-email@egroupware.org'; // set dummy email to store the CN
 							}
-							$uid = 'e'. ($cn ? $cn . ' <' . $email . '>' : $email);
+							$uid = 'e'.($cn ? $cn.' <'.$email.'>' : $email);
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 					}
-					switch($attributes['name'])
+					switch ($attributes['name'])
 					{
 						case 'ATTENDEE':
 							if (!isset($attributes['params']['ROLE']) &&
@@ -2928,7 +2927,7 @@ 
 								// keep role 'CHAIR' from an external organizer, even if he is a regular participant with a different role
 								// as this is currently the only way to store an external organizer and send him iMip responses
 								$q = $r = null;
-								if (isset($vcardData['participants'][$uid]) && ($s=$vcardData['participants'][$uid]) &&
+								if (isset($vcardData['participants'][$uid]) && ($s = $vcardData['participants'][$uid]) &&
 									calendar_so::split_status($s, $q, $r) && $r == 'CHAIR')
 								{
 									$role = 'CHAIR';
@@ -2942,7 +2941,7 @@ 
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
 										$component->getAttribute('ORGANIZER');
 								}
-								catch(Horde_Icalendar_Exception $e)
+								catch (Horde_Icalendar_Exception $e)
 								{
 									// we can store the ORGANIZER as event owner
 									$event['owner'] = $uid;
@@ -2998,7 +2997,7 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break; // handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3056,7 +3055,7 @@ 
 					if ($event['recur_type'] != MCAL_RECUR_NONE)
 					{
 						$event['reference'] = 0;
-						foreach (array('recur_interval','recur_enddate','recur_data','recur_exception','recur_count') as $r)
+						foreach (array('recur_interval', 'recur_enddate', 'recur_data', 'recur_exception', 'recur_count') as $r)
 						{
 							if (isset($vcardData[$r]))
 							{
@@ -3079,12 +3078,12 @@ 
 			// reset recure_enddate to 00:00:00 on the last day
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->normalize_enddate();
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3093,16 +3092,16 @@ 
 			$event['recur_enddate'] = egw_time::to($last, 'server');
 		}
 		// translate COUNT into an enddate, as we only store enddates
-		elseif($event['recur_count'])
+		elseif ($event['recur_count'])
 		{
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->count2date($event['recur_count']);
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__,
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3116,7 +3115,7 @@ 
 			if ($this->productManufacturer == 'groupdav' && $container &&
 				($x_calendarserver_access = $container->getAttribute('X-CALENDARSERVER-ACCESS')))
 			{
-				$event['public'] =  (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
+				$event['public'] = (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
 			}
 			//error_log(__METHOD__."() X-CALENDARSERVER-ACCESS=".array2string($x_calendarserver_access).' --> public='.array2string($event['public']));
 		}
@@ -3137,15 +3136,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($event)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($event)."\n", 3, $this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
         //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 
-	function search($_vcalData, $contentID=null, $relax=false, $charset=null)
+	function search($_vcalData, $contentID = null, $relax = false, $charset = null)
 	{
 		if (($events = $this->icaltoegw($_vcalData, $charset)))
 		{
@@ -3166,8 +3165,8 @@ 
 			}
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n" .
-					array2string($events)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n".
+					array2string($events)."\n", 3, $this->logfile);
 			}
 		}
 		return array();
@@ -3185,23 +3184,23 @@ 
 	 * @param array $extra =null extra attributes to add
 	 * 	X-CALENDARSERVER-MASK-UID can be used to not include an event specified by this uid as busy
 	 */
-	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
+	function freebusy($user, $end = null, $utc = true, $charset = 'UTF-8', $start = null, $method = 'PUBLISH', array $extra = null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start) $start = time(); // default now
+		if (!$end) $end = time() + 100 * DAY_s; // default next 100 days
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
-		$vcal->setAttribute('VERSION','2.0');
-		$vcal->setAttribute('METHOD',$method);
+		$vcal->setAttribute('VERSION', '2.0');
+		$vcal->setAttribute('METHOD', $method);
 
-		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY',$vcal);
+		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY', $vcal);
 
 		$attributes = array(
 			'DTSTAMP' => time(),
-			'DTSTART' => $this->date2ts($start,true),	// true = server-time
-			'DTEND' => $this->date2ts($end,true),	// true = server-time
+			'DTSTART' => $this->date2ts($start, true), // true = server-time
+			'DTEND' => $this->date2ts($end, true), // true = server-time
 		);
 		if (!$utc)
 		{
@@ -3212,9 +3211,9 @@ 
 		}
 		if (is_null($extra)) $extra = array(
 			'URL' => $this->freebusy_url($user),
-			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
+			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user, 'account_email'),
 		);
-		foreach($attributes+$extra as $attr => $value)
+		foreach ($attributes + $extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
 		}
@@ -3237,16 +3236,16 @@ 
 
 				if ($utc)
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
 						'start' => $event['start'],
 						'end' => $event['end'],
 					)), array('FBTYPE' => $fbtype));
 				}
 				else
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
-						'start' => date('Ymd\THis',$event['start']),
-						'end' => date('Ymd\THis',$event['end']),
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
+						'start' => date('Ymd\THis', $event['start']),
+						'end' => date('Ymd\THis', $event['end']),
 					)), array('FBTYPE' => $fbtype));
 				}
 			}

Braces +317 added lines, -81 removed lines

@@ -174,7 +174,10 @@ 
 	function __construct(&$_clientProperties = array())
 	{
 		parent::__construct();
-		if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		if ($this->log)
+		{
+			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		}
 		$this->clientProperties = $_clientProperties;
 		$this->vCalendar = new Horde_Icalendar;
 		$this->addressbook = new addressbook_bo;
@@ -223,10 +226,14 @@ 
 			'ATTACH'        => 'attachments',
 		);
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if ($this->productManufacturer == '' )
-		{	// syncevolution is broken
+		{
+// syncevolution is broken
 			$version = '2.0';
 		}
 
@@ -234,10 +241,16 @@ 
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
-		if ($method) $vcal->setAttribute('METHOD', $method);
+		if ($method)
+		{
+			$vcal->setAttribute('METHOD', $method);
+		}
 		$events_exported = false;
 
-		if (!is_array($events)) $events = array($events);
+		if (!is_array($events))
+		{
+			$events = array($events);
+		}
 
 		$vtimezones_added = array();
 		foreach ($events as $event)
@@ -303,7 +316,10 @@ 
 				self::$tz_cache[$event['tzid']] = calendar_timezones::DateTimeZone($event['tzid']);
 			}
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 
 			if ($this->log)
 			{
@@ -314,7 +330,10 @@ 
 
 			if ($recurrence)
 			{
-				if (!($master = $this->read($event['id'], 0, true, 'server'))) continue;
+				if (!($master = $this->read($event['id'], 0, true, 'server')))
+				{
+					continue;
+				}
 
 				if (!isset($this->supportedFields['participants']))
 				{
@@ -371,7 +390,8 @@ 
 			if ($this->productManufacturer != 'file' && $this->uidExtension)
 			{
 				// Append UID to DESCRIPTION
-				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
+				if (!preg_match('/\[UID:.+\]/m', $event['description']))
+				{
 					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
 				}
 			}
@@ -431,11 +451,21 @@ 
 							$quantity = $role = null;
 							calendar_so::split_status($status, $quantity, $role);
 							// do not include event owner/ORGANIZER as participant in his own calendar, if he is only participant
-							if (count($event['participants']) == 1 && $event['owner'] == $uid) continue;
+							if (count($event['participants']) == 1 && $event['owner'] == $uid)
+							{
+								continue;
+							}
 
-							if (!($info = $this->resource_info($uid))) continue;
+							if (!($info = $this->resource_info($uid)))
+							{
+								continue;
+							}
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X','E')))
+							{
+								continue;
+							}
+							// dont include deleted participants
 
 							if ($this->log)
 							{
@@ -514,24 +544,49 @@ 
 							}
 							// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT|X-*}
 							$options = array();
-							if (!empty($participantCN)) $options['CN'] = $participantCN;
-							if (!empty($role)) $options['ROLE'] = $role;
-							if (!empty($status)) $options['PARTSTAT'] = $status;
-							if (!empty($cutype)) $options['CUTYPE'] = $cutype;
-							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
+							if (!empty($participantCN))
+							{
+								$options['CN'] = $participantCN;
+							}
+							if (!empty($role))
+							{
+								$options['ROLE'] = $role;
+							}
+							if (!empty($status))
+							{
+								$options['PARTSTAT'] = $status;
+							}
+							if (!empty($cutype))
+							{
+								$options['CUTYPE'] = $cutype;
+							}
+							if (!empty($rsvp))
+							{
+								$options['RSVP'] = $rsvp;
+							}
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
 								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
-							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
-							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							if ($info['type'] != 'e')
+							{
+								$options['X-EGROUPWARE-UID'] = (string)$uid;
+							}
+							if ($quantity > 1)
+							{
+								$options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							}
 							$attributes['ATTENDEE'][] = $participantURL;
 							$parameters['ATTENDEE'][] = $options;
 						}
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public'])
+						{
+							continue;
+						}
+						// public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -563,9 +618,18 @@ 
 									'CUTYPE'   => 'INDIVIDUAL',
 									//'RSVP'     => 'FALSE',
 									);
-								if (!empty($organizerCN)) $options['CN'] = $organizerCN;
-								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
-								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
+								if (!empty($organizerCN))
+								{
+									$options['CN'] = $organizerCN;
+								}
+								if (!empty($organizerEMail))
+								{
+									$options['EMAIL'] = $organizerEMail;
+								}
+								if (!empty($event['owner']))
+								{
+									$options['X-EGROUPWARE-UID'] = $event['owner'];
+								}
 								$attributes['ATTENDEE'][] = $organizerURL;
 			    				$parameters['ATTENDEE'][] = $options;
 		    				}
@@ -594,9 +658,12 @@ 
 						{
 							// Hack for CalDAVTester to export duration instead of endtime
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
-								$attributes['duration'] = $event['end'] - $event['start'];
-							else
-							$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							{
+															$attributes['duration'] = $event['end'] - $event['start'];
+							}
+							else {
+														$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							}
 						}
 						else
 						{
@@ -616,7 +683,11 @@ 
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE)
+						{
+							break;
+						}
+						// no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -650,7 +721,10 @@ 
 						break;
 
 					case 'EXDATE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;
+						if ($event['recur_type'] == MCAL_RECUR_NONE)
+						{
+							break;
+						}
 						if (!empty($event['recur_exception']))
 						{
 							if (empty($event['whole_day']))
@@ -677,14 +751,21 @@ 
 									);
 								}
 								$event['recur_exception'] = $days;
-								if ($version != '1.0') $parameters['EXDATE']['VALUE'] = 'DATE';
+								if ($version != '1.0')
+								{
+									$parameters['EXDATE']['VALUE'] = 'DATE';
+								}
 							}
 							$vevent->setAttribute('EXDATE', $event['recur_exception'], $parameters['EXDATE']);
 						}
 						break;
 
 					case 'PRIORITY':
-						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority'])
+						{
+							continue;
+						}
+						// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
@@ -698,7 +779,11 @@ 
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking'])
+						{
+							continue;
+						}
+						// OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -755,7 +840,11 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference'])))
+							{
+								break;
+							}
+							// referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
@@ -881,7 +970,10 @@ 
 			foreach ((array)$event['alarm'] as $alarmData)
 			{
 				// skip over alarms that don't have the minimum required info
-				if (!isset($alarmData['offset']) && !isset($alarmData['time'])) continue;
+				if (!isset($alarmData['offset']) && !isset($alarmData['time']))
+				{
+					continue;
+				}
 
 				// skip alarms not being set for all users and alarms owned by other users
 				if ($alarmData['all'] != true && $alarmData['owner'] != $this->user)
@@ -898,7 +990,10 @@ 
 
 				if ($version == '1.0')
 				{
-					if ($event['title']) $description = $event['title'];
+					if ($event['title'])
+					{
+						$description = $event['title'];
+					}
 					if ($description)
 					{
 						$values['DALARM']['snooze_time'] = '';
@@ -918,7 +1013,10 @@ 
 					// VCalendar 2.0 / RFC 2445
 
 					// RFC requires DESCRIPTION for DISPLAY
-					if (!$event['title'] && !$description) $description = 'Alarm';
+					if (!$event['title'] && !$description)
+					{
+						$description = 'Alarm';
+					}
 
 					/* Disabling for now
 					// Lightning infinitly pops up alarms for recuring events, if the only use an offset
@@ -1109,13 +1207,20 @@ 
 		$this->events_imported = 0;
 		$replace = $delete_exceptions= false;
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if (!($events = $this->icaltoegw($_vcalData, $principalURL, $charset)))
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events))
+		{
+			$cal_id = -1;
+		}
+		// just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1123,8 +1228,14 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
-				if ($recur_date) $events[0]['recurrence'] = $recur_date;
+				if (!is_null($etag))
+				{
+					$events[0]['etag'] = (int) $etag;
+				}
+				if ($recur_date)
+				{
+					$events[0]['recurrence'] = $recur_date;
+				}
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
 					($eventId = array_shift($foundEvent)) &&
@@ -1132,7 +1243,10 @@ 
 			{
 				foreach ($events as $k => $event)
 				{
-					if (!isset($event['uid'])) $events[$k]['uid'] = $egwEvent['uid'];
+					if (!isset($event['uid']))
+					{
+						$events[$k]['uid'] = $egwEvent['uid'];
+					}
 				}
 			}
 		}
@@ -1162,10 +1276,17 @@ 
 		$msg = null;
 		foreach ($events as $event)
 		{
-			if (!is_array($event)) continue; // the iterator may return false
+			if (!is_array($event))
+			{
+				continue;
+			}
+			// the iterator may return false
 			++$this->events_imported;
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 			if (is_array($event['category']))
 			{
 				$event['category'] = $this->find_or_add_categories($event['category'],
@@ -1202,7 +1323,10 @@ 
 						}
 						else
 						{
-							if (!($exception = $this->read($id))) continue;
+							if (!($exception = $this->read($id)))
+							{
+								continue;
+							}
 							$exception['uid'] = common::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
 							$this->update($exception, true,true,false,true,$msg,$skip_notification);
@@ -1291,7 +1415,10 @@ 
 								break;
 
 							default:
-								if (!empty($value)) $event[$key] = $value;
+								if (!empty($value))
+								{
+									$event[$key] = $value;
+								}
 						}
 					}
 				}
@@ -1389,7 +1516,10 @@ 
 			else // common adjustments for new events
 			{
 				unset($event['id']);
-				if ($caldav_name) $event['caldav_name'] = $caldav_name;
+				if ($caldav_name)
+				{
+					$event['caldav_name'] = $caldav_name;
+				}
 				// set non blocking all day depending on the user setting
 				if (!empty($event['whole_day']) && $this->nonBlockingAllday)
 				{
@@ -1437,7 +1567,10 @@ 
 					|| !isset($event['participants'][$event['owner']]))
 				{
 					$status = calendar_so::combine_status($event['owner'] == $this->user ? 'A' : 'U', 1, 'CHAIR');
-					if (!is_array($event['participants'])) $event['participants'] = array();
+					if (!is_array($event['participants']))
+					{
+						$event['participants'] = array();
+					}
 					$event['participants'][$event['owner']] = $status;
 				}
 				else
@@ -1590,7 +1723,10 @@ 
 								$occurence = $exception = false;
 								foreach ($event_info['master_event']['recur_exception'] as $exception)
 								{
-									if ($exception > $event['start']) break;
+									if ($exception > $event['start'])
+									{
+										break;
+									}
 									$occurence = $exception;
 								}
 								if (!$occurence)
@@ -1680,12 +1816,15 @@ 
 					case 'SERIES-MASTER':
 					case 'SERIES-EXCEPTION':
 					case 'SERIES-EXCEPTION-PROPAGATE':
-						if (is_array($event_info['stored_event'])) // status update requires a stored event
+						if (is_array($event_info['stored_event']))
+						{
+							// status update requires a stored event
 						{
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
 								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+						}
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
@@ -1697,9 +1836,12 @@ 
 						break;
 
 					case 'SERIES-PSEUDO-EXCEPTION':
-						if (is_array($event_info['master_event'])) // status update requires a stored master event
+						if (is_array($event_info['master_event']))
+						{
+							// status update requires a stored master event
 						{
 							$recurrence = $this->date2usertime($event['recurrence']);
+						}
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
@@ -1772,7 +1914,10 @@ 
 	 */
 	public function sync_alarms(array &$event, array $old_alarms, $user)
 	{
-		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		}
 		$modified = 0;
 		foreach($event['alarm'] as &$alarm)
 		{
@@ -1796,19 +1941,40 @@ 
 			if ($alarm['offset'] != $old_alarm['offset'] || $old_alarm['owner'] != $user && !$alarm['all'])
 			{
 				$alarm['owner'] = $user;
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
-				if ($this->debug) error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
-				if ($event['id']) $alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
+				}
+				if ($event['id'])
+				{
+					$alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				}
 				++$modified;
 			}
 			// existing alarm --> update it
 			elseif ($alarm['offset'] == $old_alarm['offset'] && ($old_alarm['owner'] == $user || $old_alarm['all']))
 			{
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
 				$alarm = array_merge($old_alarm, $alarm);
-				if ($this->debug) error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				}
 				$alarm['id'] = $this->save_alarm($event['id'], $alarm);
 				++$modified;
 			}
@@ -1822,7 +1988,10 @@ 
 				unset($old_alarm[$id]);
 				continue;
 			}
-			if ($this->debug) error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			}
 			$this->delete_alarm($id);
 			++$modified;
 		}
@@ -2241,7 +2410,10 @@ 
 				array2string($_vcalData)."\n",3,$this->logfile);
 		}
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		// we use egw_ical_iterator only on resources, as calling importVCal() accesses single events like an array (eg. $events[0])
 		if (is_resource($_vcalData))
@@ -2552,19 +2724,27 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime(trim($recurenceMatches[2]));
 							}
-							else break;
+							else {
+								break;
+							}
 							// fall-through
 						case 'DAILY':	// 2.0
 							$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-							if (stripos($recurence, 'BYDAY') === false) break;
+							if (stripos($recurence, 'BYDAY') === false)
+							{
+								break;
+							}
 							// hack to handle TYPE=DAILY;BYDAY= as WEEKLY, which is true as long as there's no interval
 							// fall-through
 						case 'W':
 						case 'WEEKLY':
 							$days = array();
-							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))		// 1.0
+							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))
+							{
+								// 1.0
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
+							}
 								if (empty($recurenceMatches[2]))
 								{
 									$days[0] = strtoupper(substr(date('D', $vcardData['start']),0,2));
@@ -2577,7 +2757,10 @@ 
 								$repeatMatches = null;
 								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
 								{
-									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
+									if ($repeatMatches[1])
+									{
+										$vcardData['recur_count'] = $repeatMatches[1];
+									}
 								}
 								else
 								{
@@ -2586,9 +2769,12 @@ 
 
 								$recur_days = $this->recur_days_1_0;
 							}
-							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))
+							{
+								// 2.0
 							{
 								$days = explode(',',$recurenceMatches[1]);
+							}
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
@@ -2647,7 +2833,10 @@ 
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
-							} else break;
+							}
+							else {
+								break;
+							}
 							// fall-through
 						case 'YEARLY':	// 2.0
 							if (strpos($recurence, 'BYDAY') === false)
@@ -2667,7 +2856,10 @@ 
 					}
 					break;
 				case 'EXDATE':
-					if (!$attributes['value']) break;
+					if (!$attributes['value'])
+					{
+						break;
+					}
 					if ((isset($attributes['params']['VALUE'])
 							&& $attributes['params']['VALUE'] == 'DATE') ||
 						(!isset($attributes['params']['VALUE']) && $isDate))
@@ -2747,13 +2939,16 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
+					{
 				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
 				    }
 				    if (isset($attributes['params']['STATUS']))
-					{
+				    {
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
-						if (empty($status)) $status = 'X';
+						if (empty($status))
+						{
+							$status = 'X';
+						}
 					}
 					else
 					{
@@ -2813,7 +3008,10 @@ 
 							$uid = $this->user;
 					}
 					// check principal url from CalDAV here after X-EGROUPWARE-UID and to get optional X-EGROUPWARE-QUANTITY
-					if (!$uid) $uid = groupdav_principals::url2uid($attributes['value'], null, $cn);
+					if (!$uid)
+					{
+						$uid = groupdav_principals::url2uid($attributes['value'], null, $cn);
+					}
 
 					// try to find an email address
 					if (!$uid && $email && ($uid = $GLOBALS['egw']->accounts->name2id($email, 'account_email')))
@@ -2881,7 +3079,10 @@ 
 								}
 								$status = 'U'; // keep the group
 							}
-							else continue; // can't find this group
+							else {
+								continue;
+							}
+							// can't find this group
 						}
 						elseif (empty($searcharray))
 						{
@@ -2940,7 +3141,9 @@ 
 
 								try {
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
-										$component->getAttribute('ORGANIZER');
+									{
+																			$component->getAttribute('ORGANIZER');
+									}
 								}
 								catch(Horde_Icalendar_Exception $e)
 								{
@@ -2977,7 +3180,10 @@ 
 					}
 					break;
 				case 'CREATED':		// will be written direct to the event
-					if ($event['modified']) break;
+					if ($event['modified'])
+					{
+						break;
+					}
 					// fall through
 				case 'LAST-MODIFIED':	// will be written direct to the event
 					$event['modified'] = $attributes['value'];
@@ -2998,7 +3204,11 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE']))
+					{
+						break;
+					}
+					// handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3129,7 +3339,10 @@ 
 			$event['end'] = $event['start'] + 60 * $this->cal_prefs['defaultlength'];
 		}
 
-		if ($this->calendarOwner) $event['owner'] = $this->calendarOwner;
+		if ($this->calendarOwner)
+		{
+			$event['owner'] = $this->calendarOwner;
+		}
 
 		// parsing ATTACH attributes for managed attachments
 		$event['attach-delete-by-put'] = $component->getAttributeDefault('X-EGROUPWARE-ATTACH-INCLUDED', null) === 'TRUE';
@@ -3155,7 +3368,10 @@ 
 				$filter = $relax ? 'relax' : 'check';
 				$event = array_shift($events);
 				$eventId = -1;
-				if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+				if ($this->so->isWholeDay($event))
+				{
+					$event['whole_day'] = true;
+				}
 				if ($contentID)
 				{
 					$parts = preg_split('/:/', $contentID);
@@ -3187,8 +3403,16 @@ 
 	 */
 	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start)
+		{
+			$start = time();
+		}
+		// default now
+		if (!$end)
+		{
+			$end = time() + 100*DAY_s;
+		}
+		// default next 100 days
 
 		$vcal = new Horde_Icalendar;
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
@@ -3210,10 +3434,13 @@ 
 				$attributes[$attr] = date('Ymd\THis', $value);
 			}
 		}
-		if (is_null($extra)) $extra = array(
+		if (is_null($extra))
+		{
+			$extra = array(
 			'URL' => $this->freebusy_url($user),
 			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
 		);
+		}
 		foreach($attributes+$extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
@@ -3229,9 +3456,18 @@ 
 		{
 			foreach ($fbdata as $event)
 			{
-				if ($event['non_blocking']) continue;
-				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID']) continue;
-				if ($event['participants'][$user] == 'R') continue;
+				if ($event['non_blocking'])
+				{
+					continue;
+				}
+				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID'])
+				{
+					continue;
+				}
+				if ($event['participants'][$user] == 'R')
+				{
+					continue;
+				}
 
 				$fbtype = $event['participants'][$user] == 'T' ? 'BUSY-TENTATIVE' : 'BUSY';
 

calendar/inc/class.calendar_sif.inc.php

Doc Comments +2 added lines, -6 removed lines

@@ -409,11 +409,7 @@ 
 	/**
 	* @return int event id
 	* @param string	$_sifdata   the SIFE data
-	* @param int	$_calID=-1	the internal addressbook id
-	* @param boolean $merge=false	merge data with existing entry
-	* @param int $recur_date=0 if set, import the recurrence at this timestamp,
-	*                          default 0 => import whole series (or events, if not recurring)
-	* @desc import a SIFE into the calendar
+	* @param int	$_calID	the internal addressbook id
 	*/
 	function addSIF($_sifdata, $_calID=-1, $merge=false, $recur_date=0)
 	{
@@ -797,7 +793,7 @@ 
 	* return a sife
 	*
 	* @param int	$_id		the id of the event
-	* @param int $recur_date=0	if set export the next recurrence at or after the timestamp,
+	* @param int $recur_date	if set export the next recurrence at or after the timestamp,
 	*                          	default 0 => export whole series (or events, if not recurring)
 	* @return string containing the SIFE
 	*/

Indentation +22 added lines, -22 removed lines

@@ -407,14 +407,14 @@ 
 	}
 
 	/**
-	* @return int event id
-	* @param string	$_sifdata   the SIFE data
-	* @param int	$_calID=-1	the internal addressbook id
-	* @param boolean $merge=false	merge data with existing entry
-	* @param int $recur_date=0 if set, import the recurrence at this timestamp,
-	*                          default 0 => import whole series (or events, if not recurring)
-	* @desc import a SIFE into the calendar
-	*/
+	 * @return int event id
+	 * @param string	$_sifdata   the SIFE data
+	 * @param int	$_calID=-1	the internal addressbook id
+	 * @param boolean $merge=false	merge data with existing entry
+	 * @param int $recur_date=0 if set, import the recurrence at this timestamp,
+	 *                          default 0 => import whole series (or events, if not recurring)
+	 * @desc import a SIFE into the calendar
+	 */
 	function addSIF($_sifdata, $_calID=-1, $merge=false, $recur_date=0)
 	{
 		if ($this->log)
@@ -794,13 +794,13 @@ 
 	}
 
 	/**
-	* return a sife
-	*
-	* @param int	$_id		the id of the event
-	* @param int $recur_date=0	if set export the next recurrence at or after the timestamp,
-	*                          	default 0 => export whole series (or events, if not recurring)
-	* @return string containing the SIFE
-	*/
+	 * return a sife
+	 *
+	 * @param int	$_id		the id of the event
+	 * @param int $recur_date=0	if set export the next recurrence at or after the timestamp,
+	 *                          	default 0 => export whole series (or events, if not recurring)
+	 * @return string containing the SIFE
+	 */
 	function getSIF($_id, $recur_date=0)
 	{
 		if ($this->log)
@@ -1166,13 +1166,13 @@ 
 	}
 
 	/**
-	* Set the supported fields
-	*
-	* Currently we only store name and version, manucfacturer is always Funambol
-	*
-	* @param string $_productName
-	* @param string $_productSoftwareVersion
-	*/
+	 * Set the supported fields
+	 *
+	 * Currently we only store name and version, manucfacturer is always Funambol
+	 *
+	 * @param string $_productName
+	 * @param string $_productSoftwareVersion
+	 */
 	function setSupportedFields($_productName='', $_productSoftwareVersion='')
 	{
 		$state =& $_SESSION['SyncML.state'];

Spacing +95 added lines, -95 removed lines

@@ -116,14 +116,14 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-sifcal";
+	var $logfile = "/tmp/log-sifcal";
 
 
 	// constants for recurence type
 	const olRecursDaily		= 0;
 	const olRecursWeekly	= 1;
 	const olRecursMonthly	= 2;
-	const olRecursMonthNth	= 3;
+	const olRecursMonthNth = 3;
 	const olRecursYearly	= 5;
 	const olRecursYearNth	= 6;
 
@@ -131,9 +131,9 @@ 
 	const olSunday		= 1;
 	const olMonday		= 2;
 	const olTuesday 	= 4;
-	const olWednesday	= 8;
+	const olWednesday = 8;
 	const olThursday	= 16;
-	const olFriday		= 32;
+	const olFriday = 32;
 	const olSaturday	= 64;
 
 	// standard headers
@@ -168,7 +168,7 @@ 
 				break;
 
 			default:
-				if(!empty($this->sifMapping[$_tag]))
+				if (!empty($this->sifMapping[$_tag]))
 				{
 					$this->event[$this->sifMapping[$_tag]] = trim($this->sifData);
 				}
@@ -192,11 +192,11 @@ 
 	{
 		if (empty($tzid) || $tzid == 'UTC')
 		{
-			return $this->vCalendar->_exportDateTime(egw_time::to($time,'ts'));
+			return $this->vCalendar->_exportDateTime(egw_time::to($time, 'ts'));
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new egw_time($time,egw_time::$server_timezone);
+			$time = new egw_time($time, egw_time::$server_timezone);
 		}
 		if (!isset(self::$tz_cache[$tzid]))
 		{
@@ -207,7 +207,7 @@ 
 		return $time->format('Ymd\THis');
 	}
 
-	function siftoegw($sifData, $_calID=-1)
+	function siftoegw($sifData, $_calID = -1)
 	{
 		$finalEvent	= array();
 		$this->event = array();
@@ -258,13 +258,13 @@ 
 					if ($value == 1)
 					{
 						$finalEvent['whole_day'] = true;
-						$startParts = explode('-',$this->event['start']);
+						$startParts = explode('-', $this->event['start']);
 						$finalEvent['startdate']['hour'] = $finalEvent['startdate']['minute'] = $finalEvent['startdate']['second'] = 0;
 						$finalEvent['startdate']['year'] = $startParts[0];
 						$finalEvent['startdate']['month'] = $startParts[1];
 						$finalEvent['startdate']['day'] = $startParts[2];
 						$finalEvent['start'] = $this->date2ts($finalEvent['startdate']);
-						$endParts = explode('-',$this->event['end']);
+						$endParts = explode('-', $this->event['end']);
 						$finalEvent['enddate']['hour'] = 23; $finalEvent['enddate']['minute'] = $finalEvent['enddate']['second'] = 59;
 						$finalEvent['enddate']['year'] = $endParts[0];
 						$finalEvent['enddate']['month'] = $endParts[1];
@@ -320,7 +320,7 @@ 
 						switch ($this->event['recur_type'])
 						{
 							case self::olRecursDaily:
-								$finalEvent['recur_type']	= MCAL_RECUR_DAILY;
+								$finalEvent['recur_type'] = MCAL_RECUR_DAILY;
 								break;
 
 							case self::olRecursWeekly:
@@ -329,15 +329,15 @@ 
 								break;
 
 							case self::olRecursMonthly:
-								$finalEvent['recur_type']	= MCAL_RECUR_MONTHLY_MDAY;
+								$finalEvent['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
 								break;
 
 							case self::olRecursMonthNth:
-								$finalEvent['recur_type']	= MCAL_RECUR_MONTHLY_WDAY;
+								$finalEvent['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
 								break;
 
 							case self::olRecursYearly:
-								$finalEvent['recur_type']	= MCAL_RECUR_YEARLY;
+								$finalEvent['recur_type'] = MCAL_RECUR_YEARLY;
 								$finalEvent['recur_interval'] = 1;
 								break;
 						}
@@ -384,14 +384,14 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($finalEvent)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($finalEvent)."\n", 3, $this->logfile);
 		}
 
 		return $finalEvent;
 	}
 
-	function search($_sifdata, $contentID=null, $relax=false)
+	function search($_sifdata, $contentID = null, $relax = false)
 	{
 		$result = array();
 		$filter = $relax ? 'relax' : 'exact';
@@ -415,12 +415,12 @@ 
 	*                          default 0 => import whole series (or events, if not recurring)
 	* @desc import a SIFE into the calendar
 	*/
-	function addSIF($_sifdata, $_calID=-1, $merge=false, $recur_date=0)
+	function addSIF($_sifdata, $_calID = -1, $merge = false, $recur_date = 0)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($_sifdata)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($_sifdata)."\n", 3, $this->logfile);
 		}
 		if (!$event = $this->siftoegw($_sifdata, $_calID))
 		{
@@ -498,17 +498,17 @@ 
 							calendar_timezones::DateTimeZone($event_info['stored_event']['tzid']);
 					}
 					// Adjust dates to original TZ
-					$time = new egw_time($event['startdate'],self::$tz_cache[$event_info['stored_event']['tzid']]);
+					$time = new egw_time($event['startdate'], self::$tz_cache[$event_info['stored_event']['tzid']]);
 					$event['start'] = egw_time::to($time, 'server');
-					$time = new egw_time($event['enddate'],self::$tz_cache[$event_info['stored_event']['tzid']]);
+					$time = new egw_time($event['enddate'], self::$tz_cache[$event_info['stored_event']['tzid']]);
 					$event['end'] = egw_time::to($time, 'server');
 					if ($event['recur_type'] != MCAL_RECUR_NONE)
 					{
 						foreach ($event['recur_exception'] as $key => $day)
 						{
-							$time = new egw_time($day,egw_time::$server_timezone);
-							$time =& $this->so->startOfDay($time, $event_info['stored_event']['tzid']);
-							$event['recur_exception'][$key] = egw_time::to($time,'server');
+							$time = new egw_time($day, egw_time::$server_timezone);
+							$time = & $this->so->startOfDay($time, $event_info['stored_event']['tzid']);
+							$event['recur_exception'][$key] = egw_time::to($time, 'server');
 						}
 					}
 				}
@@ -524,7 +524,7 @@ 
 		else // common adjustments for new events
 		{
 			// set non blocking all day depending on the user setting
-			if (!empty($event['whole_day'])	&& $this->nonBlockingAllday)
+			if (!empty($event['whole_day']) && $this->nonBlockingAllday)
 			{
 				$event['non_blocking'] = 1;
 			}
@@ -550,7 +550,7 @@ 
 		{
 			$alarmData['offset'] = $event['alarm'] * 60;
 			$alarmData['time'] = $event['start'] - $alarmData['offset'];
-			$alarmData['owner']	= $this->user;
+			$alarmData['owner'] = $this->user;
 			$alarmData['all'] = false;
 		}
 
@@ -578,7 +578,7 @@ 
 									break;
 								}
 							}
-							if (isset($alarmData)&&is_array($alarmData)) $event['alarm'][] = $alarmData;
+							if (isset($alarmData) && is_array($alarmData)) $event['alarm'][] = $alarmData;
 						}
 					}
 					break;
@@ -608,7 +608,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						"(): event SINGLE\n",3,$this->logfile);
+						"(): event SINGLE\n", 3, $this->logfile);
 				}
 
 				// update the event
@@ -627,7 +627,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						"(): event SERIES-MASTER\n",3,$this->logfile);
+						"(): event SERIES-MASTER\n", 3, $this->logfile);
 				}
 
 				// remove all known pseudo exceptions and update the event
@@ -636,8 +636,8 @@ 
 					$days = $this->so->get_recurrence_exceptions($event_info['stored_event'], $this->tzid, 0, 0, 'tz_map');
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n" .
-							array2string($days)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n".
+							array2string($days)."\n", 3, $this->logfile);
 					}
 					if (is_array($days))
 					{
@@ -663,7 +663,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						"(): event SERIES-EXCEPTION\n",3,$this->logfile);
+						"(): event SERIES-EXCEPTION\n", 3, $this->logfile);
 				}
 
 				// update event
@@ -725,7 +725,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						"(): event SERIES-PSEUDO-EXCEPTION\n",3,$this->logfile);
+						"(): event SERIES-PSEUDO-EXCEPTION\n", 3, $this->logfile);
 				}
 
 				if ($event_info['acl_edit'])
@@ -764,7 +764,7 @@ 
 				break;
 
 			case 'SERIES-PSEUDO-EXCEPTION':
-				$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'] . ':' . $event['recurrence'] : false;
+				$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'].':'.$event['recurrence'] : false;
 				break;
 
 			case 'SERIES-EXCEPTION-PROPAGATE':
@@ -777,7 +777,7 @@ 
 				{
 					// we did not have sufficient rights to propagate the status only exception to a real one
 					// we have to keep the SERIES-PSEUDO-EXCEPTION id and keep the event untouched
-					$return_id = $event_info['master_event']['id'] . ':' . $event['recurrence'];
+					$return_id = $event_info['master_event']['id'].':'.$event['recurrence'];
 				}
 				break;
 		}
@@ -786,8 +786,8 @@ 
 		{
 			$recur_date = $this->date2usertime($event_info['stored_event']['start']);
 			$event_info['stored_event'] = $this->read($event_info['stored_event']['id'], $recur_date);
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($event_info['stored_event'])."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 		}
 
 		return $return_id;
@@ -801,14 +801,14 @@ 
 	*                          	default 0 => export whole series (or events, if not recurring)
 	* @return string containing the SIFE
 	*/
-	function getSIF($_id, $recur_date=0)
+	function getSIF($_id, $recur_date = 0)
 	{
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-			"($_id, $recur_date)\n",3,$this->logfile);
+			"($_id, $recur_date)\n", 3, $this->logfile);
 		}
-		$sysCharSet	= $GLOBALS['egw']->translation->charset();
+		$sysCharSet = $GLOBALS['egw']->translation->charset();
 
 		$fields = array_unique(array_values($this->sifMapping));
 		sort($fields);
@@ -819,7 +819,7 @@ 
 			if ($this->read($_id, $recur_date, true, 'server'))
 			{
 				$retval = -1; // Permission denied
-				if($this->xmlrpc)
+				if ($this->xmlrpc)
 				{
 					$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['no_access'],
 						$GLOBALS['xmlrpcstr']['no_access']);
@@ -828,16 +828,16 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 						"() User does not have the permission to read event $_id.\n",
-						3,$this->logfile);
+						3, $this->logfile);
 				}
 			}
 			else
 			{
-				$retval = false;  // Entry does not exist
+				$retval = false; // Entry does not exist
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						"() Event $_id not found.\n",3,$this->logfile);
+						"() Event $_id not found.\n", 3, $this->logfile);
 				}
 			}
 			return $retval;
@@ -845,8 +845,8 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($event)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($event)."\n", 3, $this->logfile);
 		}
 
 		if ($this->tzid)
@@ -910,8 +910,8 @@ 
 			$exceptions = $this->so->get_recurrence_exceptions($event, $tzid, 0, 0, 'tz_rrule');
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n" .
-					array2string($exceptions)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n".
+					array2string($exceptions)."\n", 3, $this->logfile);
 			}
 			$event['recur_exception'] = $exceptions;
 			/*
@@ -935,11 +935,11 @@ 
 		{
 			if (!preg_match('/\[UID:.+\]/m', $event['description']))
 			{
-				$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+				$event['description'] .= "\n[UID:".$event['uid']."]";
 			}
 		}
 
-		$sifEvent = self::xml_decl . "<appointment>" . self::SIF_decl;
+		$sifEvent = self::xml_decl."<appointment>".self::SIF_decl;
 
 		foreach ($this->sifMapping as $sifField => $egwField)
 		{
@@ -950,7 +950,7 @@ 
 			switch ($sifField)
 			{
 				case 'Importance':
-					$value = $value-1;
+					$value = $value - 1;
 					$sifEvent .= "<$sifField>$value</$sifField>";
 					break;
 
@@ -987,7 +987,7 @@ 
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 									"() Client Recurrence[$occurrences] $recur_date\n", 3, $this->logfile);
 							}
-							if (!$rriter->exceptions || !in_array($recur_date->format('Ymd'),$rriter->exceptions))
+							if (!$rriter->exceptions || !in_array($recur_date->format('Ymd'), $rriter->exceptions))
 							{
 								$recur_end = $recur_date;
 							}
@@ -995,7 +995,7 @@ 
 						}
 						$recurEndDate = egw_time::to($recur_end, 'server');
 						$sifEvent .= '<NoEndDate>0</NoEndDate>';
-						$sifEvent .= '<PatternEndDate>'. self::getDateTime($recurEndDate,$tzid) .'</PatternEndDate>';
+						$sifEvent .= '<PatternEndDate>'.self::getDateTime($recurEndDate, $tzid).'</PatternEndDate>';
 					}
 
 					calendar_rrule::rrule2tz($event, $event['start'], $tzid);
@@ -1007,32 +1007,32 @@ 
 
 						case MCAL_RECUR_DAILY:
 							$sifEvent .= "<$sifField>1</$sifField>";
-							$sifEvent .= '<RecurrenceType>'. self::olRecursDaily .'</RecurrenceType>';
-							$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
-							$sifEvent .= '<PatternStartDate>'. self::getDateTime($event['start'],$tzid) .'</PatternStartDate>';
+							$sifEvent .= '<RecurrenceType>'.self::olRecursDaily.'</RecurrenceType>';
+							$sifEvent .= '<Interval>'.$eventInterval.'</Interval>';
+							$sifEvent .= '<PatternStartDate>'.self::getDateTime($event['start'], $tzid).'</PatternStartDate>';
 							if ($event['recur_enddate'])
 							{
-								$sifEvent .= '<Occurrences>'. $occurrences .'</Occurrences>';
+								$sifEvent .= '<Occurrences>'.$occurrences.'</Occurrences>';
 							}
 							break;
 
 						case MCAL_RECUR_WEEKLY:
 							$sifEvent .= "<$sifField>1</$sifField>";
-							$sifEvent .= '<RecurrenceType>'. self::olRecursWeekly .'</RecurrenceType>';
-							$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
-							$sifEvent .= '<PatternStartDate>'. self::getDateTime($event['start'],$tzid) .'</PatternStartDate>';
-							$sifEvent .= '<DayOfWeekMask>'. $event['recur_data'] .'</DayOfWeekMask>';
+							$sifEvent .= '<RecurrenceType>'.self::olRecursWeekly.'</RecurrenceType>';
+							$sifEvent .= '<Interval>'.$eventInterval.'</Interval>';
+							$sifEvent .= '<PatternStartDate>'.self::getDateTime($event['start'], $tzid).'</PatternStartDate>';
+							$sifEvent .= '<DayOfWeekMask>'.$event['recur_data'].'</DayOfWeekMask>';
 							if ($event['recur_enddate'])
 							{
-								$sifEvent .= '<Occurrences>'. $occurrences .'</Occurrences>';
+								$sifEvent .= '<Occurrences>'.$occurrences.'</Occurrences>';
 							}
 							break;
 
 						case MCAL_RECUR_MONTHLY_MDAY:
 							$sifEvent .= "<$sifField>1</$sifField>";
-							$sifEvent .= '<RecurrenceType>'. self::olRecursMonthly .'</RecurrenceType>';
-							$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
-							$sifEvent .= '<PatternStartDate>'. self::getDateTime($event['start'],$tzid) .'</PatternStartDate>';
+							$sifEvent .= '<RecurrenceType>'.self::olRecursMonthly.'</RecurrenceType>';
+							$sifEvent .= '<Interval>'.$eventInterval.'</Interval>';
+							$sifEvent .= '<PatternStartDate>'.self::getDateTime($event['start'], $tzid).'</PatternStartDate>';
 							break;
 
 						case MCAL_RECUR_MONTHLY_WDAY:
@@ -1040,16 +1040,16 @@ 
 								'Wed' => self::olWednesday, 'Thu' => self::olThursday, 'Fri' => self::olFriday,
 								'Sat' => self::olSaturday);
 							$sifEvent .= "<$sifField>1</$sifField>";
-							$sifEvent .= '<RecurrenceType>'. self::olRecursMonthNth .'</RecurrenceType>';
-							$sifEvent .= '<Interval>'. $eventInterval .'</Interval>';
-							$sifEvent .= '<PatternStartDate>'. self::getDateTime($event['start'],$tzid) .'</PatternStartDate>';
-							$sifEvent .= '<Instance>' . (1 + (int) ((date('d',$event['start'])-1) / 7)) . '</Instance>';
-							$sifEvent .= '<DayOfWeekMask>' . $weekMaskMap[date('D',$event['start'])] . '</DayOfWeekMask>';
+							$sifEvent .= '<RecurrenceType>'.self::olRecursMonthNth.'</RecurrenceType>';
+							$sifEvent .= '<Interval>'.$eventInterval.'</Interval>';
+							$sifEvent .= '<PatternStartDate>'.self::getDateTime($event['start'], $tzid).'</PatternStartDate>';
+							$sifEvent .= '<Instance>'.(1 + (int)((date('d', $event['start']) - 1) / 7)).'</Instance>';
+							$sifEvent .= '<DayOfWeekMask>'.$weekMaskMap[date('D', $event['start'])].'</DayOfWeekMask>';
 							break;
 
 						case MCAL_RECUR_YEARLY:
 							$sifEvent .= "<$sifField>1</$sifField>";
-							$sifEvent .= '<RecurrenceType>'. self::olRecursYearly .'</RecurrenceType>';
+							$sifEvent .= '<RecurrenceType>'.self::olRecursYearly.'</RecurrenceType>';
 							break;
 					}
 					if (is_array($event['recur_exception']))
@@ -1059,22 +1059,22 @@ 
 						{
 							if (empty($event['whole_day']))
 							{
-								if ($this->log && is_a($day,'DateTime'))
+								if ($this->log && is_a($day, 'DateTime'))
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										'() exception[' . $day->getTimezone()->getName() . ']: ' .
-										$day->format('Ymd\THis') . "\n",3,$this->logfile);
+										'() exception['.$day->getTimezone()->getName().']: '.
+										$day->format('Ymd\THis')."\n", 3, $this->logfile);
 								}
-								$sifEvent .= '<ExcludeDate>' . self::getDateTime($day,$tzid) . '</ExcludeDate>';
+								$sifEvent .= '<ExcludeDate>'.self::getDateTime($day, $tzid).'</ExcludeDate>';
 							}
 							else
 							{
-								if (!is_a($day,'DateTime'))
+								if (!is_a($day, 'DateTime'))
 								{
-									$day = new egw_time($day,egw_time::$server_timezone);
+									$day = new egw_time($day, egw_time::$server_timezone);
 									$day->setTimezone(self::$tz_cache[$event['tzid']]);
 								}
-								$sifEvent .= '<ExcludeDate>' . $day->format('Y-m-d') . '</ExcludeDate>';
+								$sifEvent .= '<ExcludeDate>'.$day->format('Y-m-d').'</ExcludeDate>';
 							}
 						}
 						$sifEvent .= '</Exceptions>';
@@ -1099,19 +1099,19 @@ 
 				case 'Start':
 					if (empty($event['whole_day']))
 					{
-						$sifEvent .= '<Start>' . self::getDateTime($event['start'],$tzid) . '</Start>';
-						$sifEvent .= '<End>' . self::getDateTime($event['end'],$tzid) . '</End>';
+						$sifEvent .= '<Start>'.self::getDateTime($event['start'], $tzid).'</Start>';
+						$sifEvent .= '<End>'.self::getDateTime($event['end'], $tzid).'</End>';
 						$sifEvent .= "<AllDayEvent>0</AllDayEvent>";
 					}
 					else
 					{
 						// for whole-day events we use the date in event timezone
-						$time = new egw_time($event['start'],egw_time::$server_timezone);
+						$time = new egw_time($event['start'], egw_time::$server_timezone);
 						$time->setTimezone(self::$tz_cache[$event['tzid']]);
-						$sifEvent .= '<Start>' . $time->format('Y-m-d') . '</Start>';
-						$time = new egw_time($event['end'],egw_time::$server_timezone);
+						$sifEvent .= '<Start>'.$time->format('Y-m-d').'</Start>';
+						$time = new egw_time($event['end'], egw_time::$server_timezone);
 						$time->setTimezone(self::$tz_cache[$event['tzid']]);
-						$sifEvent .= '<End>' . $time->format('Y-m-d') . '</End>';
+						$sifEvent .= '<End>'.$time->format('Y-m-d').'</End>';
 						$sifEvent .= "<AllDayEvent>1</AllDayEvent>";
 					}
 					break;
@@ -1125,7 +1125,7 @@ 
 						$sifEvent .= "<$sifField>1</$sifField>";
 						foreach ($event['alarm'] as $alarmID => $alarmData)
 						{
-							$sifEvent .= '<ReminderMinutesBeforeStart>'. $alarmData['offset']/60 .'</ReminderMinutesBeforeStart>';
+							$sifEvent .= '<ReminderMinutesBeforeStart>'.$alarmData['offset'] / 60.'</ReminderMinutesBeforeStart>';
 							// lets take only the first alarm
 							break;
 						}
@@ -1156,10 +1156,10 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"() '$this->productName','$this->productSoftwareVersion'\n",3,$this->logfile);
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"()\n".array2string($sifEvent)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productName','$this->productSoftwareVersion'\n", 3, $this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"()\n".array2string($sifEvent)."\n", 3, $this->logfile);
 		}
 
 		return $sifEvent;
@@ -1173,9 +1173,9 @@ 
 	* @param string $_productName
 	* @param string $_productSoftwareVersion
 	*/
-	function setSupportedFields($_productName='', $_productSoftwareVersion='')
+	function setSupportedFields($_productName = '', $_productSoftwareVersion = '')
 	{
-		$state =& $_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 		if (isset($state))
 		{
 			$deviceInfo = $state->getClientDeviceInfo();
@@ -1239,8 +1239,8 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productName .
-				', '. $this->productSoftwareVersion . ")\n",3,$this->logfile);
+				'('.$this->productName.
+				', '.$this->productSoftwareVersion.")\n", 3, $this->logfile);
 		}
 	}
 }

Braces +38 added lines, -10 removed lines

@@ -149,7 +149,10 @@ 
 	function __construct(&$_clientProperties = array())
 	{
 		parent::__construct();
-		if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-sifcal";
+		if ($this->log)
+		{
+			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-sifcal";
+		}
 		$this->clientProperties = $_clientProperties;
 		$this->vCalendar = new Horde_iCalendar;
 	}
@@ -376,11 +379,17 @@ 
 			}
 		}
 
-		if ($this->calendarOwner) $finalEvent['owner'] = $this->calendarOwner;
+		if ($this->calendarOwner)
+		{
+			$finalEvent['owner'] = $this->calendarOwner;
+		}
 
 		date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 
-		if ($_calID > 0) $finalEvent['id'] = $_calID;
+		if ($_calID > 0)
+		{
+			$finalEvent['id'] = $_calID;
+		}
 
 		if ($this->log)
 		{
@@ -398,7 +407,8 @@ 
 
 		if ($event = $this->siftoegw($_sifdata, $contentID))
 		{
-			if ($contentID) {
+			if ($contentID)
+			{
 				$event['id'] = $contentID;
 			}
 			$result = $this->find_event($event, $filter);
@@ -462,7 +472,10 @@ 
 			$event['recur_exception'] = $exceptions;
 		} */
 
-		if ($recur_date) $event['recurrence'] = $recur_date;
+		if ($recur_date)
+		{
+			$event['recurrence'] = $recur_date;
+		}
 		$event_info = $this->get_event_info($event);
 
 		// common adjustments for existing events
@@ -482,7 +495,10 @@ 
 						unset($event[$key]);
 						continue;
 					}
-					if (!empty($value))	$event[$key] = $value;
+					if (!empty($value))
+					{
+						$event[$key] = $value;
+					}
 				}
 			}
 			else
@@ -578,7 +594,10 @@ 
 									break;
 								}
 							}
-							if (isset($alarmData)&&is_array($alarmData)) $event['alarm'][] = $alarmData;
+							if (isset($alarmData)&&is_array($alarmData))
+							{
+								$event['alarm'][] = $alarmData;
+							}
 						}
 					}
 					break;
@@ -860,7 +879,10 @@ 
 			$tzid = $event['tzid'];
 		}
 
-		if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+		if ($this->so->isWholeDay($event))
+		{
+			$event['whole_day'] = true;
+		}
 
 		if ($tzid)
 		{
@@ -904,10 +926,13 @@ 
 		}
 		elseif (!$recur_date &&
 			$event['recur_type'] != MCAL_RECUR_NONE &&
-			empty($event['whole_day'])) // whole-day events are not shifted
+			empty($event['whole_day']))
+		{
+			// whole-day events are not shifted
 		{
 			// Add the timezone transition related pseudo exceptions
 			$exceptions = $this->so->get_recurrence_exceptions($event, $tzid, 0, 0, 'tz_rrule');
+		}
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n" .
@@ -943,7 +968,10 @@ 
 
 		foreach ($this->sifMapping as $sifField => $egwField)
 		{
-			if (empty($egwField)) continue;
+			if (empty($egwField))
+			{
+				continue;
+			}
 
 			$value = $GLOBALS['egw']->translation->convert($event[$egwField], $sysCharSet, 'utf-8');