EGroupware / egroupware

api/src/Egw/Applications.php

Spacing +5 added lines, -5 removed lines

@@ -58,21 +58,21 @@ 
 	 */
 	function read_repository()
 	{
-		if (!isset($GLOBALS['egw_info']['apps']) ||	!is_array($GLOBALS['egw_info']['apps']))
+		if (!isset($GLOBALS['egw_info']['apps']) || !is_array($GLOBALS['egw_info']['apps']))
 		{
 			$this->read_installed_apps();
 		}
 		$this->data = Array();
-		if(!$this->account_id)
+		if (!$this->account_id)
 		{
 			return False;
 		}
 		$apps = $GLOBALS['egw']->acl->get_user_applications($this->account_id);
-		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
+		foreach (array_keys($GLOBALS['egw_info']['apps']) as $app)
 		{
 			if (isset($apps[$app]) && $apps[$app])
 			{
-				$this->data[$app] =& $GLOBALS['egw_info']['apps'][$app];
+				$this->data[$app] = & $GLOBALS['egw_info']['apps'][$app];
 			}
 		}
 		return $this->data;
@@ -84,7 +84,7 @@ 
 	 */
 	function read_installed_apps()
 	{
-		foreach($this->db->select($this->table_name,'*',false,__LINE__,__FILE__,false,'ORDER BY app_order ASC') as $row)
+		foreach ($this->db->select($this->table_name, '*', false, __LINE__, __FILE__, false, 'ORDER BY app_order ASC') as $row)
 		{
 			$title = $app_name = $row['app_name'];
 

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

@@ -19,7 +19,7 @@ 
 class Applications
 {
 	var $account_id;
-	var $data = Array();
+	var $data = array();
 	/**
 	 * Reference to the global db class
 	 *
@@ -62,7 +62,7 @@ 
 		{
 			$this->read_installed_apps();
 		}
-		$this->data = Array();
+		$this->data = array();
 		if(!$this->account_id)
 		{
 			return False;
@@ -92,7 +92,7 @@ 
 			{
 				$title = $t;
 			}
-			$GLOBALS['egw_info']['apps'][$app_name] = Array(
+			$GLOBALS['egw_info']['apps'][$app_name] = array(
 				'title'   => $title,
 				'name'    => $app_name,
 				'enabled' => True,

api/src/Link.php

Indentation +3 added lines, -3 removed lines

@@ -480,7 +480,7 @@ 
 		}
 		$ids = Link\Storage::get_links($app, $id, $only_app, $order, $deleted, $limit);
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			if (($vfs_ids = self::list_attached($app,$id)))
 			{
@@ -536,7 +536,7 @@ 
 		$links = Link\Storage::get_links($app,$ids,$only_app,$order,$deleted);
 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			// todo do that in a single query, eg. directory listing, too
 			foreach($ids as $id)
@@ -793,7 +793,7 @@ 
 
 		if (!isset($options['total']))
 		{
-		       $options['total'] = count($result);
+			   $options['total'] = count($result);
 		}
 		if (is_array($result) && (isset($options['start']) || (isset($options['num_rows']) && count($result) > $options['num_rows'])))
 		{

Doc Comments +3 added lines, -4 removed lines

@@ -433,7 +433,7 @@ 
 	 * generate temporary link_id used as array-key
 	 *
 	 * @param string $app app-name
-	 * @param mixed $id
+	 * @param string $id
 	 * @return string
 	 */
 	static function temp_link_id($app,$id)
@@ -579,7 +579,7 @@ 
 	 * @param string|array $id ='' id if $app_link_id is an appname or array with links, if 1. entry not yet created
 	 * @param string $app2 ='' second app
 	 * @param string $id2 ='' id in $app2
-	 * @return array with link-data or False
+	 * @return string with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{
@@ -1197,7 +1197,6 @@ 
 	 * @param string $app appname to link the file to
 	 * @param string $id id in $app
 	 * @param string $file VFS path to link to
-	 * @param string $comment ='' comment to add to the link
 	 */
 	static function link_file($app,$id,$file)//,$comment='')
 	{
@@ -1224,7 +1223,7 @@ 
 	 * @param int|string $app > 0: file_id of an attchemnt or $app/$id entry which linked to
 	 * @param string $id ='' id in app
 	 * @param string $fname ='' filename
-	 * @return boolean|array false on error ($app or $id not found), array with path as key and boolean result of delete
+	 * @return boolean false on error ($app or $id not found), array with path as key and boolean result of delete
 	 */
 	static function delete_attached($app,$id='',$fname='')
 	{

Spacing +176 added lines, -176 removed lines

@@ -113,7 +113,7 @@ 
 	/**
 	 * appname used for returned attached files (!= 'filemanager'!)
 	 */
-	const VFS_APPNAME = 'file';		// pseudo-appname for own file-attachments in vfs, this is NOT the vfs-app
+	const VFS_APPNAME = 'file'; // pseudo-appname for own file-attachments in vfs, this is NOT the vfs-app
 
 	/**
 	 * Appname used of files stored via Link::set_data()
@@ -146,7 +146,7 @@ 
 			'icon' => 'addressbook/accounts',
 			'query' => 'EGroupware\\Api\\Accounts::link_query',
 			'title' => 'EGroupware\\Api\\Accounts::username',
-			'view' => array('menuaction'=>'addressbook.addressbook_ui.view','ajax'=>'true'),
+			'view' => array('menuaction'=>'addressbook.addressbook_ui.view', 'ajax'=>'true'),
 			'view_id' => 'account_id'
 		),
 		'api' => array(
@@ -207,19 +207,19 @@ 
 		// for performance reasons, we do it only once / cache it in the session
 		if (!($search_link_hooks = Cache::getSession(__CLASS__, 'search_link_hooks')))
 		{
-			$search_link_hooks = Hooks::process('search_link',array(), (bool)$GLOBALS['egw_info']['flags']['async-service']);
+			$search_link_hooks = Hooks::process('search_link', array(), (bool)$GLOBALS['egw_info']['flags']['async-service']);
 			Cache::setSession(__CLASS__, 'search_link_hooks', $search_link_hooks);
 		}
 		if (is_array($search_link_hooks))
 		{
-			foreach($search_link_hooks as $app => $data)
+			foreach ($search_link_hooks as $app => $data)
 			{
 				// allow apps to register additional types
 				if (isset($data['additional']))
 				{
-					foreach($data['additional'] as $name => $values)
+					foreach ($data['additional'] as $name => $values)
 					{
-						$values['app'] = $app;	// store name of registring app, to be able to check access
+						$values['app'] = $app; // store name of registring app, to be able to check access
 						self::$app_register[$name] = $values;
 					}
 					unset($data['additional']);
@@ -229,7 +229,7 @@ 
 				{
 					$data['list'] = array('menuaction' => $data['view_list']);
 				}
-				elseif(isset($data['list']) && !isset($data['view_list']))
+				elseif (isset($data['list']) && !isset($data['view_list']))
 				{
 					$data['view_list'] = $data['list']['menuaction'];
 				}
@@ -273,18 +273,18 @@ 
 	public static function json_registry()
 	{
 		$to_json = array();
-		foreach(self::$app_register as $app => $data)
+		foreach (self::$app_register as $app => $data)
 		{
 			if (isset($GLOBALS['egw_info']['user']['apps'][$app]) ||
 				isset($data['app']) && isset($GLOBALS['egw_info']['user']['apps'][$data['app']]))
 			{
 				$to_json[$app] = array_intersect_key($data, array_flip(array(
-					'view','view_id','view_popup',
-					'add','add_app','add_id','add_popup',
-					'edit','edit_id','edit_popup',
-					'list','list_popup',
-					'name','icon','query',
-					'mime','entry','entries',
+					'view', 'view_id', 'view_popup',
+					'add', 'add_app', 'add_id', 'add_popup',
+					'edit', 'edit_id', 'edit_popup',
+					'list', 'list_popup',
+					'name', 'icon', 'query',
+					'mime', 'entry', 'entries',
 				)));
 			}
 		}
@@ -329,11 +329,11 @@ 
 	 * @param int $no_notify =0 &1 dont notify $app1, &2 dont notify $app2
 	 * @return int/boolean False (for db or param-error) or on success link_id (Please not the return-value of $id1)
 	 */
-	static function link( $app1,&$id1,$app2,$id2='',$remark='',$owner=0,$lastmod=0,$no_notify=0 )
+	static function link($app1, &$id1, $app2, $id2 = '', $remark = '', $owner = 0, $lastmod = 0, $no_notify = 0)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>Link::link('$app1',$id1,'".print_r($app2,true)."',".print_r($id2,true).",'$remark',$owner,$lastmod)</p>\n";
+			echo "<p>Link::link('$app1',$id1,'".print_r($app2, true)."',".print_r($id2, true).",'$remark',$owner,$lastmod)</p>\n";
 		}
 		if (!$app1 || !$app2 || $app1 == $app2 && $id1 == $id2)
 		{
@@ -352,7 +352,7 @@ 
 				}
 				if (is_array($id1) || !$id1)		// create link only in $id1 array
 				{
-					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'],$link['owner'],$link['lastmod']);
+					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'], $link['owner'], $link['lastmod']);
 					continue;
 				}
 				switch ($link['app'])
@@ -365,19 +365,19 @@ 
 						}
 						// fall through
 					case self::VFS_APPNAME:
-						$link_id = self::attach_file($app1,$id1,$link['id'],$link['remark']);
+						$link_id = self::attach_file($app1, $id1, $link['id'], $link['remark']);
 						break;
 
 					case self::VFS_LINK:
-						$link_id = self::link_file($app1,$id1, $link['id'],$link['remark']);
+						$link_id = self::link_file($app1, $id1, $link['id'], $link['remark']);
 						break;
 
 					default:
-						$link_id = Link\Storage::link($app1,$id1,$link['app'],$link['id'],
-							$link['remark'],$link['owner'],$link['lastmod']);
+						$link_id = Link\Storage::link($app1, $id1, $link['app'], $link['id'],
+							$link['remark'], $link['owner'], $link['lastmod']);
 						// notify both sides
-						if (!($no_notify&2)) self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
-						if (!($no_notify&1)) self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						if (!($no_notify&2)) self::notify('link', $link['app'], $link['id'], $app1, $id1, $link_id);
+						if (!($no_notify&1)) self::notify('link', $app1, $id1, $link['app'], $link['id'], $link_id);
 						break;
 				}
 			}
@@ -389,7 +389,7 @@ 
 			{
 				$id1 = array( );
 			}
-			$link_id = self::temp_link_id($app2,$id2);
+			$link_id = self::temp_link_id($app2, $id2);
 
 			$id1[$link_id] = array(
 				'app' => $app2,
@@ -407,24 +407,24 @@ 
 		}
 		if ($app1 == self::VFS_LINK)
 		{
-			return self::link_file($app2,$id2,$id1,$remark);
+			return self::link_file($app2, $id2, $id1, $remark);
 		}
 		elseif ($app2 == self::VFS_LINK)
 		{
-			return self::link_file($app1,$id1,$id2,$remark);
+			return self::link_file($app1, $id1, $id2, $remark);
 		}
 		if ($app1 == self::VFS_APPNAME)
 		{
-			return self::attach_file($app2,$id2,$id1,$remark);
+			return self::attach_file($app2, $id2, $id1, $remark);
 		}
 		elseif ($app2 == self::VFS_APPNAME)
 		{
-			return self::attach_file($app1,$id1,$id2,$remark);
+			return self::attach_file($app1, $id1, $id2, $remark);
 		}
-		$link_id = Link\Storage::link($app1,$id1,$app2,$id2,$remark,$owner);
+		$link_id = Link\Storage::link($app1, $id1, $app2, $id2, $remark, $owner);
 
-		if (!($no_notify&2)) self::notify('link',$app2,$id2,$app1,$id1,$link_id);
-		if (!($no_notify&1)) self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		if (!($no_notify&2)) self::notify('link', $app2, $id2, $app1, $id1, $link_id);
+		if (!($no_notify&1)) self::notify('link', $app1, $id1, $app2, $id2, $link_id);
 
 		return $link_id;
 	}
@@ -436,9 +436,9 @@ 
 	 * @param mixed $id
 	 * @return string
 	 */
-	static function temp_link_id($app,$id)
+	static function temp_link_id($app, $id)
 	{
-		return $app.':'.(!in_array($app, array(self::VFS_APPNAME,self::VFS_LINK, self::DATA_APPNAME)) ? $id : $id['name']);
+		return $app.':'.(!in_array($app, array(self::VFS_APPNAME, self::VFS_LINK, self::DATA_APPNAME)) ? $id : $id['name']);
 	}
 
 	/**
@@ -454,7 +454,7 @@ 
 	 * @param int $limit =null number of entries to return, only affects links, attachments are allways reported!
 	 * @return array id => links pairs if $id is an array or just the links (only_app: ids) or empty array if no matching links found
 	 */
-	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC',$cache_titles=false, $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $cache_titles = false, $deleted = false, $limit = null)
 	{
 		if (self::DEBUG) echo "<p>Link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
 
@@ -465,7 +465,7 @@ 
 			{
 				if (($not_only = $only_app[0] == '!'))
 				{
-					$only_app = substr(1,$only_app);
+					$only_app = substr(1, $only_app);
 				}
 				foreach (array_reverse($id) as $link)
 				{
@@ -482,7 +482,7 @@ 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
 		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
-			if (($vfs_ids = self::list_attached($app,$id)))
+			if (($vfs_ids = self::list_attached($app, $id)))
 			{
 				$ids += $vfs_ids;
 			}
@@ -492,18 +492,18 @@ 
 		{
 			// agregate links by app
 			$app_ids = array();
-			foreach($ids as $link)
+			foreach ($ids as $link)
 			{
 				$app_ids[$link['app']][] = $link['id'];
 			}
-			foreach($app_ids as $appname => $a_ids)
+			foreach ($app_ids as $appname => $a_ids)
 			{
-				self::titles($appname,array_unique($a_ids));
+				self::titles($appname, array_unique($a_ids));
 			}
 			// remove links, current user has no access, from result
-			foreach($ids as $key => $link)
+			foreach ($ids as $key => $link)
 			{
-				if (!self::title($link['app'],$link['id']))
+				if (!self::title($link['app'], $link['id']))
 				{
 					unset($ids[$key]);
 				}
@@ -525,27 +525,27 @@ 
 	 * @param boolean $deleted =false Include links that have been flagged as deleted, waiting for purge of linked record.
 	 * @return array of $id => array($links) pairs
 	 */
-	static function get_links_multiple($app,array $ids,$cache_titles=true,$only_app='',$order='link_lastmod DESC', $deleted=false )
+	static function get_links_multiple($app, array $ids, $cache_titles = true, $only_app = '', $order = 'link_lastmod DESC', $deleted = false)
 	{
-		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids, true).",$cache_titles,'$only_app','$order')</p>\n";
 
 		if (!$ids)
 		{
-			return array();		// no ids are linked to nothing
+			return array(); // no ids are linked to nothing
 		}
-		$links = Link\Storage::get_links($app,$ids,$only_app,$order,$deleted);
+		$links = Link\Storage::get_links($app, $ids, $only_app, $order, $deleted);
 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
 		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			// todo do that in a single query, eg. directory listing, too
-			foreach($ids as $id)
+			foreach ($ids as $id)
 			{
 				if (!isset($links[$id]))
 				{
 					$links[$id] = array();
 				}
-				if (($vfs_ids = self::list_attached($app,$id)))
+				if (($vfs_ids = self::list_attached($app, $id)))
 				{
 					$links[$id] += $vfs_ids;
 				}
@@ -555,16 +555,16 @@ 
 		{
 			// agregate links by app
 			$app_ids = array();
-			foreach($links as &$targets)
+			foreach ($links as &$targets)
 			{
-				foreach($targets as $link)
+				foreach ($targets as $link)
 				{
 					if (is_array($link)) $app_ids[$link['app']][] = $link['id'];
 				}
 			}
-			foreach($app_ids as $app => $a_ids)
+			foreach ($app_ids as $app => $a_ids)
 			{
-				self::titles($app,array_unique($a_ids));
+				self::titles($app, array_unique($a_ids));
 			}
 		}
 		return $links;
@@ -581,7 +581,7 @@ 
 	 * @param string $id2 ='' id in $app2
 	 * @return array with link-data or False
 	 */
-	static function get_link($app_link_id,$id='',$app2='',$id2='')
+	static function get_link($app_link_id, $id = '', $app2 = '', $id2 = '')
 	{
 		if (self::DEBUG)
 		{
@@ -589,7 +589,7 @@ 
 		}
 		if (is_array($id))
 		{
-			if (strpos($app_link_id,':') === false) $app_link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+			if (strpos($app_link_id, ':') === false) $app_link_id = self::temp_link_id($app2, $id2); // create link_id of temporary link, if not given
 
 			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))	// check for unlinked-marker
 			{
@@ -605,11 +605,11 @@ 
 			}
 			if ($app_link_id == self::VFS_APPNAME)
 			{
-				return self::info_attached($app2,$id2,$id);
+				return self::info_attached($app2, $id2, $id);
 			}
-			return self::info_attached($app_link_id,$id,$id2);
+			return self::info_attached($app_link_id, $id, $id2);
 		}
-		return Link\Storage::get_link($app_link_id,$id,$app2,$id2);
+		return Link\Storage::get_link($app_link_id, $id, $app2, $id2);
 	}
 
 	/**
@@ -627,9 +627,9 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete
 	 * @return the number of links deleted
 	 */
-	static function unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink($link_id, $app = '', $id = '', $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
-		return self::unlink2($link_id,$app,$id,$owner,$app2,$id2,$hold_for_purge);
+		return self::unlink2($link_id, $app, $id, $owner, $app2, $id2, $hold_for_purge);
 	}
 
 	/**
@@ -644,7 +644,7 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete
 	 * @return the number of links deleted
 	 */
-	static function unlink2($link_id,$app,&$id,$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink2($link_id, $app, &$id, $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
 		if (self::DEBUG)
 		{
@@ -656,22 +656,22 @@ 
 		}
 		elseif ($app == self::VFS_APPNAME)
 		{
-			return self::delete_attached($app2,$id2,$id);
+			return self::delete_attached($app2, $id2, $id);
 		}
 		elseif ($app2 == self::VFS_APPNAME)
 		{
-			return self::delete_attached($app,$id,$id2);
+			return self::delete_attached($app, $id, $id2);
 		}
 		if (!is_array($id))
 		{
 			if (!$link_id && !$app2 && !$id2 && $app2 != '!'.self::VFS_APPNAME)
 			{
-				self::delete_attached($app,$id);	// deleting all attachments
-				self::delete_cache($app,$id);
+				self::delete_attached($app, $id); // deleting all attachments
+				self::delete_cache($app, $id);
 			}
 
 			// Log in history
-			if($link_id && (!$app || !$app2))
+			if ($link_id && (!$app || !$app2))
 			{
 				// Need to load it first
 				$link = self::get_link($link_id);
@@ -682,21 +682,21 @@ 
 			}
 			if ($app && $app2)
 			{
-				Storage\History::static_add($app,$id,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app2.':'.$id2);
-				Storage\History::static_add($app2,$id2,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app.':'.$id);
+				Storage\History::static_add($app, $id, $GLOBALS['egw_info']['user']['account_id'], '~link~', '', $app2.':'.$id2);
+				Storage\History::static_add($app2, $id2, $GLOBALS['egw_info']['user']['account_id'], '~link~', '', $app.':'.$id);
 			}
-			$deleted =& Link\Storage::unlink($link_id,$app,$id,$owner,$app2 != '!'.self::VFS_APPNAME ? $app2 : '',$id2,$hold_for_purge);
+			$deleted = & Link\Storage::unlink($link_id, $app, $id, $owner, $app2 != '!'.self::VFS_APPNAME ? $app2 : '', $id2, $hold_for_purge);
 
 			// only notify on real links, not the one cached for writing or fileattachments
 			self::notify_unlink($deleted);
 
 			return count($deleted);
 		}
-		if (!$link_id) $link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+		if (!$link_id) $link_id = self::temp_link_id($app2, $id2); // create link_id of temporary link, if not given
 
 		if (isset($id[$link_id]))
 		{
-			$id[$link_id] = False;	// set the unlink marker
+			$id[$link_id] = False; // set the unlink marker
 
 			if (self::DEBUG)
 			{
@@ -713,10 +713,10 @@ 
 	 * @param string $must_support capability the apps need to support, eg. 'add', default ''=list all apps
 	 * @return array with app => title pairs
 	 */
-	static function app_list($must_support='')
+	static function app_list($must_support = '')
 	{
 		$apps = array();
-		foreach(self::$app_register as $type => $reg)
+		foreach (self::$app_register as $type => $reg)
 		{
 			if ($must_support && !isset($reg[$must_support])) continue;
 
@@ -773,11 +773,11 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return string/boolean string with title, null if $id does not exist in $app or false if no perms to view it
 	 */
-	static function title($app,$id,$link=null)
+	static function title($app, $id, $link = null)
 	{
 		if (!$id) return '';
 
-		$title =& self::get_cache($app,$id);
+		$title = & self::get_cache($app, $id);
 		if (isset($title) && !empty($title) && !is_array($id))
 		{
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
@@ -819,7 +819,7 @@ 
 			if (!isset($unlinking[$app]) || !isset($unlinking[$app][$id]))
 			{
 				$unlinking[$app][$id] = true;
-				self::unlink(0,$app,$id);
+				self::unlink(0, $app, $id);
 				unset($unlinking[$app][$id]);
 			}
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
@@ -844,36 +844,36 @@ 
 	 * @param string $app
 	 * @param array $ids
 	 */
-	static function titles($app,array $ids)
+	static function titles($app, array $ids)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>".__METHOD__."($app,".implode(',',$ids).")</p>\n";
+			echo "<p>".__METHOD__."($app,".implode(',', $ids).")</p>\n";
 		}
 		$titles = $ids_to_query = array();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
-			$title =& self::get_cache($app,$id);
+			$title = & self::get_cache($app, $id);
 			if (!isset($title))
 			{
 				if (isset(self::$app_register[$app]['titles']))
 				{
-					$ids_to_query[] = $id;	// titles method --> collect links to query at once
+					$ids_to_query[] = $id; // titles method --> collect links to query at once
 				}
 				else
 				{
-					$title = self::title($app,$id);	// no titles method --> fallback to query each link separate
+					$title = self::title($app, $id); // no titles method --> fallback to query each link separate
 				}
 			}
 			$titles[$id] = $title;
 		}
 		if ($ids_to_query)
 		{
-			for ($n = 0; ($ids = array_slice($ids_to_query,$n*self::MAX_TITLES_QUERY,self::MAX_TITLES_QUERY)); ++$n)
+			for ($n = 0; ($ids = array_slice($ids_to_query, $n * self::MAX_TITLES_QUERY, self::MAX_TITLES_QUERY)); ++$n)
 			{
-				foreach(self::exec(self::$app_register[$app]['titles'], array($ids)) as $id => $t)
+				foreach (self::exec(self::$app_register[$app]['titles'], array($ids)) as $id => $t)
 				{
-					$title =& self::get_cache($app,$id);
+					$title = & self::get_cache($app, $id);
 					$titles[$id] = $title = $t;
 				}
 			}
@@ -889,7 +889,7 @@ 
 	 * @param string $to_id =''id in $to_app
 	 * @return array/boolean with name-value pairs for link to add-methode of $app or false if add not supported
 	 */
-	static function add($app,$to_app='',$to_id='')
+	static function add($app, $to_app = '', $to_id = '')
 	{
 		//echo "<p>Link::add('$app','$to_app','$to_id') app_register[$app] ="; _debug_array($app_register[$app]);
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['add']))
@@ -914,7 +914,7 @@ 
 	 * @param string &$popup=null on return popup size eg. '600x400' or null
 	 * @return array|boolean with name-value pairs for link to edit-methode of $app or false if edit not supported
 	 */
-	static function edit($app,$id,&$popup=null)
+	static function edit($app, $id, &$popup = null)
 	{
 		//echo "<p>Link::add('$app','$to_app','$to_id') app_register[$app] ="; _debug_array($app_register[$app]);
 		if (empty($app) || empty($id) || !is_array($reg = self::$app_register[$app]) || !isset($reg['edit']))
@@ -922,7 +922,7 @@ 
 			if ($reg && isset($reg['view']))
 			{
 				$popup = $reg['view_popup'];
-				return self::view($app,$id);	// fallback to view
+				return self::view($app, $id); // fallback to view
 			}
 			return false;
 		}
@@ -942,12 +942,12 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return array with name-value pairs for link to view-methode of $app to view $id
 	 */
-	static function view($app,$id,$link=null)
+	static function view($app, $id, $link = null)
 	{
 		if ($app == self::VFS_APPNAME && !empty($id) && is_array($link))
 		{
 			//return Vfs::download_url(self::vfs_path($link['app2'],$link['id2'],$link['id'],true));
-			return self::mime_open(self::vfs_path($link['app2'],$link['id2'],$link['id'],true), $link['type']);
+			return self::mime_open(self::vfs_path($link['app2'], $link['id2'], $link['id'], true), $link['type']);
 		}
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['view']) || !isset($reg['view_id']))
 		{
@@ -955,11 +955,11 @@ 
 		}
 		$view = $reg['view'];
 
-		$names = explode(':',$reg['view_id']);
+		$names = explode(':', $reg['view_id']);
 		if (count($names) > 1)
 		{
-			$id = explode(':',$id);
-			while (list($n,$name) = each($names))
+			$id = explode(':', $id);
+			while (list($n, $name) = each($names))
 			{
 				$view[$name] = $id[$n];
 			}
@@ -983,13 +983,13 @@ 
 	 */
 	static function get_mime_info($type)
 	{
-		foreach(self::$app_register as $app => $registry)
+		foreach (self::$app_register as $app => $registry)
 		{
 			if (isset($registry['mime']) &&
 				(isset($GLOBALS['egw_info']['user']['apps'][$app]) ||
 				isset($registry['app']) && isset($GLOBALS['egw_info']['user']['apps'][$registry['app']])))
 			{
-				foreach($registry['mime'] as $mime => $data)
+				foreach ($registry['mime'] as $mime => $data)
 				{
 					if ($mime == $type) return $data;
 					if ($mime[0] == '/' && preg_match($mime.'i', $type))
@@ -1010,7 +1010,7 @@ 
 	 * @param string &$popup=null on return popup size or null
 	 * @return string|array string with EGw relative link, array with get-parameters for '/index.php' or null (directory and not filemanager access)
 	 */
-	static function mime_open($path, $type=null, &$popup=null)
+	static function mime_open($path, $type = null, &$popup = null)
 	{
 		if (is_null($type)) $type = Vfs::mime_content_type($path);
 
@@ -1026,7 +1026,7 @@ 
 				$data[$data['mime_id']] = $path;
 				unset($data['mime_id']);
 			}
-			elseif(isset($data['mime_popup']))
+			elseif (isset($data['mime_popup']))
 			{
 				$popup = $data['mime_popup'];
 			}
@@ -1051,9 +1051,9 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return boolean|string false if no popup is used or $app is not registered, otherwise string with the prefered popup size (eg. '640x400)
 	 */
-	static function is_popup($app, $action='view', $link=null)
+	static function is_popup($app, $action = 'view', $link = null)
 	{
-		$popup = self::get_registry($app,$action.'_popup');
+		$popup = self::get_registry($app, $action.'_popup');
 
 		// for files/attachments check mime-registry
 		if ($app == self::VFS_APPNAME && is_array($link) && !empty($link['type']))
@@ -1076,7 +1076,7 @@ 
 	 * @param string $name name / key in the registry, eg. 'view'
 	 * @return boolean|string false if $app is not registered, otherwise string with the value for $name
 	 */
-	static function get_registry($app,$name)
+	static function get_registry($app, $name)
 	{
 		$reg = self::$app_register[$app];
 
@@ -1084,7 +1084,7 @@ 
 
 		if (!isset($reg[$name]))	// some defaults
 		{
-			switch($name)
+			switch ($name)
 			{
 				case 'name':
 					$reg[$name] = $app;
@@ -1120,16 +1120,16 @@ 
 	 * @param boolean $just_the_path =false return url or just the vfs path
 	 * @return string/array path or array with path and relatives, depending on $relatives
 	 */
-	static function vfs_path($app,$id='',$file='',$just_the_path=false)
+	static function vfs_path($app, $id = '', $file = '', $just_the_path = false)
 	{
 		$path = self::VFS_BASEURL;
 
 		if ($app)
 		{
-			if( isset(self::$app_register[$app]) ) {
+			if (isset(self::$app_register[$app])) {
 				$reg = self::$app_register[$app];
 
-				if( isset($reg['file_dir']) ) {
+				if (isset($reg['file_dir'])) {
 					$app = $reg['file_dir'];
 				}
 			}
@@ -1148,7 +1148,7 @@ 
 		}
 		if ($just_the_path)
 		{
-			$path = parse_url($path,PHP_URL_PATH);
+			$path = parse_url($path, PHP_URL_PATH);
 		}
 		else
 		{
@@ -1172,16 +1172,16 @@ 
 	 * @param string $comment ='' comment to add to the link
 	 * @return int negative id of egw_sqlfs table as negative link-id's are for vfs attachments
 	 */
-	static function attach_file($app,$id,$file,$comment='')
+	static function attach_file($app, $id, $file, $comment = '')
 	{
-		$entry_dir = self::vfs_path($app,$id);
+		$entry_dir = self::vfs_path($app, $id);
 		if (self::DEBUG)
 		{
 			echo "<p>attach_file: app='$app', id='$id', tmp_name='$file[tmp_name]', name='$file[name]', size='$file[size]', type='$file[type]', path='$file[path]', ip='$file[ip]', comment='$comment', entry_dir='$entry_dir'</p>\n";
 		}
-		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
+		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir, 0, true)))
 		{
-			$Ok = Vfs::copy_uploaded($file, $p=self::vfs_path($app,$id,'',true), $comment, false);	// no is_uploaded_file() check!
+			$Ok = Vfs::copy_uploaded($file, $p = self::vfs_path($app, $id, '', true), $comment, false); // no is_uploaded_file() check!
 			if (!$Ok) error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called Vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
 		}
 		else
@@ -1199,24 +1199,24 @@ 
 	 * @param string $file VFS path to link to
 	 * @param string $comment ='' comment to add to the link
 	 */
-	static function link_file($app,$id,$file)//,$comment='')
+	static function link_file($app, $id, $file)//,$comment='')
 	{
 		// Don't try to link into app dir if there is no id
-		if(!$id) return;
+		if (!$id) return;
 
-		$app_path = self::vfs_path($app,$id);
+		$app_path = self::vfs_path($app, $id);
 		$ok = true;
-		if (Vfs::file_exists($app_path) || ($ok = Vfs::mkdir($app_path,0,true)))
+		if (Vfs::file_exists($app_path) || ($ok = Vfs::mkdir($app_path, 0, true)))
 		{
 			if (!Vfs::stat($file))
 			{
-				error_log(__METHOD__. ' (Link target ' . Vfs::decodePath($file) . ' not found!');
+				error_log(__METHOD__.' (Link target '.Vfs::decodePath($file).' not found!');
 				return false;
 			}
 		}
 
-		$link = Vfs::concat($app_path,Vfs::basename($file));
-		return Vfs::symlink($file,$link);
+		$link = Vfs::concat($app_path, Vfs::basename($file));
+		return Vfs::symlink($file, $link);
 	}
 	/**
 	 * deletes a single or all attached files of an entry (for all there's no acl check, as the entry probably not exists any more!)
@@ -1226,7 +1226,7 @@ 
 	 * @param string $fname ='' filename
 	 * @return boolean|array false on error ($app or $id not found), array with path as key and boolean result of delete
 	 */
-	static function delete_attached($app,$id='',$fname='')
+	static function delete_attached($app, $id = '', $fname = '')
 	{
 		if ((int)$app > 0)	// is file_id
 		{
@@ -1236,9 +1236,9 @@ 
 		{
 			if (empty($app) || empty($id))
 			{
-				return False;	// dont delete more than all attachments of an entry
+				return False; // dont delete more than all attachments of an entry
 			}
-			$url = self::vfs_path($app,$id,$fname);
+			$url = self::vfs_path($app, $id, $fname);
 
 			if (!$fname || !$id)	// we delete the whole entry (or all entries), which probably not exist anymore
 			{
@@ -1251,15 +1251,15 @@ 
 			echo '<p>'.__METHOD__."('$app','$id','$fname') url=$url</p>\n";
 		}
 		// Log in history - Need to load it first
-		if((int)$app > 0)
+		if ((int)$app > 0)
 		{
 			$link = self::get_link(-$app);
-			if($link['app2'] && $link['id2'])
+			if ($link['app2'] && $link['id2'])
 			{
-				Storage\History::static_add($link['app2'],$link['id2'],$GLOBALS['egw_info']['user']['account_id'],'~file~','', basename($url));
+				Storage\History::static_add($link['app2'], $link['id2'], $GLOBALS['egw_info']['user']['account_id'], '~file~', '', basename($url));
 			}
 		}
-		if (($Ok = !file_exists($url) || Vfs::remove($url,true)) && ((int)$app > 0 || $fname))
+		if (($Ok = !file_exists($url) || Vfs::remove($url, true)) && ((int)$app > 0 || $fname))
 		{
 			// try removing the dir, in case it's empty
 			if (($dir = Vfs::dirname($url))) @Vfs::rmdir($dir);
@@ -1279,14 +1279,14 @@ 
 	 * @param string $filename filename
 	 * @return array 'kind' of link-array
 	 */
-	static function info_attached($app,$id,$filename)
+	static function info_attached($app, $id, $filename)
 	{
-		$path = self::vfs_path($app,$id,$filename,true);
-		if (!($stat = Vfs::stat($path,STREAM_URL_STAT_QUIET)))
+		$path = self::vfs_path($app, $id, $filename, true);
+		if (!($stat = Vfs::stat($path, STREAM_URL_STAT_QUIET)))
 		{
 			return false;
 		}
-		return self::fileinfo2link($stat,$path);
+		return self::fileinfo2link($stat, $path);
 	}
 
 	/**
@@ -1295,36 +1295,36 @@ 
 	 * @param array|int $fileinfo a row from the vfs-db-table (eg. returned by the vfs ls static function) or a file_id of that table
 	 * @return array a 'kind' of link-array
 	 */
-	static function fileinfo2link($fileinfo,$url=null)
+	static function fileinfo2link($fileinfo, $url = null)
 	{
 		if (!is_array($fileinfo))
 		{
 			$url = Vfs\Sqlfs\StreamWrapper::id2path($fileinfo);
-			if (!($fileinfo = Vfs::url_stat($url,STREAM_URL_STAT_QUIET)))
+			if (!($fileinfo = Vfs::url_stat($url, STREAM_URL_STAT_QUIET)))
 			{
 				return false;
 			}
 		}
 
-		$up = explode('/',$url[0] == '/' ? $url : parse_url($url,PHP_URL_PATH));	// /apps/$app/$id
+		$up = explode('/', $url[0] == '/' ? $url : parse_url($url, PHP_URL_PATH)); // /apps/$app/$id
 		$app = null;
 
-		foreach( self::$app_register as $tapp => $reg ) {
-			if( isset($reg['file_dir']) ) {
+		foreach (self::$app_register as $tapp => $reg) {
+			if (isset($reg['file_dir'])) {
 				$lup = $up;
 
 				unset($lup[0]);
 				unset($lup[1]);
 				reset($lup);
 
-				$fdp = explode('/',$reg['file_dir'][0] == '/' ?
-					$reg['file_dir'] : parse_url($reg['file_dir'],PHP_URL_PATH));
+				$fdp = explode('/', $reg['file_dir'][0] == '/' ?
+					$reg['file_dir'] : parse_url($reg['file_dir'], PHP_URL_PATH));
 
 				$found = true;
 
-				foreach( $fdp as $part ) {
-					if( current($lup) == $part ) {
-						if( next($lup) === false ) {
+				foreach ($fdp as $part) {
+					if (current($lup) == $part) {
+						if (next($lup) === false) {
 							$found = false;
 							break;
 						}
@@ -1335,16 +1335,16 @@ 
 					}
 				}
 
-				if( $found ) {
-					$id	= current($lup);
+				if ($found) {
+					$id = current($lup);
 					$app = $tapp;
 					break;
 				}
 			}
 		}
 
-		if( $app === null ) {
-			list(,,$app,$id) = $up;
+		if ($app === null) {
+			list(,, $app, $id) = $up;
 		}
 
 		return array(
@@ -1352,7 +1352,7 @@ 
 			'id'        => $fileinfo['name'],
 			'app2'      => $app,
 			'id2'       => $id,
-			'remark'    => '',					// only list_attached currently sets the remark
+			'remark'    => '', // only list_attached currently sets the remark
 			'owner'     => $fileinfo['uid'],
 			'link_id'   => -$fileinfo['ino'],
 			'lastmod'   => $fileinfo['mtime'],
@@ -1368,26 +1368,26 @@ 
 	 * @param string $id id in app
 	 * @return array with link_id => 'kind' of link-array pairs
 	 */
-	static function list_attached($app,$id)
+	static function list_attached($app, $id)
 	{
-		$path = self::vfs_path($app,$id);
+		$path = self::vfs_path($app, $id);
 		//error_log(__METHOD__."($app,$id) url=$url");
 
-		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
+		if (!($extra = self::get_registry($app, 'find_extra'))) $extra = array();
 
 		// always use regular links stream wrapper here: extended one is unnecessary (slow) for just listing attachments
-		if (substr($path,0,13) == 'stylite.links') $path = substr($path,8);
+		if (substr($path, 0, 13) == 'stylite.links') $path = substr($path, 8);
 
 		$attached = array();
-		if (($url2stats = Vfs::find($path,array('need_mime'=>true,'type'=>'F','url'=>true)+$extra,true)))
+		if (($url2stats = Vfs::find($path, array('need_mime'=>true, 'type'=>'F', 'url'=>true) + $extra, true)))
 		{
-			$props = Vfs::propfind(array_keys($url2stats));	// get the comments
-			foreach($url2stats as $url => &$fileinfo)
+			$props = Vfs::propfind(array_keys($url2stats)); // get the comments
+			foreach ($url2stats as $url => &$fileinfo)
 			{
-				$link = self::fileinfo2link($fileinfo,$url);
+				$link = self::fileinfo2link($fileinfo, $url);
 				if ($props && isset($props[$url]))
 				{
-					foreach($props[$url] as $prop)
+					foreach ($props[$url] as $prop)
 					{
 						if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'] == 'comment')
 						{
@@ -1409,7 +1409,7 @@ 
 	 */
 	static private function decode_htmlspecialchars($str)
 	{
-		return str_replace(array('&amp;','&quot;','&lt;','&gt;'),array('&','"','<','>'),$str);
+		return str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $str);
 	}
 
 	/**
@@ -1427,18 +1427,18 @@ 
 	 * @param string $id id in $app of the updated entry
 	 * @param array $data =null updated data of changed entry, as the read-method of the BO-layer would supply it
 	 */
-	static function notify_update($app,$id,$data=null)
+	static function notify_update($app, $id, $data = null)
 	{
-		self::delete_cache($app,$id);
+		self::delete_cache($app, $id);
 		//error_log(__METHOD__."('$app', $id, $data)");
-		foreach(self::get_links($app,$id,'!'.self::VFS_APPNAME) as $link_id => $link)
+		foreach (self::get_links($app, $id, '!'.self::VFS_APPNAME) as $link_id => $link)
 		{
-			self::notify('update',$link['app'],$link['id'],$app,$id,$link_id,$data);
+			self::notify('update', $link['app'], $link['id'], $app, $id, $link_id, $data);
 		}
-		if($data[Link::OLD_LINK_TITLE] && Json\Response::isJSONResponse())
+		if ($data[Link::OLD_LINK_TITLE] && Json\Response::isJSONResponse())
 		{
 			// Update client side with new title
-			Json\Response::get()->apply('egw.link_title_callback',array(array($app => array($id => self::title($app, $id)))));
+			Json\Response::get()->apply('egw.link_title_callback', array(array($app => array($id => self::title($app, $id)))));
 		}
 	}
 
@@ -1462,7 +1462,7 @@ 
 	 * @param string $target_id id in $target_app
 	 * @param array $data =null data of entry in app2 (optional)
 	 */
-	static private function notify($type,$notify_app,$notify_id,$target_app,$target_id,$link_id,$data=null)
+	static private function notify($type, $notify_app, $notify_id, $target_app, $target_id, $link_id, $data = null)
 	{
 		//error_log(__METHOD__."('$type', '$notify_app', $notify_id, '$target_app', $target_id, $link_id, $data)");
 		if ($link_id && isset(self::$app_register[$notify_app]) && isset(self::$app_register[$notify_app]['notify']))
@@ -1489,7 +1489,7 @@ 
 	static public function run_notifies()
 	{
 		//error_log(__METHOD__."() count(self::\$notifies)=".count(self::$notifies));
-		while(self::$notifies)
+		while (self::$notifies)
 		{
 			$args = array_shift(self::$notifies);
 			$method = $args['method'];
@@ -1507,11 +1507,11 @@ 
 	 */
 	static private function notify_unlink(&$links)
 	{
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			// we notify both sides of the link, as the unlink command NOT clearly knows which side initiated the unlink
-			self::notify('unlink',$link['link_app1'],$link['link_id1'],$link['link_app2'],$link['link_id2'],$link['link_id']);
-			self::notify('unlink',$link['link_app2'],$link['link_id2'],$link['link_app1'],$link['link_id1'],$link['link_id']);
+			self::notify('unlink', $link['link_app1'], $link['link_id1'], $link['link_app2'], $link['link_id2'], $link['link_id']);
+			self::notify('unlink', $link['link_app2'], $link['link_id2'], $link['link_app1'], $link['link_id1'], $link['link_id']);
 		}
 	}
 
@@ -1523,9 +1523,9 @@ 
 	 * @param string $type ='title' 'title' or 'file_access'
 	 * @return int|string can be null, if cache not yet set
 	 */
-	private static function &get_cache($app,$id,$type = 'title')
+	private static function &get_cache($app, $id, $type = 'title')
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'title':
 				return self::$title_cache[$app.':'.$id];
@@ -1548,7 +1548,7 @@ 
 	 * @param string $title title string or null
 	 * @param int $file_access =null Acl::READ, Acl::EDIT or both or'ed together
 	 */
-	public static function set_cache($app,$id,$title,$file_access=null)
+	public static function set_cache($app, $id, $title, $file_access = null)
 	{
 		//error_log(__METHOD__."($app,$id,$title,$file_access)");
 		if (!is_null($title))
@@ -1567,7 +1567,7 @@ 
 	 * @param string $app app-name or null to delete the whole cache
 	 * @param int|string $id id or null to delete only file_access cache of given app (keeps title cache, if app implements file_access!)
 	 */
-	private static function delete_cache($app,$id)
+	private static function delete_cache($app, $id)
 	{
 		unset(self::$title_cache[$app.':'.$id]);
 		unset(self::$file_access_cache[$app.':'.$id]);
@@ -1582,7 +1582,7 @@ 
 	 * @param boolean $ignore_mime =false true: return id, even if nothing registered for given mime-type
 	 * @return string|null md5 hash of stored data of server-side supported mime-type or null otherwise
 	 */
-	public static function set_data($mime_type, $method, array $params, $ignore_mime=false)
+	public static function set_data($mime_type, $method, array $params, $ignore_mime = false)
 	{
 		if (!$ignore_mime && (!($info = self::get_mime_info($mime_type)) || empty($info['mime_data'])))
 		{
@@ -1603,7 +1603,7 @@ 
 	 * @return mixed null if id is not found or invalid
 	 * @throws Exception\WrongParameter
 	 */
-	public static function get_data($id, $return_resource=false)
+	public static function get_data($id, $return_resource = false)
 	{
 		$data = Cache::getSession(__CLASS__, $id);
 
@@ -1627,7 +1627,7 @@ 
 			{
 				$fp = $ret;
 				$ret = '';
-				while(!feof($fp))
+				while (!feof($fp))
 				{
 					$ret .= fread($fp, 8192);
 				}
@@ -1652,13 +1652,13 @@ 
 	 * @param int $user =null default null = current user
 	 * @return boolean true if access granted, false otherwise
 	 */
-	static function file_access($app,$id,$required=Acl::READ,$rel_path=null,$user=null)
+	static function file_access($app, $id, $required = Acl::READ, $rel_path = null, $user = null)
 	{
 		// are we called for an other user
 		if ($user && $user != $GLOBALS['egw_info']['user']['account_id'])
 		{
 			// check if app supports file_access WITH 4th $user parameter --> return false if not
-			if (!self::get_registry($app,'file_access_user') || !($method = self::get_registry($app,'file_access')))
+			if (!self::get_registry($app, 'file_access_user') || !($method = self::get_registry($app, 'file_access')))
 			{
 				$ret = false;
 				$err = "(no file_access_user)";
@@ -1672,22 +1672,22 @@ 
 			return $ret;
 		}
 
-		$cache =& self::get_cache($app,$id,'file_access');
+		$cache = & self::get_cache($app, $id, 'file_access');
 
-		if (!isset($cache) || $required == Acl::EDIT && !($cache & $required))
+		if (!isset($cache) || $required == Acl::EDIT && !($cache&$required))
 		{
-			if(($method = self::get_registry($app,'file_access')))
+			if (($method = self::get_registry($app, 'file_access')))
 			{
 				$cache |= self::exec($method, array($id, $required, $rel_path)) ? $required|Acl::READ : 0;
 			}
 			else
 			{
-				$cache |= self::title($app,$id) ? Acl::READ|Acl::EDIT : 0;
+				$cache |= self::title($app, $id) ? Acl::READ|Acl::EDIT : 0;
 			}
 			//error_log(__METHOD__."($app,$id,$required,$rel_path) got $cache --> ".($cache & $required ? 'true' : 'false'));
 		}
 		//else error_log(__METHOD__."($app,$id,$required,$rel_path) using cached value $cache --> ".($cache & $required ? 'true' : 'false'));
-		return !!($cache & $required);
+		return !!($cache&$required);
 	}
 
 	/**
@@ -1700,7 +1700,7 @@ 
 	 * @param array $params array with arguments incl. references
 	 * @return mixed
 	 */
-	protected static function exec($method, array $params=array())
+	protected static function exec($method, array $params = array())
 	{
 		static $objs = array();
 

Braces +174 added lines, -48 removed lines

@@ -298,10 +298,13 @@ 
 	 */
 	static function save_session_cache()
 	{
-		if (isset($GLOBALS['egw']->session))	// eg. cron-jobs use it too, without any session
+		if (isset($GLOBALS['egw']->session))
+		{
+			// eg. cron-jobs use it too, without any session
 		{
 			//error_log(__METHOD__.'() items in title-cache: '.count(self::$title_cache).' file-access-cache: '.count(self::$file_access_cache));
 			Cache::setSession(__CLASS__, 'link_title_cache', self::$title_cache);
+		}
 			Cache::setSession(__CLASS__, 'link_file_access_cache', self::$file_access_cache);
 		}
 	}
@@ -345,14 +348,20 @@ 
 			$link_id = True;
 			while ($link_id && list(,$link) = each($app2))
 			{
-				if (!is_array($link))	// check for unlink-marker
+				if (!is_array($link))
+				{
+					// check for unlink-marker
 				{
 					//echo "<b>link='$link' is no array</b><br>\n";
 					continue;
 				}
-				if (is_array($id1) || !$id1)		// create link only in $id1 array
+				}
+				if (is_array($id1) || !$id1)
+				{
+					// create link only in $id1 array
 				{
 					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'],$link['owner'],$link['lastmod']);
+				}
 					continue;
 				}
 				switch ($link['app'])
@@ -376,18 +385,27 @@ 
 						$link_id = Link\Storage::link($app1,$id1,$link['app'],$link['id'],
 							$link['remark'],$link['owner'],$link['lastmod']);
 						// notify both sides
-						if (!($no_notify&2)) self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
-						if (!($no_notify&1)) self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						if (!($no_notify&2))
+						{
+							self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
+						}
+						if (!($no_notify&1))
+						{
+							self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						}
 						break;
 				}
 			}
 			return $link_id;
 		}
-		if (is_array($id1) || !$id1)		// create link only in $id1 array
+		if (is_array($id1) || !$id1)
+		{
+			// create link only in $id1 array
 		{
 			if (!is_array($id1))
 			{
 				$id1 = array( );
+		}
 			}
 			$link_id = self::temp_link_id($app2,$id2);
 
@@ -423,8 +441,14 @@ 
 		}
 		$link_id = Link\Storage::link($app1,$id1,$app2,$id2,$remark,$owner);
 
-		if (!($no_notify&2)) self::notify('link',$app2,$id2,$app1,$id1,$link_id);
-		if (!($no_notify&1)) self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		if (!($no_notify&2))
+		{
+			self::notify('link',$app2,$id2,$app1,$id1,$link_id);
+		}
+		if (!($no_notify&1))
+		{
+			self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		}
 
 		return $link_id;
 	}
@@ -456,7 +480,10 @@ 
 	 */
 	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC',$cache_titles=false, $deleted=false, $limit=null)
 	{
-		if (self::DEBUG) echo "<p>Link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
+		if (self::DEBUG)
+		{
+			echo "<p>Link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
+		}
 
 		if (is_array($id) || !$id)
 		{
@@ -527,7 +554,10 @@ 
 	 */
 	static function get_links_multiple($app,array $ids,$cache_titles=true,$only_app='',$order='link_lastmod DESC', $deleted=false )
 	{
-		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		if (self::DEBUG)
+		{
+			echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		}
 
 		if (!$ids)
 		{
@@ -559,7 +589,10 @@ 
 			{
 				foreach($targets as $link)
 				{
-					if (is_array($link)) $app_ids[$link['app']][] = $link['id'];
+					if (is_array($link))
+					{
+						$app_ids[$link['app']][] = $link['id'];
+					}
 				}
 			}
 			foreach($app_ids as $app => $a_ids)
@@ -589,20 +622,30 @@ 
 		}
 		if (is_array($id))
 		{
-			if (strpos($app_link_id,':') === false) $app_link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+			if (strpos($app_link_id,':') === false)
+			{
+				$app_link_id = self::temp_link_id($app2,$id2);
+			}
+			// create link_id of temporary link, if not given
 
-			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))	// check for unlinked-marker
+			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))
+			{
+				// check for unlinked-marker
 			{
 				return $id[$app_link_id];
 			}
+			}
 			return False;
 		}
 		if ((int)$app_link_id < 0 || $app_link_id == self::VFS_APPNAME || $app2 == self::VFS_APPNAME)
 		{
-			if ((int)$app_link_id < 0)	// vfs link_id ?
+			if ((int)$app_link_id < 0)
+			{
+				// vfs link_id ?
 			{
 				return self::fileinfo2link(-$app_link_id);
 			}
+			}
 			if ($app_link_id == self::VFS_APPNAME)
 			{
 				return self::info_attached($app2,$id2,$id);
@@ -650,10 +693,13 @@ 
 		{
 			echo "<p>Link::unlink('$link_id','$app',".array2string($id).",'$owner','$app2','$id2', $hold_for_purge)</p>\n";
 		}
-		if ($link_id < 0)	// vfs-link?
+		if ($link_id < 0)
+		{
+			// vfs-link?
 		{
 			return self::delete_attached(-$link_id);
 		}
+		}
 		elseif ($app == self::VFS_APPNAME)
 		{
 			return self::delete_attached($app2,$id2,$id);
@@ -692,7 +738,11 @@ 
 
 			return count($deleted);
 		}
-		if (!$link_id) $link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+		if (!$link_id)
+		{
+			$link_id = self::temp_link_id($app2,$id2);
+		}
+		// create link_id of temporary link, if not given
 
 		if (isset($id[$link_id]))
 		{
@@ -718,7 +768,10 @@ 
 		$apps = array();
 		foreach(self::$app_register as $type => $reg)
 		{
-			if ($must_support && !isset($reg[$must_support])) continue;
+			if ($must_support && !isset($reg[$must_support]))
+			{
+				continue;
+			}
 
 			list($app) = explode('-', $type);
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
@@ -775,12 +828,18 @@ 
 	 */
 	static function title($app,$id,$link=null)
 	{
-		if (!$id) return '';
+		if (!$id)
+		{
+			return '';
+		}
 
 		$title =& self::get_cache($app,$id);
 		if (isset($title) && !empty($title) && !is_array($id))
 		{
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
+			}
 			return $title;
 		}
 		if ($app == self::VFS_APPNAME)
@@ -800,21 +859,33 @@ 
 			{
 				$title .= ': '.$link['type'] . ' '.Vfs::hsize($link['size']);
 			}*/
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (file)</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id')='$title' (file)</p>\n";
+			}
 			return $title;
 		}
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['title']))
 		{
-			if (self::DEBUG) echo "<p>".__METHOD__."('$app','$id') something is wrong!!!</p>\n";
+			if (self::DEBUG)
+			{
+				echo "<p>".__METHOD__."('$app','$id') something is wrong!!!</p>\n";
+			}
 			return false; //array(); // not sure why it should return an array on failure, as the description states boolean/string
 		}
 		$method = $reg['title'];
 
-		if (true) $title = self::exec($method, array($id));
+		if (true)
+		{
+			$title = self::exec($method, array($id));
+		}
 
-		if ($id && is_null($title))	// $app,$id has been deleted ==> unlink all links to it
+		if ($id && is_null($title))
+		{
+			// $app,$id has been deleted ==> unlink all links to it
 		{
 			static $unlinking = array();
+		}
 			// check if we are already trying to unlink the entry, to avoid an infinit recursion
 			if (!isset($unlinking[$app]) || !isset($unlinking[$app][$id]))
 			{
@@ -822,10 +893,16 @@ 
 				self::unlink(0,$app,$id);
 				unset($unlinking[$app][$id]);
 			}
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
+			}
 			return False;
 		}
-		if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from $method)</p>\n";
+		if (self::DEBUG)
+		{
+			echo '<p>'.__METHOD__."('$app','$id')='$title' (from $method)</p>\n";
+		}
 
 		return $title;
 	}
@@ -991,7 +1068,10 @@ 
 			{
 				foreach($registry['mime'] as $mime => $data)
 				{
-					if ($mime == $type) return $data;
+					if ($mime == $type)
+					{
+						return $data;
+					}
 					if ($mime[0] == '/' && preg_match($mime.'i', $type))
 					{
 						$wildcard_mime = $data;
@@ -1012,7 +1092,10 @@ 
 	 */
 	static function mime_open($path, $type=null, &$popup=null)
 	{
-		if (is_null($type)) $type = Vfs::mime_content_type($path);
+		if (is_null($type))
+		{
+			$type = Vfs::mime_content_type($path);
+		}
 
 		if (($data = self::get_mime_info($type)))
 		{
@@ -1080,14 +1163,20 @@ 
 	{
 		$reg = self::$app_register[$app];
 
-		if (!isset($reg)) return false;
+		if (!isset($reg))
+		{
+			return false;
+		}
 
-		if (!isset($reg[$name]))	// some defaults
+		if (!isset($reg[$name]))
+		{
+			// some defaults
 		{
 			switch($name)
 			{
 				case 'name':
 					$reg[$name] = $app;
+		}
 					break;
 				case 'entry':
 					$reg[$name] = $app;
@@ -1126,10 +1215,12 @@ 
 
 		if ($app)
 		{
-			if( isset(self::$app_register[$app]) ) {
+			if( isset(self::$app_register[$app]) )
+			{
 				$reg = self::$app_register[$app];
 
-				if( isset($reg['file_dir']) ) {
+				if( isset($reg['file_dir']) )
+				{
 					$app = $reg['file_dir'];
 				}
 			}
@@ -1182,7 +1273,10 @@ 
 		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
 		{
 			$Ok = Vfs::copy_uploaded($file, $p=self::vfs_path($app,$id,'',true), $comment, false);	// no is_uploaded_file() check!
-			if (!$Ok) error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called Vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
+			if (!$Ok)
+			{
+				error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called Vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
+			}
 		}
 		else
 		{
@@ -1202,7 +1296,10 @@ 
 	static function link_file($app,$id,$file)//,$comment='')
 	{
 		// Don't try to link into app dir if there is no id
-		if(!$id) return;
+		if(!$id)
+		{
+			return;
+		}
 
 		$app_path = self::vfs_path($app,$id);
 		$ok = true;
@@ -1228,10 +1325,13 @@ 
 	 */
 	static function delete_attached($app,$id='',$fname='')
 	{
-		if ((int)$app > 0)	// is file_id
+		if ((int)$app > 0)
+		{
+			// is file_id
 		{
 			$url = Vfs::resolve_url(Vfs\Sqlfs\StreamWrapper::id2path($app));
 		}
+		}
 		else
 		{
 			if (empty($app) || empty($id))
@@ -1240,9 +1340,12 @@ 
 			}
 			$url = self::vfs_path($app,$id,$fname);
 
-			if (!$fname || !$id)	// we delete the whole entry (or all entries), which probably not exist anymore
+			if (!$fname || !$id)
+			{
+				// we delete the whole entry (or all entries), which probably not exist anymore
 			{
 				$current_is_root = Vfs::$is_root;
+			}
 				Vfs::$is_root = true;
 			}
 		}
@@ -1262,7 +1365,10 @@ 
 		if (($Ok = !file_exists($url) || Vfs::remove($url,true)) && ((int)$app > 0 || $fname))
 		{
 			// try removing the dir, in case it's empty
-			if (($dir = Vfs::dirname($url))) @Vfs::rmdir($dir);
+			if (($dir = Vfs::dirname($url)))
+			{
+				@Vfs::rmdir($dir);
+			}
 		}
 		if (!is_null($current_is_root))
 		{
@@ -1309,8 +1415,10 @@ 
 		$up = explode('/',$url[0] == '/' ? $url : parse_url($url,PHP_URL_PATH));	// /apps/$app/$id
 		$app = null;
 
-		foreach( self::$app_register as $tapp => $reg ) {
-			if( isset($reg['file_dir']) ) {
+		foreach( self::$app_register as $tapp => $reg )
+		{
+			if( isset($reg['file_dir']) )
+			{
 				$lup = $up;
 
 				unset($lup[0]);
@@ -1322,20 +1430,25 @@ 
 
 				$found = true;
 
-				foreach( $fdp as $part ) {
-					if( current($lup) == $part ) {
-						if( next($lup) === false ) {
+				foreach( $fdp as $part )
+				{
+					if( current($lup) == $part )
+					{
+						if( next($lup) === false )
+						{
 							$found = false;
 							break;
 						}
 					}
-					else {
+					else
+					{
 						$found = false;
 						break;
 					}
 				}
 
-				if( $found ) {
+				if( $found )
+				{
 					$id	= current($lup);
 					$app = $tapp;
 					break;
@@ -1343,7 +1456,8 @@ 
 			}
 		}
 
-		if( $app === null ) {
+		if( $app === null )
+		{
 			list(,,$app,$id) = $up;
 		}
 
@@ -1373,10 +1487,16 @@ 
 		$path = self::vfs_path($app,$id);
 		//error_log(__METHOD__."($app,$id) url=$url");
 
-		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
+		if (!($extra = self::get_registry($app,'find_extra')))
+		{
+			$extra = array();
+		}
 
 		// always use regular links stream wrapper here: extended one is unnecessary (slow) for just listing attachments
-		if (substr($path,0,13) == 'stylite.links') $path = substr($path,8);
+		if (substr($path,0,13) == 'stylite.links')
+		{
+			$path = substr($path,8);
+		}
 
 		$attached = array();
 		if (($url2stats = Vfs::find($path,array('need_mime'=>true,'type'=>'F','url'=>true)+$extra,true)))
@@ -1613,7 +1733,10 @@ 
 		}
 		$ret = call_user_func_array('self::exec', $data);
 
-		if (is_resource($ret)) fseek($ret, 0);
+		if (is_resource($ret))
+		{
+			fseek($ret, 0);
+		}
 
 		if ($return_resource != is_resource($ret))
 		{
@@ -1711,7 +1834,10 @@ 
 		}
 
 		list($app, $class, $m) = $parts = explode('.', $method);
-		if (count($parts) != 3) throw Api\Exception\WrongParameter("Wrong dot-delimited method string '$method'!");
+		if (count($parts) != 3)
+		{
+			throw Api\Exception\WrongParameter("Wrong dot-delimited method string '$method'!");
+		}
 
 		if (!isset($objs[$class]))
 		{

api/src/Contacts/Tracking.php

Spacing +22 added lines, -22 removed lines

@@ -106,17 +106,17 @@ 
 	 * @param array $old =null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
-		unset($old);	// not used, but required by function signature
+		unset($old); // not used, but required by function signature
 
-		switch($name)
+		switch ($name)
 		{
 			case 'copy':
 				if ($data['is_contactform'])
 				{
-					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					$copy = preg_split('/, ?/', $data['email_contactform']);
+					if ($data['email_copytoreceiver']) $copy[] = $data['email'];
 					return $copy;
 				}
 				break;
@@ -144,27 +144,27 @@ 
 	 * @param array $changed_fields =null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 		}
 		if (!$changed_fields) return 0;
 
-		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
+		foreach (array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
 			// Only codes involved, but old text name is automatically added when loaded
-			if($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
+			if ($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
 			{
 				unset($changed_fields[$key]);
 				continue;
 			}
 
 			// Code and a text name
-			if(in_array($name, $changed_fields) && in_array($code, $changed_fields))
+			if (in_array($name, $changed_fields) && in_array($code, $changed_fields))
 			{
-				if($data[$code])
+				if ($data[$code])
 				{
 					$data[$name] = Api\Country::get_full_name($data[$code], true);
 				}
@@ -172,7 +172,7 @@ 
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' ChangedFields:'.array2string($changed_fields));
-		return parent::save_history($data,$old,$deleted,$changed_fields);
+		return parent::save_history($data, $old, $deleted, $changed_fields);
 	}
 
 	/**
@@ -183,9 +183,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($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
 		if (!$data['modified'] || !$old)
 		{
@@ -207,9 +207,9 @@ 
 	 * @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
 
 		if ($data['is_contactform'])
 		{
@@ -225,15 +225,15 @@ 
 	 * @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($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
 			if (!$data[$name] && $name != 'owner') continue;
 
-			switch($name)
+			switch ($name)
 			{
 				case 'n_prefix': case 'n_given': case 'n_middle': case 'n_family': case 'n_suffix':	// already in n_fn
 				case 'n_fileas': case 'id': case 'tid':
@@ -263,13 +263,13 @@ 
 					if ($data[$name])
 					{
 						$cats = array();
-						foreach(is_array($data[$name]) ? $data[$name] : explode(',',$data[$name]) as $cat_id)
+						foreach (is_array($data[$name]) ? $data[$name] : explode(',', $data[$name]) as $cat_id)
 						{
 							$cats[] = $GLOBALS['egw']->cats->id2name($cat_id);
 						}
 						$details[$name] = array(
 							'label' => $label,
-							'value' => explode(', ',$cats),
+							'value' => explode(', ', $cats),
 						);
 					}
 				case 'note':

Braces +12 added lines, -3 removed lines

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

api/src/Contacts/Univention.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 * @param array $keys if given $keys are copied to data before saveing => allows a save as
 	 * @return int 0 on success and errno != 0 else
 	 */
-	function save($keys=null)
+	function save($keys = null)
 	{
 		// UCS lowercases email when storing
 		$keys['email'] = strtolower(!empty($keys['email']) ? $keys['email'] : $this->data['email']);

api/src/Contacts/Merge.php

Spacing +30 added lines, -30 removed lines

@@ -16,7 +16,7 @@ 
 use EGroupware\Api;
 
 // explicit import not namespaced classes
-use calendar_boupdate;	// we detect if it is not available
+use calendar_boupdate; // we detect if it is not available
 
 /**
  * Contacts document merge
@@ -55,22 +55,22 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null,$ignore_acl=false)
+	protected function get_replacements($id, &$content = null, $ignore_acl = false)
 	{
-		if (!($replacements = $this->contact_replacements($id,'',$ignore_acl)))
+		if (!($replacements = $this->contact_replacements($id, '', $ignore_acl)))
 		{
 			return false;
 		}
-		if($content && strpos($content, '$$#') !== 0)
+		if ($content && strpos($content, '$$#') !== 0)
 		{
-			$this->cf_link_to_expand($this->contacts->read($id, $ignore_acl), $content, $replacements,'addressbook');
+			$this->cf_link_to_expand($this->contacts->read($id, $ignore_acl), $content, $replacements, 'addressbook');
 		}
 
 		// Links
 		$replacements += $this->get_all_links('addressbook', $id, '', $content);
-		if (!(strpos($content,'$$calendar/') === false))
+		if (!(strpos($content, '$$calendar/') === false))
 		{
-			$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
+			$replacements += $this->calendar_replacements($id, !(strpos($content, '$$calendar/-1/') === false));
 		}
 		return $replacements;
 	}
@@ -82,7 +82,7 @@ 
 	 * @param boolean $last_event_too =false also include information about the last event
 	 * @return array
 	 */
-	protected function calendar_replacements($id,$last_event_too=false)
+	protected function calendar_replacements($id, $last_event_too = false)
 	{
 		if (!class_exists('calendar_boupdate')) return array();
 
@@ -101,7 +101,7 @@ 
 		{
 			$events = array();
 		}
-		if ($last_event_too==true)
+		if ($last_event_too == true)
 		{
 			$last = $calendar->search(array(
 				'end' => $calendar->now_su,
@@ -111,41 +111,41 @@ 
 				'order' => 'cal_start DESC',
 				'enum_recurring' => true
 			));
-			$events['-1'] = $last ? array_shift($last) : array();	// returned events are indexed by cal_id!
+			$events['-1'] = $last ? array_shift($last) : array(); // returned events are indexed by cal_id!
 		}
 		$replacements = array();
-		$n = 1;  // Returned events are indexed by cal_id, need to index sequentially
-		foreach($events as $key => $event)
+		$n = 1; // Returned events are indexed by cal_id, need to index sequentially
+		foreach ($events as $key => $event)
 		{
 			// Use -1 for previous key
-			if($key < 0) $n = $key;
+			if ($key < 0) $n = $key;
 
-			foreach($calendar->event2array($event) as $name => $data)
+			foreach ($calendar->event2array($event) as $name => $data)
 			{
-				if (substr($name,-4) == 'date') $name = substr($name,0,-4);
-				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
+				if (substr($name, -4) == 'date') $name = substr($name, 0, -4);
+				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ', $data['data']) : $data['data'];
 			}
-			foreach(array('start','end') as $what)
+			foreach (array('start', 'end') as $what)
 			{
-				foreach(array(
+				foreach (array(
 					'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],
 					'day'  => 'l',
 					'time' => $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i',
 				) as $name => $format)
 				{
-					$value = $event[$what] ? date($format,$event[$what]) : '';
+					$value = $event[$what] ? date($format, $event[$what]) : '';
 					if ($format == 'l') $value = lang($value);
 					$replacements['$$calendar/'.$n.'/'.$what.$name.'$$'] = $value;
 				}
 			}
-			$duration = ($event['end'] - $event['start'])/60;
-			$replacements['$$calendar/'.$n.'/duration$$'] = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+			$duration = ($event['end'] - $event['start']) / 60;
+			$replacements['$$calendar/'.$n.'/duration$$'] = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
 			++$n;
 		}
 
 		// Need to set some keys if there is no previous event
-		if($last_event_too && count($events['-1']) == 0) {
+		if ($last_event_too && count($events['-1']) == 0) {
 			$replacements['$$calendar/-1/start$$'] = '';
 			$replacements['$$calendar/-1/end$$'] = '';
 			$replacements['$$calendar/-1/owner$$'] = '';
@@ -168,18 +168,18 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Contact fields:')."</h3></td></tr>";
 
 		$n = 0;
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;	// dont show them, as they are not used in the UI atm.
+			if (in_array($name, array('tid', 'label', 'geo'))) continue; // dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('email', 'org_name', 'tel_work', 'url')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
 			}
 			if (!($n&1)) echo '<tr>';
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
-			if($name == 'cat_id')
+			if ($name == 'cat_id')
 			{
 				if ($n&1) echo "</tr>\n";
 				echo '<td>{{categories}}</td><td>'.lang('Category path').'</td>';
@@ -190,13 +190,13 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach($this->contacts->customfields as $name => $field)
+		foreach ($this->contacts->customfields as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
  			'attachments' => lang('List of files linked to the current record'),
@@ -220,7 +220,7 @@ 
 
 		Api\Translation::add_app('calendar');
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')." # = 1, 2, ..., 20, -1</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'title' => lang('Title'),
 			'description' => lang('Description'),
 			'participants' => lang('Participants'),
@@ -242,7 +242,7 @@ 
 			'owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('start', 'end')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;

Braces +51 added lines, -13 removed lines

@@ -84,7 +84,10 @@ 
 	 */
 	protected function calendar_replacements($id,$last_event_too=false)
 	{
-		if (!class_exists('calendar_boupdate')) return array();
+		if (!class_exists('calendar_boupdate'))
+		{
+			return array();
+		}
 
 		$calendar = new calendar_boupdate();
 
@@ -118,11 +121,17 @@ 
 		foreach($events as $key => $event)
 		{
 			// Use -1 for previous key
-			if($key < 0) $n = $key;
+			if($key < 0)
+			{
+				$n = $key;
+			}
 
 			foreach($calendar->event2array($event) as $name => $data)
 			{
-				if (substr($name,-4) == 'date') $name = substr($name,0,-4);
+				if (substr($name,-4) == 'date')
+				{
+					$name = substr($name,0,-4);
+				}
 				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
 			}
 			foreach(array('start','end') as $what)
@@ -134,7 +143,10 @@ 
 				) as $name => $format)
 				{
 					$value = $event[$what] ? date($format,$event[$what]) : '';
-					if ($format == 'l') $value = lang($value);
+					if ($format == 'l')
+					{
+						$value = lang($value);
+					}
 					$replacements['$$calendar/'.$n.'/'.$what.$name.'$$'] = $value;
 				}
 			}
@@ -145,7 +157,8 @@ 
 		}
 
 		// Need to set some keys if there is no previous event
-		if($last_event_too && count($events['-1']) == 0) {
+		if($last_event_too && count($events['-1']) == 0)
+		{
 			$replacements['$$calendar/-1/start$$'] = '';
 			$replacements['$$calendar/-1/end$$'] = '';
 			$replacements['$$calendar/-1/owner$$'] = '';
@@ -170,22 +183,38 @@ 
 		$n = 0;
 		foreach($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;	// dont show them, as they are not used in the UI atm.
+			if (in_array($name,array('tid','label','geo')))
+			{
+				continue;
+			}
+			// dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
 			if($name == 'cat_id')
 			{
-				if ($n&1) echo "</tr>\n";
+				if ($n&1)
+				{
+					echo "</tr>\n";
+				}
 				echo '<td>{{categories}}</td><td>'.lang('Category path').'</td>';
 				$n++;
 			}
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 
@@ -242,14 +271,23 @@ 
 			'owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('start','end')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{calendar/#/'.$name.'}}</td><td>'.$label.'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 		echo "</table>\n";

api/src/Egw.php

Spacing +77 added lines, -77 removed lines

@@ -43,7 +43,7 @@ 
 	 * @var	string
 	 * @access	public
 	 */
-	var $debug = 0;		// This will turn on debugging information.
+	var $debug = 0; // This will turn on debugging information.
 	/**
 	 * Instance of the account object
 	 *
@@ -57,10 +57,10 @@ 
 	 * @author RalfBecker@outdoor-training.de
 	 * @param array $domain_names array with valid egw-domain names
 	 */
-	function __construct($domain_names=null)
+	function __construct($domain_names = null)
 	{
-		$GLOBALS['egw'] =& $this;	// we need to be immediately available there for the other classes we instantiate
-		$this->setup($domain_names,True);
+		$GLOBALS['egw'] = & $this; // we need to be immediately available there for the other classes we instantiate
+		$this->setup($domain_names, True);
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 * @param array $domain_names array with valid egw-domain names
 	 * @param boolean $createsessionobject True to create the session object (default=True)
 	 */
-	function setup($domain_names,$createsessionobject=True)
+	function setup($domain_names, $createsessionobject = True)
 	{
 		// create the DB-object
 		// as SiteMgr, Wiki, KnowledgeBase and probably more still use eg next_record(), we stick with Db\Deprecated for now
@@ -84,18 +84,18 @@ 
 		// check if eGW is already setup, if not redirect to setup/
 		try {
 			$this->db->connect();
-			$num_config = $this->db->select(Config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
+			$num_config = $this->db->select(Config::TABLE, 'COUNT(config_name)', false, __LINE__, __FILE__)->fetchColumn();
 		}
-		catch(Db\Exception\Connection $e) {
+		catch (Db\Exception\Connection $e) {
 			// ignore exception, get handled below
 		}
-		catch(Db\Exception\InvalidSql $e1) {
-			unset($e1);	// not used
+		catch (Db\Exception\InvalidSql $e1) {
+			unset($e1); // not used
 			try {
-				$phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
+				$phpgw_config = $this->db->select('phpgw_config', 'COUNT(config_name)', false, __LINE__, __FILE__)->fetchColumn();
 			}
 			catch (Db\Exception\InvalidSql $e2) {
-				unset($e2);	// not used
+				unset($e2); // not used
 				// ignor error, get handled below
 			}
 		}
@@ -104,20 +104,20 @@ 
 			// we check for the old table too, to not scare updating users ;-)
 			if ($phpgw_config)
 			{
-				throw new Exception('You need to update EGroupware before you can continue using it.',999);
+				throw new Exception('You need to update EGroupware before you can continue using it.', 999);
 			}
 			if ($e)
 			{
 				throw new Db\Exception\Setup('Connection with '.$e->getMessage()."\n\n".
-					'Maybe you not created a database for EGroupware yet.',999);
+					'Maybe you not created a database for EGroupware yet.', 999);
 			}
-			throw new Db\Exception\Setup('It appears that you have not created the database tables for EGroupware.',999);
+			throw new Db\Exception\Setup('It appears that you have not created the database tables for EGroupware.', 999);
 		}
 		// Set the DB's client charset if a system-charset is set and some other values needed by egw_cache (used in Config::read)
-			foreach($this->db->select(Config::TABLE,'config_name,config_value',array(
+			foreach ($this->db->select(Config::TABLE, 'config_name,config_value', array(
 			'config_app'  => 'phpgwapi',
-			'config_name' => array('system_charset','install_id','temp_dir'),
-		),__LINE__,__FILE__) as $row)
+			'config_name' => array('system_charset', 'install_id', 'temp_dir'),
+		), __LINE__, __FILE__) as $row)
 		{
 			$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 		}
@@ -136,10 +136,10 @@ 
 			try
 			{
 				$tz = new \DateTimeZone(date_default_timezone_get());
-				Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(),'phpgwapi');
+				Config::save_value('server_timezone', $GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(), 'phpgwapi');
 				error_log(__METHOD__."() stored server_timezone=".$GLOBALS['egw_info']['server']['server_timezone']);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				// do nothing if new DateTimeZone fails (eg. 'System/Localtime' returned), specially do NOT store it!
 				error_log(__METHOD__."() NO valid 'date.timezone' set in your php.ini!");
@@ -150,24 +150,24 @@ 
 		// if phpgwapi exists we prefer accounts and egw_session, as they have some deprecated methods
 		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
 		{
-			$this->accounts       = new egw_accounts();
+			$this->accounts = new egw_accounts();
 			/* Do not create the session object if called by the sessions class.  This way
 			 * we ensure the correct db based on the user domain.
 			 */
-			if($createsessionobject)
+			if ($createsessionobject)
 			{
-				$this->session    = new egw_session($domain_names);
+				$this->session = new egw_session($domain_names);
 			}
 		}
 		else
 		{
-			$this->accounts       = new Accounts();
+			$this->accounts = new Accounts();
 			/* Do not create the session object if called by the sessions class.  This way
 			 * we ensure the correct db based on the user domain.
 			 */
-			if($createsessionobject)
+			if ($createsessionobject)
 			{
-				$this->session    = new Session($domain_names);
+				$this->session = new Session($domain_names);
 			}
 		}
 		// setup the other subclasses
@@ -178,7 +178,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'login' && $GLOBALS['egw_info']['flags']['currentapp'] != 'logout')
 		{
 			$this->verify_session();
-			$this->applications->read_installed_apps();	// to get translated app-titles, has to be after verify_session
+			$this->applications->read_installed_apps(); // to get translated app-titles, has to be after verify_session
 
 			$this->define_egw_constants();
 
@@ -199,9 +199,9 @@ 
 	 */
 	function __wakeup()
 	{
-		$GLOBALS['egw'] =& $this;	// we need to be immediately available there for the other classes we instantiate
+		$GLOBALS['egw'] = & $this; // we need to be immediately available there for the other classes we instantiate
 		// for the migration: reference us to the old phpgw object
-		$GLOBALS['phpgw'] =& $this;
+		$GLOBALS['phpgw'] = & $this;
 
 		if ($GLOBALS['egw_info']['server']['system_charset'])
 		{
@@ -271,15 +271,15 @@ 
 		}
 
 		// Load the (depricated) app include files if they exists
-		if (EGW_APP_INC != "" && ! preg_match ('/phpgwapi/i', EGW_APP_INC) &&
-			file_exists(EGW_APP_INC . '/functions.inc.php') && !isset($_GET['menuaction']))
+		if (EGW_APP_INC != "" && !preg_match('/phpgwapi/i', EGW_APP_INC) &&
+			file_exists(EGW_APP_INC.'/functions.inc.php') && !isset($_GET['menuaction']))
 		{
-			include(EGW_APP_INC . '/functions.inc.php');
+			include(EGW_APP_INC.'/functions.inc.php');
 		}
 		if (!@$GLOBALS['egw_info']['flags']['noheader'] && !@$GLOBALS['egw_info']['flags']['noappheader'] &&
-			file_exists(EGW_APP_INC . '/header.inc.php') && !isset($_GET['menuaction']))
+			file_exists(EGW_APP_INC.'/header.inc.php') && !isset($_GET['menuaction']))
 		{
-			include(EGW_APP_INC . '/header.inc.php');
+			include(EGW_APP_INC.'/header.inc.php');
 		}
 	}
 
@@ -295,9 +295,9 @@ 
 	 */
 	function verify_session()
 	{
-		if($GLOBALS['egw_info']['server']['enforce_ssl'] === 'redirect' && !$_SERVER['HTTPS'])
+		if ($GLOBALS['egw_info']['server']['enforce_ssl'] === 'redirect' && !$_SERVER['HTTPS'])
 		{
-			Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+			Header('Location: https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 			exit;
 		}
 		// check if we have a session, if not try to automatic create one
@@ -305,7 +305,7 @@ 
 
 		$account = null;
 		if (($account_callback = $GLOBALS['egw_info']['flags']['autocreate_session_callback']) && is_callable($account_callback) &&
-			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)	// $account_call_back returns true, false or a session-id
+			($sessionid = call_user_func_array($account_callback, array(&$account))) === true)	// $account_call_back returns true, false or a session-id
 		{
 			$sessionid = $this->session->create($account);
 		}
@@ -314,21 +314,21 @@ 
 			//echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit;
 			// we forward to the same place after the re-login
 			if ($GLOBALS['egw_info']['server']['webserver_url'] && $GLOBALS['egw_info']['server']['webserver_url'] != '/' &&
-				($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)) && $webserver_path != '/')
+				($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)) && $webserver_path != '/')
 			{
 				// we have to use only path component, to cope with domains like http://egroupware.domain.com and /egroupware
-				list(,$relpath) = explode($webserver_path,parse_url($_SERVER['PHP_SELF'],PHP_URL_PATH),2);
+				list(,$relpath) = explode($webserver_path, parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH), 2);
 			}
 			else	// the webserver-url is empty or just a slash '/' (eGW is installed in the docroot and no domain given)
 			{
 				$matches = null;
-				if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/',$relpath=$_SERVER['PHP_SELF'],$matches))
+				if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/', $relpath = $_SERVER['PHP_SELF'], $matches))
 				{
 					$relpath = $matches[1];
 				}
 			}
 			// this removes the sessiondata if its saved in the URL
-			$query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/','',$_SERVER['QUERY_STRING']);
+			$query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/', '', $_SERVER['QUERY_STRING']);
 			if ($GLOBALS['egw_info']['server']['http_auth_types'])
 			{
 				$redirect = '/phpgwapi/ntlm/index.php?';
@@ -355,9 +355,9 @@ 
 	 */
 	function check_app_rights()
 	{
-		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp'];	// some apps change it later
+		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp']; // some apps change it later
 
-		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))	// give everyone implicit api rights
+		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api', 'about')))	// give everyone implicit api rights
 		{
 			// This will need to use ACL in the future
 			if (!$GLOBALS['egw_info']['user']['apps'][$currentapp = $GLOBALS['egw_info']['flags']['currentapp']] ||
@@ -387,25 +387,25 @@ 
 	 */
 	function define_egw_constants()
 	{
-		define('EGW_ACL_READ',1);
-		define('EGW_ACL_ADD',2);
-		define('EGW_ACL_EDIT',4);
-		define('EGW_ACL_DELETE',8);
-		define('EGW_ACL_PRIVATE',16);
-		define('EGW_ACL_GROUP_MANAGERS',32);
-		define('EGW_ACL_CUSTOM_1',64);
-		define('EGW_ACL_CUSTOM_2',128);
-		define('EGW_ACL_CUSTOM_3',256);
+		define('EGW_ACL_READ', 1);
+		define('EGW_ACL_ADD', 2);
+		define('EGW_ACL_EDIT', 4);
+		define('EGW_ACL_DELETE', 8);
+		define('EGW_ACL_PRIVATE', 16);
+		define('EGW_ACL_GROUP_MANAGERS', 32);
+		define('EGW_ACL_CUSTOM_1', 64);
+		define('EGW_ACL_CUSTOM_2', 128);
+		define('EGW_ACL_CUSTOM_3', 256);
 		// and the old ones
-		define('PHPGW_ACL_READ',1);
-		define('PHPGW_ACL_ADD',2);
-		define('PHPGW_ACL_EDIT',4);
-		define('PHPGW_ACL_DELETE',8);
-		define('PHPGW_ACL_PRIVATE',16);
-		define('PHPGW_ACL_GROUP_MANAGERS',32);
-		define('PHPGW_ACL_CUSTOM_1',64);
-		define('PHPGW_ACL_CUSTOM_2',128);
-		define('PHPGW_ACL_CUSTOM_3',256);
+		define('PHPGW_ACL_READ', 1);
+		define('PHPGW_ACL_ADD', 2);
+		define('PHPGW_ACL_EDIT', 4);
+		define('PHPGW_ACL_DELETE', 8);
+		define('PHPGW_ACL_PRIVATE', 16);
+		define('PHPGW_ACL_GROUP_MANAGERS', 32);
+		define('PHPGW_ACL_CUSTOM_1', 64);
+		define('PHPGW_ACL_CUSTOM_2', 128);
+		define('PHPGW_ACL_CUSTOM_3', 256);
 		// A few hacker resistant constants that will be used throught the program
 		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
 		{
@@ -418,14 +418,14 @@ 
 			define('EGW_IMAGES', $this->common->get_image_path());
 			define('EGW_APP_IMAGES_DIR', $this->common->get_image_dir());
 			// and the old ones
-			define('PHPGW_TEMPLATE_DIR',EGW_TEMPLATE_DIR);
-			define('PHPGW_IMAGES_DIR',EGW_IMAGES_DIR);
-			define('PHPGW_IMAGES_FILEDIR',EGW_IMAGES_FILEDIR);
-			define('PHPGW_APP_ROOT',EGW_APP_ROOT);
-			define('PHPGW_APP_INC',EGW_APP_INC);
-			define('PHPGW_APP_TPL',EGW_APP_TPL);
-			define('PHPGW_IMAGES',EGW_IMAGES);
-			define('PHPGW_APP_IMAGES_DIR',EGW_APP_IMAGES_DIR);
+			define('PHPGW_TEMPLATE_DIR', EGW_TEMPLATE_DIR);
+			define('PHPGW_IMAGES_DIR', EGW_IMAGES_DIR);
+			define('PHPGW_IMAGES_FILEDIR', EGW_IMAGES_FILEDIR);
+			define('PHPGW_APP_ROOT', EGW_APP_ROOT);
+			define('PHPGW_APP_INC', EGW_APP_INC);
+			define('PHPGW_APP_TPL', EGW_APP_TPL);
+			define('PHPGW_IMAGES', EGW_IMAGES);
+			define('PHPGW_APP_IMAGES_DIR', EGW_APP_IMAGES_DIR);
 		}
 	}
 
@@ -460,7 +460,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url, $extravars = '', $link_app=null)
+	static function link($url, $extravars = '', $link_app = null)
 	{
 		return $GLOBALS['egw']->framework->link($url, $extravars, $link_app);
 	}
@@ -473,7 +473,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function redirect_link($url, $extravars='', $link_app=null)
+	static function redirect_link($url, $extravars = '', $link_app = null)
 	{
 		return $GLOBALS['egw']->framework->redirect_link($url, $extravars, $link_app);
 	}
@@ -486,7 +486,7 @@ 
 	 * @param string $url url to redirect to
 	 * @param string $link_app =null appname to redirect for, default currentapp
 	 */
-	static function redirect($url, $link_app=null)
+	static function redirect($url, $link_app = null)
 	{
 		Framework::redirect($url, $link_app);
 	}
@@ -500,14 +500,14 @@ 
 	 * @param  string	The key for the phrase
 	 * @see	Translation::translate()
 	 */
-	static function lang($key,$args=null)
+	static function lang($key, $args = null)
 	{
 		if (!is_array($args))
 		{
 			$args = func_get_args();
 			array_shift($args);
 		}
-		return Translation::translate($key,$args);
+		return Translation::translate($key, $args);
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 * @param callable $callback use array($classname, $method) for static methods
 	 * @param array $args =array()
 	 */
-	public static function on_shutdown($callback, array $args=array())
+	public static function on_shutdown($callback, array $args = array())
 	{
 		array_unshift($args, $callback);
 
@@ -541,7 +541,7 @@ 
 	{
 		if (!defined('EGW_SHUTDOWN'))
 		{
-			define('EGW_SHUTDOWN',True);
+			define('EGW_SHUTDOWN', True);
 
 			// send json response BEFORE flushing output
 			if (Json\Request::isJSONRequest())
@@ -550,7 +550,7 @@ 
 			}
 
 			// run all on_shutdown callbacks with session in their name (eg. egw_link::save_session_cache), do NOT stop on exceptions
-			foreach(self::$shutdown_callbacks as $n => $data)
+			foreach (self::$shutdown_callbacks as $n => $data)
 			{
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));
@@ -581,7 +581,7 @@ 
 			}
 
 			// run all on_shutdown, do NOT stop on exceptions
-			foreach(self::$shutdown_callbacks as $data)
+			foreach (self::$shutdown_callbacks as $data)
 			{
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));

Braces +37 added lines, -10 removed lines

@@ -118,7 +118,7 @@ 
 			'config_app'  => 'phpgwapi',
 			'config_name' => array('system_charset','install_id','temp_dir'),
 		),__LINE__,__FILE__) as $row)
-		{
+			{
 			$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 		}
 		if ($GLOBALS['egw_info']['server']['system_charset'] && $GLOBALS['egw_info']['server']['system_charset'] != 'utf-8')
@@ -131,11 +131,14 @@ 
 		// if no server timezone set, use date_default_timezone_get() to determine it once
 		// it fills to log with deprecated warnings under 5.3 otherwise
 		if (empty($GLOBALS['egw_info']['server']['server_timezone']) ||
-			$GLOBALS['egw_info']['server']['server_timezone'] == 'System/Localtime')	// treat invalid tz like empty!
+			$GLOBALS['egw_info']['server']['server_timezone'] == 'System/Localtime')
+		{
+			// treat invalid tz like empty!
 		{
 			try
 			{
 				$tz = new \DateTimeZone(date_default_timezone_get());
+		}
 				Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(),'phpgwapi');
 				error_log(__METHOD__."() stored server_timezone=".$GLOBALS['egw_info']['server']['server_timezone']);
 			}
@@ -301,14 +304,20 @@ 
 			exit;
 		}
 		// check if we have a session, if not try to automatic create one
-		if ($this->session->verify()) return true;
+		if ($this->session->verify())
+		{
+			return true;
+		}
 
 		$account = null;
 		if (($account_callback = $GLOBALS['egw_info']['flags']['autocreate_session_callback']) && is_callable($account_callback) &&
-			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)	// $account_call_back returns true, false or a session-id
+			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)
+		{
+			// $account_call_back returns true, false or a session-id
 		{
 			$sessionid = $this->session->create($account);
 		}
+		}
 		if (!$sessionid)
 		{
 			//echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit;
@@ -337,9 +346,15 @@ 
 			{
 				$redirect = '/login.php?';
 				// only add "your session could not be verified", if a sessionid is given (cookie or on url)
-				if (Session::get_sessionid()) $redirect .= 'cd=10&';
+				if (Session::get_sessionid())
+				{
+					$redirect .= 'cd=10&';
+				}
+			}
+			if ($relpath)
+			{
+				$redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : ''));
 			}
-			if ($relpath) $redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : ''));
 			self::redirect_link($redirect);
 		}
 	}
@@ -357,7 +372,9 @@ 
 	{
 		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp'];	// some apps change it later
 
-		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))	// give everyone implicit api rights
+		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))
+		{
+			// give everyone implicit api rights
 		{
 			// This will need to use ACL in the future
 			if (!$GLOBALS['egw_info']['user']['apps'][$currentapp = $GLOBALS['egw_info']['flags']['currentapp']] ||
@@ -370,6 +387,7 @@ 
 					if (($sessionid = Session::get_sessionid(true)))
 					{
 						$GLOBALS['egw']->session->destroy($sessionid);
+		}
 					}
 					throw new Exception\Redirect(self::link('/logout.php'));
 				}
@@ -555,7 +573,10 @@ 
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));
 					$callback = array_shift($data);
-					if (!is_array($callback) || strpos($callback[1], 'session') === false) continue;
+					if (!is_array($callback) || strpos($callback[1], 'session') === false)
+					{
+						continue;
+					}
 					call_user_func_array($callback, $data);
 				}
 				catch (\Exception $ex) {
@@ -565,7 +586,10 @@ 
 			}
 			// now we can close the session
 			// without closing the session fastcgi_finish_request() will NOT send output to user
-			if (isset($GLOBALS['egw']->session) && is_object($GLOBALS['egw']->session)) $GLOBALS['egw']->session->commit_session();
+			if (isset($GLOBALS['egw']->session) && is_object($GLOBALS['egw']->session))
+			{
+				$GLOBALS['egw']->session->commit_session();
+			}
 
 			// flush all output to user
 			/* does NOT work on Apache :-(
@@ -593,9 +617,12 @@ 
 				}
 			}
 			// call the asyncservice check_run function if it is not explicitly set to cron-only
-			if (!$GLOBALS['egw_info']['server']['asyncservice'])	// is default
+			if (!$GLOBALS['egw_info']['server']['asyncservice'])
+			{
+				// is default
 			{
 				$async = new Asyncservice();
+			}
 				$async->check_run('fallback');
 			}
 			$this->db->disconnect();

api/src/Vfs/Sqlfs/StreamWrapper.php

Indentation +5 added lines, -5 removed lines

@@ -447,10 +447,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 ( )
@@ -485,7 +485,7 @@ 
  	 * See fseek() for more information about these parameters.
  	 *
  	 * @param integer $offset
-  	 * @param integer $whence	SEEK_SET - 0 - Set position equal to offset bytes
+ 	 * @param integer $whence	SEEK_SET - 0 - Set position equal to offset bytes
  	 * 							SEEK_CUR - 1 - Set position to current location plus offset.
  	 * 							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.
@@ -681,8 +681,8 @@ 
 		$maxdepth=10;
 		$depth2propagate = (int)$depth + 1;
 		if ($depth2propagate > $maxdepth) return is_dir($pathname);
-    	is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
-    	return is_dir($pathname) || @mkdir($pathname, $mode);
+		is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
+		return is_dir($pathname) || @mkdir($pathname, $mode);
 	}
 
 	/**

Doc Comments +8 added lines, -4 removed lines

@@ -500,7 +500,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 ( )
 	{
@@ -541,6 +541,7 @@ 
 	 * In order for the appropriate error message to be returned, do not define this method if your wrapper does not support unlinking!
 	 *
 	 * @param string $url
+	 * @param integer $parent_stat
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
 	static function unlink ( $url, $parent_stat=null )
@@ -669,6 +670,8 @@ 
 
 	/**
 	 * due to problems with recursive directory creation, we have our own here
+	 * @param false|string $pathname
+	 * @param integer $mode
 	 */
 	protected static function mkdir_recursive($pathname, $mode, $depth=0)
 	{
@@ -999,7 +1002,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 )
 	{
@@ -1399,7 +1402,7 @@ 
 	 *
 	 * @param string $path string with path
 	 * @param int $rights =null rights to set, or null to delete the entry
-	 * @param int|boolean $owner =null owner for whom to set the rights, null for the current user, or false to delete all rights for $path
+	 * @param boolean $owner =null owner for whom to set the rights, null for the current user, or false to delete all rights for $path
 	 * @param int $fs_id =null fs_id to use, to not query it again (eg. because it's already deleted)
 	 * @return boolean true if acl is set/deleted, false on error
 	 */
@@ -1676,6 +1679,7 @@ 
 	 * Replace the password of an url with '...' for error messages
 	 *
 	 * @param string &$url
+	 * @param string $url
 	 */
 	static protected function _remove_password(&$url)
 	{
@@ -1691,7 +1695,7 @@ 
 	/**
 	 * Get storage mode from url (get parameter 'storage', eg. ?storage=db)
 	 *
-	 * @param string|array $url complete url or array of url-parts from parse_url
+	 * @param string $url complete url or array of url-parts from parse_url
 	 * @return int self::STORE2FS or self::STORE2DB
 	 */
 	static function url2operation($url)

Spacing +225 added lines, -228 removed lines

@@ -67,7 +67,7 @@ 
 	/**
 	 * mode-bits, which have to be set for directories
 	 */
-	const MODE_DIR =   040000;
+	const MODE_DIR = 040000;
 	/**
 	 * mode-bits, which have to be set for links
 	 */
@@ -164,10 +164,10 @@ 
 	 *
 	 * @param string $path ='/'
 	 */
-	public static function clearstatcache($path='/')
+	public static function clearstatcache($path = '/')
 	{
 		//error_log(__METHOD__."('$path')");
-		unset($path);	// not used
+		unset($path); // not used
 
 		self::$stat_cache = array();
 
@@ -187,32 +187,32 @@ 
 	 * @param array $overwrite_new =null if set create new file with values overwriten by the given ones
 	 * @return boolean true if the ressource was opened successful, otherwise false
 	 */
-	function stream_open ( $url, $mode, $options, &$opened_path, array $overwrite_new=null )
+	function stream_open($url, $mode, $options, &$opened_path, array $overwrite_new = null)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 		$this->operation = self::url2operation($url);
 		$dir = Vfs::dirname($url);
 
 		$this->opened_path = $opened_path = $path;
-		$this->opened_mode = $mode = str_replace('b','',$mode);	// we are always binary, like every Linux system
+		$this->opened_mode = $mode = str_replace('b', '', $mode); // we are always binary, like every Linux system
 		$this->opened_stream = null;
 
 		parse_str(parse_url($url, PHP_URL_QUERY), $this->dir_url_params);
 
-		if (!is_null($overwrite_new) || !($stat = static::url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!is_null($overwrite_new) || !($stat = static::url_stat($path, STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
 		{
-			if (!$dir || $mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
-				$mode[0] == 'x' && $stat ||	// or file should not exist, but does
-				!($dir_stat=static::url_stat($dir,STREAM_URL_STAT_QUIET)) ||	// or parent dir does not exist																																			create it
-				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat))	// or we are not allowed to 																																			create it
+			if (!$dir || $mode[0] == 'r' || // does $mode require the file to exist (r,r+)
+				$mode[0] == 'x' && $stat || // or file should not exist, but does
+				!($dir_stat = static::url_stat($dir, STREAM_URL_STAT_QUIET)) || // or parent dir does not exist																																			create it
+				!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat))	// or we are not allowed to 																																			create it
 			{
 				self::_remove_password($url);
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
-				if (($options & STREAM_REPORT_ERRORS))
+				if (($options&STREAM_REPORT_ERRORS))
 				{
-					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);
 				}
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
 				return false;
@@ -227,7 +227,7 @@ 
 				'fs_name' => self::limit_filename(Vfs::basename($path)),
 				'fs_dir'  => $dir_stat['ino'],
 				// we use the mode of the dir, so files in group dirs stay accessible by all members
-				'fs_mode' => $dir_stat['mode'] & 0666,
+				'fs_mode' => $dir_stat['mode']&0666,
 				// for the uid we use the uid of the dir if not 0=root or the current user otherwise
 				'fs_uid'  => $dir_stat['uid'] ? $dir_stat['uid'] : Vfs::$user,
 				// we allways use the group of the dir
@@ -235,11 +235,11 @@ 
 				'fs_created'  => self::_pdo_timestamp(time()),
 				'fs_modified' => self::_pdo_timestamp(time()),
 				'fs_creator'  => Vfs::$user,
-				'fs_mime'     => 'application/octet-stream',	// required NOT NULL!
+				'fs_mime'     => 'application/octet-stream', // required NOT NULL!
 				'fs_size'     => 0,
 				'fs_active'   => self::_pdo_boolean(true),
 			);
-			if ($overwrite_new) $values = array_merge($values,$overwrite_new);
+			if ($overwrite_new) $values = array_merge($values, $overwrite_new);
 			if (!$stmt->execute($values) || !($this->opened_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq')))
 			{
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
@@ -252,35 +252,35 @@ 
 				$this->opened_stream = tmpfile();
 			}
 			// create the hash-dirs, if they not yet exist
-			elseif(!file_exists($fs_dir=Vfs::dirname(self::_fs_path($this->opened_fs_id))))
+			elseif (!file_exists($fs_dir = Vfs::dirname(self::_fs_path($this->opened_fs_id))))
 			{
 				$umaskbefore = umask();
 				if (self::LOG_LEVEL > 1) error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
-				self::mkdir_recursive($fs_dir,0700,true);
+				self::mkdir_recursive($fs_dir, 0700, true);
 			}
 		}
 		// check if opend file is a directory
-		elseif($stat && ($stat['mode'] & self::MODE_DIR) == self::MODE_DIR)
+		elseif ($stat && ($stat['mode']&self::MODE_DIR) == self::MODE_DIR)
 		{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) Is a directory!");
-				if (($options & STREAM_REPORT_ERRORS))
+				if (($options&STREAM_REPORT_ERRORS))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) Is a directory!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) Is a directory!", E_USER_WARNING);
 				}
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
 				return false;
 		}
 		else
 		{
-			if ($mode == 'r' && !Vfs::check_access($url,Vfs::READABLE ,$stat) ||// we are not allowed to read
-				$mode != 'r' && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// or edit it
+			if ($mode == 'r' && !Vfs::check_access($url, Vfs::READABLE, $stat) || // we are not allowed to read
+				$mode != 'r' && !Vfs::check_access($url, Vfs::WRITABLE, $stat))	// or edit it
 			{
 				self::_remove_password($url);
 				$op = $mode == 'r' ? 'read' : 'edited';
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be $op!");
-				if (($options & STREAM_REPORT_ERRORS))
+				if (($options&STREAM_REPORT_ERRORS))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) file can not be $op!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) file can not be $op!", E_USER_WARNING);
 				}
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
 				return false;
@@ -289,9 +289,9 @@ 
 
 			if ($this->operation == self::STORE2DB)
 			{
-				$stmt = self::$pdo->prepare($sql='SELECT fs_content FROM '.self::TABLE.' WHERE fs_id=?');
+				$stmt = self::$pdo->prepare($sql = 'SELECT fs_content FROM '.self::TABLE.' WHERE fs_id=?');
 				$stmt->execute(array($stat['ino']));
-				$stmt->bindColumn(1,$this->opened_stream,\PDO::PARAM_LOB);
+				$stmt->bindColumn(1, $this->opened_stream, \PDO::PARAM_LOB);
 				$stmt->fetch(\PDO::FETCH_BOUND);
 				// hack to work around a current php bug (http://bugs.php.net/bug.php?id=40913)
 				// PDOStatement::bindColumn(,,\PDO::PARAM_LOB) is not working for MySQL, content is returned as string :-(
@@ -310,7 +310,7 @@ 
 		if ($this->operation == self::STORE2FS)
 		{
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__." fopen (may create a directory? mkdir) ($this->opened_fs_id,$mode,$options)");
-			if (!($this->opened_stream = fopen(self::_fs_path($this->opened_fs_id),$mode)) && $new_file)
+			if (!($this->opened_stream = fopen(self::_fs_path($this->opened_fs_id), $mode)) && $new_file)
 			{
 				// delete db entry again, if we are not able to open a new(!) file
 				unset($stmt);
@@ -320,7 +320,7 @@ 
 		}
 		if ($mode[0] == 'a')	// append modes: a, a+
 		{
-			$this->stream_seek(0,SEEK_END);
+			$this->stream_seek(0, SEEK_END);
 		}
 		if (!is_resource($this->opened_stream)) error_log(__METHOD__."($url,$mode,$options) NO stream, returning false!");
 
@@ -332,7 +332,7 @@ 
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
 	 */
-	function stream_close ( )
+	function stream_close( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
 
@@ -343,7 +343,7 @@ 
 
 		if ($this->opened_mode != 'r')
 		{
-			$this->stream_seek(0,SEEK_END);
+			$this->stream_seek(0, SEEK_END);
 
 			// we need to update the mime-type, size and content (if STORE2DB)
 			$values = array(
@@ -366,10 +366,10 @@ 
 			else
 			{
 				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_size=:fs_size,fs_mime=:fs_mime,fs_modifier=:fs_modifier,fs_modified=:fs_modified,fs_content=:fs_content WHERE fs_id=:fs_id');
-				$this->stream_seek(0,SEEK_SET);	// rewind to the start
-				foreach($values as $name => &$value)
+				$this->stream_seek(0, SEEK_SET); // rewind to the start
+				foreach ($values as $name => &$value)
 				{
-					$stmt->bindParam($name,$value);
+					$stmt->bindParam($name, $value);
 				}
 				$stmt->bindParam('fs_content', $this->opened_stream, \PDO::PARAM_LOB);
 				if (!($ret = $stmt->execute()))
@@ -402,13 +402,13 @@ 
 	 * @param int $count
 	 * @return string/false up to count bytes read or false on EOF
 	 */
-	function stream_read ( $count )
+	function stream_read($count)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($count) pos=$this->opened_pos");
 
 		if (is_resource($this->opened_stream))
 		{
-			return fread($this->opened_stream,$count);
+			return fread($this->opened_stream, $count);
 		}
 		return false;
 	}
@@ -424,13 +424,13 @@ 
 	 * @param string $data
 	 * @return integer
 	 */
-	function stream_write ( $data )
+	function stream_write($data)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($data)");
 
 		if (is_resource($this->opened_stream))
 		{
-			return fwrite($this->opened_stream,$data);
+			return fwrite($this->opened_stream, $data);
 		}
 		return false;
 	}
@@ -447,7 +447,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( )
 	{
 		if (is_resource($this->opened_stream))
 		{
@@ -461,7 +461,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
 
@@ -484,13 +484,13 @@ 
  	 * 							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)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($offset,$whence)");
 
 		if (is_resource($this->opened_stream))
 		{
-			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
 		}
 		return false;
 	}
@@ -502,7 +502,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( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
 
@@ -527,11 +527,11 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( )
+	function stream_stat( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($this->opened_path)");
 
-		return $this->url_stat($this->opened_path,0);
+		return $this->url_stat($this->opened_path, 0);
 	}
 
 	/**
@@ -543,31 +543,30 @@ 
 	 * @param string $url
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function unlink ( $url, $parent_stat=null )
+	static function unlink($url, $parent_stat = null)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
 		// need to get parent stat from Sqlfs, not Vfs
 		if (!isset($parent_stat))
 		{
-			$parent_stat = !($dir = Vfs::dirname($path)) ? false :
-				static::url_stat($dir, STREAM_URL_STAT_LINK);
+			$parent_stat = !($dir = Vfs::dirname($path)) ? false : static::url_stat($dir, STREAM_URL_STAT_LINK);
 		}
 
-		if (!$parent_stat || !($stat = self::url_stat($path,STREAM_URL_STAT_LINK)) ||
+		if (!$parent_stat || !($stat = self::url_stat($path, STREAM_URL_STAT_LINK)) ||
 			!Vfs::check_access($dir, Vfs::WRITABLE, $parent_stat))
 		{
 			self::_remove_password($url);
 			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
 		}
 		if ($stat['mime'] == self::DIR_MIME_TYPE)
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) is NO file!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		$stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
 		unset(self::$stat_cache[$path]);
@@ -575,7 +574,7 @@ 
 		if (($ret = $stmt->execute(array('fs_id' => $stat['ino']))))
 		{
 			if (self::url2operation($url) == self::STORE2FS &&
-				($stat['mode'] & self::MODE_LINK) != self::MODE_LINK)
+				($stat['mode']&self::MODE_LINK) != self::MODE_LINK)
 			{
 				unlink(self::_fs_path($stat['ino']));
 			}
@@ -599,13 +598,13 @@ 
 	 * @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)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url_from,$url_to)");
 
-		$path_from = Vfs::parse_url($url_from,PHP_URL_PATH);
+		$path_from = Vfs::parse_url($url_from, PHP_URL_PATH);
 		$from_dir = Vfs::dirname($path_from);
-		$path_to = Vfs::parse_url($url_to,PHP_URL_PATH);
+		$path_to = Vfs::parse_url($url_to, PHP_URL_PATH);
 		$to_dir = Vfs::dirname($path_to);
 		$operation = self::url2operation($url_from);
 
@@ -615,14 +614,14 @@ 
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_from permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		if (!$to_dir || !Vfs::check_access($to_dir, Vfs::WRITABLE, $to_dir_stat = static::url_stat($to_dir, 0)))
 		{
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_to permission denied!");
-			return false;	// no permission or parent-dir does not exist
+			return false; // no permission or parent-dir does not exist
 		}
 		// 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
@@ -633,10 +632,10 @@ 
 			self::_remove_password($url_to);
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $path_to 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 && !static::unlink($url_to,$operation))
+		if ($to_stat && !static::unlink($url_to, $operation))
 		{
 			self::_remove_password($url_to);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
@@ -657,7 +656,7 @@ 
 
 		// check if extension changed and update mime-type in that case (as we currently determine mime-type by it's extension!)
 		// fixes eg. problems with MsWord storing file with .tmp extension and then renaming to .doc
-		if ($ok && ($new_mime = Vfs::mime_content_type($url_to,true)) != Vfs::mime_content_type($url_to))
+		if ($ok && ($new_mime = Vfs::mime_content_type($url_to, true)) != Vfs::mime_content_type($url_to))
 		{
 			//echo "<p>Vfs::nime_content_type($url_to,true) = $new_mime</p>\n";
 			$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_mime=:fs_mime WHERE fs_id=:fs_id');
@@ -673,9 +672,9 @@ 
 	/**
 	 * due to problems with recursive directory creation, we have our own here
 	 */
-	protected static function mkdir_recursive($pathname, $mode, $depth=0)
+	protected static function mkdir_recursive($pathname, $mode, $depth = 0)
 	{
-		$maxdepth=10;
+		$maxdepth = 10;
 		$depth2propagate = (int)$depth + 1;
 		if ($depth2propagate > $maxdepth) return is_dir($pathname);
     	is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
@@ -693,19 +692,19 @@ 
 	 * @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)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__." called from:".function_backtrace());
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (self::url_stat($path,STREAM_URL_STAT_QUIET))
+		if (self::url_stat($path, STREAM_URL_STAT_QUIET))
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) already exist!");
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
-				trigger_error(__METHOD__."('$url',$mode,$options) already exist!",E_USER_WARNING);
+				trigger_error(__METHOD__."('$url',$mode,$options) already exist!", E_USER_WARNING);
 			}
 			return false;
 		}
@@ -713,35 +712,35 @@ 
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) dirname('$path')===false!");
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
 				trigger_error(__METHOD__."('$url',$mode,$options) dirname('$path')===false!", E_USER_WARNING);
 			}
 			return false;
 		}
-		if (($query = Vfs::parse_url($url,PHP_URL_QUERY))) $parent_path .= '?'.$query;
-		$parent = self::url_stat($parent_path,STREAM_URL_STAT_QUIET);
+		if (($query = Vfs::parse_url($url, PHP_URL_QUERY))) $parent_path .= '?'.$query;
+		$parent = self::url_stat($parent_path, STREAM_URL_STAT_QUIET);
 
 		// check if we should also create all non-existing path components and our parent does not exist,
 		// if yes call ourself recursive with the parent directory
-		if (($options & STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent)
+		if (($options&STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent)
 		{
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__." creating parents: $parent_path, $mode");
-			if (!self::mkdir($parent_path,$mode,$options))
+			if (!self::mkdir($parent_path, $mode, $options))
 			{
 				return false;
 			}
-			$parent = self::url_stat($parent_path,0);
+			$parent = self::url_stat($parent_path, 0);
 		}
-		if (!$parent || !Vfs::check_access($parent_path,Vfs::WRITABLE,$parent))
+		if (!$parent || !Vfs::check_access($parent_path, Vfs::WRITABLE, $parent))
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) permission denied!");
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
-				trigger_error(__METHOD__."('$url',$mode,$options) permission denied!",E_USER_WARNING);
+				trigger_error(__METHOD__."('$url',$mode,$options) permission denied!", E_USER_WARNING);
 			}
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		unset(self::$stat_cache[$path]);
 		$stmt = self::$pdo->prepare('INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified,fs_creator'.
@@ -762,9 +761,9 @@ 
 			// check if some other process created the directory parallel to us (sqlfs would gives SQL errors later!)
 			$new_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq');
 
-			unset($stmt);	// free statement object, on some installs a new prepare fails otherwise!
+			unset($stmt); // free statement object, on some installs a new prepare fails otherwise!
 
-			$stmt = self::$pdo->prepare($q='SELECT COUNT(*) FROM '.self::TABLE.
+			$stmt = self::$pdo->prepare($q = 'SELECT COUNT(*) FROM '.self::TABLE.
 				' WHERE fs_dir=:fs_dir AND fs_active=:fs_active AND fs_name'.self::$case_sensitive_equal.':fs_name');
 			if ($stmt->execute(array(
 				'fs_dir'  => $parent['ino'],
@@ -788,25 +787,24 @@ 
 	 * @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)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
 		if (!($parent = Vfs::dirname($path)) ||
 			!($stat = self::url_stat($path, 0)) || $stat['mime'] != self::DIR_MIME_TYPE ||
-			!Vfs::check_access($parent, Vfs::WRITABLE, static::url_stat($parent,0)))
+			!Vfs::check_access($parent, Vfs::WRITABLE, static::url_stat($parent, 0)))
 		{
 			self::_remove_password($url);
-			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' :
-				($stat['mime'] != self::DIR_MIME_TYPE ? 'not a directory!' : 'permission denied!'));
+			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' : ($stat['mime'] != self::DIR_MIME_TYPE ? 'not a directory!' : 'permission denied!'));
 			if (self::LOG_LEVEL) error_log($err_msg);
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
-				trigger_error($err_msg,E_USER_WARNING);
+				trigger_error($err_msg, E_USER_WARNING);
 			}
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		$stmt = self::$pdo->prepare('SELECT COUNT(*) FROM '.self::TABLE.' WHERE fs_dir=?');
 		$stmt->execute(array($stat['ino']));
@@ -814,19 +812,19 @@ 
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$options) dir is not empty!");
-			if (!($options & STREAM_REPORT_ERRORS))
+			if (!($options&STREAM_REPORT_ERRORS))
 			{
-				trigger_error(__METHOD__."('$url',$options) dir is not empty!",E_USER_WARNING);
+				trigger_error(__METHOD__."('$url',$options) dir is not empty!", E_USER_WARNING);
 			}
 			return false;
 		}
 		unset(self::$stat_cache[$path]);
-		unset($stmt);	// free statement object, on some installs a new prepare fails otherwise!
+		unset($stmt); // free statement object, on some installs a new prepare fails otherwise!
 
 		$del_stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=?');
 		if (($ret = $del_stmt->execute(array($stat['ino']))))
 		{
-			self::eacl($path,null,false,$stat['ino']);	// remove all (=false) evtl. existing extended acl for that dir
+			self::eacl($path, null, false, $stat['ino']); // remove all (=false) evtl. existing extended acl for that dir
 			// delete props
 			unset($del_stmt);
 			$del_stmt = self::$pdo->prepare('DELETE FROM '.self::PROPS_TABLE.' WHERE fs_id=?');
@@ -842,25 +840,25 @@ 
 	 * @param int $time =null modification time (unix timestamp), default null = current time
 	 * @param int $atime =null access time (unix timestamp), default null = current time, not implemented in the vfs!
 	 */
-	static function touch($url,$time=null,$atime=null)
+	static function touch($url, $time = null, $atime = null)
 	{
-		unset($atime);	// not used
+		unset($atime); // not used
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $time)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,STREAM_URL_STAT_QUIET)))
+		if (!($stat = self::url_stat($path, STREAM_URL_STAT_QUIET)))
 		{
 			// file does not exist --> create an empty one
-			if (!($f = fopen(self::SCHEME.'://default'.$path,'w')) || !fclose($f))
+			if (!($f = fopen(self::SCHEME.'://default'.$path, 'w')) || !fclose($f))
 			{
 				return false;
 			}
 			if (is_null($time))
 			{
-				return true;	// new (empty) file created with current mod time
+				return true; // new (empty) file created with current mod time
 			}
-			$stat = self::url_stat($path,0);
+			$stat = self::url_stat($path, 0);
 		}
 		unset(self::$stat_cache[$path]);
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_modified=:fs_modified,fs_modifier=:fs_modifier WHERE fs_id=:fs_id');
@@ -879,39 +877,39 @@ 
 	 * @param int $owner
 	 * @return boolean
 	 */
-	static function chown($url,$owner)
+	static function chown($url, $owner)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,0)))
+		if (!($stat = self::url_stat($path, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
-			trigger_error("No such file or directory $url !",E_USER_WARNING);
+			trigger_error("No such file or directory $url !", E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::$is_root)
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only root can do that!");
-			trigger_error("Only root can do that!",E_USER_WARNING);
+			trigger_error("Only root can do that!", E_USER_WARNING);
 			return false;
 		}
 		if ($owner < 0 || $owner && !$GLOBALS['egw']->accounts->id2name($owner))	// not a user (0 == root)
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) user id!");
-			trigger_error(__METHOD__."($url,$owner) Unknown (numeric) user id!",E_USER_WARNING);
+			trigger_error(__METHOD__."($url,$owner) Unknown (numeric) user id!", E_USER_WARNING);
 			//throw new Exception(__METHOD__."($url,$owner) Unknown (numeric) user id!");
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_uid=:fs_uid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path, -1) == '/') $path = substr($path, 0, -1);
 		self::$stat_cache[$path]['fs_uid'] = $owner;
 
 		return $stmt->execute(array(
-			'fs_uid' => (int) $owner,
+			'fs_uid' => (int)$owner,
 			'fs_id' => $stat['ino'],
 		));
 	}
@@ -923,36 +921,36 @@ 
 	 * @param int $owner
 	 * @return boolean
 	 */
-	static function chgrp($url,$owner)
+	static function chgrp($url, $owner)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,0)))
+		if (!($stat = self::url_stat($path, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
-			trigger_error("No such file or directory $url !",E_USER_WARNING);
+			trigger_error("No such file or directory $url !", E_USER_WARNING);
 			return false;
 		}
-		if (!Vfs::has_owner_rights($path,$stat))
+		if (!Vfs::has_owner_rights($path, $stat))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only owner or root can do that!");
-			trigger_error("Only owner or root can do that!",E_USER_WARNING);
+			trigger_error("Only owner or root can do that!", E_USER_WARNING);
 			return false;
 		}
-		if ($owner < 0) $owner = -$owner;	// sqlfs uses a positiv group id's!
+		if ($owner < 0) $owner = -$owner; // sqlfs uses a positiv group id's!
 
 		if ($owner && !$GLOBALS['egw']->accounts->id2name(-$owner))	// not a group
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) group id!");
-			trigger_error("Unknown (numeric) group id!",E_USER_WARNING);
+			trigger_error("Unknown (numeric) group id!", E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_gid=:fs_gid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path, -1) == '/') $path = substr($path, 0, -1);
 		self::$stat_cache[$path]['fs_gid'] = $owner;
 
 		return $stmt->execute(array(
@@ -968,38 +966,38 @@ 
 	 * @param int $mode
 	 * @return boolean
 	 */
-	static function chmod($url,$mode)
+	static function chmod($url, $mode)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $mode)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,0)))
+		if (!($stat = self::url_stat($path, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no such file or directory!");
-			trigger_error("No such file or directory $url !",E_USER_WARNING);
+			trigger_error("No such file or directory $url !", E_USER_WARNING);
 			return false;
 		}
-		if (!Vfs::has_owner_rights($path,$stat))
+		if (!Vfs::has_owner_rights($path, $stat))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) only owner or root can do that!");
-			trigger_error("Only owner or root can do that!",E_USER_WARNING);
+			trigger_error("Only owner or root can do that!", E_USER_WARNING);
 			return false;
 		}
 		if (!is_numeric($mode))	// not a mode
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no (numeric) mode!");
-			trigger_error("No (numeric) mode!",E_USER_WARNING);
+			trigger_error("No (numeric) mode!", E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_mode=:fs_mode WHERE fs_id=:fs_id');
 
 		// update stat cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
-		self::$stat_cache[$path]['fs_mode'] = ((int) $mode) & 0777;
+		if ($path != '/' && substr($path, -1) == '/') $path = substr($path, 0, -1);
+		self::$stat_cache[$path]['fs_mode'] = ((int)$mode)&0777;
 
 		return $stmt->execute(array(
-			'fs_mode' => ((int) $mode) & 0777,		// we dont store the file and dir bits, give int overflow!
+			'fs_mode' => ((int)$mode)&0777, // we dont store the file and dir bits, give int overflow!
 			'fs_id' => $stat['ino'],
 		));
 	}
@@ -1012,15 +1010,15 @@ 
 	 * @param int $options
 	 * @return booelan
 	 */
-	function dir_opendir ( $url, $options )
+	function dir_opendir($url, $options)
 	{
 		$this->opened_dir = null;
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($url,0)) || 		// dir not found
-			$stat['mime'] != self::DIR_MIME_TYPE ||		// no dir
-			!Vfs::check_access($url,Vfs::EXECUTABLE|Vfs::READABLE,$stat))	// no access
+		if (!($stat = self::url_stat($url, 0)) || // dir not found
+			$stat['mime'] != self::DIR_MIME_TYPE || // no dir
+			!Vfs::check_access($url, Vfs::EXECUTABLE|Vfs::READABLE, $stat))	// no access
 		{
 			self::_remove_password($url);
 			$msg = $stat['mime'] != self::DIR_MIME_TYPE ? "$url is no directory" : 'permission denied';
@@ -1039,13 +1037,13 @@ 
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
 		if ($stmt->execute(array($stat['ino'])))
 		{
-			foreach($stmt as $file)
+			foreach ($stmt as $file)
 			{
 				$this->opened_dir[] = $file['fs_name'];
-				self::$stat_cache[Vfs::concat($path,$file['fs_name'])] = $file;
+				self::$stat_cache[Vfs::concat($path, $file['fs_name'])] = $file;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options): ".implode(', ',$this->opened_dir));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options): ".implode(', ', $this->opened_dir));
 		reset($this->opened_dir);
 
 		return true;
@@ -1078,26 +1076,26 @@ 
 	 * @param boolean $eacl_access =null allows extending classes to pass the value of their check_extended_acl() method (no lsb!)
 	 * @return array
 	 */
-	static function url_stat ( $url, $flags, $eacl_access=null )
+	static function url_stat($url, $flags, $eacl_access = null)
 	{
-		static $max_subquery_depth=null;
+		static $max_subquery_depth = null;
 		if (is_null($max_subquery_depth))
 		{
 			$max_subquery_depth = $GLOBALS['egw_info']['server']['max_subquery_depth'];
-			if (!$max_subquery_depth) $max_subquery_depth = 7;	// setting current default of 7, if nothing set
+			if (!$max_subquery_depth) $max_subquery_depth = 7; // setting current default of 7, if nothing set
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags,$eacl_access)");
 
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
 		// webdav adds a trailing slash to dirs, which causes url_stat to NOT find the file otherwise
-		if ($path != '/' && substr($path,-1) == '/')
+		if ($path != '/' && substr($path, -1) == '/')
 		{
-			$path = substr($path,0,-1);
+			$path = substr($path, 0, -1);
 		}
 		if (empty($path))
 		{
-			return false;	// is invalid and gives sql error
+			return false; // is invalid and gives sql error
 		}
 		// check if we already have the info from the last dir_open call, as the old vfs reads it anyway from the db
 		if (self::$stat_cache && isset(self::$stat_cache[$path]) && (is_null($eacl_access) || self::$stat_cache[$path] !== false))
@@ -1112,28 +1110,28 @@ 
 		$base_query = 'SELECT fs_id,fs_name,fs_mode,fs_uid,fs_gid,fs_size,fs_mime,fs_created,fs_modified'.self::$extra_columns.
 			' FROM '.self::TABLE.' WHERE fs_active='.self::_pdo_boolean(true).
 			' AND fs_name'.self::$case_sensitive_equal.'? AND fs_dir=';
-		$parts = explode('/',$path);
+		$parts = explode('/', $path);
 
 		// if we have extendes acl access to the url, we dont need and can NOT include the sql for the readable check
 		if (is_null($eacl_access))
 		{
-			$eacl_access = self::check_extended_acl($path,Vfs::READABLE);	// should be static::check_extended_acl, but no lsb!
+			$eacl_access = self::check_extended_acl($path, Vfs::READABLE); // should be static::check_extended_acl, but no lsb!
 		}
 
 		try {
-			foreach($parts as $n => $name)
+			foreach ($parts as $n => $name)
 			{
 				if ($n == 0)
 				{
-					$query = (int) ($path != '/');	// / always has fs_id == 1, no need to query it ($path=='/' needs fs_dir=0!)
+					$query = (int)($path != '/'); // / always has fs_id == 1, no need to query it ($path=='/' needs fs_dir=0!)
 				}
-				elseif ($n < count($parts)-1)
+				elseif ($n < count($parts) - 1)
 				{
 					// MySQL 5.0 has a nesting limit for subqueries
 					// --> we replace the so far cumulated subqueries with their result
 					// no idea about the other DBMS, but this does NOT hurt ...
 					// --> depth limit of subqueries is now dynamicly decremented in catch
-					if ($n > 1 && !(($n-1) % $max_subquery_depth) && !($query = self::$pdo->query($query)->fetchColumn()))
+					if ($n > 1 && !(($n - 1) % $max_subquery_depth) && !($query = self::$pdo->query($query)->fetchColumn()))
 					{
 						if (self::LOG_LEVEL > 1)
 						{
@@ -1160,7 +1158,7 @@ 
 				}
 				else
 				{
-					$query = str_replace('fs_name'.self::$case_sensitive_equal.'?','fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name),$base_query).'('.$query.')';
+					$query = str_replace('fs_name'.self::$case_sensitive_equal.'?', 'fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name), $base_query).'('.$query.')';
 				}
 			}
 			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$flags,$eacl_access)".' */ '.$query;
@@ -1186,7 +1184,7 @@ 
 			$GLOBALS['egw_info']['server']['max_subquery_depth'] = --$max_subquery_depth;
 			error_log(__METHOD__."() decremented max_subquery_depth to $max_subquery_depth");
 			Api\Config::save_value('max_subquery_depth', $max_subquery_depth, 'phpgwapi');
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) $GLOBALS['egw']->invalidate_session_cache();
+			if (method_exists($GLOBALS['egw'], 'invalidate_session_cache')) $GLOBALS['egw']->invalidate_session_cache();
 			return self::url_stat($url, $flags, $eacl_access);
 		}
 		self::$stat_cache[$path] = $info;
@@ -1202,18 +1200,18 @@ 
 	 */
 	protected static function _sql_readable()
 	{
-		static $sql_read_acl=null;
+		static $sql_read_acl = null;
 
 		if (is_null($sql_read_acl))
 		{
-			foreach($GLOBALS['egw']->accounts->memberships(Vfs::$user,true) as $gid)
+			foreach ($GLOBALS['egw']->accounts->memberships(Vfs::$user, true) as $gid)
 			{
-				$memberships[] = abs($gid);	// sqlfs stores the gid's positiv
+				$memberships[] = abs($gid); // sqlfs stores the gid's positiv
 			}
 			// using octal numbers with mysql leads to funny results (select 384 & 0400 --> 384 not 256=0400)
 			// 256 = 0400, 32 = 040
 			$sql_read_acl = '((fs_mode & 4)=4 OR (fs_mode & 256)=256 AND fs_uid='.(int)Vfs::$user.
-				($memberships ? ' OR (fs_mode & 32)=32 AND fs_gid IN('.implode(',',$memberships).')' : '').')';
+				($memberships ? ' OR (fs_mode & 32)=32 AND fs_gid IN('.implode(',', $memberships).')' : '').')';
 			//error_log(__METHOD__."() Vfs::\$user=".array2string(Vfs::$user).' --> memberships='.array2string($memberships).' --> '.$sql_read_acl.($memberships?'':': '.function_backtrace()));
 		}
 		return $sql_read_acl;
@@ -1226,7 +1224,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1245,7 +1243,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1263,7 +1261,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1284,7 +1282,7 @@ 
 	 */
 	static function readlink($path)
 	{
-		$link = !($lstat = self::url_stat($path,STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
+		$link = !($lstat = self::url_stat($path, STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
 
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = $link");
 
@@ -1298,31 +1296,31 @@ 
 	 * @param string $link
 	 * @return boolean true on success false on error
 	 */
-	static function symlink($target,$link)
+	static function symlink($target, $link)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$target','$link')");
 
-		if (self::url_stat($link,0))
+		if (self::url_stat($link, 0))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') $link exists, returning false!");
-			return false;	// $link already exists
+			return false; // $link already exists
 		}
 		if (!($dir = Vfs::dirname($link)) ||
-			!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=static::url_stat($dir,0)))
+			!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat = static::url_stat($dir, 0)))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!is_writable('$dir'), dir_stat=".array2string($dir_stat).")");
-			return false;	// parent dir does not exist or is not writable
+			return false; // parent dir does not exist or is not writable
 		}
 		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_link'.
 			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_link)';
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 		$stmt = self::$pdo->prepare($query);
-		unset(self::$stat_cache[Vfs::parse_url($link,PHP_URL_PATH)]);
+		unset(self::$stat_cache[Vfs::parse_url($link, PHP_URL_PATH)]);
 
 		return !!$stmt->execute(array(
 			'fs_name' => self::limit_filename(Vfs::basename($link)),
 			'fs_dir'  => $dir_stat['ino'],
-			'fs_mode' => ($dir_stat['mode'] & 0666),
+			'fs_mode' => ($dir_stat['mode']&0666),
 			'fs_uid'  => $dir_stat['uid'] ? $dir_stat['uid'] : Vfs::$user,
 			'fs_gid'  => $dir_stat['gid'],
 			'fs_created'  => self::_pdo_timestamp(time()),
@@ -1346,24 +1344,24 @@ 
 	 * @param int $check mode to check: one or more or'ed together of: 4 = read, 2 = write, 1 = executable
 	 * @return boolean
 	 */
-	static function check_extended_acl($url,$check)
+	static function check_extended_acl($url, $check)
 	{
-		$url_path = Vfs::parse_url($url,PHP_URL_PATH);
+		$url_path = Vfs::parse_url($url, PHP_URL_PATH);
 
 		if (is_null(self::$extended_acl))
 		{
 			self::_read_extended_acl();
 		}
 		$access = false;
-		foreach(self::$extended_acl as $path => $rights)
+		foreach (self::$extended_acl as $path => $rights)
 		{
-			if ($path == $url_path || substr($url_path,0,strlen($path)+1) == $path.'/')
+			if ($path == $url_path || substr($url_path, 0, strlen($path) + 1) == $path.'/')
 			{
-				$access = ($rights & $check) == $check;
+				$access = ($rights&$check) == $check;
 				break;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$check) ".($access?"access granted by $path=$rights":'no access!!!'));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$check) ".($access ? "access granted by $path=$rights" : 'no access!!!'));
 		return $access;
 	}
 
@@ -1375,14 +1373,14 @@ 
 	{
 		if ((self::$extended_acl = Api\Cache::getSession(self::EACL_APPNAME, 'extended_acl')))
 		{
-			return;		// ext. ACL read from session.
+			return; // ext. ACL read from session.
 		}
 		self::$extended_acl = array();
-		if (($rights = $GLOBALS['egw']->acl->get_all_location_rights(Vfs::$user,self::EACL_APPNAME)))
+		if (($rights = $GLOBALS['egw']->acl->get_all_location_rights(Vfs::$user, self::EACL_APPNAME)))
 		{
 			$pathes = self::id2path(array_keys($rights));
 		}
-		foreach($rights as $fs_id => $right)
+		foreach ($rights as $fs_id => $right)
 		{
 			$path = $pathes[$fs_id];
 			if (isset($path))
@@ -1391,8 +1389,8 @@ 
 			}
 		}
 		// sort by length descending, to allow more specific pathes to have precedence
-		uksort(self::$extended_acl, function($a,$b) {
-			return strlen($b)-strlen($a);
+		uksort(self::$extended_acl, function($a, $b) {
+			return strlen($b) - strlen($a);
 		});
 		Api\Cache::setSession(self::EACL_APPNAME, 'extended_acl', self::$extended_acl);
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() '.array2string(self::$extended_acl));
@@ -1414,23 +1412,23 @@ 
 	 * @param int $fs_id =null fs_id to use, to not query it again (eg. because it's already deleted)
 	 * @return boolean true if acl is set/deleted, false on error
 	 */
-	static function eacl($path,$rights=null,$owner=null,$fs_id=null)
+	static function eacl($path, $rights = null, $owner = null, $fs_id = null)
 	{
 		if ($path[0] != '/')
 		{
-			$path = Vfs::parse_url($path,PHP_URL_PATH);
+			$path = Vfs::parse_url($path, PHP_URL_PATH);
 		}
 		if (is_null($fs_id))
 		{
-			if (!($stat = self::url_stat($path,0)))
+			if (!($stat = self::url_stat($path, 0)))
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) no such file or directory!");
-				return false;	// $path not found
+				return false; // $path not found
 			}
-			if (!Vfs::has_owner_rights($path,$stat))		// not group dir and user is eGW admin
+			if (!Vfs::has_owner_rights($path, $stat))		// not group dir and user is eGW admin
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) permission denied!");
-				return false;	// permission denied
+				return false; // permission denied
 			}
 			$fs_id = $stat['ino'];
 		}
@@ -1442,21 +1440,21 @@ 
 		{
 			// delete eacl
 			if (is_null($owner) || $owner == Vfs::$user ||
-				$owner < 0 && Vfs::$user && in_array($owner,$GLOBALS['egw']->accounts->memberships(Vfs::$user,true)))
+				$owner < 0 && Vfs::$user && in_array($owner, $GLOBALS['egw']->accounts->memberships(Vfs::$user, true)))
 			{
-				self::$extended_acl = null;	// force new read of eACL, as there could be multiple eACL for that path
+				self::$extended_acl = null; // force new read of eACL, as there could be multiple eACL for that path
 			}
-			$ret = $GLOBALS['egw']->acl->delete_repository(self::EACL_APPNAME,$fs_id,(int)$owner);
+			$ret = $GLOBALS['egw']->acl->delete_repository(self::EACL_APPNAME, $fs_id, (int)$owner);
 		}
 		else
 		{
 			if (isset(self::$extended_acl) && ($owner == Vfs::$user ||
-				$owner < 0 && Vfs::$user && in_array($owner,$GLOBALS['egw']->accounts->memberships(Vfs::$user,true))))
+				$owner < 0 && Vfs::$user && in_array($owner, $GLOBALS['egw']->accounts->memberships(Vfs::$user, true))))
 			{
 				// set rights for this class, if applicable
 				self::$extended_acl[$path] |= $rights;
 			}
-			$ret = $GLOBALS['egw']->acl->add_repository(self::EACL_APPNAME,$fs_id,$owner,$rights);
+			$ret = $GLOBALS['egw']->acl->add_repository(self::EACL_APPNAME, $fs_id, $owner, $rights);
 		}
 		if ($ret)
 		{
@@ -1479,10 +1477,10 @@ 
 		if (!($stat = static::url_stat($path, STREAM_URL_STAT_QUIET)))
 		{
 			error_log(__METHOD__.__LINE__.' '.array2string($path).' not found!');
-			return false;	// not found
+			return false; // not found
 		}
 		$eacls = array();
-		foreach($GLOBALS['egw']->acl->get_all_rights($stat['ino'],self::EACL_APPNAME) as $owner => $rights)
+		foreach ($GLOBALS['egw']->acl->get_all_rights($stat['ino'], self::EACL_APPNAME) as $owner => $rights)
 		{
 			$eacls[] = array(
 				'path'   => $path,
@@ -1493,7 +1491,7 @@ 
 		}
 		if (($path = Vfs::dirname($path)))
 		{
-			$eacls = array_merge((array)self::get_eacl($path),$eacls);
+			$eacls = array_merge((array)self::get_eacl($path), $eacls);
 		}
 		// sort by length descending, to show precedence
 		usort($eacls, function($a, $b) {
@@ -1518,9 +1516,9 @@ 
 		$ids = (array)$fs_ids;
 		$pathes = array();
 		// first check our stat-cache for the ids
-		foreach(self::$stat_cache as $path => $stat)
+		foreach (self::$stat_cache as $path => $stat)
 		{
-			if (($key = array_search($stat['fs_id'],$ids)) !== false)
+			if (($key = array_search($stat['fs_id'], $ids)) !== false)
 			{
 				$pathes[$stat['fs_id']] = $path;
 				unset($ids[$key]);
@@ -1534,7 +1532,7 @@ 
 		// now search via the database
 		if (count($ids) > 1) array_map(function(&$v) { $v = (int)$v; },$ids);
 		$query = 'SELECT fs_id,fs_dir,fs_name FROM '.self::TABLE.' WHERE fs_id'.
-			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',',$ids).')');
+			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',', $ids).')');
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 		if (!is_object(self::$pdo))
@@ -1545,12 +1543,12 @@ 
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
 		if (!$stmt->execute())
 		{
-			return false;	// not found
+			return false; // not found
 		}
 		$parents = array();
-		foreach($stmt as $row)
+		foreach ($stmt as $row)
 		{
-			if ($row['fs_dir'] > 1 && !in_array($row['fs_dir'],$parents))
+			if ($row['fs_dir'] > 1 && !in_array($row['fs_dir'], $parents))
 			{
 				$parents[] = $row['fs_dir'];
 			}
@@ -1560,14 +1558,14 @@ 
 
 		if ($parents && !($parents = self::id2path($parents)))
 		{
-			return false;	// parent not found, should never happen ...
+			return false; // parent not found, should never happen ...
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
-		foreach((array)$rows as $fs_id => $row)
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows, true)."#");
+		foreach ((array)$rows as $fs_id => $row)
 		{
 			$parent = $row['fs_dir'] > 1 ? $parents[$row['fs_dir']] : '';
 
-			$pathes[$fs_id] = $parent . '/' . $row['fs_name'];
+			$pathes[$fs_id] = $parent.'/'.$row['fs_name'];
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes));
 		return is_array($fs_ids) ? $pathes : array_shift($pathes);
@@ -1591,7 +1589,7 @@ 
 			$parts = explode('.', $name);
 			if ($parts > 1 && mb_strlen($extension = '.'.array_pop($parts)) <= $fs_name_precision)
 			{
-				$name = mb_substr(implode('.', $parts), 0, $fs_name_precision-mb_strlen($extension)).$extension;
+				$name = mb_substr(implode('.', $parts), 0, $fs_name_precision - mb_strlen($extension)).$extension;
 			}
 			else
 			{
@@ -1612,9 +1610,8 @@ 
 		$stat = array(
 			'ino'   => $info['fs_id'],
 			'name'  => $info['fs_name'],
-			'mode'  => $info['fs_mode'] |
-				($info['fs_mime'] == self::DIR_MIME_TYPE ? self::MODE_DIR :
-				($info['fs_mime'] == self::SYMLINK_MIME_TYPE ? self::MODE_LINK : self::MODE_FILE)),	// required by the stream wrapper
+			'mode'  => $info['fs_mode']|
+				($info['fs_mime'] == self::DIR_MIME_TYPE ? self::MODE_DIR : ($info['fs_mime'] == self::SYMLINK_MIME_TYPE ? self::MODE_LINK : self::MODE_FILE)), // required by the stream wrapper
 			'size'  => $info['fs_size'],
 			'uid'   => $info['fs_uid'],
 			'gid'   => $info['fs_gid'],
@@ -1659,10 +1656,10 @@ 
 		{
 			if (is_object($GLOBALS['egw_setup']->db))	// if we run under setup, query the db for the files dir
 			{
-				$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
+				$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config', 'config_value', array(
 					'config_name' => 'files_dir',
 					'config_app' => 'phpgwapi',
-				),__LINE__,__FILE__)->fetchColumn();
+				), __LINE__, __FILE__)->fetchColumn();
 			}
 		}
 		if (!$GLOBALS['egw_info']['server']['files_dir'])
@@ -1671,14 +1668,14 @@ 
 		}
 		$hash = array();
 		$n = $id;
-		while(($n = (int) ($n / self::HASH_MAX)))
+		while (($n = (int)($n / self::HASH_MAX)))
 		{
-			$hash[] = sprintf('%02d',$n % self::HASH_MAX);
+			$hash[] = sprintf('%02d', $n % self::HASH_MAX);
 		}
-		if (!$hash) $hash[] = '00';		// we need at least one directory, to not conflict with the dir-names
-		array_unshift($hash,$id);
+		if (!$hash) $hash[] = '00'; // we need at least one directory, to not conflict with the dir-names
+		array_unshift($hash, $id);
 
-		$path = '/sqlfs/'.implode('/',array_reverse($hash));
+		$path = '/sqlfs/'.implode('/', array_reverse($hash));
 		//error_log(__METHOD__."($id) = '$path'");
 		return $GLOBALS['egw_info']['server']['files_dir'].$path;
 	}
@@ -1694,7 +1691,7 @@ 
 
 		if ($parts['pass'] || $parts['scheme'])
 		{
-			$url = $parts['scheme'].'://'.($parts['user'] ? $parts['user'].($parts['pass']?':...':'').'@' : '').
+			$url = $parts['scheme'].'://'.($parts['user'] ? $parts['user'].($parts['pass'] ? ':...' : '').'@' : '').
 				$parts['host'].$parts['path'];
 		}
 	}
@@ -1709,10 +1706,10 @@ 
 	{
 		$operation = self::DEFAULT_OPERATION;
 
-		if (strpos(is_array($url) ? $url['query'] : $url,'storage=') !== false)
+		if (strpos(is_array($url) ? $url['query'] : $url, 'storage=') !== false)
 		{
 			$query = null;
-			parse_str(is_array($url) ? $url['query'] : Vfs::parse_url($url,PHP_URL_QUERY), $query);
+			parse_str(is_array($url) ? $url['query'] : Vfs::parse_url($url, PHP_URL_QUERY), $query);
 			switch ($query['storage'])
 			{
 				case 'db':
@@ -1735,27 +1732,27 @@ 
 	 * @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)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."(".array2string($path).','.array2string($props));
 		if (!is_numeric($path))
 		{
-			if (!($stat = self::url_stat($path,0)))
+			if (!($stat = self::url_stat($path, 0)))
 			{
 				return false;
 			}
 			$id = $stat['ino'];
 		}
-		elseif(!($path = self::id2path($id=$path)))
+		elseif (!($path = self::id2path($id = $path)))
 		{
 			return false;
 		}
-		if (!Vfs::check_access($path,Api\Acl::EDIT,$stat))
+		if (!Vfs::check_access($path, Api\Acl::EDIT, $stat))
 		{
-			return false;	// permission denied
+			return false; // permission denied
 		}
 		$ins_stmt = $del_stmt = null;
-		foreach($props as &$prop)
+		foreach ($props as &$prop)
 		{
 			if (!isset($prop['ns'])) $prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
 
@@ -1800,14 +1797,14 @@ 
 	 * @return array|boolean false on error ($path_ids does not exist), array with props (values for keys 'name', 'ns', 'value'), or
 	 * 	fs_id/path => array of props for $depth==1 or is_array($path_ids)
 	 */
-	static function propfind($path_ids,$ns=Vfs::DEFAULT_PROP_NAMESPACE)
+	static function propfind($path_ids, $ns = Vfs::DEFAULT_PROP_NAMESPACE)
 	{
 		$ids = is_array($path_ids) ? $path_ids : array($path_ids);
-		foreach($ids as &$id)
+		foreach ($ids as &$id)
 		{
 			if (!is_numeric($id))
 			{
-				if (!($stat = self::url_stat($id,0)))
+				if (!($stat = self::url_stat($id, 0)))
 				{
 					if (self::LOG_LEVEL) error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
 					return false;
@@ -1817,7 +1814,7 @@ 
 		}
 		if (count($ids) >= 1) array_map(function(&$v) { $v = (int)$v; },$ids);
 		$query = 'SELECT * FROM '.self::PROPS_TABLE.' WHERE (fs_id'.
-			(count($ids) == 1 ? '='.(int)implode('',$ids) : ' IN ('.implode(',',$ids).')').')'.
+			(count($ids) == 1 ? '='.(int)implode('', $ids) : ' IN ('.implode(',', $ids).')').')'.
 			(!is_null($ns) ? ' AND prop_namespace=?' : '');
 		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
@@ -1826,7 +1823,7 @@ 
 		$stmt->execute(!is_null($ns) ? array($ns) : array());
 
 		$props = array();
-		foreach($stmt as $row)
+		foreach ($stmt as $row)
 		{
 			$props[$row['fs_id']][] = array(
 				'val'  => $row['prop_value'],
@@ -1836,19 +1833,19 @@ 
 		}
 		if (!is_array($path_ids))
 		{
-			$props = $props[$row['fs_id']] ? $props[$row['fs_id']] : array();	// return empty array for no props
+			$props = $props[$row['fs_id']] ? $props[$row['fs_id']] : array(); // return empty array for no props
 		}
 		elseif ($props && isset($stat))	// need to map fs_id's to pathes
 		{
-			foreach(self::id2path(array_keys($props)) as $id => $path)
+			foreach (self::id2path(array_keys($props)) as $id => $path)
 			{
-				$props[$path] =& $props[$id];
+				$props[$path] = & $props[$id];
 				unset($props[$id]);
 			}
 		}
 		if (self::LOG_LEVEL > 1)
 		{
-			foreach((array)$props as $k => $v)
+			foreach ((array)$props as $k => $v)
 			{
 				error_log(__METHOD__."($path_ids,$ns) $k => ".array2string($v));
 			}

Braces +405 added lines, -101 removed lines

@@ -189,7 +189,10 @@ 
 	 */
 	function stream_open ( $url, $mode, $options, &$opened_path, array $overwrite_new=null )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$mode,$options)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 		$this->operation = self::url2operation($url);
@@ -201,7 +204,9 @@ 
 
 		parse_str(parse_url($url, PHP_URL_QUERY), $this->dir_url_params);
 
-		if (!is_null($overwrite_new) || !($stat = static::url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!is_null($overwrite_new) || !($stat = static::url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')
+		{
+			// file not found or file should NOT exist
 		{
 			if (!$dir || $mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
 				$mode[0] == 'x' && $stat ||	// or file should not exist, but does
@@ -209,7 +214,11 @@ 
 				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat))	// or we are not allowed to 																																			create it
 			{
 				self::_remove_password($url);
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+		}
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+				}
 				if (($options & STREAM_REPORT_ERRORS))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
@@ -221,7 +230,10 @@ 
 			$new_file = true;
 			$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_active'.
 				') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_active)';
-			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+			if (self::LOG_LEVEL > 2)
+			{
+				$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+			}
 			$stmt = self::$pdo->prepare($query);
 			$values = array(
 				'fs_name' => self::limit_filename(Vfs::basename($path)),
@@ -239,11 +251,17 @@ 
 				'fs_size'     => 0,
 				'fs_active'   => self::_pdo_boolean(true),
 			);
-			if ($overwrite_new) $values = array_merge($values,$overwrite_new);
+			if ($overwrite_new)
+			{
+				$values = array_merge($values,$overwrite_new);
+			}
 			if (!$stmt->execute($values) || !($this->opened_fs_id = self::$pdo->lastInsertId('egw_sqlfs_fs_id_seq')))
 			{
 				$this->opened_stream = $this->opened_path = $this->opened_mode = null;
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) execute() failed: ".self::$pdo->errorInfo());
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) execute() failed: ".self::$pdo->errorInfo());
+				}
 				return false;
 			}
 			if ($this->operation == self::STORE2DB)
@@ -255,14 +273,20 @@ 
 			elseif(!file_exists($fs_dir=Vfs::dirname(self::_fs_path($this->opened_fs_id))))
 			{
 				$umaskbefore = umask();
-				if (self::LOG_LEVEL > 1) error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
+				if (self::LOG_LEVEL > 1)
+				{
+					error_log(__METHOD__." about to call mkdir for $fs_dir # Present UMASK:".decoct($umaskbefore)." called from:".function_backtrace());
+				}
 				self::mkdir_recursive($fs_dir,0700,true);
 			}
 		}
 		// check if opend file is a directory
 		elseif($stat && ($stat['mode'] & self::MODE_DIR) == self::MODE_DIR)
 		{
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) Is a directory!");
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) Is a directory!");
+				}
 				if (($options & STREAM_REPORT_ERRORS))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) Is a directory!",E_USER_WARNING);
@@ -273,11 +297,17 @@ 
 		else
 		{
 			if ($mode == 'r' && !Vfs::check_access($url,Vfs::READABLE ,$stat) ||// we are not allowed to read
-				$mode != 'r' && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// or edit it
+				$mode != 'r' && !Vfs::check_access($url,Vfs::WRITABLE,$stat))
+			{
+				// or edit it
 			{
 				self::_remove_password($url);
+			}
 				$op = $mode == 'r' ? 'read' : 'edited';
-				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be $op!");
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($url,$mode,$options) file can not be $op!");
+				}
 				if (($options & STREAM_REPORT_ERRORS))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file can not be $op!",E_USER_WARNING);
@@ -309,7 +339,10 @@ 
 		// do we operate directly on the filesystem --> open file from there
 		if ($this->operation == self::STORE2FS)
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__." fopen (may create a directory? mkdir) ($this->opened_fs_id,$mode,$options)");
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__." fopen (may create a directory? mkdir) ($this->opened_fs_id,$mode,$options)");
+			}
 			if (!($this->opened_stream = fopen(self::_fs_path($this->opened_fs_id),$mode)) && $new_file)
 			{
 				// delete db entry again, if we are not able to open a new(!) file
@@ -318,11 +351,17 @@ 
 				$stmt->execute(array('fs_id' => $this->opened_fs_id));
 			}
 		}
-		if ($mode[0] == 'a')	// append modes: a, a+
+		if ($mode[0] == 'a')
+		{
+			// append modes: a, a+
 		{
 			$this->stream_seek(0,SEEK_END);
 		}
-		if (!is_resource($this->opened_stream)) error_log(__METHOD__."($url,$mode,$options) NO stream, returning false!");
+		}
+		if (!is_resource($this->opened_stream))
+		{
+			error_log(__METHOD__."($url,$mode,$options) NO stream, returning false!");
+		}
 
 		return is_resource($this->opened_stream);
 	}
@@ -334,7 +373,10 @@ 
 	 */
 	function stream_close ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		if (is_null($this->opened_path) || !is_resource($this->opened_stream) || !$this->opened_fs_id)
 		{
@@ -404,7 +446,10 @@ 
 	 */
 	function stream_read ( $count )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($count) pos=$this->opened_pos");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($count) pos=$this->opened_pos");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -426,7 +471,10 @@ 
 	 */
 	function stream_write ( $data )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($data)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($data)");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -463,7 +511,10 @@ 
 	 */
  	function stream_tell ( )
  	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -486,7 +537,10 @@ 
  	 */
 	function stream_seek ( $offset, $whence )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($offset,$whence)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($offset,$whence)");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -504,7 +558,10 @@ 
 	 */
 	function stream_flush ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		if (is_resource($this->opened_stream))
 		{
@@ -529,7 +586,10 @@ 
 	 */
 	function stream_stat ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($this->opened_path)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($this->opened_path)");
+		}
 
 		return $this->url_stat($this->opened_path,0);
 	}
@@ -545,7 +605,10 @@ 
 	 */
 	static function unlink ( $url, $parent_stat=null )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
@@ -560,13 +623,19 @@ 
 			!Vfs::check_access($dir, Vfs::WRITABLE, $parent_stat))
 		{
 			self::_remove_password($url);
-			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
 		}
 		if ($stat['mime'] == self::DIR_MIME_TYPE)
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) is NO file!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) is NO file!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		$stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
@@ -601,7 +670,10 @@ 
 	 */
 	static function rename ( $url_from, $url_to)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url_from,$url_to)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url_from,$url_to)");
+		}
 
 		$path_from = Vfs::parse_url($url_from,PHP_URL_PATH);
 		$from_dir = Vfs::dirname($path_from);
@@ -614,14 +686,20 @@ 
 		{
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_from permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $path_from permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		if (!$to_dir || !Vfs::check_access($to_dir, Vfs::WRITABLE, $to_dir_stat = static::url_stat($to_dir, 0)))
 		{
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $path_to permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $path_to permission denied!");
+			}
 			return false;	// no permission or parent-dir does not exist
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
@@ -632,14 +710,20 @@ 
 			self::_remove_password($url_from);
 			self::_remove_password($url_to);
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $path_to is $is_dir directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) $path_to is $is_dir directory!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !static::unlink($url_to,$operation))
 		{
 			self::_remove_password($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;
 		}
 		unset(self::$stat_cache[$path_from]);
@@ -677,7 +761,10 @@ 
 	{
 		$maxdepth=10;
 		$depth2propagate = (int)$depth + 1;
-		if ($depth2propagate > $maxdepth) return is_dir($pathname);
+		if ($depth2propagate > $maxdepth)
+		{
+			return is_dir($pathname);
+		}
     	is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
     	return is_dir($pathname) || @mkdir($pathname, $mode);
 	}
@@ -695,14 +782,23 @@ 
 	 */
 	static function mkdir ( $url, $mode, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$mode,$options)");
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__." called from:".function_backtrace());
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$mode,$options)");
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__." called from:".function_backtrace());
+		}
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (self::url_stat($path,STREAM_URL_STAT_QUIET))
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) already exist!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."('$url',$mode,$options) already exist!");
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error(__METHOD__."('$url',$mode,$options) already exist!",E_USER_WARNING);
@@ -712,21 +808,30 @@ 
 		if (!($parent_path = Vfs::dirname($path)))
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) dirname('$path')===false!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."('$url',$mode,$options) dirname('$path')===false!");
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error(__METHOD__."('$url',$mode,$options) dirname('$path')===false!", E_USER_WARNING);
 			}
 			return false;
 		}
-		if (($query = Vfs::parse_url($url,PHP_URL_QUERY))) $parent_path .= '?'.$query;
+		if (($query = Vfs::parse_url($url,PHP_URL_QUERY)))
+		{
+			$parent_path .= '?'.$query;
+		}
 		$parent = self::url_stat($parent_path,STREAM_URL_STAT_QUIET);
 
 		// check if we should also create all non-existing path components and our parent does not exist,
 		// if yes call ourself recursive with the parent directory
 		if (($options & STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent)
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__." creating parents: $parent_path, $mode");
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__." creating parents: $parent_path, $mode");
+			}
 			if (!self::mkdir($parent_path,$mode,$options))
 			{
 				return false;
@@ -736,7 +841,10 @@ 
 		if (!$parent || !Vfs::check_access($parent_path,Vfs::WRITABLE,$parent))
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."('$url',$mode,$options) permission denied!");
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error(__METHOD__."('$url',$mode,$options) permission denied!",E_USER_WARNING);
@@ -770,10 +878,13 @@ 
 				'fs_dir'  => $parent['ino'],
 				'fs_active' => self::_pdo_boolean(true),
 				'fs_name' => self::limit_filename(Vfs::basename($path)),
-			)) && $stmt->fetchColumn() > 1)	// if there's more then one --> remove our new dir
+			)) && $stmt->fetchColumn() > 1)
+			{
+				// if there's more then one --> remove our new dir
 			{
 				self::$pdo->query('DELETE FROM '.self::TABLE.' WHERE fs_id='.$new_fs_id);
 			}
+			}
 		}
 		return $ok;
 	}
@@ -790,7 +901,10 @@ 
 	 */
 	static function rmdir ( $url, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
@@ -801,7 +915,10 @@ 
 			self::_remove_password($url);
 			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' :
 				($stat['mime'] != self::DIR_MIME_TYPE ? 'not a directory!' : 'permission denied!'));
-			if (self::LOG_LEVEL) error_log($err_msg);
+			if (self::LOG_LEVEL)
+			{
+				error_log($err_msg);
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error($err_msg,E_USER_WARNING);
@@ -813,7 +930,10 @@ 
 		if ($stmt->fetchColumn())
 		{
 			self::_remove_password($url);
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$options) dir is not empty!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$options) dir is not empty!");
+			}
 			if (!($options & STREAM_REPORT_ERRORS))
 			{
 				trigger_error(__METHOD__."('$url',$options) dir is not empty!",E_USER_WARNING);
@@ -845,7 +965,10 @@ 
 	static function touch($url,$time=null,$atime=null)
 	{
 		unset($atime);	// not used
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $time)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url, $time)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
@@ -881,25 +1004,37 @@ 
 	 */
 	static function chown($url,$owner)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$owner)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (!($stat = self::url_stat($path,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) no such file or directory!");
+			}
 			trigger_error("No such file or directory $url !",E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::$is_root)
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only root can do that!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) only root can do that!");
+			}
 			trigger_error("Only root can do that!",E_USER_WARNING);
 			return false;
 		}
-		if ($owner < 0 || $owner && !$GLOBALS['egw']->accounts->id2name($owner))	// not a user (0 == root)
+		if ($owner < 0 || $owner && !$GLOBALS['egw']->accounts->id2name($owner))
+		{
+			// not a user (0 == root)
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) user id!");
+		}
 			trigger_error(__METHOD__."($url,$owner) Unknown (numeric) user id!",E_USER_WARNING);
 			//throw new Exception(__METHOD__."($url,$owner) Unknown (numeric) user id!");
 			return false;
@@ -907,7 +1042,10 @@ 
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_uid=:fs_uid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path,-1) == '/')
+		{
+			$path = substr($path, 0, -1);
+		}
 		self::$stat_cache[$path]['fs_uid'] = $owner;
 
 		return $stmt->execute(array(
@@ -925,34 +1063,53 @@ 
 	 */
 	static function chgrp($url,$owner)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$owner)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$owner)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (!($stat = self::url_stat($path,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) no such file or directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) no such file or directory!");
+			}
 			trigger_error("No such file or directory $url !",E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::has_owner_rights($path,$stat))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) only owner or root can do that!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$owner) only owner or root can do that!");
+			}
 			trigger_error("Only owner or root can do that!",E_USER_WARNING);
 			return false;
 		}
-		if ($owner < 0) $owner = -$owner;	// sqlfs uses a positiv group id's!
+		if ($owner < 0)
+		{
+			$owner = -$owner;
+		}
+		// sqlfs uses a positiv group id's!
 
-		if ($owner && !$GLOBALS['egw']->accounts->id2name(-$owner))	// not a group
+		if ($owner && !$GLOBALS['egw']->accounts->id2name(-$owner))
+		{
+			// not a group
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) group id!");
+		}
 			trigger_error("Unknown (numeric) group id!",E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_gid=:fs_gid WHERE fs_id=:fs_id');
 
 		// update stat-cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path,-1) == '/')
+		{
+			$path = substr($path, 0, -1);
+		}
 		self::$stat_cache[$path]['fs_gid'] = $owner;
 
 		return $stmt->execute(array(
@@ -970,32 +1127,47 @@ 
 	 */
 	static function chmod($url,$mode)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url, $mode)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url, $mode)");
+		}
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
 		if (!($stat = self::url_stat($path,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no such file or directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url, $mode) no such file or directory!");
+			}
 			trigger_error("No such file or directory $url !",E_USER_WARNING);
 			return false;
 		}
 		if (!Vfs::has_owner_rights($path,$stat))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) only owner or root can do that!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url, $mode) only owner or root can do that!");
+			}
 			trigger_error("Only owner or root can do that!",E_USER_WARNING);
 			return false;
 		}
