EGroupware / egroupware

api/src/Accounts.php

Spacing +101 added lines, -102 removed lines

@@ -57,8 +57,8 @@ 
 	 *
 	 * @var array
 	 */
-	var $depricated_names = array('firstname','lastname','fullname','email','type',
-		'status','expires','lastlogin','lastloginfrom','lastpasswd_change');
+	var $depricated_names = array('firstname', 'lastname', 'fullname', 'email', 'type',
+		'status', 'expires', 'lastlogin', 'lastloginfrom', 'lastpasswd_change');
 
 	/**
 	 * List of all config vars accounts depend on and therefore should be passed in when calling contructor with array syntax
@@ -66,11 +66,11 @@ 
 	 * @var array
 	 */
 	static public $config_vars = array(
-		'account_repository', 'auth_type',	// auth_type if fallback if account_repository is not set
-		'install_id',	// instance-specific caching
-		'auto_create_expire', 'default_group_lid',	// auto-creation of accounts
-		'ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter',	// ldap backend
-		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context',	// ads backend
+		'account_repository', 'auth_type', // auth_type if fallback if account_repository is not set
+		'install_id', // instance-specific caching
+		'auto_create_expire', 'default_group_lid', // auto-creation of accounts
+		'ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', // ldap backend
+		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context', // ads backend
 	);
 
 	/**
@@ -135,18 +135,18 @@ 
 	 *
 	 * @param string|array $backend =null string with backend 'sql'|'ldap', or whole config array, default read from global egw_info
 	 */
-	public function __construct($backend=null)
+	public function __construct($backend = null)
 	{
 		if (is_array($backend))
 		{
 			$this->config = $backend;
 			$backend = null;
-			self::$_instance = $this;	// also set instance returned by singleton
-			self::$cache = array();		// and empty our internal (session) cache
+			self::$_instance = $this; // also set instance returned by singleton
+			self::$cache = array(); // and empty our internal (session) cache
 		}
 		else
 		{
-			$this->config =& $GLOBALS['egw_info']['server'];
+			$this->config = & $GLOBALS['egw_info']['server'];
 
 			if (!isset(self::$_instance)) self::$_instance = $this;
 		}
@@ -195,11 +195,11 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__.'('.array2string($param).') '.function_backtrace());
-		if (!isset($param['active'])) $param['active'] = true;	// default is true = only return active accounts
+		if (!isset($param['active'])) $param['active'] = true; // default is true = only return active accounts
 
 		// Check for lang(Group) in search - if there, we search all groups
