EGroupware / egroupware

api/src/Storage/Customfields.php

Doc Comments +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 	 * @param string $app
 	 * @param boolean $all_private_too =false should all the private fields be returned too, default no
 	 * @param string $only_type2 =null if given only return fields of type2 == $only_type2
-	 * @return boolen true: if there is a custom field useing html, false if not
+	 * @return boolean true: if there is a custom field useing html, false if not
 	 */
 	public static function use_html($app, $all_private_too=false, $only_type2=null)
 	{

Spacing +35 added lines, -35 removed lines

@@ -42,7 +42,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $all_private_too=false;
+	protected $all_private_too = false;
 
 	/**
 	 * Iterator initialised for custom fields
@@ -62,7 +62,7 @@ 
 	 * @param Api\Db $db =null reference to database instance to use
 	 * @return array with customfields
 	 */
-	function __construct($app, $all_private_too=false, $only_type2=null, $start=0, $num_rows=null, Api\Db $db=null)
+	function __construct($app, $all_private_too = false, $only_type2 = null, $start = 0, $num_rows = null, Api\Db $db = null)
 	{
 		$this->app = $app;
 		$this->all_private_too = $all_private_too;
@@ -116,7 +116,7 @@ 
 	protected function commasep_match($column, $values)
 	{
 		$to_or = array($column.' IS NULL');
-		foreach((array) $values as $value)
+		foreach ((array)$values as $value)
 		{
 			$to_or[] = self::$db->concat("','", $column, "','").' LIKE '.self::$db->quote('%,'.$value.',%');
 		}
@@ -132,9 +132,9 @@ 
 	 * @param Api\Db $db =null reference to database to use
 	 * @return array with customfields
 	 */
-	public static function get($app, $all_private_too=false, $only_type2=null, Api\Db $db=null)
+	public static function get($app, $all_private_too = false, $only_type2 = null, Api\Db $db = null)
 	{
-		$cache_key = $app.':'.($all_private_too?'all':$GLOBALS['egw_info']['user']['account_id']).':'.$only_type2;
+		$cache_key = $app.':'.($all_private_too ? 'all' : $GLOBALS['egw_info']['user']['account_id']).':'.$only_type2;
 		$cfs = Api\Cache::getInstance(__CLASS__, $cache_key);
 
 		if (!isset($cfs))
@@ -161,9 +161,9 @@ 
 	 * @param string $only_type2 =null if given only return fields of type2 == $only_type2
 	 * @return boolen true: if there is a custom field useing html, false if not
 	 */
-	public static function use_html($app, $all_private_too=false, $only_type2=null)
+	public static function use_html($app, $all_private_too = false, $only_type2 = null)
 	{
-		foreach(self::get($app, $all_private_too, $only_type2) as $data)
+		foreach (self::get($app, $all_private_too, $only_type2) as $data)
 		{
 			if ($data['type'] == 'htmlarea') return true;
 		}
@@ -186,17 +186,17 @@ 
 	 */
 	public static function format(array $field, $value)
 	{
-		switch($field['type'])
+		switch ($field['type'])
 		{
 			case 'select-account':
 				if ($value)
 				{
 					$values = array();
-					foreach($field['rows'] > 1 ? explode(',', $value) : (array) $value as $value)
+					foreach ($field['rows'] > 1 ? explode(',', $value) : (array)$value as $value)
 					{
 						$values[] = Api\Accounts::username($value);
 					}
-					$value = implode(', ',$values);
+					$value = implode(', ', $values);
 				}
 				break;
 
@@ -211,7 +211,7 @@ 
 					$field['values'] = self::get_options_from_file($field['values']['@']);
 				}
 				$values = array();
-				foreach($field['rows'] > 1 ? explode(',', $value) : (array) $value as $value)
+				foreach ($field['rows'] > 1 ? explode(',', $value) : (array)$value as $value)
 				{
 					$values[] = isset($field['values'][$value]) ? $field['values'][$value] : '#'.$value;
 				}
@@ -275,12 +275,12 @@ 
 	{
 		$options = array();
 
-		if (!($path = realpath($file[0] == '/' ? $file : EGW_SERVER_ROOT.'/'.$file)) ||	// file does not exist
-			substr($path,0,strlen(EGW_SERVER_ROOT)+1) != EGW_SERVER_ROOT.'/' ||	// we are NOT inside the eGW root
-			basename($path,'.php').'.php' != basename($path) ||	// extension is NOT .php
+		if (!($path = realpath($file[0] == '/' ? $file : EGW_SERVER_ROOT.'/'.$file)) || // file does not exist
+			substr($path, 0, strlen(EGW_SERVER_ROOT) + 1) != EGW_SERVER_ROOT.'/' || // we are NOT inside the eGW root
+			basename($path, '.php').'.php' != basename($path) || // extension is NOT .php
 			basename($path) == 'header.inc.php')	// dont allow to include our header again
 		{
-			return array(lang("'%1' is no php file in the eGW server root (%2)!".': '.$path,$file,EGW_SERVER_ROOT));
+			return array(lang("'%1' is no php file in the eGW server root (%2)!".': '.$path, $file, EGW_SERVER_ROOT));
 		}
 		include($path);
 
@@ -298,7 +298,7 @@ 
 
 		if (is_null($link_types))
 		{
-			$link_types = array_keys(array_intersect(Api\Link::app_list('query'),Api\Link::app_list('title')));
+			$link_types = array_keys(array_intersect(Api\Link::app_list('query'), Api\Link::app_list('title')));
 			$link_types[] = 'link-entry';
 		}
 		return $link_types;
@@ -315,31 +315,31 @@ 
 	 * @param array $old =null old values before the update, if existing
 	 * @param string $id_name ='id' name/key of the (link-)id in $values
 	 */
-	public static function update_links($own_app,array $values,array $old=null,$id_name='id')
+	public static function update_links($own_app, array $values, array $old = null, $id_name = 'id')
 	{
 		$link_types = self::get_link_types();
 
-		foreach(self::get($own_app) as $name => $data)
+		foreach (self::get($own_app) as $name => $data)
 		{
-			if (!in_array($data['type'],$link_types)) continue;
+			if (!in_array($data['type'], $link_types)) continue;
 
 			// do we have a different old value --> delete that link
 			if ($old && $old['#'.$name] && $old['#'.$name] != $values['#'.$name])
 			{
 				if ($data['type'] == 'link-entry')
 				{
-					list($app,$id) = explode(':',$old['#'.$name]);
+					list($app, $id) = explode(':', $old['#'.$name]);
 				}
 				else
 				{
 					$app = $data['type'];
 					$id = $old['#'.$name];
 				}
-				Api\Link::unlink(false,$own_app,$values[$id_name],'',$app,$id);
+				Api\Link::unlink(false, $own_app, $values[$id_name], '', $app, $id);
 			}
 			if ($data['type'] == 'link-entry')
 			{
-				list($app,$id) = explode(':',$values['#'.$name]);
+				list($app, $id) = explode(':', $values['#'.$name]);
 			}
 			else
 			{
@@ -348,7 +348,7 @@ 
 			}
 			if ($id)	// create new link, does nothing for already existing links
 			{
-				Api\Link::link($own_app,$values[$id_name],$app,$id);
+				Api\Link::link($own_app, $values[$id_name], $app, $id);
 			}
 		}
 	}
@@ -369,25 +369,25 @@ 
 		$old = $cfs[$cf['name']];
 
 		// Add new one in for numbering
-		if(!$cf['id'])
+		if (!$cf['id'])
 		{
 			$cfs[$cf['name']] = $cf;
 		}
 
-		if($old['order'] != $cf['order'] || $cf['order'] % 10 !== 0)
+		if ($old['order'] != $cf['order'] || $cf['order'] % 10 !== 0)
 		{
 			$cfs[$cf['name']]['order'] = $cf['order'];
-			uasort($cfs, function($a1, $a2){
+			uasort($cfs, function($a1, $a2) {
 				return $a1['order'] - $a2['order'];
 			});
 			$n = 0;
-			foreach($cfs as $old_cf)
+			foreach ($cfs as $old_cf)
 			{
 				$n += 10;
-				if($old_cf['order'] != $n)
+				if ($old_cf['order'] != $n)
 				{
 					$old_cf['order'] = $n;
-					if($old_cf['name'] != $cf['name'])
+					if ($old_cf['name'] != $cf['name'])
 					{
 						$update[] = $old_cf;
 					}
@@ -417,7 +417,7 @@ 
 			'cf_app' => $cf['app'],
 		), __LINE__, __FILE__);
 
-		foreach($update as $old_cf)
+		foreach ($update as $old_cf)
 		{
 			self::$db->$op(self::TABLE, array(
 				'cf_order' => $old_cf['order'],
@@ -442,7 +442,7 @@ 
 		if ($cfs) $query[] = self::$db->expression(self::TABLE, 'NOT ', array('cf_name' => array_keys($cfs)));
 		self::$db->delete(self::TABLE, $query, __LINE__, __FILE__);
 
-		foreach($cfs as $name => $cf)
+		foreach ($cfs as $name => $cf)
 		{
 			if (empty($cf['name'])) $cf['name'] = $name;
 			if (empty($cf['app']))  $cf['app'] = $app;
@@ -461,7 +461,7 @@ 
 	{
 		if (($cached = Api\Cache::getInstance(__CLASS__, $app)))
 		{
-			foreach($cached as $key)
+			foreach ($cached as $key)
 			{
 				Api\Cache::unsetInstance(__CLASS__, $key);
 			}
@@ -481,12 +481,12 @@ 
 		$total = 0;
 		if (($cfs = self::get($app, true)))
 		{
-			foreach($cfs as &$data)
+			foreach ($cfs as &$data)
 			{
 				if ($data['private'])
 				{
 					$changed = 0;
-					foreach($data['private'] as &$id)
+					foreach ($data['private'] as &$id)
 					{
 						if (isset($ids2change[$id]))
 						{
@@ -516,7 +516,7 @@ 
 		$types = array();
 		if (($cfs = self::get($app, true)))
 		{
-			foreach($cfs as $name => $data)
+			foreach ($cfs as $name => $data)
 			{
 				if ($data['type'] == 'select-account' || $data['type'] == 'api-accounts')
 				{

Braces +42 added lines, -11 removed lines

@@ -80,7 +80,10 @@ 
 		{
 			$query[] = $this->commasep_match('cf_type2', $only_type2);
 		}
-		if (!$db) $db = self::$db;
+		if (!$db)
+		{
+			$db = self::$db;
+		}
 		$this->iterator = $db->select(self::TABLE, '*', $query, __LINE__, __FILE__,
 			!isset($num_rows) ? false : $start, 'ORDER BY cf_order ASC', 'phpgwapi', $num_rows);
 	}
@@ -165,7 +168,10 @@ 
 	{
 		foreach(self::get($app, $all_private_too, $only_type2) as $data)
 		{
-			if ($data['type'] == 'htmlarea') return true;
+			if ($data['type'] == 'htmlarea')
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -227,7 +233,10 @@ 
 				break;
 
 			case 'htmlarea':	// ToDo: EMail probably has a nicer html2text method
-				if ($value) $value = strip_tags(preg_replace('/<(br|p)[^>]*>/i', "\r\n", str_replace(array("\r", "\n"), '', $value)));
+				if ($value)
+				{
+					$value = strip_tags(preg_replace('/<(br|p)[^>]*>/i', "\r\n", str_replace(array("\r", "\n"), '', $value)));
+				}
 				break;
 
 			case 'ajax_select':	// ToDo: returns unchanged value for now
@@ -245,7 +254,10 @@ 
 					{
 						$app = $field['type'];
 					}
-					if ($value) $value = Api\Link::title($app, $value);
+					if ($value)
+					{
+						$value = Api\Link::title($app, $value);
+					}
 				}
 				break;
 		}
@@ -278,10 +290,13 @@ 
 		if (!($path = realpath($file[0] == '/' ? $file : EGW_SERVER_ROOT.'/'.$file)) ||	// file does not exist
 			substr($path,0,strlen(EGW_SERVER_ROOT)+1) != EGW_SERVER_ROOT.'/' ||	// we are NOT inside the eGW root
 			basename($path,'.php').'.php' != basename($path) ||	// extension is NOT .php
-			basename($path) == 'header.inc.php')	// dont allow to include our header again
+			basename($path) == 'header.inc.php')
+		{
+			// dont allow to include our header again
 		{
 			return array(lang("'%1' is no php file in the eGW server root (%2)!".': '.$path,$file,EGW_SERVER_ROOT));
 		}
+		}
 		include($path);
 
 		return $options;
@@ -321,7 +336,10 @@ 
 
 		foreach(self::get($own_app) as $name => $data)
 		{
-			if (!in_array($data['type'],$link_types)) continue;
+			if (!in_array($data['type'],$link_types))
+			{
+				continue;
+			}
 
 			// do we have a different old value --> delete that link
 			if ($old && $old['#'.$name] && $old['#'.$name] != $values['#'.$name])
@@ -346,10 +364,13 @@ 
 				$app = $data['type'];
 				$id = $values['#'.$name];
 			}
-			if ($id)	// create new link, does nothing for already existing links
+			if ($id)
+			{
+				// create new link, does nothing for already existing links
 			{
 				Api\Link::link($own_app,$values[$id_name],$app,$id);
 			}
+			}
 		}
 	}
 
@@ -377,7 +398,8 @@ 
 		if($old['order'] != $cf['order'] || $cf['order'] % 10 !== 0)
 		{
 			$cfs[$cf['name']]['order'] = $cf['order'];
-			uasort($cfs, function($a1, $a2){
+			uasort($cfs, function($a1, $a2)
+			{
 				return $a1['order'] - $a2['order'];
 			});
 			$n = 0;
@@ -439,13 +461,22 @@ 
 	public static function save($app, array $cfs)
 	{
 		$query = array('cf_app' => $app);
-		if ($cfs) $query[] = self::$db->expression(self::TABLE, 'NOT ', array('cf_name' => array_keys($cfs)));
+		if ($cfs)
+		{
+			$query[] = self::$db->expression(self::TABLE, 'NOT ', array('cf_name' => array_keys($cfs)));
+		}
 		self::$db->delete(self::TABLE, $query, __LINE__, __FILE__);
 
 		foreach($cfs as $name => $cf)
 		{
-			if (empty($cf['name'])) $cf['name'] = $name;
-			if (empty($cf['app']))  $cf['app'] = $app;
+			if (empty($cf['name']))
+			{
+				$cf['name'] = $name;
+			}
+			if (empty($cf['app']))
+			{
+				$cf['app'] = $app;
+			}
 
 			self::update($cf);
 		}

api/src/Storage/History.php

Doc Comments +2 added lines

@@ -112,6 +112,8 @@
 
 	/**
 	 * Static function to add a history record
+	 * @param string $field_code
+	 * @param string $new_value
 	 */
 	public static function static_add($appname, $id, $user, $field_code, $new_value, $old_value = '')
 	{

Spacing +30 added lines, -30 removed lines

@@ -51,7 +51,7 @@ 
 	 * @param string $appname app name this instance operates on
 	 * @return historylog
 	 */
-	function __construct($appname='',$user=null)
+	function __construct($appname = '', $user = null)
 	{
 		$this->appname = $appname ? $appname : $GLOBALS['egw_info']['flags']['currentapp'];
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
@@ -80,7 +80,7 @@ 
 		{
 			$where['history_record_id'] = $record_id;
 		}
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -93,11 +93,11 @@ 
 	 * @param string $new_value new value
 	 * @param string $old_value old value
 	 */
-	function add($status,$record_id,$new_value,$old_value)
+	function add($status, $record_id, $new_value, $old_value)
 	{
 		if ($new_value != $old_value)
 		{
-			$this->db->insert(self::TABLE,array(
+			$this->db->insert(self::TABLE, array(
 				'history_record_id' => $record_id,
 				'history_appname'   => $this->appname,
 				'history_owner'     => $this->user,
@@ -106,7 +106,7 @@ 
 				'history_old_value' => $old_value,
 				'history_timestamp' => time(),
 				'sessionid' => $GLOBALS['egw']->session->sessionid_access_log,
-			),false,__LINE__,__FILE__);
+			), false, __LINE__, __FILE__);
 		}
 	}
 
@@ -117,7 +117,7 @@ 
 	{
 		if ($new_value != $old_value)
 		{
-			$GLOBALS['egw']->db->insert(self::TABLE,array(
+			$GLOBALS['egw']->db->insert(self::TABLE, array(
 				'history_record_id' => $id,
 				'history_appname'   => $appname,
 				'history_owner'     => (int)$user,
@@ -126,7 +126,7 @@ 
 				'history_old_value' => $old_value,
 				'history_timestamp' => time(),
 				'sessionid' => $GLOBALS['egw']->session->sessionid_access_log,
-			),false,__LINE__,__FILE__);
+			), false, __LINE__, __FILE__);
 		}
 	}
 
@@ -140,11 +140,11 @@ 
 	 * @return array of arrays with keys id, record_id, appname, owner (account_id), status, new_value, old_value,
 	 * 	timestamp (Y-m-d H:i:s in servertime), user_ts (timestamp in user-time)
 	 */
-	function search($filter,$order='history_id',$sort='DESC',$limit=null)
+	function search($filter, $order = 'history_id', $sort = 'DESC', $limit = null)
 	{
 		if (!is_array($filter)) $filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
 
-		if (!$order || !preg_match('/^[a-z0-9_]+$/i',$order) || !preg_match('/^(asc|desc)?$/i',$sort))
+		if (!$order || !preg_match('/^[a-z0-9_]+$/i', $order) || !preg_match('/^(asc|desc)?$/i', $sort))
 		{
 			$orderby = 'ORDER BY history_id DESC';
 		}
@@ -152,9 +152,9 @@ 
 		{
 			$orderby = "ORDER BY $order $sort";
 		}
-		foreach($filter as $col => $value)
+		foreach ($filter as $col => $value)
 		{
-			if (!is_numeric($col) && substr($col,0,8) != 'history_')
+			if (!is_numeric($col) && substr($col, 0, 8) != 'history_')
 			{
 				$filter['history_'.$col] = $value;
 				unset($filter[$col]);
@@ -166,11 +166,11 @@ 
 		if (!$filter['history_record_id']) return array();
 
 		$rows = array();
-		foreach($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
+		foreach ($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
 			isset($limit) ? 0 : false, $orderby, 'phpgwapi', $limit) as $row)
 		{
 			$row['user_ts'] = $this->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
-			$rows[] = Api\Db::strip_array_keys($row,'history_');
+			$rows[] = Api\Db::strip_array_keys($row, 'history_');
 		}
 		return $rows;
 	}
@@ -188,8 +188,8 @@ 
 		$rows = array();
 		$filter['history_appname'] = $query['appname'];
 		$filter['history_record_id'] = $query['record_id'];
-		if(is_array($query['colfilter'])) {
-			foreach($query['colfilter'] as $column => $value) {
+		if (is_array($query['colfilter'])) {
+			foreach ($query['colfilter'] as $column => $value) {
 				$filter[$column] = $value;
 			}
 		}
@@ -199,20 +199,20 @@ 
 		}
 		else
 		{
-			$total = $GLOBALS['egw']->db->select(self::TABLE,'COUNT(*)',$filter,__LINE__,__FILE__,false,'','phpgwapi',0)->fetchColumn();
+			$total = $GLOBALS['egw']->db->select(self::TABLE, 'COUNT(*)', $filter, __LINE__, __FILE__, false, '', 'phpgwapi', 0)->fetchColumn();
 		}
 		// filter out private (or no longer defined) custom fields
 		if ($filter['history_appname'])
 		{
 			$to_or[] = "history_status NOT LIKE '#%'";
 			// explicitly allow "##" used to store iCal/vCard X-attributes
-			if (in_array($filter['history_appname'], array('calendar','infolog','addressbook')))
+			if (in_array($filter['history_appname'], array('calendar', 'infolog', 'addressbook')))
 			{
 				$to_or[] = "history_status LIKE '##%'";
 			}
 			if (($cfs = Customfields::get($filter['history_appname'])))
 			{
-				$to_or[] =  'history_status IN ('.implode(',', array_map(function($str)
+				$to_or[] = 'history_status IN ('.implode(',', array_map(function($str)
 				{
 					return $GLOBALS['egw']->db->quote('#'.$str);
 				}, array_keys($cfs))).')';
@@ -221,25 +221,25 @@ 
 		}
 		$_query = array(array(
 			'table' => self::TABLE,
-			'cols' => array('history_id', 'history_record_id','history_appname','history_owner','history_status','history_new_value', 'history_timestamp','history_old_value'),
+			'cols' => array('history_id', 'history_record_id', 'history_appname', 'history_owner', 'history_status', 'history_new_value', 'history_timestamp', 'history_old_value'),
 			'where' => $filter,
 		));
 
 		// Add in files, if possible
-		if($GLOBALS['egw_info']['user']['apps']['filemanager'] &&
-			$file = Api\Vfs\Sqlfs\StreamWrapper::url_stat("/apps/{$query['appname']}/{$query['record_id']}",STREAM_URL_STAT_LINK))
+		if ($GLOBALS['egw_info']['user']['apps']['filemanager'] &&
+			$file = Api\Vfs\Sqlfs\StreamWrapper::url_stat("/apps/{$query['appname']}/{$query['record_id']}", STREAM_URL_STAT_LINK))
 		{
 			$_query[] = array(
 				'table' => Api\Vfs\Sqlfs\StreamWrapper::TABLE,
-				'cols' =>array('fs_id', 'fs_dir', "'filemanager'",'COALESCE(fs_modifier,fs_creator)',"'~file~'",'fs_name','fs_modified', 'fs_mime'),
+				'cols' =>array('fs_id', 'fs_dir', "'filemanager'", 'COALESCE(fs_modifier,fs_creator)', "'~file~'", 'fs_name', 'fs_modified', 'fs_mime'),
 				'where' => array('fs_dir' => $file['ino'])
 			);
 		}
 		$new_file_id = array();
-		foreach($GLOBALS['egw']->db->union(
+		foreach ($GLOBALS['egw']->db->union(
 			$_query,
 			__LINE__, __FILE__,
-			' ORDER BY ' . ($query['order'] ? $query['order'] : 'history_timestamp') . ' ' . ($query['sort'] ? $query['sort'] : 'DESC'),
+			' ORDER BY '.($query['order'] ? $query['order'] : 'history_timestamp').' '.($query['sort'] ? $query['sort'] : 'DESC'),
 			$query['start'],
 			$query['num_rows']
 		) as $row)
@@ -247,15 +247,15 @@ 
 			$row['user_ts'] = $GLOBALS['egw']->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
 
 			// Explode multi-part values
-			foreach(array('history_new_value','history_old_value') as $field)
+			foreach (array('history_new_value', 'history_old_value') as $field)
 			{
-				if(strpos($row[$field],Tracking::ONE2N_SEPERATOR) !== false)
+				if (strpos($row[$field], Tracking::ONE2N_SEPERATOR) !== false)
 				{
-					$row[$field] = explode(Tracking::ONE2N_SEPERATOR,$row[$field]);
+					$row[$field] = explode(Tracking::ONE2N_SEPERATOR, $row[$field]);
 				}
 			}
 			// Get information needed for proper display
-			if($row['history_appname'] == 'filemanager')
+			if ($row['history_appname'] == 'filemanager')
 			{
 				$new_version = $new_file_id[$row['history_new_value']];
 				$new_file_id[$row['history_new_value']] = count($rows);
@@ -271,12 +271,12 @@ 
 					'mime' => $row['history_old_value']
 				);
 				$row['history_old_value'] = '';
-				if($new_version !== null)
+				if ($new_version !== null)
 				{
 					$rows[$new_version]['old_value'] = $row['history_new_value'];
 				}
 			}
-			$rows[] = Api\Db::strip_array_keys($row,'history_');
+			$rows[] = Api\Db::strip_array_keys($row, 'history_');
 		}
 		if ($mysql_calc_rows)
 		{

Braces +16 added lines, -5 removed lines

@@ -142,7 +142,10 @@ 
 	 */
 	function search($filter,$order='history_id',$sort='DESC',$limit=null)
 	{
-		if (!is_array($filter)) $filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		if (!is_array($filter))
+		{
+			$filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		}
 
 		if (!$order || !preg_match('/^[a-z0-9_]+$/i',$order) || !preg_match('/^(asc|desc)?$/i',$sort))
 		{
@@ -160,10 +163,16 @@ 
 				unset($filter[$col]);
 			}
 		}
-		if (!isset($filter['history_appname'])) $filter['history_appname'] = $this->appname;
+		if (!isset($filter['history_appname']))
+		{
+			$filter['history_appname'] = $this->appname;
+		}
 
 		// do not try to read all history entries of an app
-		if (!$filter['history_record_id']) return array();
+		if (!$filter['history_record_id'])
+		{
+			return array();
+		}
 
 		$rows = array();
 		foreach($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
@@ -188,8 +197,10 @@ 
 		$rows = array();
 		$filter['history_appname'] = $query['appname'];
 		$filter['history_record_id'] = $query['record_id'];
-		if(is_array($query['colfilter'])) {
-			foreach($query['colfilter'] as $column => $value) {
+		if(is_array($query['colfilter']))
+		{
+			foreach($query['colfilter'] as $column => $value)
+			{
 				$filter[$column] = $value;
 			}
 		}

api/src/Storage/Merge.php

Doc Comments +14 added lines, -7 removed lines

@@ -368,9 +368,9 @@ 
 	 *
 	 * Calls get_links() repeatedly to get all the combinations for the content.
 	 *
-	 * @param $app String appname
+	 * @param string $app String appname
 	 * @param $id String ID of record
-	 * @param $prefix
+	 * @param string $prefix
 	 * @param $content String document content
 	 */
 	protected function get_all_links($app, $id, $prefix, &$content)
@@ -530,7 +530,7 @@ 
 	 * @param mixed $app_limit app_limit, if not set checks the global limit
 	 * @param string $checkas [AND|ISALLOWED], AND default; if set to ISALLOWED it is checked if Export is allowed
 	 *
-	 * @return bool - true if no export is allowed or a limit is set, false if there is no restriction
+	 * @return boolean|null - true if no export is allowed or a limit is set, false if there is no restriction
 	 */
 	public static function hasExportLimit($app_limit,$checkas='AND')
 	{
@@ -579,6 +579,9 @@ 
 		return $content;
 	}
 
+	/**
+	 * @param string $mimetype
+	 */
 	protected function apply_styles (&$content, $mimetype, $mso_application_progid=null)
 	{
 		if (!isset($mso_application_progid))
@@ -1169,6 +1172,8 @@ 
 
 	/**
 	 * Convert numeric values in spreadsheets into actual numeric values
+	 * @param string $content
+	 * @param string $mimetype
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
@@ -1238,6 +1243,7 @@ 
 
 	/**
 	 * Convert date / timestamp values in spreadsheets into actual date / timestamp values
+	 * @param string $mimetype
 	 */
 	protected function format_spreadsheet_dates(&$content, $names, &$values, $mimetype)
 	{
@@ -1342,6 +1348,7 @@ 
 	/**
 	 * Expand link_to custom fields with the merge replacements from the app
 	 * but only if the template uses them.
+	 * @param string $app
 	 */
 	public function cf_link_to_expand($values, $content, &$replacements, $app = null)
 	{
@@ -1407,7 +1414,7 @@ 
 	/**
 	 * Process special flags, such as IF or NELF
 	 *
-	 * @param content Text to be examined and changed
+	 * @param content string to be examined and changed
 	 * @param replacements array of markers => replacement
 	 *
 	 * @return changed content
@@ -1720,8 +1727,7 @@ 
 	 * Get a list of document actions / files from the given directory
 	 *
 	 * @param string $dirs Directory(s comma or space separated) to search
-	 * @param string $prefix='document_' prefix for array keys
-	 * @param array|string $mime_filter=null allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
+	 * @param array|string $mime_filter allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
 	 * @return array List of documents, suitable for a selectbox.  The key is document_<filename>.
 	 */
 	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
@@ -1988,7 +1994,8 @@ 
 	 *
 	 * @param string &$document maybe relative path of document, on return true absolute path to existing document
 	 * @param string $dirs comma or whitespace separated directories
-	 * @return string|boolean false if document exists, otherwise string with error-message
+	 * @param string $document
+	 * @return false|string false if document exists, otherwise string with error-message
 	 */
 	public static function check_document(&$document, $dirs)
 	{

Spacing +363 added lines, -364 removed lines

@@ -82,14 +82,14 @@ 
 	 * Configuration for HTML Tidy to clean up any HTML content that is kept
 	 */
 	public static $tidy_config = array(
-		'output-xml'		=> true,	// Entity encoding
+		'output-xml'		=> true, // Entity encoding
 		'show-body-only'	=> true,
 		'output-encoding'	=> 'utf-8',
 		'input-encoding'	=> 'utf-8',
-		'quote-ampersand'	=> false,	// Prevent double encoding
-		'quote-nbsp'		=> true,	// XSLT can handle spaces easier
+		'quote-ampersand'	=> false, // Prevent double encoding
+		'quote-nbsp'		=> true, // XSLT can handle spaces easier
 		'preserve-entities'	=> true,
-		'wrap'			=> 0,		// Wrapping can break output
+		'wrap'			=> 0, // Wrapping can break output
 	);
 
 	/**
@@ -120,7 +120,7 @@ 
 		$this->contacts = new Api\Contacts();
 
 		$this->datetime_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.
-			($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']==12 ? 'h:i a' : 'H:i');
+			($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 
 		$this->export_limit = self::getExportLimit();
 	}
@@ -135,7 +135,7 @@ 
 		$accountsel = new uiaccountsel();
 
 		return '<input type="hidden" value="" name="newsettings[export_limit_excepted]" />'.
-			$accountsel->selection('newsettings[export_limit_excepted]','export_limit_excepted',$config['export_limit_excepted'],'both',4);
+			$accountsel->selection('newsettings[export_limit_excepted]', 'export_limit_excepted', $config['export_limit_excepted'], 'both', 4);
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean array with replacements or false if entry not found
 	 */
-	abstract protected function get_replacements($id,&$content=null);
+	abstract protected function get_replacements($id, &$content = null);
 
 	/**
 	 * Return if merge-print is implemented for given mime-type (and/or extension)
@@ -157,13 +157,13 @@ 
 	 * @param string $mimetype eg. text/plain
 	 * @param string $extension only checked for applications/msword and .rtf
 	 */
-	static public function is_implemented($mimetype,$extension=null)
+	static public function is_implemented($mimetype, $extension = null)
 	{
-		static $zip_available=null;
+		static $zip_available = null;
 		if (is_null($zip_available))
 		{
 			$zip_available = check_load_extension('zip') &&
-				class_exists('ZipArchive');	// some PHP has zip extension, but no ZipArchive (eg. RHEL5!)
+				class_exists('ZipArchive'); // some PHP has zip extension, but no ZipArchive (eg. RHEL5!)
 		}
 		switch ($mimetype)
 		{
@@ -171,27 +171,27 @@ 
 				if (strtolower($extension) != '.rtf') break;
 			case 'application/rtf':
 			case 'text/rtf':
-				return true;	// rtf files
+				return true; // rtf files
 			case 'application/vnd.oasis.opendocument.text':	// oo text
 			case 'application/vnd.oasis.opendocument.spreadsheet':	// oo spreadsheet
 				if (!$zip_available) break;
-				return true;	// open office write xml files
+				return true; // open office write xml files
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms word 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':	// ms excel 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
 				if (!$zip_available) break;
-				return true;	// ms word xml format
+				return true; // ms word xml format
 			case 'application/xml':
-				return true;	// alias for text/xml, eg. ms office 2003 word format
+				return true; // alias for text/xml, eg. ms office 2003 word format
 			case 'message/rfc822':
 				return true; // ToDo: check if you are theoretical able to send mail
 			case 'application/x-yaml':
-				return true;	// yaml file, plain text with marginal syntax support for multiline replacements
+				return true; // yaml file, plain text with marginal syntax support for multiline replacements
 			default:
-				if (substr($mimetype,0,5) == 'text/')
+				if (substr($mimetype, 0, 5) == 'text/')
 				{
-					return true;	// text files
+					return true; // text files
 				}
 				break;
 		}
@@ -209,7 +209,7 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array
 	 */
-	public function contact_replacements($contact,$prefix='',$ignore_acl=false)
+	public function contact_replacements($contact, $prefix = '', $ignore_acl = false)
 	{
 		if (!is_array($contact))
 		{
@@ -218,13 +218,13 @@ 
 		if (!is_array($contact)) return array();
 
 		$replacements = array();
-		foreach(array_keys($this->contacts->contact_fields) as $name)
+		foreach (array_keys($this->contacts->contact_fields) as $name)
 		{
 			$value = $contact[$name];
-			switch($name)
+			switch ($name)
 			{
 				case 'created': case 'modified':
-					if($value) $value = Api\DateTime::to($value);
+					if ($value) $value = Api\DateTime::to($value);
 					break;
 				case 'bday':
 					if ($value)
@@ -241,11 +241,11 @@ 
 						// if cat-tree is displayed, we return a full category path not just the name of the cat
 						$use = $GLOBALS['egw_info']['server']['cat_tab'] == 'Tree' ? 'path' : 'name';
 						$cats = array();
-						foreach(is_array($value) ? $value : explode(',',$value) as $cat_id)
+						foreach (is_array($value) ? $value : explode(',', $value) as $cat_id)
 						{
-							$cats[] = $GLOBALS['egw']->categories->id2name($cat_id,$use);
+							$cats[] = $GLOBALS['egw']->categories->id2name($cat_id, $use);
 						}
-						$value = implode(', ',$cats);
+						$value = implode(', ', $cats);
 					}
 					break;
 				case 'jpegphoto':	// returning a link might make more sense then the binary photo
@@ -253,7 +253,7 @@ 
 					{
 						$value = ($GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
 							($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
-							$GLOBALS['egw']->link('/index.php',$contact['photo']);
+							$GLOBALS['egw']->link('/index.php', $contact['photo']);
 					}
 					break;
 				case 'tel_prefer':
@@ -265,40 +265,39 @@ 
 				case 'account_id':
 					if ($value)
 					{
-						$replacements['$$'.($prefix ? $prefix.'/':'').'account_lid$$'] = $GLOBALS['egw']->accounts->id2name($value);
+						$replacements['$$'.($prefix ? $prefix.'/' : '').'account_lid$$'] = $GLOBALS['egw']->accounts->id2name($value);
 					}
 					break;
 			}
-			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] = $value;
 		}
 		// set custom fields, should probably go to a general method all apps can use
 		// need to load all cfs for $ignore_acl=true
-		foreach($ignore_acl ? Customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
+		foreach ($ignore_acl ? Customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
 		{
 			$name = '#'.$name;
-			$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] =
+			$replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] =
 				// use raw data for yaml, no user-preference specific formatting
-				$this->mimetype == 'application/x-yaml' ? (string)$contact[$name] :
-				Customfields::format($field, (string)$contact[$name]);
+				$this->mimetype == 'application/x-yaml' ? (string)$contact[$name] : Customfields::format($field, (string)$contact[$name]);
 		}
 
 		// Add in extra cat field
 		$cats = array();
-		foreach(is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',',$contact['cat_id']) as $cat_id)
+		foreach (is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',', $contact['cat_id']) as $cat_id)
 		{
-			if(!$cat_id) continue;
-			if($GLOBALS['egw']->categories->id2name($cat_id,'main') != $cat_id)
+			if (!$cat_id) continue;
+			if ($GLOBALS['egw']->categories->id2name($cat_id, 'main') != $cat_id)
 			{
 				$path = explode(' / ', $GLOBALS['egw']->categories->id2name($cat_id, 'path'));
 				unset($path[0]); // Drop main
-				$cats[$GLOBALS['egw']->categories->id2name($cat_id,'main')][] = implode(' / ', $path);
-			} elseif($cat_id) {
+				$cats[$GLOBALS['egw']->categories->id2name($cat_id, 'main')][] = implode(' / ', $path);
+			} elseif ($cat_id) {
 				$cats[$cat_id] = array();
 			}
 		}
-		foreach($cats as $main => $cat) {
-			$replacements['$$'.($prefix ? $prefix.'/':'').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main,'name')
-				. (count($cat) > 0 ? ': ' : '') . implode(', ', $cats[$main]) . "\n";
+		foreach ($cats as $main => $cat) {
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main, 'name')
+				. (count($cat) > 0 ? ': ' : '').implode(', ', $cats[$main])."\n";
 		}
 		return $replacements;
 	}
@@ -317,34 +316,34 @@ 
 	 * 	'link' - URL to the entry
 	 * 	'href' - HREF tag wrapped around the title
 	 */
-	protected function get_links($app, $id, $only_app='', $exclude = array(), $style = 'title')
+	protected function get_links($app, $id, $only_app = '', $exclude = array(), $style = 'title')
 	{
 		$links = Api\Link::get_links($app, $id, $only_app);
 		$link_titles = array();
-		foreach($links as $link_info)
+		foreach ($links as $link_info)
 		{
 			// Using only_app only returns the ID
-			if(!is_array($link_info) && $only_app && $only_app[0] !== '!')
+			if (!is_array($link_info) && $only_app && $only_app[0] !== '!')
 			{
 				$link_info = array(
 					'app'	=> $only_app,
 					'id'	=> $link_info
 				);
 			}
-			if($exclude && in_array($link_info['id'], $exclude)) continue;
+			if ($exclude && in_array($link_info['id'], $exclude)) continue;
 
 			$title = Api\Link::title($link_info['app'], $link_info['id']);
-			if(class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $link_info['app'] != Api\Link::VFS_APPNAME)
+			if (class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $link_info['app'] != Api\Link::VFS_APPNAME)
 			{
 				$title = Stylite\Vfs\Links\StreamWrapper::entry2name($link_info['app'], $link_info['id'], $title);
 			}
-			if($style == 'href' || $style == 'link')
+			if ($style == 'href' || $style == 'link')
 			{
 				$link = Api\Link::view($link_info['app'], $link_info['id'], $link_info);
-				if($link_info['app'] != Api\Link::VFS_APPNAME)
+				if ($link_info['app'] != Api\Link::VFS_APPNAME)
 				{
 					// Set app to false so we always get an external link
-					$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php',$link, false));
+					$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php', $link, false));
 				}
 				else
 				{
@@ -360,7 +359,7 @@ 
 			}
 			$link_titles[] = $title;
 		}
-		return implode("\n",$link_titles);
+		return implode("\n", $link_titles);
 	}
 
 	/**
@@ -377,33 +376,33 @@ 
 	{
 		$array = array();
 		$pattern = '@\$(links_attachments|links|attachments|link)\/?(title|href|link)?\/?([a-z]*)\$@';
-		static $link_cache=null;
+		static $link_cache = null;
 		$matches = null;
-		if(preg_match_all($pattern, $content, $matches))
+		if (preg_match_all($pattern, $content, $matches))
 		{
-			foreach($matches[0] as $i => $placeholder)
+			foreach ($matches[0] as $i => $placeholder)
 			{
 				$placeholder = substr($placeholder, 1, -1);
-				if($link_cache[$id][$placeholder])
+				if ($link_cache[$id][$placeholder])
 				{
 					$array[$placeholder] = $link_cache[$id][$placeholder];
 					continue;
 				}
-				switch($matches[1][$i])
+				switch ($matches[1][$i])
 				{
 					case 'link':
 						// Link to current record
 						$title = Api\Link::title($app, $id);
-						if(class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $app != Api\Link::VFS_APPNAME)
+						if (class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $app != Api\Link::VFS_APPNAME)
 						{
 							$title = Stylite\Vfs\Links\StreamWrapper::entry2name($app, $id, $title);
 						}
 
 						$link = Api\Link::view($app, $id);
-						if($app != Api\Link::VFS_APPNAME)
+						if ($app != Api\Link::VFS_APPNAME)
 						{
 							// Set app to false so we always get an external link
-							$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php',$link, false));
+							$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php', $link, false));
 						}
 						else
 						{
@@ -415,26 +414,26 @@ 
 							$link = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
 								($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : $_SERVER['HTTP_HOST']).$link;
 						}
-						$array[($prefix?$prefix.'/':'').$placeholder] = Api\Html::a_href(Api\Html::htmlspecialchars($title), $link);
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = Api\Html::a_href(Api\Html::htmlspecialchars($title), $link);
 						break;
 					case 'links':
-						$link_app = $matches[3][$i] ? $matches[3][$i] :  '!'.Api\Link::VFS_APPNAME;
-						$array[($prefix?$prefix.'/':'').$placeholder] = $this->get_links($app, $id, $link_app, array(),$matches[2][$i]);
+						$link_app = $matches[3][$i] ? $matches[3][$i] : '!'.Api\Link::VFS_APPNAME;
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = $this->get_links($app, $id, $link_app, array(), $matches[2][$i]);
 						break;
 					case 'attachments':
-						$array[($prefix?$prefix.'/':'').$placeholder] = $this->get_links($app, $id, Api\Link::VFS_APPNAME,array(),$matches[2][$i]);
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = $this->get_links($app, $id, Api\Link::VFS_APPNAME, array(), $matches[2][$i]);
 						break;
 					default:
-						$array[($prefix?$prefix.'/':'').$placeholder] = $this->get_links($app, $id, $matches[3][$i], array(), $matches[2][$i]);
+						$array[($prefix ? $prefix.'/' : '').$placeholder] = $this->get_links($app, $id, $matches[3][$i], array(), $matches[2][$i]);
 						break;
 				}
 				$link_cache[$id][$placeholder] = $array[$placeholder];
 			}
 		}
 		// Need to set each app, to make sure placeholders are removed
-		foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
+		foreach (array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
 		{
-			$array[($prefix?$prefix.'/':'')."links/$app"] = $this->get_links($app,$id,$_app);
+			$array[($prefix ? $prefix.'/' : '')."links/$app"] = $this->get_links($app, $id, $_app);
 		}
 		return $array;
 	}
@@ -447,12 +446,12 @@ 
 	 * @deprecated use Api\DateTime::to($time='now',$format='')
 	 * @return string
 	 */
-	protected function format_datetime($time,$format=null)
+	protected function format_datetime($time, $format = null)
 	{
-		trigger_error(__METHOD__ . ' is deprecated, use Api\DateTime::to($time, $format)', E_USER_DEPRECATED);
+		trigger_error(__METHOD__.' is deprecated, use Api\DateTime::to($time, $format)', E_USER_DEPRECATED);
 		if (is_null($format)) $format = $this->datetime_format;
 
-		return Api\DateTime::to($time,$format);
+		return Api\DateTime::to($time, $format);
 	}
 
 	/**
@@ -464,7 +463,7 @@ 
 	 */
 	public static function is_export_limit_excepted()
 	{
-		static $is_excepted=null;
+		static $is_excepted = null;
 
 		if (is_null($is_excepted))
 		{
@@ -474,9 +473,9 @@ 
 			if (!$is_excepted && (is_array($export_limit_excepted = $GLOBALS['egw_info']['server']['export_limit_excepted']) ||
 				is_array($export_limit_excepted = unserialize($export_limit_excepted))))
 			{
-				$id_and_memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				$id_and_memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				$id_and_memberships[] = $GLOBALS['egw_info']['user']['account_id'];
-				$is_excepted = (bool) array_intersect($id_and_memberships, $export_limit_excepted);
+				$is_excepted = (bool)array_intersect($id_and_memberships, $export_limit_excepted);
 			}
 		}
 		return $is_excepted;
@@ -489,18 +488,18 @@ 
 	 * @return mixed - no if no export is allowed, false if there is no restriction and int as there is a valid restriction
 	 *		you may have to cast the returned value to int, if you want to use it as number
 	 */
-	public static function getExportLimit($app='common')
+	public static function getExportLimit($app = 'common')
 	{
-		static $exportLimitStore=array();
-		if (empty($app)) $app='common';
+		static $exportLimitStore = array();
+		if (empty($app)) $app = 'common';
 		//error_log(__METHOD__.__LINE__.' called with app:'.$app);
-		if (!array_key_exists($app,$exportLimitStore))
+		if (!array_key_exists($app, $exportLimitStore))
 		{
 			//error_log(__METHOD__.__LINE__.' -> '.$app_limit.' '.function_backtrace());
 			$exportLimitStore[$app] = $GLOBALS['egw_info']['server']['export_limit'];
-			if ($app !='common')
+			if ($app != 'common')
 			{
-				$app_limit = Api\Hooks::single('export_limit',$app);
+				$app_limit = Api\Hooks::single('export_limit', $app);
 				if ($app_limit) $exportLimitStore[$app] = $app_limit;
 			}
 			//error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]);
@@ -532,9 +531,9 @@ 
 	 *
 	 * @return bool - true if no export is allowed or a limit is set, false if there is no restriction
 	 */
-	public static function hasExportLimit($app_limit,$checkas='AND')
+	public static function hasExportLimit($app_limit, $checkas = 'AND')
 	{
-		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
+		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit != 'no' && $app_limit > 0));
 		if (empty($app_limit)) return false;
 		if ($app_limit == 'no') return true;
 		if ($app_limit > 0) return true;
@@ -550,28 +549,28 @@ 
 	 * @param array $fix =null regular expression => replacement pairs eg. to fix garbled placeholders
 	 * @return string|boolean merged document or false on error
 	 */
-	public function &merge($document,$ids,&$err,$mimetype,array $fix=null)
+	public function &merge($document, $ids, &$err, $mimetype, array $fix = null)
 	{
 		if (!($content = file_get_contents($document)))
 		{
-			$err = lang("Document '%1' does not exist or is not readable for you!",$document);
+			$err = lang("Document '%1' does not exist or is not readable for you!", $document);
 			return false;
 		}
 
 		if (self::hasExportLimit($this->export_limit) && !self::is_export_limit_excepted() && count($ids) > (int)$this->export_limit)
 		{
-			$err = lang('No rights to export more than %1 entries!',(int)$this->export_limit);
+			$err = lang('No rights to export more than %1 entries!', (int)$this->export_limit);
 			return false;
 		}
 
 		// fix application/msword mimetype for rtf files
-		if ($mimetype == 'application/msword' && strtolower(substr($document,-4)) == '.rtf')
+		if ($mimetype == 'application/msword' && strtolower(substr($document, -4)) == '.rtf')
 		{
 			$mimetype = 'application/rtf';
 		}
 
 		try {
-			$content = $this->merge_string($content,$ids,$err,$mimetype,$fix);
+			$content = $this->merge_string($content, $ids, $err, $mimetype, $fix);
 		} catch (\Exception $e) {
 			$err = $e->getMessage();
 			return false;
@@ -579,18 +578,18 @@ 
 		return $content;
 	}
 
-	protected function apply_styles (&$content, $mimetype, $mso_application_progid=null)
+	protected function apply_styles(&$content, $mimetype, $mso_application_progid = null)
 	{
 		if (!isset($mso_application_progid))
 		{
 			$matches = null;
 			$mso_application_progid = $mimetype == 'application/xml' &&
-				preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/',substr($content,0,200),$matches) ?
+				preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/', substr($content, 0, 200), $matches) ?
 					$matches[1] : '';
 		}
 		// Tags we can replace with the target document's version
 		$replace_tags = array();
-		switch($mimetype.$mso_application_progid)
+		switch ($mimetype.$mso_application_progid)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -600,7 +599,7 @@ 
 					'/<\/(ol|ul|table)>/' => '</$1><text:p>',
 					//'/<(li)(.*?)>(.*?)<\/\1>/' => '<$1 $2>$3</$1>',
 				);
-				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content);
+				$content = preg_replace(array_keys($replace_tags), array_values($replace_tags), $content);
 
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();
@@ -625,7 +624,7 @@ 
 					// Remove spans with no attributes, linebreaks inside them cause problems
 					'/<span>(.*?)<\/span>/' => '$1'
 				);
-				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content);
+				$content = preg_replace(array_keys($replace_tags), array_values($replace_tags), $content);
 
 				/*
 				In the case where you have something like <span><span></w:t><w:br/><w:t></span></span> (invalid - mismatched tags),
@@ -635,9 +634,9 @@ 
 				$count = $i = 0;
 				do
 				{
-					$content = preg_replace('/<span>(.*?)<\/span>/','$1',$content, -1, $count);
+					$content = preg_replace('/<span>(.*?)<\/span>/', '$1', $content, -1, $count);
 					$i++;
-				} while($count > 0 && $i < 10);
+				} while ($count > 0 && $i < 10);
 
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();
@@ -648,20 +647,20 @@ 
 		}
 
 		// XSLT transform known tags
-		if($xslt)
+		if ($xslt)
 		{
 			// does NOT work with php 5.2.6: Catchable fatal error: argument 1 to transformToXml() must be of type DOMDocument
 			//$element = new SimpleXMLelement($content);
 			$element = new DOMDocument('1.0', 'utf-8');
 			$result = $element->loadXML($content);
-			if(!$result)
+			if (!$result)
 			{
 				throw new Api\Exception('Unable to parse merged document for styles.  Check warnings in log for details.');
 			}
 			$content = $xslt->transformToXml($element);
 
 			// Word 2003 needs two declarations, add extra declaration back in
-			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
+			if ($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
 				$content = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'.$content;
 			}
 			// Validate
@@ -684,11 +683,11 @@ 
 	 * @param string $charset =null charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
-	public function &merge_string($_content,$ids,&$err,$mimetype,array $fix=null,$charset=null)
+	public function &merge_string($_content, $ids, &$err, $mimetype, array $fix = null, $charset = null)
 	{
 		$matches = null;
 		if ($mimetype == 'application/xml' &&
-			preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/',substr($_content,0,200),$matches))
+			preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/', substr($_content, 0, 200), $matches))
 		{
 			$mso_application_progid = $matches[1];
 		}
@@ -698,12 +697,12 @@ 
 		}
 		// alternative syntax using double curly brackets (eg. {{cat_id}} instead $$cat_id$$),
 		// agressivly removing all xml-tags eg. Word adds within placeholders
-		$content = preg_replace_callback('/{{[^}]+}}/i',create_function('$p','return \'$$\'.strip_tags(substr($p[0],2,-2)).\'$$\';'),$_content);
+		$content = preg_replace_callback('/{{[^}]+}}/i', create_function('$p', 'return \'$$\'.strip_tags(substr($p[0],2,-2)).\'$$\';'), $_content);
 
 		// Handle escaped placeholder markers in RTF, they won't match when escaped
-		if($mimetype == 'application/rtf')
+		if ($mimetype == 'application/rtf')
 		{
-			$content = preg_replace('/\\\{\\\{([^\\}]+)\\\}\\\}/i','$$\1$$',$content);
+			$content = preg_replace('/\\\{\\\{([^\\}]+)\\\}\\\}/i', '$$\1$$', $content);
 		}
 
 		// make currently processed mimetype available to class methods;
@@ -712,16 +711,16 @@ 
 		// fix garbled placeholders
 		if ($fix && is_array($fix))
 		{
-			$content = preg_replace(array_keys($fix),array_values($fix),$content);
+			$content = preg_replace(array_keys($fix), array_values($fix), $content);
 			//die("<pre>".htmlspecialchars($content)."</pre>\n");
 		}
-		list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
+		list($contentstart, $contentrepeat, $contentend) = preg_split('/\$\$pagerepeat\$\$/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
 		if ($mimetype == 'text/plain' && count($ids) > 1)
 		{
 			// textdocuments are simple, they do not hold start and end, but they may have content before and after the $$pagerepeat$$ tag
 			// header and footer should not hold any $$ tags; if we find $$ tags with the header, we assume it is the pagerepeatcontent
 			$nohead = false;
-			if (stripos($contentstart,'$$') !== false) $nohead = true;
+			if (stripos($contentstart, '$$') !== false) $nohead = true;
 			if ($nohead)
 			{
 				$contentend = $contentrepeat;
@@ -732,14 +731,14 @@ 
 		}
 		if ($mimetype == 'application/vnd.oasis.opendocument.text' && count($ids) > 1)
 		{
-			if(strpos($content, '$$pagerepeat') === false)
+			if (strpos($content, '$$pagerepeat') === false)
 			{
 				//for odt files we have to split the content and add a style for page break to  the style area
-				list($contentstart,$contentrepeat,$contentend) = preg_split('/office:body>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
-				$contentstart = substr($contentstart,0,strlen($contentstart)-1);  //remove "<"
-				$contentrepeat = substr($contentrepeat,0,strlen($contentrepeat)-2);  //remove "</";
+				list($contentstart, $contentrepeat, $contentend) = preg_split('/office:body>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
+				$contentstart = substr($contentstart, 0, strlen($contentstart) - 1); //remove "<"
+				$contentrepeat = substr($contentrepeat, 0, strlen($contentrepeat) - 2); //remove "</";
 				// need to add page-break style to the style list
-				list($stylestart,$stylerepeat,$styleend) = preg_split('/<\/office:automatic-styles>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document style sheets
+				list($stylestart, $stylerepeat, $styleend) = preg_split('/<\/office:automatic-styles>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document style sheets
 				$contentstart = $stylestart.'<style:style style:name="P200" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:break-before="page"/></style:style></office:automatic-styles>';
 				$contentstart .= '<office:body>';
 				$contentend = '</office:body></office:document-content>';
@@ -747,22 +746,22 @@ 
 			else
 			{
 				// Template specifies where to repeat
-				list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get different parts of document, seperated by pagerepeat
+				list($contentstart, $contentrepeat, $contentend) = preg_split('/\$\$pagerepeat\$\$/', $content, -1, PREG_SPLIT_NO_EMPTY); //get different parts of document, seperated by pagerepeat
 			}
 		}
 		if ($mimetype == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' && count($ids) > 1)
 		{
 			//for Word 2007 XML files we have to split the content and add a style for page break to  the style area
-			list($contentstart,$contentrepeat,$contentend) = preg_split('/w:body>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
-			$contentstart = substr($contentstart,0,strlen($contentstart)-1);  //remove "</"
-			$contentrepeat = substr($contentrepeat,0,strlen($contentrepeat)-2);  //remove "</";
+			list($contentstart, $contentrepeat, $contentend) = preg_split('/w:body>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
+			$contentstart = substr($contentstart, 0, strlen($contentstart) - 1); //remove "</"
+			$contentrepeat = substr($contentrepeat, 0, strlen($contentrepeat) - 2); //remove "</";
 			$contentstart .= '<w:body>';
 			$contentend = '</w:body></w:document>';
 		}
-		list($Labelstart,$Labelrepeat,$Labeltend) = preg_split('/\$\$label\$\$/',$contentrepeat,-1, PREG_SPLIT_NO_EMPTY);  //get the Lable content
-		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
+		list($Labelstart, $Labelrepeat, $Labeltend) = preg_split('/\$\$label\$\$/', $contentrepeat, -1, PREG_SPLIT_NO_EMPTY); //get the Lable content
+		preg_match_all('/\$\$labelplacement\$\$/', $contentrepeat, $countlables, PREG_SPLIT_NO_EMPTY);
 		$countlables = count($countlables[0]);
-		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
+		preg_replace('/\$\$labelplacement\$\$/', '', $Labelrepeat, 1);
 		if ($countlables > 1) $lableprint = true;
 		if (count($ids) > 1 && !$contentrepeat)
 		{
@@ -773,10 +772,10 @@ 
 
 		if ($contentrepeat)
 		{
-			$content_stream = fopen('php://temp','r+');
+			$content_stream = fopen('php://temp', 'r+');
 			fwrite($content_stream, $contentstart);
 			$joiner = '';
-			switch($mimetype)
+			switch ($mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
@@ -796,19 +795,19 @@ 
 					$joiner = "\r\n";
 					break;
 				default:
-					$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
+					$err = lang('%1 not implemented for %2!', '$$pagerepeat$$', $mimetype);
 					return false;
 			}
 		}
 		foreach ((array)$ids as $n => $id)
 		{
-			if ($contentrepeat) $content = $contentrepeat;   //content to repeat
+			if ($contentrepeat) $content = $contentrepeat; //content to repeat
 			if ($lableprint) $content = $Labelrepeat;
 
 			// generate replacements; if exeption is thrown, catch it set error message and return false
 			try
 			{
-				if(!($replacements = $this->get_replacements($id,$content)))
+				if (!($replacements = $this->get_replacements($id, $content)))
 				{
 					$err = lang('Entry not found!');
 					return false;
@@ -822,86 +821,86 @@ 
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() $n: $id ".Api\Vfs::hsize(memory_get_usage(true)));
 			// some general replacements: current user, date and time
-			if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
+			if (strpos($content, '$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')))
 			{
-				$replacements += $this->contact_replacements($user,'user');
-				$replacements['$$user/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'account_primary_group'));
+				$replacements += $this->contact_replacements($user, 'user');
+				$replacements['$$user/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'account_primary_group'));
 			}
-			$replacements['$$date$$'] = Api\DateTime::to('now',true);
+			$replacements['$$date$$'] = Api\DateTime::to('now', true);
 			$replacements['$$datetime$$'] = Api\DateTime::to('now');
-			$replacements['$$time$$'] = Api\DateTime::to('now',false);
+			$replacements['$$time$$'] = Api\DateTime::to('now', false);
 
 			// does our extending class registered table-plugins AND document contains table tags
-			if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))
+			if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s', $content, $matches, PREG_SET_ORDER))
 			{
 				// process each table
-				foreach($matches as $match)
+				foreach ($matches as $match)
 				{
-					$plugin   = $match[1];	// plugin name
+					$plugin   = $match[1]; // plugin name
 					$callback = $this->table_plugins[$plugin];
-					$repeat   = $match[2];	// line to repeat
+					$repeat   = $match[2]; // line to repeat
 					$repeats = '';
 					if (isset($callback))
 					{
-						for($n = 0; ($row_replacements = $this->$callback($plugin,$id,$n,$repeat)); ++$n)
+						for ($n = 0; ($row_replacements = $this->$callback($plugin, $id, $n, $repeat)); ++$n)
 						{
 							$_repeat = $this->process_commands($repeat, $row_replacements);
-							$repeats .= $this->replace($_repeat,$row_replacements,$mimetype,$mso_application_progid);
+							$repeats .= $this->replace($_repeat, $row_replacements, $mimetype, $mso_application_progid);
 						}
 					}
-					$content = str_replace($match[0],$repeats,$content);
+					$content = str_replace($match[0], $repeats, $content);
 				}
 			}
-			$content = $this->process_commands($this->replace($content,$replacements,$mimetype,$mso_application_progid,$charset), $replacements);
+			$content = $this->process_commands($this->replace($content, $replacements, $mimetype, $mso_application_progid, $charset), $replacements);
 
 			// remove not existing replacements (eg. from calendar array)
-			if (strpos($content,'$$') !== null)
+			if (strpos($content, '$$') !== null)
 			{
-				$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content);
+				$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i', '', $content);
 			}
 			if ($contentrepeat)
 			{
-				fwrite($content_stream, ($n == 0 ? '' : $joiner) . $content);
+				fwrite($content_stream, ($n == 0 ? '' : $joiner).$content);
 			}
-			if($lableprint)
+			if ($lableprint)
 			{
-				$contentrep[is_array($id) ? implode(':',$id) : $id] = $content;
+				$contentrep[is_array($id) ? implode(':', $id) : $id] = $content;
 			}
 		}
 		if ($Labelrepeat)
 		{
-			$countpage=0;
-			$count=0;
+			$countpage = 0;
+			$count = 0;
 			$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 
 			foreach ($contentrep as $Label)
 			{
-				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
-				$count=$count+1;
-				if (($count % $countlables) == 0 && count($contentrep)>$count)  //new page
+				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/', $Label, $contentrepeatpages[$countpage], 1);
+				$count = $count + 1;
+				if (($count % $countlables) == 0 && count($contentrep) > $count)  //new page
 				{
-					$countpage = $countpage+1;
+					$countpage = $countpage + 1;
 					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 				}
 			}
-			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/','',$contentrepeatpages[$countpage],-1);  //clean empty fields
+			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/', '', $contentrepeatpages[$countpage], -1); //clean empty fields
 
-			switch($mimetype)
+			switch ($mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
-					return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
+					return $contentstart.implode('\\par \\page\\pard\\plain', $contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.text':
-					return $contentstart.implode('<text:line-break />',$contentrepeatpages).$contentend;
+					return $contentstart.implode('<text:line-break />', $contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.spreadsheet':
-					return $contentstart.implode('</text:p><text:p>',$contentrepeatpages).$contentend;
+					return $contentstart.implode('</text:p><text:p>', $contentrepeatpages).$contentend;
 				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-					return $contentstart.implode('<w:br w:type="page" />',$contentrepeatpages).$contentend;
+					return $contentstart.implode('<w:br w:type="page" />', $contentrepeatpages).$contentend;
 				case 'text/plain':
-					return $contentstart.implode("\r\n",$contentrep).$contentend;
+					return $contentstart.implode("\r\n", $contentrep).$contentend;
 			}
-			$err = lang('%1 not implemented for %2!','$$labelplacement$$',$mimetype);
+			$err = lang('%1 not implemented for %2!', '$$labelplacement$$', $mimetype);
 			return false;
 		}
 
@@ -926,9 +925,9 @@ 
 	 * @param string $charset =null charset to override default set by mimetype or export charset
 	 * @return string
 	 */
-	protected function replace($content,array $replacements,$mimetype,$mso_application_progid='',$charset=null)
+	protected function replace($content, array $replacements, $mimetype, $mso_application_progid = '', $charset = null)
 	{
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -937,13 +936,13 @@ 
 			case 'application/xml':
 			case 'text/xml':
 				$is_xml = true;
-				$charset = 'utf-8';	// xml files --> always use utf-8
+				$charset = 'utf-8'; // xml files --> always use utf-8
 				break;
 
 			case 'text/html':
 				$is_xml = true;
 				$matches = null;
-				if (preg_match('/<meta http-equiv="content-type".*charset=([^;"]+)/i',$content,$matches))
+				if (preg_match('/<meta http-equiv="content-type".*charset=([^;"]+)/i', $content, $matches))
 				{
 					$charset = $matches[1];
 				}
@@ -962,18 +961,18 @@ 
 		// do we need to convert charset
 		if ($charset && $charset != Api\Translation::charset())
 		{
-			$replacements = Api\Translation::convert($replacements,Api\Translation::charset(),$charset);
+			$replacements = Api\Translation::convert($replacements, Api\Translation::charset(), $charset);
 		}
 
 		// Date only placeholders for timestamps
-		if(is_array($this->date_fields))
+		if (is_array($this->date_fields))
 		{
-			foreach($this->date_fields as $field)
+			foreach ($this->date_fields as $field)
 			{
-				if(($value = $replacements['$$'.$field.'$$']))
+				if (($value = $replacements['$$'.$field.'$$']))
 				{
 					$time = Api\DateTime::createFromFormat('+'.Api\DateTime::$user_dateformat.' '.Api\DateTime::$user_timeformat.'*', $value);
-					$replacements['$$'.$field.'/date$$'] = $time ? $time->format(Api\DateTime::$user_dateformat)  : '';
+					$replacements['$$'.$field.'/date$$'] = $time ? $time->format(Api\DateTime::$user_dateformat) : '';
 				}
 			}
 		}
@@ -987,66 +986,66 @@ 
 			// only keep tags, if we have xsl extension available
 			if (class_exists(XSLTProcessor) && class_exists(DOMDocument) && $this->parse_html_styles)
 			{
-				switch($mimetype.$mso_application_progid)
+				switch ($mimetype.$mso_application_progid)
 				{
 					case 'text/html':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>','<a>','<style>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>', '<a>', '<style>',
 						);
 						break;
 					case 'application/vnd.oasis.opendocument.text':		// open office
 					case 'application/vnd.oasis.opendocument.spreadsheet':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>','<a>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>', '<a>',
 						);
 						break;
 					case 'application/xmlWord.Document':	// Word 2003*/
 					case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms office 2007
 					case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>',
 						);
 						break;
 				}
 			}
 			// clean replacements from array values and html or html-entities, which mess up xml
-			foreach($replacements as $name => &$value)
+			foreach ($replacements as $name => &$value)
 			{
 				// set unresolved array values to empty string
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$value = '';
 					continue;
 				}
 				// decode html entities back to utf-8
 
-				if (is_string($value) && (strpos($value,'&') !== false) && $this->parse_html_styles)
+				if (is_string($value) && (strpos($value, '&') !== false) && $this->parse_html_styles)
 				{
-					$value = html_entity_decode($value,ENT_QUOTES,$charset);
+					$value = html_entity_decode($value, ENT_QUOTES, $charset);
 
 					// remove all non-decodable entities
-					if (strpos($value,'&') !== false)
+					if (strpos($value, '&') !== false)
 					{
-						$value = preg_replace('/&[^; ]+;/','',$value);
+						$value = preg_replace('/&[^; ]+;/', '', $value);
 					}
 				}
 
-				if(!$this->parse_html_styles)
+				if (!$this->parse_html_styles)
 				{
 					// Encode special chars so they don't break the file
-					$value = htmlspecialchars($value,ENT_NOQUOTES);
+					$value = htmlspecialchars($value, ENT_NOQUOTES);
 				}
-				else if (is_string($value) && (strpos($value,'<') !== false))
+				else if (is_string($value) && (strpos($value, '<') !== false))
 				{
 					// Clean HTML, if it's being kept
-					if($replace_tags && extension_loaded('tidy')) {
+					if ($replace_tags && extension_loaded('tidy')) {
 						$tidy = new tidy();
 						$cleaned = $tidy->repairString($value, self::$tidy_config);
 						// Found errors. Strip it all so there's some output
-						if($tidy->getStatus() == 2)
+						if ($tidy->getStatus() == 2)
 						{
 							error_log($tidy->errorBuffer);
 							$value = strip_tags($value);
@@ -1057,52 +1056,52 @@ 
 						}
 					}
 					// replace </p> and <br /> with CRLF (remove <p> and CRLF)
-					$value = strip_tags(str_replace(array("\r","\n",'<p>','</p>','<div>','</div>','<br />'),
-						array('','','',"\r\n",'',"\r\n","\r\n"), $value),
+					$value = strip_tags(str_replace(array("\r", "\n", '<p>', '</p>', '<div>', '</div>', '<br />'),
+						array('', '', '', "\r\n", '', "\r\n", "\r\n"), $value),
 						implode('', $replace_tags));
 
 					// Change <tag>...\r\n</tag> to <tag>...</tag>\r\n or simplistic line break below will mangle it
 					// Loop to catch things like <b><span>Break:\r\n</span></b>
-					if($mso_application_progid)
+					if ($mso_application_progid)
 					{
 						$count = $i = 0;
 						do
 						{
-							$value = preg_replace('/<(b|strong|i|em|u|span)\b([^>]*?)>(.*?)'."\r\n".'<\/\1>/u', '<$1$2>$3</$1>'."\r\n",$value,-1,$count);
+							$value = preg_replace('/<(b|strong|i|em|u|span)\b([^>]*?)>(.*?)'."\r\n".'<\/\1>/u', '<$1$2>$3</$1>'."\r\n", $value, -1, $count);
 							$i++;
-						} while($count > 0 && $i < 10); // Limit of 10 chosen arbitrarily just in case
+						} while ($count > 0 && $i < 10); // Limit of 10 chosen arbitrarily just in case
 					}
 				}
 				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
 				// as they are not allowed in xml
-				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u',' ',$value);
-				if(is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
+				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u', ' ', $value);
+				if (is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
 				{
-					$names[] = preg_quote($name,'/');
+					$names[] = preg_quote($name, '/');
 				}
 			}
 
 			// Look for numbers, set their value if needed
-			if($this->numeric_fields || count($names))
+			if ($this->numeric_fields || count($names))
 			{
-				foreach((array)$this->numeric_fields as $fieldname) {
-					$names[] = preg_quote($fieldname,'/');
+				foreach ((array)$this->numeric_fields as $fieldname) {
+					$names[] = preg_quote($fieldname, '/');
 				}
 				$this->format_spreadsheet_numbers($content, $names, $mimetype.$mso_application_progid);
 			}
 
 			// Look for dates, set their value if needed
-			if($this->date_fields || count($names))
+			if ($this->date_fields || count($names))
 			{
 				$names = array();
-				foreach((array)$this->date_fields as $fieldname) {
+				foreach ((array)$this->date_fields as $fieldname) {
 					$names[] = $fieldname;
 				}
 				$this->format_spreadsheet_dates($content, $names, $replacements, $mimetype.$mso_application_progid);
 			}
 
 			// replace CRLF with linebreak tag of given type
-			switch($mimetype.$mso_application_progid)
+			switch ($mimetype.$mso_application_progid)
 			{
 				case 'application/vnd.oasis.opendocument.text':		// open office writer
 					$break = '<text:line-break/>';
@@ -1129,14 +1128,14 @@ 
 			}
 			// now decode &, < and >, which need to be encoded as entities in xml
 			// Check for encoded >< getting double-encoded
-			if($this->parse_html_styles)
+			if ($this->parse_html_styles)
 			{
-				$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);
+				$replacements = str_replace(array('&', "\r", "\n", '&amp;lt;', '&amp;gt;'), array('&amp;', '', $break, '&lt;', '&gt;'), $replacements);
 			}
 			else
 			{
 				// Need to at least handle new lines, or it'll be run together on one line
-				$replacements = str_replace(array("\r","\n"),array('',$break),$replacements);
+				$replacements = str_replace(array("\r", "\n"), array('', $break), $replacements);
 			}
 		}
 		if ($mimetype == 'application/x-yaml')
@@ -1147,24 +1146,24 @@ 
 				$parts = null;
 				if (preg_match('|^\$\$([^/]+)/([^/]+)/([^$]*)\$\$$|', $matches[3], $parts) && isset($replacements['$$'.$parts[1].'$$']))
 				{
-					$replacement =& $replacements['$$'.$parts[1].'$$'];
+					$replacement = & $replacements['$$'.$parts[1].'$$'];
 					$replacement = preg_replace('/'.$parts[2].'/', strtr($parts[3], array(
 						'\\n' => "\n", '\\r' => "\r", '\\t' => "\t", '\\v' => "\v", '\\\\' => '\\', '\\f' => "\f",
 					)), $replacement);
 				}
 				else
 				{
-					$replacement =& $replacements[$matches[3]];
+					$replacement = & $replacements[$matches[3]];
 				}
 				// replacement with multiple lines --> add same number of space as before placeholder
 				if (isset($replacement))
 				{
 					return $matches[1].$matches[2].implode("\n".$matches[1], preg_split("/\r?\n/", $replacement));
 				}
-				return $matches[0];	// regular replacement below
+				return $matches[0]; // regular replacement below
 			}, $content);
 		}
-		return str_replace(array_keys($replacements),array_values($replacements),$content);
+		return str_replace(array_keys($replacements), array_values($replacements), $content);
 	}
 
 	/**
@@ -1172,36 +1171,36 @@ 
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
-		foreach((array)$this->numeric_fields as $fieldname) {
-			$names[] = preg_quote($fieldname,'/');
+		foreach ((array)$this->numeric_fields as $fieldname) {
+			$names[] = preg_quote($fieldname, '/');
 		}
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)(?:calcext:value-type="[^"]+")?>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)(?:calcext:value-type="[^"]+")?>.?<([a-z].*?)[^>]*>('.implode('|', $names).')<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2 calcext:value-type="float"><$3>$4</$3></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// tables in open office writer
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|', $names).')<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2><text:p text:style-name="Standard">$4</text:p></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// open office writer
 			case 'application/xmlExcel.Sheet':	// Excel 2003
-				$format = '/'.preg_quote('<Data ss:Type="String">','/').'('.implode('|',$names).')'.preg_quote('</Data>','/').'/';
+				$format = '/'.preg_quote('<Data ss:Type="String">', '/').'('.implode('|', $names).')'.preg_quote('</Data>', '/').'/';
 				$replacement = '<Data ss:Type="Number">$1</Data>';
 
 				break;
 		}
-		if($format && $names)
+		if ($format && $names)
 		{
 			// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
 			do {
 				$result = preg_replace($format, $replacement, $content, -1);
 			}
 			// try to increase/double pcre.backtrack_limit failure
-			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
+			while (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result) $content = $result; // On failure $result would be NULL
 		}
 	}
 
@@ -1212,7 +1211,7 @@ 
 	 */
 	protected static function increase_backtrack_limit()
 	{
-		static $backtrack_limit=null,$memory_limit=null;
+		static $backtrack_limit = null, $memory_limit = null;
 		if (!isset($backtrack_limit))
 		{
 			$backtrack_limit = ini_get('pcre.backtrack_limit');
@@ -1220,16 +1219,16 @@ 
 		if (!isset($memory_limit))
 		{
 			$memory_limit = ini_get('memory_limit');
-			switch(strtoupper(substr($memory_limit, -1)))
+			switch (strtoupper(substr($memory_limit, -1)))
 			{
 				case 'G': $memory_limit *= 1024;
 				case 'M': $memory_limit *= 1024;
 				case 'K': $memory_limit *= 1024;
 			}
 		}
-		if ($backtrack_limit < $memory_limit/8)
+		if ($backtrack_limit < $memory_limit / 8)
 		{
-			ini_set( 'pcre.backtrack_limit', $backtrack_limit*=2);
+			ini_set('pcre.backtrack_limit', $backtrack_limit *= 2);
 			return true;
 		}
 		error_log("pcre.backtrack_limit exceeded @ $backtrack_limit, some cells left as text.");
@@ -1241,32 +1240,32 @@ 
 	 */
 	protected function format_spreadsheet_dates(&$content, $names, &$values, $mimetype)
 	{
-		if(!in_array($mimetype, array(
-			'application/vnd.oasis.opendocument.spreadsheet',		// open office calc
-			'application/xmlExcel.Sheet',					// Excel 2003
+		if (!in_array($mimetype, array(
+			'application/vnd.oasis.opendocument.spreadsheet', // open office calc
+			'application/xmlExcel.Sheet', // Excel 2003
 			//'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'//Excel WTF
 		))) return;
 
 		// Some different formats dates could be in, depending what they've been through
 		$formats = array(
-			'!'.Api\DateTime::$user_dateformat . ' ' .Api\DateTime::$user_timeformat.':s',
-			'!'.Api\DateTime::$user_dateformat . '*' .Api\DateTime::$user_timeformat.':s',
-			'!'.Api\DateTime::$user_dateformat . '* ' .Api\DateTime::$user_timeformat,
-			'!'.Api\DateTime::$user_dateformat . '*',
+			'!'.Api\DateTime::$user_dateformat.' '.Api\DateTime::$user_timeformat.':s',
+			'!'.Api\DateTime::$user_dateformat.'*'.Api\DateTime::$user_timeformat.':s',
+			'!'.Api\DateTime::$user_dateformat.'* '.Api\DateTime::$user_timeformat,
+			'!'.Api\DateTime::$user_dateformat.'*',
 			'!'.Api\DateTime::$user_dateformat,
 		);
 
 		// Properly format values for spreadsheet
-		foreach($names as $idx => &$field)
+		foreach ($names as $idx => &$field)
 		{
 			$key = '$$'.$field.'$$';
 			$field = preg_quote($field, '/');
-			if($values[$key])
+			if ($values[$key])
 			{
-				if(!is_numeric($values[$key]))
+				if (!is_numeric($values[$key]))
 				{
 					// Try the different formats, stop when one works
-					foreach($formats as $f)
+					foreach ($formats as $f)
 					{
 						try {
 							$date = Api\DateTime::createFromFormat(
@@ -1274,12 +1273,12 @@ 
 								$values[$key],
 								Api\DateTime::$user_timezone
 							);
-							if($date) break;
+							if ($date) break;
 						} catch (Exception $e) {
 
 						}
 					}
-					if(!$date)
+					if (!$date)
 					{
 						// Couldn't get a date out of it... skip it
 						trigger_error("Unable to parse date $key = '{$values[$key]}' - left as text", E_USER_NOTICE);
@@ -1291,16 +1290,16 @@ 
 				{
 					$date = new Api\DateTime($values[$key]);
 				}
-				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')//Excel WTF
+				if ($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')//Excel WTF
 				{
 					$interval = $date->diff(new Api\DateTime('1900-01-00 0:00'));
-					$values[$key] = $interval->format('%a')+1;// 1900-02-29 did not exist
+					$values[$key] = $interval->format('%a') + 1; // 1900-02-29 did not exist
 					// 1440 minutes in a day - fractional part
-					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440;
+					$values[$key] += ($date->format('H') * 60 + $date->format('i')) / 1440;
 				}
 				else
 				{
-					$values[$key] = date('Y-m-d\TH:i:s',Api\DateTime::to($date,'ts'));
+					$values[$key] = date('Y-m-d\TH:i:s', Api\DateTime::to($date, 'ts'));
 				}
 			}
 			else
@@ -1309,33 +1308,33 @@ 
 			}
 		}
 
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 				// Removing these forces calc to respect our set value-type
-				$content = str_ireplace('calcext:value-type="string"','',$content);
+				$content = str_ireplace('calcext:value-type="string"', '', $content);
 
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>\$\$('.implode('|',$names).')\$\$<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>\$\$('.implode('|', $names).')\$\$<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="date" office:date-value="\$\$$4\$\$"$2><$3>\$\$$4\$\$</$3></table:table-cell>';
 				break;
 			case 'application/xmlExcel.Sheet':	// Excel 2003
-				$format = '/'.preg_quote('<Data ss:Type="String">','/').'..('.implode('|',$names).')..'.preg_quote('</Data>','/').'/';
+				$format = '/'.preg_quote('<Data ss:Type="String">', '/').'..('.implode('|', $names).')..'.preg_quote('</Data>', '/').'/';
 				$replacement = '<Data ss:Type="DateTime">\$\$$1\$\$</Data>';
 
 				break;
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
 				break;
 		}
-		if($format && $names)
+		if ($format && $names)
 		{
 			// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
 			do {
 				$result = preg_replace($format, $replacement, $content, -1);
 			}
 			// try to increase/double pcre.backtrack_limit failure
-			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
+			while (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result) $content = $result; // On failure $result would be NULL
 		}
 	}
 
@@ -1345,9 +1344,9 @@ 
 	 */
 	public function cf_link_to_expand($values, $content, &$replacements, $app = null)
 	{
-		if($app == null)
+		if ($app == null)
 		{
-			$app = str_replace('_merge','',get_class($this));
+			$app = str_replace('_merge', '', get_class($this));
 		}
 		$cfs = Api\Storage\Customfields::get($app);
 
@@ -1358,13 +1357,13 @@ 
 		// Placeholders that need expanded will look like {{#name/placeholder}}
 		$matches = null;
 		preg_match_all('/\${2}(([^\/#]*?\/)?)#([^$\/]+)\/(.*?)[$}]{2}/', $content, $matches);
-		list($placeholders, , , $cf, $sub) = $matches;
+		list($placeholders,,, $cf, $sub) = $matches;
 
-		foreach($cf as $index => $field)
+		foreach ($cf as $index => $field)
 		{
-			if($cfs[$field])
+			if ($cfs[$field])
 			{
-				if(in_array($cfs[$field]['type'],array_keys($GLOBALS['egw_info']['apps'])))
+				if (in_array($cfs[$field]['type'], array_keys($GLOBALS['egw_info']['apps'])))
 				{
 					$field_app = $cfs[$field]['type'];
 				}
@@ -1375,7 +1374,7 @@ 
 					$account = $GLOBALS['egw']->accounts->read($values['#'.$field]);
 					$app_replacements[$field] = $this->contact_replacements($account['person_id']);
 				}
-				else if (($list = explode('-',$cfs[$field]['type']) && in_array($list[0], array_keys($GLOBALS['egw_info']['apps']))))
+				else if (($list = explode('-', $cfs[$field]['type']) && in_array($list[0], array_keys($GLOBALS['egw_info']['apps']))))
 				{
 					// Sub-type - use app
 					$field_app = $list[0];
@@ -1386,7 +1385,7 @@ 
 				}
 
 				// Get replacements for that application
-				if(!$app_replacements[$field])
+				if (!$app_replacements[$field])
 				{
 					$classname = "{$field_app}_merge";
 					$class = new $classname();
@@ -1414,33 +1413,33 @@ 
 	 */
 	private function process_commands($content, $replacements)
 	{
-		if (strpos($content,'$$IF') !== false)
+		if (strpos($content, '$$IF') !== false)
 		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$NELF') !== false)
+		if (strpos($content, '$$NELF') !== false)
 		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$NENVLF') !== false)
+		if (strpos($content, '$$NENVLF') !== false)
 		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$LETTERPREFIX$$') !== false)
+		if (strpos($content, '$$LETTERPREFIX$$') !== false)
 		{	//Example use to use: $$LETTERPREFIX$$
 			$LETTERPREFIXCUSTOM = '$$LETTERPREFIXCUSTOM n_prefix title n_family$$';
-			$content = str_replace('$$LETTERPREFIX$$',$LETTERPREFIXCUSTOM,$content);
+			$content = str_replace('$$LETTERPREFIX$$', $LETTERPREFIXCUSTOM, $content);
 		}
-		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
+		if (strpos($content, '$$LETTERPREFIXCUSTOM') !== false)
 		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
 		return $content;
@@ -1454,16 +1453,16 @@ 
 	 */
 	private function replace_callback($param)
 	{
-		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
-		if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
+		if (array_key_exists('$$'.$param[4].'$$', $this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
+		if (array_key_exists('$$'.$param[3].'$$', $this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
 
 		$pattern = '/'.preg_quote($param[2], '/').'/';
-		if (strpos($param[0],'$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
+		if (strpos($param[0], '$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
 		{
 			$pattern = '/^$/';
 		}
-		$replace = preg_match($pattern,$this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
-		switch($this->mimetype)
+		$replace = preg_match($pattern, $this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
+		switch ($this->mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -1476,14 +1475,14 @@ 
 				break;
 		}
 
-		switch($this->mimetype)
+		switch ($this->mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
 					$LF = '}\par \pard\plain{';
 					break;
 				case 'application/vnd.oasis.opendocument.text':
-					$LF ='<text:line-break/>';
+					$LF = '<text:line-break/>';
 					break;
 				case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 					$LF = '</text:p><text:p>';
@@ -1493,35 +1492,35 @@ 
 					break;
 				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-					$LF ='</w:t></w:r></w:p><w:p><w:r><w:t>';
+					$LF = '</w:t></w:r></w:p><w:p><w:r><w:t>';
 					break;
 				case 'application/xml';
-					$LF ='</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';
+					$LF = '</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';
 					break;
 				default:
 					$LF = "\n";
 			}
-		if($is_xml) {
-			$this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
+		if ($is_xml) {
+			$this->replacements = str_replace(array('&', '&amp;amp;', '<', '>', "\r", "\n"), array('&amp;', '&amp;', '&lt;', '&gt;', '', $LF), $this->replacements);
 		}
-		if (strpos($param[0],'$$NELF') === 0)
+		if (strpos($param[0], '$$NELF') === 0)
 		{	//sets a Pagebreak and value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+			if ($this->replacements['$$'.$param[1].'$$'] != '') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
 		}
-		if (strpos($param[0],'$$NENVLF') === 0)
+		if (strpos($param[0], '$$NENVLF') === 0)
 		{	//sets a Pagebreak without any value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF;
+			if ($this->replacements['$$'.$param[1].'$$'] != '') $replace = $LF;
 		}
-		if (strpos($param[0],'$$LETTERPREFIXCUSTOM') === 0)
+		if (strpos($param[0], '$$LETTERPREFIXCUSTOM') === 0)
 		{	//sets a Letterprefix
 			$replaceprefixsort = array();
 			// ToDo Stefan: $contentstart is NOT defined here!!!
-			$replaceprefix = explode(' ',substr($param[0],21,-2));
+			$replaceprefix = explode(' ', substr($param[0], 21, -2));
 			foreach ($replaceprefix as $nameprefix)
 			{
-				if ($this->replacements['$$'.$nameprefix.'$$'] !='') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				if ($this->replacements['$$'.$nameprefix.'$$'] != '') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
 			}
-			$replace = implode($replaceprefixsort,' ');
+			$replace = implode($replaceprefixsort, ' ');
 		}
 		return $replace;
 	}
@@ -1535,7 +1534,7 @@ 
 	 * @param string $dirs comma or whitespace separated directories, used if $document is a relative path
 	 * @return string with error-message on error, otherwise it does NOT return
 	 */
-	public function download($document, $ids, $name='', $dirs='')
+	public function download($document, $ids, $name = '', $dirs = '')
 	{
 		//error_log(__METHOD__."('$document', ".array2string($ids).", '$name', dirs='$dirs') ->".function_backtrace());
 		if (($error = $this->check_document($document, $dirs)))
@@ -1551,7 +1550,7 @@ 
 				$mail_bo->openConnection();
 				try
 				{
-					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder='');
+					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder = '');
 				}
 				catch (Api\Exception\WrongUserinput $e)
 				{
@@ -1560,39 +1559,39 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.' Message after importMessageToMergeAndSend:'.array2string($msgs));
 				$retString = '';
-				if (count($msgs['success'])>0) $retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));//implode('<br />',$msgs['success']);
+				if (count($msgs['success']) > 0) $retString .= count($msgs['success']).' '.(count($msgs['success']) + count($msgs['failed']) == 1 ? lang('Message prepared for sending.') : lang('Message(s) send ok.')); //implode('<br />',$msgs['success']);
 				//if (strlen($retString)>0) $retString .= '<br />';
-				foreach($msgs['failed'] as $c =>$e)
+				foreach ($msgs['failed'] as $c =>$e)
 				{
 					$errorString .= lang('contact').' '.lang('id').':'.$c.'->'.$e.'.';
 				}
-				if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				if (count($msgs['failed']) > 0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
 				return $retString;
 			case 'application/vnd.oasis.opendocument.text':
 			case 'application/vnd.oasis.opendocument.spreadsheet':
 				$ext = $mimetype == 'application/vnd.oasis.opendocument.text' ? '.odt' : '.ods';
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,$ext).'-').$ext;
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, $ext).'-').$ext;
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'content.xml');
 				$this->parse_html_styles = true;
 				break;
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
 				$mimetype = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.docx').'-').'.docx';
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.docx').'-').'.docx';
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'word/document.xml');
 				$fix = array(		// regular expression to fix garbled placeholders
-					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$$\\1$$',
-					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="','/').
-						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="','/').
-						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$','/').'/i' => '$$\\2$$',
-					'/'.preg_quote('$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$\\1$',
-					'/'.preg_quote('$ $</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$ $\\1$ $',
+					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$$\\1$$',
+					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="', '/').
+						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="', '/').
+						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$', '/').'/i' => '$$\\2$$',
+					'/'.preg_quote('$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$\\1$',
+					'/'.preg_quote('$ $</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$ $\\1$ $',
 				);
 				break;
 			case 'application/xml':
@@ -1606,13 +1605,13 @@ 
 				$fix = array(	// hack to get Excel 2007 to display additional rows in tables
 					'/ss:ExpandedRowCount="\d+"/' => 'ss:ExpandedRowCount="9999"',
 				);
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.xlsx').'-').'.xlsx';
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.xlsx').'-').'.xlsx';
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'xl/sharedStrings.xml');
 				break;
 		}
 		$err = null;
-		if (!($merged =& $this->merge($content_url,$ids,$err,$mimetype,$fix)))
+		if (!($merged = & $this->merge($content_url, $ids, $err, $mimetype, $fix)))
 		{
 			//error_log(__METHOD__."() !this->merge() err=$err");
 			return $err;
@@ -1629,22 +1628,22 @@ 
 			{
 				// Error converting HTML styles over
 				error_log($e->getMessage());
-				error_log("Target document: $content_url, IDs: ". array2string($ids));
+				error_log("Target document: $content_url, IDs: ".array2string($ids));
 
 				// Try again, but strip HTML so user gets something
 				$this->parse_html_styles = false;
-				if (!($merged =& $this->merge($content_url,$ids,$err,$mimetype,$fix)))
+				if (!($merged = & $this->merge($content_url, $ids, $err, $mimetype, $fix)))
 				{
 					return $err;
 				}
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() after HTML processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
 		}
-		if(!empty($name))
+		if (!empty($name))
 		{
-			if(empty($ext))
+			if (empty($ext))
 			{
-				$ext = '.'.pathinfo($document,PATHINFO_EXTENSION);
+				$ext = '.'.pathinfo($document, PATHINFO_EXTENSION);
 			}
 			$name .= $ext;
 		}
@@ -1660,30 +1659,30 @@ 
 				error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE"."::CHECKCONS) failed. Trying open without validating");
 				if ($zip->open($archive) !== true) throw new Api\Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
 			}
-			if ($zip->addFromString($content_file,$merged) !== true) throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
+			if ($zip->addFromString($content_file, $merged) !== true) throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
 			if ($zip->close() !== true) throw new Api\Exception("!ZipArchive::close()");
 			unset($zip);
 			unset($merged);
-			if (substr($mimetype,0,35) == 'application/vnd.oasis.opendocument.' && 			// only open office archives need that, ms word files brake
-				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION,'5.3.1','<'))	// fix broken zip archives generated by current php
+			if (substr($mimetype, 0, 35) == 'application/vnd.oasis.opendocument.' && // only open office archives need that, ms word files brake
+				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION, '5.3.1', '<'))	// fix broken zip archives generated by current php
 			{
 				exec('/usr/bin/zip -F '.escapeshellarg($archive));
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
-			Api\Header\Content::type($name,$mimetype,filesize($archive));
-			readfile($archive,'r');
+			Api\Header\Content::type($name, $mimetype, filesize($archive));
+			readfile($archive, 'r');
 		}
 		else
 		{
 			if ($mimetype == 'application/xml')
 			{
-				if (strpos($merged,'<?mso-application progid="Word.Document"?>') !== false)
+				if (strpos($merged, '<?mso-application progid="Word.Document"?>') !== false)
 				{
-					$mimetype = 'application/msword';	// to open it automatically in word or oowriter
+					$mimetype = 'application/msword'; // to open it automatically in word or oowriter
 				}
-				elseif (strpos($merged,'<?mso-application progid="Excel.Sheet"?>') !== false)
+				elseif (strpos($merged, '<?mso-application progid="Excel.Sheet"?>') !== false)
 				{
-					$mimetype = 'application/vnd.ms-excel';	// to open it automatically in excel or oocalc
+					$mimetype = 'application/vnd.ms-excel'; // to open it automatically in excel or oocalc
 				}
 			}
 			Api\Header\Content::type($name, $mimetype);
@@ -1704,13 +1703,13 @@ 
 	 */
 	public function download_by_request()
 	{
-		if(empty($_POST['data_document_name'])) return false;
-		if(empty($_POST['data_document_dir'])) return false;
-		if(empty($_POST['data_checked'])) return false;
+		if (empty($_POST['data_document_name'])) return false;
+		if (empty($_POST['data_document_dir'])) return false;
+		if (empty($_POST['data_checked'])) return false;
 
 		return $this->download(
 			$_POST['data_document_name'],
-			explode(',',$_POST['data_checked']),
+			explode(',', $_POST['data_checked']),
 			'',
 			$_POST['data_document_dir']
 		);
@@ -1724,18 +1723,18 @@ 
 	 * @param array|string $mime_filter=null allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
 	 * @return array List of documents, suitable for a selectbox.  The key is document_<filename>.
 	 */
-	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
+	public static function get_documents($dirs, $prefix = 'document_', $mime_filter = null, $app = '')
 	{
-		$export_limit=self::getExportLimit($app);
-		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted())) return array();
+		$export_limit = self::getExportLimit($app);
+		if (!$dirs || (!self::hasExportLimit($export_limit, 'ISALLOWED') && !self::is_export_limit_excepted())) return array();
 
 		// split multiple comma or whitespace separated directories
 		// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 		if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 		{
-			foreach($dirs as $n => &$d)
+			foreach ($dirs as $n => &$d)
 			{
-				if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+				if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
 			}
 		}
 		if ($mime_filter && ($negativ_filter = $mime_filter[0] === '!'))
@@ -1750,15 +1749,15 @@ 
 			}
 		}
 		$list = array();
-		foreach($dirs as $dir)
+		foreach ($dirs as $dir)
 		{
-			if (($files = Api\Vfs::find($dir,array('need_mime'=>true),true)))
+			if (($files = Api\Vfs::find($dir, array('need_mime'=>true), true)))
 			{
-				foreach($files as $file)
+				foreach ($files as $file)
 				{
 					// return only the mime-types we support
-					$parts = explode('.',$file['name']);
-					if (!self::is_implemented($file['mime'],'.'.array_pop($parts))) continue;
+					$parts = explode('.', $file['name']);
+					if (!self::is_implemented($file['mime'], '.'.array_pop($parts))) continue;
 					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter)) continue;
 					$list[$prefix.$file['name']] = Api\Vfs::decodePath($file['name']);
 				}
@@ -1785,14 +1784,14 @@ 
 	 * @param int|string $export_limit =null export-limit, default $GLOBALS['egw_info']['server']['export_limit']
 	 * @return array see nextmatch_widget::egw_actions
 	 */
-	public static function document_action($dirs, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='',
-		$export_limit=null)
+	public static function document_action($dirs, $group = 0, $caption = 'Insert in document', $prefix = 'document_', $default_doc = '',
+		$export_limit = null)
 	{
 		$documents = array();
 		if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
 		if ($default_doc && ($file = Api\Vfs::stat($default_doc)))	// put default document on top
 		{
-			if(!$file['mime'])
+			if (!$file['mime'])
 			{
 				$file['mime'] = Api\Vfs::mime_content_type($default_doc);
 				$file['path'] = $default_doc;
@@ -1801,7 +1800,7 @@ 
 				'icon' => Api\Vfs::mime_icon($file['mime']),
 				'caption' => Api\Vfs::decodePath(Api\Vfs::basename($default_doc)),
 				'group' => 1,
-				'postSubmit' => true,	// download needs post submit (not Ajax) to work
+				'postSubmit' => true, // download needs post submit (not Ajax) to work
 			);
 			if ($file['mime'] == 'message/rfc822')
 			{
@@ -1816,28 +1815,28 @@ 
 			// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 			if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 			{
-				foreach($dirs as $n => &$d)
+				foreach ($dirs as $n => &$d)
 				{
-					if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+					if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
 				}
 			}
-			foreach($dirs as $dir)
+			foreach ($dirs as $dir)
 			{
-				$files += Api\Vfs::find($dir,array(
+				$files += Api\Vfs::find($dir, array(
 					'need_mime' => true,
 					'order' => 'fs_name',
 					'sort' => 'ASC',
-				),true);
+				), true);
 			}
 		}
 
 		$dircount = array();
-		foreach($files as $key => $file)
+		foreach ($files as $key => $file)
 		{
 			// use only the mime-types we support
-			$parts = explode('.',$file['name']);
-			if (!self::is_implemented($file['mime'],'.'.array_pop($parts)) ||
-				!Api\Vfs::check_access($file['path'], Api\Vfs::READABLE, $file) ||	// remove files not readable by user
+			$parts = explode('.', $file['name']);
+			if (!self::is_implemented($file['mime'], '.'.array_pop($parts)) ||
+				!Api\Vfs::check_access($file['path'], Api\Vfs::READABLE, $file) || // remove files not readable by user
 				$file['path'] === $default_doc)	// default doc already added
 			{
 				unset($files[$key]);
@@ -1845,40 +1844,40 @@ 
 			else
 			{
 				$dirname = Api\Vfs::dirname($file['path']);
-				if(!isset($dircount[$dirname]))
+				if (!isset($dircount[$dirname]))
 				{
 					$dircount[$dirname] = 1;
 				}
 				else
 				{
-					$dircount[$dirname] ++;
+					$dircount[$dirname]++;
 				}
 			}
 		}
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if (count($dircount) > 1)
 			{
 				$name_arr = explode('/', $file['name']);
 				$current_level = &$documents;
-				for($count = 0; $count < count($name_arr); $count++)
+				for ($count = 0; $count < count($name_arr); $count++)
 				{
-					if($count == 0)
+					if ($count == 0)
 					{
 						$current_level = &$documents;
 					}
 					else
 					{
-						$current_level = &$current_level[$prefix.$name_arr[($count-1)]]['children'];
+						$current_level = &$current_level[$prefix.$name_arr[($count - 1)]]['children'];
 					}
-					switch($count)
+					switch ($count)
 					{
-						case (count($name_arr)-1):
+						case (count($name_arr) - 1):
 							$current_level[$prefix.$file['name']] = array(
 								'icon'		=> Api\Vfs::mime_icon($file['mime']),
 								'caption'	=> Api\Vfs::decodePath($name_arr[$count]),
 								'group'		=> 2,
-								'postSubmit' => true,	// download needs post submit (not Ajax) to work
+								'postSubmit' => true, // download needs post submit (not Ajax) to work
 							);
 							if ($file['mime'] == 'message/rfc822')
 							{
@@ -1887,7 +1886,7 @@ 
 							break;
 
 						default:
-							if(!is_array($current_level[$prefix.$name_arr[$count]]))
+							if (!is_array($current_level[$prefix.$name_arr[$count]]))
 							{
 								// create parent folder
 								$current_level[$prefix.$name_arr[$count]] = array(
@@ -1914,7 +1913,7 @@ 
 				}
 				$documents[$file['mime']]['children'][$prefix.$file['name']] = array(
 					'caption' => Api\Vfs::decodePath($file['name']),
-					'postSubmit' => true,	// download needs post submit (not Ajax) to work
+					'postSubmit' => true, // download needs post submit (not Ajax) to work
 				);
 				if ($file['mime'] == 'message/rfc822')
 				{
@@ -1927,7 +1926,7 @@ 
 					'icon' => Api\Vfs::mime_icon($file['mime']),
 					'caption' => Api\Vfs::decodePath($file['name']),
 					'group' => 2,
-					'postSubmit' => true,	// download needs post submit (not Ajax) to work
+					'postSubmit' => true, // download needs post submit (not Ajax) to work
 				);
 				if ($file['mime'] == 'message/rfc822')
 				{
@@ -1941,8 +1940,8 @@ 
 			'caption' => $caption,
 			'children' => $documents,
 			// disable action if no document or export completly forbidden for non-admins
-			'enabled' => (boolean)$documents && (self::hasExportLimit($export_limit,'ISALLOWED') || self::is_export_limit_excepted()),
-			'hideOnDisabled' => true,	// do not show 'Insert in document', if no documents defined or no export allowed
+			'enabled' => (boolean)$documents && (self::hasExportLimit($export_limit, 'ISALLOWED') || self::is_export_limit_excepted()),
+			'hideOnDisabled' => true, // do not show 'Insert in document', if no documents defined or no export allowed
 			'group' => $group,
 		);
 	}
@@ -1973,14 +1972,14 @@ 
 		);
 
 		// egw.open() used if only 1 row selected
-		$action['egw_open'] = 'edit-mail--'.implode('&',$extra);
-		$action['target'] = 'compose_' .$file['path'];
+		$action['egw_open'] = 'edit-mail--'.implode('&', $extra);
+		$action['target'] = 'compose_'.$file['path'];
 
 		// long_task runs menuaction once for each selected row
 		$action['nm_action'] = 'long_task';
 		$action['popup'] = Api\Link::get_registry('mail', 'edit_popup');
-		$action['message'] = lang('insert in %1',Api\Vfs::decodePath($file['name']));
-		$action['menuaction'] = 'mail.mail_compose.ajax_merge&document='.$file['path'].'&merge='. get_called_class();
+		$action['message'] = lang('insert in %1', Api\Vfs::decodePath($file['name']));
+		$action['menuaction'] = 'mail.mail_compose.ajax_merge&document='.$file['path'].'&merge='.get_called_class();
 	}
 
 	/**
@@ -1992,15 +1991,15 @@ 
 	 */
 	public static function check_document(&$document, $dirs)
 	{
-		if($document[0] !== '/')
+		if ($document[0] !== '/')
 		{
 			// split multiple comma or whitespace separated directories
 			// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 			if ($dirs && ($dirs = preg_split('/[,\s]+\//', $dirs)))
 			{
-				foreach($dirs as $n => $dir)
+				foreach ($dirs as $n => $dir)
 				{
-					if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+					if ($n) $dir = '/'.$dir; // re-adding trailing slash removed by split
 					if (Api\Vfs::stat($dir.'/'.$document) && Api\Vfs::is_readable($dir.'/'.$document))
 					{
 						$document = $dir.'/'.$document;
@@ -2014,7 +2013,7 @@ 
 			return false;
 		}
 		//error_log(__METHOD__."('$document', dirs='$dirs') returning 'Document '$document' does not exist or is not readable for you!'");
-		return lang("Document '%1' does not exist or is not readable for you!",$document);
+		return lang("Document '%1' does not exist or is not readable for you!", $document);
 	}
 
 	/**
@@ -2035,16 +2034,16 @@ 
 	 * @param string $_mimetype =''
 	 * @return string
 	 */
-	static public function number_format($number,$num_decimal_places=2,$_mimetype='')
+	static public function number_format($number, $num_decimal_places = 2, $_mimetype = '')
 	{
 		if ((string)$number === '') return '';
 		//error_log(__METHOD__.$_mimetype);
-		switch($_mimetype)
+		switch ($_mimetype)
 		{
 			case 'application/xml':	// Excel 2003
 			case 'application/vnd.oasis.opendocument.spreadsheet': // OO.o spreadsheet
-				return number_format(str_replace(' ','',$number),$num_decimal_places,'.','');
+				return number_format(str_replace(' ', '', $number), $num_decimal_places, '.', '');
 		}
-		return Api\Etemplate::number_format($number,$num_decimal_places);
+		return Api\Etemplate::number_format($number, $num_decimal_places);
 	}
 }

Braces +278 added lines, -77 removed lines

@@ -168,19 +168,28 @@ 
 		switch ($mimetype)
 		{
 			case 'application/msword':
-				if (strtolower($extension) != '.rtf') break;
+				if (strtolower($extension) != '.rtf')
+				{
+					break;
+				}
 			case 'application/rtf':
 			case 'text/rtf':
 				return true;	// rtf files
 			case 'application/vnd.oasis.opendocument.text':	// oo text
 			case 'application/vnd.oasis.opendocument.spreadsheet':	// oo spreadsheet
-				if (!$zip_available) break;
+				if (!$zip_available)
+				{
+					break;
+				}
 				return true;	// open office write xml files
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms word 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':	// ms excel 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
-				if (!$zip_available) break;
+				if (!$zip_available)
+				{
+					break;
+				}
 				return true;	// ms word xml format
 			case 'application/xml':
 				return true;	// alias for text/xml, eg. ms office 2003 word format
@@ -215,7 +224,10 @@ 
 		{
 			$contact = $this->contacts->read($contact, $ignore_acl);
 		}
-		if (!is_array($contact)) return array();
+		if (!is_array($contact))
+		{
+			return array();
+		}
 
 		$replacements = array();
 		foreach(array_keys($this->contacts->contact_fields) as $name)
@@ -224,7 +236,10 @@ 
 			switch($name)
 			{
 				case 'created': case 'modified':
-					if($value) $value = Api\DateTime::to($value);
+					if($value)
+					{
+						$value = Api\DateTime::to($value);
+					}
 					break;
 				case 'bday':
 					if ($value)
@@ -269,7 +284,10 @@ 
 					}
 					break;
 			}
-			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			if ($name != 'photo')
+			{
+				$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			}
 		}
 		// set custom fields, should probably go to a general method all apps can use
 		// need to load all cfs for $ignore_acl=true
@@ -286,17 +304,23 @@ 
 		$cats = array();
 		foreach(is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',',$contact['cat_id']) as $cat_id)
 		{
-			if(!$cat_id) continue;
+			if(!$cat_id)
+			{
+				continue;
+			}
 			if($GLOBALS['egw']->categories->id2name($cat_id,'main') != $cat_id)
 			{
 				$path = explode(' / ', $GLOBALS['egw']->categories->id2name($cat_id, 'path'));
 				unset($path[0]); // Drop main
 				$cats[$GLOBALS['egw']->categories->id2name($cat_id,'main')][] = implode(' / ', $path);
-			} elseif($cat_id) {
+			}
+			elseif($cat_id)
+			{
 				$cats[$cat_id] = array();
 			}
 		}
-		foreach($cats as $main => $cat) {
+		foreach($cats as $main => $cat)
+		{
 			$replacements['$$'.($prefix ? $prefix.'/':'').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main,'name')
 				. (count($cat) > 0 ? ': ' : '') . implode(', ', $cats[$main]) . "\n";
 		}
@@ -331,7 +355,10 @@ 
 					'id'	=> $link_info
 				);
 			}
-			if($exclude && in_array($link_info['id'], $exclude)) continue;
+			if($exclude && in_array($link_info['id'], $exclude))
+			{
+				continue;
+			}
 
 			$title = Api\Link::title($link_info['app'], $link_info['id']);
 			if(class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $link_info['app'] != Api\Link::VFS_APPNAME)
@@ -450,7 +477,10 @@ 
 	protected function format_datetime($time,$format=null)
 	{
 		trigger_error(__METHOD__ . ' is deprecated, use Api\DateTime::to($time, $format)', E_USER_DEPRECATED);
-		if (is_null($format)) $format = $this->datetime_format;
+		if (is_null($format))
+		{
+			$format = $this->datetime_format;
+		}
 
 		return Api\DateTime::to($time,$format);
 	}
@@ -492,7 +522,10 @@ 
 	public static function getExportLimit($app='common')
 	{
 		static $exportLimitStore=array();
-		if (empty($app)) $app='common';
+		if (empty($app))
+		{
+			$app='common';
+		}
 		//error_log(__METHOD__.__LINE__.' called with app:'.$app);
 		if (!array_key_exists($app,$exportLimitStore))
 		{
@@ -501,7 +534,10 @@ 
 			if ($app !='common')
 			{
 				$app_limit = Api\Hooks::single('export_limit',$app);
-				if ($app_limit) $exportLimitStore[$app] = $app_limit;
+				if ($app_limit)
+				{
+					$exportLimitStore[$app] = $app_limit;
+				}
 			}
 			//error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]);
 			if (empty($exportLimitStore[$app]))
@@ -534,10 +570,22 @@ 
 	 */
 	public static function hasExportLimit($app_limit,$checkas='AND')
 	{
-		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
-		if (empty($app_limit)) return false;
-		if ($app_limit == 'no') return true;
-		if ($app_limit > 0) return true;
+		if (strtoupper($checkas) == 'ISALLOWED')
+		{
+			return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
+		}
+		if (empty($app_limit))
+		{
+			return false;
+		}
+		if ($app_limit == 'no')
+		{
+			return true;
+		}
+		if ($app_limit > 0)
+		{
+			return true;
+		}
 	}
 
 	/**
@@ -572,7 +620,8 @@ 
 
 		try {
 			$content = $this->merge_string($content,$ids,$err,$mimetype,$fix);
-		} catch (\Exception $e) {
+		}
+		catch (\Exception $e) {
 			$err = $e->getMessage();
 			return false;
 		}
@@ -661,7 +710,8 @@ 
 			$content = $xslt->transformToXml($element);
 
 			// Word 2003 needs two declarations, add extra declaration back in
-			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
+			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0)
+			{
 				$content = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'.$content;
 			}
 			// Validate
@@ -721,7 +771,10 @@ 
 			// textdocuments are simple, they do not hold start and end, but they may have content before and after the $$pagerepeat$$ tag
 			// header and footer should not hold any $$ tags; if we find $$ tags with the header, we assume it is the pagerepeatcontent
 			$nohead = false;
-			if (stripos($contentstart,'$$') !== false) $nohead = true;
+			if (stripos($contentstart,'$$') !== false)
+			{
+				$nohead = true;
+			}
 			if ($nohead)
 			{
 				$contentend = $contentrepeat;
@@ -763,13 +816,19 @@ 
 		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
 		$countlables = count($countlables[0]);
 		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
-		if ($countlables > 1) $lableprint = true;
+		if ($countlables > 1)
+		{
+			$lableprint = true;
+		}
 		if (count($ids) > 1 && !$contentrepeat)
 		{
 			$err = lang('for more than one contact in a document use the tag pagerepeat!');
 			return false;
 		}
-		if ($this->report_memory_usage) error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
+		if ($this->report_memory_usage)
+		{
+			error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
+		}
 
 		if ($contentrepeat)
 		{
@@ -802,8 +861,15 @@ 
 		}
 		foreach ((array)$ids as $n => $id)
 		{
-			if ($contentrepeat) $content = $contentrepeat;   //content to repeat
-			if ($lableprint) $content = $Labelrepeat;
+			if ($contentrepeat)
+			{
+				$content = $contentrepeat;
+			}
+			//content to repeat
+			if ($lableprint)
+			{
+				$content = $Labelrepeat;
+			}
 
 			// generate replacements; if exeption is thrown, catch it set error message and return false
 			try
@@ -820,7 +886,10 @@ 
 				$err = $e->getMessage();
 				return false;
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() $n: $id ".Api\Vfs::hsize(memory_get_usage(true)));
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() $n: $id ".Api\Vfs::hsize(memory_get_usage(true)));
+			}
 			// some general replacements: current user, date and time
 			if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
 			{
@@ -878,9 +947,12 @@ 
 			{
 				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
 				$count=$count+1;
-				if (($count % $countlables) == 0 && count($contentrep)>$count)  //new page
+				if (($count % $countlables) == 0 && count($contentrep)>$count)
+				{
+					//new page
 				{
 					$countpage = $countpage+1;
+				}
 					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 				}
 			}
@@ -911,7 +983,10 @@ 
 			rewind($content_stream);
 			return stream_get_contents($content_stream);
 		}
-		if ($this->report_memory_usage) error_log(__METHOD__."() returning ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+		if ($this->report_memory_usage)
+		{
+			error_log(__METHOD__."() returning ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+		}
 
 		return $content;
 	}
@@ -954,7 +1029,10 @@ 
 				break;
 
 			default:	// div. text files --> use our export-charset, defined in addressbook prefs
-				if (empty($charset)) $charset = $this->contacts->prefs['csv_charset'];
+				if (empty($charset))
+				{
+					$charset = $this->contacts->prefs['csv_charset'];
+				}
 				break;
 		}
 		//error_log(__METHOD__."('$document', ... ,$mimetype) --> $charset (egw=".Api\Translation::charset().', export='.$this->contacts->prefs['csv_charset'].')');
@@ -977,10 +1055,13 @@ 
 				}
 			}
 		}
-		if ($is_xml)	// zip'ed xml document (eg. OO)
+		if ($is_xml)
+		{
+			// zip'ed xml document (eg. OO)
 		{
 			// Numeric fields
 			$names = array();
+		}
 
 			// Tags we can replace with the target document's version
 			$replace_tags = array();
@@ -1042,7 +1123,8 @@ 
 				else if (is_string($value) && (strpos($value,'<') !== false))
 				{
 					// Clean HTML, if it's being kept
-					if($replace_tags && extension_loaded('tidy')) {
+					if($replace_tags && extension_loaded('tidy'))
+					{
 						$tidy = new tidy();
 						$cleaned = $tidy->repairString($value, self::$tidy_config);
 						// Found errors. Strip it all so there's some output
@@ -1076,16 +1158,20 @@ 
 				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
 				// as they are not allowed in xml
 				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u',' ',$value);
-				if(is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
+				if(is_numeric($value) && $name != '$$user/account_id$$')
+				{
+					// account_id causes problems with the preg_replace below
 				{
 					$names[] = preg_quote($name,'/');
 				}
+				}
 			}
 
 			// Look for numbers, set their value if needed
 			if($this->numeric_fields || count($names))
 			{
-				foreach((array)$this->numeric_fields as $fieldname) {
+				foreach((array)$this->numeric_fields as $fieldname)
+				{
 					$names[] = preg_quote($fieldname,'/');
 				}
 				$this->format_spreadsheet_numbers($content, $names, $mimetype.$mso_application_progid);
@@ -1095,7 +1181,8 @@ 
 			if($this->date_fields || count($names))
 			{
 				$names = array();
-				foreach((array)$this->date_fields as $fieldname) {
+				foreach((array)$this->date_fields as $fieldname)
+				{
 					$names[] = $fieldname;
 				}
 				$this->format_spreadsheet_dates($content, $names, $replacements, $mimetype.$mso_application_progid);
@@ -1172,7 +1259,8 @@ 
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
-		foreach((array)$this->numeric_fields as $fieldname) {
+		foreach((array)$this->numeric_fields as $fieldname)
+		{
 			$names[] = preg_quote($fieldname,'/');
 		}
 		switch($mimetype)
@@ -1201,7 +1289,11 @@ 
 			// try to increase/double pcre.backtrack_limit failure
 			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result)
+			{
+				$content = $result;
+			}
+			// On failure $result would be NULL
 		}
 	}
 
@@ -1245,7 +1337,10 @@ 
 			'application/vnd.oasis.opendocument.spreadsheet',		// open office calc
 			'application/xmlExcel.Sheet',					// Excel 2003
 			//'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'//Excel WTF
-		))) return;
+		)))
+		{
+			return;
+		}
 
 		// Some different formats dates could be in, depending what they've been through
 		$formats = array(
@@ -1274,8 +1369,12 @@ 
 								$values[$key],
 								Api\DateTime::$user_timezone
 							);
-							if($date) break;
-						} catch (Exception $e) {
+							if($date)
+							{
+								break;
+							}
+						}
+						catch (Exception $e) {
 
 						}
 					}
@@ -1291,9 +1390,12 @@ 
 				{
 					$date = new Api\DateTime($values[$key]);
 				}
-				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')//Excel WTF
+				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+				{
+					//Excel WTF
 				{
 					$interval = $date->diff(new Api\DateTime('1900-01-00 0:00'));
+				}
 					$values[$key] = $interval->format('%a')+1;// 1900-02-29 did not exist
 					// 1440 minutes in a day - fractional part
 					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440;
@@ -1335,7 +1437,11 @@ 
 			// try to increase/double pcre.backtrack_limit failure
 			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result)
+			{
+				$content = $result;
+			}
+			// On failure $result would be NULL
 		}
 	}
 
@@ -1399,7 +1505,10 @@ 
 			}
 			else
 			{
-				if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time') $this->date_fields[] = '#'.$field;
+				if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time')
+				{
+					$this->date_fields[] = '#'.$field;
+				}
 			}
 		}
 	}
@@ -1415,30 +1524,35 @@ 
 	private function process_commands($content, $replacements)
 	{
 		if (strpos($content,'$$IF') !== false)
-		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
+		{
+//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NELF') !== false)
-		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
+		{
+//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NENVLF') !== false)
-		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
+		{
+//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$LETTERPREFIX$$') !== false)
-		{	//Example use to use: $$LETTERPREFIX$$
+		{
+//Example use to use: $$LETTERPREFIX$$
 			$LETTERPREFIXCUSTOM = '$$LETTERPREFIXCUSTOM n_prefix title n_family$$';
 			$content = str_replace('$$LETTERPREFIX$$',$LETTERPREFIXCUSTOM,$content);
 		}
 		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
-		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
+		{
+//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
@@ -1454,8 +1568,14 @@ 
 	 */
 	private function replace_callback($param)
 	{
-		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
-		if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
+		if (array_key_exists('$$'.$param[4].'$$',$this->replacements))
+		{
+			$param[4] = $this->replacements['$$'.$param[4].'$$'];
+		}
+		if (array_key_exists('$$'.$param[3].'$$',$this->replacements))
+		{
+			$param[3] = $this->replacements['$$'.$param[3].'$$'];
+		}
 
 		$pattern = '/'.preg_quote($param[2], '/').'/';
 		if (strpos($param[0],'$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
@@ -1477,7 +1597,7 @@ 
 		}
 
 		switch($this->mimetype)
-			{
+		{
 				case 'application/rtf':
 				case 'text/rtf':
 					$LF = '}\par \pard\plain{';
@@ -1501,25 +1621,38 @@ 
 				default:
 					$LF = "\n";
 			}
-		if($is_xml) {
+		if($is_xml)
+		{
 			$this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
 		}
 		if (strpos($param[0],'$$NELF') === 0)
-		{	//sets a Pagebreak and value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+		{
+//sets a Pagebreak and value, only if the field has a value
+			if ($this->replacements['$$'.$param[1].'$$'] !='')
+			{
+				$replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+			}
 		}
 		if (strpos($param[0],'$$NENVLF') === 0)
-		{	//sets a Pagebreak without any value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF;
+		{
+//sets a Pagebreak without any value, only if the field has a value
+			if ($this->replacements['$$'.$param[1].'$$'] !='')
+			{
+				$replace = $LF;
+			}
 		}
 		if (strpos($param[0],'$$LETTERPREFIXCUSTOM') === 0)
-		{	//sets a Letterprefix
+		{
+//sets a Letterprefix
 			$replaceprefixsort = array();
 			// ToDo Stefan: $contentstart is NOT defined here!!!
 			$replaceprefix = explode(' ',substr($param[0],21,-2));
 			foreach ($replaceprefix as $nameprefix)
 			{
-				if ($this->replacements['$$'.$nameprefix.'$$'] !='') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				if ($this->replacements['$$'.$nameprefix.'$$'] !='')
+				{
+					$replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				}
 			}
 			$replace = implode($replaceprefixsort,' ');
 		}
@@ -1560,13 +1693,20 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.' Message after importMessageToMergeAndSend:'.array2string($msgs));
 				$retString = '';
-				if (count($msgs['success'])>0) $retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));//implode('<br />',$msgs['success']);
+				if (count($msgs['success'])>0)
+				{
+					$retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));
+				}
+				//implode('<br />',$msgs['success']);
 				//if (strlen($retString)>0) $retString .= '<br />';
 				foreach($msgs['failed'] as $c =>$e)
 				{
 					$errorString .= lang('contact').' '.lang('id').':'.$c.'->'.$e.'.';
 				}
-				if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				if (count($msgs['failed'])>0)
+				{
+					$retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				}
 				return $retString;
 			case 'application/vnd.oasis.opendocument.text':
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -1638,7 +1778,10 @@ 
 					return $err;
 				}
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() after HTML processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() after HTML processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			}
 		}
 		if(!empty($name))
 		{
@@ -1658,18 +1801,33 @@ 
 			if ($zip->open($archive, ZipArchive::CHECKCONS) !== true)
 			{
 				error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE"."::CHECKCONS) failed. Trying open without validating");
-				if ($zip->open($archive) !== true) throw new Api\Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
+				if ($zip->open($archive) !== true)
+				{
+					throw new Api\Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
+				}
+			}
+			if ($zip->addFromString($content_file,$merged) !== true)
+			{
+				throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
+			}
+			if ($zip->close() !== true)
+			{
+				throw new Api\Exception("!ZipArchive::close()");
 			}
-			if ($zip->addFromString($content_file,$merged) !== true) throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
-			if ($zip->close() !== true) throw new Api\Exception("!ZipArchive::close()");
 			unset($zip);
 			unset($merged);
 			if (substr($mimetype,0,35) == 'application/vnd.oasis.opendocument.' && 			// only open office archives need that, ms word files brake
-				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION,'5.3.1','<'))	// fix broken zip archives generated by current php
+				file_exists('/usr/bin/zip') && version_compare(PHP_VERSION,'5.3.1','<'))
+			{
+				// fix broken zip archives generated by current php
 			{
 				exec('/usr/bin/zip -F '.escapeshellarg($archive));
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			}
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() after ZIP processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			}
 			Api\Header\Content::type($name,$mimetype,filesize($archive));
 			readfile($archive,'r');
 		}
@@ -1704,9 +1862,18 @@ 
 	 */
 	public function download_by_request()
 	{
-		if(empty($_POST['data_document_name'])) return false;
-		if(empty($_POST['data_document_dir'])) return false;
-		if(empty($_POST['data_checked'])) return false;
+		if(empty($_POST['data_document_name']))
+		{
+			return false;
+		}
+		if(empty($_POST['data_document_dir']))
+		{
+			return false;
+		}
+		if(empty($_POST['data_checked']))
+		{
+			return false;
+		}
 
 		return $this->download(
 			$_POST['data_document_name'],
@@ -1727,7 +1894,10 @@ 
 	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
 	{
 		$export_limit=self::getExportLimit($app);
-		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted())) return array();
+		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted()))
+		{
+			return array();
+		}
 
 		// split multiple comma or whitespace separated directories
 		// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
@@ -1735,7 +1905,11 @@ 
 		{
 			foreach($dirs as $n => &$d)
 			{
-				if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+				if ($n)
+				{
+					$d = '/'.$d;
+				}
+				// re-adding trailing slash removed by split
 			}
 		}
 		if ($mime_filter && ($negativ_filter = $mime_filter[0] === '!'))
@@ -1758,8 +1932,14 @@ 
 				{
 					// return only the mime-types we support
 					$parts = explode('.',$file['name']);
-					if (!self::is_implemented($file['mime'],'.'.array_pop($parts))) continue;
-					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter)) continue;
+					if (!self::is_implemented($file['mime'],'.'.array_pop($parts)))
+					{
+						continue;
+					}
+					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter))
+					{
+						continue;
+					}
 					$list[$prefix.$file['name']] = Api\Vfs::decodePath($file['name']);
 				}
 			}
@@ -1789,12 +1969,19 @@ 
 		$export_limit=null)
 	{
 		$documents = array();
-		if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
-		if ($default_doc && ($file = Api\Vfs::stat($default_doc)))	// put default document on top
+		if ($export_limit == null)
+		{
+			$export_limit = self::getExportLimit();
+		}
+		// check if there is a globalsetting
+		if ($default_doc && ($file = Api\Vfs::stat($default_doc)))
+		{
+			// put default document on top
 		{
 			if(!$file['mime'])
 			{
 				$file['mime'] = Api\Vfs::mime_content_type($default_doc);
+		}
 				$file['path'] = $default_doc;
 			}
 			$documents['document'] = array(
@@ -1818,7 +2005,11 @@ 
 			{
 				foreach($dirs as $n => &$d)
 				{
-					if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+					if ($n)
+					{
+						$d = '/'.$d;
+					}
+					// re-adding trailing slash removed by split
 				}
 			}
 			foreach($dirs as $dir)
@@ -1838,10 +2029,13 @@ 
 			$parts = explode('.',$file['name']);
 			if (!self::is_implemented($file['mime'],'.'.array_pop($parts)) ||
 				!Api\Vfs::check_access($file['path'], Api\Vfs::READABLE, $file) ||	// remove files not readable by user
-				$file['path'] === $default_doc)	// default doc already added
+				$file['path'] === $default_doc)
+			{
+				// default doc already added
 			{
 				unset($files[$key]);
 			}
+			}
 			else
 			{
 				$dirname = Api\Vfs::dirname($file['path']);
@@ -2000,7 +2194,11 @@ 
 			{
 				foreach($dirs as $n => $dir)
 				{
-					if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+					if ($n)
+					{
+						$dir = '/'.$dir;
+					}
+					// re-adding trailing slash removed by split
 					if (Api\Vfs::stat($dir.'/'.$document) && Api\Vfs::is_readable($dir.'/'.$document))
 					{
 						$document = $dir.'/'.$document;
@@ -2037,7 +2235,10 @@ 
 	 */
 	static public function number_format($number,$num_decimal_places=2,$_mimetype='')
 	{
-		if ((string)$number === '') return '';
+		if ((string)$number === '')
+		{
+			return '';
+		}
 		//error_log(__METHOD__.$_mimetype);
 		switch($_mimetype)
 		{

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

@@ -1417,19 +1417,19 @@ 
 		if (strpos($content,'$$IF') !== false)
 		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NELF') !== false)
 		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NENVLF') !== false)
 		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$LETTERPREFIX$$') !== false)
@@ -1440,7 +1440,7 @@ 
 		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
 		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		return $content;
@@ -1958,7 +1958,7 @@ 
 	 * @param Array $file Array of information about the document from Api\Vfs::find
 	 * @return void
 	 */
-	private static function document_mail_action(Array &$action, $file)
+	private static function document_mail_action(array &$action, $file)
 	{
 		unset($action['postSubmit']);
 

api/src/Storage/Tracking.php

Doc Comments +1 added lines, -2 removed lines

@@ -528,7 +528,7 @@ 
 	 * @param array $data current entry
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @param boolean $deleted = null can be set to true to let the tracking know the item got deleted or undelted
-	 * @param array $email_notified=null if present will return the emails notified, if given emails in that list will not be notified
+	 * @param array $email_notified if present will return the emails notified, if given emails in that list will not be notified
 	 * @return boolean true on success, false on error (error messages are in $this->errors)
 	 */
 	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
@@ -824,7 +824,6 @@ 
 	 * The default implementation prefers depending on the prefer_user_as_sender class-var the user over
 	 * what is returned by get_config('sender').
 	 *
-	 * @param int $user account_lid of user
 	 * @param array $data
 	 * @param array $old
 	 * @param bool $prefer_id returns the userid rather than email

Spacing +163 added lines, -163 removed lines

@@ -194,12 +194,12 @@ 
 	{
 		if ($cf_app)
 		{
-			$linkable_cf_types = array('link-entry')+array_keys(Api\Link::app_list());
-			foreach(Customfields::get($cf_app, true) as $cf_name => $cf_data)
+			$linkable_cf_types = array('link-entry') + array_keys(Api\Link::app_list());
+			foreach (Customfields::get($cf_app, true) as $cf_name => $cf_data)
 			{
 				$this->field2history['#'.$cf_name] = '#'.$cf_name;
 
-				if (in_array($cf_data['type'],$linkable_cf_types))
+				if (in_array($cf_data['type'], $linkable_cf_types))
 				{
 					$this->cf_link_fields['#'.$cf_name] = $cf_data['type'] == 'link-entry' ? '' : $cf_data['type'];
 				}
@@ -216,9 +216,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($data, $receiver);	// not uses as just a stub
+		unset($data, $receiver); // not uses as just a stub
 
 		return array();
 	}
@@ -230,14 +230,14 @@ 
 	 * @param string $only_type2 = null if given only return fields of type2 == $only_type2
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_customfields($data, $only_type2=null)
+	function get_customfields($data, $only_type2 = null)
 	{
 		$details = array();
 
-		if (($cfs = Customfields::get($this->app, $all_private_too=false, $only_type2)))
+		if (($cfs = Customfields::get($this->app, $all_private_too = false, $only_type2)))
 		{
 			$header_done = false;
-			foreach($cfs as $name => $field)
+			foreach ($cfs as $name => $field)
 			{
 				if (in_array($field['type'], Customfields::$non_printable_fields)) continue;
 
@@ -278,9 +278,9 @@ 
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	protected function get_config($name,$data,$old=null)
+	protected function get_config($name, $data, $old = null)
 	{
-		unset($name, $data, $old);	// not used as just a stub
+		unset($name, $data, $old); // not used as just a stub
 
 		return null;
 	}
@@ -296,7 +296,7 @@ 
 	 * @param boolean $skip_notification = false do NOT send any notification
 	 * @return int|boolean false on error, integer number of changes logged or true for new entries ($old == null)
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null,$skip_notification=false)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null, $skip_notification = false)
 	{
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
 
@@ -305,7 +305,7 @@ 
 		if ($old && $this->field2history)
 		{
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
-			$changes = $this->save_history($data,$old,$deleted,$changed_fields);
+			$changes = $this->save_history($data, $old, $deleted, $changed_fields);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
 			//error_log(__METHOD__.__LINE__.' Changes:'.print_r($changes,true));
 		}
@@ -313,10 +313,10 @@ 
 		//error_log(__METHOD__.__LINE__.' LinkFields:'.array2string($this->cf_link_fields));
 		if ($changes && $this->cf_link_fields)
 		{
-			$this->update_links($data,(array)$old);
+			$this->update_links($data, (array)$old);
 		}
 		// do not run do_notifications if we have no changes
-		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		if ($changes && !$skip_notification && !$this->do_notifications($data, $old, $deleted))
 		{
 			$changes = false;
 		}
@@ -333,45 +333,45 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($data).function_backtrace());
 		//error_log(__METHOD__.__LINE__.array2string($this->cf_link_fields));
-		foreach(array_keys((array)$this->cf_link_fields) as $name)
+		foreach (array_keys((array)$this->cf_link_fields) as $name)
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id', $data[$name])) $data[$name] = $data[$name]['id'];
+			if (is_array($old[$name]) && array_key_exists('id', $old[$name])) $old[$name] = $old[$name]['id'];
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
-		$current_ids = array_unique(array_diff(array_intersect_key($data,$this->cf_link_fields),array('',0,NULL)));
-		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old,$this->cf_link_fields),array('',0,NULL))) : array();
+		$current_ids = array_unique(array_diff(array_intersect_key($data, $this->cf_link_fields), array('', 0, NULL)));
+		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old, $this->cf_link_fields), array('', 0, NULL))) : array();
 		//error_log(__METHOD__.__LINE__.array2string($current_ids));
 		//error_log(__METHOD__.__LINE__.array2string($old_ids));
 		// create links for added application entry
-		foreach(array_diff($current_ids,$old_ids) as $name => $id)
+		foreach (array_diff($current_ids, $old_ids) as $name => $id)
 		{
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				list($app, $id) = explode(':', $id);
+				if (!$id) continue; // can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) Api\Link::link($this->app,$source_id,$app,$id);
+			if ($source_id) Api\Link::link($this->app, $source_id, $app, $id);
 			//error_log(__METHOD__.__LINE__."Api\Link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>Api\Link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
 
 		// unlink removed application entries
-		foreach(array_diff($old_ids,$current_ids) as $name => $id)
+		foreach (array_diff($old_ids, $current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name])) continue; // ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
+				list($app, $id) = explode(':', $id);
 				if (!$id) continue;
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id) Api\Link::unlink(null, $this->app, $source_id, 0, $app, $id);
 			//echo "<p>Api\Link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -386,14 +386,14 @@ 
 	 * @param array $changed_fields = null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
-		unset($deleted);	// not used, but required by function signature
+		unset($deleted); // not used, but required by function signature
 
 		//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
 		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
@@ -408,30 +408,30 @@ 
 			$this->historylog->add('user_agent_action', $data[$this->id_field],
 				$_SERVER['HTTP_USER_AGENT'], $_SESSION[Api\Session::EGW_SESSION_VAR]['session_action']);
 		}
-		foreach($changed_fields as $name)
+		foreach ($changed_fields as $name)
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
 			if (is_array($status))	// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
-				$added = array_values(array_diff($data[$name],$old[$name]));
-				$removed = array_values(array_diff($old[$name],$data[$name]));
-				$n = max(array(count($added),count($removed)));
-				for($i = 0; $i < $n; ++$i)
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
+				$added = array_values(array_diff($data[$name], $old[$name]));
+				$removed = array_values(array_diff($old[$name], $data[$name]));
+				$n = max(array(count($added), count($removed)));
+				for ($i = 0; $i < $n; ++$i)
 				{
 					//error_log(__METHOD__."() $i: historylog->add('$name',data['$this->id_field']={$data[$this->id_field]},".array2string($added[$i]).','.array2string($removed[$i]));
-					$this->historylog->add($name,$data[$this->id_field],$added[$i],$removed[$i]);
+					$this->historylog->add($name, $data[$this->id_field], $added[$i], $removed[$i]);
 				}
 			}
 			else
 			{
 				//error_log(__METHOD__.__LINE__.' IDField:'.array2string($this->id_field).' ->'.$data[$this->id_field].' New:'.$data[$name].' Old:'.$old[$name]);
-				$this->historylog->add($status,$data[$this->id_field],
-					is_array($data[$name]) ? implode(',',$data[$name]) : $data[$name],
-					is_array($old[$name]) ? implode(',',$old[$name]) : $old[$name]);
+				$this->historylog->add($status, $data[$this->id_field],
+					is_array($data[$name]) ? implode(',', $data[$name]) : $data[$name],
+					is_array($old[$name]) ? implode(',', $old[$name]) : $old[$name]);
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' return:'.count($changed_fields));
@@ -447,28 +447,28 @@ 
 	 * @param array $old = null
 	 * @return array of keys with different values in $data and $old
 	 */
-	public function changed_fields(array $data,array $old=null)
+	public function changed_fields(array $data, array $old = null)
 	{
 		if (is_null($old)) return array_keys($data);
 		$changed_fields = array();
-		foreach($this->field2history as $name => $status)
+		foreach ($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name]) continue; // treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name])) continue; // no set customfields are not stored, therefore not changed
 
 			if (is_array($status))	// 1:N relation
 			{
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
 			}
 			if ($old[$name] != $data[$name])
 			{
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name])) $data[$name] = explode(',', $data[$name]);
+					if (!is_array($old[$name])) $old[$name] = explode(',', $old[$name]);
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
@@ -478,13 +478,13 @@ 
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
 				{
-					continue;	// change only in CR (eg. different OS) --> ignore
+					continue; // change only in CR (eg. different OS) --> ignore
 				}
 				$changed_fields[] = $name;
 				//echo "<p>$name: ".array2string($data[$name]).' != '.array2string($old[$name])."</p>\n";
 			}
 		}
-		foreach($data as $name => $value)
+		foreach ($data as $name => $value)
 		{
 			if ($name[0] == '#' && $name[1] == '#' && $value !== $old[$name])
 			{
@@ -501,18 +501,18 @@ 
 	 * @param array &$rows rows of the 1:N relation
 	 * @param array $cols field names as values
 	 */
-	private static function compact_1_N_relation(&$rows,array $cols)
+	private static function compact_1_N_relation(&$rows, array $cols)
 	{
 		if (is_array($rows))
 		{
-			foreach($rows as &$row)
+			foreach ($rows as &$row)
 			{
 				$values = array();
-				foreach($cols as $col)
+				foreach ($cols as $col)
 				{
 					$values[] = $row[$col];
 				}
-				$row = implode(self::ONE2N_SEPERATOR,$values);
+				$row = implode(self::ONE2N_SEPERATOR, $values);
 			}
 		}
 		else
@@ -531,7 +531,7 @@ 
 	 * @param array $email_notified=null if present will return the emails notified, if given emails in that list will not be notified
 	 * @return boolean true on success, false on error (error messages are in $this->errors)
 	 */
-	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
+	public function do_notifications($data, $old, $deleted = null, &$email_notified = null)
 	{
 		$this->errors = $email_sent = array();
 		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
@@ -539,19 +539,19 @@ 
 		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
-			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
+			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email');
 		}
-		$skip_notify = $this->get_config('skip_notify',$data,$old);
-		if($skip_notify && is_array($skip_notify))
+		$skip_notify = $this->get_config('skip_notify', $data, $old);
+		if ($skip_notify && is_array($skip_notify))
 		{
 			$email_sent = array_merge($email_sent, $skip_notify);
 		}
 
 		// entry creator
-		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field],'account_email')) &&
+		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field], 'account_email')) &&
 			!in_array($email, $email_sent))
 		{
-			if ($this->send_notification($data,$old,$email,$data[$this->creator_field],'notify_creator'))
+			if ($this->send_notification($data, $old, $email, $data[$this->creator_field], 'notify_creator'))
 			{
 				$email_sent[] = $email;
 			}
@@ -560,12 +560,12 @@ 
 		// members of group when entry owned by group
 		if ($this->creator_field && $GLOBALS['egw']->accounts->get_type($data[$this->creator_field]) == 'g')
 		{
-			foreach($GLOBALS['egw']->accounts->members($data[$this->creator_field],true) as $u)
+			foreach ($GLOBALS['egw']->accounts->members($data[$this->creator_field], true) as $u)
 			{
-				if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) &&
+				if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) &&
 					!in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$u,'notify_owner_group_member'))
+					if ($this->send_notification($data, $old, $email, $u, 'notify_owner_group_member'))
 					{
 						$email_sent[] = $email;
 					}
@@ -582,14 +582,14 @@ 
 			if ($data[$this->assigned_field])	// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
-					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
+					$data[$this->assigned_field] : explode(',', $data[$this->assigned_field]);
 			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
-					$old[$this->assigned_field] : explode(',',$old[$this->assigned_field]);
+					$old[$this->assigned_field] : explode(',', $old[$this->assigned_field]);
 			}
-			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
+			foreach (array_unique(array_merge($assignees, $old_assignees)) as $assignee)
 			{
 				//error_log(__METHOD__."() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
 				if (!$assignee) continue;
@@ -597,10 +597,10 @@ 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
 				{
-					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
+					if (($email = $GLOBALS['egw']->accounts->id2name($assignee, 'account_email')) && !in_array($email, $email_sent))
 					{
-						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+						if ($this->send_notification($data, $old, $email, $assignee, 'notify_assigned',
+							in_array($assignee, $assignees) !== in_array($assignee, $old_assignees) || $deleted))	// assignment changed
 						{
 							$email_sent[] = $email;
 						}
@@ -608,12 +608,12 @@ 
 				}
 				else	// item assignee is a group
 				{
-					foreach($GLOBALS['egw']->accounts->members($assignee,true) as $u)
+					foreach ($GLOBALS['egw']->accounts->members($assignee, true) as $u)
 					{
-						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
+						if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) && !in_array($email, $email_sent))
 						{
-							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+							if ($this->send_notification($data, $old, $email, $u, 'notify_assigned',
+								in_array($u, $assignees) !== in_array($u, $old_assignees) || $deleted))	// assignment changed
 							{
 								$email_sent[] = $email;
 							}
@@ -624,14 +624,14 @@ 
 		}
 
 		// notification copies
-		if (($copies = $this->get_config('copy',$data,$old)))
+		if (($copies = $this->get_config('copy', $data, $old)))
 		{
-			$lang = $this->get_config('lang',$data,$old);
-			foreach($copies as $email)
+			$lang = $this->get_config('lang', $data, $old);
+			foreach ($copies as $email)
 			{
-				if (strchr($email,'@') !== false && !in_array($email, $email_sent))
+				if (strchr($email, '@') !== false && !in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$lang,'notify_copy'))
+					if ($this->send_notification($data, $old, $email, $lang, 'notify_copy'))
 					{
 						$email_sent[] = $email;
 					}
@@ -676,7 +676,7 @@ 
 	 * @param boolean $deleted = null can be set to true to let the tracking know the item got deleted or undelted
 	 * @return boolean true on success or false if notification not requested or error (error-message is in $this->errors)
 	 */
-	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
+	public function send_notification($data, $old, $email, $user_or_lang, $check = null, $assignment_changed = true, $deleted = null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
 		if (!$email) return false;
@@ -688,16 +688,16 @@ 
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
-			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 			if ($check && $this->check2pref) $check = $this->check2pref[$check];
 
-			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
+			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] || // no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
 				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
 			{
-				$do_notify = false;	// no notification requested / necessary
+				$do_notify = false; // no notification requested / necessary
 			}
 		}
 		else
@@ -720,33 +720,33 @@ 
 
 			// Cache message body to not have to re-generate it every time
 			$lang = Api\Translation::$userlang;
-			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] .
+			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].
 				$GLOBALS['egw_info']['user']['preferences']['common']['timeformat'];
 
 			// Cache text body
-			$body_cache =& $this->body_cache[$data[$this->id_field]][$lang][$date_format];
-			if(empty($data[$this->id_field]) || !isset($body_cache['text']))
+			$body_cache = & $this->body_cache[$data[$this->id_field]][$lang][$date_format];
+			if (empty($data[$this->id_field]) || !isset($body_cache['text']))
 			{
-				$body_cache['text'] = $this->get_body(false,$data,$old,false,$receiver);
+				$body_cache['text'] = $this->get_body(false, $data, $old, false, $receiver);
 			}
 			// Cache HTML body
-			if(empty($data[$this->id_field]) || !isset($body_cache['html']))
+			if (empty($data[$this->id_field]) || !isset($body_cache['html']))
 			{
-				$body_cache['html'] = $this->get_body(true,$data,$old,false,$receiver);
+				$body_cache['html'] = $this->get_body(true, $data, $old, false, $receiver);
 			}
 
 			// get rest of notification message
-			$sender = $this->get_sender($data,$old,true,$receiver);
-			$subject = $this->get_subject($data,$old,$deleted,$receiver);
-			$link = $this->get_notification_link($data,$old,$receiver);
-			$attachments = $this->get_attachments($data,$old,$receiver);
+			$sender = $this->get_sender($data, $old, true, $receiver);
+			$subject = $this->get_subject($data, $old, $deleted, $receiver);
+			$link = $this->get_notification_link($data, $old, $receiver);
+			$attachments = $this->get_attachments($data, $old, $receiver);
 		}
 
 		// restore user enviroment BEFORE calling notification class or returning
 		$GLOBALS['egw_info']['user'] = $save_user;
 		// need to call preferences constructor and read_repository, to set user timezone again
 		$GLOBALS['egw']->preferences->__construct($GLOBALS['egw_info']['user']['account_id']);
-		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 		// Re-load date/time preferences
 		Api\DateTime::init();
@@ -801,11 +801,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function datetime($timestamp,$do_time=true)
+	public function datetime($timestamp, $do_time = true)
 	{
-		if (!is_a($timestamp,'DateTime'))
+		if (!is_a($timestamp, 'DateTime'))
 		{
-			$timestamp = new Api\DateTime($timestamp,Api\DateTime::$server_timezone);
+			$timestamp = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
 		}
 		$timestamp->setTimezone(Api\DateTime::$user_timezone);
 		if (is_null($do_time))
@@ -831,25 +831,25 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string or userid
 	 */
-	protected function get_sender($data,$old,$prefer_id=false,$receiver=null)
+	protected function get_sender($data, $old, $prefer_id = false, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		$sender = $this->get_config('sender',$data,$old);
+		$sender = $this->get_config('sender', $data, $old);
 		//echo "<p>".__METHOD__."() get_config('sender',...)='".htmlspecialchars($sender)."'</p>\n";
 
 		if (($this->prefer_user_as_sender || !$sender) && $this->user &&
-			($email = $GLOBALS['egw']->accounts->id2name($this->user,'account_email')))
+			($email = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email')))
 		{
-			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
+			$name = $GLOBALS['egw']->accounts->id2name($this->user, 'account_fullname');
 
-			if($prefer_id) {
+			if ($prefer_id) {
 				$sender = $this->user;
 			} else {
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
-		elseif(!$sender)
+		elseif (!$sender)
 		{
 			$sender = 'eGroupWare '.lang($this->app).' <noreply@'.$GLOBALS['egw_info']['server']['mail_suffix'].'>';
 		}
@@ -864,11 +864,11 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	protected function get_title($data,$old)
+	protected function get_title($data, $old)
 	{
-		unset($old);	// not used, but required by function signature
+		unset($old); // not used, but required by function signature
 
-		return Api\Link::title($this->app,$data[$this->id_field]);
+		return Api\Link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -882,11 +882,11 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
-		unset($old, $deleted, $receiver);	// not used, but required by function signature
+		unset($old, $deleted, $receiver); // not used, but required by function signature
 
-		return Api\Link::title($this->app,$data[$this->id_field]);
+		return Api\Link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -899,9 +899,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
-		unset($data, $old, $receiver);	// not used, but required by function signature
+		unset($data, $old, $receiver); // not used, but required by function signature
 
 		return '';
 	}
@@ -917,24 +917,24 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string|array string with link (!$allow_popup) or array(link,popup-size), popup size is something like '640x480'
 	 */
-	protected function get_link($data,$old,$allow_popup=false,$receiver=null)
+	protected function get_link($data, $old, $allow_popup = false, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		if (($link = $this->get_config('link',$data,$old)))
+		if (($link = $this->get_config('link', $data, $old)))
 		{
-			if (!$this->get_config('link_no_id', $data) && strpos($link,$this->id_field.'=') === false && isset($data[$this->id_field]))
+			if (!$this->get_config('link_no_id', $data) && strpos($link, $this->id_field.'=') === false && isset($data[$this->id_field]))
 			{
-				$link .= strpos($link,'?') === false ? '?' : '&';
+				$link .= strpos($link, '?') === false ? '?' : '&';
 				$link .= $this->id_field.'='.$data[$this->id_field];
 			}
 		}
 		else
 		{
-			if (($view = Api\Link::view($this->app,$data[$this->id_field])))
+			if (($view = Api\Link::view($this->app, $data[$this->id_field])))
 			{
-				$link = $GLOBALS['egw']->link('/index.php',$view);
-				$popup = Api\Link::is_popup($this->app,'view');
+				$link = $GLOBALS['egw']->link('/index.php', $view);
+				$popup = Api\Link::is_popup($this->app, 'view');
 			}
 		}
 		if ($link[0] == '/')
@@ -945,12 +945,12 @@ 
 		if (!$allow_popup)
 		{
 			// remove the session-id in the notification mail!
-			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
+			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', $link);
 
 			if ($popup) $link .= '&nopopup=1';
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
-		return $allow_popup ? array($link,$popup) : $link;
+		return $allow_popup ? array($link, $popup) : $link;
 	}
 
 	/**
@@ -961,18 +961,18 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array with link
 	 */
-	protected function get_notification_link($data,$old,$receiver=null)
+	protected function get_notification_link($data, $old, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		if (($view = Api\Link::view($this->app,$data[$this->id_field])))
+		if (($view = Api\Link::view($this->app, $data[$this->id_field])))
 		{
 			return array(
-				'text' 	=> $this->get_title($data,$old),
+				'text' 	=> $this->get_title($data, $old),
 				'app'	=> $this->app,
 				'id'	=> $data[$this->id_field],
 				'view' 	=> $view,
-				'popup'	=> Api\Link::is_popup($this->app,'view'),
+				'popup'	=> Api\Link::is_popup($this->app, 'view'),
 			);
 		}
 		return false;
@@ -988,15 +988,15 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	public function get_body($html_email,$data,$old,$integrate_link = true,$receiver=null)
+	public function get_body($html_email, $data, $old, $integrate_link = true, $receiver = null)
 	{
 		$body = '';
-		if($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
+		if ($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
 		{
-			$body = $this->get_custom_message($data,$old);
-			if(($sig = $this->get_signature($data,$old,$receiver)))
+			$body = $this->get_custom_message($data, $old);
+			if (($sig = $this->get_signature($data, $old, $receiver)))
 			{
-				$body .= ($html_email ? '<br />':'') . "\n$sig";
+				$body .= ($html_email ? '<br />' : '')."\n$sig";
 			}
 			return $body;
 		}
@@ -1005,35 +1005,35 @@ 
 			$body = '<table cellspacing="2" cellpadding="0" border="0" width="100%">'."\n";
 		}
 		// new or modified message
-		if (($message = $this->get_message($data,$old,$receiver)))
+		if (($message = $this->get_message($data, $old, $receiver)))
 		{
 			foreach ((array)$message as $_message)
 			{
-				$body .= $this->format_line($html_email,'message',false,($_message=='---'?($html_email?'<hr/>':$_message):$_message));
+				$body .= $this->format_line($html_email, 'message', false, ($_message == '---' ? ($html_email ? '<hr/>' : $_message) : $_message));
 			}
 		}
-		if ($integrate_link && ($link = $this->get_link($data,$old,false,$receiver)))
+		if ($integrate_link && ($link = $this->get_link($data, $old, false, $receiver)))
 		{
-			$body .= $this->format_line($html_email,'link',false,$integrate_link === true ? lang('You can respond by visiting:') : $integrate_link,$link);
+			$body .= $this->format_line($html_email, 'link', false, $integrate_link === true ? lang('You can respond by visiting:') : $integrate_link, $link);
 		}
-		foreach($this->get_details($data,$receiver) as $name => $detail)
+		foreach ($this->get_details($data, $receiver) as $name => $detail)
 		{
 			// if there's no old entry, the entry is not modified by definition
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified) continue; // skip unchanged, empty values
 
-			$body .= $this->format_line($html_email,$detail['type'],$modified,
+			$body .= $this->format_line($html_email, $detail['type'], $modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
 		}
 		if ($html_email)
 		{
 			$body .= "</table>\n";
 		}
-		if(($sig = $this->get_signature($data,$old,$receiver)))
+		if (($sig = $this->get_signature($data, $old, $receiver)))
 		{
-			$body .= ($html_email ? '<br />':'') . "\n$sig";
+			$body .= ($html_email ? '<br />' : '')."\n$sig";
 		}
 		return $body;
 	}
@@ -1049,20 +1049,20 @@ 
 	 * @param string $data = null data or null to display just $line over 2 columns
 	 * @return string
 	 */
-	protected function format_line($html_mail,$type,$modified,$line,$data=null)
+	protected function format_line($html_mail, $type, $modified, $line, $data = null)
 	{
 		//error_log(__METHOD__.'('.array2string($html_mail).",'$type',".array2string($modified).",'$line',".array2string($data).')');
 		$content = '';
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line); // XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
 			$bold = false;
 			$background = '#FFFFF1';
-			switch($type)
+			switch ($type)
 			{
 				case 'message':
 					$background = '#D3DCE3;';
@@ -1080,7 +1080,7 @@ 
 					if (strpos($data, '<br') === false)
 					{
 						$data = nl2br($this->html_content_allow ? $data : Api\Html::htmlspecialchars($data));
-						$this->html_content_allow = true;	// to NOT do htmlspecialchars again
+						$this->html_content_allow = true; // to NOT do htmlspecialchars again
 					}
 					break;
 				case 'reply':
@@ -1089,13 +1089,13 @@ 
 				default:
 					$size = false;
 			}
-			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color?'color:'.$color:'');
+			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color ? 'color:'.$color : '');
 
-			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data?'" width="20%':'" colspan="2').'">';
+			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data ? '" width="20%' : '" colspan="2').'">';
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply') $content = str_repeat('-', 64)."\n";
 
 			if ($modified) $content .= '> ';
 		}
@@ -1107,7 +1107,7 @@ 
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
-				$content .= Api\Html::a_href(chunk_split(rawurldecode($data),40,'&#8203;'),$data,'','target="_blank"');
+				$content .= Api\Html::a_href(chunk_split(rawurldecode($data), 40, '&#8203;'), $data, '', 'target="_blank"');
 			}
 			elseif ($this->html_content_allow)
 			{
@@ -1120,7 +1120,7 @@ 
 		}
 		else
 		{
-			$content .= ($content&&$data?': ':'').$data;
+			$content .= ($content && $data ? ': ' : '').$data;
 		}
 		if ($html_mail) $content .= '</td></tr>';
 
@@ -1137,9 +1137,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array or array with values for either 'string' or 'path' and optionally (mime-)'type', 'filename' and 'encoding'
 	 */
-	protected function get_attachments($data,$old,$receiver=null)
+	protected function get_attachments($data, $old, $receiver = null)
 	{
-		unset($data, $old, $receiver);	// not used, but required by function signature
+		unset($data, $old, $receiver); // not used, but required by function signature
 
 	 	return array();
 	}
@@ -1152,20 +1152,20 @@ 
 	 */
 	protected function get_signature($data, $old, $receiver)
 	{
-		unset($old, $receiver);	// not used, but required by function signature
+		unset($old, $receiver); // not used, but required by function signature
 
 		$config = Api\Config::read('notifications');
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 		}
-		elseif(class_exists($this->app. '_merge'))
+		elseif (class_exists($this->app.'_merge'))
 		{
 			$merge_class = $this->app.'_merge';
 			$merge = new $merge_class();
 			$error = null;
 			$sig = $merge->merge_string($config['signature'], array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $config['signature'];
@@ -1182,27 +1182,27 @@ 
 	protected function get_custom_message($data, $old, $merge_class = null)
 	{
 		$message = $this->get_config(self::CUSTOM_NOTIFICATION, $data, $old);
-		if(!$message)
+		if (!$message)
 		{
 			return '';
 		}
 
 		// Automatically set merge class from naming conventions
-		if($merge_class == null)
+		if ($merge_class == null)
 		{
 			$merge_class = $this->app.'_merge';
 		}
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 			return $message;
 		}
-		elseif(class_exists($merge_class))
+		elseif (class_exists($merge_class))
 		{
 			$merge = new $merge_class();
 			$error = null;
 			$merged_message = $merge->merge_string($message, array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $message;

Braces +157 added lines, -39 removed lines

@@ -239,7 +239,10 @@ 
 			$header_done = false;
 			foreach($cfs as $name => $field)
 			{
-				if (in_array($field['type'], Customfields::$non_printable_fields)) continue;
+				if (in_array($field['type'], Customfields::$non_printable_fields))
+				{
+					continue;
+				}
 
 				if (!$header_done)
 				{
@@ -337,8 +340,14 @@ 
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id',$data[$name]))
+			{
+				$data[$name] = $data[$name]['id'];
+			}
+			if (is_array($old[$name]) && array_key_exists('id',$old[$name]))
+			{
+				$old[$name] = $old[$name]['id'];
+			}
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
@@ -352,11 +361,18 @@ 
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				if (!$id)
+				{
+					continue;
+				}
+				// can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) Api\Link::link($this->app,$source_id,$app,$id);
+			if ($source_id)
+			{
+				Api\Link::link($this->app,$source_id,$app,$id);
+			}
 			//error_log(__METHOD__.__LINE__."Api\Link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>Api\Link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
@@ -364,14 +380,24 @@ 
 		// unlink removed application entries
 		foreach(array_diff($old_ids,$current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name]))
+			{
+				continue;
+			}
+			// ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;
+				if (!$id)
+				{
+					continue;
+				}
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id)
+			{
+				Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			}
 			//echo "<p>Api\Link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -396,7 +422,10 @@ 
 			$changed_fields = self::changed_fields($data,$old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
-		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
+		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action']))
+		{
+			return 0;
+		}
 
 		if (!is_object($this->historylog) || $this->historylog->user != $this->user)
 		{
@@ -412,10 +441,13 @@ 
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
-			if (is_array($status))	// 1:N relation --> remove common rows
+			if (is_array($status))
+			{
+				// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 				$added = array_values(array_diff($data[$name],$old[$name]));
 				$removed = array_values(array_diff($old[$name],$data[$name]));
@@ -449,17 +481,31 @@ 
 	 */
 	public function changed_fields(array $data,array $old=null)
 	{
-		if (is_null($old)) return array_keys($data);
+		if (is_null($old))
+		{
+			return array_keys($data);
+		}
 		$changed_fields = array();
 		foreach($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name])
+			{
+				continue;
+			}
+			// treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name]))
+			{
+				continue;
+			}
+			// no set customfields are not stored, therefore not changed
 
-			if (is_array($status))	// 1:N relation
+			if (is_array($status))
+			{
+				// 1:N relation
 			{
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 			}
 			if ($old[$name] != $data[$name])
@@ -467,13 +513,22 @@ 
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name]))
+					{
+						$data[$name] = explode(',',$data[$name]);
+					}
+					if (!is_array($old[$name]))
+					{
+						$old[$name] = explode(',',$old[$name]);
+					}
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
 						sort($old[$name]);
-						if ($data[$name] == $old[$name]) continue;
+						if ($data[$name] == $old[$name])
+						{
+							continue;
+						}
 					}
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
@@ -534,13 +589,19 @@ 
 	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
 	{
 		$this->errors = $email_sent = array();
-		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
+		if (!empty($email_notified) && is_array($email_notified))
+		{
+			$email_sent = $email_notified;
+		}
 
-		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
+		if (!$this->notify_current_user && $this->user)
+		{
+			// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
 			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
 		}
+		}
 		$skip_notify = $this->get_config('skip_notify',$data,$old);
 		if($skip_notify && is_array($skip_notify))
 		{
@@ -579,11 +640,14 @@ 
 			//error_log(__METHOD__."() data[$this->assigned_field]=".print_r($data[$this->assigned_field],true).", old[$this->assigned_field]=".print_r($old[$this->assigned_field],true));
 			$old_assignees = array();
 			$assignees = $assigned ? $assigned : array();
-			if ($data[$this->assigned_field])	// current assignments
+			if ($data[$this->assigned_field])
+			{
+				// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
 					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
 			}
+			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
@@ -592,7 +656,10 @@ 
 			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
 			{
 				//error_log(__METHOD__."() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
-				if (!$assignee) continue;
+				if (!$assignee)
+				{
+					continue;
+				}
 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
@@ -600,10 +667,13 @@ 
 					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
 					{
 						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))
+						{
+							// assignment changed
 						{
 							$email_sent[] = $email;
 						}
+						}
 					}
 				}
 				else	// item assignee is a group
@@ -613,10 +683,13 @@ 
 						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
 						{
 							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))
+							{
+								// assignment changed
 							{
 								$email_sent[] = $email;
 							}
+							}
 						}
 					}
 				}
@@ -679,25 +752,38 @@ 
 	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
-		if (!$email) return false;
+		if (!$email)
+		{
+			return false;
+		}
 
 		$save_user = $GLOBALS['egw_info']['user'];
 		$do_notify = true;
 
-		if (is_numeric($user_or_lang))	// user --> read everything from his prefs
+		if (is_numeric($user_or_lang))
+		{
+			// user --> read everything from his prefs
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
+		}
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
 
-			if ($check && $this->check2pref) $check = $this->check2pref[$check];
+			if ($check && $this->check2pref)
+			{
+				$check = $this->check2pref[$check];
+			}
 
 			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
-				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
+				$this->user == $user_or_lang && !$this->notify_current_user)
 			{
-				$do_notify = false;	// no notification requested / necessary
+				// no popup for own actions
+			{
+				$do_notify = false;
+			}
+			// no notification requested / necessary
 			}
 		}
 		else
@@ -706,10 +792,13 @@ 
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->default_prefs();
 			$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $user_or_lang;
 		}
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != Api\Translation::$userlang)	// load the right language if needed
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != Api\Translation::$userlang)
+		{
+			// load the right language if needed
 		{
 			Api\Translation::init();
 		}
+		}
 
 		$receiver = is_numeric($user_or_lang) ? $user_or_lang : $email;
 
@@ -813,7 +902,10 @@ 
 			$do_time = ($timestamp->format('Hi') != '0000');
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if ($do_time) $format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		if ($do_time)
+		{
+			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		}
 
 		return $timestamp->format($format);
 	}
@@ -843,9 +935,12 @@ 
 		{
 			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
 
-			if($prefer_id) {
+			if($prefer_id)
+			{
 				$sender = $this->user;
-			} else {
+			}
+			else
+			{
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
@@ -947,7 +1042,10 @@ 
 			// remove the session-id in the notification mail!
 			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
 
-			if ($popup) $link .= '&nopopup=1';
+			if ($popup)
+			{
+				$link .= '&nopopup=1';
+			}
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
 		return $allow_popup ? array($link,$popup) : $link;
@@ -1022,7 +1120,11 @@ 
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified)
+			{
+				continue;
+			}
+			// skip unchanged, empty values
 
 			$body .= $this->format_line($html_email,$detail['type'],$modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
@@ -1056,7 +1158,11 @@ 
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow)
+			{
+				$line = Api\Html::htmlspecialchars($line);
+			}
+			// XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
@@ -1095,15 +1201,24 @@ 
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply')
+			{
+				$content = str_repeat('-',64)."\n";
+			}
 
-			if ($modified) $content .= '> ';
+			if ($modified)
+			{
+				$content .= '> ';
+			}
 		}
 		$content .= $line;
 
 		if ($html_mail)
 		{
-			if ($line && $data) $content .= '</td><td style="'.$style.'">';
+			if ($line && $data)
+			{
+				$content .= '</td><td style="'.$style.'">';
+			}
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
@@ -1122,7 +1237,10 @@ 
 		{
 			$content .= ($content&&$data?': ':'').$data;
 		}
-		if ($html_mail) $content .= '</td></tr>';
+		if ($html_mail)
+		{
+			$content .= '</td></tr>';
+		}
 
 		$content .= "\n";
 

api/src/Translation.php

Doc Comments +1 added lines, -1 removed lines

@@ -742,7 +742,7 @@
 	 *
 	 * @param string $app application name
 	 * @param string $lang language code
-	 * @return the full path of the filename for the requested app and language
+	 * @return string full path of the filename for the requested app and language
 	 */
 	static function get_lang_file($app,$lang)
 	{

Indentation +13 added lines, -13 removed lines

@@ -738,12 +738,12 @@ 
 	}
 
  	/**
-	 * provides centralization and compatibility to locate the lang files
-	 *
-	 * @param string $app application name
-	 * @param string $lang language code
-	 * @return the full path of the filename for the requested app and language
-	 */
+ 	 * provides centralization and compatibility to locate the lang files
+ 	 *
+ 	 * @param string $app application name
+ 	 * @param string $lang language code
+ 	 * @return the full path of the filename for the requested app and language
+ 	 */
 	static function get_lang_file($app,$lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
@@ -1074,13 +1074,13 @@ 
 	}
 
  	/**
-	 * detect_encoding - try to detect the encoding
-	 *    only to be used if the string in question has no structure that determines his encoding
-	 *
-	 * @param string - to be evaluated
-	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
-	 * @return string - encoding
-	 */
+ 	 * detect_encoding - try to detect the encoding
+ 	 *    only to be used if the string in question has no structure that determines his encoding
+ 	 *
+ 	 * @param string - to be evaluated
+ 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
+ 	 * @return string - encoding
+ 	 */
 	static function detect_encoding($string, $verify=null)
 	{
 		if (function_exists('iconv'))

Spacing +100 added lines, -100 removed lines

@@ -99,7 +99,7 @@ 
 	 *
 	 * @var array
 	 */
-	static $instance_specific_translations = array('loginscreen','mainscreen','custom');
+	static $instance_specific_translations = array('loginscreen', 'mainscreen', 'custom');
 
 	/**
 	 * returns the charset to use (!$lang) or the charset of the lang-files or $lang
@@ -107,7 +107,7 @@ 
 	 * @param string|boolean $lang =False return charset of the active user-lang, or $lang if specified
 	 * @return string charset
 	 */
-	static function charset($lang=False)
+	static function charset($lang = False)
 	{
 		static $charsets = array();
 
@@ -115,11 +115,11 @@ 
 		{
 			if (!isset($charsets[$lang]))
 			{
-				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE,'content',array(
+				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE, 'content', array(
 					'lang'		=> $lang,
 					'message_id'=> 'charset',
 					'app_name'	=> 'common',
-				),__LINE__,__FILE__)->fetchColumn()))
+				), __LINE__, __FILE__)->fetchColumn()))
 				{
 					$charsets[$lang] = 'utf-8';
 				}
@@ -153,7 +153,7 @@ 
 	 *
 	 * @param boolean $load_translations =true should we also load translations for common and currentapp
 	 */
-	static function init($load_translations=true)
+	static function init($load_translations = true)
 	{
 		if (!isset(self::$db))
 		{
@@ -165,11 +165,11 @@ 
 		}
 		else
 		{
-			self::$system_charset =& $GLOBALS['egw_setup']->system_charset;
+			self::$system_charset = & $GLOBALS['egw_setup']->system_charset;
 		}
 		if ((self::$mbstring = check_load_extension('mbstring')))
 		{
-			if(!empty(self::$system_charset))
+			if (!empty(self::$system_charset))
 			{
 				$ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset';
 				ini_set($ini_default_charset, self::$system_charset);
@@ -178,7 +178,7 @@ 
 
 		// try loading load_via from tree-wide cache and check if it contains more rules
 		if (($load_via = Cache::getTree(__CLASS__, 'load_via')) &&
-			$load_via >= self::$load_via && 	// > for array --> contains more elements
+			$load_via >= self::$load_via && // > for array --> contains more elements
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
@@ -217,13 +217,13 @@ 
 	 * @param string $not_found ='*' what to add to not found phrases, default '*'
 	 * @return string with translation
 	 */
-	static function translate($key, $vars=null, $not_found='' )
+	static function translate($key, $vars = null, $not_found = '')
 	{
 		if (!self::$lang_arr)
 		{
 			self::init();
 		}
-		$ret = $key;				// save key if we dont find a translation
+		$ret = $key; // save key if we dont find a translation
 		if ($not_found) $ret .= $not_found;
 
 		if (isset(self::$lang_arr[$key]))
@@ -243,16 +243,16 @@ 
 		{
 			if (count($vars) > 1)
 			{
-				static $placeholders = array('%3','%2','%1','|%2|','|%3|','%4','%5','%6','%7','%8','%9','%10');
+				static $placeholders = array('%3', '%2', '%1', '|%2|', '|%3|', '%4', '%5', '%6', '%7', '%8', '%9', '%10');
 				// to cope with $vars[0] containing '%2' (eg. an urlencoded path like a referer),
 				// we first replace '%2' in $ret with '|%2|' and then use that as 2. placeholder
 				// we do that for %3 as well, ...
-				$vars = array_merge(array('|%3|','|%2|'),$vars);	// push '|%2|' (and such) as first replacement on $vars
-				$ret = str_replace($placeholders,$vars,$ret);
+				$vars = array_merge(array('|%3|', '|%2|'), $vars); // push '|%2|' (and such) as first replacement on $vars
+				$ret = str_replace($placeholders, $vars, $ret);
 			}
 			else
 			{
-				$ret = str_replace('%1',$vars[0],$ret);
+				$ret = str_replace('%1', $vars[0], $ret);
 			}
 		}
 		return $ret;
@@ -267,14 +267,14 @@ 
 	 * 	if multiple names given, they are requested in one request from cache and loaded in given order
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 */
-	static function add_app($apps, $lang=null)
+	static function add_app($apps, $lang = null)
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
 		if (!$lang) $lang = self::$userlang;
 		$tree_level = $instance_level = array();
 		if (!is_array($apps)) $apps = (array)$apps;
-		foreach($apps as $key => $app)
+		foreach ($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
 			{
@@ -298,26 +298,26 @@ 
 
 		// merging loaded translations together
 		$updated_load_via = false;
-		foreach((array)$apps as $app)
+		foreach ((array)$apps as $app)
 		{
 			$l = $app == 'custom' ? 'en' : $lang;
 			if (isset($tree_level[$app.':'.$l]))
 			{
-				$loaded =& $tree_level[$app.':'.$l];
+				$loaded = & $tree_level[$app.':'.$l];
 			}
 			elseif (isset($instance_level[$app.':'.$l]))
 			{
-				$loaded =& $instance_level[$app.':'.$l];
+				$loaded = & $instance_level[$app.':'.$l];
 			}
 			else
 			{
 				if (($instance_specific = in_array($app, self::$instance_specific_translations)))
 				{
-					$loaded =& self::load_app($app, $l);
+					$loaded = & self::load_app($app, $l);
 				}
 				else
 				{
-					$loaded =& self::load_app_files($app, $l, null, $updated_load_via);
+					$loaded = & self::load_app_files($app, $l, null, $updated_load_via);
 				}
 				//error_log(__METHOD__."('$app', '$lang') instance_specific=$instance_specific, load_app(_files)() returned ".(is_array($loaded)?'Array('.count($loaded).')':array2string($loaded)));
 				if ($loaded || $instance_specific)
@@ -330,14 +330,14 @@ 
 			if ($loaded)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $loaded);
-				self::$loaded_apps[$app] = $l;	// dont set something not existing to $loaded_apps, no need to load client-side
+				self::$loaded_apps[$app] = $l; // dont set something not existing to $loaded_apps, no need to load client-side
 			}
 		}
 		// Re-merge custom over instance level, they have higher precidence
-		if($tree_level && !$instance_level && self::$instance_specific_translations)
+		if ($tree_level && !$instance_level && self::$instance_specific_translations)
 		{
 			$custom = Cache::getInstance(__CLASS__, 'custom:en');
-			if($custom)
+			if ($custom)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $custom);
 			}
@@ -358,15 +358,15 @@ 
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 * @return array the loaded strings
 	 */
-	static function &load_app($app,$lang)
+	static function &load_app($app, $lang)
 	{
 		//$start = microtime(true);
 		if (is_null(self::$db)) self::init(false);
 		$loaded = array();
-		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
+		foreach (self::$db->select(self::LANG_TABLE, 'message_id,content', array(
 			'lang'		=> $lang,
 			'app_name'	=> $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$loaded[strtolower($row['message_id'])] = $row['content'];
 		}
@@ -390,7 +390,7 @@ 
 		'sitemgr-link' => array('sitemgr'),
 		'groupdav' => array('api'),
 		'developer_tools' => array('etemplate'),
-		'login' => array('api','registration'),
+		'login' => array('api', 'registration'),
 	);
 
 	/**
@@ -402,7 +402,7 @@ 
 	{
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$apps = array_keys($GLOBALS['egw_info']['apps']);
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$file = self::get_lang_file($app, $lang);
 			// check if file has changed compared to what's cached
@@ -432,7 +432,7 @@ 
 		Cache::unsetTree(__CLASS__, $app.':'.$lang);
 		Cache::unsetTree(__CLASS__, self::get_lang_file($app, $lang));
 
-		foreach(self::$load_via as $load => $via)
+		foreach (self::$load_via as $load => $via)
 		{
 			//error_log("load_via[load='$load'] = via = ".array2string($via));
 			if ($via === 'all-apps' || in_array($app, (array)$via))
@@ -454,7 +454,7 @@ 
 	 * @param string $_lang =null
 	 * @return array $lang or $app => number pairs
 	 */
-	static function statistics($_lang=null)
+	static function statistics($_lang = null)
 	{
 		$cache = Cache::getTree(__CLASS__, 'statistics');
 
@@ -465,7 +465,7 @@ 
 			{
 				$en_phrases = array_keys(self::load_app_files(null, 'en', 'all-apps'));
 				$cache['']['en'] = count($en_phrases);
-				foreach(array_keys(self::get_available_langs()) as $lang)
+				foreach (array_keys(self::get_available_langs()) as $lang)
 				{
 					if ($lang == 'en') continue;
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
@@ -476,7 +476,7 @@ 
 			else
 			{
 				$cache['en'] = array();
-				foreach(scandir(EGW_SERVER_ROOT) as $app)
+				foreach (scandir(EGW_SERVER_ROOT) as $app)
 				{
 					if ($app[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app) ||
 						!file_exists(self::get_lang_file($app, 'en')))
@@ -514,7 +514,7 @@ 
 		if (!in_array($_app, self::$instance_specific_translations))
 		{
 			// check if cache is NOT invalided by checking if we have a modification time for concerned lang-file
-			$time = Cache::getTree(__CLASS__, $file=self::get_lang_file($_app, $_lang));
+			$time = Cache::getTree(__CLASS__, $file = self::get_lang_file($_app, $_lang));
 			// if we dont have one, cache has been invalidated and we need to load translations
 			if (!isset($time)) self::add_app($_app, $_lang);
 
@@ -534,7 +534,7 @@ 
 	 * @param type $time
 	 * @return type
 	 */
-	static function max_lang_time($time=null)
+	static function max_lang_time($time = null)
 	{
 		static $max_lang_time = null;
 
@@ -545,7 +545,7 @@ 
 		if (isset($time) && $time > $max_lang_time)
 		{
 			//error_log(__METHOD__."($time) updating previous max_lang_time=$max_lang_time to $time");
-			Cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time=$time);
+			Cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time = $time);
 		}
 		return $max_lang_time;
 	}
@@ -561,34 +561,34 @@ 
 	 * @param boolean $updated_load_via =false on return true if self::$load_via was updated
 	 * @return array the loaded strings
 	 */
-	static function &load_app_files($app, $lang, $just_app_file=null, &$updated_load_via=false)
+	static function &load_app_files($app, $lang, $just_app_file = null, &$updated_load_via = false)
 	{
 		//$start = microtime(true);
 		$load_app = isset($just_app_file) ? $just_app_file : (isset(self::$load_via[$app]) ? self::$load_via[$app] : $app);
 		$loaded = array();
-		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
+		foreach ($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
 		{
-			if ($load_app == 'all-apps' && $app_dir=='..') continue; // do not try to break out of egw server root
+			if ($load_app == 'all-apps' && $app_dir == '..') continue; // do not try to break out of egw server root
 			if ($app_dir[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app_dir) ||
-				!@file_exists($file=self::get_lang_file($app_dir, $lang)) ||
+				!@file_exists($file = self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
 			{
 				continue;
 			}
 			// store ctime of file we parse
-			Cache::setTree(__CLASS__, $file, $time=filemtime($file));
+			Cache::setTree(__CLASS__, $file, $time = filemtime($file));
 			self::max_lang_time($time);
 
 			$line_nr = 0;
 			//use fgets and split the line, as php5.3.3 with squeeze does not support splitting lines with fgetcsv while reading properly
 			//if the first letter after the delimiter is a german umlaut (UTF8 representation thereoff)
 			//while(($line = fgetcsv($f, 1024, "\t")))
-			while(($read = fgets($f)))
+			while (($read = fgets($f)))
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
 				if (count($line) != 4) continue;
-				list($l_id,$l_app,$l_lang,$l_translation) = $line;
+				list($l_id, $l_app, $l_lang, $l_translation) = $line;
 				if ($l_lang != $lang) continue;
 				if (!isset($just_app_file) && $l_app != $app)
 				{
@@ -629,7 +629,7 @@ 
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
-			foreach($load_via as $app => $via)
+			foreach ($load_via as $app => $via)
 			{
 				if (self::$load_via[$app] != $via)
 				{
@@ -655,15 +655,15 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_available_langs($translate=true, $force_read=false)
+	static function get_available_langs($translate = true, $force_read = false)
 	{
 		if (!is_array(self::$langs) || $force_read)
 		{
-			if (!($f = fopen($file=EGW_SERVER_ROOT.'/setup/lang/languages','rb')))
+			if (!($f = fopen($file = EGW_SERVER_ROOT.'/setup/lang/languages', 'rb')))
 			{
 				throw new Exception("List of available languages (%1) missing!", $file);
 			}
-			while(($line = fgetcsv($f, null, "\t")))
+			while (($line = fgetcsv($f, null, "\t")))
 			{
 				self::$langs[$line[0]] = $line[1];
 			}
@@ -673,12 +673,12 @@ 
 			{
 				if (is_null(self::$db)) self::init(false);
 
-				foreach(self::$langs as $lang => $name)
+				foreach (self::$langs as $lang => $name)
 				{
-					self::$langs[$lang] = self::translate($name,False,'');
+					self::$langs[$lang] = self::translate($name, False, '');
 				}
 			}
-			uasort(self::$langs,'strcasecmp');
+			uasort(self::$langs, 'strcasecmp');
 		}
 		return self::$langs;
 	}
@@ -691,7 +691,7 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_installed_langs($force_read=false)
+	static function get_installed_langs($force_read = false)
 	{
 		return self::get_available_langs($force_read);
 	}
@@ -708,7 +708,7 @@ 
 		{
 			return self::$langs[$lang];
 		}
-		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
+		return self::$db->select(self::LANGUAGES_TABLE, 'lang_name', array('lang_id' => $lang), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -717,20 +717,20 @@ 
 	 * @param boolean $force_read =false
 	 * @return array with lang_id => lang_name pairs
 	 */
-	static function list_langs($force_read=false)
+	static function list_langs($force_read = false)
 	{
 		if (!$force_read)
 		{
-			return Cache::getInstance(__CLASS__,'list_langs',array(__CLASS__,'list_langs'),array(true));
+			return Cache::getInstance(__CLASS__, 'list_langs', array(__CLASS__, 'list_langs'), array(true));
 		}
-		$languages = self::get_installed_langs();	// available languages
-		$availible = "('".implode("','",array_keys($languages))."')";
+		$languages = self::get_installed_langs(); // available languages
+		$availible = "('".implode("','", array_keys($languages))."')";
 
 		// this shows first the installed, then the available and then the rest
-		foreach(self::$db->select(self::LANGUAGES_TABLE,array(
-			'lang_id','lang_name',
+		foreach (self::$db->select(self::LANGUAGES_TABLE, array(
+			'lang_id', 'lang_name',
 			"CASE WHEN lang_id IN $availible THEN 1 ELSE 0 END AS availible",
-		),"lang_id NOT IN ('".implode("','",array_keys($languages))."')",__LINE__,__FILE__,false,' ORDER BY availible DESC,lang_name') as $row)
+		), "lang_id NOT IN ('".implode("','", array_keys($languages))."')", __LINE__, __FILE__, false, ' ORDER BY availible DESC,lang_name') as $row)
 		{
 			$languages[$row['lang_id']] = $row['lang_name'];
 		}
@@ -744,7 +744,7 @@ 
 	 * @param string $lang language code
 	 * @return the full path of the filename for the requested app and language
 	 */
-	static function get_lang_file($app,$lang)
+	static function get_lang_file($app, $lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
@@ -757,7 +757,7 @@ 
 	 */
 	static function get_installed_charsets()
 	{
-		static $charsets=null;
+		static $charsets = null;
 
 		if (!isset($charsets))
 		{
@@ -787,13 +787,13 @@ 
 		static $extra = array(
 			'&szlig;' => 'ss',
 		);
-		$entities = htmlentities($_str,ENT_QUOTES,self::charset());
+		$entities = htmlentities($_str, ENT_QUOTES, self::charset());
 
-		$estr = str_replace(array_keys($extra),array_values($extra), $entities);
-		$ustr = preg_replace('/&([aAuUoO])uml;/','\\1e', $estr);	// replace german umlauts with the letter plus one 'e'
-		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/','\\1', $ustr);	// remove all types of accents
+		$estr = str_replace(array_keys($extra), array_values($extra), $entities);
+		$ustr = preg_replace('/&([aAuUoO])uml;/', '\\1e', $estr); // replace german umlauts with the letter plus one 'e'
+		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/', '\\1', $ustr); // remove all types of accents
 
-		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/','', $astr);	// remove all other entities
+		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/', '', $astr); // remove all other entities
 	}
 
 	/**
@@ -805,7 +805,7 @@ 
 	 * @param boolean $check_to_from =true internal to bypass all charset replacements
 	 * @return string|array converted string(s) from $data
 	 */
-	static function convert($data,$from=False,$to=False,$check_to_from=true)
+	static function convert($data, $from = False, $to = False, $check_to_from = true)
 	{
 		if ($check_to_from)
 		{
@@ -816,7 +816,7 @@ 
 			if (!$from)
 			{
 				$from = self::$mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
-				if($from == 'ascii')
+				if ($from == 'ascii')
 				{
 					$from = 'iso-8859-1';
 				}
@@ -826,7 +826,7 @@ 
 				 php does not seem to support gb2312
 				 but seems to be able to decode it as EUC-CN
 			*/
-			switch($from)
+			switch ($from)
 			{
 				case 'ks_c_5601-1987':
 					$from = 'CP949';
@@ -872,9 +872,9 @@ 
 		}
 		if (is_array($data))
 		{
-			foreach($data as $key => $str)
+			foreach ($data as $key => $str)
 			{
-				$ret[$key] = self::convert($str,$from,$to,false);	// false = bypass the above checks, as they are already done
+				$ret[$key] = self::convert($str, $from, $to, false); // false = bypass the above checks, as they are already done
 			}
 			return $ret;
 		}
@@ -886,7 +886,7 @@ 
 		{
 			return utf8_decode($data);
 		}
-		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data,$to,$from)) != '')
+		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data, $to, $from)) != '')
 		{
 			return $data;
 		}
@@ -914,12 +914,12 @@ 
 			// in an email on the first Traditional/Japanese/Korean character,
 			// but in reality when people send mails in GB2312, UMA mostly use
 			// extended GB13000/GB18030 which allow T/Jap/Korean characters.
-			if($from == 'euc-cn')
+			if ($from == 'euc-cn')
 			{
 				$from = 'gb18030';
 			}
 
-			if (($convertedData = iconv($from,$to,$data)))
+			if (($convertedData = iconv($from, $to, $data)))
 			{
 				return $convertedData;
 			}
@@ -934,9 +934,9 @@ 
 	 * @param string|boolean $from charset $data is in or False if it should be detected
 	 * @return string|array converted string(s) from $data
 	 */
-	static function convert_jsonsafe($_data,$from=False)
+	static function convert_jsonsafe($_data, $from = False)
 	{
-		if ($from===false) $from = self::detect_encoding($_data);
+		if ($from === false) $from = self::detect_encoding($_data);
 
 		$data = self::convert($_data, strtolower($from));
 
@@ -945,12 +945,12 @@ 
 		{
 			$test = @json_encode($data);
 			//error_log(__METHOD__.__LINE__.' ->'.strlen($data).' Error:'.json_last_error().'<- data:#'.$test.'#');
-			if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+			if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 			{
 				// try to fix broken utf8
-				$x = (function_exists('mb_convert_encoding')?mb_convert_encoding($data,'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$data):$data));
+				$x = (function_exists('mb_convert_encoding') ? mb_convert_encoding($data, 'UTF-8', 'UTF-8') : (function_exists('iconv') ? @iconv("UTF-8", "UTF-8//IGNORE", $data) : $data));
 				$test = @json_encode($x);
-				if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+				if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
 					error_log(__METHOD__.__LINE__.' Charset Reported:'.$from.' Charset Detected:'.self::detect_encoding($data));
@@ -973,36 +973,36 @@ 
 	 * @param string $message_id
 	 * @param string $content translation or null to delete translation
 	 */
-	static function write($lang,$app,$message_id,$content)
+	static function write($lang, $app, $message_id, $content)
 	{
 		if ($content)
 		{
-			self::$db->insert(self::LANG_TABLE,array(
+			self::$db->insert(self::LANG_TABLE, array(
 				'content' => $content,
-			),array(
+			), array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		else
 		{
-			self::$db->delete(self::LANG_TABLE,array(
+			self::$db->delete(self::LANG_TABLE, array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		// invalidate the cache
-		if(!in_array($app,self::$instance_specific_translations))
+		if (!in_array($app, self::$instance_specific_translations))
 		{
-			Cache::unsetCache(Cache::TREE,__CLASS__,$app.':'.$lang);
+			Cache::unsetCache(Cache::TREE, __CLASS__, $app.':'.$lang);
 		}
 		else
 		{
-			foreach(array_keys((array)self::get_installed_langs()) as $key)
+			foreach (array_keys((array)self::get_installed_langs()) as $key)
 			{
-				Cache::unsetCache(Cache::INSTANCE,__CLASS__,$app.':'.$key);
+				Cache::unsetCache(Cache::INSTANCE, __CLASS__, $app.':'.$key);
 			}
 		}
  	}
@@ -1015,13 +1015,13 @@ 
 	 * @param string $message_id
 	 * @return string|boolean content or false if not found
 	 */
-	static function read($lang,$app_name,$message_id)
+	static function read($lang, $app_name, $message_id)
 	{
-		return self::$db->select(self::LANG_TABLE,'content',array(
+		return self::$db->select(self::LANG_TABLE, 'content', array(
 			'lang' => $lang,
 			'app_name' => $app_name,
 			'message_id' => $message_id,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -1032,22 +1032,22 @@ 
 	 * @param string $lang ='' default check all langs
 	 * @return string
 	 */
-	static function get_message_id($translation,$app=null,$lang=null)
+	static function get_message_id($translation, $app = null, $lang = null)
 	{
 		$where = array('content '.self::$db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.self::$db->quote($translation));
 		if ($app) $where['app_name'] = $app;
 		if ($lang) $where['lang'] = $lang;
 
-		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
+		$id = self::$db->select(self::LANG_TABLE, 'message_id', $where, __LINE__, __FILE__)->fetchColumn();
 
 		// Check cache, since most things aren't in the DB anymore
-		if(!$id)
+		if (!$id)
 		{
 			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
-				return stripos(self::$lang_arr[$haystack],$translation) !== false;
+				return stripos(self::$lang_arr[$haystack], $translation) !== false;
 			});
 			$id = array_shift($ids);
-			if(!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
+			if (!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
 			{
 				// Try english
 				if (in_array($app, self::$instance_specific_translations))
@@ -1064,7 +1064,7 @@ 
 				if ($instance_level) $lang_arr = Cache::getInstance(__CLASS__, $instance_level);
 				$lang_arr = $lang_arr[$app.':en'];
 				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
-					return stripos($lang_arr[$haystack],$translation) !== false;
+					return stripos($lang_arr[$haystack], $translation) !== false;
 				});
 				$id = array_shift($ids);
 			}
@@ -1081,7 +1081,7 @@ 
 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
 	 * @return string - encoding
 	 */
-	static function detect_encoding($string, $verify=null)
+	static function detect_encoding($string, $verify = null)
 	{
 		if (function_exists('iconv'))
 		{
@@ -1104,7 +1104,7 @@ 
 		}
 		if ($verify && (!isset($detected) || $detected === 'ascii'))
 		{
-			return $verify;	// ascii matches all charsets
+			return $verify; // ascii matches all charsets
 		}
 		return isset($detected) ? $detected : 'iso-8859-1'; // we choose to return iso-8859-1 as default
 	}

Braces +121 added lines, -31 removed lines

@@ -126,17 +126,23 @@ 
 			}
 			return $charsets[$lang];
 		}
-		if (self::$system_charset)	// do we have a system-charset ==> return it
+		if (self::$system_charset)
+		{
+			// do we have a system-charset ==> return it
 		{
 			$charset = self::$system_charset;
 		}
+		}
 		else
 		{
 			// if no translations are loaded (system-startup) use a default, else lang('charset')
 			$charset = !self::$lang_arr ? 'utf-8' : strtolower(self::translate('charset'));
 		}
 		// in case no charset is set, default to utf-8
-		if (empty($charset) || $charset == 'charset') $charset = 'utf-8';
+		if (empty($charset) || $charset == 'charset')
+		{
+			$charset = 'utf-8';
+		}
 
 		// we need to set our charset as mbstring.internal_encoding if mbstring.func_overlaod > 0
 		// else we get problems for a charset is different from the default utf-8
@@ -195,8 +201,14 @@ 
 			}
 			$apps = array('common');
 			// for eTemplate apps, load etemplate before app itself (allowing app to overwrite etemplate translations)
-			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false)) $apps[] = 'etemplate';
-			if ($GLOBALS['egw_info']['flags']['currentapp']) $apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false))
+			{
+				$apps[] = 'etemplate';
+			}
+			if ($GLOBALS['egw_info']['flags']['currentapp'])
+			{
+				$apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			}
 			// load instance specific translations last, so they can overwrite everything
 			$apps[] = 'custom';
 			self::add_app($apps);
@@ -224,7 +236,10 @@ 
 			self::init();
 		}
 		$ret = $key;				// save key if we dont find a translation
-		if ($not_found) $ret .= $not_found;
+		if ($not_found)
+		{
+			$ret .= $not_found;
+		}
 
 		if (isset(self::$lang_arr[$key]))
 		{
@@ -271,9 +286,15 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
-		if (!$lang) $lang = self::$userlang;
+		if (!$lang)
+		{
+			$lang = self::$userlang;
+		}
 		$tree_level = $instance_level = array();
-		if (!is_array($apps)) $apps = (array)$apps;
+		if (!is_array($apps))
+		{
+			$apps = (array)$apps;
+		}
 		foreach($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
@@ -293,8 +314,14 @@ 
 			}
 		}
 		// load all translations from cache at once
-		if ($tree_level) $tree_level = Cache::getTree(__CLASS__, $tree_level);
-		if ($instance_level) $instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		if ($tree_level)
+		{
+			$tree_level = Cache::getTree(__CLASS__, $tree_level);
+		}
+		if ($instance_level)
+		{
+			$instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		}
 
 		// merging loaded translations together
 		$updated_load_via = false;
@@ -361,7 +388,10 @@ 
 	static function &load_app($app,$lang)
 	{
 		//$start = microtime(true);
-		if (is_null(self::$db)) self::init(false);
+		if (is_null(self::$db))
+		{
+			self::init(false);
+		}
 		$loaded = array();
 		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
 			'lang'		=> $lang,
@@ -467,7 +497,10 @@ 
 				$cache['']['en'] = count($en_phrases);
 				foreach(array_keys(self::get_available_langs()) as $lang)
 				{
-					if ($lang == 'en') continue;
+					if ($lang == 'en')
+					{
+						continue;
+					}
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
 					$cache[''][$lang] = count($valid_phrases);
@@ -484,7 +517,10 @@ 
 						continue;
 					}
 					$en_phrases = array_keys(self::load_app_files(null, 'en', $app));
-					if (count($en_phrases) <= 2) continue;
+					if (count($en_phrases) <= 2)
+					{
+						continue;
+					}
 					$cache['en'][$app] = count($en_phrases);
 					$lang_phrases = array_keys(self::load_app_files(null, $_lang, $app));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
@@ -516,7 +552,10 @@ 
 			// check if cache is NOT invalided by checking if we have a modification time for concerned lang-file
 			$time = Cache::getTree(__CLASS__, $file=self::get_lang_file($_app, $_lang));
 			// if we dont have one, cache has been invalidated and we need to load translations
-			if (!isset($time)) self::add_app($_app, $_lang);
+			if (!isset($time))
+			{
+				self::add_app($_app, $_lang);
+			}
 
 			$etag = self::max_lang_time();
 		}
@@ -568,7 +607,11 @@ 
 		$loaded = array();
 		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
 		{
-			if ($load_app == 'all-apps' && $app_dir=='..') continue; // do not try to break out of egw server root
+			if ($load_app == 'all-apps' && $app_dir=='..')
+			{
+				continue;
+			}
+			// do not try to break out of egw server root
 			if ($app_dir[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app_dir) ||
 				!@file_exists($file=self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
@@ -587,9 +630,15 @@ 
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
-				if (count($line) != 4) continue;
+				if (count($line) != 4)
+				{
+					continue;
+				}
 				list($l_id,$l_app,$l_lang,$l_translation) = $line;
-				if ($l_lang != $lang) continue;
+				if ($l_lang != $lang)
+				{
+					continue;
+				}
 				if (!isset($just_app_file) && $l_app != $app)
 				{
 					// check if $l_app contained in file in $app_dir is mentioned in $load_via
@@ -603,8 +652,14 @@ 
 						}
 						// if not update load_via accordingly and store it as config
 						//error_log(__METHOD__."() load_via does not contain $l_app => $app_dir");
-						if (!isset(self::$load_via[$l_app])) self::$load_via[$l_app] = array($l_app);
-						if (!is_array(self::$load_via[$l_app])) self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						if (!isset(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array($l_app);
+						}
+						if (!is_array(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						}
 						self::$load_via[$l_app][] = $app_dir;
 						$updated_load_via = true;
 					}
@@ -671,7 +726,10 @@ 
 
 			if ($translate)
 			{
-				if (is_null(self::$db)) self::init(false);
+				if (is_null(self::$db))
+				{
+					self::init(false);
+				}
 
 				foreach(self::$langs as $lang => $name)
 				{
@@ -704,10 +762,13 @@ 
 	 */
 	static function lang2language($lang)
 	{
-		if (isset(self::$langs[$lang]))	// no need to query the DB
+		if (isset(self::$langs[$lang]))
+		{
+			// no need to query the DB
 		{
 			return self::$langs[$lang];
 		}
+		}
 		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
 	}
 
@@ -746,7 +807,10 @@ 
 	 */
 	static function get_lang_file($app,$lang)
 	{
-		if ($app == 'common') $app = 'phpgwapi';
+		if ($app == 'common')
+		{
+			$app = 'phpgwapi';
+		}
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
 	}
 
@@ -809,9 +873,15 @@ 
 	{
 		if ($check_to_from)
 		{
-			if ($from) $from = strtolower($from);
+			if ($from)
+			{
+				$from = strtolower($from);
+			}
 
-			if ($to) $to = strtolower($to);
+			if ($to)
+			{
+				$to = strtolower($to);
+			}
 
 			if (!$from)
 			{
@@ -936,7 +1006,10 @@ 
 	 */
 	static function convert_jsonsafe($_data,$from=False)
 	{
-		if ($from===false) $from = self::detect_encoding($_data);
+		if ($from===false)
+		{
+			$from = self::detect_encoding($_data);
+		}
 
 		$data = self::convert($_data, strtolower($from));
 
@@ -1035,15 +1108,22 @@ 
 	static function get_message_id($translation,$app=null,$lang=null)
 	{
 		$where = array('content '.self::$db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.self::$db->quote($translation));
-		if ($app) $where['app_name'] = $app;
-		if ($lang) $where['lang'] = $lang;
+		if ($app)
+		{
+			$where['app_name'] = $app;
+		}
+		if ($lang)
+		{
+			$where['lang'] = $lang;
+		}
 
 		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
 
 		// Check cache, since most things aren't in the DB anymore
 		if(!$id)
 		{
-			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
+			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation)
+			{
 				return stripos(self::$lang_arr[$haystack],$translation) !== false;
 			});
 			$id = array_shift($ids);
@@ -1060,10 +1140,17 @@ 
 				}
 
 				// load all translations from cache at once
-				if ($tree_level) $lang_arr = Cache::getTree(__CLASS__, $tree_level);
-				if ($instance_level) $lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				if ($tree_level)
+				{
+					$lang_arr = Cache::getTree(__CLASS__, $tree_level);
+				}
+				if ($instance_level)
+				{
+					$lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				}
 				$lang_arr = $lang_arr[$app.':en'];
-				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
+				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr)
+				{
 					return stripos($lang_arr[$haystack],$translation) !== false;
 				});
 				$id = array_shift($ids);
@@ -1087,7 +1174,10 @@ 
 		{
 			$list = array('utf-8', 'iso-8859-1', 'windows-1251'); // list may be extended
 
-			if ($verify) array_unshift($list, $verify);
+			if ($verify)
+			{
+				array_unshift($list, $verify);
+			}
 
 			foreach ($list as $item)
 			{

api/src/Vfs.php

Doc Comments +4 added lines, -4 removed lines

@@ -152,7 +152,7 @@ 
 	 * dir working on just the eGW VFS: returns directory object
 	 *
 	 * @param string $path filename with absolute path in the eGW VFS
-	 * @return Directory
+	 * @return \Directory
 	 */
 	static function dir($path)
 	{
@@ -1295,7 +1295,7 @@ 
 	 * Also works around PHP under Windows returning dirname('/something') === '\\', which is NOT understood by EGroupware's VFS!
 	 *
 	 * @param string $_url path or url
-	 * @return string|boolean parent or false if there's none ($path == '/')
+	 * @return false|string parent or false if there's none ($path == '/')
 	 */
 	static function dirname($_url)
 	{
@@ -1719,7 +1719,7 @@ 
 	 * checkLock() helper
 	 *
 	 * @param  string resource path to check for locks
-	 * @return array|boolean false if there's no lock, else array with lock info
+	 * @return string|null false if there's no lock, else array with lock info
 	 */
 	static function checkLock($path)
 	{
@@ -1935,7 +1935,7 @@ 
 	/**
 	 * Copies the files given in $src to $dst.
 	 *
-	 * @param array $src contains the source file
+	 * @param string[] $src contains the source file
 	 * @param string $dst is the destination directory
 	 * @param int& $errs =null on return number of errors happened
 	 * @param array& $copied =null on return files copied

Indentation +33 added lines, -33 removed lines

@@ -672,7 +672,7 @@ 
 			return;	// not found, should not happen
 		}
 		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
-		    $type == 'F' && is_dir($path)))	// symlink to a directory
+			$type == 'F' && is_dir($path)))	// symlink to a directory
 		{
 			return;	// wrong type
 		}
@@ -1621,13 +1621,13 @@ 
 		{
 			return false;
 		}
-    	// remove the lock info evtl. set in the cache
-    	unset(self::$lock_cache[$path]);
+		// remove the lock info evtl. set in the cache
+		unset(self::$lock_cache[$path]);
 
-    	if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
-    	{
-    		$timeout += time();
-    	}
+		if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
+		{
+			$timeout += time();
+		}
 
 		if ($update)	// Lock Update
 		{
@@ -1688,32 +1688,32 @@ 
 		return $ret;
 	}
 
-    /**
-     * unlock a ressource/path
-     *
-     * @param string $path path to unlock
-     * @param string $token locktoken
+	/**
+	 * unlock a ressource/path
+	 *
+	 * @param string $path path to unlock
+	 * @param string $token locktoken
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
-     * @return boolean true on success
-     */
-    static function unlock($path,$token,$check_writable=true)
-    {
+	 * @return boolean true on success
+	 */
+	static function unlock($path,$token,$check_writable=true)
+	{
 		// we require write rights to lock/unlock a resource
 		if ($check_writable && !self::is_writable($path))
 		{
 			return false;
 		}
-        if (($ret = self::$db->delete(self::LOCK_TABLE,array(
-        	'lock_path' => $path,
-        	'lock_token' => $token,
-        ),__LINE__,__FILE__) && self::$db->affected_rows()))
-        {
-        	// remove the lock from the cache too
-        	unset(self::$lock_cache[$path]);
-        }
+		if (($ret = self::$db->delete(self::LOCK_TABLE,array(
+			'lock_path' => $path,
+			'lock_token' => $token,
+		),__LINE__,__FILE__) && self::$db->affected_rows()))
+		{
+			// remove the lock from the cache too
+			unset(self::$lock_cache[$path]);
+		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
 		return $ret;
-    }
+	}
 
 	/**
 	 * checkLock() helper
@@ -1741,13 +1741,13 @@ 
 		}
 		if ($result && $result['expires'] < time())	// lock is expired --> remove it
 		{
-	        self::$db->delete(self::LOCK_TABLE,array(
-	        	'lock_path' => $result['path'],
-	        	'lock_token' => $result['token'],
-	        ),__LINE__,__FILE__);
+			self::$db->delete(self::LOCK_TABLE,array(
+				'lock_path' => $result['path'],
+				'lock_token' => $result['token'],
+			),__LINE__,__FILE__);
 
 			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
-	        $result = false;
+			$result = false;
 		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
 		return self::$lock_cache[$path] = $result;
@@ -1887,9 +1887,9 @@ 
 			$image = Image::find($mime_sub, 'navbar');
 		}
 		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
-		         (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
-		         (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
-		         ($stat = self::stat($file)) && $stat['size'] < 1500000)
+				 (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
+				 (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
+				 ($stat = self::stat($file)) && $stat['size'] < 1500000)
 		{
 			if (substr($file, 0, 6) == '/apps/')
 			{

Spacing +269 added lines, -273 removed lines

@@ -124,13 +124,13 @@ 
 	 * @param string $mode 'r', 'w', ... like fopen
 	 * @return resource
 	 */
-	static function fopen($path,$mode)
+	static function fopen($path, $mode)
 	{
 		if ($path[0] != '/')
 		{
 			throw new Exception\AssertionFailed("Filename '$path' is not an absolute path!");
 		}
-		return fopen(self::PREFIX.$path,$mode);
+		return fopen(self::PREFIX.$path, $mode);
 	}
 
 	/**
@@ -170,13 +170,13 @@ 
 	 * @param int $sorting_order =0 !$sorting_order (default) alphabetical in ascending order, $sorting_order alphabetical in descending order.
 	 * @return array
 	 */
-	static function scandir($path,$sorting_order=0)
+	static function scandir($path, $sorting_order = 0)
 	{
 		if ($path[0] != '/')
 		{
 			throw new Exception\AssertionFailed("Directory '$path' is not an absolute path!");
 		}
-		return scandir(self::PREFIX.$path,$sorting_order);
+		return scandir(self::PREFIX.$path, $sorting_order);
 	}
 
 	/**
@@ -186,22 +186,22 @@ 
 	 * @param string $to
 	 * @return boolean
 	 */
-	static function copy($from,$to)
+	static function copy($from, $to)
 	{
-		$old_props = self::file_exists($to) ? self::propfind($to,null) : array();
+		$old_props = self::file_exists($to) ? self::propfind($to, null) : array();
 		// copy properties (eg. file comment), if there are any and evtl. existing old properties
-		$props = self::propfind($from,null);
+		$props = self::propfind($from, null);
 
-		foreach($old_props as $prop)
+		foreach ($old_props as $prop)
 		{
-			if (!self::find_prop($props,$prop))
+			if (!self::find_prop($props, $prop))
 			{
-				$prop['val'] = null;	// null = delete prop
+				$prop['val'] = null; // null = delete prop
 				$props[] = $prop;
 			}
 		}
 		// using self::copy_uploaded() to treat copying incl. properties as atomar operation in respect of notifications
-		return self::copy_uploaded(self::PREFIX.$from,$to,$props,false);	// false = no is_uploaded_file check!
+		return self::copy_uploaded(self::PREFIX.$from, $to, $props, false); // false = no is_uploaded_file check!
 	}
 
 	/**
@@ -212,14 +212,14 @@ 
 	 * @param string $ns =self::DEFAULT_PROP_NAMESPACE namespace, only if $prop is no array
 	 * @return &array reference to property in $props or null if not found
 	 */
-	static function &find_prop(array &$props,$name,$ns=self::DEFAULT_PROP_NAMESPACE)
+	static function &find_prop(array &$props, $name, $ns = self::DEFAULT_PROP_NAMESPACE)
 	{
 		if (is_array($name))
 		{
 			$ns = $name['ns'];
 			$name = $name['name'];
 		}
-		foreach($props as &$prop)
+		foreach ($props as &$prop)
 		{
 			if ($prop['name'] == $name && $prop['ns'] == $ns) return $prop;
 		}
@@ -233,15 +233,15 @@ 
 	 * @param boolean $try_create_home =false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function stat($path,$try_create_home=false)
+	static function stat($path, $try_create_home = false)
 	{
 		if ($path[0] != '/')
 		{
 			throw new Exception\AssertionFailed("File '$path' is not an absolute path!");
 		}
-		if (($stat = self::url_stat($path,0,$try_create_home)))
+		if (($stat = self::url_stat($path, 0, $try_create_home)))
 		{
-			$stat = array_slice($stat,13);	// remove numerical indices 0-12
+			$stat = array_slice($stat, 13); // remove numerical indices 0-12
 		}
 		return $stat;
 	}
@@ -253,15 +253,15 @@ 
 	 * @param boolean $try_create_home =false should a non-existing home-directory be automatically created
 	 * @return array
 	 */
-	static function lstat($path,$try_create_home=false)
+	static function lstat($path, $try_create_home = false)
 	{
 		if ($path[0] != '/')
 		{
 			throw new Exception\AssertionFailed("File '$path' is not an absolute path!");
 		}
-		if (($stat = self::url_stat($path,STREAM_URL_STAT_LINK,$try_create_home)))
+		if (($stat = self::url_stat($path, STREAM_URL_STAT_LINK, $try_create_home)))
 		{
-			$stat = array_slice($stat,13);	// remove numerical indices 0-12
+			$stat = array_slice($stat, 13); // remove numerical indices 0-12
 		}
 		return $stat;
 	}
@@ -312,9 +312,9 @@ 
 	 * @param boolean $clear_fstab =false true clear current fstab, false (default) only add given mount
 	 * @return array|boolean array with fstab, if called without parameter or true on successful mount
 	 */
-	static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
+	static function mount($url = null, $path = null, $check_url = null, $persitent_mount = true, $clear_fstab = false)
 	{
-		if (is_null($check_url)) $check_url = strpos($url,'$') === false;
+		if (is_null($check_url)) $check_url = strpos($url, '$') === false;
 
 		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))	// happens eg. in setup
 		{
@@ -340,7 +340,7 @@ 
 		if (!self::$is_root)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
-			return false;	// only root can mount
+			return false; // only root can mount
 		}
 		if ($clear_fstab)
 		{
@@ -349,14 +349,14 @@ 
 		if (isset(self::$fstab[$path]) && self::$fstab[$path] === $url)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
-			return true;	// already mounted
+			return true; // already mounted
 		}
-		self::load_wrapper(self::parse_url($url,PHP_URL_SCHEME));
+		self::load_wrapper(self::parse_url($url, PHP_URL_SCHEME));
 
 		if ($check_url && (!file_exists($url) || opendir($url) === false))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
-			return false;	// url does not exist
+			return false; // url does not exist
 		}
 		self::$fstab[$path] = $url;
 
@@ -367,10 +367,10 @@ 
 
 		if ($persitent_mount)
 		{
-			Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
+			Config::save_value('vfs_fstab', self::$fstab, 'phpgwapi');
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 			// invalidate session cache
-			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();
 			}
@@ -389,19 +389,19 @@ 
 		if (!self::$is_root)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
-			return false;	// only root can mount
+			return false; // only root can mount
 		}
-		if (!isset(self::$fstab[$path]) && ($path = array_search($path,self::$fstab)) === false)
+		if (!isset(self::$fstab[$path]) && ($path = array_search($path, self::$fstab)) === false)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
-			return false;	// $path not mounted
+			return false; // $path not mounted
 		}
 		unset(self::$fstab[$path]);
 
-		Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
+		Config::save_value('vfs_fstab', self::$fstab, 'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 		// invalidate session cache
-		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();
 		}
@@ -416,7 +416,7 @@ 
 	 * @param boolean $allow_versions =false allow .versions or .attic
 	 * @return boolean
 	 */
-	public static function is_hidden($path, $allow_versions=false)
+	public static function is_hidden($path, $allow_versions = false)
 	{
 		$file = self::basename($path);
 
@@ -452,30 +452,30 @@ 
 	 * @param array $exec_params =null further params for exec as array, path is always the first param and stat the last!
 	 * @return array of pathes if no $exec, otherwise path => stat pairs
 	 */
-	static function find($base,$options=null,$exec=null,$exec_params=null)
+	static function find($base, $options = null, $exec = null, $exec_params = null)
 	{
 		//error_log(__METHOD__."(".print_r($base,true).",".print_r($options,true).",".print_r($exec,true).",".print_r($exec_params,true).")\n");
 
-		$type = $options['type'];	// 'd', 'f' or 'F'
-		$dirs_last = $options['depth'];	// put content of dirs before the dir itself
+		$type = $options['type']; // 'd', 'f' or 'F'
+		$dirs_last = $options['depth']; // put content of dirs before the dir itself
 		// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
-		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
-		if ($dirsontop) $options['need_mime'] = true;	// otherwise dirsontop can NOT work
+		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth']) && $options['maxdepth'] > 0);
+		if ($dirsontop) $options['need_mime'] = true; // otherwise dirsontop can NOT work
 
 		// process some of the options (need to be done only once)
 		if (isset($options['name']) && !isset($options['name_preg']))	// change from simple *,? wildcards to preg regular expression once
 		{
-			$options['name_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['name'])).'$/i';
+			$options['name_preg'] = '/^'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($options['name'])).'$/i';
 		}
 		if (isset($options['path']) && !isset($options['preg_path']))	// change from simple *,? wildcards to preg regular expression once
 		{
-			$options['path_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['path'])).'$/i';
+			$options['path_preg'] = '/^'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($options['path'])).'$/i';
 		}
 		if (!isset($options['uid']))
 		{
 			if (isset($options['user']))
 			{
-				$options['uid'] = $GLOBALS['egw']->accounts->name2id($options['user'],'account_lid','u');
+				$options['uid'] = $GLOBALS['egw']->accounts->name2id($options['user'], 'account_lid', 'u');
 			}
 			elseif (isset($options['nouser']))
 			{
@@ -486,7 +486,7 @@ 
 		{
 			if (isset($options['group']))
 			{
-				$options['gid'] = abs($GLOBALS['egw']->accounts->name2id($options['group'],'account_lid','g'));
+				$options['gid'] = abs($GLOBALS['egw']->accounts->name2id($options['group'], 'account_lid', 'g'));
 			}
 			elseif (isset($options['nogroup']))
 			{
@@ -495,7 +495,7 @@ 
 		}
 		if ($options['order'] == 'mime')
 		{
-			$options['need_mime'] = true;	// we need to return the mime colum
+			$options['need_mime'] = true; // we need to return the mime colum
 		}
 		// implicit show deleted files, if hidden is enabled (requires versioning!)
 		if (!empty($options['hidden']) && !isset($options['show-deleted']))
@@ -513,37 +513,37 @@ 
 			$base = array($base);
 		}
 		$result = array();
-		foreach($base as $path)
+		foreach ($base as $path)
 		{
 			if (!$url)
 			{
 				if ($path[0] != '/' || !self::stat($path)) continue;
-				$path = self::PREFIX . $path;
+				$path = self::PREFIX.$path;
 			}
 			if (!isset($options['remove']))
 			{
-				$options['remove'] = count($base) == 1 ? count(explode('/',$path))-3+(int)(substr($path,-1)!='/') : 0;
+				$options['remove'] = count($base) == 1 ? count(explode('/', $path)) - 3 + (int)(substr($path, -1) != '/') : 0;
 			}
 			$is_dir = is_dir($path);
 			if ((int)$options['mindepth'] == 0 && (!$dirs_last || !$is_dir))
 			{
-				self::_check_add($options,$path,$result);
+				self::_check_add($options, $path, $result);
 			}
 			if ($is_dir && (!isset($options['maxdepth']) || ($options['maxdepth'] > 0 &&
 				$options['depth'] < $options['maxdepth'])) &&
 				($dir = @opendir($path, $context)))
 			{
-				while(($fname = readdir($dir)) !== false)
+				while (($fname = readdir($dir)) !== false)
 				{
-					if ($fname == '.' || $fname == '..') continue;	// ignore current and parent dir!
+					if ($fname == '.' || $fname == '..') continue; // ignore current and parent dir!
 
-					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue;	// ignore hidden files
+					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue; // ignore hidden files
 
 					$file = self::concat($path, $fname);
 
 					if ((int)$options['mindepth'] <= 1)
 					{
-						self::_check_add($options,$file,$result);
+						self::_check_add($options, $file, $result);
 					}
 					// only descend into subdirs, if it's a real dir (no link to a dir) or we should follow symlinks
 					if (is_dir($file) && ($options['follow'] || !is_link($file)) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
@@ -553,7 +553,7 @@ 
 						if ($opts['maxdepth']) $opts['depth']++;
 						unset($opts['order']);
 						unset($opts['limit']);
-						foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s)
+						foreach (self::find($options['url'] ? $file : self::parse_url($file, PHP_URL_PATH), $opts, true) as $p => $s)
 						{
 							unset($result[$p]);
 							$result[$p] = $s;
@@ -564,7 +564,7 @@ 
 			}
 			if ($is_dir && (int)$options['mindepth'] == 0 && $dirs_last)
 			{
-				self::_check_add($options,$path,$result);
+				self::_check_add($options, $path, $result);
 			}
 		}
 		// sort code, to place directories before files, if $dirsontop enabled
@@ -574,7 +574,7 @@ 
 		if (isset($options['order']))
 		{
 			$sort = strtolower($options['sort']) == 'desc' ? '-' : '';
-			switch($options['order'])
+			switch ($options['order'])
 			{
 				// sort numerical
 				case 'size':
@@ -586,7 +586,7 @@ 
 					$code = $dirsfirst.$sort.'($a[\''.$options['order'].'\']-$b[\''.$options['order'].'\']);';
 					// always use name as second sort criteria
 					$code = '$cmp = '.$code.' return $cmp ? $cmp : strcasecmp($a[\'name\'],$b[\'name\']);';
-					$ok = uasort($result,create_function('$a,$b',$code));
+					$ok = uasort($result, create_function('$a,$b', $code));
 					break;
 
 				// sort alphanumerical
@@ -605,7 +605,7 @@ 
 					{
 						$code = 'return '.$code;
 					}
-					$ok = uasort($result,create_function('$a,$b',$code));
+					$ok = uasort($result, create_function('$a,$b', $code));
 					break;
 			}
 			//echo "<p>order='$options[order]', sort='$options[sort]' --> uasort($result,create_function(,'$code'))=".array2string($ok)."</p>>\n";
@@ -614,13 +614,13 @@ 
 		self::$find_total = count($result);
 		if (isset($options['limit']))
 		{
-			list($limit,$start) = explode(',',$options['limit']);
+			list($limit, $start) = explode(',', $options['limit']);
 			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches'])) $limit = 15;
 			//echo "total=".self::$find_total.", limit=$options[limit] --> start=$start, limit=$limit<br>\n";
 
 			if ((int)$start || self::$find_total > $limit)
 			{
-				$result = array_slice($result,(int)$start,(int)$limit,true);
+				$result = array_slice($result, (int)$start, (int)$limit, true);
 			}
 		}
 		//echo $path; _debug_array($result);
@@ -630,13 +630,13 @@ 
 			{
 				$exec_params = is_null($exec_params) ? array() : array($exec_params);
 			}
-			foreach($result as $path => &$stat)
+			foreach ($result as $path => &$stat)
 			{
 				$options = $exec_params;
-				array_unshift($options,$path);
-				array_push($options,$stat);
+				array_unshift($options, $path);
+				array_push($options, $stat);
 				//echo "calling ".print_r($exec,true).print_r($options,true)."\n";
-				$stat = call_user_func_array($exec,$options);
+				$stat = call_user_func_array($exec, $options);
 			}
 			return $result;
 		}
@@ -655,9 +655,9 @@ 
 	 * @param string $path name of path to add
 	 * @param array &$result here we add the stat for the key $path, if the checks are successful
 	 */
-	private static function _check_add($options,$path,&$result)
+	private static function _check_add($options, $path, &$result)
 	{
-		$type = $options['type'];	// 'd' or 'f'
+		$type = $options['type']; // 'd' or 'f'
 
 		if ($options['url'])
 		{
@@ -665,35 +665,35 @@ 
 		}
 		else
 		{
-			$stat = self::url_stat($path,STREAM_URL_STAT_LINK);
+			$stat = self::url_stat($path, STREAM_URL_STAT_LINK);
 		}
 		if (!$stat)
 		{
-			return;	// not found, should not happen
+			return; // not found, should not happen
 		}
-		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
+		if ($type && (($type == 'd') == !($stat['mode']&Vfs\Sqlfs\StreamWrapper::MODE_DIR) || // != is_dir() which can be true for symlinks
 		    $type == 'F' && is_dir($path)))	// symlink to a directory
 		{
-			return;	// wrong type
+			return; // wrong type
 		}
-		$stat = array_slice($stat,13);	// remove numerical indices 0-12
-		$stat['path'] = self::parse_url($path,PHP_URL_PATH);
-		$stat['name'] = $options['remove'] > 0 ? implode('/',array_slice(explode('/',$stat['path']),$options['remove'])) : self::basename($path);
+		$stat = array_slice($stat, 13); // remove numerical indices 0-12
+		$stat['path'] = self::parse_url($path, PHP_URL_PATH);
+		$stat['name'] = $options['remove'] > 0 ? implode('/', array_slice(explode('/', $stat['path']), $options['remove'])) : self::basename($path);
 
 		if ($options['mime'] || $options['need_mime'])
 		{
 			$stat['mime'] = self::mime_content_type($path);
 		}
-		if (isset($options['name_preg']) && !preg_match($options['name_preg'],$stat['name']) ||
-			isset($options['path_preg']) && !preg_match($options['path_preg'],$path))
+		if (isset($options['name_preg']) && !preg_match($options['name_preg'], $stat['name']) ||
+			isset($options['path_preg']) && !preg_match($options['path_preg'], $path))
 		{
 			//echo "<p>!preg_match('{$options['name_preg']}','{$stat['name']}')</p>\n";
-			return;	// wrong name or path
+			return; // wrong name or path
 		}
 		if (isset($options['gid']) && $stat['gid'] != $options['gid'] ||
 			isset($options['uid']) && $stat['uid'] != $options['uid'])
 		{
-			return;	// wrong user or group
+			return; // wrong user or group
 		}
 		if (isset($options['mime']) && $options['mime'] != $stat['mime'])
 		{
@@ -701,40 +701,40 @@ 
 			{
 				if (!preg_match($options['mime'], $stat['mime']))
 				{
-					return;	// wrong mime-type
+					return; // wrong mime-type
 				}
 			}
 			else
 			{
-				list($type,$subtype) = explode('/',$options['mime']);
+				list($type, $subtype) = explode('/', $options['mime']);
 				// no subtype (eg. 'image') --> check only the main type
-				if ($subtype || substr($stat['mime'],0,strlen($type)+1) != $type.'/')
+				if ($subtype || substr($stat['mime'], 0, strlen($type) + 1) != $type.'/')
 				{
-					return;	// wrong mime-type
+					return; // wrong mime-type
 				}
 			}
 		}
-		if (isset($options['size']) && !self::_check_num($stat['size'],$options['size']) ||
+		if (isset($options['size']) && !self::_check_num($stat['size'], $options['size']) ||
 			(isset($options['empty']) && !!$options['empty'] !== !$stat['size']))
 		{
-			return;	// wrong size
+			return; // wrong size
 		}
-		if (isset($options['cmin']) && !self::_check_num(round((time()-$stat['ctime'])/60),$options['cmin']) ||
-			isset($options['mmin']) && !self::_check_num(round((time()-$stat['mtime'])/60),$options['mmin']) ||
-			isset($options['ctime']) && !self::_check_num(round((time()-$stat['ctime'])/86400),$options['ctime']) ||
-			isset($options['mtime']) && !self::_check_num(round((time()-$stat['mtime'])/86400),$options['mtime']))
+		if (isset($options['cmin']) && !self::_check_num(round((time() - $stat['ctime']) / 60), $options['cmin']) ||
+			isset($options['mmin']) && !self::_check_num(round((time() - $stat['mtime']) / 60), $options['mmin']) ||
+			isset($options['ctime']) && !self::_check_num(round((time() - $stat['ctime']) / 86400), $options['ctime']) ||
+			isset($options['mtime']) && !self::_check_num(round((time() - $stat['mtime']) / 86400), $options['mtime']))
 		{
-			return;	// not create/modified in the spezified time
+			return; // not create/modified in the spezified time
 		}
 		// do we return url or just vfs pathes
 		if (!$options['url'])
 		{
-			$path = self::parse_url($path,PHP_URL_PATH);
+			$path = self::parse_url($path, PHP_URL_PATH);
 		}
 		$result[$path] = $stat;
 	}
 
-	private static function _check_num($value,$argument)
+	private static function _check_num($value, $argument)
 	{
 		if (is_int($argument) && $argument >= 0 || $argument[0] != '-' && $argument[0] != '+')
 		{
@@ -747,7 +747,7 @@ 
 			return $value < abs($argument);
 		}
 		//echo "_check_num($value,$argument) check > == ".(int)($value > (int)substr($argument,1))."\n";
-		return $value > (int) substr($argument,1);
+		return $value > (int)substr($argument, 1);
 	}
 
 	/**
@@ -758,18 +758,18 @@ 
 	 * @throws Exception\AssertionFailed when trainig to remove /, /apps or /home
 	 * @return array
 	 */
-	static function remove($urls,$allow_urls=false)
+	static function remove($urls, $allow_urls = false)
 	{
 		//error_log(__METHOD__.'('.array2string($urls).')');
 		// some precaution to never allow to (recursivly) remove /, /apps or /home
-		foreach((array)$urls as $url)
+		foreach ((array)$urls as $url)
 		{
-			if (preg_match('/^\/?(home|apps|)\/*$/',self::parse_url($url,PHP_URL_PATH)))
+			if (preg_match('/^\/?(home|apps|)\/*$/', self::parse_url($url, PHP_URL_PATH)))
 			{
 				throw new Exception\AssertionFailed(__METHOD__.'('.array2string($urls).") Cautiously rejecting to remove folder '$url'!");
 			}
 		}
-		return self::find($urls,array('depth'=>true,'url'=>$allow_urls,'hidden'=>true),array(__CLASS__,'_rm_rmdir'));
+		return self::find($urls, array('depth'=>true, 'url'=>$allow_urls, 'hidden'=>true), array(__CLASS__, '_rm_rmdir'));
 	}
 
 	/**
@@ -782,11 +782,11 @@ 
 	{
 		if ($url[0] == '/')
 		{
-			$url = self::PREFIX . $url;
+			$url = self::PREFIX.$url;
 		}
 		if (is_dir($url) && !is_link($url))
 		{
-			return self::rmdir($url,0);
+			return self::rmdir($url, 0);
 		}
 		return self::unlink($url);
 	}
@@ -800,9 +800,9 @@ 
 	 * 	2 = self::WRITABLE, 1 = self::EXECUTABLE
 	 * @return boolean
 	 */
-	static function is_readable($path,$check = self::READABLE)
+	static function is_readable($path, $check = self::READABLE)
 	{
-		return self::check_access($path,$check);
+		return self::check_access($path, $check);
 	}
 
 	/**
@@ -816,7 +816,7 @@ 
 	 * @param int $user =null user used for check, if not current user (self::$user)
 	 * @return boolean
 	 */
-	static function check_access($path, $check, $stat=null, $user=null)
+	static function check_access($path, $check, $stat = null, $user = null)
 	{
 		if (is_null($stat) && $user && $user != self::$user)
 		{
@@ -831,7 +831,7 @@ 
 
 				$path_user_stat[$path][$user] = self::url_stat($path, 0);
 
-				self::clearstatcache($path);	// we need to clear the stat-cache after the call too, as the next call might be the regular user again!
+				self::clearstatcache($path); // we need to clear the stat-cache after the call too, as the next call might be the regular user again!
 			}
 			if (($stat = $path_user_stat[$path][$user]))
 			{
@@ -847,7 +847,7 @@ 
 			}
 			else
 			{
-				$ret = false;	// no access, if we can not stat the file
+				$ret = false; // no access, if we can not stat the file
 			}
 			self::$user = $backup_user;
 
@@ -871,20 +871,20 @@ 
 		// query stat array, if not given
 		if (is_null($stat))
 		{
-			$stat = self::url_stat($path,0);
+			$stat = self::url_stat($path, 0);
 		}
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check)");
 
 		if (!$stat)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) no stat array!");
-			return false;	// file not found
+			return false; // file not found
 		}
 		// check if we use an EGroupwre stream wrapper, or a stock php one
 		// if it's not an EGroupware one, we can NOT use uid, gid and mode!
-		if (($scheme = self::parse_url($stat['url'],PHP_URL_SCHEME)) && !(class_exists(self::scheme2class($scheme))))
+		if (($scheme = self::parse_url($stat['url'], PHP_URL_SCHEME)) && !(class_exists(self::scheme2class($scheme))))
 		{
-			switch($check)
+			switch ($check)
 			{
 				case self::READABLE:
 					return is_readable($stat['url']);
@@ -895,19 +895,19 @@ 
 			}
 		}
 		// check if other rights grant access
-		if (($stat['mode'] & $check) == $check)
+		if (($stat['mode']&$check) == $check)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) access via other rights!");
 			return true;
 		}
 		// check if there's owner access and we are the owner
-		if (($stat['mode'] & ($check << 6)) == ($check << 6) && $stat['uid'] && $stat['uid'] == self::$user)
+		if (($stat['mode']&($check << 6)) == ($check << 6) && $stat['uid'] && $stat['uid'] == self::$user)
 		{
 			//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) access via owner rights!");
 			return true;
 		}
 		// check if there's a group access and we have the right membership
-		if (($stat['mode'] & ($check << 3)) == ($check << 3) && $stat['gid'])
+		if (($stat['mode']&($check << 3)) == ($check << 3) && $stat['gid'])
 		{
 			if (($memberships = $GLOBALS['egw']->accounts->memberships(self::$user, true)) && in_array(-abs($stat['gid']), $memberships))
 			{
@@ -916,7 +916,7 @@ 
 			}
 		}
 		// check backend for extended acls (only if path given)
-		$ret = $path && self::_call_on_backend('check_extended_acl',array(isset($stat['url'])?$stat['url']:$path,$check),true);	// true = fail silent if backend does not support
+		$ret = $path && self::_call_on_backend('check_extended_acl', array(isset($stat['url']) ? $stat['url'] : $path, $check), true); // true = fail silent if backend does not support
 
 		//error_log(__METHOD__."(path=$path||stat[name]={$stat['name']},stat[mode]=".sprintf('%o',$stat['mode']).",$check) ".($ret ? 'backend extended acl granted access.' : 'no access!!!'));
 		return $ret;
@@ -931,7 +931,7 @@ 
 	 */
 	static function is_writable($path)
 	{
-		return self::is_readable($path,self::WRITABLE);
+		return self::is_readable($path, self::WRITABLE);
 	}
 
 	/**
@@ -943,7 +943,7 @@ 
 	 */
 	static function is_executable($path)
 	{
-		return self::is_readable($path,self::EXECUTABLE);
+		return self::is_readable($path, self::EXECUTABLE);
 	}
 
 	/**
@@ -954,7 +954,7 @@ 
 	 */
 	static function deny_script($path)
 	{
-		return self::_call_on_backend('deny_script',array($path),true);
+		return self::_call_on_backend('deny_script', array($path), true);
 	}
 
 	/**
@@ -973,11 +973,11 @@ 
 	 * @param boolean $session_only =false true: set eacl only for this session, does NO further checks currently!
 	 * @return boolean true if acl is set/deleted, false on error
 	 */
-	static function eacl($url,$rights=null,$owner=null,$session_only=false)
+	static function eacl($url, $rights = null, $owner = null, $session_only = false)
 	{
 		if ($session_only)
 		{
-			$session_eacls =& Cache::getSession(__CLASS__, self::SESSION_EACL);
+			$session_eacls = & Cache::getSession(__CLASS__, self::SESSION_EACL);
 			$session_eacls[] = array(
 				'path'   => $url[0] == '/' ? $url : self::parse_url($url, PHP_URL_PATH),
 				'owner'  => $owner ? $owner : self::$user,
@@ -985,7 +985,7 @@ 
 			);
 			return true;
 		}
-		return self::_call_on_backend('eacl',array($url,$rights,$owner));
+		return self::_call_on_backend('eacl', array($url, $rights, $owner));
 	}
 
 	/**
@@ -998,9 +998,9 @@ 
 	 */
 	static function get_eacl($path)
 	{
-		$eacls = self::_call_on_backend('get_eacl',array($path),true);	// true = fail silent (no PHP Warning)
+		$eacls = self::_call_on_backend('get_eacl', array($path), true); // true = fail silent (no PHP Warning)
 
-		$session_eacls =& Cache::getSession(__CLASS__, self::SESSION_EACL);
+		$session_eacls = & Cache::getSession(__CLASS__, self::SESSION_EACL);
 		if ($session_eacls)
 		{
 			// eacl is recursive, therefore we have to match all parent-dirs too
@@ -1009,7 +1009,7 @@ 
 			{
 				$paths[] = $path = self::dirname($path);
 			}
-			foreach((array)$session_eacls as $eacl)
+			foreach ((array)$session_eacls as $eacl)
 			{
 				if (in_array($eacl['path'], $paths))
 				{
@@ -1032,9 +1032,9 @@ 
 	 * @param array $props array of array with values for keys 'name', 'ns', 'val' (null to delete the prop)
 	 * @return boolean true if props are updated, false otherwise (eg. ressource not found)
 	 */
-	static function proppatch($path,array $props)
+	static function proppatch($path, array $props)
 	{
-		return self::_call_on_backend('proppatch',array($path,$props));
+		return self::_call_on_backend('proppatch', array($path, $props));
 	}
 
 	/**
@@ -1051,9 +1051,9 @@ 
 	 * @return array|boolean array with props (values for keys 'name', 'ns', 'val'), or path => array of props for is_array($path)
 	 * 	false if $path does not exist
 	 */
-	static function propfind($path,$ns=self::DEFAULT_PROP_NAMESPACE)
+	static function propfind($path, $ns = self::DEFAULT_PROP_NAMESPACE)
 	{
-		return self::_call_on_backend('propfind',array($path,$ns),true);	// true = fail silent (no PHP Warning)
+		return self::_call_on_backend('propfind', array($path, $ns), true); // true = fail silent (no PHP Warning)
 	}
 
 	/**
@@ -1071,7 +1071,7 @@ 
 	 * @param int $mode =0 current mode of the file, necessary for +/- operation
 	 * @return int
 	 */
-	static function mode2int($set,$mode=0)
+	static function mode2int($set, $mode = 0)
 	{
 		if (is_int($set))		// already an integer
 		{
@@ -1080,23 +1080,23 @@ 
 		if (is_numeric($set))	// octal string
 		{
 			//error_log(__METHOD__."($set,$mode) returning ".(int)base_convert($set,8,10));
-			return (int)base_convert($set,8,10);	// convert octal to decimal
+			return (int)base_convert($set, 8, 10); // convert octal to decimal
 		}
-		foreach(explode(',',$set) as $s)
+		foreach (explode(',', $set) as $s)
 		{
 			$matches = null;
-			if (!preg_match($use='/^([ugoa]*)([+=-]+)([rwx]+)$/',$s,$matches))
+			if (!preg_match($use = '/^([ugoa]*)([+=-]+)([rwx]+)$/', $s, $matches))
 			{
-				$use = str_replace(array('/','^','$','(',')'),'',$use);
+				$use = str_replace(array('/', '^', '$', '(', ')'), '', $use);
 				throw new Exception\WrongUserinput("$s is not an allowed mode, use $use !");
 			}
-			$base = (strpos($matches[3],'r') !== false ? self::READABLE : 0) |
-				(strpos($matches[3],'w') !== false ? self::WRITABLE : 0) |
-				(strpos($matches[3],'x') !== false ? self::EXECUTABLE : 0);
+			$base = (strpos($matches[3], 'r') !== false ? self::READABLE : 0)|
+				(strpos($matches[3], 'w') !== false ? self::WRITABLE : 0)|
+				(strpos($matches[3], 'x') !== false ? self::EXECUTABLE : 0);
 
-			for($n = $m = 0; $n < strlen($matches[1]); $n++)
+			for ($n = $m = 0; $n < strlen($matches[1]); $n++)
 			{
-				switch($matches[1][$n])
+				switch ($matches[1][$n])
 				{
 					case 'o':
 						$m |= $base;
@@ -1109,10 +1109,10 @@ 
 						break;
 					default:
 					case 'a':
-						$m = $base | ($base << 3) | ($base << 6);
+						$m = $base|($base << 3)|($base << 6);
 				}
 			}
-			switch($matches[2])
+			switch ($matches[2])
 			{
 				case '+':
 					$mode |= $m;
@@ -1134,33 +1134,33 @@ 
 	 * @param int $mode
 	 * @return string
 	 */
-	static function int2mode( $mode )
+	static function int2mode($mode)
 	{
-		if(($mode & self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
+		if (($mode&self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
 		{
 			$sP = 'l';
 		}
-		elseif(($mode & 0xC000) == 0xC000) // Socket
+		elseif (($mode&0xC000) == 0xC000) // Socket
 		{
 			$sP = 's';
 		}
-		elseif($mode & 0x1000)     // FIFO pipe
+		elseif ($mode&0x1000)     // FIFO pipe
 		{
 			$sP = 'p';
 		}
-		elseif($mode & 0x2000) // Character special
+		elseif ($mode&0x2000) // Character special
 		{
 			$sP = 'c';
 		}
-		elseif($mode & 0x4000) // Directory
+		elseif ($mode&0x4000) // Directory
 		{
 			$sP = 'd';
 		}
-		elseif($mode & 0x6000) // Block special
+		elseif ($mode&0x6000) // Block special
 		{
 			$sP = 'b';
 		}
-		elseif($mode & 0x8000) // Regular
+		elseif ($mode&0x8000) // Regular
 		{
 			$sP = '-';
 		}
@@ -1170,22 +1170,19 @@ 
 		}
 
 		// owner
-		$sP .= (($mode & 0x0100) ? 'r' : '-') .
-		(($mode & 0x0080) ? 'w' : '-') .
-		(($mode & 0x0040) ? (($mode & 0x0800) ? 's' : 'x' ) :
-		(($mode & 0x0800) ? 'S' : '-'));
+		$sP .= (($mode&0x0100) ? 'r' : '-').
+		(($mode&0x0080) ? 'w' : '-').
+		(($mode&0x0040) ? (($mode&0x0800) ? 's' : 'x') : (($mode&0x0800) ? 'S' : '-'));
 
 		// group
-		$sP .= (($mode & 0x0020) ? 'r' : '-') .
-		(($mode & 0x0010) ? 'w' : '-') .
-		(($mode & 0x0008) ? (($mode & 0x0400) ? 's' : 'x' ) :
-		(($mode & 0x0400) ? 'S' : '-'));
+		$sP .= (($mode&0x0020) ? 'r' : '-').
+		(($mode&0x0010) ? 'w' : '-').
+		(($mode&0x0008) ? (($mode&0x0400) ? 's' : 'x') : (($mode&0x0400) ? 'S' : '-'));
 
 		// world
-		$sP .= (($mode & 0x0004) ? 'r' : '-') .
-		(($mode & 0x0002) ? 'w' : '-') .
-		(($mode & 0x0001) ? (($mode & 0x0200) ? 't' : 'x' ) :
-		(($mode & 0x0200) ? 'T' : '-'));
+		$sP .= (($mode&0x0004) ? 'r' : '-').
+		(($mode&0x0002) ? 'w' : '-').
+		(($mode&0x0001) ? (($mode&0x0200) ? 't' : 'x') : (($mode&0x0200) ? 'T' : '-'));
 
 		return $sP;
 	}
@@ -1198,26 +1195,26 @@ 
 	 * @param int $size =128
 	 * @return string
 	 */
-	static function mime_icon($mime_type, $et_image=true, $size=128)
+	static function mime_icon($mime_type, $et_image = true, $size = 128)
 	{
 		if ($mime_type == self::DIR_MIME_TYPE)
 		{
 			$mime_type = 'Directory';
 		}
-		if(!$mime_type)
+		if (!$mime_type)
 		{
 			$mime_type = 'unknown';
 		}
-		$mime_full = strtolower(str_replace	('/','_',$mime_type));
-		list($mime_part) = explode('_',$mime_full);
+		$mime_full = strtolower(str_replace('/', '_', $mime_type));
+		list($mime_part) = explode('_', $mime_full);
 
-		if (!($img=Image::find('etemplate',$icon='mime'.$size.'_'.$mime_full)) &&
+		if (!($img = Image::find('etemplate', $icon = 'mime'.$size.'_'.$mime_full)) &&
 			// check mime-alias-map before falling back to more generic icons
 			!(isset(MimeMagic::$mime_alias_map[$mime_type]) &&
-				($img=Image::find('etemplate',$icon='mime'.$size.'_'.str_replace('/','_',MimeMagic::$mime_alias_map[$mime_full])))) &&
-			!($img=Image::find('etemplate',$icon='mime'.$size.'_'.$mime_part)))
+				($img = Image::find('etemplate', $icon = 'mime'.$size.'_'.str_replace('/', '_', MimeMagic::$mime_alias_map[$mime_full])))) &&
+			!($img = Image::find('etemplate', $icon = 'mime'.$size.'_'.$mime_part)))
 		{
-			$img = Image::find('etemplate',$icon='mime'.$size.'_unknown');
+			$img = Image::find('etemplate', $icon = 'mime'.$size.'_unknown');
 		}
 		return $et_image ? 'etemplate/'.$icon : $img;
 	}
@@ -1231,9 +1228,9 @@ 
 	static function hsize($size)
 	{
 		if ($size < 1024) return $size;
-		if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-		if ($size < 1024*1024*1024) return sprintf('%3.1lfM',(float)$size/(1024*1024));
-		return sprintf('%3.1lfG',(float)$size/(1024*1024*1024));
+		if ($size < 1024 * 1024) return sprintf('%3.1lfk', (float)$size / 1024);
+		if ($size < 1024 * 1024 * 1024) return sprintf('%3.1lfM', (float)$size / (1024 * 1024));
+		return sprintf('%3.1lfG', (float)$size / (1024 * 1024 * 1024));
 	}
 
 	/**
@@ -1243,7 +1240,7 @@ 
 	 */
 	static function int_size($_val)
 	{
-		if(empty($_val))return 0;
+		if (empty($_val))return 0;
 
 		$val = trim($_val);
 
@@ -1251,12 +1248,12 @@ 
 		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
 
 		$last = '';
-		if(isset($matches[2])){
+		if (isset($matches[2])) {
 			$last = $matches[2];
 		}
 
-		if(isset($matches[1])){
-			$val = (int) $matches[1];
+		if (isset($matches[1])) {
+			$val = (int)$matches[1];
 		}
 
 		switch (strtolower($last))
@@ -1272,7 +1269,7 @@ 
 			$val *= 1024;
 		}
 
-		return (int) $val;
+		return (int)$val;
 	}
 
 	/**
@@ -1283,8 +1280,8 @@ 
 	 */
 	static function basename($_path)
 	{
-		list($path) = explode('?',$_path);	// remove query
-		$parts = explode('/',$path);
+		list($path) = explode('?', $_path); // remove query
+		$parts = explode('/', $path);
 
 		return array_pop($parts);
 	}
@@ -1299,22 +1296,22 @@ 
 	 */
 	static function dirname($_url)
 	{
-		list($url,$query) = explode('?',$_url,2);	// strip the query first, as it can contain slashes
+		list($url, $query) = explode('?', $_url, 2); // strip the query first, as it can contain slashes
 
-		if ($url == '/' || $url[0] != '/' && self::parse_url($url,PHP_URL_PATH) == '/')
+		if ($url == '/' || $url[0] != '/' && self::parse_url($url, PHP_URL_PATH) == '/')
 		{
 			//error_log(__METHOD__."($url) returning FALSE: already in root!");
 			return false;
 		}
-		$parts = explode('/',$url);
-		if (substr($url,-1) == '/') array_pop($parts);
+		$parts = explode('/', $url);
+		if (substr($url, -1) == '/') array_pop($parts);
 		array_pop($parts);
 		if ($url[0] != '/' && count($parts) == 3 || count($parts) == 1 && $parts[0] === '')
 		{
-			array_push($parts,'');	// scheme://host is wrong (no path), has to be scheme://host/
+			array_push($parts, ''); // scheme://host is wrong (no path), has to be scheme://host/
 		}
 		//error_log(__METHOD__."($url)=".implode('/',$parts).($query ? '?'.$query : ''));
-		return implode('/',$parts).($query ? '?'.$query : '');
+		return implode('/', $parts).($query ? '?'.$query : '');
 	}
 
 	/**
@@ -1326,13 +1323,13 @@ 
 	 * @param array $stat =null stat for path, default queried by this function
 	 * @return boolean
 	 */
-	static function has_owner_rights($path,array $stat=null)
+	static function has_owner_rights($path, array $stat = null)
 	{
-		if (!$stat) $stat = self::url_stat($path,0);
+		if (!$stat) $stat = self::url_stat($path, 0);
 
-		return $stat['uid'] == self::$user ||	// user is the owner
-			self::$is_root ||					// class runs with root rights
-			!$stat['uid'] && $stat['gid'] && self::$is_admin;	// group directory and user is an eGW admin
+		return $stat['uid'] == self::$user || // user is the owner
+			self::$is_root || // class runs with root rights
+			!$stat['uid'] && $stat['gid'] && self::$is_admin; // group directory and user is an eGW admin
 	}
 
 	/**
@@ -1344,22 +1341,22 @@ 
 	 * @param string $relative relative path to add to $url
 	 * @return string
 	 */
-	static function concat($_url,$relative)
+	static function concat($_url, $relative)
 	{
-		list($url,$query) = explode('?',$_url,2);
-		if (substr($url,-1) == '/') $url = substr($url,0,-1);
+		list($url, $query) = explode('?', $_url, 2);
+		if (substr($url, -1) == '/') $url = substr($url, 0, -1);
 		$ret = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
 
 		// now normalize the path (remove "/something/..")
-		while (strpos($ret,'/../') !== false)
+		while (strpos($ret, '/../') !== false)
 		{
-			list($a_str,$b_str) = explode('/../',$ret,2);
-			$a = explode('/',$a_str);
+			list($a_str, $b_str) = explode('/../', $ret, 2);
+			$a = explode('/', $a_str);
 			array_pop($a);
-			$b = explode('/',$b_str);
-			$ret = implode('/',array_merge($a,$b));
+			$b = explode('/', $b_str);
+			$ret = implode('/', array_merge($a, $b));
 		}
-		return $ret.($query ? (strpos($url,'?')===false ? '?' : '&').$query : '');
+		return $ret.($query ? (strpos($url, '?') === false ? '?' : '&').$query : '');
 	}
 
 	/**
@@ -1370,11 +1367,11 @@ 
 	 */
 	static function build_url(array $url_parts)
 	{
-		$url = (!isset($url_parts['scheme'])?'':$url_parts['scheme'].'://'.
-			(!isset($url_parts['user'])?'':$url_parts['user'].(!isset($url_parts['pass'])?'':':'.$url_parts['pass']).'@').
+		$url = (!isset($url_parts['scheme']) ? '' : $url_parts['scheme'].'://'.
+			(!isset($url_parts['user']) ? '' : $url_parts['user'].(!isset($url_parts['pass']) ? '' : ':'.$url_parts['pass']).'@').
 			$url_parts['host']).$url_parts['path'].
-			(!isset($url_parts['query'])?'':'?'.$url_parts['query']).
-			(!isset($url_parts['fragment'])?'':'?'.$url_parts['fragment']);
+			(!isset($url_parts['query']) ? '' : '?'.$url_parts['query']).
+			(!isset($url_parts['fragment']) ? '' : '?'.$url_parts['fragment']);
 		//error_log(__METHOD__.'('.array2string($url_parts).") = '".$url."'");
 		return $url;
 	}
@@ -1392,19 +1389,19 @@ 
 	 * @todo get $force_download working through webdav
 	 * @return string
 	 */
-	static function download_url($path,$force_download=false)
+	static function download_url($path, $force_download = false)
 	{
-		if (($url = self::_call_on_backend('download_url',array($path,$force_download),true)))
+		if (($url = self::_call_on_backend('download_url', array($path, $force_download), true)))
 		{
 			return $url;
 		}
 		if ($path[0] != '/')
 		{
-			$path = self::parse_url($path,PHP_URL_PATH);
+			$path = self::parse_url($path, PHP_URL_PATH);
 		}
 		// we do NOT need to encode % itself, as our path are already url encoded, with the exception of ' ' and '+'
 		// we urlencode double quotes '"', as that fixes many problems in html markup
-		return '/webdav.php'.strtr($path,array('+' => '%2B',' ' => '%20','"' => '%22')).($force_download ? '?download' : '');
+		return '/webdav.php'.strtr($path, array('+' => '%2B', ' ' => '%20', '"' => '%22')).($force_download ? '?download' : '');
 	}
 
 	/**
@@ -1432,12 +1429,12 @@ 
 		// eg: User selected /home/nathan/picture.jpg, /home/Pictures/logo.jpg
 		// We want /home
 		$dirs = array();
-		foreach($_files as $file)
+		foreach ($_files as $file)
 		{
 			$dirs[] = self::dirname($file);
 		}
 		$paths = array_unique($dirs);
-		if(count($paths) > 0)
+		if (count($paths) > 0)
 		{
 			// Shortest to longest
 			usort($paths, function($a, $b) {
@@ -1445,13 +1442,13 @@ 
 			});
 
 			// Start with shortest, pop off sub-directories that don't match
-			$parts = explode('/',$paths[0]);
-			foreach($paths as $path)
+			$parts = explode('/', $paths[0]);
+			foreach ($paths as $path)
 			{
-				$dirs = explode('/',$path);
-				foreach($dirs as $dir_index => $dir)
+				$dirs = explode('/', $path);
+				foreach ($dirs as $dir_index => $dir)
 				{
-					if($parts[$dir_index] && $parts[$dir_index] != $dir)
+					if ($parts[$dir_index] && $parts[$dir_index] != $dir)
 					{
 						unset($parts[$dir_index]);
 					}
@@ -1470,24 +1467,23 @@ 
 			// Linux
 			'/',
 			// Windows
-			'\\','?','%','*',':','|',/*'.',*/ '"','<','>'
+			'\\', '?', '%', '*', ':', '|', /*'.',*/ '"', '<', '>'
 		);
 
 		// A nice name for the user,
-		$filename = $GLOBALS['egw_info']['server']['site_title'] . '_' .
-			str_replace($replace,'_',(
+		$filename = $GLOBALS['egw_info']['server']['site_title'].'_'.
+			str_replace($replace, '_', (
 			$name ? $name : (
 			count($_files) == 1 ?
 			// Just one file (hopefully a directory?) selected
-			self::basename($_files[0]) :
-			// Use the lowest common directory (eg: Infolog, Open, nathan)
+			self::basename($_files[0]) : // Use the lowest common directory (eg: Infolog, Open, nathan)
 			self::basename($base_dir))
-		)) . '.zip';
+		)).'.zip';
 
 		// Make sure basename is a dir
-		if(substr($base_dir, -1) != '/')
+		if (substr($base_dir, -1) != '/')
 		{
-			$base_dir .='/';
+			$base_dir .= '/';
 		}
 
 		// Go into directories, find them all
@@ -1498,37 +1494,37 @@ 
 		$tempfiles = array();
 
 		// Give 1 second per file, but try to allow more time for big files when amount of files is low
-		set_time_limit((count($files)<=9?10:count($files)));
+		set_time_limit((count($files) <= 9 ? 10 : count($files)));
 
 		// Add files to archive
-		foreach($files as &$addfile)
+		foreach ($files as &$addfile)
 		{
 			// Use relative paths inside zip
 			$relative = substr($addfile, strlen($base_dir));
 
 			// Use safe names - replace unsafe chars, convert to ASCII (ZIP spec says CP437, but we'll try)
-			$path = explode('/',$relative);
-			$_name = Translation::convert(Translation::to_ascii(implode('/', str_replace($replace,'_',$path))),false,'ASCII');
+			$path = explode('/', $relative);
+			$_name = Translation::convert(Translation::to_ascii(implode('/', str_replace($replace, '_', $path))), false, 'ASCII');
 
 			// Don't go infinite with app entries
-			if(self::is_link($addfile))
+			if (self::is_link($addfile))
 			{
-				if(in_array($addfile, $links)) continue;
+				if (in_array($addfile, $links)) continue;
 				$links[] = $addfile;
 			}
 			// Add directory - if empty, client app might not show it though
-			if(self::is_dir($addfile))
+			if (self::is_dir($addfile))
 			{
 				// Zip directories
 				$zip->addEmptyDir($addfile);
 			}
-			else if(self::is_readable($addfile))
+			else if (self::is_readable($addfile))
 			{
 				// Copy to temp file, as ZipArchive fails to read VFS
 				$temp = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'zip_');
-				$from = self::fopen($addfile,'r');
-		 		$to = fopen($temp,'w');
-				if(!stream_copy_to_stream($from,$to) || !$zip->addFile($temp, $_name))
+				$from = self::fopen($addfile, 'r');
+		 		$to = fopen($temp, 'w');
+				if (!stream_copy_to_stream($from, $to) || !$zip->addFile($temp, $_name))
 				{
 					unlink($temp);
 					trigger_error("Could not add $addfile to ZIP file", E_USER_ERROR);
@@ -1539,10 +1535,10 @@ 
 
 				// Add comment in
 				$props = self::propfind($addfile);
-				if($props)
+				if ($props)
 				{
-					$comment = self::find_prop($props,'comment');
-					if($comment)
+					$comment = self::find_prop($props, 'comment');
+					if ($comment)
 					{
 						$zip->setCommentName($_name, $comment);
 					}
@@ -1552,34 +1548,34 @@ 
 		}
 
 		// Set a comment to help tell them apart
-		$zip->setArchiveComment(lang('Created by %1', $GLOBALS['egw_info']['user']['account_lid']) . ' ' .DateTime::to());
+		$zip->setArchiveComment(lang('Created by %1', $GLOBALS['egw_info']['user']['account_lid']).' '.DateTime::to());
 
 		// Record total for debug, not available after close()
 		$total_files = $zip->numFiles;
 
 		$result = $zip->close();
-		if(!$result || !filesize($zip_file))
+		if (!$result || !filesize($zip_file))
 		{
 			error_log('close() result: '.array2string($result));
 			return 'Error creating zip file';
 		}
 
-		error_log("Total files: " . $total_files . " Peak memory to zip: " . self::hsize(memory_get_peak_usage(true)));
+		error_log("Total files: ".$total_files." Peak memory to zip: ".self::hsize(memory_get_peak_usage(true)));
 
 		// Stop any buffering
-		while(ob_get_level() > 0)
+		while (ob_get_level() > 0)
 		{
 			ob_end_clean();
 		}
 
 		// Stream the file to the client
 		header("Content-Type: application/zip");
-		header("Content-Length: " . filesize($zip_file));
+		header("Content-Length: ".filesize($zip_file));
 		header("Content-Disposition: attachment; filename=\"$filename\"");
 		readfile($zip_file);
 
 		unlink($zip_file);
-		foreach($tempfiles as $temp_file)
+		foreach ($tempfiles as $temp_file)
 		{
 			unlink($temp_file);
 		}
@@ -1613,7 +1609,7 @@ 
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
 	 * @return boolean true on success
 	 */
-	static function lock($path,&$token,&$timeout,&$owner,&$scope,&$type,$update=false,$check_writable=true)
+	static function lock($path, &$token, &$timeout, &$owner, &$scope, &$type, $update = false, $check_writable = true)
 	{
 		// we require write rights to lock/unlock a resource
 		if (!$path || $update && !$token || $check_writable &&
@@ -1631,28 +1627,28 @@ 
 
 		if ($update)	// Lock Update
 		{
-			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE,array('lock_owner','lock_exclusive','lock_write'),array(
+			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE, array('lock_owner', 'lock_exclusive', 'lock_write'), array(
 				'lock_path' => $path,
 				'lock_token' => $token,
-			),__LINE__,__FILE__)->fetch())))
+			), __LINE__, __FILE__)->fetch())))
 			{
 				$owner = $row['lock_owner'];
 				$scope = Db::from_bool($row['lock_exclusive']) ? 'exclusive' : 'shared';
 				$type  = Db::from_bool($row['lock_write']) ? 'write' : 'read';
 
-				self::$db->update(self::LOCK_TABLE,array(
+				self::$db->update(self::LOCK_TABLE, array(
 					'lock_expires' => $timeout,
 					'lock_modified' => time(),
-				),array(
+				), array(
 					'lock_path' => $path,
 					'lock_token' => $token,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		// HTTP_WebDAV_Server does this check before calling LOCK, but we want to be complete and usable outside WebDAV
-		elseif(($lock = self::checkLock($path)) && ($lock['scope'] == 'exclusive' || $scope == 'exclusive'))
+		elseif (($lock = self::checkLock($path)) && ($lock['scope'] == 'exclusive' || $scope == 'exclusive'))
 		{
-			$ret = false;	// there's alread a lock
+			$ret = false; // there's alread a lock
 		}
 		else
 		{
@@ -1667,7 +1663,7 @@ 
 				$token = HTTP_WebDAV_Server::_new_locktoken();
 			}
 			try {
-				self::$db->insert(self::LOCK_TABLE,array(
+				self::$db->insert(self::LOCK_TABLE, array(
 					'lock_token' => $token,
 					'lock_path'  => $path,
 					'lock_created' => time(),
@@ -1676,12 +1672,12 @@ 
 					'lock_expires' => $timeout,
 					'lock_exclusive' => $scope == 'exclusive',
 					'lock_write' => $type == 'write',
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 				$ret = true;
 			}
-			catch(Db\Exception $e) {
+			catch (Db\Exception $e) {
 				unset($e);
-				$ret = false;	// there's already a lock
+				$ret = false; // there's already a lock
 			}
 		}
 		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
@@ -1696,17 +1692,17 @@ 
 	 * @param boolean $check_writable =true should we check if the ressource is writable, before granting locks, default yes
      * @return boolean true on success
      */
-    static function unlock($path,$token,$check_writable=true)
+    static function unlock($path, $token, $check_writable = true)
     {
 		// we require write rights to lock/unlock a resource
 		if ($check_writable && !self::is_writable($path))
 		{
 			return false;
 		}
-        if (($ret = self::$db->delete(self::LOCK_TABLE,array(
+        if (($ret = self::$db->delete(self::LOCK_TABLE, array(
         	'lock_path' => $path,
         	'lock_token' => $token,
-        ),__LINE__,__FILE__) && self::$db->affected_rows()))
+        ), __LINE__, __FILE__) && self::$db->affected_rows()))
         {
         	// remove the lock from the cache too
         	unset(self::$lock_cache[$path]);
@@ -1725,31 +1721,31 @@ 
 	{
 		if (isset(self::$lock_cache[$path]))
 		{
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n", '    '), '', print_r(self::$lock_cache[$path], true)));
 			return self::$lock_cache[$path];
 		}
 		$where = 'lock_path='.self::$db->quote($path);
 		// ToDo: additional check parent dirs for locks and children of the requested directory
 		//$where .= ' OR '.self::$db->quote($path).' LIKE '.self::$db->concat('lock_path',"'%'").' OR lock_path LIKE '.self::$db->quote($path.'%');
 		// ToDo: shared locks can return multiple rows
-		if (($result = self::$db->select(self::LOCK_TABLE,'*',$where,__LINE__,__FILE__)->fetch()))
+		if (($result = self::$db->select(self::LOCK_TABLE, '*', $where, __LINE__, __FILE__)->fetch()))
 		{
-			$result = Db::strip_array_keys($result,'lock_');
+			$result = Db::strip_array_keys($result, 'lock_');
 			$result['type']  = Db::from_bool($result['write']) ? 'write' : 'read';
 			$result['scope'] = Db::from_bool($result['exclusive']) ? 'exclusive' : 'shared';
 			$result['depth'] = Db::from_bool($result['recursive']) ? 'infinite' : 0;
 		}
 		if ($result && $result['expires'] < time())	// lock is expired --> remove it
 		{
-	        self::$db->delete(self::LOCK_TABLE,array(
+	        self::$db->delete(self::LOCK_TABLE, array(
 	        	'lock_path' => $result['path'],
 	        	'lock_token' => $result['token'],
-	        ),__LINE__,__FILE__);
+	        ), __LINE__, __FILE__);
 
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s', $result['expires'])." --> removed");
 	        $result = false;
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result ? array2string($result) : 'false'));
 		return self::$lock_cache[$path] = $result;
 	}
 
@@ -1760,10 +1756,10 @@ 
 	 * @param array $content =null
 	 * @return array|boolean array with values for keys 'data','etemplate','name','label','help' or false if not supported by backend
 	 */
-	static function getExtraInfo($path,array $content=null)
+	static function getExtraInfo($path, array $content = null)
 	{
 		$extra = array();
-		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))	// true = fail silent if backend does NOT support it
+		if (($extra_info = self::_call_on_backend('extra_info', array($path, $content), true)))	// true = fail silent if backend does NOT support it
 		{
 			$extra[] = $extra_info;
 		}
@@ -1774,7 +1770,7 @@ 
 			'content' => $content,
 		))))
 		{
-			foreach($vfs_extra as $data)
+			foreach ($vfs_extra as $data)
 			{
 				$extra = $extra ? array_merge($extra, $data) : $data;
 			}
@@ -1789,7 +1785,7 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	static function app_entry_lock_path($app,$id)
+	static function app_entry_lock_path($app, $id)
 	{
 		return "/apps/$app/entry/$id";
 	}
@@ -1803,7 +1799,7 @@ 
 		//'%' => '%25',	// % should be encoded, but easily leads to double encoding, therefore better NOT encodig it
 		'#' => '%23',
 		'?' => '%3F',
-		'/' => '',	// better remove it completly
+		'/' => '', // better remove it completly
 	);
 
 	/**
@@ -1818,7 +1814,7 @@ 
 	 */
 	static public function encodePathComponent($component)
 	{
-		return str_replace(array_keys(self::$encode),array_values(self::$encode),$component);
+		return str_replace(array_keys(self::$encode), array_values(self::$encode), $component);
 	}
 
 	/**
@@ -1831,7 +1827,7 @@ 
 	 */
 	static public function encodePath($path)
 	{
-		return implode('/',self::encodePathComponent(explode('/',$path)));
+		return implode('/', self::encodePathComponent(explode('/', $path)));
 	}
 
 	/**
@@ -1886,7 +1882,7 @@ 
 		{
 			$image = Image::find($mime_sub, 'navbar');
 		}
-		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
+		else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png', 'jpeg', 'jpg', 'gif', 'bmp')) &&
 		         (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
 		         (string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
 		         ($stat = self::stat($file)) && $stat['size'] < 1500000)
@@ -1941,7 +1937,7 @@ 
 	 * @param array& $copied =null on return files copied
 	 * @return boolean true for no errors, false otherwise
 	 */
-	static public function copy_files(array $src, $dst, &$errs=null, array &$copied=null)
+	static public function copy_files(array $src, $dst, &$errs = null, array &$copied = null)
 	{
 		if (self::is_dir($dst))
 		{
@@ -1959,7 +1955,7 @@ 
 						if ($file !== $target)
 						{
 							// Create the target directory
-							self::mkdir($target,null,STREAM_MKDIR_RECURSIVE);
+							self::mkdir($target, null, STREAM_MKDIR_RECURSIVE);
 
 							$copied[] = $file;
 							$copied[] = $target; // < newly created folder must not be copied again!
@@ -2002,7 +1998,7 @@ 
 	{
 		if (self::is_dir($dst))
 		{
-			foreach($src as $file)
+			foreach ($src as $file)
 			{
 				$target = self::concat($dst, self::basename($file));
 
@@ -2034,7 +2030,7 @@ 
 	 * @param boolean $check_is_uploaded_file =true should method perform an is_uploaded_file check, default yes
 	 * @return boolean|array stat array on success, false on error
 	 */
-	static public function copy_uploaded($src,$target,$props=null,$check_is_uploaded_file=true)
+	static public function copy_uploaded($src, $target, $props = null, $check_is_uploaded_file = true)
 	{
 		$tmp_name = is_array($src) ? $src['tmp_name'] : $src;
 
@@ -2054,12 +2050,12 @@ 
 		}
 		if ($props)
 		{
-			if (!is_array($props)) $props = array(array('name' => 'comment','val' => $props));
+			if (!is_array($props)) $props = array(array('name' => 'comment', 'val' => $props));
 
 			// if $props is name => value pairs, convert it to internal array or array with values for keys 'name', 'val' and optional 'ns'
 			if (!isset($props[0]))
 			{
-				foreach($props as $name => $val)
+				foreach ($props as $name => $val)
 				{
 					if (($name == 'comment' || $name[0] == '#') && $val)	// only copy 'comment' and cfs
 					{
@@ -2077,8 +2073,8 @@ 
 			// set props before copying the file, so notifications already contain them
 			if (!self::stat($target))
 			{
-				self::touch($target);	// create empty file, to be able to attach properties
-				self::$treat_as_new = true;	// notify as new
+				self::touch($target); // create empty file, to be able to attach properties
+				self::$treat_as_new = true; // notify as new
 			}
 			self::proppatch($target, $props);
 		}
@@ -2092,7 +2088,7 @@ 
 		}
 		else
 		{
-			$ret = copy($tmp_name,self::PREFIX.$target) ? self::stat($target) : false;
+			$ret = copy($tmp_name, self::PREFIX.$target) ? self::stat($target) : false;
 		}
 		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
 		return $ret;

Braces +237 added lines, -62 removed lines

@@ -221,7 +221,10 @@ 
 		}
 		foreach($props as &$prop)
 		{
-			if ($prop['name'] == $name && $prop['ns'] == $ns) return $prop;
+			if ($prop['name'] == $name && $prop['ns'] == $ns)
+			{
+				return $prop;
+			}
 		}
 		return null;
 	}
@@ -314,11 +317,17 @@ 
 	 */
 	static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
 	{
-		if (is_null($check_url)) $check_url = strpos($url,'$') === false;
+		if (is_null($check_url))
+		{
+			$check_url = strpos($url,'$') === false;
+		}
 
-		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))	// happens eg. in setup
+		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))
+		{
+			// happens eg. in setup
 		{
 			$api_config = Config::read('phpgwapi');
+		}
 			if (isset($api_config['vfs_fstab']) && is_array($api_config['vfs_fstab']))
 			{
 				self::$fstab = $api_config['vfs_fstab'];
@@ -334,12 +343,18 @@ 
 		}
 		if (is_null($url) || is_null($path))
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
+			}
 			return self::$fstab;
 		}
 		if (!self::$is_root)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
+			}
 			return false;	// only root can mount
 		}
 		if ($clear_fstab)
@@ -348,14 +363,20 @@ 
 		}
 		if (isset(self::$fstab[$path]) && self::$fstab[$path] === $url)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
+			}
 			return true;	// already mounted
 		}
 		self::load_wrapper(self::parse_url($url,PHP_URL_SCHEME));
 
 		if ($check_url && (!file_exists($url) || opendir($url) === false))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
+			}
 			return false;	// url does not exist
 		}
 		self::$fstab[$path] = $url;
@@ -370,12 +391,18 @@ 
 			Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 			// invalidate session cache
-			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 (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');
 		return true;
 	}
 
@@ -388,12 +415,18 @@ 
 	{
 		if (!self::$is_root)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
+			}
 			return false;	// only root can mount
 		}
 		if (!isset(self::$fstab[$path]) && ($path = array_search($path,self::$fstab)) === false)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
+			}
 			return false;	// $path not mounted
 		}
 		unset(self::$fstab[$path]);
@@ -401,11 +434,17 @@ 
 		Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 		// invalidate session cache
-		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 (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($path).') returns true (successful unmount).');
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($path).') returns true (successful unmount).');
+		}
 		return true;
 	}
 
@@ -460,17 +499,27 @@ 
 		$dirs_last = $options['depth'];	// put content of dirs before the dir itself
 		// show dirs on top by default, if no recursive listing (allways disabled if $type specified, as unnecessary)
 		$dirsontop = !$type && (isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : isset($options['maxdepth'])&&$options['maxdepth']>0);
-		if ($dirsontop) $options['need_mime'] = true;	// otherwise dirsontop can NOT work
+		if ($dirsontop)
+		{
+			$options['need_mime'] = true;
+		}
+		// otherwise dirsontop can NOT work
 
 		// process some of the options (need to be done only once)
-		if (isset($options['name']) && !isset($options['name_preg']))	// change from simple *,? wildcards to preg regular expression once
+		if (isset($options['name']) && !isset($options['name_preg']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 		{
 			$options['name_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['name'])).'$/i';
 		}
-		if (isset($options['path']) && !isset($options['preg_path']))	// change from simple *,? wildcards to preg regular expression once
+		}
+		if (isset($options['path']) && !isset($options['preg_path']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 		{
 			$options['path_preg'] = '/^'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($options['path'])).'$/i';
 		}
+		}
 		if (!isset($options['uid']))
 		{
 			if (isset($options['user']))
@@ -517,7 +566,10 @@ 
 		{
 			if (!$url)
 			{
-				if ($path[0] != '/' || !self::stat($path)) continue;
+				if ($path[0] != '/' || !self::stat($path))
+				{
+					continue;
+				}
 				$path = self::PREFIX . $path;
 			}
 			if (!isset($options['remove']))
@@ -535,9 +587,17 @@ 
 			{
 				while(($fname = readdir($dir)) !== false)
 				{
-					if ($fname == '.' || $fname == '..') continue;	// ignore current and parent dir!
+					if ($fname == '.' || $fname == '..')
+					{
+						continue;
+					}
+					// ignore current and parent dir!
 
-					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden']) continue;	// ignore hidden files
+					if (self::is_hidden($fname, $options['show-deleted']) && !$options['hidden'])
+					{
+						continue;
+					}
+					// ignore hidden files
 
 					$file = self::concat($path, $fname);
 
@@ -549,8 +609,14 @@ 
 					if (is_dir($file) && ($options['follow'] || !is_link($file)) && (!isset($options['maxdepth']) || $options['maxdepth'] > 1))
 					{
 						$opts = $options;
-						if ($opts['mindepth']) $opts['mindepth']--;
-						if ($opts['maxdepth']) $opts['depth']++;
+						if ($opts['mindepth'])
+						{
+							$opts['mindepth']--;
+						}
+						if ($opts['maxdepth'])
+						{
+							$opts['depth']++;
+						}
 						unset($opts['order']);
 						unset($opts['limit']);
 						foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s)
@@ -615,7 +681,10 @@ 
 		if (isset($options['limit']))
 		{
 			list($limit,$start) = explode(',',$options['limit']);
-			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches'])) $limit = 15;
+			if (!$limit && !($limit = $GLOBALS['egw_info']['user']['preferences']['comman']['maxmatches']))
+			{
+				$limit = 15;
+			}
 			//echo "total=".self::$find_total.", limit=$options[limit] --> start=$start, limit=$limit<br>\n";
 
 			if ((int)$start || self::$find_total > $limit)
@@ -672,9 +741,13 @@ 
 			return;	// not found, should not happen
 		}
 		if ($type && (($type == 'd') == !($stat['mode'] & Vfs\Sqlfs\StreamWrapper::MODE_DIR) ||	// != is_dir() which can be true for symlinks
-		    $type == 'F' && is_dir($path)))	// symlink to a directory
+		    $type == 'F' && is_dir($path)))
 		{
-			return;	// wrong type
+			// symlink to a directory
+		{
+			return;
+		}
+		// wrong type
 		}
 		$stat = array_slice($stat,13);	// remove numerical indices 0-12
 		$stat['path'] = self::parse_url($path,PHP_URL_PATH);
@@ -697,11 +770,15 @@ 
 		}
 		if (isset($options['mime']) && $options['mime'] != $stat['mime'])
 		{
-			if ($options['mime'][0] == '/')	// perl regular expression given
+			if ($options['mime'][0] == '/')
+			{
+				// perl regular expression given
 			{
 				if (!preg_match($options['mime'], $stat['mime']))
 				{
-					return;	// wrong mime-type
+					return;
+			}
+			// wrong mime-type
 				}
 			}
 			else
@@ -1018,7 +1095,8 @@ 
 			}
 
 			// sort by length descending, to show precedence
-			usort($eacls, function($a, $b) {
+			usort($eacls, function($a, $b)
+			{
 				return strlen($b['path']) - strlen($a['path']);
 			});
 		}
@@ -1073,14 +1151,21 @@ 
 	 */
 	static function mode2int($set,$mode=0)
 	{
-		if (is_int($set))		// already an integer
+		if (is_int($set))
+		{
+			// already an integer
 		{
 			return $set;
 		}
-		if (is_numeric($set))	// octal string
+		}
+		if (is_numeric($set))
+		{
+			// octal string
 		{
 			//error_log(__METHOD__."($set,$mode) returning ".(int)base_convert($set,8,10));
-			return (int)base_convert($set,8,10);	// convert octal to decimal
+			return (int)base_convert($set,8,10);
+		}
+		// convert octal to decimal
 		}
 		foreach(explode(',',$set) as $s)
 		{
@@ -1136,34 +1221,55 @@ 
 	 */
 	static function int2mode( $mode )
 	{
-		if(($mode & self::MODE_LINK) == self::MODE_LINK) // Symbolic Link
+		if(($mode & self::MODE_LINK) == self::MODE_LINK)
+		{
+			// Symbolic Link
 		{
 			$sP = 'l';
 		}
-		elseif(($mode & 0xC000) == 0xC000) // Socket
+		}
+		elseif(($mode & 0xC000) == 0xC000)
+		{
+			// Socket
 		{
 			$sP = 's';
 		}
-		elseif($mode & 0x1000)     // FIFO pipe
+		}
+		elseif($mode & 0x1000)
+		{
+			// FIFO pipe
 		{
 			$sP = 'p';
 		}
-		elseif($mode & 0x2000) // Character special
+		}
+		elseif($mode & 0x2000)
+		{
+			// Character special
 		{
 			$sP = 'c';
 		}
-		elseif($mode & 0x4000) // Directory
+		}
+		elseif($mode & 0x4000)
+		{
+			// Directory
 		{
 			$sP = 'd';
 		}
-		elseif($mode & 0x6000) // Block special
+		}
+		elseif($mode & 0x6000)
+		{
+			// Block special
 		{
 			$sP = 'b';
 		}
-		elseif($mode & 0x8000) // Regular
+		}
+		elseif($mode & 0x8000)
+		{
+			// Regular
 		{
 			$sP = '-';
 		}
+		}
 		else                         // UNKNOWN
 		{
 			$sP = 'u';
@@ -1230,9 +1336,18 @@ 
 	 */
 	static function hsize($size)
 	{
-		if ($size < 1024) return $size;
-		if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-		if ($size < 1024*1024*1024) return sprintf('%3.1lfM',(float)$size/(1024*1024));
+		if ($size < 1024)
+		{
+			return $size;
+		}
+		if ($size < 1024*1024)
+		{
+			return sprintf('%3.1lfk',(float)$size/1024);
+		}
+		if ($size < 1024*1024*1024)
+		{
+			return sprintf('%3.1lfM',(float)$size/(1024*1024));
+		}
 		return sprintf('%3.1lfG',(float)$size/(1024*1024*1024));
 	}
 
@@ -1243,7 +1358,10 @@ 
 	 */
 	static function int_size($_val)
 	{
-		if(empty($_val))return 0;
+		if(empty($_val))
+		{
+			return 0;
+		}
 
 		$val = trim($_val);
 
@@ -1251,11 +1369,13 @@ 
 		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
 
 		$last = '';
-		if(isset($matches[2])){
+		if(isset($matches[2]))
+		{
 			$last = $matches[2];
 		}
 
-		if(isset($matches[1])){
+		if(isset($matches[1]))
+		{
 			$val = (int) $matches[1];
 		}
 
@@ -1307,7 +1427,10 @@ 
 			return false;
 		}
 		$parts = explode('/',$url);
-		if (substr($url,-1) == '/') array_pop($parts);
+		if (substr($url,-1) == '/')
+		{
+			array_pop($parts);
+		}
 		array_pop($parts);
 		if ($url[0] != '/' && count($parts) == 3 || count($parts) == 1 && $parts[0] === '')
 		{
@@ -1328,7 +1451,10 @@ 
 	 */
 	static function has_owner_rights($path,array $stat=null)
 	{
-		if (!$stat) $stat = self::url_stat($path,0);
+		if (!$stat)
+		{
+			$stat = self::url_stat($path,0);
+		}
 
 		return $stat['uid'] == self::$user ||	// user is the owner
 			self::$is_root ||					// class runs with root rights
@@ -1347,7 +1473,10 @@ 
 	static function concat($_url,$relative)
 	{
 		list($url,$query) = explode('?',$_url,2);
-		if (substr($url,-1) == '/') $url = substr($url,0,-1);
+		if (substr($url,-1) == '/')
+		{
+			$url = substr($url,0,-1);
+		}
 		$ret = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
 
 		// now normalize the path (remove "/something/..")
@@ -1440,7 +1569,8 @@ 
 		if(count($paths) > 0)
 		{
 			// Shortest to longest
-			usort($paths, function($a, $b) {
+			usort($paths, function($a, $b)
+			{
 				return strlen($a) - strlen($b);
 			});
 
@@ -1513,7 +1643,10 @@ 
 			// Don't go infinite with app entries
 			if(self::is_link($addfile))
 			{
-				if(in_array($addfile, $links)) continue;
+				if(in_array($addfile, $links))
+				{
+					continue;
+				}
 				$links[] = $addfile;
 			}
 			// Add directory - if empty, client app might not show it though
@@ -1624,12 +1757,17 @@ 
     	// remove the lock info evtl. set in the cache
     	unset(self::$lock_cache[$path]);
 
-    	if ($timeout < 1000000)	// < 1000000 is a relative timestamp, so we add the current time
+    	if ($timeout < 1000000)
+    	{
+    		// < 1000000 is a relative timestamp, so we add the current time
     	{
     		$timeout += time();
     	}
+    	}
 
-		if ($update)	// Lock Update
+		if ($update)
+		{
+			// Lock Update
 		{
 			if (($ret = (boolean)($row = self::$db->select(self::LOCK_TABLE,array('lock_owner','lock_exclusive','lock_write'),array(
 				'lock_path' => $path,
@@ -1637,6 +1775,7 @@ 
 			),__LINE__,__FILE__)->fetch())))
 			{
 				$owner = $row['lock_owner'];
+		}
 				$scope = Db::from_bool($row['lock_exclusive']) ? 'exclusive' : 'shared';
 				$type  = Db::from_bool($row['lock_write']) ? 'write' : 'read';
 
@@ -1684,7 +1823,10 @@ 
 				$ret = false;	// there's already a lock
 			}
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path,$token,$timeout,$owner,$scope,$type,update=$update,check_writable=$check_writable) returns ".($ret ? 'true' : 'false'));
+		}
 		return $ret;
 	}
 
@@ -1711,7 +1853,10 @@ 
         	// remove the lock from the cache too
         	unset(self::$lock_cache[$path]);
         }
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path,$token,$check_writable) returns ".($ret ? 'true' : 'false'));
+		}
 		return $ret;
     }
 
@@ -1725,7 +1870,10 @@ 
 	{
 		if (isset(self::$lock_cache[$path]))
 		{
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			if (self::LOCK_DEBUG)
+			{
+				error_log(__METHOD__."($path) returns from CACHE ".str_replace(array("\n",'    '),'',print_r(self::$lock_cache[$path],true)));
+			}
 			return self::$lock_cache[$path];
 		}
 		$where = 'lock_path='.self::$db->quote($path);
@@ -1739,17 +1887,26 @@ 
 			$result['scope'] = Db::from_bool($result['exclusive']) ? 'exclusive' : 'shared';
 			$result['depth'] = Db::from_bool($result['recursive']) ? 'infinite' : 0;
 		}
-		if ($result && $result['expires'] < time())	// lock is expired --> remove it
+		if ($result && $result['expires'] < time())
+		{
+			// lock is expired --> remove it
 		{
 	        self::$db->delete(self::LOCK_TABLE,array(
 	        	'lock_path' => $result['path'],
 	        	'lock_token' => $result['token'],
 	        ),__LINE__,__FILE__);
+		}
 
-			if (self::LOCK_DEBUG) error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			if (self::LOCK_DEBUG)
+			{
+				error_log(__METHOD__."($path) lock is expired at ".date('Y-m-d H:i:s',$result['expires'])." --> removed");
+			}
 	        $result = false;
 		}
-		if (self::LOCK_DEBUG) error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		if (self::LOCK_DEBUG)
+		{
+			error_log(__METHOD__."($path) returns ".($result?array2string($result):'false'));
+		}
 		return self::$lock_cache[$path] = $result;
 	}
 
@@ -1763,10 +1920,13 @@ 
 	static function getExtraInfo($path,array $content=null)
 	{
 		$extra = array();
-		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))	// true = fail silent if backend does NOT support it
+		if (($extra_info = self::_call_on_backend('extra_info',array($path,$content),true)))
+		{
+			// true = fail silent if backend does NOT support it
 		{
 			$extra[] = $extra_info;
 		}
+		}
 
 		if (($vfs_extra = Hooks::process(array(
 			'location' => 'vfs_extra',
@@ -2044,30 +2204,42 @@ 
 		}
 		if ($check_is_uploaded_file && !is_resource($tmp_name) && !is_uploaded_file($tmp_name))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !is_uploaded_file()");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !is_uploaded_file()");
+			}
 			return false;
 		}
 		if (!(self::is_writable($target) || self::is_writable(self::dirname($target))))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !writable");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !writable");
+			}
 			return false;
 		}
 		if ($props)
 		{
-			if (!is_array($props)) $props = array(array('name' => 'comment','val' => $props));
+			if (!is_array($props))
+			{
+				$props = array(array('name' => 'comment','val' => $props));
+			}
 
 			// if $props is name => value pairs, convert it to internal array or array with values for keys 'name', 'val' and optional 'ns'
 			if (!isset($props[0]))
 			{
 				foreach($props as $name => $val)
 				{
-					if (($name == 'comment' || $name[0] == '#') && $val)	// only copy 'comment' and cfs
+					if (($name == 'comment' || $name[0] == '#') && $val)
+					{
+						// only copy 'comment' and cfs
 					{
 						$vfs_props[] = array(
 							'name' => $name,
 							'val'  => $val,
 						);
 					}
+					}
 				}
 				$props = $vfs_props;
 			}
@@ -2094,7 +2266,10 @@ 
 		{
 			$ret = copy($tmp_name,self::PREFIX.$target) ? self::stat($target) : false;
 		}
-		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
+		if (self::LOG_LEVEL > 1 || !$ret && self::LOG_LEVEL)
+		{
+			error_log(__METHOD__."($tmp_name, $target, ".array2string($props).") returning ".array2string($ret));
+		}
 		return $ret;
 	}
 

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

@@ -1415,7 +1415,7 @@
 	 *
 	 * @todo use https://github.com/maennchen/ZipStream-PHP to not assamble all files in memmory
 	 */
-	public static function download_zip(Array $_files, $name = false)
+	public static function download_zip(array $_files, $name = false)
 	{
 		//error_log(__METHOD__ . ': '.implode(',',$_files));
 

api/src/Vfs/Dav/Directory.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	/**
 	 * Returns available diskspace information
 	 *
-	 * @return array [ available-space, free-space ]
+	 * @return false[] [ available-space, free-space ]
 	 */
 	function getQuotaInfo()
 	{

Spacing +4 added lines, -4 removed lines

@@ -66,10 +66,10 @@ 
 	function getChild($name)
 	{
 		//error_log(__METHOD__."('$name') this->path=$this->path, this->vfs_path=$this->vfs_path");
-		$path = $this->vfs_path . '/' . $name;
-		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
+		$path = $this->vfs_path.'/'.$name;
+		$vfs_path = $this->vfs_path.'/'.Vfs::encodePathComponent($name);
 
-		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name '.$path.' could not be located');
 
 		if (Vfs::is_dir($vfs_path))
 		{
@@ -88,6 +88,6 @@ 
 	 */
 	function getQuotaInfo()
 	{
-		return [ false, false ];
+		return [false, false];
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -69,7 +69,10 @@
 		$path = $this->vfs_path . '/' . $name;
 		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
 
-		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		if (!Vfs::file_exists($vfs_path))
+		{
+			throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		}
 
 		if (Vfs::is_dir($vfs_path))
 		{

api/src/Vfs/Dav/File.php

Doc Comments +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	 *
 	 * Return null if the ETag can not effectively be determined
 	 *
-	 * @return mixed
+	 * @return string|null
 	 */
 	function getETag()
 	{
@@ -78,7 +78,7 @@ 
 	 *
 	 * If null is returned, we'll assume application/octet-stream
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	function getContentType()
 	{

api/src/Vfs/Filesystem/StreamWrapper.php

Doc Comments +3 added lines, -3 removed lines

@@ -271,7 +271,7 @@ 
 	 *
 	 * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now.
 	 *
-	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
+	 * @return boolean TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
 	function stream_flush ( )
 	{
@@ -507,7 +507,7 @@ 
 	 *
 	 * @param string $url URL that was passed to opendir() and that this object is expected to explore.
 	 * @param int $options
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $url, $options )
 	{
@@ -616,7 +616,7 @@ 
 	 * It should reset the output generated by dir_readdir(). i.e.:
 	 * The next call to dir_readdir() should return the first entry in the location returned by dir_opendir().
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function dir_rewinddir ( )
 	{

Spacing +94 added lines, -94 removed lines

@@ -51,7 +51,7 @@ 
 	/**
 	 * Mime type of directories, the old vfs used 'Directory', while eg. WebDAV uses 'httpd/unix-directory'
 	 */
-	const DIR_MIME_TYPE = Vfs::DIR_MIME_TYPE ;
+	const DIR_MIME_TYPE = Vfs::DIR_MIME_TYPE;
 
 	/**
 	 * mode-bits, which have to be set for files
@@ -60,7 +60,7 @@ 
 	/**
 	 * mode-bits, which have to be set for directories
 	 */
-	const MODE_DIR =   040000;
+	const MODE_DIR = 040000;
 
 	/**
 	 * optional context param when opening the stream, null if no context passed
@@ -123,50 +123,50 @@ 
 	 * @param string $opened_path full path of the file/resource, if the open was successfull and STREAM_USE_PATH was set
 	 * @return boolean true if the ressource was opened successful, otherwise false
 	 */
-	function stream_open ( $url, $mode, $options, &$opened_path )
+	function stream_open($url, $mode, $options, &$opened_path)
 	{
-		unset($opened_path);	// not used, but required by interface
+		unset($opened_path); // not used, but required by interface
 
 		$this->opened_stream = $this->opened_stream_url = null;
-		$read_only = str_replace('b','',$mode) == 'r';
+		$read_only = str_replace('b', '', $mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
-		if (!($stat = self::url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = self::url_stat($url, 0)) || $mode[0] == 'x')	// file not found or file should NOT exist
 		{
 			$dir = Vfs::dirname($url);
-			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
-				$mode[0] == 'x' ||	// or file should not exist, but does
-				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))	// or we are not allowed to 																																			create it
+			if ($mode[0] == 'r' || // does $mode require the file to exist (r,r+)
+				$mode[0] == 'x' || // or file should not exist, but does
+				!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat = self::url_stat($dir, 0)))	// or we are not allowed to 																																			create it
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
-				if (!($options & STREAM_URL_STAT_QUIET))
+				if (!($options&STREAM_URL_STAT_QUIET))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!", E_USER_WARNING);
 				}
 				return false;
 			}
 		}
-		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !Vfs::check_access($url, Vfs::WRITABLE, $stat))	// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
-			if (!($options & STREAM_URL_STAT_QUIET))
+			if (!($options&STREAM_URL_STAT_QUIET))
 			{
-				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!",E_USER_WARNING);
+				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!", E_USER_WARNING);
 			}
 			return false;
 		}
 		if (!$read_only && self::deny_script($url))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
-			if (!($options & STREAM_URL_STAT_QUIET))
+			if (!($options&STREAM_URL_STAT_QUIET))
 			{
-				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
+				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!", E_USER_WARNING);
 			}
 			return false;
 		}
 
 		// open the "real" file
-		if (!($this->opened_stream = fopen($path=Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH)),$mode,$options)))
+		if (!($this->opened_stream = fopen($path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH)), $mode, $options)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
 			return false;
@@ -181,7 +181,7 @@ 
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
 	 */
-	function stream_close ( )
+	function stream_close( )
 	{
 		$ret = fclose($this->opened_stream);
 
@@ -201,9 +201,9 @@ 
 	 * @param int $count
 	 * @return string/false up to count bytes read or false on EOF
 	 */
-	function stream_read ( $count )
+	function stream_read($count)
 	{
-		return fread($this->opened_stream,$count);
+		return fread($this->opened_stream, $count);
 	}
 
 	/**
@@ -217,9 +217,9 @@ 
 	 * @param string $data
 	 * @return integer
 	 */
-	function stream_write ( $data )
+	function stream_write($data)
 	{
-		return fwrite($this->opened_stream,$data);
+		return fwrite($this->opened_stream, $data);
 	}
 
  	/**
@@ -234,7 +234,7 @@ 
   	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
-	function stream_eof ( )
+	function stream_eof( )
 	{
 		return feof($this->opened_stream);
 	}
@@ -244,7 +244,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
  		return ftell($this->opened_stream);
  	}
@@ -261,9 +261,9 @@ 
  	 * 							SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
  	 * @return boolean TRUE if the position was updated, FALSE otherwise.
  	 */
-	function stream_seek ( $offset, $whence )
+	function stream_seek($offset, $whence)
 	{
-		return !fseek($this->opened_stream,$offset,$whence);	// fseek returns 0 on success and -1 on failure
+		return !fseek($this->opened_stream, $offset, $whence); // fseek returns 0 on success and -1 on failure
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 *
 	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
-	function stream_flush ( )
+	function stream_flush( )
 	{
 		return fflush($this->opened_stream);
 	}
@@ -292,9 +292,9 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( )
+	function stream_stat( )
 	{
-		return self::url_stat($this->opened_stream_url,0);
+		return self::url_stat($this->opened_stream_url, 0);
 	}
 
 	/**
@@ -306,15 +306,15 @@ 
 	 * @param string $url
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function unlink ( $url )
+	static function unlink($url)
 	{
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 
 		// check access rights (file need to exist and directory need to be writable
-		if (!file_exists($path) || is_dir($path) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
+		if (!file_exists($path) || is_dir($path) || !Vfs::check_access(Vfs::dirname($url), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		return unlink($path);
 	}
@@ -331,22 +331,22 @@ 
 	 * @param string $url_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function rename ( $url_from, $url_to )
+	static function rename($url_from, $url_to)
 	{
 		$from = Vfs::parse_url($url_from);
 		$to   = Vfs::parse_url($url_to);
 
 		// check access rights
-		if (!($from_stat = self::url_stat($url_from,0)) || !Vfs::check_access(Vfs::dirname($url_from),Vfs::WRITABLE))
+		if (!($from_stat = self::url_stat($url_from, 0)) || !Vfs::check_access(Vfs::dirname($url_from), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		$to_dir = Vfs::dirname($url_to);
-		if (!Vfs::check_access($to_dir,Vfs::WRITABLE,$to_dir_stat = self::url_stat($to_dir,0)))
+		if (!Vfs::check_access($to_dir, Vfs::WRITABLE, $to_dir_stat = self::url_stat($to_dir, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
-			return false;	// no permission or parent-dir does not exist
+			return false; // no permission or parent-dir does not exist
 		}
 		if (self::deny_script($url_to))
 		{
@@ -355,12 +355,12 @@ 
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
 		// for our vfs too, we abort here with an error, like the filesystem one does
-		if (($to_stat = self::url_stat($to['path'],0)) &&
+		if (($to_stat = self::url_stat($to['path'], 0)) &&
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !self::unlink($url_to))
@@ -368,7 +368,7 @@ 
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
 			return false;
 		}
-		return rename(Vfs::decodePath($from['path']),Vfs::decodePath($to['path']));
+		return rename(Vfs::decodePath($from['path']), Vfs::decodePath($to['path']));
 	}
 
 	/**
@@ -382,12 +382,12 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function mkdir ( $url, $mode, $options )
+	static function mkdir($url, $mode, $options)
 	{
-		unset($mode);	// not used, but required by interface
+		unset($mode); // not used, but required by interface
 
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
-		$recursive = (bool)($options & STREAM_MKDIR_RECURSIVE);
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
+		$recursive = (bool)($options&STREAM_MKDIR_RECURSIVE);
 
 		// find the real parent (might be more then one level if $recursive!)
 		do {
@@ -398,12 +398,12 @@ 
 		//echo __METHOD__."($url,$mode,$options) path=$path, recursive=$recursive, parent=$parent, Vfs::check_access(parent_url=$parent_url,Vfs::WRITABLE)=".(int)Vfs::check_access($parent_url,Vfs::WRITABLE)."\n";
 
 		// check access rights (in real filesystem AND by mount perms)
-		if (file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url,Vfs::WRITABLE))
+		if (file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url, Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
 			return false;
 		}
-		return mkdir($path, 0700, $recursive);	// setting mode 0700 allows (only) apache to write into the dir
+		return mkdir($path, 0700, $recursive); // setting mode 0700 allows (only) apache to write into the dir
 	}
 
 	/**
@@ -416,15 +416,15 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	static function rmdir ( $url, $options )
+	static function rmdir($url, $options)
 	{
-		unset($options);	// not used, but required by interface
+		unset($options); // not used, but required by interface
 
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 		$parent = dirname($path);
 
 		// check access rights (in real filesystem AND by mount perms)
-		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
+		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
 			return false;
@@ -440,18 +440,18 @@ 
 	 * @param int $atime =null access time (unix timestamp), default null = current time, not implemented in the vfs!
 	 * @return boolean true on success, false otherwise
 	 */
-	static function touch($url,$time=null,$atime=null)
+	static function touch($url, $time = null, $atime = null)
 	{
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 		$parent = dirname($path);
 
 		// check access rights (in real filesystem AND by mount perms)
-		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
+		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url), Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
 			return false;
 		}
-		return touch($path,$time,$atime);
+		return touch($path, $time, $atime);
 	}
 
 	/**
@@ -463,9 +463,9 @@ 
 	 * @param string $mode mode string see Vfs::mode2int
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chmod($path,$mode)
+	static function chmod($path, $mode)
 	{
-		unset($path, $mode);	// not used, but required by interface
+		unset($path, $mode); // not used, but required by interface
 
 		return false;
 	}
@@ -479,9 +479,9 @@ 
 	 * @param int $owner numeric user id
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chown($path,$owner)
+	static function chown($path, $owner)
 	{
-		unset($path, $owner);	// not used, but required by interface
+		unset($path, $owner); // not used, but required by interface
 
 		return false;
 	}
@@ -495,9 +495,9 @@ 
 	 * @param int $group numeric group id
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chgrp($path,$group)
+	static function chgrp($path, $group)
 	{
-		unset($path, $group);	// not used, but required by interface
+		unset($path, $group); // not used, but required by interface
 
 		return false;
 	}
@@ -509,13 +509,13 @@ 
 	 * @param int $options
 	 * @return booelan
 	 */
-	function dir_opendir ( $url, $options )
+	function dir_opendir($url, $options)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
 
 		$this->opened_dir = null;
 
-		$path = Vfs::decodePath(Vfs::parse_url($this->opened_dir_url = $url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($this->opened_dir_url = $url, PHP_URL_PATH));
 
 		// ToDo: check access rights
 
@@ -553,31 +553,31 @@ 
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
 	 * @return array
 	 */
-	static function url_stat ( $url, $flags )
+	static function url_stat($url, $flags)
 	{
 		$parts = Vfs::parse_url($url);
 		$path = Vfs::decodePath($parts['path']);
 
-		$stat = @stat($path);	// suppressed the stat failed warnings
+		$stat = @stat($path); // suppressed the stat failed warnings
 
 		if ($stat)
 		{
 			// set owner, group and mode from mount options
 			$uid = $gid = $mode = null;
-			if (!self::parse_query($parts['query'],$uid,$gid,$mode))
+			if (!self::parse_query($parts['query'], $uid, $gid, $mode))
 			{
 				return false;
 			}
 			$stat['uid'] = $stat[4] = $uid;
 			$stat['gid'] = $stat[5] = $gid;
-			$stat['mode'] = $stat[2] = $stat['mode'] & self::MODE_DIR ? self::MODE_DIR | $mode : self::MODE_FILE | ($mode & ~0111);
+			$stat['mode'] = $stat[2] = $stat['mode']&self::MODE_DIR ? self::MODE_DIR|$mode : self::MODE_FILE|($mode&~0111);
 			// write rights also depend on the write rights of the webserver
 			if (!is_writable($path))
 			{
-				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
+				$stat['mode'] = $stat[2] = $stat['mode']&~0222;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o', $mode).", mode=".sprintf('0%o', $stat['mode']).'='.Vfs::int2mode($stat['mode']));
 		return $stat;
 	}
 
@@ -591,13 +591,13 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		do {
 			$file = readdir($this->opened_dir);
 
-			$ignore = !($file === false ||							// stop if no more dirs or
-				($file != '.' && $file != '..' ));					// file not . or ..
+			$ignore = !($file === false || // stop if no more dirs or
+				($file != '.' && $file != '..')); // file not . or ..
 			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
 		}
 		while ($ignore);
@@ -618,7 +618,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		return rewinddir($this->opened_dir);
 	}
@@ -630,7 +630,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		closedir($this->opened_dir);
 
@@ -648,18 +648,18 @@ 
 	 * @param int &$mode default if not set is 05 r-x for others
 	 * @return boolean true on successfull parse, false on error
 	 */
-	static function parse_query($query,&$uid,&$gid,&$mode)
+	static function parse_query($query, &$uid, &$gid, &$mode)
 	{
 		$params = null;
-		parse_str(is_array($query) ? $query['query'] : $query,$params);
+		parse_str(is_array($query) ? $query['query'] : $query, $params);
 
 		// setting the default perms root.root r-x for other
 		$uid = $gid = 0;
 		$mode = 05;
 
-		foreach($params as $name => $value)
+		foreach ($params as $name => $value)
 		{
-			switch($name)
+			switch ($name)
 			{
 				case 'user':
 					if (!is_numeric($value))
@@ -668,10 +668,10 @@ 
 						{
 							$value = 0;
 						}
-						elseif (($value = $GLOBALS['egw']->accounts->name2id($value,'account_lid','u')) === false)
+						elseif (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'u')) === false)
 						{
 							error_log(__METHOD__."('$query') unknown user-name '$value'!");
-							return false;	// wrong user-name
+							return false; // wrong user-name
 						}
 					}
 					// fall-through
@@ -690,12 +690,12 @@ 
 						{
 							$value = 0;
 						}
-						elseif (($value = $GLOBALS['egw']->accounts->name2id($value,'account_lid','g')) === false)
+						elseif (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'g')) === false)
 						{
 							error_log(__METHOD__."('$query') unknown group-name '$value'!");
-							return false;	// wrong group-name
+							return false; // wrong group-name
 						}
-						$value = -$value;	// vfs uses positiv gid's!
+						$value = -$value; // vfs uses positiv gid's!
 					}
 					// fall-through
 				case 'gid':
@@ -731,9 +731,9 @@ 
 	{
 		$parts = Vfs::parse_url($url);
 		$get = null;
-		parse_str($parts['query'],$get);
+		parse_str($parts['query'], $get);
 
-		$deny = !$get['exec'] && preg_match(self::SCRIPT_EXTENSIONS_PREG,$parts['path']);
+		$deny = !$get['exec'] && preg_match(self::SCRIPT_EXTENSIONS_PREG, $parts['path']);
 
 		if (self::LOG_LEVEL > 1 || self::LOG_LEVEL > 0 && $deny)
 		{
@@ -753,21 +753,21 @@ 
 	 * @todo get $force_download working through webdav
 	 * @return string|false string with full download url or false to use default webdav.php url
 	 */
-	static function download_url($_url,$force_download=false)
+	static function download_url($_url, $force_download = false)
 	{
-		unset($force_download);	// not used, but required by interface
+		unset($force_download); // not used, but required by interface
 
-		list($url,$query) = explode('?',$_url,2);
+		list($url, $query) = explode('?', $_url, 2);
 		$get = null;
-		parse_str($query,$get);
-		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		parse_str($query, $get);
+		if (empty($get['url'])) return false; // no download url given for this mount-point
 
-		if (!($mount_url = Vfs::mount_url($_url))) return false;	// no mount url found, should not happen
-		list($mount_url) = explode('?',$mount_url);
+		if (!($mount_url = Vfs::mount_url($_url))) return false; // no mount url found, should not happen
+		list($mount_url) = explode('?', $mount_url);
 
-		$relpath = substr($url,strlen($mount_url));
+		$relpath = substr($url, strlen($mount_url));
 
-		$download_url = Vfs::concat($get['url'],$relpath);
+		$download_url = Vfs::concat($get['url'], $relpath);
 		if ($download_url[0] == '/')
 		{
 			$download_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').

Indentation +2 added lines, -2 removed lines

@@ -80,10 +80,10 @@
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
  	 *
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
-  	 * {
+ 	 * {
  	 * 		$eof = !$eof;
  	 * }
-  	 *
+ 	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
 	function stream_eof ( );

Braces +90 added lines, -22 removed lines

@@ -131,14 +131,20 @@ 
 		$read_only = str_replace('b','',$mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
-		if (!($stat = self::url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = self::url_stat($url,0)) || $mode[0] == 'x')
+		{
+			// file not found or file should NOT exist
 		{
 			$dir = Vfs::dirname($url);
+		}
 			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
 				$mode[0] == 'x' ||	// or file should not exist, but does
-				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))	// or we are not allowed to 																																			create it
+				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))
+			{
+				// or we are not allowed to 																																			create it
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+			}
 				if (!($options & STREAM_URL_STAT_QUIET))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
@@ -146,9 +152,12 @@ 
 				return false;
 			}
 		}
-		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))
+		{
+			// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
+		}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!",E_USER_WARNING);
@@ -157,7 +166,10 @@ 
 		}
 		if (!$read_only && self::deny_script($url))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
@@ -168,7 +180,10 @@ 
 		// open the "real" file
 		if (!($this->opened_stream = fopen($path=Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH)),$mode,$options)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			}
 			return false;
 		}
 		$this->opened_stream_url = $url;
@@ -313,7 +328,10 @@ 
 		// check access rights (file need to exist and directory need to be writable
 		if (!file_exists($path) || is_dir($path) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		return unlink($path);
@@ -339,18 +357,27 @@ 
 		// check access rights
 		if (!($from_stat = self::url_stat($url_from,0)) || !Vfs::check_access(Vfs::dirname($url_from),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		$to_dir = Vfs::dirname($url_to);
 		if (!Vfs::check_access($to_dir,Vfs::WRITABLE,$to_dir_stat = self::url_stat($to_dir,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			}
 			return false;	// no permission or parent-dir does not exist
 		}
 		if (self::deny_script($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			}
 			return false;
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
@@ -359,13 +386,19 @@ 
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !self::unlink($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			}
 			return false;
 		}
 		return rename(Vfs::decodePath($from['path']),Vfs::decodePath($to['path']));
@@ -400,7 +433,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return mkdir($path, 0700, $recursive);	// setting mode 0700 allows (only) apache to write into the dir
@@ -426,7 +462,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return rmdir($path);
@@ -448,7 +487,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return touch($path,$time,$atime);
@@ -511,7 +553,10 @@ 
 	 */
 	function dir_opendir ( $url, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$options)");
+		}
 
 		$this->opened_dir = null;
 
@@ -521,7 +566,10 @@ 
 
 		if (!($this->opened_dir = opendir($path)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			}
 			return false;
 		}
 		return true;
@@ -577,7 +625,10 @@ 
 				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		}
 		return $stat;
 	}
 
@@ -598,14 +649,23 @@ 
 
 			$ignore = !($file === false ||							// stop if no more dirs or
 				($file != '.' && $file != '..' ));					// file not . or ..
-			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
+			if (self::LOG_LEVEL > 1 && $ignore)
+			{
+				error_log(__METHOD__.'() ignoring '.array2string($file));
+			}
 		}
 		while ($ignore);
 
 		// encode special chars messing up url's
-		if ($file !== false) $file = Vfs::encodePathComponent($file);
+		if ($file !== false)
+		{
+			$file = Vfs::encodePathComponent($file);
+		}
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() returning '.array2string($file));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'() returning '.array2string($file));
+		}
 
 		return $file;
 	}
@@ -760,9 +820,17 @@ 
 		list($url,$query) = explode('?',$_url,2);
 		$get = null;
 		parse_str($query,$get);
-		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		if (empty($get['url']))
+		{
+			return false;
+		}
+		// no download url given for this mount-point
 
-		if (!($mount_url = Vfs::mount_url($_url))) return false;	// no mount url found, should not happen
+		if (!($mount_url = Vfs::mount_url($_url)))
+		{
+			return false;
+		}
+		// no mount url found, should not happen
 		list($mount_url) = explode('?',$mount_url);
 
 		$relpath = substr($url,strlen($mount_url));