-		if (!is_numeric($mode))	// not a mode
+		if (!is_numeric($mode))
+		{
+			// not a mode
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url, $mode) no (numeric) mode!");
+		}
 			trigger_error("No (numeric) mode!",E_USER_WARNING);
 			return false;
 		}
 		$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_mode=:fs_mode WHERE fs_id=:fs_id');
 
 		// update stat cache
-		if ($path != '/' && substr($path,-1) == '/') $path = substr($path, 0, -1);
+		if ($path != '/' && substr($path,-1) == '/')
+		{
+			$path = substr($path, 0, -1);
+		}
 		self::$stat_cache[$path]['fs_mode'] = ((int) $mode) & 0777;
 
 		return $stmt->execute(array(
@@ -1020,11 +1192,17 @@ 
 
 		if (!($stat = self::url_stat($url,0)) || 		// dir not found
 			$stat['mime'] != self::DIR_MIME_TYPE ||		// no dir
-			!Vfs::check_access($url,Vfs::EXECUTABLE|Vfs::READABLE,$stat))	// no access
+			!Vfs::check_access($url,Vfs::EXECUTABLE|Vfs::READABLE,$stat))
+		{
+			// no access
 		{
 			self::_remove_password($url);
+		}
 			$msg = $stat['mime'] != self::DIR_MIME_TYPE ? "$url is no directory" : 'permission denied';
-			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$options) $msg!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."('$url',$options) $msg!");
+			}
 			$this->opened_dir = null;
 			return false;
 		}
