EGroupware / egroupware

api/src/Acl.php

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

@@ -32,7 +32,7 @@ 
 	/**
 	 * @var array $data internal repository with acl rows for the given app and account-id (incl. memberships)
 	 */
-	var $data = Array();
+	var $data = array();
 	/**
 	 * internal reference to global db-object
 	 *
@@ -133,7 +133,7 @@ 
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
-		$this->data = Array();
+		$this->data = array();
 		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
 		{
 			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
@@ -676,7 +676,7 @@ 
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
-			$grants = $accounts = Array();
+			$grants = $accounts = array();
 			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,

Spacing +99 added lines, -99 removed lines

@@ -47,15 +47,15 @@ 
 	/**
 	 * Constants for acl rights, like old EGW_ACL_* defines
 	 */
-	const READ      = 1;	// EGW_ACL_READ
-	const ADD       = 2;	// EGW_ACL_ADD
-	const EDIT      = 4;	// EGW_ACL_EDIT
-	const DELETE    = 8;	// EGW_ACL_DELETE
-	const PRIVAT    = 16;	// EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
-	const GROUPMGRS = 32;	// EGW_ACL_GROUP_MANAGERS
-	const CUSTOM1  = 64;		// EGW_ACL_CUSTOM_1
-	const CUSTOM2  = 128;	// EGW_ACL_CUSTOM_2
-	const CUSTOM3  = 256;	// EGW_ACL_CUSTOM_3
+	const READ      = 1; // EGW_ACL_READ
+	const ADD       = 2; // EGW_ACL_ADD
+	const EDIT      = 4; // EGW_ACL_EDIT
+	const DELETE    = 8; // EGW_ACL_DELETE
+	const PRIVAT    = 16; // EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
+	const GROUPMGRS = 32; // EGW_ACL_GROUP_MANAGERS
+	const CUSTOM1  = 64; // EGW_ACL_CUSTOM_1
+	const CUSTOM2  = 128; // EGW_ACL_CUSTOM_2
+	const CUSTOM3  = 256; // EGW_ACL_CUSTOM_3
 
 	/**
 	 * ACL constructor for setting account id
@@ -78,7 +78,7 @@ 
 		}
 		if ((int)$this->account_id != (int)$account_id)
 		{
-			$this->account_id = get_account_id((int)$account_id,@$GLOBALS['egw_info']['user']['account_id']);
+			$this->account_id = get_account_id((int)$account_id, @$GLOBALS['egw_info']['user']['account_id']);
 		}
 		$this->data = array();
 	}
@@ -91,7 +91,7 @@ 
 	 */
 	function __sleep()
 	{
-		return array('account_id','db');
+		return array('account_id', 'db');
 	}
 
 	/**************************************************************************\
@@ -104,7 +104,7 @@ 
 	 * @param boolean|array $no_groups = false if true, do not use memberships, if array do not use given groups
 	 * @return array along with storing it in $acl->data.  <br>
 	 */
-	function read_repository($no_groups=false)
+	function read_repository($no_groups = false)
 	{
 		// For some reason, calling this via XML-RPC doesn't call the constructor.
 		// Here is yet another work around(tm) (jengo)
@@ -119,14 +119,14 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
-			array_unshift($acl_acc_list,$this->account_id);
+			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list, $no_groups);
+			array_unshift($acl_acc_list, $this->account_id);
 		}
 
 		$this->data = Array();
-		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select(self::TABLE, '*', array('acl_account' => $acl_acc_list), __LINE__, __FILE__) as $row)
 		{
-			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
+			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row, 'acl_');
 		}
 		return $this->data;
 	}
@@ -155,15 +155,15 @@ 
 	 * @param int $rights rights
 	 * @return array all ACL records from $this->data.
 	 */
-	function add($appname,$location,$rights)
+	function add($appname, $location, $rights)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$row = array(
 			'appname'  => $appname,
 			'location' => $location,
-			'account'  => (int) $this->account_id,
-			'rights'   => (int) $rights
+			'account'  => (int)$this->account_id,
+			'rights'   => (int)$rights
 		);
 		$this->data[$row['appname'].'-'.$row['location'].'-'.$row['account']] = $row;
 
@@ -177,11 +177,11 @@ 
 	 * @param string/boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