-		$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ',$param['query'])));
-		if($group_index !== FALSE && !(
+		$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ', $param['query'])));
+		if ($group_index !== FALSE && !(
 				in_array($param['type'], array('accounts', 'groupmembers')) || is_int($param['type'])
 		))
 		{
@@ -227,8 +227,8 @@ 
 		}
 		// no backend understands $param['app'], only sql understands type owngroups or groupmemember[+memberships]
 		// --> do an full search first and then filter and limit that search
-		elseif($param['app'] || $this->config['account_repository'] != 'sql' &&
-			in_array($param['type'], array('owngroups','groupmembers','groupmembers+memberships')))
+		elseif ($param['app'] || $this->config['account_repository'] != 'sql' &&
+			in_array($param['type'], array('owngroups', 'groupmembers', 'groupmembers+memberships')))
 		{
 			$app = $param['app'];
 			unset($param['app']);
@@ -240,15 +240,15 @@ 
 
 			if ($param['type'] == 'owngroups')
 			{
-				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				$param['type'] = 'groups';
 			}
-			elseif(in_array($param['type'],array('groupmembers','groupmembers+memberships')))
+			elseif (in_array($param['type'], array('groupmembers', 'groupmembers+memberships')))
 			{
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
 				{
-					$members = array_unique(array_merge($members, (array)$this->members($grp,true,$param['active'])));
+					$members = array_unique(array_merge($members, (array)$this->members($grp, true, $param['active'])));
 					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
 				}
 				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
@@ -261,20 +261,20 @@ 
 			if ($app)
 			{
 				// we want the result merged, whatever it takes, as we only care for the ids
-				$valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type'],$param['active']);
+				$valid = $this->split_accounts($app, !in_array($param['type'], array('accounts', 'groups')) ? 'merge' : $param['type'], $param['active']);
 			}
 			if (isset($members))
 			{
 				//error_log(__METHOD__.'() members='.array2string($members));
 				if (!$members) $members = array();
-				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
+				$valid = !$app ? $members : array_intersect($valid, $members); // use the intersection
 			}
 			//error_log(__METHOD__."() limiting result to app='$app' and/or group=$group valid-ids=".array2string($valid));
 			$n = 0;
 			$account_search[$serial]['data'] = array();
 			foreach ($full_search as $id => $data)
 			{
-				if (!in_array($id,$valid))
+				if (!in_array($id, $valid))
 				{
 					$this->total--;
 					continue;
@@ -294,7 +294,7 @@ 
 			$account_search[$serial]['data'] = $this->backend->search($param);
 			if ($param['type'] !== 'accounts')
 			{
-				foreach($account_search[$serial]['data'] as &$account)
+				foreach ($account_search[$serial]['data'] as &$account)
 				{
 					// add default description for Admins and Default group
 					if ($account['account_type'] === 'g')
@@ -323,7 +323,7 @@ 
 		{
 			$options['filter'] = (array)$options['filter'];
 		}
-		switch($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
 		{
 			case 'firstname':
 			case 'firstall':
@@ -339,7 +339,7 @@ 
 		}
 		$only_own = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
-		switch($options['account_type'])
+		switch ($options['account_type'])
 		{
 			case 'accounts':
 				$type = $only_own ? 'groupmembers' : 'accounts';
@@ -360,7 +360,7 @@ 
 				break;
 		}
 		$accounts = array();
-		foreach(self::getInstance()->search(array(
+		foreach (self::getInstance()->search(array(
 			'type' => $options['filter']['group'] < 0 ? $options['filter']['group'] : $type,
 			'query' => $pattern,
 			'query_type' => 'all',
@@ -368,7 +368,7 @@ 
 		)) as $account)
 		{
 			$accounts[$account['account_id']] = self::format_username($account['account_lid'],
-				$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+				$account['account_firstname'], $account['account_lastname'], $account['account_id']);
 		}
 		return $accounts;
 	}
@@ -383,7 +383,7 @@ 
 	 * @param boolean $set_depricated_names =false set _additionaly_ the depricated keys without 'account_' prefix
 	 * @return array/boolean array with account data (keys: account_id, account_lid, ...) or false if account not found
 	 */
-	function read($id, $set_depricated_names=false)
+	function read($id, $set_depricated_names = false)
 	{
 		if (!is_int($id) && !is_numeric($id))
 		{
@@ -401,9 +401,9 @@ 
 
 		if ($set_depricated_names && $data)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
-				$data[$name] =& $data['account_'.$name];
+				$data[$name] = & $data['account_'.$name];
 			}
 		}
 		return $data;
@@ -420,8 +420,8 @@ 
 	function json($id)
 	{
 		static $keys = array(
-			'account_id','account_lid','person_id','account_status',
-			'account_firstname','account_lastname','account_email','account_fullname','account_phone',
+			'account_id', 'account_lid', 'person_id', 'account_status',
+			'account_firstname', 'account_lastname', 'account_email', 'account_fullname', 'account_phone',
 		);
 		if (($account = $this->read($id)))
 		{
@@ -430,9 +430,9 @@ 
 		// for current user, add the apps available to him
 		if ($id == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
+			foreach ((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
 			{
-				unset($data['table_defs']);	// no need for that on the client
+				unset($data['table_defs']); // no need for that on the client
 				$account['apps'][$app] = $data;
 			}
 		}
@@ -447,7 +447,7 @@ 
 	 * @param $lastname ='' lastname
 	 * @param $accountid =0 id, to check if it's a user or group, otherwise the lid will be used
 	 */
-	static function format_username($lid = '', $firstname = '', $lastname = '', $accountid=0)
+	static function format_username($lid = '', $firstname = '', $lastname = '', $accountid = 0)
 	{
 		if (!$lid && !$firstname && !$lastname)
 		{
@@ -460,7 +460,7 @@ 
 		if (empty($firstname)) $firstname = $lid;
 		if (empty($lastname) || $is_group)
 		{
-			$lastname  = $is_group ? lang('Group') : lang('User');
+			$lastname = $is_group ? lang('Group') : lang('User');
 		}
 		$display = $GLOBALS['egw_info']['user']['preferences']['common']['account_display'];
 
@@ -474,30 +474,30 @@ 
 		}
 
 		$name = '';
-		switch($display)
+		switch ($display)
 		{
 			case 'firstname':
-				$name = $firstname . ' ' . $lastname;
+				$name = $firstname.' '.$lastname;
 				break;
 			case 'lastname':
-				$name = $lastname . $delimiter . $firstname;
+				$name = $lastname.$delimiter.$firstname;
 				break;
 			case 'username':
 				$name = $lid;
 				break;
 			case 'firstall':
-				$name = $firstname . ' ' . $lastname . ' ['.$lid.']';
+				$name = $firstname.' '.$lastname.' ['.$lid.']';
 				break;
 			case 'lastall':
-				$name = $lastname . $delimiter . $firstname . ' ['.$lid.']';
+				$name = $lastname.$delimiter.$firstname.' ['.$lid.']';
 				break;
 			case 'allfirst':
-				$name = '['.$lid.'] ' . $firstname . ' ' . $lastname;
+				$name = '['.$lid.'] '.$firstname.' '.$lastname;
 				break;
 			case 'all':
 				/* fall through */
 			default:
-				$name = '['.$lid.'] ' . $lastname . $delimiter . $firstname;
+				$name = '['.$lid.'] '.$lastname.$delimiter.$firstname;
 		}
 		return $name;
 	}
@@ -508,14 +508,14 @@ 
 	 * @param string $account_id =null account id
 	 * @return string full name of user or "#$accountid" if user not found
 	 */
-	static function username($account_id=null)
+	static function username($account_id = null)
 	{
 		if ($account_id && !($account = self::cache_read((int)$account_id)))
 		{
 			return '#'.$account_id;
 		}
 		return self::format_username($account['account_lid'],
-			$account['account_firstname'] , $account['account_lastname'], $account_id);
+			$account['account_firstname'], $account['account_lastname'], $account_id);
 	}
 
 	/**
@@ -529,9 +529,9 @@ 
 	 * @param string $domain =null domain-name or null to use eGW's default domain $GLOBALS['egw_info']['server']['mail_suffix]
 	 * @return string with email address
 	 */
-	static function email($first,$last,$account,$domain=null)
+	static function email($first, $last, $account, $domain = null)
 	{
-		foreach (array('first','last','account') as $name)
+		foreach (array('first', 'last', 'account') as $name)
 		{
 			$$name = Translation::to_ascii($$name);
 		}
@@ -553,8 +553,8 @@ 
 		if (!$domain) $domain = $GLOBALS['egw_info']['server']['mail_suffix'];
 		if (!$domain) $domain = $_SERVER['SERVER_NAME'];
 
-		$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
-			array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
+		$email = str_replace(array('first', 'last', 'initial', 'account', 'dot', 'underscore', '-'),
+			array($first, $last, substr($first, 0, 1), $account, $dot, $underscore, ''),
 			$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
 			($domain ? '@'.$domain : '');
 		//echo " = '$email'</p>\n";
@@ -570,7 +570,7 @@ 
 	{
 		if (empty($data['account_description']))
 		{
-			switch($data['account_lid'])
+			switch ($data['account_lid'])
 			{
 				case 'Default':
 					$data['account_description'] = lang('EGroupware all users group, do NOT delete');
@@ -598,15 +598,15 @@ 
 	 * @param boolean $check_depricated_names =false check _additionaly_ the depricated keys without 'account_' prefix
 	 * @return int|boolean the account_id or false on error
 	 */
-	function save(&$data,$check_depricated_names=false)
+	function save(&$data, $check_depricated_names = false)
 	{
 		if ($check_depricated_names)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
 				if (isset($data[$name]) && !isset($data['account_'.$name]))
 				{
-					$data['account_'.$name] =& $data[$name];
+					$data['account_'.$name] = & $data[$name];
 				}
 			}
 		}
@@ -619,7 +619,7 @@ 
 		{
 			// if we are not on a pure LDAP system, we have to write the account-date via the contacts class now
 			if (($this->config['account_repository'] == 'sql' || $this->config['contact_repository'] == 'sql-ldap') &&
-				(!($old = $this->read($data['account_id'])) ||	// only for new account or changed contact-data
+				(!($old = $this->read($data['account_id'])) || // only for new account or changed contact-data
 				$old['account_firstname'] != $data['account_firstname'] ||
 				$old['account_lastname'] != $data['account_lastname'] ||
 				$old['account_email'] != $data['account_email']))
@@ -634,14 +634,14 @@ 
 					'id'         => $data['person_id'],
 					'owner'      => 0,
 				);
-				$GLOBALS['egw']->contacts->save($contact,true);		// true = ignore addressbook acl
+				$GLOBALS['egw']->contacts->save($contact, true); // true = ignore addressbook acl
 			}
 			// save primary group if necessary
-			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id,true)) ||
-				!in_array($data['account_primary_group'],$memberships)))
+			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id, true)) ||
+				!in_array($data['account_primary_group'], $memberships)))
 			{
 				$memberships[] = $data['account_primary_group'];
-				$this->set_memberships($memberships, $id);	// invalidates cache for account_id and primary group
+				$this->set_memberships($memberships, $id); // invalidates cache for account_id and primary group
 			}
 		}
 		// as some backends set (group-)members in save, we need to invalidate their members too!
@@ -733,10 +733,10 @@ 
 	 * @param string $account_type =null u = user or g = group, or default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($name,$which='account_lid',$account_type=null)
+	function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		// Don't bother searching for empty or non-scalar account_lid
-		if(empty($name) || !is_scalar($name))
+		if (empty($name) || !is_scalar($name))
 		{
 			return False;
 		}
@@ -744,12 +744,12 @@ 
 		self::setup_cache();
 		$name_list = &self::$cache['name_list'];
 
-		if(@isset($name_list[$which][$name]) && $name_list[$which][$name])
+		if (@isset($name_list[$which][$name]) && $name_list[$which][$name])
 		{
 			return $name_list[$which][$name];
 		}
 
-		return $name_list[$which][$name] = $this->backend->name2id($name,$which,$account_type);
+		return $name_list[$which][$name] = $this->backend->name2id($name, $which, $account_type);
 	}
 
 	/**
@@ -762,7 +762,7 @@ 
 	 * @param boolean $generate_email =false true: generate an email address, if user has none
 	 * @return string|boolean converted value or false on error ($account_id not found)
 	 */
-	static function id2name($account_id, $which='account_lid', $generate_email=false)
+	static function id2name($account_id, $which = 'account_lid', $generate_email = false)
 	{
 		if (!is_numeric($account_id) && !($account_id = self::getInstance()->name2id($account_id)))
 		{
@@ -838,13 +838,13 @@ 
 				$account_lid != $GLOBALS['egw_info']['user']['account_lid'] ||
 			// only allow group-members for account-selection is groupmembers
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				!array_intersect((array)$this->memberships($account_id,true),
-					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true))))
+				!array_intersect((array)$this->memberships($account_id, true),
+					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true))))
 		{
 			//error_log(__METHOD__."($account_id='$account_lid') returning FALSE");
-			return false;	// user is not allowed to see given account
+			return false; // user is not allowed to see given account
 		}
-		return true;	// user allowed to see given account
+		return true; // user allowed to see given account
 	}
 
 	/**
@@ -854,11 +854,11 @@ 
 	 * @param boolean $just_id =false return just account_id's or account_id => account_lid pairs
 	 * @return array with account_id's ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function memberships($account_id, $just_id=false)
+	function memberships($account_id, $just_id = false)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
-			$account_id = $this->name2id($account_id,'account_lid','u');
+			$account_id = $this->name2id($account_id, 'account_lid', 'u');
 		}
 		if ($account_id && ($data = self::cache_read($account_id)))
 		{
@@ -874,7 +874,7 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
@@ -902,7 +902,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array with account_id ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function members($account_id, $just_id=false, $active=true)
+	function members($account_id, $just_id = false, $active = true)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
@@ -923,7 +923,7 @@ 
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
-	function set_members($members,$gid)
+	function set_members($members, $gid)
 	{
 		if (($old_members = $this->members($gid, true, false)) != $members)
 		{
@@ -947,7 +947,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array/boolean see $use, false on error (wront $use)
 	 */
-	function split_accounts($app_users,$use='both',$active=true)
+	function split_accounts($app_users, $use = 'both', $active = true)
 	{
 		if (!is_array($app_users))
 		{
@@ -958,21 +958,21 @@ 
 			{
 				return $cache;
 			}
-			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run',1,$app_users);
+			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run', 1, $app_users);
 		}
 		$accounts = array(
 			'accounts' => array(),
 			'groups' => array(),
 		);
-		foreach($app_users as $id)
+		foreach ($app_users as $id)
 		{
 			$type = $this->get_type($id);
-			if($type == 'g')
+			if ($type == 'g')
 			{
 				$accounts['groups'][$id] = $id;
 				if ($use != 'groups')
 				{
-					foreach((array)$this->members($id, true, $active) as $id)
+					foreach ((array)$this->members($id, true, $active) as $id)
 					{
 						$accounts['accounts'][$id] = $id;
 					}
@@ -993,7 +993,7 @@ 
 			$cache = $accounts;
 		}
 
-		switch($use)
+		switch ($use)
 		{
 			case 'both':
 				return $accounts;
@@ -1002,7 +1002,7 @@ 
 			case 'accounts':
 				return $accounts['accounts'];
 			case 'merge':
-				return array_merge($accounts['accounts'],$accounts['groups']);
+				return array_merge($accounts['accounts'], $accounts['groups']);
 		}
 		return False;
 	}
@@ -1020,21 +1020,20 @@ 
 	function auto_add($account_lid, $passwd)
 	{
 		$expires = !isset($this->config['auto_create_expire']) ||
-			$this->config['auto_create_expire'] == 'never' ? -1 :
-			time() + $this->config['auto_create_expire'] + 2;
+			$this->config['auto_create_expire'] == 'never' ? -1 : time() + $this->config['auto_create_expire'] + 2;
 
 		$memberships = array();
 		$default_group_id = null;
 		// check if we have a comma or semicolon delimited list of groups --> add first as primary and rest as memberships
-		foreach(preg_split('/[,;] */',$this->config['default_group_lid']) as $group_lid)
+		foreach (preg_split('/[,;] */', $this->config['default_group_lid']) as $group_lid)
 		{
-			if (($group_id = $this->name2id($group_lid,'account_lid','g')))
+			if (($group_id = $this->name2id($group_lid, 'account_lid', 'g')))
 			{
 				if (!$default_group_id) $default_group_id = $group_id;
 				$memberships[] = $group_id;
 			}
 		}
-		if (!$default_group_id && ($default_group_id = $this->name2id('Default','account_lid','g')))
+		if (!$default_group_id && ($default_group_id = $this->name2id('Default', 'account_lid', 'g')))
 		{
 			$memberships[] = $default_group_id;
 		}
@@ -1071,25 +1070,25 @@ 
 		// set memberships if given
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		// set the appropriate value for the can change password flag (assume users can, if the admin requires users to change their password)
 		$data['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
-		if(!$data['changepassword'])
+		if (!$data['changepassword'])
 		{
-			$GLOBALS['egw']->acl->add_repository('preferences','nopasswordchange',$data['account_id'],1);
+			$GLOBALS['egw']->acl->add_repository('preferences', 'nopasswordchange', $data['account_id'], 1);
 		}
 		else
 		{
-			$GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$data['account_id']);
+			$GLOBALS['egw']->acl->delete_repository('preferences', 'nopasswordchange', $data['account_id']);
 		}
 		// call hook to notify interested apps about the new account
 		$GLOBALS['hook_values'] = $data;
-		Hooks::process($data+array(
+		Hooks::process($data + array(
 			'location' => 'addaccount',
 			// at login-time only the hooks from the following apps will be called
-			'order' => array('felamimail','fudforum'),
-		),False,True);  // called for every app now, not only enabled ones
+			'order' => array('felamimail', 'fudforum'),
+		), False, True); // called for every app now, not only enabled ones
 		unset($data['changepassword']);
 
 		return $data['account_id'];
@@ -1136,14 +1135,14 @@ 
 	 *
 	 * @param int|array $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
 	 */
-	static function cache_invalidate($account_ids=0)
+	static function cache_invalidate($account_ids = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($account_ids).')');
 
 		// instance-wide cache
 		if ($account_ids)
 		{
-			foreach((array)$account_ids as $account_id)
+			foreach ((array)$account_ids as $account_id)
 			{
 				$instance = self::getInstance();
 
@@ -1155,11 +1154,11 @@ 
 
 		// session-cache
 		if (self::$cache) self::$cache = array();
-		Cache::unsetSession('accounts_cache','phpgwapi');
+		Cache::unsetSession('accounts_cache', 'phpgwapi');
 
-		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
 		{
-			Egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			Egw::invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
 		}
 	}
 
@@ -1183,11 +1182,11 @@ 
 	 * @return array
 	 * @throws Exception\WrongParameter if no integer was passed as $account_id
 	 */
-	static function cache_read($account_id, $need_active=false)
+	static function cache_read($account_id, $need_active = false)
 	{
 		if (!is_numeric($account_id)) throw new Exception\WrongParameter('Not an integer!');
 
-		$account =& self::$request_cache[$account_id];
+		$account = & self::$request_cache[$account_id];
 
 		if (!isset($account))	// not in request cache --> try instance cache
 		{
@@ -1218,7 +1217,7 @@ 
 		{
 			$instance = self::getInstance();
 			$account['members-active'] = array();
-			foreach((array)$account['members'] as $id => $lid)
+			foreach ((array)$account['members'] as $id => $lid)
 			{
 				if ($instance->is_active($id)) $account['members-active'][$id] = $lid;
 			}
@@ -1244,11 +1243,11 @@ 
 	 */
 	private static function setup_cache()
 	{
-		if (is_array(self::$cache)) return;	// cache is already setup
+		if (is_array(self::$cache)) return; // cache is already setup
 
 		if (self::$use_session_cache && is_object($GLOBALS['egw']->session))
 		{
-			self::$cache =& Cache::getSession('accounts_cache','phpgwapi');
+			self::$cache = & Cache::getSession('accounts_cache', 'phpgwapi');
 		}
 		//error_log(__METHOD__."() use_session_cache=".array2string(self::$use_session_cache).", is_array(self::\$cache)=".array2string(is_array(self::$cache)));
 

timesheet/inc/class.timesheet_ui.inc.php

Spacing +180 added lines, -183 removed lines

@@ -55,10 +55,10 @@ 
 
 	function view()
 	{
-		$this->edit(null,true);
+		$this->edit(null, true);
 	}
 
-	function edit($content = null,$view = false)
+	function edit($content = null, $view = false)
 	{
 		$etpl = new Etemplate('timesheet.edit');
 		if (!is_array($content))
@@ -80,35 +80,34 @@ 
 			{
 				$this->data = array(
 					'ts_start' => $this->today,
-					'start_time' => '',	// force empty start-time
-					'end_time' => Api\DateTime::to($this->now,'H:i'),
+					'start_time' => '', // force empty start-time
+					'end_time' => Api\DateTime::to($this->now, 'H:i'),
 					'ts_owner' => $GLOBALS['egw_info']['user']['account_id'],
-					'cat_id'   => (int) $_REQUEST['cat_id'],
+					'cat_id'   => (int)$_REQUEST['cat_id'],
 					'ts_status'=> $GLOBALS['egw_info']['user']['preferences']['timesheet']['predefined_status'],
 					'ts_project' => $_REQUEST['ts_project'],
 					'ts_title_blur' => $_REQUEST['ts_project'],
 				);
-				if(!is_numeric($_REQUEST['ts_project']))
+				if (!is_numeric($_REQUEST['ts_project']))
 				{
 					$this->data['pm_id'] = $this->find_pm_id($_REQUEST['ts_project']);
 				}
 			}
 			$matches = null;
-			$referer = preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] :
-				(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
+			$referer = preg_match('/menuaction=([^&]+)/', $_SERVER['HTTP_REFERER'], $matches) ? $matches[1] : (strpos($_SERVER['HTTP_REFERER'], '/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
 
-			if($_GET['action'] == 'copy')
+			if ($_GET['action'] == 'copy')
 			{
 				$this->create_copy();
-				$msg = lang('%1 copied - the copy can now be edited', lang(Link::get_registry(TIMESHEET_APP,'entry')));
+				$msg = lang('%1 copied - the copy can now be edited', lang(Link::get_registry(TIMESHEET_APP, 'entry')));
 			}
 			if (!$this->check_statusForEditRights($this->data))
 			{
-				$view = true;  //only admin can edit with this status
+				$view = true; //only admin can edit with this status
 				$only_admin_edit = true;
 				$msg = lang('only Admin can edit this status');
 			}
-			if(!$this->data['ts_project_blur'])
+			if (!$this->data['ts_project_blur'])
 			{
 				$this->data['ts_project_blur'] = $this->data['pm_id'] ? Link::title('projectmanager', $this->data['pm_id']) : '';
 			}
@@ -120,7 +119,7 @@ 
 			{
 				if ($this->status_labels_config[$content['ts_status']]['admin'])
 				{
-					$view = true;  //only admin can edit with this status
+					$view = true; //only admin can edit with this status
 					$only_admin_edit = true;
 					$msg = lang('only Admin can edit this status');
 				}
@@ -134,29 +133,29 @@ 
 			{
 				//$content['ts_start'] += $content['start_time'];
 				$start = new Api\DateTime($content['ts_start']);
-				$start_time = explode(':',$content['start_time']);
-				$start->setTime($start_time[0],$start_time[1]);
+				$start_time = explode(':', $content['start_time']);
+				$start->setTime($start_time[0], $start_time[1]);
 				$content['ts_start'] = $start->format('ts');
 			}
 			if (isset($content['end_time']))		// end-time specified
 			{
 				$end = new Api\DateTime($content['ts_start']);
-				$end_time = explode(':',$content['end_time']);
-				$end->setTime($end_time[0],$end_time[1]);
+				$end_time = explode(':', $content['end_time']);
+				$end->setTime($end_time[0], $end_time[1]);
 			}
 			if ($end && $start)	// start- & end-time --> calculate the duration
 			{
 				$content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60;
 				// check if negative duration is caused by wrap over midnight
-				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60)
+				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24 * 60)
 				{
-					$content['ts_duration'] += 24*60;
+					$content['ts_duration'] += 24 * 60;
 				}
 				//echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n";
 			}
 			elseif ($content['ts_duration'] && $end)	// no start, calculate from end and duration
 			{
-				$content['ts_start'] = $end->format('ts') - 60*$content['ts_duration'];
+				$content['ts_start'] = $end->format('ts') - 60 * $content['ts_duration'];
 				//echo "<p>end_time=$content[end_time], duration=$content[ts_duration] --> ts_start=$content[ts_start]=".Api\DateTime::to($content['ts_start'])."</p>\n";
 			}
 			if ($content['ts_duration'] > 0) unset($content['end_time']);
@@ -166,18 +165,18 @@ 
 			$referer = $content['referer'];
 			$content['ts_project_blur'] = $content['pm_id'] ? Link::title('projectmanager', $content['pm_id']) : '';
 			$this->data = $content;
-			foreach(array('button','view','referer','tabs','start_time') as $key)
+			foreach (array('button', 'view', 'referer', 'tabs', 'start_time') as $key)
 			{
 				unset($this->data[$key]);
 			}
-			switch($button)
+			switch ($button)
 			{
 				case 'edit':
 					if ($this->check_acl(Acl::EDIT) && !$only_admin_edit) $view = false;
 					break;
 
 				case 'undelete':
-					if($content['ts_status'] == self::DELETED_STATUS)
+					if ($content['ts_status'] == self::DELETED_STATUS)
 					{
 						unset($content['ts_status']);
 						$this->data['ts_status'] = '';
@@ -195,18 +194,17 @@ 
 					}
 					if (!$this->data['ts_quantity'])
 					{
-						$etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!'));
+						$etpl->set_validation_error('ts_quantity', lang('Field must not be empty !!!'));
 					}
 					if ($this->data['ts_duration'] < 0)
 					{
-						$etpl->set_validation_error('start_time',lang('Starttime has to be before endtime !!!'));
+						$etpl->set_validation_error('start_time', lang('Starttime has to be before endtime !!!'));
 					}
 					// set ts_title to ts_project if short viewtype (title is not editable)
-					if($this->ts_viewtype == 'short')
+					if ($this->ts_viewtype == 'short')
 					{
 						$this->data['ts_title'] = $this->data['ts_project'] = $this->data['pm_id'] ?
-								Link::title('projectmanager', $this->data['pm_id']) :
-								$this->data['ts_project'];
+								Link::title('projectmanager', $this->data['pm_id']) : $this->data['ts_project'];
 					}
 					if (!$this->data['ts_title'])
 					{
@@ -215,9 +213,9 @@ 
 
 						if (!$this->data['ts_title'])
 						{
-							$etpl->set_validation_error('ts_title',lang('Field must not be empty !!!'));
+							$etpl->set_validation_error('ts_title', lang('Field must not be empty !!!'));
 						}
-						elseif($button != 'save_new')
+						elseif ($button != 'save_new')
 						{
 							// remove title-blur for same behavior after apply, as for opening the saved entry again
 							unset($this->data['ts_title_blur']);
@@ -226,26 +224,26 @@ 
 							unset($content['ts_project_blur']);
 						}
 					}
-					if ($etpl->validation_errors()) break;	// the user need to fix the error, before we can save the entry
+					if ($etpl->validation_errors()) break; // the user need to fix the error, before we can save the entry
 
 					// account for changed project --> remove old one from links and add new one
-					if ((int) $this->data['pm_id'] != (int) $this->data['old_pm_id'])
+					if ((int)$this->data['pm_id'] != (int)$this->data['old_pm_id'])
 					{
 						// update links accordingly
 						if ($this->data['pm_id'])
 						{
-							Link::link(TIMESHEET_APP,$content['link_to']['to_id'],'projectmanager',$this->data['pm_id']);
+							Link::link(TIMESHEET_APP, $content['link_to']['to_id'], 'projectmanager', $this->data['pm_id']);
 						}
 						if ($this->data['old_pm_id'])
 						{
-							Link::unlink2(0,TIMESHEET_APP,$content['link_to']['to_id'],0,'projectmanager',$this->data['old_pm_id']);
+							Link::unlink2(0, TIMESHEET_APP, $content['link_to']['to_id'], 0, 'projectmanager', $this->data['old_pm_id']);
 							unset($this->data['old_pm_id']);
 						}
 					}
 					// check if we are linked to a project, but that is NOT set as project
 					if (!$this->data['pm_id'] && is_array($content['link_to']['to_id']))
 					{
-						foreach($content['link_to']['to_id'] as $data)
+						foreach ($content['link_to']['to_id'] as $data)
 						{
 							if ($data['app'] == 'projectmanager')
 							{
@@ -266,32 +264,32 @@ 
 						$msg = lang('Entry saved');
 						if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 						{
-							Link::link(TIMESHEET_APP,$this->data['ts_id'],$content['link_to']['to_id']);
+							Link::link(TIMESHEET_APP, $this->data['ts_id'], $content['link_to']['to_id']);
 						}
 					}
 					Framework::refresh_opener($msg, 'timesheet', $this->data['ts_id'], $content['ts_id'] ? 'edit' : 'add');
 					if ($button == 'apply') break;
 					if ($button == 'save_new')
 					{
-						$msg .= ', '.lang('creating new entry');		// giving some feedback to the user
+						$msg .= ', '.lang('creating new entry'); // giving some feedback to the user
 
 						if (!is_array($content['link_to']['to_id']))	// set links again, so new entry gets the same links as the existing one
 						{
 							$content['link_to']['to_id'] = 0;
-							foreach(Link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.Link::VFS_APPNAME) as $link)
+							foreach (Link::get_links(TIMESHEET_APP, $this->data['ts_id'], '!'.Link::VFS_APPNAME) as $link)
 							{
-								Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
+								Link::link(TIMESHEET_APP, $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
 							}
 						}
 						// create a new entry
 						$this->data['ts_start'] += 60 * $this->data['ts_duration'];
-						foreach(array('ts_id','ts_title','ts_description','ts_duration','ts_quantity','ts_modified','ts_modifier','link_to') as $name)
+						foreach (array('ts_id', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_modified', 'ts_modifier', 'link_to') as $name)
 						{
 							unset($this->data[$name]);
 						}
 						// save the selected project, to delete the project-link, if the user changes the project
 						$this->data['old_pm_id'] = $this->data['pm_id'];
-						if($this->pm_integration == 'none')
+						if ($this->pm_integration == 'none')
 						{
 							unset($this->data['pm_id']);
 						}
@@ -309,7 +307,7 @@ 
 						else
 						{
 							$msg = lang('Error deleting the entry!!!');
-							break;	// dont close window
+							break; // dont close window
 						}
 					}
 					// fall-through for save
@@ -322,17 +320,16 @@ 
 			'referer' => $referer,
 			'ts_title_blur' => $content['ts_title_blur'],
 		);
-		$content = array_merge($this->data,array(
+		$content = array_merge($this->data, array(
 			'msg'  => $msg,
 			'view' => $view,
 			'tabs'  => $content['tabs'],
 			'link_to' => array(
-				'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] :
-					($this->data['link_to']['to_id'] ? $this->data['link_to']['to_id'] : $content['link_to']['to_id']),
+				'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : ($this->data['link_to']['to_id'] ? $this->data['link_to']['to_id'] : $content['link_to']['to_id']),
 				'to_app' => TIMESHEET_APP,
 			),
-			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
-			'ts_quantity' => $this->data['ts_duration']/60.0 == $this->data['ts_quantity'] ? null : $this->data['ts_quantity'],
+			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0, 3) : '',
+			'ts_quantity' => $this->data['ts_duration'] / 60.0 == $this->data['ts_quantity'] ? null : $this->data['ts_quantity'],
 			'start_time' => isset($this->data['start_time']) ? $this->data['start_time'] : $this->data['ts_start'],
 			'pm_integration' => $this->pm_integration,
 			'no_ts_status' => !$this->status_labels && ($this->data['ts_status'] != self::DELETED_STATUS),
@@ -342,10 +339,10 @@ 
 		if (!$this->data['ts_id'] && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
 		{
 			$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-			foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+			foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 			{
 				$link_id = $link_ids[$n];
-				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// gard against XSS
 				{
 					switch ($link_app)
 					{
@@ -353,33 +350,33 @@ 
 							$links[] = $link_id;
 							// fall-through;
 						default:
-							if(!$n)
+							if (!$n)
 							{
 								// get title from first linked app
-								$preserv['ts_title_blur'] = Link::title($link_app,$link_id);
+								$preserv['ts_title_blur'] = Link::title($link_app, $link_id);
 								// ask first linked app via "timesheet_set" hook, for further data to set, incl. links
-								if (($set = Api\Hooks::single(array('location'=>'timesheet_set','id'=>$link_id),$link_app)))
+								if (($set = Api\Hooks::single(array('location'=>'timesheet_set', 'id'=>$link_id), $link_app)))
 								{
-									foreach((array)$set['link_app'] as $i => $l_app)
+									foreach ((array)$set['link_app'] as $i => $l_app)
 									{
-										if (($l_id=$set['link_id'][$i])) Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
+										if (($l_id = $set['link_id'][$i])) Link::link(TIMESHEET_APP, $content['link_to']['to_id'], $l_app, $l_id);
 										if ($l_app == 'projectmanager') $links[] = $l_id;
 									}
 									unset($set['link_app']);
 									unset($set['link_id']);
 
-									$content = array_merge($content,$set);
+									$content = array_merge($content, $set);
 								}
 							}
 							break;
 					}
-					Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link_app,$link_id);
+					Link::link(TIMESHEET_APP, $content['link_to']['to_id'], $link_app, $link_id);
 				}
 			}
 		}
 		elseif ($this->data['ts_id'])
 		{
-			$links = Link::get_links(TIMESHEET_APP,$this->data['ts_id'],'projectmanager');
+			$links = Link::get_links(TIMESHEET_APP, $this->data['ts_id'], 'projectmanager');
 		}
 		// make all linked projects availible for the pm-pricelist widget, to be able to choose prices from all
 		$content['all_pm_ids'] = array_values($links);
@@ -422,7 +419,7 @@ 
 
 		if ($view)
 		{
-			foreach(array_merge(array_keys($this->data),array('pm_id','pl_id','link_to')) as $key)
+			foreach (array_merge(array_keys($this->data), array('pm_id', 'pl_id', 'link_to')) as $key)
 			{
 				$readonlys[$key] = true;
 			}
@@ -439,9 +436,9 @@ 
 		{
 			$edit_grants[$content['ts_owner']] = Api\Accounts::username($content['ts_owner']);
 		}
-		$sel_options['ts_owner']  = $edit_grants;
-		$sel_options['ts_status']  = $this->status_labels;
-		if($this->config_data['history'] && $content['ts_status'] == self::DELETED_STATUS)
+		$sel_options['ts_owner'] = $edit_grants;
+		$sel_options['ts_status'] = $this->status_labels;
+		if ($this->config_data['history'] && $content['ts_status'] == self::DELETED_STATUS)
 		{
 			$sel_options['ts_status'][self::DELETED_STATUS] = 'Deleted';
 		}
@@ -451,23 +448,23 @@ 
 		// supress unknow widget 'projectmanager-*', if projectmanager is not installed or old
 		if (!@file_exists(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.projectmanager_widget.inc.php'))
 		{
-			$etpl->set_cell_attribute('pm_id','disabled',true);
-			$etpl->set_cell_attribute('pl_id','disabled',true);
+			$etpl->set_cell_attribute('pm_id', 'disabled', true);
+			$etpl->set_cell_attribute('pl_id', 'disabled', true);
 		}
 
-		if($this->ts_viewtype == 'short')
+		if ($this->ts_viewtype == 'short')
 		{
 			$content['ts_viewtype'] = $readonlys['tabs']['notes'] = true;
 			$content['ts_description_short'] = $content['ts_description'];
-			if(!$content['pm_id'] && $this->pm_integration != 'full' && $content['ts_project'])
+			if (!$content['pm_id'] && $this->pm_integration != 'full' && $content['ts_project'])
 			{
-				$etpl->setElementAttribute('pm_id','blur',$content['ts_project']);
+				$etpl->setElementAttribute('pm_id', 'blur', $content['ts_project']);
 			}
 		}
-		if (!$this->customfields) $readonlys['tabs']['customfields'] = true;	// suppress tab if there are not customfields
-		if (!$this->data['ts_id']) $readonlys['tabs']['history']    = true;   //suppress history for the first loading without ID
+		if (!$this->customfields) $readonlys['tabs']['customfields'] = true; // suppress tab if there are not customfields
+		if (!$this->data['ts_id']) $readonlys['tabs']['history'] = true; //suppress history for the first loading without ID
 
-		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
+		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -480,7 +477,7 @@ 
 	{
 		if (!$datetime) return 0;
 
-		return $datetime - mktime(0,0,0,date('m',$datetime),date('d',$datetime),date('Y',$datetime));
+		return $datetime - mktime(0, 0, 0, date('m', $datetime), date('d', $datetime), date('Y', $datetime));
 	}
 
 	/**
@@ -494,23 +491,23 @@ 
 	 * @param boolean $id_only if true only return (via $rows) an array of contact-ids, dont save state to session
 	 * @return int total number of contacts matching the selection
 	 */
-	function get_rows(&$query_in,&$rows,&$readonlys,$id_only=false)
+	function get_rows(&$query_in, &$rows, &$readonlys, $id_only = false)
 	{
 		$this->show_sums = false;
 		$end_date = false;
 
 		// Date filter
-		if($query_in['filter'] === 'custom')
+		if ($query_in['filter'] === 'custom')
 		{
 			$end_date = $query_in['enddate'] ? $query_in['enddate'] : false;
 			$query_in['startdate'] = $query_in['startdate'] ? $query_in['startdate'] : 1;
 		}
-		$date_filter = $this->date_filter($query_in['filter'],$query_in['startdate'],$end_date);
+		$date_filter = $this->date_filter($query_in['filter'], $query_in['startdate'], $end_date);
 
 		if ($query_in['startdate'])
 		{
-			$start = explode('-',date('Y-m-d',$query_in['startdate']+12*60*60));
-			$end   = explode('-',date('Y-m-d',$end_date ? $end_date : $query_in['startdate']+7.5*24*60*60));
+			$start = explode('-', date('Y-m-d', $query_in['startdate'] + 12 * 60 * 60));
+			$end   = explode('-', date('Y-m-d', $end_date ? $end_date : $query_in['startdate'] + 7.5 * 24 * 60 * 60));
 
 			// show year-sums, if we are year-aligned (show full years)?
 			if ((int)$start[2] == 1 && (int)$start[1] == 1 && (int)$end[2] == 31 && (int)$end[1] == 12)
@@ -518,28 +515,28 @@ 
 				$this->show_sums[] = 'year';
 			}
 			// show month-sums, if we are month-aligned (show full monthes)?
-			if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d',mktime(12,0,0,$end[1]+1,0,$end[0])))
+			if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d', mktime(12, 0, 0, $end[1] + 1, 0, $end[0])))
 			{
 				$this->show_sums[] = 'month';
 			}
 			// show week-sums, if we are week-aligned (show full weeks)?
 			$week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
 			if (!$week_start_day) $week_start_day = 'Sunday';
-			switch($week_start_day)
+			switch ($week_start_day)
 			{
 				case 'Sunday': $week_end_day = 'Saturday'; break;
 				case 'Monday': $week_end_day = 'Sunday'; break;
 				case 'Saturday': $week_end_day = 'Friday'; break;
 			}
-			$filter_start_day = date('l',$query_in['startdate']+12*60*60);
-			$filter_end_day   = $end_date ? date('l',$end_date+12*60*60) : false;
+			$filter_start_day = date('l', $query_in['startdate'] + 12 * 60 * 60);
+			$filter_end_day   = $end_date ? date('l', $end_date + 12 * 60 * 60) : false;
 			//echo "<p align=right>prefs: $week_start_day - $week_end_day, filter: $filter_start_day - $filter_end_day</p>\n";
 			if ($filter_start_day == $week_start_day && (!$filter_end_day || $filter_end_day == $week_end_day))
 			{
 				$this->show_sums[] = 'week';
 			}
 			// show day-sums, if range <= 5 weeks
-			if (!$end_date || $end_date - $query_in['startdate'] < 36*24*60*60)
+			if (!$end_date || $end_date - $query_in['startdate'] < 36 * 24 * 60 * 60)
 			{
 				$this->show_sums[] = 'day';
 			}
@@ -550,10 +547,10 @@ 
 		// Refresh actions (undelete needs this)
 		$query_in['actions'] = $this->get_actions($query_in);
 
-		$query = $query_in;	// keep the original query
+		$query = $query_in; // keep the original query
 		$query['enddate'] = $end_date;
 
-		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
+		if ($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false, 'ts_unitprice'=>false, 'ts_total'=>false);
 		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
 
 		//_debug_array($query['col_filter']);
@@ -580,18 +577,18 @@ 
 		// handle linked filter (show only entries linked to a certain other entry)
 		if ($query['col_filter']['linked'])
 		{
-			if(!is_array($query['col_filter']['linked']))
+			if (!is_array($query['col_filter']['linked']))
 			{
-				list($app,$id) = explode(':',$query['col_filter']['linked']);
+				list($app, $id) = explode(':', $query['col_filter']['linked']);
 			}
 			else
 			{
 				$app = $query['col_filter']['linked']['app'];
 				$id = $query['col_filter']['linked']['id'];
 			}
-			if (!($links = Link::get_links($app,$id,'timesheet')))
+			if (!($links = Link::get_links($app, $id, 'timesheet')))
 			{
-				$rows = array();	// no infologs linked to project --> no rows to return
+				$rows = array(); // no infologs linked to project --> no rows to return
 				return 0;
 			}
 			if (!$query['col_filter']['ts_id'])
@@ -599,9 +596,9 @@ 
 				$query['col_filter']['ts_id'] = array_values(array_unique($links));
 			}
 			// allow to combine with other filters using ts_id --> intersect ids
-			elseif (!($query['col_filter']['ts_id'] = array_intersect((array)$query['col_filter']['ts_id'],array_values(array_unique($links)))))
+			elseif (!($query['col_filter']['ts_id'] = array_intersect((array)$query['col_filter']['ts_id'], array_values(array_unique($links)))))
 			{
-				$rows = array();	// no infologs linked to project --> no rows to return
+				$rows = array(); // no infologs linked to project --> no rows to return
 				return 0;
 			}
 		}
@@ -625,13 +622,13 @@ 
 			{
 				if (isset($this->status_labels_substatus['2level'][$status_id]))
 				{
-					$query['col_filter']['ts_status'] = array_merge($query['col_filter']['ts_status'],$this->status_labels_substatus[$status_id]);
+					$query['col_filter']['ts_status'] = array_merge($query['col_filter']['ts_status'], $this->status_labels_substatus[$status_id]);
 				}
 			}
 		}
 		if ((int)$query['filter2'] != (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'])
 		{
-			$GLOBALS['egw']->preferences->add(TIMESHEET_APP,'show_details',(int)$query['filter2']);
+			$GLOBALS['egw']->preferences->add(TIMESHEET_APP, 'show_details', (int)$query['filter2']);
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
 		// category filter: cat_id or ''=All cats or 0=No cat
@@ -654,7 +651,7 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.Api\Accounts::username($query['col_filter']['ts_owner']);
 			#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members");
 			#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
-			if ($query['col_filter']['ts_owner']<0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			if ($query['col_filter']['ts_owner'] < 0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']), $GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'], true));
 		}
 		else
 		{
@@ -667,60 +664,60 @@ 
 			// generate a meaningful app-header / report title
 			if ($this->show_sums['month'])
 			{
-				if ((int)$start[1] == 1 && (int) $end[1] == 12)		// whole year(s)
+				if ((int)$start[1] == 1 && (int)$end[1] == 12)		// whole year(s)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . $start[0] . ($start[0] != $end[0] ? ' - '.$end[0] : '');
+					$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$start[0].($start[0] != $end[0] ? ' - '.$end[0] : '');
 				}
 				else
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang(date('F',$query['startdate']+12*60*60)) . ' ' . $start[0];
+					$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(date('F', $query['startdate'] + 12 * 60 * 60)).' '.$start[0];
 					if ($start[0] != $end[0] || $start[1] != $end[1])
 					{
-						$GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . lang(date('F',$query['enddate']+12*60*60)) . ' ' . $end[0];
+						$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang(date('F', $query['enddate'] + 12 * 60 * 60)).' '.$end[0];
 					}
 				}
 			}
 			elseif ($this->show_sums['week'])
 			{
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang('week') . ' ' . date('W',$query['startdate']+36*60*60) . '/' . $start[0];
-				if ($query['enddate'] && $query['enddate'] - $query['startdate'] > 10*24*60*60)
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('week').' '.date('W', $query['startdate'] + 36 * 60 * 60).'/'.$start[0];
+				if ($query['enddate'] && $query['enddate'] - $query['startdate'] > 10 * 24 * 60 * 60)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . date('W',$query['enddate']-36*60*60) . '/' . $end[0];
+					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.date('W', $query['enddate'] - 36 * 60 * 60).'/'.$end[0];
 				}
 			}
 			elseif ($query['startdate'])
 			{
 				$df = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . Api\DateTime::to($query['startdate']+12*60*60, $df);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.Api\DateTime::to($query['startdate'] + 12 * 60 * 60, $df);
 				if ($start != $end)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.Api\DateTime::to($query['enddate'] ? $query['enddate']+12*60*60:'now', $df);
+					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.Api\DateTime::to($query['enddate'] ? $query['enddate'] + 12 * 60 * 60 : 'now', $df);
 				}
 			}
 		}
 		// Update start / end dates for custom
-		if($query_in['filter'] != 'custom')
+		if ($query_in['filter'] != 'custom')
 		{
 			Api\Json\Response::get()->call(
 				'app.timesheet.update_timespan',
-				Api\DateTime::to($query['startdate'] ? $query['startdate'] : 'now' , Api\DateTime::ET2),
+				Api\DateTime::to($query['startdate'] ? $query['startdate'] : 'now', Api\DateTime::ET2),
 				$query['filter'] ? Api\DateTime::to($query['enddate'], Api\DateTime::ET2) : null
 			);
 		}
-		$total = parent::get_rows($query,$rows,$readonlys);
+		$total = parent::get_rows($query, $rows, $readonlys);
 
 		$ids = array();
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if ($row['ts_id'] > 0) $ids[] = $row['ts_id'];
 		}
 		if ($id_only)
 		{
 			$rows = $ids;
-			return $this->total;	// no need to set other fields or $readonlys
+			return $this->total; // no need to set other fields or $readonlys
 		}
 		$links = array();
-		$links3 = Link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
+		$links3 = Link::get_links_multiple(TIMESHEET_APP, $ids, true, 'projectmanager'); // only check for pm links!
 		//as the full array is expected, we must supply the missing but needed (since expected further down) information
 		if (is_array($links3))
 		{
@@ -740,14 +737,14 @@ 
 
 		$readonlys = array();
 		$have_cats = false;
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if ($row['cat_id']) $have_cats = true;
 
 			$row['class'] = 'row';
 			if ($row['ts_id'] <= 0)	// sums
 			{
-				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;	// fix for DSL change
+				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200; // fix for DSL change
 
 				// Remove fake modified date, it breaks nextmatch checks
 				unset($row['ts_modified']);
@@ -755,22 +752,22 @@ 
 				// Set flag to avoid actions on these rows
 				$row['no_actions'] = true;
 
-				switch($row['ts_id'])
+				switch ($row['ts_id'])
 				{
 					case 0:	// day-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.Api\DateTime::to($row['ts_start'], $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
+						$row['ts_title'] = lang('Sum %1:', lang(date('l', $row['ts_start'])).' '.Api\DateTime::to($row['ts_start'], $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
 						$row['ts_id'] = 'sum-day-'.$row['ts_start'];
 						break;
 					case -1:	// week-sum
-						$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
+						$row['ts_title'] = lang('Sum %1:', lang('week').' '.substr($row['ts_week'], 4).'/'.substr($row['ts_week'], 0, 4));
 						$row['ts_id'] = 'sum-week-'.$row['ts_week'];
 						break;
 					case -2:	// month-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
+						$row['ts_title'] = lang('Sum %1:', lang(date('F', $row['ts_start'])).' '.substr($row['ts_month'], 0, 4));
 						$row['ts_id'] = 'sum-month-'.$row['ts_month'];
 						break;
 					case -3:	// year-sum
-						$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
+						$row['ts_title'] = lang('Sum %1:', $row['ts_year']);
 						$row['ts_id'] = 'sum-year-'.$row['ts_year'];
 						break;
 				}
@@ -780,11 +777,11 @@ 
 				$row['titleClass'] = 'timesheet_titleSum';
 				continue;
 			}
-			if($row['ts_quantity'])
+			if ($row['ts_quantity'])
 			{
 				$row['ts_quantity'] = round($row['ts_quantity'], 2);
 			}
-			if (!$this->check_acl(Acl::EDIT,$row))
+			if (!$this->check_acl(Acl::EDIT, $row))
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
@@ -792,21 +789,21 @@ 
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
-			if (!$this->check_acl(Acl::DELETE,$row))
+			if (!$this->check_acl(Acl::DELETE, $row))
 			{
 				$row['class'] .= ' rowNoDelete ';
 			}
-			if($row['ts_status'] != self::DELETED_STATUS)
+			if ($row['ts_status'] != self::DELETED_STATUS)
 			{
 				$row['class'] .= ' rowNoUndelete ';
 			}
 			if ($query['col_filter']['ts_project'])
 			{
-				unset($row['ts_project']);	// dont need or want to show it
+				unset($row['ts_project']); // dont need or want to show it
 			}
 			elseif ($links[$row['ts_id']])
 			{
-				foreach($links[$row['ts_id']] as $link)
+				foreach ($links[$row['ts_id']] as $link)
 				{
 					if ($link['app'] == 'projectmanager')
 					{
@@ -817,13 +814,13 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if (!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
 
 		}
 		$rows['no_cat_id'] = (!$have_cats || $query['cat_id']);
 		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
 		$rows['no_owner_col'] = $query['no_owner_col'];
-		if(is_string($query['selectcols']))
+		if (is_string($query['selectcols']))
 		{
 			$query['selectcols'] = explode(',', $query['selectcols']);
 		}
@@ -835,17 +832,17 @@ 
 		$rows += $this->summary;
 
 		$rows['pm_integration'] = $this->pm_integration;
-		$rows['ts_viewtype'] =  $rows['no_ts_quantity'] =  $rows['no_ts_unitprice'] =  $rows['no_ts_total'] = $this->ts_viewtype == 'short';
+		$rows['ts_viewtype'] = $rows['no_ts_quantity'] = $rows['no_ts_unitprice'] = $rows['no_ts_total'] = $this->ts_viewtype == 'short';
 		if (!$rows['ts_viewtype'])
 		{
 			#_debug_array($query['selectcols']);
-			if(!is_array($query['selectcols'])){
-				$query['selectcols'] = explode(',',$query['selectcols']);
+			if (!is_array($query['selectcols'])) {
+				$query['selectcols'] = explode(',', $query['selectcols']);
 			}
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && in_array('ts_quantity_quantity',$query['selectcols'])===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols'])===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && in_array('ts_total_price',$query['selectcols'])===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && in_array('ts_quantity_quantity', $query['selectcols']) === false) $rows['no_ts_quantity'] = 1;
+			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols']) === false) $rows['no_ts_unitprice'] = 1;
+			if ($query['selectcols'] && in_array('ts_total_price', $query['selectcols']) === false) $rows['no_ts_total'] = 1;
 		}
 		$rows['no_ts_status'] = in_array('ts_status', $query['selectcols']) === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -864,7 +861,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index($content = null,$msg='')
+	function index($content = null, $msg = '')
 	{
 		$etpl = new Etemplate('timesheet.index');
 
@@ -901,14 +898,14 @@ 
 			else
 			{
 				$success = $failed = $action_msg = null;
-				if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,'index',$msg))
+				if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+					$success, $failed, $action_msg, 'index', $msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2',$success,$action_msg);
+					$msg .= lang('%1 timesheets(s) %2', $success, $action_msg);
 				}
-				elseif(empty($msg))
+				elseif (empty($msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 				}
 			}
 		}
@@ -920,7 +917,7 @@ 
 		if (!is_array($content['nm']))
 		{
 			$date_filters = array('All');
-			foreach(array_keys($this->date_filters) as $name)
+			foreach (array_keys($this->date_filters) as $name)
 			{
 				$date_filters[$name] = $name;
 			}
@@ -929,26 +926,26 @@ 
 			$content['nm'] = array(
 				'get_rows'       =>	TIMESHEET_APP.'.timesheet_ui.get_rows',
 				'options-filter' => $date_filters,
-				'options-filter2' => array('No details','Details'),
-				'order'          =>	'ts_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
+				'options-filter2' => array('No details', 'Details'),
+				'order'          =>	'ts_start', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 				'filter_onchange' => "app.timesheet.filter_change();",
 				'filter2_onchange' => "app.timesheet.filter2_change();",
 				'filter2'        => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],
 				'row_id'         => 'ts_id',
 				'row_modified'   => 'ts_modified',
 				//'actions'        => $this->get_actions(),
-				'default_cols'   => '!legacy_actions',	// switch legacy actions column and row off by default
+				'default_cols'   => '!legacy_actions', // switch legacy actions column and row off by default
 				'pm_integration' => $this->pm_integration,
 				'placeholder_actions' => array('add')
 			);
 		}
 
-		if($_GET['search'])
+		if ($_GET['search'])
 		{
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if($_GET['link_app'] && Link::get_registry($_GET['link_app'], 'query') && $_GET['link_id'])
+		if ($_GET['link_app'] && Link::get_registry($_GET['link_app'], 'query') && $_GET['link_id'])
 		{
 			$content['nm']['col_filter']['linked'] = array(
 				'app' => $_GET['link_app'],
@@ -962,25 +959,25 @@ 
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
 			'cat_id'     => array(array('value' => '', 'label' => lang('all categories')), array('value' => 0, 'label'=>lang('None'))),
-			'ts_status'  => $this->status_labels+array(lang('No status')),
+			'ts_status'  => $this->status_labels + array(lang('No status')),
 		);
-		if($this->config_data['history'])
+		if ($this->config_data['history'])
 		{
 			$sel_options['ts_status'][self::DELETED_STATUS] = 'Deleted';
 		}
-		$content['nm']['no_status'] = count($sel_options['ts_status']) <= 1;	// 1 because of 'No status'
-		$content['nm']['favorites'] = true;		//Enable favorite
+		$content['nm']['no_status'] = count($sel_options['ts_status']) <= 1; // 1 because of 'No status'
+		$content['nm']['favorites'] = true; //Enable favorite
 
 		if ($this->pm_integration != 'full')
 		{
-			$projects =& $this->query_list('ts_project');
+			$projects = & $this->query_list('ts_project');
 			if (!is_array($projects)) $projects = array();
 			$sel_options['ts_project'] = $projects + array(lang('No project'));
 		}
 
 		// dont show [Export] button if app is not availible to the user or we are on php4
-		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int) phpversion() < 5;
-		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.index',$content,$sel_options,$readonlys);
+		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int)phpversion() < 5;
+		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -999,9 +996,9 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&ts_id=$id',
 				'popup' => Link::get_registry('timesheet', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.timesheet.viewEntry':'',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.timesheet.viewEntry' : '',
 				'mobileViewTemplate' => 'view?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/timesheet/templates/mobile/view.xet'))
 			),
 /*
@@ -1041,7 +1038,7 @@ 
 				)
 			),
 			'cat' => Etemplate\Widget\Nextmatch::category_action(
-				'timesheet',++$group,'Change category','cat_'
+				'timesheet', ++$group, 'Change category', 'cat_'
 			),
 			'status' => array(
 				'icon' => 'apply',
@@ -1093,7 +1090,7 @@ 
 			);
 		}
 		// enable additonal edit check for following actions, if they are generally available
-		foreach(array('cat','status') as $action)
+		foreach (array('cat', 'status') as $action)
 		{
 			if ($actions[$action]['enabled'])
 			{
@@ -1116,7 +1113,7 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		$success = $failed = 0;
 		if ($use_all)
@@ -1126,17 +1123,17 @@ 
 
 			if ($use_all)
 			{
-				@set_time_limit(0);			// switch off the execution time limit, as it's for big selections to small
-				$query['num_rows'] = -1;	// all
+				@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+				$query['num_rows'] = -1; // all
 				$readonlys = null;
-				$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+				$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
 			}
 		}
 		//error_log(__METHOD__."('$action', ".array2string($checked).', '.array2string($use_all).",,, '$session_name')");
 
-		if (substr($action,0,9) == 'to_status')
+		if (substr($action, 0, 9) == 'to_status')
 		{
-			$to_status = (int)substr($action,10);
+			$to_status = (int)substr($action, 10);
 			$action = 'to_status';
 		}
 		else
@@ -1145,11 +1142,11 @@ 
 			list($action, $settings) = explode('_', $action, 2);
 		}
 
-		switch($action)
+		switch ($action)
 		{
 			case 'delete':
 				$action_msg = lang('deleted');
-				foreach((array)$checked as $n => $id)
+				foreach ((array)$checked as $n => $id)
 				{
 					if ($this->delete($id))
 					{
@@ -1162,10 +1159,10 @@ 
 				}
 				break;
 			case 'undelete':
-				$action_msg =lang('recovered');
-				foreach((array)$checked as $n => $id)
+				$action_msg = lang('recovered');
+				foreach ((array)$checked as $n => $id)
 				{
-					if ($this->set_status($id,''))
+					if ($this->set_status($id, ''))
 					{
 						$success++;
 					}
@@ -1176,10 +1173,10 @@ 
 				}
 				break;
 			case 'to_status':
-				$action_msg =lang('changed status');
-				foreach((array)$checked as $n => $id)
+				$action_msg = lang('changed status');
+				foreach ((array)$checked as $n => $id)
 				{
-					if ($this->set_status($id,$to_status))
+					if ($this->set_status($id, $to_status))
 					{
 						$success++;
 					}
@@ -1192,7 +1189,7 @@ 
 			case 'cat':
 				$cat_name = Api\Categories::id2name($settings);
 				$action_msg = lang('changed category to %1', $cat_name);
-				foreach((array)$checked as $n => $id) {
+				foreach ((array)$checked as $n => $id) {
 					if (($entry = $this->read($id)) &&
 						($entry['cat_id'] = $settings) &&
 						$this->save($entry) == 0)
@@ -1223,7 +1220,7 @@ 
 	 * @param conetnt
 	 * @param view
 	 */
-	function editstatus($content = null,$msg='')
+	function editstatus($content = null, $msg = '')
 	{
 		// this function requires admin rights
 		$GLOBALS['egw_info']['flags']['admin_only'] = true;
@@ -1234,13 +1231,13 @@ 
 			list($button) = @each($content['button']);
 			unset ($content['button']);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'delete':
 					break;
 				case 'apply':
 				case 'save':
-					foreach($content['statis'] as &$cat)
+					foreach ($content['statis'] as &$cat)
 					{
 						$id = $cat['id'];
 						if (($cat ['name'] !== $this->status_labels_config[$id]) && ($cat ['name'] !== '') || ($cat ['parent'] !== $this->status_labels_config[$id]['parent']) && ($cat ['parent'] !== ''))
@@ -1254,7 +1251,7 @@ 
 					}
 					if ($need_update)
 					{
-						Api\Config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+						Api\Config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 						$this->config_data = Api\Config::read(TIMESHEET_APP);
 						$this->load_statuses();
 						$msg .= lang('Status updated.');
@@ -1271,7 +1268,7 @@ 
 			if (isset($this->status_labels_config[$id]))
 			{
 				unset($this->status_labels_config[$id]);
-				Api\Config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+				Api\Config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 				unset($this->status_labels[$id]);
 				$msg .= lang('Status deleted.');
 			}
@@ -1280,12 +1277,12 @@ 
 		$i = 1;
 		$max_id = 0;
 		unset($content['statis']);
-		foreach($this->status_labels_config as $id => $label)
+		foreach ($this->status_labels_config as $id => $label)
 		{
-			$content['statis'][$i]['name']= $label['name'];
-			$content['statis'][$i]['id']= $id;
-			$content['statis'][$i]['parent']= $label['parent'];
-			$content['statis'][$i]['admin']= $label['admin'];
+			$content['statis'][$i]['name'] = $label['name'];
+			$content['statis'][$i]['id'] = $id;
+			$content['statis'][$i]['parent'] = $label['parent'];
+			$content['statis'][$i]['admin'] = $label['admin'];
 			$i++;
 			$max_id = max($id, $max_id);
 		}
@@ -1297,7 +1294,7 @@ 
 		$preserv = $content;
 		$sel_options['parent'] = $this->status_labels;
 		$etpl = new Etemplate('timesheet.editstatus');
-		$etpl->exec('timesheet.timesheet_ui.editstatus',$content,$sel_options,array(),$preserv);
+		$etpl->exec('timesheet.timesheet_ui.editstatus', $content, $sel_options, array(), $preserv);
 	}
 
 	/**
@@ -1308,14 +1305,14 @@ 
 	protected function find_pm_id($project)
 	{
 		list($pm_number, $pm_title) = explode(': ', $project, 2);
-		if(!$pm_number || !$pm_title)
+		if (!$pm_number || !$pm_title)
 		{
 			return false;
 		}
 
 		$pm = new projectmanager_bo();
 		$pm_ids = $pm->search(array('pm_number' => $pm_number, 'pm_title' => $pm_title));
-		if($pm_ids && count($pm_ids) >= 1)
+		if ($pm_ids && count($pm_ids) >= 1)
 		{
 			return $pm_ids[0]['pm_id'];
 		}
@@ -1331,17 +1328,17 @@ 
 		$original_id = $this->data['ts_id'];
 		unset($this->data['ts_id']);
 
-		$this->data['ts_title'] = lang('Copy of:') . ' ' .$this->data['ts_title'];
+		$this->data['ts_title'] = lang('Copy of:').' '.$this->data['ts_title'];
 		unset($this->data['ts_modified']);
 		unset($this->data['ts_modifier']);
-		$this->data['ts_owner'] = !(int)$this->data['ts_owner'] || !$this->check_acl(Acl::ADD,NULL,$this->data['ts_owner']) ? $this->user : $this->data['ts_owner'];
+		$this->data['ts_owner'] = !(int)$this->data['ts_owner'] || !$this->check_acl(Acl::ADD, NULL, $this->data['ts_owner']) ? $this->user : $this->data['ts_owner'];
 
 		// Copy links
-		if(!is_array($this->data['link_to'])) $this->data['link_to'] = array();
+		if (!is_array($this->data['link_to'])) $this->data['link_to'] = array();
 		$this->data['link_to']['to_app'] = 'timesheet';
 		$this->data['link_to']['to_id'] = 0;
 
-		foreach(Link::get_links($this->data['link_to']['to_app'], $original_id) as $link)
+		foreach (Link::get_links($this->data['link_to']['to_app'], $original_id) as $link)
 		{
 			if ($link['app'] != Link::VFS_APPNAME)
 			{

Braces +177 added lines, -45 removed lines

@@ -63,7 +63,10 @@ 
 		$etpl = new Etemplate('timesheet.edit');
 		if (!is_array($content))
 		{
-			if ($_GET['msg']) $msg = strip_tags($_GET['msg']);
+			if ($_GET['msg'])
+			{
+				$msg = strip_tags($_GET['msg']);
+			}
 
 			if ($view || (int)$_GET['ts_id'])
 			{
@@ -130,23 +133,32 @@ 
 				$content['ts_description'] = $content['ts_description_short'];
 			}
 			// we only need 2 out of 3 values from start-, end-time or duration (the date in ts_start is always required!)
-			if (isset($content['start_time']))		// start-time specified
+			if (isset($content['start_time']))
+			{
+				// start-time specified
 			{
 				//$content['ts_start'] += $content['start_time'];
 				$start = new Api\DateTime($content['ts_start']);
+			}
 				$start_time = explode(':',$content['start_time']);
 				$start->setTime($start_time[0],$start_time[1]);
 				$content['ts_start'] = $start->format('ts');
 			}
-			if (isset($content['end_time']))		// end-time specified
+			if (isset($content['end_time']))
+			{
+				// end-time specified
 			{
 				$end = new Api\DateTime($content['ts_start']);
+			}
 				$end_time = explode(':',$content['end_time']);
 				$end->setTime($end_time[0],$end_time[1]);
 			}
-			if ($end && $start)	// start- & end-time --> calculate the duration
+			if ($end && $start)
+			{
+				// start- & end-time --> calculate the duration
 			{
 				$content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60;
+			}
 				// check if negative duration is caused by wrap over midnight
 				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60)
 				{
@@ -154,12 +166,18 @@ 
 				}
 				//echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n";
 			}
-			elseif ($content['ts_duration'] && $end)	// no start, calculate from end and duration
+			elseif ($content['ts_duration'] && $end)
+			{
+				// no start, calculate from end and duration
 			{
 				$content['ts_start'] = $end->format('ts') - 60*$content['ts_duration'];
+			}
 				//echo "<p>end_time=$content[end_time], duration=$content[ts_duration] --> ts_start=$content[ts_start]=".Api\DateTime::to($content['ts_start'])."</p>\n";
 			}
-			if ($content['ts_duration'] > 0) unset($content['end_time']);
+			if ($content['ts_duration'] > 0)
+			{
+				unset($content['end_time']);
+			}
 			// now we only deal with start (date+time) and duration
 			list($button) = @each($content['button']);
 			$view = $content['view'];
@@ -173,7 +191,10 @@ 
 			switch($button)
 			{
 				case 'edit':
-					if ($this->check_acl(Acl::EDIT) && !$only_admin_edit) $view = false;
+					if ($this->check_acl(Acl::EDIT) && !$only_admin_edit)
+					{
+						$view = false;
+					}
 					break;
 
 				case 'undelete':
@@ -187,12 +208,15 @@ 
 				case 'save':
 				case 'save_new':
 				case 'apply':
-					if ((!$this->data['ts_quantity'] || $this->ts_viewtype == 'short') && $this->data['ts_duration'])	// set the quantity (in h) from the duration (in min)
+					if ((!$this->data['ts_quantity'] || $this->ts_viewtype == 'short') && $this->data['ts_duration'])
+					{
+						// set the quantity (in h) from the duration (in min)
 					{
 						// We need to keep the actual value of ts_quantity when we are storing it, as it is used in price calculation
 						// and rounding it causes miscalculation on prices
 						$this->data['ts_quantity'] = $this->data['ts_duration'] / 60.0;
 					}
+					}
 					if (!$this->data['ts_quantity'])
 					{
 						$etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!'));
@@ -226,7 +250,11 @@ 
 							unset($content['ts_project_blur']);
 						}
 					}
-					if ($etpl->validation_errors()) break;	// the user need to fix the error, before we can save the entry
+					if ($etpl->validation_errors())
+					{
+						break;
+					}
+					// the user need to fix the error, before we can save the entry
 
 					// account for changed project --> remove old one from links and add new one
 					if ((int) $this->data['pm_id'] != (int) $this->data['old_pm_id'])
@@ -270,14 +298,20 @@ 
 						}
 					}
 					Framework::refresh_opener($msg, 'timesheet', $this->data['ts_id'], $content['ts_id'] ? 'edit' : 'add');
-					if ($button == 'apply') break;
+					if ($button == 'apply')
+					{
+						break;
+					}
 					if ($button == 'save_new')
 					{
 						$msg .= ', '.lang('creating new entry');		// giving some feedback to the user
 
-						if (!is_array($content['link_to']['to_id']))	// set links again, so new entry gets the same links as the existing one
+						if (!is_array($content['link_to']['to_id']))
+						{
+							// set links again, so new entry gets the same links as the existing one
 						{
 							$content['link_to']['to_id'] = 0;
+						}
 							foreach(Link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.Link::VFS_APPNAME) as $link)
 							{
 								Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
@@ -345,12 +379,15 @@ 
 			foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 			{
 				$link_id = $link_ids[$n];
-				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+				{
+					// gard against XSS
 				{
 					switch ($link_app)
 					{
 						case 'projectmanager':
 							$links[] = $link_id;
+				}
 							// fall-through;
 						default:
 							if(!$n)
@@ -362,8 +399,14 @@ 
 								{
 									foreach((array)$set['link_app'] as $i => $l_app)
 									{
-										if (($l_id=$set['link_id'][$i])) Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
-										if ($l_app == 'projectmanager') $links[] = $l_id;
+										if (($l_id=$set['link_id'][$i]))
+										{
+											Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
+										}
+										if ($l_app == 'projectmanager')
+										{
+											$links[] = $l_id;
+										}
 									}
 									unset($set['link_app']);
 									unset($set['link_id']);
@@ -464,8 +507,16 @@ 
 				$etpl->setElementAttribute('pm_id','blur',$content['ts_project']);
 			}
 		}
-		if (!$this->customfields) $readonlys['tabs']['customfields'] = true;	// suppress tab if there are not customfields
-		if (!$this->data['ts_id']) $readonlys['tabs']['history']    = true;   //suppress history for the first loading without ID
+		if (!$this->customfields)
+		{
+			$readonlys['tabs']['customfields'] = true;
+		}
+		// suppress tab if there are not customfields
+		if (!$this->data['ts_id'])
+		{
+			$readonlys['tabs']['history']    = true;
+		}
+		//suppress history for the first loading without ID
 
 		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
 	}
@@ -478,7 +529,10 @@ 
 	 */
 	function datetime2time($datetime)
 	{
-		if (!$datetime) return 0;
+		if (!$datetime)
+		{
+			return 0;
+		}
 
 		return $datetime - mktime(0,0,0,date('m',$datetime),date('d',$datetime),date('Y',$datetime));
 	}
@@ -524,7 +578,10 @@ 
 			}
 			// show week-sums, if we are week-aligned (show full weeks)?
 			$week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
-			if (!$week_start_day) $week_start_day = 'Sunday';
+			if (!$week_start_day)
+			{
+				$week_start_day = 'Sunday';
+			}
 			switch($week_start_day)
 			{
 				case 'Sunday': $week_end_day = 'Saturday'; break;
@@ -545,7 +602,10 @@ 
 			}
 		}
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
-		if (!$id_only && !$query_in['csv_export']) Api\Cache::setSession(TIMESHEET_APP, 'index', $query_in);
+		if (!$id_only && !$query_in['csv_export'])
+		{
+			Api\Cache::setSession(TIMESHEET_APP, 'index', $query_in);
+		}
 
 		// Refresh actions (undelete needs this)
 		$query_in['actions'] = $this->get_actions($query_in);
@@ -553,8 +613,14 @@ 
 		$query = $query_in;	// keep the original query
 		$query['enddate'] = $end_date;
 
-		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
-		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
+		if($this->ts_viewtype == 'short')
+		{
+			$query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
+		}
+		if ($query['no_status'])
+		{
+			$query_in['options-selectcols']['ts_status'] = false;
+		}
 
 		//_debug_array($query['col_filter']);
 		//echo "PM Integration:".$this->pm_integration.'<br>';
@@ -567,8 +633,14 @@ 
 		{
 			//$query['col_filter']['ts_id'] = Link::get_links('projectmanager',$query['col_filter']['pm_id'],'timesheet');
 			$query['col_filter']['ts_id'] = $this->get_ts_links($query['col_filter']['pm_id']);
-			if (empty($query['col_filter']['ts_id'])) $query['col_filter']['ts_id'] = -1;
-			if (!$query['col_filter']['ts_id']) $query['col_filter']['ts_id'] = 0;
+			if (empty($query['col_filter']['ts_id']))
+			{
+				$query['col_filter']['ts_id'] = -1;
+			}
+			if (!$query['col_filter']['ts_id'])
+			{
+				$query['col_filter']['ts_id'] = 0;
+			}
 		}
 		if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] == '0')
 		{
@@ -640,10 +712,13 @@ 
 			$cats = $GLOBALS['egw']->categories->return_all_children((int)$query['cat_id']);
 			$query['col_filter']['cat_id'] = count($cats) > 1 ? $cats : $query['cat_id'];
 		}
-		elseif ((string)$query['cat_id'] == '0')	// no category
+		elseif ((string)$query['cat_id'] == '0')
+		{
+			// no category
 		{
 			$query['col_filter']['cat_id'] = null;
 		}
+		}
 		else	// all cats --> no filter
 		{
 			unset($query['col_filter']['cat_id']);
@@ -654,7 +729,10 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.Api\Accounts::username($query['col_filter']['ts_owner']);
 			#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members");
 			#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
-			if ($query['col_filter']['ts_owner']<0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			if ($query['col_filter']['ts_owner']<0)
+			{
+				$query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			}
 		}
 		else
 		{
@@ -667,10 +745,13 @@ 
 			// generate a meaningful app-header / report title
 			if ($this->show_sums['month'])
 			{
-				if ((int)$start[1] == 1 && (int) $end[1] == 12)		// whole year(s)
+				if ((int)$start[1] == 1 && (int) $end[1] == 12)
+				{
+					// whole year(s)
 				{
 					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . $start[0] . ($start[0] != $end[0] ? ' - '.$end[0] : '');
 				}
+				}
 				else
 				{
 					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang(date('F',$query['startdate']+12*60*60)) . ' ' . $start[0];
@@ -712,7 +793,10 @@ 
 		$ids = array();
 		foreach($rows as &$row)
 		{
-			if ($row['ts_id'] > 0) $ids[] = $row['ts_id'];
+			if ($row['ts_id'] > 0)
+			{
+				$ids[] = $row['ts_id'];
+			}
 		}
 		if ($id_only)
 		{
@@ -742,12 +826,19 @@ 
 		$have_cats = false;
 		foreach($rows as &$row)
 		{
-			if ($row['cat_id']) $have_cats = true;
+			if ($row['cat_id'])
+			{
+				$have_cats = true;
+			}
 
 			$row['class'] = 'row';
-			if ($row['ts_id'] <= 0)	// sums
+			if ($row['ts_id'] <= 0)
 			{
-				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;	// fix for DSL change
+				// sums
+			{
+				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;
+			}
+			// fix for DSL change
 
 				// Remove fake modified date, it breaks nextmatch checks
 				unset($row['ts_modified']);
@@ -775,7 +866,10 @@ 
 						break;
 				}
 				$row['ts_start'] = $row['ts_unitprice'] = '';
-				if (!$this->quantity_sum) $row['ts_quantity'] = '';
+				if (!$this->quantity_sum)
+				{
+					$row['ts_quantity'] = '';
+				}
 				$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete';
 				$row['titleClass'] = 'timesheet_titleSum';
 				continue;
@@ -817,11 +911,17 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if(!$row['titleClass'])
+			{
+				$row['titleClass'] = 'timesheet_titleDetails';
+			}
 
 		}
 		$rows['no_cat_id'] = (!$have_cats || $query['cat_id']);
-		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
+		if ($query['col_filter']['ts_owner'])
+		{
+			$rows['ownerClass'] = 'noPrint';
+		}
 		$rows['no_owner_col'] = $query['no_owner_col'];
 		if(is_string($query['selectcols']))
 		{
@@ -839,13 +939,23 @@ 
 		if (!$rows['ts_viewtype'])
 		{
 			#_debug_array($query['selectcols']);
-			if(!is_array($query['selectcols'])){
+			if(!is_array($query['selectcols']))
+			{
 				$query['selectcols'] = explode(',',$query['selectcols']);
 			}
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && in_array('ts_quantity_quantity',$query['selectcols'])===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols'])===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && in_array('ts_total_price',$query['selectcols'])===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && in_array('ts_quantity_quantity',$query['selectcols'])===false)
+			{
+				$rows['no_ts_quantity'] = 1;
+			}
+			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols'])===false)
+			{
+				$rows['no_ts_unitprice'] = 1;
+			}
+			if ($query['selectcols'] && in_array('ts_total_price',$query['selectcols'])===false)
+			{
+				$rows['no_ts_total'] = 1;
+			}
 		}
 		$rows['no_ts_status'] = in_array('ts_status', $query['selectcols']) === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -868,7 +978,10 @@ 
 	{
 		$etpl = new Etemplate('timesheet.index');
 
-		if ($_GET['msg']) $msg = $_GET['msg'];
+		if ($_GET['msg'])
+		{
+			$msg = $_GET['msg'];
+		}
 		if ($content['nm']['rows']['delete'])
 		{
 			list($ts_id) = each($content['nm']['rows']['delete']);
@@ -881,9 +994,12 @@ 
 				$msg = lang('Error deleting the entry!!!');
 			}
 		}
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
+		if (is_array($content) && isset($content['nm']['rows']['document']))
+		{
+			// handle insert in default document button like an action
 		{
 			list($id) = @each($content['nm']['rows']['document']);
+		}
 			$content['nm']['action'] = 'document';
 			$content['nm']['selected'] = array($id);
 		}
@@ -957,7 +1073,10 @@ 
 		}
 		$read_grants = $this->grant_list(Acl::READ);
 		$content['nm']['no_owner_col'] = count($read_grants) == 1;
-		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows']) $content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
+		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'])
+		{
+			$content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
+		}
 		$sel_options = array(
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
@@ -974,7 +1093,10 @@ 
 		if ($this->pm_integration != 'full')
 		{
 			$projects =& $this->query_list('ts_project');
-			if (!is_array($projects)) $projects = array();
+			if (!is_array($projects))
+			{
+				$projects = array();
+			}
 			$sel_options['ts_project'] = $projects + array(lang('No project'));
 		}
 
@@ -1192,7 +1314,8 @@ 
 			case 'cat':
 				$cat_name = Api\Categories::id2name($settings);
 				$action_msg = lang('changed category to %1', $cat_name);
-				foreach((array)$checked as $n => $id) {
+				foreach((array)$checked as $n => $id)
+				{
 					if (($entry = $this->read($id)) &&
 						($entry['cat_id'] = $settings) &&
 						$this->save($entry) == 0)
@@ -1207,7 +1330,10 @@ 
 				break;
 
 			case 'document':
-				if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'];
+				if (!$settings)
+				{
+					$settings = $GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'];
+				}
 				$document_merge = new timesheet_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['timesheet']['document_dir']);
 				$failed = count($checked);
@@ -1259,7 +1385,10 @@ 
 						$this->load_statuses();
 						$msg .= lang('Status updated.');
 					}
-					if ($button == 'apply') break;
+					if ($button == 'apply')
+					{
+						break;
+					}
 					// fall-through
 				case 'cancel':
 					$GLOBALS['egw']->redirect_link('/admin/index.php', null, 'admin');
@@ -1337,7 +1466,10 @@ 
 		$this->data['ts_owner'] = !(int)$this->data['ts_owner'] || !$this->check_acl(Acl::ADD,NULL,$this->data['ts_owner']) ? $this->user : $this->data['ts_owner'];
 
 		// Copy links
-		if(!is_array($this->data['link_to'])) $this->data['link_to'] = array();
+		if(!is_array($this->data['link_to']))
+		{
+			$this->data['link_to'] = array();
+		}
 		$this->data['link_to']['to_app'] = 'timesheet';
 		$this->data['link_to']['to_id'] = 0;