@@ -1033,7 +1211,10 @@ 
 			' FROM '.self::TABLE.' WHERE fs_dir=? AND fs_active='.self::_pdo_boolean(true).
 			" ORDER BY fs_mime='httpd/unix-directory' DESC, fs_name ASC";
 		//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$options)".' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__."($url,$options)".' */ '.$query;
+		}
 
 		$stmt = self::$pdo->prepare($query);
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
@@ -1045,7 +1226,10 @@ 
 				self::$stat_cache[Vfs::concat($path,$file['fs_name'])] = $file;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options): ".implode(', ',$this->opened_dir));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$options): ".implode(', ',$this->opened_dir));
+		}
 		reset($this->opened_dir);
 
 		return true;
@@ -1084,9 +1268,16 @@ 
 		if (is_null($max_subquery_depth))
 		{
 			$max_subquery_depth = $GLOBALS['egw_info']['server']['max_subquery_depth'];
-			if (!$max_subquery_depth) $max_subquery_depth = 7;	// setting current default of 7, if nothing set
+			if (!$max_subquery_depth)
+			{
+				$max_subquery_depth = 7;
+			}
+			// setting current default of 7, if nothing set
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$url',$flags,$eacl_access)");
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags,$eacl_access)");
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
@@ -1152,7 +1343,10 @@ 
 						if (!Vfs::$user)
 						{
 							self::_remove_password($url);
-							if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags) permission denied, no user-id and not root!");
+							if (self::LOG_LEVEL > 1)
+							{
+								error_log(__METHOD__."('$url',$flags) permission denied, no user-id and not root!");
+							}
 							return false;
 						}
 						$query .= ' AND '.self::_sql_readable();