-	function delete($appname,$location)
+	function delete($appname, $location)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		foreach($this->data as $idx => $value)
+		foreach ($this->data as $idx => $value)
 		{
 			if ($value['appname'] == $appname &&
 				($location === false || $value['location'] == $location) &&
@@ -200,24 +200,24 @@ 
 	 */
 	function save_repository()
 	{
-		$this->db->delete(self::TABLE,array(
+		$this->db->delete(self::TABLE, array(
 			'acl_account' => $this->account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['account'] == $this->account_id)
 			{
-				$this->db->insert(self::TABLE,array(
+				$this->db->insert(self::TABLE, array(
 					'acl_appname'  => $value['appname'],
 					'acl_location' => $value['location'],
 					'acl_account'  => $this->account_id,
 					'acl_rights'   => $value['rights'],
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -235,7 +235,7 @@ 
 	 * @param string $appname optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return int all rights or'ed together
 	 */
-	function get_rights($location,$appname = '')
+	function get_rights($location, $appname = '')
 	{
 		// For XML-RPC, change this once its working correctly for passing parameters (jengo)
 		if (is_array($location))
@@ -255,7 +255,7 @@ 
 			return True;
 		}
 		$rights = 0;
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname)
 			{
@@ -282,9 +282,9 @@ 
 	 */
 	function check($location, $required, $appname = False)
 	{
-		$rights = $this->get_rights($location,$appname);
+		$rights = $this->get_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 * @param array $memberships = array() additional account_id, eg. memberships to match beside $this->account_id, default none
 	 * @return int $rights
 	 */
-	function get_specific_rights($location, $appname = '', $memberships=array())
+	function get_specific_rights($location, $appname = '', $memberships = array())
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -305,10 +305,10 @@ 
 		}
 		$rights = 0;
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname &&
-				($value['location'] == $location ||	$value['location'] == 'everywhere') &&
+				($value['location'] == $location || $value['location'] == 'everywhere') &&
 				($value['account'] == $this->account_id || $memberships && in_array($value['account'], $memberships)))
 			{
 				if ($value['rights'] == 0)
@@ -331,9 +331,9 @@ 
 	 */
 	function check_specific($location, $required, $appname = '')
 	{
-		$rights = $this->get_specific_rights($location,$appname);
+		$rights = $this->get_specific_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**************************************************************************\
@@ -352,16 +352,16 @@ 
 	function add_repository($app, $location, $account_id, $rights)
 	{
 		//echo "<p>self::add_repository('$app','$location',$account_id,$rights);</p>\n";
-		$this->db->insert(self::TABLE,array(
+		$this->db->insert(self::TABLE, array(
 			'acl_rights' => $rights,
-		),array(
+		), array(
 			'acl_appname' => $app,
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -376,7 +376,7 @@ 
 	 * @param int/boolean $accountid = '' account id, default 0=$this->account_id, or false to delete all entries for $app/$location
 	 * @return int number of rows deleted
 	 */
-	function delete_repository($app, $location, $accountid='')
+	function delete_repository($app, $location, $accountid = '')
 	{
 		static $cache_accountid = array();
 
@@ -386,22 +386,22 @@ 
 		);
 		if ($accountid !== false)
 		{
-			if(isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
+			if (isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
 			{
 				$where['acl_account'] = $cache_accountid[$accountid];
 			}
 			else
 			{
-				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
 		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -414,15 +414,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return int/boolean rights or false if none exist
 	 */
-	function get_specific_rights_for_account($account_id,$location,$appname='')
+	function get_specific_rights_for_account($account_id, $location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		return $this->db->select(self::TABLE,'acl_rights',array(
+		return $this->db->select(self::TABLE, 'acl_rights', array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -432,15 +432,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return array with account => rights pairs
 	 */
-	function get_all_rights($location,$appname='')
+	function get_all_rights($location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_account,acl_rights', array(
 			'acl_location' => $location,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_account']] = $row['acl_rights'];
 		}
@@ -455,7 +455,7 @@ 
 	 * @param boolean $use_memberships = true
 	 * @return array with location => rights pairs
 	 */
-	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
+	function get_all_location_rights($account_id, $appname = '', $use_memberships = true)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -466,10 +466,10 @@ 
 			$accounts[] = $account_id;
 		}
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_account' => $accounts,
 			'acl_appname' => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_location']] |= $row['acl_rights'];
 		}
@@ -488,28 +488,28 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		$rights = 0;
 		$apps = false;
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if ($row['acl_rights'] == 0)
 			{
 				return False;
 			}
 			$rights |= $row['acl_rights'];
-			if (!!($rights & $required))
+			if (!!($rights&$required))
 			{
 				$apps[] = $row['acl_appname'];
 			}
@@ -529,21 +529,21 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$accountid = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$accountid = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+			$accountid = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 		}
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_appname' => $app,
 			'acl_account' => $accountid,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if ($row['acl_rights'] & $required)
+			if ($row['acl_rights']&$required)
 			{
 				$locations[] = $row['acl_location'];
 			}
@@ -564,14 +564,14 @@ 
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$accounts = false;
-		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights'), array(
 			'acl_appname'  => $app,
 			'acl_location' => $location,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if (!!($row['acl_rights'] & $required))
+			if (!!($row['acl_rights']&$required))
 			{
-				$accounts[] = (int) $row['acl_account'];
+				$accounts[] = (int)$row['acl_account'];
 			}
 		}
 		return $accounts;
@@ -583,14 +583,14 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return boolean/array false if there are no matching location in the db or array of locations
 	 */
-	function get_locations_for_app($app='')
+	function get_locations_for_app($app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
+		foreach ($this->db->select(self::TABLE, 'DISTINCT '.'acl_location', array(
 			'acl_appname'  => $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{
@@ -608,38 +608,38 @@ 
 	 * @param boolean $add_implicit_apps = true true: add apps every user has implicit rights
 	 * @return array containing list of apps
 	 */
-	function get_user_applications($accountid = '', $use_memberships=true, $add_implicit_apps=true)
+	function get_user_applications($accountid = '', $use_memberships = true, $add_implicit_apps = true)
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => 'run',
 			'acl_account'  => $memberships,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$app = $row['acl_appname'];
-			if(!isset($apps[$app]))
+			if (!isset($apps[$app]))
 			{
 				$apps[$app] = 0;
 			}
-			$apps[$app] |= (int) $row['acl_rights'];
+			$apps[$app] |= (int)$row['acl_rights'];
 		}
 		if ($add_implicit_apps)
 		{
-			$apps['api'] = 1;	// give everyone implicit rights for the home app
+			$apps['api'] = 1; // give everyone implicit rights for the home app
 		}
 		return $apps;
 	}
@@ -653,29 +653,29 @@ 
 	 * @param int $user = null user whos grants to return, default current user
 	 * @return array with account-ids (of owners) and granted rights as values
 	 */
-	function get_grants($app='',$enum_group_acls=true,$user=null)
+	function get_grants($app = '', $enum_group_acls = true, $user = null)
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!$user) $user = $this->account_id;
 
-		static $cache = array();	// some caching withing the request
+		static $cache = array(); // some caching withing the request
 
-		$grants =& $cache[$app][$user];
+		$grants = & $cache[$app][$user];
 		if (!isset($grants))
 		{
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
-			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
+			foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights', 'acl_location'), array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$grantor    = $row['acl_account'];
 				$rights     = $row['acl_rights'];
 
-				if(!isset($grants[$grantor]))
+				if (!isset($grants[$grantor]))
 				{
 					$grants[$grantor] = 0;
 				}
@@ -683,17 +683,17 @@ 
 
 				// if the right is granted from a group and we enummerated group ACL's
 				if ($GLOBALS['egw']->accounts->get_type($grantor) == 'g' && $enum_group_acls &&
-					(!is_array($enum_group_acls) || !in_array($grantor,$enum_group_acls)))
+					(!is_array($enum_group_acls) || !in_array($grantor, $enum_group_acls)))
 				{
 					// return the grant for each member of the group (false = also for no longer active users)
-					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
+					foreach ((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor) continue; // can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
 
-						if(!isset($grants[$grantor]))
+						if (!isset($grants[$grantor]))
 						{
 							$grants[$grantor] = 0;
 						}
@@ -715,21 +715,21 @@ 
 	 */
 	function delete_account($account_id)
 	{
-		if ((int) $account_id)
+		if ((int)$account_id)
 		{
 			// Delete all grants from this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_account' => $account_id
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			// Delete all grants to this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_location' => $account_id
-			),__LINE__, __FILE__);
+			), __LINE__, __FILE__);
 			// delete all memberships in account_id (if it is a group)
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_appname' => 'phpgw_group',
 				'acl_location' => $account_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 	}
 
@@ -740,15 +740,15 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return array with location => array(account => rights) pairs
 	 */
-	function get_location_grants($location,$app='')
+	function get_location_grants($location, $app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_account,acl_rights', array(
 			'acl_appname'  => $app,
 			'acl_location LIKE '.$this->db->quote($location),
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{

infolog/inc/class.infolog_bo.inc.php

Spacing +246 added lines, -247 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	var $total;
 	var $vfs;
-	var $vfs_basedir='/infolog';
+	var $vfs_basedir = '/infolog';
 	/**
 	 * Set Logging
 	 *
@@ -65,13 +65,13 @@ 
 	 *
 	 * @var array
 	 */
-	var $timestamps = array('info_startdate','info_enddate','info_datemodified','info_datecompleted','info_created');
+	var $timestamps = array('info_startdate', 'info_enddate', 'info_datemodified', 'info_datecompleted', 'info_created');
 	/**
 	 * fields the responsible user can change
 	 *
 	 * @var array
 	 */
-	var $responsible_edit=array('info_status','info_percent','info_datecompleted');
+	var $responsible_edit = array('info_status', 'info_percent', 'info_datecompleted');
 	/**
 	 * Fields to exclude from copy, if an entry is copied, the ones below are excluded by default.
 	 *
@@ -95,19 +95,19 @@ 
 	 *
 	 * @var string
 	 */
-	var $implicit_rights='read';
+	var $implicit_rights = 'read';
 	/**
 	 * Custom fields read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Group owners for certain types read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $group_owners=array();
+	var $group_owners = array();
 	/**
 	 * Current user
 	 *
@@ -174,55 +174,55 @@ 
 	function __construct($info_id = 0)
 	{
 		$this->enums = $this->stock_enums = array(
-			'priority' => array (
+			'priority' => array(
 				3 => 'urgent',
 				2 => 'high',
 				1 => 'normal',
 				0 => 'low'
 			),
 			'confirm'   => array(
-				'not' => 'not','accept' => 'accept','finish' => 'finish',
+				'not' => 'not', 'accept' => 'accept', 'finish' => 'finish',
 				'both' => 'both' ),
 			'type'      => array(
-				'task' => 'task','phone' => 'phone','note' => 'note','email' => 'email'
+				'task' => 'task', 'phone' => 'phone', 'note' => 'note', 'email' => 'email'
 			/*	,'confirm' => 'confirm','reject' => 'reject','fax' => 'fax' not implemented so far */ )
 		);
 		$this->status = $this->stock_status = array(
 			'defaults' => array(
-				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done','email' => 'done'),
+				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done', 'email' => 'done'),
 			'task' => array(
-				'offer' => 'offer',				// -->  NEEDS-ACTION
-				'not-started' => 'not-started',	// iCal NEEDS-ACTION
-				'ongoing' => 'ongoing',			// iCal IN-PROCESS
-				'done' => 'done',				// iCal COMPLETED
-				'cancelled' => 'cancelled',		// iCal CANCELLED
-				'billed' => 'billed',			// -->  DONE
-				'template' => 'template',		// -->  cancelled
-				'nonactive' => 'nonactive',		// -->  cancelled
-				'archive' => 'archive' ), 		// -->  cancelled
+				'offer' => 'offer', // -->  NEEDS-ACTION
+				'not-started' => 'not-started', // iCal NEEDS-ACTION
+				'ongoing' => 'ongoing', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'cancelled' => 'cancelled', // iCal CANCELLED
+				'billed' => 'billed', // -->  DONE
+				'template' => 'template', // -->  cancelled
+				'nonactive' => 'nonactive', // -->  cancelled
+				'archive' => 'archive' ), // -->  cancelled
 			'phone' => array(
-				'not-started' => 'call',		// iCal NEEDS-ACTION
-				'ongoing' => 'will-call',		// iCal IN-PROCESS
-				'done' => 'done', 				// iCal COMPLETED
-				'billed' => 'billed' ),			// -->  DONE
+				'not-started' => 'call', // iCal NEEDS-ACTION
+				'ongoing' => 'will-call', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'billed' => 'billed' ), // -->  DONE
 			'note' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 			'email' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 		);
 		if (($config_data = Api\Config::read('infolog')))
 		{
 			if (isset($config_data['status']) && is_array($config_data['status']))
 			{
-				foreach(array_keys($config_data['status']) as $key)
+				foreach (array_keys($config_data['status']) as $key)
 				{
 					if (!is_array($this->status[$key]))
 					{
 						$this->status[$key] = array();
 					}
-					$this->status[$key] = array_merge($this->status[$key],(array)$config_data['status'][$key]);
+					$this->status[$key] = array_merge($this->status[$key], (array)$config_data['status'][$key]);
 				}
 			}
 			if (isset($config_data['types']) && is_array($config_data['types']))
@@ -237,10 +237,10 @@ 
 			$this->customfields = Api\Storage\Customfields::get('infolog');
 			if ($this->customfields)
 			{
-				foreach($this->customfields as $name => $field)
+				foreach ($this->customfields as $name => $field)
 				{
 					// old infolog customefield record
-					if(empty($field['type']))
+					if (empty($field['type']))
 					{
 						if (count($field['values'])) $field['type'] = 'select'; // selectbox
 						elseif ($field['rows'] > 1) $field['type'] = 'textarea'; // textarea
@@ -252,23 +252,23 @@ 
 						$save_config = true;
 					}
 				}
-				if ($save_config) Api\Config::save_value('customfields',$this->customfields,'infolog');
+				if ($save_config) Api\Config::save_value('customfields', $this->customfields, 'infolog');
 			}
 			if (is_array($config_data['responsible_edit']))
 			{
-				$this->responsible_edit = array_merge($this->responsible_edit,$config_data['responsible_edit']);
+				$this->responsible_edit = array_merge($this->responsible_edit, $config_data['responsible_edit']);
 			}
 			if (is_array($config_data['copy_excludefields']))
 			{
-				$this->copy_excludefields = array_merge($this->copy_excludefields,$config_data['copy_excludefields']);
+				$this->copy_excludefields = array_merge($this->copy_excludefields, $config_data['copy_excludefields']);
 			}
 			if (is_array($config_data['sub_excludefields']) && $config_data['sub_excludefields'])
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$config_data['sub_excludefields']);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $config_data['sub_excludefields']);
 			}
 			else
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$this->default_sub_excludefields);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $this->default_sub_excludefields);
 			}
 			if ($config_data['implicit_rights'] == 'edit')
 			{
@@ -277,7 +277,7 @@ 
 			$this->history = $config_data['history'];
 		}
 		// sort types by there translation
-		foreach($this->enums['type'] as $key => $val)
+		foreach ($this->enums['type'] as $key => $val)
 		{
 			if (($val = lang($key)) != $key.'*') $this->enums['type'][$key] = lang($key);
 		}
@@ -286,14 +286,14 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->now = time();
-		$this->user_time_now = Api\DateTime::server2user($this->now,'ts');
+		$this->user_time_now = Api\DateTime::server2user($this->now, 'ts');
 
-		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
+		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
 		$this->so = new infolog_so($this->grants);
 
 		if ($info_id)
 		{
-			$this->read( $info_id );
+			$this->read($info_id);
 		}
 		else
 		{
@@ -309,9 +309,9 @@ 
 	 */
 	function has_customfields($type)
 	{
-		foreach($this->customfields as $field)
+		foreach ($this->customfields as $field)
 		{
-			if ((!$type || empty($field['type2']) || in_array($type,is_array($field['type2']) ? $field['type2'] : explode(',',$field['type2']))))
+			if ((!$type || empty($field['type2']) || in_array($type, is_array($field['type2']) ? $field['type2'] : explode(',', $field['type2']))))
 			{
 				return True;
 			}
@@ -328,7 +328,7 @@ 
 	 * @param int $user = null user whos rights to check, default current user
 	 * @return boolean
 	 */
-	function check_access($info,$required_rights,$other=0,$user=null)
+	function check_access($info, $required_rights, $other = 0, $user = null)
 	{
 		static $cache = array();
 
@@ -338,17 +338,17 @@ 
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
-			if ($info_id) $access =& $cache[$info_id][$required_rights];	// we only cache the current user!
+			if ($info_id) $access = & $cache[$info_id][$required_rights]; // we only cache the current user!
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true, $user);
 		}
 		if (!$info)
 		{
 			$owner = $other ? $other : $user;
 			$grant = $grants[$owner];
-			return $grant & $required_rights;
+			return $grant&$required_rights;
 		}
 
 
@@ -360,10 +360,10 @@ 
 				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id)))) return false;
 
 				if ($info['info_status'] == 'deleted' &&
-					($required_rights == Acl::EDIT ||		// no edit rights for deleted entries
-					 $required_rights == Acl::ADD  ||		// no add rights for deleted entries
+					($required_rights == Acl::EDIT || // no edit rights for deleted entries
+					 $required_rights == Acl::ADD || // no add rights for deleted entries
 					 $required_rights == Acl::DELETE && ($this->history == 'history_no_delete' || // no delete at all!
-					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))	// delete only for admins
+					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user != $this->user))))	// delete only for admins
 				{
 					$access = false;
 				}
@@ -371,12 +371,12 @@ 
 				{
 					if ($info['info_status'] != 'deleted')
 					{
-						$access = false;	// can only undelete deleted items
+						$access = false; // can only undelete deleted items
 					}
 					else
 					{
 						// undelete requires edit rights
-						$access = $this->so->check_access( $info,Acl::EDIT,$this->implicit_rights == 'edit',$grants,$user );
+						$access = $this->so->check_access($info, Acl::EDIT, $this->implicit_rights == 'edit', $grants, $user);
 					}
 				}
 			}
@@ -386,7 +386,7 @@ 
 			}
 			if (!isset($access))
 			{
-				$access = $this->so->check_access( $info,$required_rights,$this->implicit_rights == 'edit',$grants,$user );
+				$access = $this->so->check_access($info, $required_rights, $this->implicit_rights == 'edit', $grants, $user);
 			}
 		}
 		// else $cached = ' (from cache)';
@@ -421,12 +421,12 @@ 
 	 * @param string $not_id = '' id to exclude
 	 * @return boolean True if we have a linked item, False otherwise
 	 */
-	function link_id2from(&$info,$not_app='',$not_id='')
+	function link_id2from(&$info, $not_app = '', $not_id = '')
 	{
 		//error_log(__METHOD__ . "(subject='{$info['info_subject']}', link_id='{$info['info_link_id']}', from='{$info['info_from']}', not_app='$not_app', not_id='$not_id')");
 
 		if ($info['info_link_id'] > 0 &&
-			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) ||	// use supplied links info
+			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) || // use supplied links info
 			 ($link = Link::get_link($info['info_link_id'])) !== False))	// if link not found in supplied links, we always search!
 		{
 			if (isset($info['links']) && isset($link['app']))
@@ -440,11 +440,11 @@ 
 				$app = $link['link_app'.$nr];
 				$id  = $link['link_id'.$nr];
 			}
-			$title = Link::title($app,$id);
+			$title = Link::title($app, $id);
 
 			if ((string)$info['info_custom_from'] === '')	// old entry
 			{
-				$info['info_custom_from'] = (int) ($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
+				$info['info_custom_from'] = (int)($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
 			}
 			if (!$info['info_custom_from'])
 			{
@@ -466,7 +466,7 @@ 
 			return $info['blur_title'] = $title;
 		}
 		$info['info_link'] = array('title' => $info['info_from']);
-		$info['info_link_id'] = 0;	// link might have been deleted
+		$info['info_link_id'] = 0; // link might have been deleted
 		$info['info_custom_from'] = (int)!!$info['info_from'];
 
 		return False;
@@ -477,7 +477,7 @@ 
 	 */
 	static function subject_from_des($des)
 	{
-		return substr($des,0,60).' ...';
+		return substr($des, 0, 60).' ...';
 	}
 
 	/**
@@ -492,7 +492,7 @@ 
 	 * 			or NULL for timestamps in user-time
 	 * 			or false for timestamps in server-time
 	 */
-	 function time2time(&$values, $fromTZId=false, $toTZId=null)
+	 function time2time(&$values, $fromTZId = false, $toTZId = null)
 	 {
 
 		if ($fromTZId === $toTZId) return;
@@ -533,7 +533,7 @@ 
 			$toTZ = Api\DateTime::$server_timezone;
 		}
 		//error_log(__METHOD__.'(values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']).", from=".array2string($fromTZId).", to=".array2string($toTZId).") tz=".$tz->getName().', fromTZ='.$fromTZ->getName().', toTZ='.$toTZ->getName().', userTZ='.Api\DateTime::$user_timezone->getName());
-	 	foreach($this->timestamps as $key)
+	 	foreach ($this->timestamps as $key)
 		{
 		 	if ($values[$key])
 		 	{
@@ -542,14 +542,14 @@ 
 			 	if ($time->format('Hi') == '0000')
 			 	{
 				 	// we keep dates the same in new timezone
-				 	$arr = Api\DateTime::to($time,'array');
+				 	$arr = Api\DateTime::to($time, 'array');
 				 	$time = new Api\DateTime($arr, $toTZ);
 			 	}
 			 	else
 			 	{
 				 	$time->setTimezone($toTZ);
 			 	}
-			 	$values[$key] = Api\DateTime::to($time,'ts');
+			 	$values[$key] = Api\DateTime::to($time, 'ts');
 		 	}
 		}
 		//error_log(__METHOD__.'() --> values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']));
@@ -562,11 +562,11 @@ 
 	 * @param string $date_format = 'ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return Api\DateTime::server2user($ts,$date_format);
+		return Api\DateTime::server2user($ts, $date_format);
 	}
 
 	/**
@@ -581,10 +581,10 @@ 
 	 *
 	 * @return array|boolean infolog entry, null if not found or false if no permission to read it
 	 */
-	function &read($info_id,$run_link_id2from=true,$date_format='ts',$ignore_acl=false)
+	function &read($info_id, $run_link_id2from = true, $date_format = 'ts', $ignore_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($info_id).', '.array2string($run_link_id2from).", '$date_format') ".function_backtrace());
-		if (is_scalar($info_id) || isset($info_id[count($info_id)-1]))
+		if (is_scalar($info_id) || isset($info_id[count($info_id) - 1]))
 		{
 			if (is_scalar($info_id) && !is_numeric($info_id))
 			{
@@ -601,7 +601,7 @@ 
 			return null;
 		}
 
-		if (!$ignore_acl && !$this->check_access($data,Acl::READ))	// check behind read, to prevent a double read
+		if (!$ignore_acl && !$this->check_access($data, Acl::READ))	// check behind read, to prevent a double read
 		{
 			return False;
 		}
@@ -633,7 +633,7 @@ 
 	 * @param boolean $skip_notification Do not send notification of delete
 	 * @return boolean True if delete was successful, False otherwise ($info_id does not exist or no rights)
 	 */
-	function delete($info_id,$delete_children=False,$new_parent=False, $skip_notification=False)
+	function delete($info_id, $delete_children = False, $new_parent = False, $skip_notification = False)
 	{
 		if (is_array($info_id))
 		{
@@ -643,18 +643,18 @@ 
 		{
 			return False;
 		}
-		if (!$this->check_access($info,Acl::DELETE))
+		if (!$this->check_access($info, Acl::DELETE))
 		{
 			return False;
 		}
 		// check if we have children and delete or re-parent them
 		if (($children = $this->so->get_children($info_id)))
 		{
-			foreach($children as $id => $owner)
+			foreach ($children as $id => $owner)
 			{
-				if ($delete_children && $this->so->grants[$owner] & Acl::DELETE)
+				if ($delete_children && $this->so->grants[$owner]&Acl::DELETE)
 				{
-					$this->delete($id,$delete_children,$new_parent,$skip_notification);	// call ourself recursive to delete the child
+					$this->delete($id, $delete_children, $new_parent, $skip_notification); // call ourself recursive to delete the child
 				}
 				else	// dont delete or no rights to delete the child --> re-parent it
 				{
@@ -673,28 +673,28 @@ 
 		// if we have history switched on and not an already deleted item --> set only status deleted
 		if ($this->history && $info['info_status'] != 'deleted')
 		{
-			if ($info['info_status'] == 'deleted') return false;	// entry already deleted
+			if ($info['info_status'] == 'deleted') return false; // entry already deleted
 
 			$this->so->write($deleted);
 
-			Link::unlink(0,'infolog',$info_id,'','!file','',true);	// keep the file attachments, hide the rest
+			Link::unlink(0, 'infolog', $info_id, '', '!file', '', true); // keep the file attachments, hide the rest
 		}
 		else
 		{
-			$this->so->delete($info_id,false);	// we delete the children via bo to get all notifications!
+			$this->so->delete($info_id, false); // we delete the children via bo to get all notifications!
 
-			Link::unlink(0,'infolog',$info_id);
+			Link::unlink(0, 'infolog', $info_id);
 		}
 		if ($info['info_status'] != 'deleted')	// dont notify of final purge of already deleted items
 		{
 			// send email notifications and do the history logging
-			if(!$skip_notification)
+			if (!$skip_notification)
 			{
 				if (!is_object($this->tracking))
 				{
 					$this->tracking = new infolog_tracking($this);
 				}
-				$this->tracking->track($deleted,$info,$this->user,true);
+				$this->tracking->track($deleted, $info, $this->user, true);
 			}
 		}
 		return True;
@@ -716,13 +716,13 @@ 
 	*
 	* @return int|boolean info_id on a successfull write or false
 	*/
-	function write(&$values_in, $check_defaults=true, $touch_modified=true, $user2server=true,
-		$skip_notification=false, $throw_exception=false, $purge_cfs=null, $ignore_acl=false)
+	function write(&$values_in, $check_defaults = true, $touch_modified = true, $user2server = true,
+		$skip_notification = false, $throw_exception = false, $purge_cfs = null, $ignore_acl = false)
 	{
 		$values = $values_in;
 		//echo "boinfolog::write()values="; _debug_array($values);
-		if (!$ignore_acl && (!$values['info_id'] && !$this->check_access(0,Acl::EDIT,$values['info_owner']) &&
-			!$this->check_access(0,Acl::ADD,$values['info_owner'])))
+		if (!$ignore_acl && (!$values['info_id'] && !$this->check_access(0, Acl::EDIT, $values['info_owner']) &&
+			!$this->check_access(0, Acl::ADD, $values['info_owner'])))
 		{
 			return false;
 		}
@@ -732,7 +732,7 @@ 
 			$old = $this->read($values['info_id'], false, 'server', $ignore_acl);
 		}
 
-		if (($status_only = !$ignore_acl && $values['info_id'] && !$this->check_access($values,Acl::EDIT)))
+		if (($status_only = !$ignore_acl && $values['info_id'] && !$this->check_access($values, Acl::EDIT)))
 		{
 			if (!isset($values['info_responsible']))
 			{
@@ -744,21 +744,21 @@ 
 			}
 			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
 			{
-				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
+				$status_only = !!array_intersect((array)$responsible, array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
-				$status_only = $undelete = $this->check_access($values['info_id'],self::ACL_UNDELETE);
+				$status_only = $undelete = $this->check_access($values['info_id'], self::ACL_UNDELETE);
 			}
 		}
-		if (!$ignore_acl && ($values['info_id'] && !$this->check_access($values['info_id'],Acl::EDIT) && !$status_only ||
-		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],Acl::ADD)))
+		if (!$ignore_acl && ($values['info_id'] && !$this->check_access($values['info_id'], Acl::EDIT) && !$status_only ||
+		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'], Acl::ADD)))
 		{
 			return false;
 		}
 
 		// Make sure status is still valid if the type changes
-		if($old['info_type'] != $values['info_type'] && $values['info_status'])
+		if ($old['info_type'] != $values['info_type'] && $values['info_status'])
 		{
 			if (isset($this->status[$values['info_type']]) &&
 				!in_array($values['info_status'], array_keys($this->status[$values['info_type']])))
@@ -768,8 +768,8 @@ 
 		}
 		if ($status_only && !$undelete)	// make sure only status gets writen
 		{
-			$set_completed = !$values['info_datecompleted'] &&	// set date completed of finished job, only if its not already set
-				in_array($values['info_status'],array('done','billed','cancelled'));
+			$set_completed = !$values['info_datecompleted'] && // set date completed of finished job, only if its not already set
+				in_array($values['info_status'], array('done', 'billed', 'cancelled'));
 
 			$values = $old;
 			// only overwrite explicitly allowed fields
@@ -784,7 +784,7 @@ 
 				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
-				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+				if (isset($values['info_type']) && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) {
 					$forcestatus = false;
 					//echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
 					if (isset($this->status[$values['info_type']]['done'])) {
@@ -798,19 +798,19 @@ 
 						$status = 'cancelled';
 					}
 				}
-				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
+				if ($forcestatus && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) $values['info_status'] = $status;
 			}
 			$check_defaults = false;
 		}
 		if ($check_defaults)
 		{
 			if (!$values['info_datecompleted'] &&
-				(in_array($values['info_status'],array('done','billed'))))
+				(in_array($values['info_status'], array('done', 'billed'))))
 			{
-				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now;	// set date completed to today if status == done
+				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now; // set date completed to today if status == done
 			}
 			// Check for valid status / percent combinations
-			if (in_array($values['info_status'],array('done','billed')))
+			if (in_array($values['info_status'], array('done', 'billed')))
 			{
 				$values['info_percent'] = 100;
 			}
@@ -825,7 +825,7 @@ 
 				// We change percent to match status, not status to match percent
 				$values['info_percent'] = 10;
 			}
-			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'],array('done','billed','cancelled','archive')))
+			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'], array('done', 'billed', 'cancelled', 'archive')))
 			{
 				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
 				//$values['info_status'] = 'done';
@@ -846,7 +846,7 @@ 
 			}
 			if ($values['info_responsible'] && $values['info_status'] == 'offer')
 			{
-				$values['info_status'] = 'not-started';   // have to match if not finished
+				$values['info_status'] = 'not-started'; // have to match if not finished
 			}
 			if (isset($values['info_subject']) && empty($values['info_subject']))
 			{
@@ -854,18 +854,18 @@ 
 			}
 
 			// Check required custom fields
-			if($throw_exception)
+			if ($throw_exception)
 			{
 				$custom = Api\Storage\Customfields::get('infolog');
-				foreach($custom as $c_name => $c_field)
+				foreach ($custom as $c_name => $c_field)
 				{
-					if($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
-					if($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'],$type2)))
+					if ($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',', $c_field['type2']);
+					if ($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'], $type2)))
 					{
 						// Required custom field
-						if(!$values['#'.$c_name])
+						if (!$values['#'.$c_name])
 						{
-							throw new Api\Exception\WrongUserinput(lang('For infolog type %1, %2 is required',lang($values['info_type']),$c_field['label']));
+							throw new Api\Exception\WrongUserinput(lang('For infolog type %1, %2 is required', lang($values['info_type']), $c_field['label']));
 						}
 					}
 				}
@@ -874,16 +874,16 @@ 
 		if (isset($this->group_owners[$values['info_type']]))
 		{
 			$values['info_owner'] = $this->group_owners[$values['info_type']];
-			if (!$ignore_acl && !($this->grants[$this->group_owners[$values['info_type']]] & Acl::EDIT))
+			if (!$ignore_acl && !($this->grants[$this->group_owners[$values['info_type']]]&Acl::EDIT))
 			{
-				if (!$this->check_access($values['info_id'],Acl::EDIT) ||
-					!$values['info_id'] && !$this->check_access($values,Acl::ADD)
+				if (!$this->check_access($values['info_id'], Acl::EDIT) ||
+					!$values['info_id'] && !$this->check_access($values, Acl::ADD)
 				)
 				{
-					return false;	// no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
+					return false; // no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
 				}
 			}
-			$values['info_access'] = 'public';	// group-owners are allways public
+			$values['info_access'] = 'public'; // group-owners are allways public
 		}
 		elseif (!$values['info_id'] && !$values['info_owner'] || $GLOBALS['egw']->accounts->get_type($values['info_owner']) == 'g')
 		{
@@ -938,10 +938,10 @@ 
 			$to_write['info_id'] = $info_id;
 
 			// if the info responbsible array is not passed, fetch it from old.
-			if (!array_key_exists('info_responsible',$values)) $values['info_responsible'] = $old['info_responsible'];
+			if (!array_key_exists('info_responsible', $values)) $values['info_responsible'] = $old['info_responsible'];
 			if (!is_array($values['info_responsible']))		// this should not happen, bug it does ;-)
 			{
-				$values['info_responsible'] = $values['info_responsible'] ? explode(',',$values['info_responsible']) : array();
+				$values['info_responsible'] = $values['info_responsible'] ? explode(',', $values['info_responsible']) : array();
 				$to_write['info_responsible'] = $values['info_responsible'];
 			}
 
@@ -949,11 +949,11 @@ 
 			if (!$old && is_array($to_write['link_to']['to_id']) && count($to_write['link_to']['to_id']))
 			{
 				//echo "<p>writing links for new entry $info_id</p>\n"; _debug_array($content['link_to']['to_id']);
-				Link::link('infolog',$info_id,$to_write['link_to']['to_id']);
+				Link::link('infolog', $info_id, $to_write['link_to']['to_id']);
 				$values['link_to']['to_id'] = $info_id;
 			}
 			$this->write_check_links($to_write);
-			if(!$values['info_link_id'] || $values['info_link_id'] != $to_write['info_link_id'])
+			if (!$values['info_link_id'] || $values['info_link_id'] != $to_write['info_link_id'])
 			{
 				// Just got a link ID, need to save it
 				$this->so->write($to_write);
@@ -968,20 +968,20 @@ 
 			}
 
 			// create (and remove) links in custom fields
-			if(!is_array($old))
+			if (!is_array($old))
 			{
 				$old = array();
 			}
-			Api\Storage\Customfields::update_links('infolog',$values,$old,'info_id');
+			Api\Storage\Customfields::update_links('infolog', $values, $old, 'info_id');
 
 			// Check for restore of deleted entry, restore held links
-			if($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
+			if ($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
 			{
 				Link::restore('infolog', $info_id);
 			}
 
 			// notify the link-class about the update, as other apps may be subscribt to it
-			Link::notify_update('infolog',$info_id,$values);
+			Link::notify_update('infolog', $info_id, $values);
 
 			// pre-cache the new values
 			self::set_link_cache($values);
@@ -992,39 +992,39 @@ 
 				$this->tracking = new infolog_tracking($this);
 			}
 
-			if ($old && ($missing_fields = array_diff_key($old,$values)))
+			if ($old && ($missing_fields = array_diff_key($old, $values)))
 			{
 				// Some custom fields (multiselect with nothing selected) will be missing,
 				// and that's OK.  Don't put them back.
-				foreach(array_keys($missing_fields) as $field)
+				foreach (array_keys($missing_fields) as $field)
 				{
-					if(array_key_exists($field, $values_in))
+					if (array_key_exists($field, $values_in))
 					{
 						unset($missing_fields[$field]);
 					}
 				}
-				$values = array_merge($values,$missing_fields);
+				$values = array_merge($values, $missing_fields);
 			}
 			// Add keys missing in the $to_write array
-			if (($missing_fields = array_diff_key($values,$to_write)))
+			if (($missing_fields = array_diff_key($values, $to_write)))
 			{
-				$to_write = array_merge($to_write,$missing_fields);
+				$to_write = array_merge($to_write, $missing_fields);
 			}
-			$this->tracking->track($to_write,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
-				null,$skip_notification);
+			$this->tracking->track($to_write, $old, $this->user, $values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
+				null, $skip_notification);
 
 			if ($info_from_set) $values['info_from'] = '';
 
 			// Change new values back to user time before sending them back
-			if($user2server)
+			if ($user2server)
 			{
 				$this->time2time($values);
 			}
 			// merge changes (keeping extra values from the UI)
-			$values_in = array_merge($values_in,$values);
+			$values_in = array_merge($values_in, $values);
 
 			// Update modified timestamp of parent
-			if($values['info_id_parent'] && $touch_modified)
+			if ($values['info_id_parent'] && $touch_modified)
 			{
 				$parent = $this->read($values['info_id_parent'], false, 'server', true);
 				$this->write($parent, false, true, false, true, false, null, $ignore_acl);
@@ -1044,9 +1044,9 @@ 
 	protected function write_check_links(&$values)
 	{
 		$old_link_id = (int)$values['info_link_id'];
-		if($values['info_contact'])
+		if ($values['info_contact'])
 		{
-			if(is_array($values['info_contact']))
+			if (is_array($values['info_contact']))
 			{
 				// eTemplate2 returns the array all ready
 				$app = $values['info_contact']['app'];
@@ -1063,14 +1063,14 @@ 
 			}
 			elseif ($app && $id)
 			{
-				if(!is_array($values['link_to']))
+				if (!is_array($values['link_to']))
 				{
 					$values['link_to'] = array();
 				}
 				$values['info_link_id'] = (int)($info_link_id = Link::link(
 						'infolog',
 						$values['info_id'],
-						$app,$id
+						$app, $id
 				));
 			}
 			else
@@ -1082,7 +1082,7 @@ 
 		{
 			$link = Link::get_link($old_link_id);
 			// remove selected project, if removed link is that project
-			if($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $values['old_pm_id'])
+			if ($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $values['old_pm_id'])
 			{
 				unset($values['pm_id'], $values['old_pm_id']);
 			}
@@ -1101,9 +1101,9 @@ 
 	 * @param int|array $info_id id
 	 * @return int|array number of subs
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
-		return $this->so->anzSubs( $info_id );
+		return $this->so->anzSubs($info_id);
 	}
 
 	/**
@@ -1120,23 +1120,23 @@ 
 	 * @param boolean $no_acl =false true: ignore all acl
 	 * @return array with id's as key of the matching log-entries
 	 */
-	function &search(&$query, $no_acl=false)
+	function &search(&$query, $no_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($query).')');
 
-		if($query['filter'] == 'bydate')
+		if ($query['filter'] == 'bydate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'duedate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'private')
 		{
-			$query['col_filter'][] = 'info_access = ' . $GLOBALS['egw']->db->quote('private');
+			$query['col_filter'][] = 'info_access = '.$GLOBALS['egw']->db->quote('private');
 		}
 		if (!isset($query['date_format']) || $query['date_format'] != 'server')
 		{
@@ -1146,7 +1146,7 @@ 
 				{
 					if (!empty($query['col_filter'][$key]))
 					{
-						$query['col_filter'][$key] = Api\DateTime::user2server($query['col_filter'][$key],'ts');
+						$query['col_filter'][$key] = Api\DateTime::user2server($query['col_filter'][$key], 'ts');
 					}
 				}
 			}
@@ -1159,7 +1159,7 @@ 
 		{
 			foreach ($ret as $id => &$data)
 			{
-				if (!$no_acl && !$this->check_access($data,Acl::READ))
+				if (!$no_acl && !$this->check_access($data, Acl::READ))
 				{
 					unset($ret[$id]);
 					continue;
@@ -1175,7 +1175,7 @@ 
 							if ($time->format('Hi') == '0000')
 							{
 								// we keep dates the same in user-time
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$time = new Api\DateTime($arr, Api\DateTime::$user_timezone);
 							}
 							else
@@ -1183,7 +1183,7 @@ 
 								$time->setTimezone(Api\DateTime::$user_timezone);
 							}
 						}
-						$data[$key] = Api\DateTime::to($time,'ts');
+						$data[$key] = Api\DateTime::to($time, 'ts');
 					}
 				}
 				// pre-cache title and file access
@@ -1200,7 +1200,7 @@ 
 	 * @param array $filter = array('filter'=>'own','info_type'=>'task')
 	 * @return string
 	 */
-	public function getctag(array $filter=array('filter'=>'own','info_type'=>'task'))
+	public function getctag(array $filter = array('filter'=>'own', 'info_type'=>'task'))
 	{
 		$filter += array(
 			'order'			=> 'info_datemodified',
@@ -1212,7 +1212,7 @@ 
 		// we need to query deleted entries too for a ctag!
 		$filter['filter'] .= '+deleted';
 
-		$result =& $this->search($filter);
+		$result = & $this->search($filter);
 
 		if (empty($result)) return 'EGw-empty-wGE';
 
@@ -1234,12 +1234,12 @@ 
 	 * @param string $_date
 	 * @return array $content array for uiinfolog
 	 */
-	function import_mail($_addresses,$_subject,$_message,$_attachments,$_date)
+	function import_mail($_addresses, $_subject, $_message, $_attachments, $_date)
 	{
-		foreach($_addresses as $address)
+		foreach ($_addresses as $address)
 		{
 			$names[] = $address['name'];
-			$emails[] =$address['email'];
+			$emails[] = $address['email'];
 		}
 
 		$type = isset($this->enums['type']['email']) ? 'email' : 'note';
@@ -1247,8 +1247,8 @@ 
 		$info = array(
 			'info_id' => 0,
 			'info_type' => $type,
-			'info_from' => implode(', ',$names),
-			'info_addr' => implode(', ',$emails),
+			'info_from' => implode(', ', $names),
+			'info_addr' => implode(', ', $emails),
 			'info_subject' => $_subject,
 			'info_des' => $_message,
 			'info_startdate' => Api\DateTime::server2user($_date),
@@ -1267,16 +1267,16 @@ 
 		$contacts = array();
 		foreach ($emails as $mailadr)
 		{
-			$contacts = array_merge($contacts,(array)$addressbook->search(
+			$contacts = array_merge($contacts, (array)$addressbook->search(
 				array(
 					'email' => $mailadr,
 					'email_home' => $mailadr
-				),True,'','','',false,'OR',false,null,'',false));
+				), True, '', '', '', false, 'OR', false, null, '', false));
 		}
 		if (!$contacts || !is_array($contacts) || !is_array($contacts[0]))
 		{
-			$info['msg'] = lang('Attention: No Contact with address %1 found.',$info['info_addr']);
-			$info['info_custom_from'] = true;	// show the info_from line and NOT only the link
+			$info['msg'] = lang('Attention: No Contact with address %1 found.', $info['info_addr']);
+			$info['info_custom_from'] = true; // show the info_from line and NOT only the link
 		}
 		else
 		{
@@ -1286,21 +1286,21 @@ 
 			// create the rest a "ordinary" links
 			foreach ($contacts as $contact)
 			{
-				Link::link('infolog',$info['link_to']['to_id'],'addressbook',$contact['id']);
+				Link::link('infolog', $info['link_to']['to_id'], 'addressbook', $contact['id']);
 			}
 		}
 		if (is_array($_attachments))
 		{
 			foreach ($_attachments as $attachment)
 			{
-				if($attachment['egw_data'])
+				if ($attachment['egw_data'])
 				{
-					Link::link('infolog',$info['link_to']['to_id'],Link::DATA_APPNAME,  $attachment);
+					Link::link('infolog', $info['link_to']['to_id'], Link::DATA_APPNAME, $attachment);
 				}
-				else if(is_readable($attachment['tmp_name']) ||
+				else if (is_readable($attachment['tmp_name']) ||
 					(Vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
 				{
-					Link::link('infolog',$info['link_to']['to_id'],'file',  $attachment);
+					Link::link('infolog', $info['link_to']['to_id'], 'file', $attachment);
 				}
 			}
 		}
@@ -1319,14 +1319,14 @@ 
 	{
 		if (!is_array($info))
 		{
-			$info = $this->read( $info,false );
+			$info = $this->read($info, false);
 		}
 		if (!$info)
 		{
 			return $info;
 		}
-		$title = !empty($info['info_subject']) ? $info['info_subject'] :self::subject_from_des($info['info_descr']);
-		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id']?' (#'.$info['info_id'].')':'');
+		$title = !empty($info['info_subject']) ? $info['info_subject'] : self::subject_from_des($info['info_descr']);
+		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id'] ? ' (#'.$info['info_id'].')' : '');
 	}
 
 	/**
@@ -1337,15 +1337,15 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		foreach ($this->search($params=array(
+		foreach ($this->search($params = array(
 			'col_filter' => array('info_id' => $ids),
 		)) as $info)
 		{
 			$titles[$info['info_id']] = $this->link_title($info);
 		}
-		foreach (array_diff($ids,array_keys($titles)) as $id)
+		foreach (array_diff($ids, array_keys($titles)) as $id)
 		{
-			$titles[$id] = false;	// we assume every not returned entry to be not readable, as we notify the link class about all deletes
+			$titles[$id] = false; // we assume every not returned entry to be not readable, as we notify the link class about all deletes
 		}
 		return $titles;
 	}
@@ -1372,7 +1372,7 @@ 
 		$content = array();
 		if (is_array($ids))
 		{
-			foreach(array_keys($ids) as $id)
+			foreach (array_keys($ids) as $id)
 			{
 				$content[$id] = $this->link_title($id);
 			}
@@ -1389,10 +1389,10 @@ 
 	 * @param int $user = null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used
-		return $this->check_access($id,$check,0,$user);
+		unset($rel_path); // not used
+		return $this->check_access($id, $check, 0, $user);
 	}
 
 	/**
@@ -1402,10 +1402,9 @@ 
 	 */
 	function set_link_cache(array $info)
 	{
-		Link::set_cache('infolog',$info['info_id'],
+		Link::set_cache('infolog', $info['info_id'],
 			$this->link_title($info),
-			$this->file_access($info,Acl::EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT :
-			($this->file_access($info,Acl::READ) ? Acl::READ : 0));
+			$this->file_access($info, Acl::EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT : ($this->file_access($info, Acl::READ) ? Acl::READ : 0));
 	}
 
 	/**
@@ -1419,8 +1418,8 @@ 
 	function cal_to_include($args)
 	{
 		//echo "<p>cal_to_include("; print_r($args); echo ")</p>\n";
-		$user = (int) $args['owner'];
-		if ($user <= 0 && !checkdate($args['month'],$args['day'],$args['year']))
+		$user = (int)$args['owner'];
+		if ($user <= 0 && !checkdate($args['month'], $args['day'], $args['year']))
 		{
 			return False;
 		}
@@ -1428,7 +1427,7 @@ 
 
 		$do_events = $args['location'] == 'calendar_include_events';
 		$to_include = array();
-		$date_wanted = sprintf('%04d/%02d/%02d',$args['year'],$args['month'],$args['day']);
+		$date_wanted = sprintf('%04d/%02d/%02d', $args['year'], $args['month'], $args['day']);
 		$query = array(
 			'order' => $args['order'] ? $args['order'] : 'info_startdate',
 			'sort'  => $args['sort'] ? $args['sort'] : ($do_events ? 'ASC' : 'DESC'),
@@ -1437,34 +1436,34 @@ 
 		);
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] || $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] === '0')
 		{
-			$query['col_filter']['info_type'] = explode(',',$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
+			$query['col_filter']['info_type'] = explode(',', $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
 		}
 		elseif ($this->customfields && !$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show_custom'])
 		{
-			$query['col_filter']['info_type'] = array('task','phone','note','email');
+			$query['col_filter']['info_type'] = array('task', 'phone', 'note', 'email');
 		}
 		while ($infos = $this->search($query))
 		{
 			foreach ($infos as $info)
 			{
-				$start = new Api\DateTime($info['info_startdate'],Api\DateTime::$user_timezone);
+				$start = new Api\DateTime($info['info_startdate'], Api\DateTime::$user_timezone);
 				$title = ($do_events ? $start->format(false).' ' : '').
 					$info['info_subject'];
-				$view = Link::view('infolog',$info['info_id']);
+				$view = Link::view('infolog', $info['info_id']);
 				$size = null;
-				$edit = Link::edit('infolog',$info['info_id'], $size);
+				$edit = Link::edit('infolog', $info['info_id'], $size);
 				$edit['size'] = $size;
-				$content=array();
+				$content = array();
 				$status = $this->status[$info['info_type']][$info['info_status']];
 				$icons = array();
-				foreach(array(
+				foreach (array(
 					$info['info_type'] => 'navbar',
 					$status => 'status'
 				) as $icon => $default)
 				{
-					$icons[Api\Image::find('infolog',$icon) ? $icon : $default] = $icon;
+					$icons[Api\Image::find('infolog', $icon) ? $icon : $default] = $icon;
 				}
-				$content[] = Api\Html::a_href($title,$view);
+				$content[] = Api\Html::a_href($title, $view);
 				$html = Api\Html::table(array(1 => $content));
 
 				$to_include[] = array(
@@ -1477,9 +1476,9 @@ 
 					'content'   => $html,
 				);
 			}
-			if ($query['total'] <= ($query['start']+=count($infos)))
+			if ($query['total'] <= ($query['start'] += count($infos)))
 			{
-				break;	// no more availible
+				break; // no more availible
 			}
 		}
 		//echo "boinfolog::cal_to_include("; print_r($args); echo ")<pre>"; print_r($to_include); echo "</pre>\n";
@@ -1502,7 +1501,7 @@ 
 				'cols' => 'main.info_id,info_type,info_status,info_percent,info_id_parent',
 			);
 			$infos = array();
-			foreach($this->search($query) as $row)
+			foreach ($this->search($query) as $row)
 			{
 				$infos[$row['info_id']] = array(
 					'status' => $row['info_type'] != 'phone' && $row['info_status'] == 'ongoing' ?
@@ -1511,16 +1510,16 @@ 
 						'ongoing' : 'infolog/'.$row['info_status'],
 					'class'  => $row['info_id_parent'] ? 'infolog_rowHasParent' : null,
 				);
-				if (Api\Image::find('infolog', $icon=$row['info_type'].'_element') ||
-					Api\Image::find('infolog', $icon=$row['info_type']))
+				if (Api\Image::find('infolog', $icon = $row['info_type'].'_element') ||
+					Api\Image::find('infolog', $icon = $row['info_type']))
 				{
 					$infos[$row['info_id']]['icon'] = 'infolog/'.$icon;
 				}
 			}
 			$anzSubs = $this->anzSubs(array_keys($infos));
-			if($anzSubs && is_array($anzSubs))
+			if ($anzSubs && is_array($anzSubs))
 			{
-				foreach($anzSubs as $info_id => $subs)
+				foreach ($anzSubs as $info_id => $subs)
 				{
 					if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs';
 				}
@@ -1540,18 +1539,18 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $info_id=-1)
+	function find_or_add_categories($catname_list, $info_id = -1)
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Api\Categories($this->user,'infolog');
+			$this->categories = new Api\Categories($this->user, 'infolog');
 		}
 		$old_cats_preserve = array();
 		if ($info_id && $info_id > 0)
 		{
 			// preserve Api\Categories without users read access
 			$old_infolog = $this->read($info_id);
-			$old_categories = explode(',',$old_infolog['info_cat']);
+			$old_categories = explode(',', $old_infolog['info_cat']);
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
 				foreach ($old_categories as $cat_id)
@@ -1612,15 +1611,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Api\Categories($this->user,'infolog');
+			$this->categories = new Api\Categories($this->user, 'infolog');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(Acl::READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -1647,19 +1646,19 @@ 
 
 		$save_account_id = $GLOBALS['egw_info']['user']['account_id'];
 		$save_prefs      = $GLOBALS['egw_info']['user']['preferences'];
-		foreach($users as $user)
+		foreach ($users as $user)
 		{
-			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email'))) continue;
+			if (!($email = $GLOBALS['egw']->accounts->id2name($user, 'account_email'))) continue;
 			// create the enviroment for $user
 			$this->user = $GLOBALS['egw_info']['user']['account_id'] = $user;
 			$GLOBALS['egw']->preferences->__construct($user);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
 			$GLOBALS['egw']->acl->__construct($user);
-			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
-			$this->so = new infolog_so($this->grants);	// so caches it's filters
+			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
+			$this->so = new infolog_so($this->grants); // so caches it's filters
 
 			$notified_info_ids = array();
-			foreach(array(
+			foreach (array(
 				'notify_due_responsible'   => 'open-responsible-enddate',
 				'notify_due_delegated'     => 'open-delegated-enddate',
 				'notify_start_responsible' => 'open-responsible-date',
@@ -1668,44 +1667,44 @@ 
 			{
 				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref])) continue;
 
-				$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
+				$filter .= date('Y-m-d', time() + 24 * 60 * 60 * (int)$pref_value);
 				//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
 
 				$params = array('filter' => $filter, 'custom_fields' => true, 'subs' => true);
-				foreach($this->so->search($params) as $info)
+				foreach ($this->so->search($params) as $info)
 				{
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
-					if (in_array($info['info_id'],$notified_info_ids)) continue;
+					if (in_array($info['info_id'], $notified_info_ids)) continue;
 
 					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
 						$this->tracking = new infolog_tracking($this);
 					}
-					switch($pref)
+					switch ($pref)
 					{
 						case 'notify_due_responsible':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_due_delegated':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_start_responsible':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 						case 'notify_start_delegated':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 					}
 					//error_log("notifiying $user($email) about $info[info_subject]: $info[message]");
-					$this->tracking->send_notification($info,null,$email,$user,$pref);
+					$this->tracking->send_notification($info, null, $email, $user, $pref);
 
 					$notified_info_ids[] = $info['info_id'];
 				}
@@ -1768,7 +1767,7 @@ 
 	 * @param string $x_infolog_status preserved original infolog status
 	 * @return string
 	 */
-	function vtodo2status($_vtodo_status,$x_infolog_status=null)
+	function vtodo2status($_vtodo_status, $x_infolog_status = null)
 	{
 		$vtodo_status = strtoupper($_vtodo_status);
 
@@ -1792,7 +1791,7 @@ 
 	 * @param array &$icons = null on return name of icons
 	 * @return array value => (commaseparated) translations
 	 */
-	function get_status($type=null, array &$icons=null)
+	function get_status($type = null, array &$icons = null)
 	{
 		// if filtered by type, show only the stati of the filtered type
 		if ($type && isset($this->status[$type]))
@@ -1802,16 +1801,16 @@ 
 		else	// show all stati
 		{
 			$statis = $icons = array();
-			foreach($this->status as $t => $stati)
+			foreach ($this->status as $t => $stati)
 			{
 				if ($t === 'defaults') continue;
-				foreach($stati as $val => $label)
+				foreach ($stati as $val => $label)
 				{
 					$statis[$val][$label] = lang($label);
 					if (!isset($icons[$val])) $icons[$val] = $label;
 				}
 			}
-			foreach($statis as $val => &$labels)
+			foreach ($statis as $val => &$labels)
 			{
 				$labels = implode(', ', $labels);
 			}
@@ -1827,7 +1826,7 @@ 
 	 */
 	function activate($info)
 	{
-		switch((int)$info['info_percent'])
+		switch ((int)$info['info_percent'])
 		{
 			case 0:		return 'not-started';
 			case 100:	return 'done';
@@ -1846,8 +1845,8 @@ 
 		#Horde::logMessage("getParentID($_guid)",  __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		$parentID = False;
-		$myfilter = array('col_filter' => array('info_uid'=>$_guid)) ;
-		if ($_guid && ($found=$this->search($myfilter)) && ($uidmatch = array_shift($found)))
+		$myfilter = array('col_filter' => array('info_uid'=>$_guid));
+		if ($_guid && ($found = $this->search($myfilter)) && ($uidmatch = array_shift($found)))
 		{
 			$parentID = $uidmatch['info_id'];
 		}
@@ -1864,7 +1863,7 @@ 
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
-	function findInfo($infoData, $relax=false, $tzid=null)
+	function findInfo($infoData, $relax = false, $tzid = null)
 	{
 		$foundInfoLogs = array();
 		$filter = array();
@@ -1872,7 +1871,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX, ': 'EXACT, ') . $tzid . ')[InfoData]:'
+				. '('.($relax ? 'RELAX, ' : 'EXACT, ').$tzid.')[InfoData]:'
 				. array2string($infoData));
 		}
 
@@ -1891,9 +1890,9 @@ 
 		if (!$relax && !empty($infoData['info_uid']))
 		{
 			$filter = array('col_filter' => array('info_uid' => $infoData['info_uid']));
-			foreach($this->so->search($filter) as $egwData)
+			foreach ($this->so->search($filter) as $egwData)
 			{
-				if (!$this->check_access($egwData,Acl::READ)) continue;
+				if (!$this->check_access($egwData, Acl::READ)) continue;
 				$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
 			}
 			return $foundInfoLogs;
@@ -1921,7 +1920,7 @@ 
 				$text = '';
 				foreach ($matches as $chunk)
 				{
-					if (strlen($text) <  strlen($chunk[0]))
+					if (strlen($text) < strlen($chunk[0]))
 					{
 						$text = $chunk[0];
 					}
@@ -1945,7 +1944,7 @@ 
 
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData, Acl::READ)) continue;
 
 			switch ($infoData['info_type'])
 			{
@@ -1962,7 +1961,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[location mismatch]: '
-								. $infoData['info_location'] . ' <> ' . $egwData['info_location']);
+								. $infoData['info_location'].' <> '.$egwData['info_location']);
 						}
 						continue;
 					}
@@ -1979,7 +1978,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[description mismatch]: '
-								. $infoData['info_des'] . ' <> ' . $egwData['info_des']);
+								. $infoData['info_des'].' <> '.$egwData['info_des']);
 						}
 						continue;
 					}
@@ -1993,7 +1992,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[FOUND]:' . array2string($foundInfoLogs));
+					. '()[FOUND]:'.array2string($foundInfoLogs));
 			}
 			return $foundInfoLogs;
 		}
@@ -2018,7 +2017,7 @@ 
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData, Acl::READ)) continue;
 			// Horde::logMessage("findVTODO Trying\n"
 			//	. print_r($egwData, true),
 			//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -2030,7 +2029,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[category mismatch]: '
-						. $infoData['info_cat'] . ' <> ' . $egwData['info_cat']);
+						. $infoData['info_cat'].' <> '.$egwData['info_cat']);
 				}
 				continue;
 			}
@@ -2040,15 +2039,15 @@ 
 				if (isset($egwData['info_startdate']) && $egwData['info_startdate'])
 				{
 					// We compare the date only
-					$taskTime = new Api\DateTime($infoData['info_startdate'],Api\DateTime::$server_timezone);
-					$egwTime = new Api\DateTime($egwData['info_startdate'],Api\DateTime::$server_timezone);
+					$taskTime = new Api\DateTime($infoData['info_startdate'], Api\DateTime::$server_timezone);
+					$egwTime = new Api\DateTime($egwData['info_startdate'], Api\DateTime::$server_timezone);
 					if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 					{
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[start mismatch]: '
-								. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+								. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 						}
 						continue;
 					}
@@ -2075,7 +2074,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 							. '()[status mismatch]: '
-							. $infoData['info_status'] . ' <> ' . $egwData['info_status']);
+							. $infoData['info_status'].' <> '.$egwData['info_status']);
 					}
 					continue;
 				}
@@ -2085,15 +2084,15 @@ 
 					if (isset($egwData['info_enddate']) && $egwData['info_enddate'])
 					{
 						// We compare the date only
-						$taskTime = new Api\DateTime($infoData['info_enddate'],Api\DateTime::$server_timezone);
-						$egwTime = new Api\DateTime($egwData['info_enddate'],Api\DateTime::$server_timezone);
+						$taskTime = new Api\DateTime($infoData['info_enddate'], Api\DateTime::$server_timezone);
+						$egwTime = new Api\DateTime($egwData['info_enddate'], Api\DateTime::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[DUE mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2114,15 +2113,15 @@ 
 					if (isset($egwData['info_datecompleted']) && $egwData['info_datecompleted'])
 					{
 						// We compare the date only
-						$taskTime = new Api\DateTime($infoData['info_datecompleted'],Api\DateTime::$server_timezone);
-						$egwTime = new Api\DateTime($egwData['info_datecompleted'],Api\DateTime::$server_timezone);
+						$taskTime = new Api\DateTime($infoData['info_datecompleted'], Api\DateTime::$server_timezone);
+						$egwTime = new Api\DateTime($egwData['info_datecompleted'], Api\DateTime::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[completed mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2152,7 +2151,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]:' . array2string($foundInfoLogs));
+				. '()[FOUND]:'.array2string($foundInfoLogs));
 		}
 		return $foundInfoLogs;
 	}