@@ -1163,7 +1357,10 @@ 
 					$query = str_replace('fs_name'.self::$case_sensitive_equal.'?','fs_name'.self::$case_sensitive_equal.self::$pdo->quote($name),$base_query).'('.$query.')';
 				}
 			}
-			if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__."($url,$flags,$eacl_access)".' */ '.$query;
+			if (self::LOG_LEVEL > 2)
+			{
+				$query = '/* '.__METHOD__."($url,$flags,$eacl_access)".' */ '.$query;
+			}
 			//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 			if (!($result = self::$pdo->query($query)) || !($info = $result->fetch(\PDO::FETCH_ASSOC)))
@@ -1186,12 +1383,18 @@ 
 			$GLOBALS['egw_info']['server']['max_subquery_depth'] = --$max_subquery_depth;
 			error_log(__METHOD__."() decremented max_subquery_depth to $max_subquery_depth");
 			Api\Config::save_value('max_subquery_depth', $max_subquery_depth, 'phpgwapi');
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) $GLOBALS['egw']->invalidate_session_cache();
+			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
 			return self::url_stat($url, $flags, $eacl_access);
 		}
 		self::$stat_cache[$path] = $info;
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags)=".array2string($info));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$flags)=".array2string($info));
+		}
 		return self::_vfsinfo2stat($info);
 	}
 
@@ -1228,9 +1431,15 @@ 
 	 */
 	function dir_readdir ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( )");
+		}
 
-		if (!is_array($this->opened_dir)) return false;
+		if (!is_array($this->opened_dir))
+		{
+			return false;
+		}
 
 		$file = current($this->opened_dir); next($this->opened_dir);
 
@@ -1247,9 +1456,15 @@ 
 	 */
 	function dir_rewinddir ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( )");
+		}
 
-		if (!is_array($this->opened_dir)) return false;
+		if (!is_array($this->opened_dir))
+		{
+			return false;
+		}
 
 		reset($this->opened_dir);
 
@@ -1265,9 +1480,15 @@ 
 	 */
 	function dir_closedir ( )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( )");
+		}
 
-		if (!is_array($this->opened_dir)) return false;
+		if (!is_array($this->opened_dir))
+		{
+			return false;
+		}
 
 		$this->opened_dir = null;
 
@@ -1286,7 +1507,10 @@ 
 	{
 		$link = !($lstat = self::url_stat($path,STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = $link");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$path') = $link");
+		}
 
 		return $link;
 	}
@@ -1300,22 +1524,34 @@ 
 	 */
 	static function symlink($target,$link)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$target','$link')");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$target','$link')");
+		}
 
 		if (self::url_stat($link,0))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') $link exists, returning false!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."('$target','$link') $link exists, returning false!");
+			}
 			return false;	// $link already exists
 		}
 		if (!($dir = Vfs::dirname($link)) ||
 			!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=static::url_stat($dir,0)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!is_writable('$dir'), dir_stat=".array2string($dir_stat).")");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."('$target','$link') returning false! (!is_writable('$dir'), dir_stat=".array2string($dir_stat).")");
+			}
 			return false;	// parent dir does not exist or is not writable
 		}
 		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_link'.
 			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_link)';
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		}
 		$stmt = self::$pdo->prepare($query);
 		unset(self::$stat_cache[Vfs::parse_url($link,PHP_URL_PATH)]);
 
@@ -1363,7 +1599,10 @@ 
 				break;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$check) ".($access?"access granted by $path=$rights":'no access!!!'));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$check) ".($access?"access granted by $path=$rights":'no access!!!'));
+		}
 		return $access;
 	}
 
@@ -1391,11 +1630,15 @@ 
 			}
 		}
 		// sort by length descending, to allow more specific pathes to have precedence
-		uksort(self::$extended_acl, function($a,$b) {
+		uksort(self::$extended_acl, function($a,$b)
+		{
 			return strlen($b)-strlen($a);
 		});
 		Api\Cache::setSession(self::EACL_APPNAME, 'extended_acl', self::$extended_acl);
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() '.array2string(self::$extended_acl));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'() '.array2string(self::$extended_acl));
+		}
 	}
 
 	/**
@@ -1424,12 +1667,18 @@ 
 		{
 			if (!($stat = self::url_stat($path,0)))
 			{
-				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) no such file or directory!");
+				if (self::LOG_LEVEL)
+				{
+					error_log(__METHOD__."($path,$rights,$owner,$fs_id) no such file or directory!");
+				}
 				return false;	// $path not found
 			}
-			if (!Vfs::has_owner_rights($path,$stat))		// not group dir and user is eGW admin
+			if (!Vfs::has_owner_rights($path,$stat))
+			{
+				// not group dir and user is eGW admin
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($path,$rights,$owner,$fs_id) permission denied!");
+			}
 				return false;	// permission denied
 			}
 			$fs_id = $stat['ino'];
@@ -1462,7 +1711,10 @@ 
 		{
 			Api\Cache::setSession(self::EACL_APPNAME, 'extended_acl', self::$extended_acl);
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$rights,$owner,$fs_id)=".(int)$ret);
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($path,$rights,$owner,$fs_id)=".(int)$ret);
+		}
 		return $ret;
 	}
 
@@ -1496,7 +1748,8 @@ 
 			$eacls = array_merge((array)self::get_eacl($path),$eacls);
 		}
 		// sort by length descending, to show precedence
-		usort($eacls, function($a, $b) {
+		usort($eacls, function($a, $b)
+		{
 			return strlen($b['path']) - strlen($a['path']);
 		});
 		//error_log(__METHOD__."('$_path') returning ".array2string($eacls));
@@ -1514,7 +1767,10 @@ 
 	 */
 	static function id2path($fs_ids)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')');
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($fs_ids).')');
+		}
 		$ids = (array)$fs_ids;
 		$pathes = array();
 		// first check our stat-cache for the ids
@@ -1526,16 +1782,26 @@ 
 				unset($ids[$key]);
 				if (!$ids)
 				{
-					if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes).' *from stat_cache*');
+					if (self::LOG_LEVEL > 1)
+					{
+						error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes).' *from stat_cache*');
+					}
 					return is_array($fs_ids) ? $pathes : array_shift($pathes);
 				}
 			}
 		}
 		// now search via the database
-		if (count($ids) > 1) array_map(function(&$v) { $v = (int)$v; },$ids);
+		if (count($ids) > 1)
+		{
+			array_map(function(&$v) { $v = (int)$v;
+		}
+		},$ids);
 		$query = 'SELECT fs_id,fs_dir,fs_name FROM '.self::TABLE.' WHERE fs_id'.
 			(count($ids) == 1 ? '='.(int)$ids[0] : ' IN ('.implode(',',$ids).')');
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		}
 
 		if (!is_object(self::$pdo))
 		{
@@ -1562,14 +1828,20 @@ 
 		{
 			return false;	// parent not found, should never happen ...
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__." trying foreach with:".print_r($rows,true)."#");
+		}
 		foreach((array)$rows as $fs_id => $row)
 		{
 			$parent = $row['fs_dir'] > 1 ? $parents[$row['fs_dir']] : '';
 
 			$pathes[$fs_id] = $parent . '/' . $row['fs_name'];
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($fs_ids).')='.array2string($pathes));
+		}
 		return is_array($fs_ids) ? $pathes : array_shift($pathes);
 	}
 
@@ -1625,7 +1897,10 @@ 
 			'mime'  => $info['fs_mime'],
 			'readlink' => $info['fs_link'],
 		);
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($info[name]) = ".array2string($stat));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($info[name]) = ".array2string($stat));
+		}
 		return $stat;
 	}
 
@@ -1657,13 +1932,16 @@ 
 		}
 		if (!isset($GLOBALS['egw_info']['server']['files_dir']))
 		{
-			if (is_object($GLOBALS['egw_setup']->db))	// if we run under setup, query the db for the files dir
+			if (is_object($GLOBALS['egw_setup']->db))
+			{
+				// if we run under setup, query the db for the files dir
 			{
 				$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
 					'config_name' => 'files_dir',
 					'config_app' => 'phpgwapi',
 				),__LINE__,__FILE__)->fetchColumn();
 			}
+			}
 		}
 		if (!$GLOBALS['egw_info']['server']['files_dir'])
 		{
@@ -1675,7 +1953,11 @@ 
 		{
 			$hash[] = sprintf('%02d',$n % self::HASH_MAX);
 		}
-		if (!$hash) $hash[] = '00';		// we need at least one directory, to not conflict with the dir-names
+		if (!$hash)
+		{
+			$hash[] = '00';
+		}
+		// we need at least one directory, to not conflict with the dir-names
 		array_unshift($hash,$id);
 
 		$path = '/sqlfs/'.implode('/',array_reverse($hash));
@@ -1737,7 +2019,10 @@ 
 	 */
 	static function proppatch($path,array $props)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."(".array2string($path).','.array2string($props));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."(".array2string($path).','.array2string($props));
+		}
 		if (!is_numeric($path))
 		{
 			if (!($stat = self::url_stat($path,0)))
@@ -1757,13 +2042,19 @@ 
 		$ins_stmt = $del_stmt = null;
 		foreach($props as &$prop)
 		{
-			if (!isset($prop['ns'])) $prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
+			if (!isset($prop['ns']))
+			{
+				$prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
+			}
 
-			if (!isset($prop['val']) || self::$pdo_type != 'mysql')	// for non mysql, we have to delete the prop anyway, as there's no REPLACE!
+			if (!isset($prop['val']) || self::$pdo_type != 'mysql')
+			{
+				// for non mysql, we have to delete the prop anyway, as there's no REPLACE!
 			{
 				if (!isset($del_stmt))
 				{
 					$del_stmt = self::$pdo->prepare('DELETE FROM '.self::PROPS_TABLE.' WHERE fs_id=:fs_id AND prop_namespace=:prop_namespace AND prop_name=:prop_name');
+			}
 				}
 				$del_stmt->execute(array(
 					'fs_id'          => $id,
@@ -1809,17 +2100,27 @@ 
 			{
 				if (!($stat = self::url_stat($id,0)))
 				{
-					if (self::LOG_LEVEL) error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
+					if (self::LOG_LEVEL)
+					{
+						error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
+					}
 					return false;
 				}
 				$id = $stat['ino'];
 			}
 		}
-		if (count($ids) >= 1) array_map(function(&$v) { $v = (int)$v; },$ids);
+		if (count($ids) >= 1)
+		{
+			array_map(function(&$v) { $v = (int)$v;
+		}
+		},$ids);
 		$query = 'SELECT * FROM '.self::PROPS_TABLE.' WHERE (fs_id'.
 			(count($ids) == 1 ? '='.(int)implode('',$ids) : ' IN ('.implode(',',$ids).')').')'.
 			(!is_null($ns) ? ' AND prop_namespace=?' : '');
-		if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		if (self::LOG_LEVEL > 2)
+		{
+			$query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
+		}
 
 		$stmt = self::$pdo->prepare($query);
 		$stmt->setFetchMode(\PDO::FETCH_ASSOC);
@@ -1838,11 +2139,14 @@ 
 		{
 			$props = $props[$row['fs_id']] ? $props[$row['fs_id']] : array();	// return empty array for no props
 		}
-		elseif ($props && isset($stat))	// need to map fs_id's to pathes
+		elseif ($props && isset($stat))
+		{
+			// need to map fs_id's to pathes
 		{
 			foreach(self::id2path(array_keys($props)) as $id => $path)
 			{
 				$props[$path] =& $props[$id];
+		}
 				unset($props[$id]);
 			}
 		}

api/src/Vfs/Sqlfs/Utils.php

Spacing +43 added lines, -44 removed lines

@@ -26,7 +26,7 @@ 
 	 *
 	 * @param boolean $debug true to echo a message for each copied file
 	 */
-	static function migrate_db2fs($debug=true)
+	static function migrate_db2fs($debug = true)
 	{
 		if (!is_object(self::$pdo))
 		{
@@ -40,15 +40,15 @@ 
 		$fs_id = $fs_name = $fs_size = $fs_content = null;
 		$n = 0;
 		$stmt = self::$pdo->prepare($query);
-		$stmt->bindColumn(1,$fs_id);
-		$stmt->bindColumn(2,$fs_name);
-		$stmt->bindColumn(3,$fs_size);
-		$stmt->bindColumn(4,$fs_content,\PDO::PARAM_LOB);
+		$stmt->bindColumn(1, $fs_id);
+		$stmt->bindColumn(2, $fs_name);
+		$stmt->bindColumn(3, $fs_size);
+		$stmt->bindColumn(4, $fs_content, \PDO::PARAM_LOB);
 		$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 
 		while ($stmt->execute())
 		{
-			foreach($stmt as $row)
+			foreach ($stmt as $row)
 			{
 				// hack to work around a current php bug (http://bugs.php.net/bug.php?id=40913)
 				// PDOStatement::bindColumn(,,\PDO::PARAM_LOB) is not working for MySQL, content is returned as string :-(
@@ -68,15 +68,15 @@ 
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name, $fs_size bytes) content is NO resource! ".array2string($content));
 				}
 				$filename = self::_fs_path($fs_id);
-				if (!file_exists($fs_dir=Vfs::dirname($filename)))
+				if (!file_exists($fs_dir = Vfs::dirname($filename)))
 				{
-					self::mkdir_recursive($fs_dir,0700,true);
+					self::mkdir_recursive($fs_dir, 0700, true);
 				}
-				if (!($dest = fopen($filename,'w')))
+				if (!($dest = fopen($filename, 'w')))
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fopen($filename,'w') failed!");
 				}
-				if (($bytes = stream_copy_to_stream($content,$dest)) != $fs_size)
+				if (($bytes = stream_copy_to_stream($content, $dest)) != $fs_size)
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name) $bytes bytes copied != size of $fs_size bytes!");
 				}
@@ -86,11 +86,11 @@ 
 
 				++$n;
 			}
-			if (!$n) break;	// just in case nothing is found, statement will execute just fine
+			if (!$n) break; // just in case nothing is found, statement will execute just fine
 
 			$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 		}
-		unset($row);	// not used, as we access bound variables
+		unset($row); // not used, as we access bound variables
 		unset($stmt);
 
 		if ($n)	// delete all content in DB, if there was some AND no error (exception thrown!)
@@ -108,14 +108,14 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	public static function fsck($check_only=true)
+	public static function fsck($check_only = true)
 	{
 		if (!is_object(self::$pdo))
 		{
 			self::_pdo();
 		}
 		$msgs = array();
-		foreach(array(
+		foreach (array(
 			self::fsck_fix_required_nodes($check_only),
 			self::fsck_fix_multiple_active($check_only),
 			self::fsck_fix_unconnected($check_only),
@@ -141,7 +141,7 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_required_nodes($check_only=true)
+	private static function fsck_fix_required_nodes($check_only = true)
 	{
 		static $dirs = array(
 			'/' => 1,
@@ -150,7 +150,7 @@ 
 		);
 		$stmt = $delete_stmt = null;
 		$msgs = array();
-		foreach($dirs as $path => $id)
+		foreach ($dirs as $path => $id)
 		{
 			if (!($stat = self::url_stat($path, STREAM_URL_STAT_LINK)))
 			{
@@ -168,7 +168,7 @@ 
 					try {
 						$ok = $stmt->execute($data = array(
 							'fs_id' => $id,
-							'fs_name' => substr($path,1),
+							'fs_name' => substr($path, 1),
 							'fs_dir'  => $path == '/' ? 0 : $dirs['/'],
 							'fs_mode' => 05,
 							'fs_uid' => 0,
@@ -183,7 +183,7 @@ 
 					catch (\PDOException $e)
 					{
 						$ok = false;
-						unset($e);	// ignore exception
+						unset($e); // ignore exception
 					}
 					if (!$ok)	// can not insert it, try deleting it first
 					{
@@ -196,15 +196,14 @@ 
 						}
 						catch (\PDOException $e)
 						{
-							unset($e);	// ignore exception
+							unset($e); // ignore exception
 						}
 					}
-					$msgs[] = $ok ? lang('Required directory "%1" created.', $path) :
-						lang('Failed to create required directory "%1"!', $path);
+					$msgs[] = $ok ? lang('Required directory "%1" created.', $path) : lang('Failed to create required directory "%1"!', $path);
 				}
 			}
 			// check if directory is at least world readable and executable (r-x), we allow more but not less
-			elseif (($stat['mode'] & 05) != 05)
+			elseif (($stat['mode']&05) != 05)
 			{
 				if ($check_only)
 				{
@@ -244,20 +243,20 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_no_content($check_only=true)
+	private static function fsck_fix_no_content($check_only = true)
 	{
 		$stmt = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs_id FROM '.self::TABLE.
+		foreach (self::$pdo->query('SELECT fs_id FROM '.self::TABLE.
 			" WHERE fs_mime!='httpd/unix-directory' AND fs_content IS NULL AND fs_link IS NULL") as $row)
 		{
-			if (!file_exists($phy_path=self::_fs_path($row['fs_id'])))
+			if (!file_exists($phy_path = self::_fs_path($row['fs_id'])))
 			{
 				$path = self::id2path($row['fs_id']);
 				if ($check_only)
 				{
 					$msgs[] = lang('File %1 has no content in physical filesystem %2!',
-						$path.' (#'.$row['fs_id'].')',$phy_path);
+						$path.' (#'.$row['fs_id'].')', $phy_path);
 				}
 				else
 				{
@@ -269,12 +268,12 @@ 
 					if ($stmt->execute(array('fs_id' => $row['fs_id'])) &&
 						$stmt_props->execute(array('fs_id' => $row['fs_id'])))
 					{
-						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> file removed!',$path,$phy_path);
+						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> file removed!', $path, $phy_path);
 					}
 					else
 					{
 						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> failed to remove file!',
-							$path.' (#'.$row['fs_id'].')',$phy_path);
+							$path.' (#'.$row['fs_id'].')', $phy_path);
 					}
 				}
 			}
@@ -304,11 +303,11 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_unconnected($check_only=true)
+	private static function fsck_fix_unconnected($check_only = true)
 	{
 		$lostnfound = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs.* FROM '.self::TABLE.' fs'.
+		foreach (self::$pdo->query('SELECT fs.* FROM '.self::TABLE.' fs'.
 			' LEFT JOIN '.self::TABLE.' dir ON dir.fs_id=fs.fs_dir'.
 			' WHERE fs.fs_id > 1 AND dir.fs_id IS NULL') as $row)
 		{
@@ -327,14 +326,14 @@ 
 					Vfs::$is_root = true;
 					if (!self::mkdir(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD, 0) ||
 						!(!($admins = $GLOBALS['egw']->accounts->name2id(self::LOST_N_FOUND_GRP)) ||
-						   self::chgrp(self::LOST_N_FOUND, $admins) && self::chmod(self::LOST_N_FOUND,self::LOST_N_FOUND_MOD)) ||
+						   self::chgrp(self::LOST_N_FOUND, $admins) && self::chmod(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD)) ||
 						!($lostnfound = self::url_stat(self::LOST_N_FOUND, STREAM_URL_STAT_QUIET)))
 					{
-						$msgs[] = lang("Can't create directory %1 to connect found unconnected nodes to it!",self::LOST_N_FOUND);
+						$msgs[] = lang("Can't create directory %1 to connect found unconnected nodes to it!", self::LOST_N_FOUND);
 					}
 					else
 					{
-						$msgs[] = lang('Successful created new directory %1 for unconnected nods.',self::LOST_N_FOUND);
+						$msgs[] = lang('Successful created new directory %1 for unconnected nods.', self::LOST_N_FOUND);
 					}
 					Vfs::$is_root = false;
 					if (!$lostnfound) break;
@@ -359,7 +358,7 @@ 
 		}
 		if ($check_only && $msgs)
 		{
-			$msgs[] = lang('Unconnected nodes will be moved to %1.',self::LOST_N_FOUND);
+			$msgs[] = lang('Unconnected nodes will be moved to %1.', self::LOST_N_FOUND);
 		}
 		return $msgs;
 	}
@@ -372,20 +371,20 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_multiple_active($check_only=true)
+	private static function fsck_fix_multiple_active($check_only = true)
 	{
 		$stmt = $inactivate_msg_added = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs_dir,fs_name,COUNT(*) FROM '.self::TABLE.
+		foreach (self::$pdo->query('SELECT fs_dir,fs_name,COUNT(*) FROM '.self::TABLE.
 			' WHERE fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory'".
-			' GROUP BY fs_dir,'.(self::$pdo_type == 'mysql' ? 'BINARY ' : '').'fs_name'.	// fs_name is casesensitive!
+			' GROUP BY fs_dir,'.(self::$pdo_type == 'mysql' ? 'BINARY ' : '').'fs_name'.// fs_name is casesensitive!
 			' HAVING COUNT(*) > 1') as $row)
 		{
 			if (!isset($stmt))
 			{
 				$stmt = self::$pdo->prepare('SELECT *,(SELECT COUNT(*) FROM '.self::TABLE.' sub WHERE sub.fs_dir=fs.fs_id) AS children'.
 					' FROM '.self::TABLE.' fs'.
-					' WHERE fs.fs_dir=:fs_dir AND (fs.fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory')" .
+					' WHERE fs.fs_dir=:fs_dir AND (fs.fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory')".
 					' AND fs.fs_name'.self::$case_sensitive_equal.':fs_name'.
 					" ORDER BY fs.fs_mime='httpd/unix-directory' DESC,fs.fs_active DESC,children DESC,fs.fs_modified DESC");
 				$inactivate_stmt = self::$pdo->prepare('UPDATE '.self::TABLE.
@@ -399,14 +398,14 @@ 
 				'fs_dir'  => $row['fs_dir'],
 				'fs_name' => $row['fs_name'],
 			));
-			foreach($stmt as $n => $entry)
+			foreach ($stmt as $n => $entry)
 			{
 				if ($entry['fs_mime'] == 'httpd/unix-directory')
 				{
 					// by sorting active directores first (fs.fs_active DESC), we make sure active one is kept
 					if (!$n)
 					{
-						$dir = $entry;	// directory to keep
+						$dir = $entry; // directory to keep
 						$msgs[] = lang('%1 directories %2 found!', $row[2], self::id2path($entry['fs_id']));
 						if ($check_only) break;
 					}
@@ -422,7 +421,7 @@ 
 							$dir['children'] += $children;
 						}
 						self::$pdo->query('DELETE FROM '.self::TABLE.' WHERE fs_id='.(int)$entry['fs_id']);
-						$msgs[] = lang('Removed (now) empty directory fs_id=%1',$entry['fs_id']);
+						$msgs[] = lang('Removed (now) empty directory fs_id=%1', $entry['fs_id']);
 					}
 				}
 				elseif (isset($dir))	// file and directory with same name exist!
@@ -438,9 +437,9 @@ 
 					}
 					else
 					{
-						$cnt = ucfirst(lang('none of %1', $row[2]-1));
+						$cnt = ucfirst(lang('none of %1', $row[2] - 1));
 					}
-					$msgs[] = lang('%1 active file(s) with same name as directory inactivated!',$cnt);
+					$msgs[] = lang('%1 active file(s) with same name as directory inactivated!', $cnt);
 					break;
 				}
 				else	// newest file --> set for all other fs_active=false
@@ -456,7 +455,7 @@ 
 					}
 					else
 					{
-						$cnt = lang('none of %1', $row[2]-1);
+						$cnt = lang('none of %1', $row[2] - 1);
 					}
 					$msgs[] = lang('More then one active file %1 found, inactivating %2 older revisions!',
 						self::id2path($entry['fs_id']), $cnt);

Braces +41 added lines, -10 removed lines

@@ -80,22 +80,32 @@ 
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name) $bytes bytes copied != size of $fs_size bytes!");
 				}
-				if ($debug) error_log("$fs_id: $fs_name: $bytes bytes copied to fs");
+				if ($debug)
+				{
+					error_log("$fs_id: $fs_name: $bytes bytes copied to fs");
+				}
 				fclose($dest);
 				fclose($content); unset($content);
 
 				++$n;
 			}
-			if (!$n) break;	// just in case nothing is found, statement will execute just fine
+			if (!$n)
+			{
+				break;
+			}
+			// just in case nothing is found, statement will execute just fine
 
 			$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 		}
 		unset($row);	// not used, as we access bound variables
 		unset($stmt);
 
-		if ($n)	// delete all content in DB, if there was some AND no error (exception thrown!)
+		if ($n)
+		{
+			// delete all content in DB, if there was some AND no error (exception thrown!)
 		{
 			$query = 'UPDATE '.self::TABLE.' SET fs_content=NULL';
+		}
 			$stmt = self::$pdo->prepare($query);
 			$stmt->execute();
 		}
@@ -122,7 +132,10 @@ 
 			self::fsck_fix_no_content($check_only),
 		) as $check_msgs)
 		{
-			if ($check_msgs) $msgs = array_merge($msgs, $check_msgs);
+			if ($check_msgs)
+			{
+				$msgs = array_merge($msgs, $check_msgs);
+			}
 		}
 
 		foreach (Api\Hooks::process(array(
@@ -130,7 +143,10 @@ 
 			'check_only' => $check_only)
 		) as $app_msgs)
 		{
-			if ($app_msgs) $msgs = array_merge($msgs, $app_msgs);
+			if ($app_msgs)
+			{
+				$msgs = array_merge($msgs, $app_msgs);
+			}
 		}
 		return $msgs;
 	}
@@ -185,11 +201,14 @@ 
 						$ok = false;
 						unset($e);	// ignore exception
 					}
-					if (!$ok)	// can not insert it, try deleting it first
+					if (!$ok)
+					{
+						// can not insert it, try deleting it first
 					{
 						if (!isset($delete_stmt))
 						{
 							$delete_stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
+					}
 						}
 						try {
 							$ok = $delete_stmt->execute(array('fs_id' => $id)) && $stmt->execute($data);
@@ -231,7 +250,10 @@ 
 		if (!$check_only && $msgs)
 		{
 			global $oProc;
-			if (!isset($oProc)) $oProc = new Api\Db\Schema();
+			if (!isset($oProc))
+			{
+				$oProc = new Api\Db\Schema();
+			}
 			// PostgreSQL seems to require to update the sequenz, after manually inserting id's
 			$oProc->UpdateSequence('egw_sqlfs', 'fs_id');
 		}
@@ -337,7 +359,10 @@ 
 						$msgs[] = lang('Successful created new directory %1 for unconnected nods.',self::LOST_N_FOUND);
 					}
 					Vfs::$is_root = false;
-					if (!$lostnfound) break;
+					if (!$lostnfound)
+					{
+						break;
+					}
 				}
 				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_dir=:fs_dir WHERE fs_id=:fs_id');
 			}
@@ -408,7 +433,10 @@ 
 					{
 						$dir = $entry;	// directory to keep
 						$msgs[] = lang('%1 directories %2 found!', $row[2], self::id2path($entry['fs_id']));
-						if ($check_only) break;
+						if ($check_only)
+						{
+							break;
+						}
 					}
 					else
 					{
@@ -425,7 +453,9 @@ 
 						$msgs[] = lang('Removed (now) empty directory fs_id=%1',$entry['fs_id']);
 					}
 				}
-				elseif (isset($dir))	// file and directory with same name exist!
+				elseif (isset($dir))
+				{
+					// file and directory with same name exist!
 				{
 					if (!$check_only)
 					{
@@ -434,6 +464,7 @@ 
 							'fs_name' => $row['fs_name'],
 							'fs_id'   => $dir['fs_id'],
 						));
+				}
 						$cnt = $inactivate_stmt->rowCount();
 					}
 					else

api/src/WebDAV/Tools/_parse_lockinfo.php

Indentation +203 added lines, -203 removed lines

@@ -43,209 +43,209 @@
  */
 class _parse_lockinfo
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
-
-    /**
-     * lock type, currently only "write"
-     *
-     * @var string
-     * @access public
-     */
-    var $locktype = "";
-
-    /**
-     * lock scope, "shared" or "exclusive"
-     *
-     * @var string
-     * @access public
-     */
-    var $lockscope = "";
-
-    /**
-     * lock owner information
-     *
-     * @var string
-     * @access public
-     */
-    var $owner = "";
-
-    /**
-     * flag that is set during lock owner read
-     *
-     * @var bool
-     * @access private
-     */
-    var $collect_owner = false;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of stream to read
-     * @access public
-     */
-    function __construct($path)
-    {
-        // we assume success unless problems occur
-        $this->success = true;
-
-        // remember if any input was parsed
-        $had_input = false;
-
-        // open stream
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        // create namespace aware parser
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        // set tag and data handlers
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        // we want a case sensitive parser
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        // parse input
-        while ($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
-
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        // check if required tags where found
-        $this->success &= !empty($this->locktype);
-        $this->success &= !empty($this->lockscope);
-
-        // free parser resource
-        xml_parser_free($xml_parser);
-
-        // close input stream
-        fclose($f_in);
-    }
-
-
-    /**
-     * tag start handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @param  array     tag attributes
-     * @return void
-     * @access private
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-
-        if ($this->collect_owner) {
-            // everything within the <owner> tag needs to be collected
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
-            // parse only the essential tags
-            switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
-            }
-        }
-    }
-
-    /**
-     * data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data)
-    {
-        // only the <owner> tag has data content
-        if ($this->collect_owner) {
-            $this->owner .= $data;
-        }
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-        // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
-            $this->collect_owner = false;
-        }
-
-        // within <owner> we have to collect everything
-        if ($this->collect_owner) {
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "</$ns_short$tag$ns_attr>";
-        }
-    }
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
+
+	/**
+	 * lock type, currently only "write"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $locktype = "";
+
+	/**
+	 * lock scope, "shared" or "exclusive"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $lockscope = "";
+
+	/**
+	 * lock owner information
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $owner = "";
+
+	/**
+	 * flag that is set during lock owner read
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $collect_owner = false;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of stream to read
+	 * @access public
+	 */
+	function __construct($path)
+	{
+		// we assume success unless problems occur
+		$this->success = true;
+
+		// remember if any input was parsed
+		$had_input = false;
+
+		// open stream
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		// create namespace aware parser
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		// set tag and data handlers
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		// we want a case sensitive parser
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		// parse input
+		while ($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
+
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		// check if required tags where found
+		$this->success &= !empty($this->locktype);
+		$this->success &= !empty($this->lockscope);
+
+		// free parser resource
+		xml_parser_free($xml_parser);
+
+		// close input stream
+		fclose($f_in);
+	}
+
+
+	/**
+	 * tag start handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @param  array     tag attributes
+	 * @return void
+	 * @access private
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+
+		if ($this->collect_owner) {
+			// everything within the <owner> tag needs to be collected
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "<$ns_short$tag$ns_attr>";
+		} else if ($ns == "DAV:") {
+			// parse only the essential tags
+			switch ($tag) {
+			case "write":
+				$this->locktype = $tag;
+				break;
+			case "exclusive":
+			case "shared":
+				$this->lockscope = $tag;
+				break;
+			case "owner":
+				$this->collect_owner = true;
+				break;
+			}
+		}
+	}
+
+	/**
+	 * data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data)
+	{
+		// only the <owner> tag has data content
+		if ($this->collect_owner) {
+			$this->owner .= $data;
+		}
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+		// <owner> finished?
+		if (($ns == "DAV:") && ($tag == "owner")) {
+			$this->collect_owner = false;
+		}
+
+		// within <owner> we have to collect everything
+		if ($this->collect_owner) {
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "</$ns_short$tag$ns_attr>";
+		}
+	}
 }
 
 ?>

Switch Indentation +10 added lines, -10 removed lines

@@ -179,16 +179,16 @@
         } else if ($ns == "DAV:") {
             // parse only the essential tags
             switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
+            	case "write":
+                	$this->locktype = $tag;
+                	break;
+            	case "exclusive":
+            	case "shared":
+                	$this->lockscope = $tag;
+                	break;
+            	case "owner":
+                	$this->collect_owner = true;
+                	break;
             }
         }
     }

Doc Comments +1 added lines

@@ -95,6 +95,7 @@
      *
      * @param  string  path of input stream
      * @param boolean $store_request =false if true whole request data will be made available in $this->request
+     * @param string $path
      * @access public
      */
     function __construct($path, $store_request=false)

Braces +45 added lines, -20 removed lines

@@ -99,7 +99,8 @@ 
 
         // open stream
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -119,16 +120,19 @@ 
                               XML_OPTION_CASE_FOLDING, false);
 
         // parse input
-        while ($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if (is_string($line)) {
+            if (is_string($line))
+            {
                 $had_input = true;
                 $this->success &= xml_parse($xml_parser, $line, false);
             }
         }
 
         // finish parsing
-        if ($had_input) {
+        if ($had_input)
+        {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -156,29 +160,40 @@ 
     function _startElement($parser, $name, $attrs)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
 
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             // everything within the <owner> tag needs to be collected
             $ns_short = "";
             $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }
             $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
+        }
+        else if ($ns == "DAV:")
+        {
             // parse only the essential tags
-            switch ($tag) {
+            switch ($tag)
+            {
             case "write":
                 $this->locktype = $tag;
                 break;
@@ -204,7 +219,8 @@ 
     function _data($parser, $data)
     {
         // only the <owner> tag has data content
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $this->owner .= $data;
         }
     }
@@ -220,26 +236,35 @@ 
     function _endElement($parser, $name)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
         // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
+        if (($ns == "DAV:") && ($tag == "owner"))
+        {
             $this->collect_owner = false;
         }
 
         // within <owner> we have to collect everything
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $ns_short = "";
             $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }