EGroupware / egroupware

api/src/Db/Deprecated.php

Indentation +81 added lines, -81 removed lines

@@ -41,19 +41,19 @@ 
 	var $Query_ID = 0;
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from, default 0
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
-	* @return ADORecordSet or false, if the query fails
-	* @throws EGroupware\Api\Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $offset row to start from, default 0
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
+	 * @return ADORecordSet or false, if the query fails
+	 * @throws EGroupware\Api\Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
+	 */
 	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=self::FETCH_BOTH, $reconnect=true)
 	{
 		// New query, discard previous result.
@@ -76,12 +76,12 @@ 
 	}
 
 	/**
-	* Escape strings before sending them to the database
-	*
-	* @deprecated use quote($value,$type='') instead
-	* @param string $str the string to be escaped
-	* @return string escaped sting
-	*/
+	 * Escape strings before sending them to the database
+	 *
+	 * @deprecated use quote($value,$type='') instead
+	 * @param string $str the string to be escaped
+	 * @return string escaped sting
+	 */
 	function db_addslashes($str)
 	{
 		if (!isset($str) || $str == '')
@@ -107,14 +107,14 @@ 
 	}
 
 	/**
-	* Move to the next row in the results set
-	*
-	* Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param int $fetch_mode self::FETCH_BOTH = numerical+assoc keys (eGW default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @return bool was another row found?
-	*/
+	 * Move to the next row in the results set
+	 *
+	 * Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param int $fetch_mode self::FETCH_BOTH = numerical+assoc keys (eGW default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @return bool was another row found?
+	 */
 	function next_record($fetch_mode=self::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
@@ -164,12 +164,12 @@ 
 	}
 
 	/**
-	* Move to position in result set
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param int $pos required row (optional), default first row
-	* @return boolean true if sucessful or false if not found
-	*/
+	 * Move to position in result set
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param int $pos required row (optional), default first row
+	 * @return boolean true if sucessful or false if not found
+	 */
 	function seek($pos = 0)
 	{
 		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
@@ -180,74 +180,74 @@ 
 	}
 
 	/**
-	* Lock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @param string $table name of table to lock
-	* @param string $mode type of lock required (optional), default write
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Lock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @param string $table name of table to lock
+	 * @param string $mode type of lock required (optional), default write
+	 * @return bool True if sucessful, False if fails
+	 */
 	function lock($table, $mode='write')
 	{
 		unset($table, $mode);	// not used anymore
 	}
 
 	/**
-	* Unlock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Unlock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @return bool True if sucessful, False if fails
+	 */
 	function unlock()
 	{}
 
 	/**
-	* Number of rows in current result set
-	*
-	* @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
-	* @return int number of rows
-	*/
+	 * Number of rows in current result set
+	 *
+	 * @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
+	 * @return int number of rows
+	 */
 	function num_rows()
 	{
 		return $this->Query_ID ? $this->Query_ID->RecordCount() : False;
 	}
 
 	/**
-	* Number of fields in current row
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @return int number of fields
-	*/
+	 * Number of fields in current row
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @return int number of fields
+	 */
 	function num_fields()
 	{
 		return $this->Query_ID ? $this->Query_ID->FieldCount() : False;
 	}
 
 	/**
-	* @deprecated use num_rows()
-	*/
+	 * @deprecated use num_rows()
+	 */
 	function nf()
 	{
 		return $this->num_rows();
 	}
 
 	/**
-	* @deprecated use print num_rows()
-	*/
+	 * @deprecated use print num_rows()
+	 */
 	function np()
 	{
 		print $this->num_rows();
 	}
 
 	/**
-	* Return the value of a column
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string|integer $Name name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	* @return string the field value
-	*/
+	 * Return the value of a column
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string|integer $Name name of field or positional index starting from 0
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 * @return string the field value
+	 */
 	function f($Name, $strip_slashes = False)
 	{
 		if ($strip_slashes)
@@ -258,26 +258,26 @@ 
 	}
 
 	/**
-	* Print the value of a field
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string $Name name of field to print
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	*/
+	 * Print the value of a field
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string $Name name of field to print
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 */
 	function p($Name, $strip_slashes = True)
 	{
 		print $this->f($Name, $strip_slashes);
 	}
 
 	/**
-	* Returns a query-result-row as an associative array (no numerical keys !!!)
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param bool $do_next_record should next_record() be called or not (default not)
-	* @param string $strip ='' string to strip of the column-name, default ''
-	* @return array/bool the associative array or False if no (more) result-row is availible
-	*/
+	 * Returns a query-result-row as an associative array (no numerical keys !!!)
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param bool $do_next_record should next_record() be called or not (default not)
+	 * @param string $strip ='' string to strip of the column-name, default ''
+	 * @return array/bool the associative array or False if no (more) result-row is availible
+	 */
 	function row($do_next_record=False,$strip='')
 	{
 		if ($do_next_record && !$this->next_record(self::FETCH_ASSOC) || !is_array($this->Record))

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
 	* @return ADORecordSet or false, if the query fails
 	* @throws EGroupware\Api\Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
 	*/
-	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=self::FETCH_BOTH, $reconnect=true)
+	function query($Query_String, $line = '', $file = '', $offset = 0, $num_rows = -1, $inputarr = false, $fetchmode = self::FETCH_BOTH, $reconnect = true)
 	{
 		// New query, discard previous result.
 		if ($this->Query_ID)
@@ -102,7 +102,7 @@ 
 	 */
 	function free()
 	{
-		unset($this->Query_ID);	// else copying of the db-object does not work
+		unset($this->Query_ID); // else copying of the db-object does not work
 		$this->Query_ID = 0;
 	}
 
@@ -115,7 +115,7 @@ 
 	* @param int $fetch_mode self::FETCH_BOTH = numerical+assoc keys (eGW default), self::FETCH_ASSOC or self::FETCH_NUM
 	* @return bool was another row found?
 	*/
-	function next_record($fetch_mode=self::FETCH_BOTH)
+	function next_record($fetch_mode = self::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
 		{
@@ -135,7 +135,7 @@ 
 		}
 		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')	// maxdb, oracle, ...
 		{
-			switch($fetch_mode)
+			switch ($fetch_mode)
 			{
 				case self::FETCH_ASSOC:
 					$this->Record = array_change_key_case($this->Record);
@@ -172,9 +172,9 @@ 
 	*/
 	function seek($pos = 0)
 	{
-		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
+		if (!$this->Query_ID || !$this->Query_ID->Move($this->Row = $pos))
 		{
-			throw new Exception("seek($pos) failed: resultset has " . $this->num_rows() . " rows");
+			throw new Exception("seek($pos) failed: resultset has ".$this->num_rows()." rows");
 		}
 		return True;
 	}
@@ -187,9 +187,9 @@ 
 	* @param string $mode type of lock required (optional), default write
 	* @return bool True if sucessful, False if fails
 	*/
-	function lock($table, $mode='write')
+	function lock($table, $mode = 'write')
 	{
-		unset($table, $mode);	// not used anymore
+		unset($table, $mode); // not used anymore
 	}
 
 	/**
@@ -278,18 +278,18 @@ 
 	* @param string $strip ='' string to strip of the column-name, default ''
 	* @return array/bool the associative array or False if no (more) result-row is availible
 	*/
-	function row($do_next_record=False,$strip='')
+	function row($do_next_record = False, $strip = '')
 	{
 		if ($do_next_record && !$this->next_record(self::FETCH_ASSOC) || !is_array($this->Record))
 		{
 			return False;
 		}
 		$result = array();
-		foreach($this->Record as $column => $value)
+		foreach ($this->Record as $column => $value)
 		{
 			if (!is_numeric($column))
 			{
-				if ($strip) $column = str_replace($strip,'',$column);
+				if ($strip) $column = str_replace($strip, '', $column);
 
 				$result[$column] = $value;
 			}

Braces +17 added lines, -5 removed lines

@@ -121,10 +121,13 @@ 
 		{
 			throw new Exception('next_record called with no query pending.');
 		}
-		if ($this->Row)	// first row is already fetched
+		if ($this->Row)
+		{
+			// first row is already fetched
 		{
 			$this->Query_ID->MoveNext();
 		}
+		}
 		++$this->Row;
 
 		$this->Record = $this->Query_ID->fields;
@@ -133,12 +136,15 @@ 
 		{
 			return False;
 		}
-		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')	// maxdb, oracle, ...
+		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')
+		{
+			// maxdb, oracle, ...
 		{
 			switch($fetch_mode)
 			{
 				case self::FETCH_ASSOC:
 					$this->Record = array_change_key_case($this->Record);
+		}
 					break;
 				case self::FETCH_NUM:
 					$this->Record = array_values($this->Record);
@@ -199,7 +205,8 @@ 
 	* @return bool True if sucessful, False if fails
 	*/
 	function unlock()
-	{}
+	{
+}
 
 	/**
 	* Number of rows in current result set
@@ -289,7 +296,10 @@ 
 		{
 			if (!is_numeric($column))
 			{
-				if ($strip) $column = str_replace($strip,'',$column);
+				if ($strip)
+				{
+					$column = str_replace($strip,'',$column);
+				}
 
 				$result[$column] = $value;
 			}
@@ -301,4 +311,6 @@ 
 /**
  * @deprecated use EGroupware\Api\Db\CallbackIterator
  */
-class egw_db_callback_iterator extends Api\Db\CallbackIterator {}
+class egw_db_callback_iterator extends Api\Db\CallbackIterator
+{
+}

api/src/Egw/Base.php

Spacing +4 added lines, -4 removed lines

@@ -64,12 +64,12 @@ 
 	 */
 	static $sub_objects = array(
 		'log' => 'errorlog',
-		'link' => 'bolink',		// depricated use static egw_link methods
+		'link' => 'bolink', // depricated use static egw_link methods
 		'datetime' => 'egw_datetime',
 		// classes moved to new api dir
 		'template' => true,
 		'applications' => 'EGroupware\\Api\\Egw\\Applications',
-		'framework' => true,	// special handling in __get()
+		'framework' => true, // special handling in __get()
 		'ldap' => true,
 	);
 
@@ -95,7 +95,7 @@ 
 	{
 		//error_log(__METHOD__."($name)".function_backtrace());
 
-		if ($name == 'js') $name = 'framework';	// javascript class is integrated now into framework
+		if ($name == 'js') $name = 'framework'; // javascript class is integrated now into framework
 
 		if (isset($this->$name))
 		{
@@ -107,7 +107,7 @@ 
 			if ($name != 'ADOdb') error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
 			return null;
 		}
-		switch($name)
+		switch ($name)
 		{
 			case 'framework':
 				return $this->framework = Api\Framework::factory();

Braces +13 added lines, -3 removed lines

@@ -95,7 +95,11 @@ 
 	{
 		//error_log(__METHOD__."($name)".function_backtrace());
 
-		if ($name == 'js') $name = 'framework';	// javascript class is integrated now into framework
+		if ($name == 'js')
+		{
+			$name = 'framework';
+		}
+		// javascript class is integrated now into framework
 
 		if (isset($this->$name))
 		{
@@ -104,7 +108,10 @@ 
 
 		if (!isset(self::$sub_objects[$name]) && !class_exists('EGroupware\\Api\\'.ucfirst($name)) && !class_exists($name))
 		{
-			if ($name != 'ADOdb') error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
+			if ($name != 'ADOdb')
+			{
+				error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
+			}
 			return null;
 		}
 		switch($name)
@@ -121,7 +128,10 @@ 
 				return $this->ldap = Api\Ldap::factory(false);
 			default:
 				$class = isset(self::$sub_objects[$name]) ? self::$sub_objects[$name] : 'EGroupware\\Api\\'.ucfirst($name);
-				if (!class_exists($class)) $class = $name;
+				if (!class_exists($class))
+				{
+					$class = $name;
+				}
 				break;
 		}
 		return $this->$name = new $class();

api/src/Contacts/Ads.php

Indentation +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 	 *
 	 * @param string/array $_contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||

Braces +13 added lines, -3 removed lines

@@ -84,7 +84,11 @@ 
 	 */
 	function __construct(array $ldap_config=null, $ds=null)
 	{
-		if (false) parent::__construct ();	// quiten IDE warning, we are explicitly NOT calling parrent constructor!
+		if (false)
+		{
+			parent::__construct ();
+		}
+		// quiten IDE warning, we are explicitly NOT calling parrent constructor!
 
 		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
 
@@ -202,10 +206,16 @@ 
 		$contact['id'] = $contact['uid'] = $this->accounts_ads->objectguid2str($data['objectguid']);
 
 		// ignore system accounts
-		if ($contact['account_id'] < Api\Accounts\Ads::MIN_ACCOUNT_ID) return false;
+		if ($contact['account_id'] < Api\Accounts\Ads::MIN_ACCOUNT_ID)
+		{
+			return false;
+		}
 
 		// ignore deactivated or expired accounts
-		if (!$this->accounts_ads->user_active($data)) return false;
+		if (!$this->accounts_ads->user_active($data))
+		{
+			return false;
+		}
 
 		$this->_inetorgperson2egw($contact, $data, 'displayname');
 	}

Spacing +17 added lines, -18 removed lines

@@ -35,8 +35,8 @@ 
 	 * minimum: $this->columns_to_search = array('n_family','n_given','org_name','email');
 	 */
 	var $search_attributes = array(
-		'n_family','n_middle','n_given','org_name','org_unit',
-		'adr_one_location','note','email','samaccountname',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_location', 'note', 'email', 'samaccountname',
 	);
 
 	/**
@@ -50,7 +50,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $dn_attribute='cn';
+	var $dn_attribute = 'cn';
 
 	/**
 	 * Do NOT attempt to change DN (dn-attribute can NOT be part of schemas used in addressbook!)
@@ -82,11 +82,11 @@ 
 	 * @param array $ldap_config =null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds =null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	function __construct(array $ldap_config = null, $ds = null)
 	{
-		if (false) parent::__construct ();	// quiten IDE warning, we are explicitly NOT calling parrent constructor!
+		if (false) parent::__construct(); // quiten IDE warning, we are explicitly NOT calling parrent constructor!
 
-		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -94,7 +94,7 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 
 		$this->accounts_ads = $GLOBALS['egw']->accounts->backend;
@@ -119,15 +119,15 @@ 
 			'account_id'	=> 'objectsid',
 			'id'            => 'objectguid',
 			'uid'			=> 'objectguid',
-			'n_fn'          => 'displayname',	// leave CN used in DN untouched
-			'accountexpires', 'useraccountcontrol',	// needed to exclude deactivated or expired accounts
+			'n_fn'          => 'displayname', // leave CN used in DN untouched
+			'accountexpires', 'useraccountcontrol', // needed to exclude deactivated or expired accounts
 		));
 		unset($this->schema2egw['user']['n_fileas']);
 		unset($this->schema2egw['inetorgperson']);
 
-		foreach($this->schema2egw as $attributes)
+		foreach ($this->schema2egw as $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -139,9 +139,9 @@ 
 	 *
 	 * @param boolean $admin =false true (re-)connect with admin not user credentials, eg. to modify accounts
 	 */
-	function connect($admin=false)
+	function connect($admin = false)
 	{
-		unset($admin);	// not used, but required by function signature
+		unset($admin); // not used, but required by function signature
 
 		$this->ds = $this->accounts_ads->ldap_connection();
 	}
@@ -174,18 +174,17 @@ 
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||
-			!is_array($_contact_id) && substr($_contact_id,0,8) == 'account:')
+			!is_array($_contact_id) && substr($_contact_id, 0, 8) == 'account:')
 		{
-			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id,8));
+			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id, 8));
 			if ($account_id < 0 || !($_contact_id = $GLOBALS['egw']->accounts->id2name($account_id, 'person_id')))
 			{
 				return false;
 			}
 		}
-		$contact_id = !is_array($_contact_id) ? $_contact_id :
-			(isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
+		$contact_id = !is_array($_contact_id) ? $_contact_id : (isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
 
-		$rows = $this->_searchLDAP($this->allContactsDN, $filter=$this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
+		$rows = $this->_searchLDAP($this->allContactsDN, $filter = $this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
 		//error_log(__METHOD__."('$contact_id') _searchLDAP($this->allContactsDN, '$filter',...)=".array2string($rows));
 		return $rows ? $rows[0] : false;
 	}

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/Ldap.php

Indentation +17 added lines, -17 removed lines

@@ -41,33 +41,33 @@ 
 	var $contacts_id='id';
 
 	/**
-	* @var string $accountName holds the accountname of the current user
-	*/
+	 * @var string $accountName holds the accountname of the current user
+	 */
 	var $accountName;
 
 	/**
-	* @var object $ldapServerInfo holds the information about the current used ldap server
-	*/
+	 * @var object $ldapServerInfo holds the information about the current used ldap server
+	 */
 	var $ldapServerInfo;
 
 	/**
-	* @var int $ldapLimit how many rows to fetch from ldap server
-	*/
+	 * @var int $ldapLimit how many rows to fetch from ldap server
+	 */
 	var $ldapLimit = 2000;
 
 	/**
-	* @var string $personalContactsDN holds the base DN for the personal addressbooks
-	*/
+	 * @var string $personalContactsDN holds the base DN for the personal addressbooks
+	 */
 	var $personalContactsDN;
 
 	/**
-	* @var string $sharedContactsDN holds the base DN for the shared addressbooks
-	*/
+	 * @var string $sharedContactsDN holds the base DN for the shared addressbooks
+	 */
 	var $sharedContactsDN;
 
 	/**
-	* @var string $accountContactsDN holds the base DN for accounts addressbook
-	*/
+	 * @var string $accountContactsDN holds the base DN for accounts addressbook
+	 */
 	var $accountContactsDN;
 
 	/**
@@ -77,8 +77,8 @@ 
 	var $accountsFilter = '(objectclass=posixaccount)';
 
 	/**
-	* @var string $allContactsDN holds the base DN of all addressbook
-	*/
+	 * @var string $allContactsDN holds the base DN of all addressbook
+	 */
 	var $allContactsDN;
 
 	/**
@@ -96,8 +96,8 @@ 
 	var $never_change_dn = false;
 
 	/**
-	* @var int $total holds the total count of found rows
-	*/
+	 * @var int $total holds the total count of found rows
+	 */
 	var $total;
 
 	/**
@@ -403,7 +403,7 @@ 
 	 *
 	 * @param string|array $contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($contact_id)
 	{
 		if (is_array($contact_id) && isset($contact_id['account_id']) ||

Braces +105 added lines, -27 removed lines

@@ -327,9 +327,12 @@ 
 			$this->ds = Api\Ldap::factory();
 		}
 		// if ldap is NOT the contact repository, we only do accounts and need to use the account-data
-		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'],-4) != 'ldap')	// not (ldap or sql-ldap)
+		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'],-4) != 'ldap')
+		{
+			// not (ldap or sql-ldap)
 		{
 			$this->ldap_config['ldap_contact_host'] = $this->ldap_config['ldap_host'];
+		}
 			$this->allContactsDN = $this->ldap_config['ldap_context'];
 			$this->ds = Api\Ldap::factory();
 		}
@@ -413,7 +416,10 @@ 
 		}
 		else
 		{
-			if (is_array($contact_id)) $contact_id = isset ($contact_id['id']) ? $contact_id['id'] : $contact_id['uid'];
+			if (is_array($contact_id))
+			{
+				$contact_id = isset ($contact_id['id']) ? $contact_id['id'] : $contact_id['uid'];
+			}
 			$filter = $this->id_filter($contact_id);
 		}
 		$rows = $this->_searchLDAP($this->allContactsDN,
@@ -517,7 +523,10 @@ 
 		// add for all supported objectclasses the objectclass and it's attributes
 		foreach($this->schema2egw as $objectclass => $mapping)
 		{
-			if(!$this->ldapServerInfo->supportsObjectClass($objectclass)) continue;
+			if(!$this->ldapServerInfo->supportsObjectClass($objectclass))
+			{
+				continue;
+			}
 
 			if($objectclass != 'posixaccount' && !in_array($objectclass, $oldObjectclasses))
 			{
@@ -535,7 +544,10 @@ 
 			}
 			foreach($mapping as $egwFieldName => $ldapFieldName)
 			{
-				if (is_int($egwFieldName)) continue;
+				if (is_int($egwFieldName))
+				{
+					continue;
+				}
 				if(!empty($data[$egwFieldName]))
 				{
 					// dont convert the (binary) jpegPhoto!
@@ -671,7 +683,10 @@ 
 	function delete($keys=null)
 	{
 		// single entry
-		if($keys[$this->contacts_id]) $keys = array( 0 => $keys);
+		if($keys[$this->contacts_id])
+		{
+			$keys = array( 0 => $keys);
+		}
 
 		if(!is_array($keys))
 		{
@@ -760,7 +775,10 @@ 
 
 		if((int)$filter['owner'])
 		{
-			if (!($accountName = $GLOBALS['egw']->accounts->id2name($filter['owner']))) return false;
+			if (!($accountName = $GLOBALS['egw']->accounts->id2name($filter['owner'])))
+			{
+				return false;
+			}
 
 			$searchDN = 'cn='. Api\Ldap::quote(strtolower($accountName)) .',';
 
@@ -856,7 +874,10 @@ 
 			$sort = 'ASC';
 			foreach(explode(',',$order_by) as $o)
 			{
-				if (substr($o,0,8) == 'contact_') $o = substr($o,8);
+				if (substr($o,0,8) == 'contact_')
+				{
+					$o = substr($o,8);
+				}
 				if (substr($o,-4) == ' ASC')
 				{
 					$sort = 'ASC';
@@ -884,7 +905,10 @@ 
 					{
 						$strc = strcmp($b[$f], $a[$f]);
 					}
-					if ($strc) return $strc;
+					if ($strc)
+					{
+						return $strc;
+					}
 				}
 				return 0;
 			});
@@ -913,12 +937,18 @@ 
 	 */
 	function _colFilter($filter)
 	{
-		if (!is_array($filter)) return '';
+		if (!is_array($filter))
+		{
+			return '';
+		}
 
 		$filters = '';
 		foreach($filter as $key => $value)
 		{
-			if ($key != 'cat_id' && $key != 'account_id' && !$value) continue;
+			if ($key != 'cat_id' && $key != 'account_id' && !$value)
+			{
+				continue;
+			}
 
 			switch((string) $key)
 			{
@@ -933,12 +963,18 @@ 
 					}
 					elseif ($value)
 					{
-						if (is_array($value)) $filters .= '(|';
+						if (is_array($value))
+						{
+							$filters .= '(|';
+						}
 						foreach((array)$value as $value)
 						{
 							$filters .= '(uidNumber='.(int)$value.')';
 						}
-						if (is_array($value)) $filters .= ')';
+						if (is_array($value))
+						{
+							$filters .= ')';
+						}
 					}
 					break;
 
@@ -954,19 +990,28 @@ 
 							$GLOBALS['egw']->categories = new Api\Categories();
 						}
 						$cats = $GLOBALS['egw']->categories->return_all_children((int)$value);
-						if (count($cats) > 1) $filters .= '(|';
+						if (count($cats) > 1)
+						{
+							$filters .= '(|';
+						}
 						foreach($cats as $cat)
 						{
 							$catName = Api\Translation::convert(
 								$GLOBALS['egw']->categories->id2name($cat),$this->charset,'utf-8');
 							$filters .= '(category='.Api\Ldap::quote($catName).')';
 						}
-						if (count($cats) > 1) $filters .= ')';
+						if (count($cats) > 1)
+						{
+							$filters .= ')';
+						}
 					}
 					break;
 
 				case 'carddav_name':
-					if (!is_array($value)) $value = array($value);
+					if (!is_array($value))
+					{
+						$value = array($value);
+					}
 					foreach($value as &$v)
 					{
 						$v = basename($v, '.vcf');
@@ -1000,7 +1045,10 @@ 
 					elseif (preg_match("/^([^ ]+) ".preg_quote($GLOBALS['egw']->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE])." '(.*)%'$/",$value,$matches))
 					{
 						list(,$name,$value) = $matches;
-						if (strpos($name,'.') !== false) list(,$name) = explode('.',$name);
+						if (strpos($name,'.') !== false)
+						{
+							list(,$name) = explode('.',$name);
+						}
 						foreach($this->schema2egw as $mapping)
 						{
 							if (isset($mapping[$name]))
@@ -1073,13 +1121,20 @@ 
 		{
 			$result = @ldap_list($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit);
 		}
-		if(!$result || !$entries = ldap_get_entries($this->ds, $result)) return array();
+		if(!$result || !$entries = ldap_get_entries($this->ds, $result))
+		{
+			return array();
+		}
 		//error_log(__METHOD__."('$_ldapContext', '$_filter', ".array2string($_attributes).", $_addressbooktype) result of $entries[count]");
 
 		$this->total = $entries['count'];
 		foreach($entries as $i => $entry)
 		{
-			if (!is_int($i)) continue;	// eg. count
+			if (!is_int($i))
+			{
+				continue;
+			}
+			// eg. count
 
 			$contact = array(
 				'id'  => $entry['uid'][0] ? $entry['uid'][0] : $entry['entryuuid'][0],
@@ -1211,7 +1266,10 @@ 
 					$var => $val,
 				);
 				// create a admin connection to add the needed DN
-				if (!isset($adminDS)) $adminDS = Api\Ldap::factory();
+				if (!isset($adminDS))
+				{
+					$adminDS = Api\Ldap::factory();
+				}
 				if(!@ldap_add($adminDS, $dn, $data))
 				{
 					//echo "<p>ldap_add($adminDS,'$dn',".print_r($data,true).")</p>\n";
@@ -1297,11 +1355,17 @@ 
 			$contact['cat_id'] = array();
 			foreach($data['category'] as $iii => $cat)
 			{
-				if (!is_int($iii)) continue;
+				if (!is_int($iii))
+				{
+					continue;
+				}
 
 				$contact['cat_id'][] = $GLOBALS['egw']->categories->name2id($cat);
 			}
-			if ($contact['cat_id']) $contact['cat_id'] = implode(',',$contact['cat_id']);
+			if ($contact['cat_id'])
+			{
+				$contact['cat_id'] = implode(',',$contact['cat_id']);
+			}
 		}
 		if ($data['primaryphone'])
 		{
@@ -1356,7 +1420,10 @@ 
 	{
 		unset($contact);	// not used, but required by function signature
 		static $shadowExpireNow=null;
-		if (!isset($shadowExpireNow)) $shadowExpireNow = floor((time()-date('Z'))/86400);
+		if (!isset($shadowExpireNow))
+		{
+			$shadowExpireNow = floor((time()-date('Z'))/86400);
+		}
 
 		// exclude expired or deactivated accounts
 		if (isset($data['shadowexpire']) && $data['shadowexpire'][0] <= $shadowExpireNow)
@@ -1401,9 +1468,13 @@ 
 		elseif ($data['adr_one_countryname'])
 		{
 			$ldapContact['c'] = Api\Country::country_code($data['adr_one_countryname']);
-			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
+			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)
 			{
-				$ldapContact['c'] = array(); // should return error...
+				// Bad countryname when "custom" selected!
+			{
+				$ldapContact['c'] = array();
+			}
+			// should return error...
 			}
 		}
 		elseif ($isUpdate)
@@ -1442,14 +1513,21 @@ 
 		if ($data['adr_one_countrycode'])
 		{
 			$ldapContact['c'] = $data['adr_one_countrycode'];
-			if ($isUpdate) $ldapContact['co'] = array();
+			if ($isUpdate)
+			{
+				$ldapContact['co'] = array();
+			}
 		}
 		elseif ($data['adr_one_countryname'])
 		{
 			$ldapContact['c'] = Api\Country::country_code($data['adr_one_countryname']);
-			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
+			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)
+			{
+				// Bad countryname when "custom" selected!
 			{
-				$ldapContact['c'] = array(); // should return error...
+				$ldapContact['c'] = array();
+			}
+			// should return error...
 			}
 		}
 		elseif ($isUpdate)

Spacing +185 added lines, -187 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $contacts_id='id';
+	var $contacts_id = 'id';
 
 	/**
 	* @var string $accountName holds the accountname of the current user
@@ -86,7 +86,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $dn_attribute='uid';
+	var $dn_attribute = 'uid';
 
 	/**
 	 * Do NOT attempt to change DN (dn-attribute can NOT be part of schemas used in addressbook!)
@@ -113,9 +113,9 @@ 
 	 * minimum: $this->columns_to_search = array('n_family','n_given','org_name','email');
 	 */
 	var $search_attributes = array(
-		'n_family','n_middle','n_given','org_name','org_unit',
-		'adr_one_locality','adr_two_locality','note',
-		'email','mozillasecondemail','uidnumber',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_locality', 'adr_two_locality', 'note',
+		'email', 'mozillasecondemail', 'uidnumber',
 	);
 
 	/**
@@ -171,8 +171,8 @@ 
 		#postOfficeBox
 		'mozillaabpersonalpha' => array(
 			'adr_one_street2'	=> 'mozillaworkstreet2',
-			'adr_one_countryname'	=> 'c',	// 2 letter country code
-			'adr_one_countrycode'	=> 'c',	// 2 letter country code
+			'adr_one_countryname'	=> 'c', // 2 letter country code
+			'adr_one_countrycode'	=> 'c', // 2 letter country code
 			'adr_two_street'	=> 'mozillahomestreet',
 			'adr_two_street2'	=> 'mozillahomestreet2',
 			'adr_two_locality'	=> 'mozillahomelocalityname',
@@ -186,8 +186,8 @@ 
 		// similar to the newer mozillaAbPerson, but uses mozillaPostalAddress2 instead of mozillaStreet2
 		'mozillaorgperson' => array(
 			'adr_one_street2'	=> 'mozillapostaladdress2',
-			'adr_one_countrycode'	=> 'c',	// 2 letter country code
-			'adr_one_countryname'	=> 'co',	// human readable country name, must be after 'c' to take precedence on read!
+			'adr_one_countrycode'	=> 'c', // 2 letter country code
+			'adr_one_countryname'	=> 'co', // human readable country name, must be after 'c' to take precedence on read!
 			'adr_two_street'	=> 'mozillahomestreet',
 			'adr_two_street2'	=> 'mozillahomepostaladdress2',
 			'adr_two_locality'	=> 'mozillahomelocalityname',
@@ -213,7 +213,7 @@ 
 			'note'			=> 'note',
 			'tel_car'		=> 'carphone',
 			'tel_prefer'	=> 'primaryphone',
-			'cat_id'		=> 'category',	// special handling in _egw2evolutionperson method
+			'cat_id'		=> 'category', // special handling in _egw2evolutionperson method
 			'role'			=> 'businessrole',
 			'tel_assistent'	=> 'assistantphone',
 			'assistent'		=> 'assistantname',
@@ -222,7 +222,7 @@ 
 			'freebusy_uri'	=> 'freeBusyuri',
 			'calendar_uri'	=> 'calendaruri',
 			'tel_other'		=> 'otherphone',
-			'tel_cell_private' => 'callbackphone',	// not the best choice, but better then nothing
+			'tel_cell_private' => 'callbackphone', // not the best choice, but better then nothing
 		),
 		// additional schema can be added here, including special functions
 
@@ -270,10 +270,10 @@ 
 	 * @param array $ldap_config =null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds =null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	function __construct(array $ldap_config = null, $ds = null)
 	{
 		//$this->db_data_cols 	= $this->stock_contact_fields + $this->non_contact_fields;
-		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -281,12 +281,12 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 		$this->accountContactsDN	= $this->ldap_config['ldap_context'];
-		$this->allContactsDN		= $this->ldap_config['ldap_contact_context'];
-		$this->personalContactsDN	= 'ou=personal,ou=contacts,'. $this->allContactsDN;
-		$this->sharedContactsDN		= 'ou=shared,ou=contacts,'. $this->allContactsDN;
+		$this->allContactsDN = $this->ldap_config['ldap_contact_context'];
+		$this->personalContactsDN = 'ou=personal,ou=contacts,'.$this->allContactsDN;
+		$this->sharedContactsDN		= 'ou=shared,ou=contacts,'.$this->allContactsDN;
 
 		if ($ds)
 		{
@@ -298,9 +298,9 @@ 
 		}
 		$this->ldapServerInfo = $GLOBALS['egw']->ldap->getLDAPServerInfo($this->ldap_config['ldap_contact_host']);
 
-		foreach($this->schema2egw as $attributes)
+		foreach ($this->schema2egw as $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -327,7 +327,7 @@ 
 			$this->ds = Api\Ldap::factory();
 		}
 		// if ldap is NOT the contact repository, we only do accounts and need to use the account-data
-		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'],-4) != 'ldap')	// not (ldap or sql-ldap)
+		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'], -4) != 'ldap')	// not (ldap or sql-ldap)
 		{
 			$this->ldap_config['ldap_contact_host'] = $this->ldap_config['ldap_host'];
 			$this->allContactsDN = $this->ldap_config['ldap_context'];
@@ -351,17 +351,17 @@ 
 	function supported_fields()
 	{
 		$fields = array(
-			'id','tid','owner',
-			'n_middle','n_prefix','n_suffix',	// stored in the cn
-			'created','modified',				// automatic timestamps
-			'creator','modifier',				// automatic for non accounts
-			'private',							// true for personal addressbooks, false otherwise
+			'id', 'tid', 'owner',
+			'n_middle', 'n_prefix', 'n_suffix', // stored in the cn
+			'created', 'modified', // automatic timestamps
+			'creator', 'modifier', // automatic for non accounts
+			'private', // true for personal addressbooks, false otherwise
 		);
-		foreach($this->schema2egw as $objectclass => $mapping)
+		foreach ($this->schema2egw as $objectclass => $mapping)
 		{
-			if($this->ldapServerInfo->supportsObjectClass($objectclass))
+			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
-				$fields = array_merge($fields,array_keys($mapping));
+				$fields = array_merge($fields, array_keys($mapping));
 			}
 		}
 		return array_values(array_unique($fields));
@@ -392,7 +392,7 @@ 
 			return $this->id_filter(is_array($ids) ? array_shift($ids) : $ids);
 		}
 		$filter = array();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			$filter[] = $this->id_filter($id);
 		}
@@ -408,9 +408,9 @@ 
 	function read($contact_id)
 	{
 		if (is_array($contact_id) && isset($contact_id['account_id']) ||
-			!is_array($contact_id) && substr($contact_id,0,8) == 'account:')
+			!is_array($contact_id) && substr($contact_id, 0, 8) == 'account:')
 		{
-			$filter = 'uidNumber='.(int)(is_array($contact_id) ? $contact_id['account_id'] : substr($contact_id,8));
+			$filter = 'uidNumber='.(int)(is_array($contact_id) ? $contact_id['account_id'] : substr($contact_id, 8));
 		}
 		else
 		{
@@ -433,7 +433,7 @@ 
 		// never allow to change the uidNumber (account_id) on update, as it could be misused by eg. xmlrpc or syncml
 		unset($ldapContact['uidnumber']);
 
-		unset($ldapContact['entryuuid']);	// not allowed to modify that, no need either
+		unset($ldapContact['entryuuid']); // not allowed to modify that, no need either
 
 		unset($ldapContact['objectClass']);
 	}
@@ -444,28 +444,28 @@ 
 	 * @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)
 	{
 		//error_log(__METHOD__."(".array2string($keys).") this->data=".array2string($this->data));
-		if(is_array($keys))
+		if (is_array($keys))
 		{
-			$this->data = is_array($this->data) ? array_merge($this->data,$keys) : $keys;
+			$this->data = is_array($this->data) ? array_merge($this->data, $keys) : $keys;
 		}
 
-		$data =& $this->data;
+		$data = & $this->data;
 		$isUpdate = false;
 		$ldapContact = array();
 
 		// generate addressbook dn
-		if((int)$data['owner'])
+		if ((int)$data['owner'])
 		{
 			// group address book
-			if(!($cn = strtolower($GLOBALS['egw']->accounts->id2name((int)$data['owner']))))
+			if (!($cn = strtolower($GLOBALS['egw']->accounts->id2name((int)$data['owner']))))
 			{
 				error_log('Unknown owner');
 				return true;
 			}
-			$baseDN = 'cn='. $cn .','.($data['owner'] < 0 ? $this->sharedContactsDN : $this->personalContactsDN);
+			$baseDN = 'cn='.$cn.','.($data['owner'] < 0 ? $this->sharedContactsDN : $this->personalContactsDN);
 		}
 		// only an admin or the user itself is allowed to change the data of an account
 		elseif ($data['account_id'] && ($GLOBALS['egw_info']['user']['apps']['admin'] ||
@@ -473,7 +473,7 @@ 
 		{
 			// account
 			$baseDN = $this->accountContactsDN;
-			$cn	= false;
+			$cn = false;
 			// we need an admin connection
 			$this->connect(true);
 
@@ -486,7 +486,7 @@ 
 		else
 		{
 			error_log("Permission denied, to write: data[owner]=$data[owner], data[account_id]=$data[account_id], account_id=".$GLOBALS['egw_info']['user']['account_id']);
-			return lang('Permission denied !!!');	// only admin or the user itself is allowd to write accounts!
+			return lang('Permission denied !!!'); // only admin or the user itself is allowd to write accounts!
 		}
 		// check if $baseDN exists. If not create it
 		if (($err = $this->_check_create_dn($baseDN)))
@@ -495,55 +495,54 @@ 
 		}
 		// check the existing objectclasses of an entry, none = array() for new ones
 		$oldObjectclasses = array();
-		$attributes = array('dn','cn','objectClass',$this->dn_attribute,'mail');
+		$attributes = array('dn', 'cn', 'objectClass', $this->dn_attribute, 'mail');
 
 		$contactUID	= $this->data[$this->contacts_id];
 		if (!empty($contactUID) &&
-			($result = ldap_search($this->ds, $base=$this->allContactsDN, $this->id_filter($contactUID), $attributes)) &&
+			($result = ldap_search($this->ds, $base = $this->allContactsDN, $this->id_filter($contactUID), $attributes)) &&
 			($oldContactInfo = ldap_get_entries($this->ds, $result)) && $oldContactInfo['count'])
 		{
 			unset($oldContactInfo[0]['objectclass']['count']);
-			foreach($oldContactInfo[0]['objectclass'] as $objectclass)
+			foreach ($oldContactInfo[0]['objectclass'] as $objectclass)
 			{
-				$oldObjectclasses[]	= strtolower($objectclass);
+				$oldObjectclasses[] = strtolower($objectclass);
 			}
 		   	$isUpdate = true;
 		}
 
-		if(empty($contactUID))
+		if (empty($contactUID))
 		{
 			$ldapContact[$this->dn_attribute] = $this->data[$this->contacts_id] = $contactUID = md5(Api\Auth::randomstring(15));
 		}
 		//error_log(__METHOD__."() contactUID='$contactUID', isUpdate=".array2string($isUpdate).", oldContactInfo=".array2string($oldContactInfo));
 		// add for all supported objectclasses the objectclass and it's attributes
-		foreach($this->schema2egw as $objectclass => $mapping)
+		foreach ($this->schema2egw as $objectclass => $mapping)
 		{
-			if(!$this->ldapServerInfo->supportsObjectClass($objectclass)) continue;
+			if (!$this->ldapServerInfo->supportsObjectClass($objectclass)) continue;
 
-			if($objectclass != 'posixaccount' && !in_array($objectclass, $oldObjectclasses))
+			if ($objectclass != 'posixaccount' && !in_array($objectclass, $oldObjectclasses))
 			{
 				$ldapContact['objectClass'][] = $objectclass;
 			}
 			if (isset($this->required_subs[$objectclass]))
 			{
-				foreach($this->required_subs[$objectclass] as $sub)
+				foreach ($this->required_subs[$objectclass] as $sub)
 				{
-					if(!in_array($sub, $oldObjectclasses))
+					if (!in_array($sub, $oldObjectclasses))
 					{
 						$ldapContact['objectClass'][] = $sub;
 					}
 				}
 			}
-			foreach($mapping as $egwFieldName => $ldapFieldName)
+			foreach ($mapping as $egwFieldName => $ldapFieldName)
 			{
 				if (is_int($egwFieldName)) continue;
-				if(!empty($data[$egwFieldName]))
+				if (!empty($data[$egwFieldName]))
 				{
 					// dont convert the (binary) jpegPhoto!
-					$ldapContact[$ldapFieldName] = $ldapFieldName == 'jpegphoto' ? $data[$egwFieldName] :
-						Api\Translation::convert(trim($data[$egwFieldName]),$this->charset,'utf-8');
+					$ldapContact[$ldapFieldName] = $ldapFieldName == 'jpegphoto' ? $data[$egwFieldName] : Api\Translation::convert(trim($data[$egwFieldName]), $this->charset, 'utf-8');
 				}
-				elseif($isUpdate && isset($data[$egwFieldName]))
+				elseif ($isUpdate && isset($data[$egwFieldName]))
 				{
 					$ldapContact[$ldapFieldName] = array();
 				}
@@ -551,9 +550,9 @@ 
 			}
 			// handling of special attributes, like cat_id in evolutionPerson
 			$egw2objectclass = '_egw2'.$objectclass;
-			if (method_exists($this,$egw2objectclass))
+			if (method_exists($this, $egw2objectclass))
 			{
-				$this->$egw2objectclass($ldapContact,$data,$isUpdate);
+				$this->$egw2objectclass($ldapContact, $data, $isUpdate);
 			}
 		}
 		if ($isUpdate)
@@ -571,11 +570,11 @@ 
 			$needRecreation = false;
 
 			// add missing objectclasses
-			if($ldapContact['objectClass'] && ($missing=array_diff($ldapContact['objectClass'],$oldObjectclasses)))
+			if ($ldapContact['objectClass'] && ($missing = array_diff($ldapContact['objectClass'], $oldObjectclasses)))
 			{
 				if (!@ldap_mod_add($this->ds, $dn, array('objectClass' => $ldapContact['objectClass'])))
 				{
-					if(in_array(ldap_errno($this->ds),array(69,20)))
+					if (in_array(ldap_errno($this->ds), array(69, 20)))
 					{
 						// need to modify structural objectclass
 						$needRecreation = true;
@@ -584,15 +583,15 @@ 
 					else
 					{
 						//echo "<p>ldap_mod_add($this->ds,'$dn',array(objectClass =>".print_r($ldapContact['objectClass'],true)."))</p>\n";
-						error_log(__METHOD__.'() '.__LINE__.' update of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')');
+						error_log(__METHOD__.'() '.__LINE__.' update of '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).')');
 						return $this->_error(__LINE__);
 					}
 				}
 			}
 
 			// check if we need to rename the DN or need to recreate the contact
-			$newRDN = $this->dn_attribute.'='. $ldapContact[$this->dn_attribute];
-			$newDN = $newRDN .','. $baseDN;
+			$newRDN = $this->dn_attribute.'='.$ldapContact[$this->dn_attribute];
+			$newDN = $newRDN.','.$baseDN;
 			if ($needRecreation)
 			{
 				$result = ldap_read($this->ds, $dn, 'objectclass=*');
@@ -603,20 +602,20 @@ 
 				$newContact = $oldContact;
 				$newContact[$this->dn_attribute] = $ldapContact[$this->dn_attribute];
 
-				if(is_array($ldapContact['objectClass']) && count($ldapContact['objectClass']) > 0)
+				if (is_array($ldapContact['objectClass']) && count($ldapContact['objectClass']) > 0)
 				{
-					$newContact['objectclass'] = array_unique(array_map('strtolower',	// objectclasses my have different case
+					$newContact['objectclass'] = array_unique(array_map('strtolower', // objectclasses my have different case
 						array_merge($newContact['objectclass'], $ldapContact['objectClass'])));
 				}
 
-				if(!ldap_delete($this->ds, $dn))
+				if (!ldap_delete($this->ds, $dn))
 				{
-					error_log(__METHOD__.'() '.__LINE__.' delete of old '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')');
+					error_log(__METHOD__.'() '.__LINE__.' delete of old '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).')');
 					return $this->_error(__LINE__);
 				}
-				if(!@ldap_add($this->ds, $newDN, $newContact))
+				if (!@ldap_add($this->ds, $newDN, $newContact))
 				{
-					error_log(__METHOD__.'() '.__LINE__.' re-create contact as '. $newDN .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .') newContact='.array2string($newContact));
+					error_log(__METHOD__.'() '.__LINE__.' re-create contact as '.$newDN.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).') newContact='.array2string($newContact));
 					// if adding with new objectclass or dn fails, re-add deleted contact
 					@ldap_add($this->ds, $dn, $oldContact);
 					return $this->_error(__LINE__);
@@ -645,22 +644,22 @@ 
 
 			if (!@ldap_modify($this->ds, $dn, $ldapContact))
 			{
-				error_log(__METHOD__.'() '.__LINE__.' update of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .') ldapContact='.array2string($ldapContact));
+				error_log(__METHOD__.'() '.__LINE__.' update of '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).') ldapContact='.array2string($ldapContact));
 				return $this->_error(__LINE__);
 			}
 		}
 		else
 		{
-			$dn = $this->dn_attribute.'='. $ldapContact[$this->dn_attribute] .','. $baseDN;
-			unset($ldapContact['entryuuid']);	// trying to write it, gives an error
+			$dn = $this->dn_attribute.'='.$ldapContact[$this->dn_attribute].','.$baseDN;
+			unset($ldapContact['entryuuid']); // trying to write it, gives an error
 
 			if (!@ldap_add($this->ds, $dn, $ldapContact))
 			{
-				error_log(__METHOD__.'() '.__LINE__.' add of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .') ldapContact='.array2string($ldapContact));
+				error_log(__METHOD__.'() '.__LINE__.' add of '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).') ldapContact='.array2string($ldapContact));
 				return $this->_error(__LINE__);
 			}
 		}
-		return 0;	// Ok, no error
+		return 0; // Ok, no error
 	}
 
 	/**
@@ -669,28 +668,28 @@ 
 	 * @param array $keys if given array with col => value pairs to characterise the rows to delete
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null)
+	function delete($keys = null)
 	{
 		// single entry
-		if($keys[$this->contacts_id]) $keys = array( 0 => $keys);
+		if ($keys[$this->contacts_id]) $keys = array(0 => $keys);
 
-		if(!is_array($keys))
+		if (!is_array($keys))
 		{
-			$keys = array( $keys);
+			$keys = array($keys);
 		}
 
 		$ret = 0;
 
 		$attributes = array('dn');
 
-		foreach($keys as $entry)
+		foreach ($keys as $entry)
 		{
 			$entry = Api\Ldap::quote(is_array($entry) ? $entry['id'] : $entry);
-			if(($result = ldap_search($this->ds, $this->allContactsDN,
+			if (($result = ldap_search($this->ds, $this->allContactsDN,
 				"(|(entryUUID=$entry)(uid=$entry))", $attributes)))
 			{
 				$contactInfo = ldap_get_entries($this->ds, $result);
-				if(@ldap_delete($this->ds, $contactInfo[0]['dn']))
+				if (@ldap_delete($this->ds, $contactInfo[0]['dn']))
 				{
 					$ret++;
 				}
@@ -718,10 +717,10 @@ 
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
 	 * @return array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__."(".array2string($criteria).", ".array2string($only_keys).", '$order_by', ".array2string($extra_cols).", '$wildcard', '$empty', '$op', ".array2string($start).", ".array2string($filter).")");
-		unset($only_keys, $extra_cols, $empty, $join, $need_full_no_count);	// not used, but required by function signature
+		unset($only_keys, $extra_cols, $empty, $join, $need_full_no_count); // not used, but required by function signature
 
 		if (is_array($filter['owner']))
 		{
@@ -743,7 +742,7 @@ 
 			'created' => 'createtimestamp',
 			'modified' => 'modifytimestamp',
 		);
-		foreach($filter as $key => $value)
+		foreach ($filter as $key => $value)
 		{
 			$matches = null;
 			if (is_int($key) && preg_match('/^(contact_)?(modified|created)([<=>]+)([0-9]+)$/', $value, $matches))
@@ -759,11 +758,11 @@ 
 			}
 		}
 
-		if((int)$filter['owner'])
+		if ((int)$filter['owner'])
 		{
 			if (!($accountName = $GLOBALS['egw']->accounts->id2name($filter['owner']))) return false;
 
-			$searchDN = 'cn='. Api\Ldap::quote(strtolower($accountName)) .',';
+			$searchDN = 'cn='.Api\Ldap::quote(strtolower($accountName)).',';
 
 			if ($filter['owner'] < 0)
 			{
@@ -787,7 +786,7 @@ 
 			$addressbookType = self::ACCOUNTS;
 		}
 		// create the search filter
-		switch($addressbookType)
+		switch ($addressbookType)
 		{
 			case self::ACCOUNTS:
 				$objectFilter = $this->accountsFilter;
@@ -802,42 +801,42 @@ 
 		// shadowExpire>= does NOT work, as shadow schema only specifies integerMatch and not integerOrderingMatch :-(
 
 		$searchFilter = '';
-		if(is_array($criteria) && count($criteria) > 0)
+		if (is_array($criteria) && count($criteria) > 0)
 		{
 			$wildcard = $wildcard === '%' ? '*' : '';
 			$searchFilter = '';
-			foreach($criteria as $egwSearchKey => $searchValue)
+			foreach ($criteria as $egwSearchKey => $searchValue)
 			{
-				if (in_array($egwSearchKey, array('id','contact_id')))
+				if (in_array($egwSearchKey, array('id', 'contact_id')))
 				{
 					try {
 						$searchFilter .= $this->ids_filter($searchValue);
 					}
 					// catch and ignore exception caused by id not being a valid GUID
-					catch(Api\Exception\AssertionFailed $e) {
+					catch (Api\Exception\AssertionFailed $e) {
 						unset($e);
 					}
 					continue;
 				}
-				foreach($this->schema2egw as $mapping)
+				foreach ($this->schema2egw as $mapping)
 				{
 					$matches = null;
 					if (preg_match('/^(egw_addressbook\.)?(contact_)?(.*)$/', $egwSearchKey, $matches))
 					{
 						$egwSearchKey = $matches[3];
 					}
-					if(($ldapSearchKey = $mapping[$egwSearchKey]))
+					if (($ldapSearchKey = $mapping[$egwSearchKey]))
 					{
-						foreach((array)$searchValue as $val)
+						foreach ((array)$searchValue as $val)
 						{
-							$searchString = Api\Translation::convert($val, $this->charset,'utf-8');
+							$searchString = Api\Translation::convert($val, $this->charset, 'utf-8');
 							$searchFilter .= '('.$ldapSearchKey.'='.$wildcard.Api\Ldap::quote($searchString).$wildcard.')';
 						}
 						break;
 					}
 				}
 			}
-			if($op == 'AND')
+			if ($op == 'AND')
 			{
 				$searchFilter = "(&$searchFilter)";
 			}
@@ -856,9 +855,9 @@ 
 		// only return certain owners --> unset not matching ones
 		if ($owner_filter)
 		{
-			foreach($rows as $k => $row)
+			foreach ($rows as $k => $row)
 			{
-				if (!in_array($row['owner'],$owner_filter))
+				if (!in_array($row['owner'], $owner_filter))
 				{
 					unset($rows[$k]);
 					--$this->total;
@@ -869,18 +868,18 @@ 
 		{
 			$order = array();
 			$sort = 'ASC';
-			foreach(explode(',',$order_by) as $o)
+			foreach (explode(',', $order_by) as $o)
 			{
-				if (substr($o,0,8) == 'contact_') $o = substr($o,8);
-				if (substr($o,-4) == ' ASC')
+				if (substr($o, 0, 8) == 'contact_') $o = substr($o, 8);
+				if (substr($o, -4) == ' ASC')
 				{
 					$sort = 'ASC';
-					$order[] = substr($o,0,-4);
+					$order[] = substr($o, 0, -4);
 				}
-				elseif (substr($o,-5) == ' DESC')
+				elseif (substr($o, -5) == ' DESC')
 				{
 					$sort = 'DESC';
-					$order[] = substr($o,0,-5);
+					$order[] = substr($o, 0, -5);
 				}
 				elseif ($o)
 				{
@@ -889,9 +888,9 @@ 
 			}
 			usort($rows, function($a, $b) use ($order, $sort)
 			{
-				foreach($order as $f)
+				foreach ($order as $f)
 				{
-					if($sort == 'ASC')
+					if ($sort == 'ASC')
 					{
 						$strc = strcmp($a[$f], $b[$f]);
 					}
@@ -907,13 +906,13 @@ 
 		// if requested ($start !== false) return only limited resultset
 		if (is_array($start))
 		{
-			list($start,$offset) = $start;
+			list($start, $offset) = $start;
 		}
-		if(is_numeric($start) && is_numeric($offset) && $offset >= 0)
+		if (is_numeric($start) && is_numeric($offset) && $offset >= 0)
 		{
 			return array_slice($rows, $start, $offset);
 		}
-		elseif(is_numeric($start))
+		elseif (is_numeric($start))
 		{
 			return array_slice($rows, $start, $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']);
 		}
@@ -931,11 +930,11 @@ 
 		if (!is_array($filter)) return '';
 
 		$filters = '';
-		foreach($filter as $key => $value)
+		foreach ($filter as $key => $value)
 		{
 			if ($key != 'cat_id' && $key != 'account_id' && !$value) continue;
 
-			switch((string) $key)
+			switch ((string)$key)
 			{
 				case 'owner':	// already handled
 				case 'tid':		// ignored
@@ -949,7 +948,7 @@ 
 					elseif ($value)
 					{
 						if (is_array($value)) $filters .= '(|';
-						foreach((array)$value as $value)
+						foreach ((array)$value as $value)
 						{
 							$filters .= '(uidNumber='.(int)$value.')';
 						}
@@ -962,7 +961,7 @@ 
 					{
 						$filters .= '(!(category=*))';
 					}
-					elseif((int)$value)
+					elseif ((int)$value)
 					{
 						if (!is_object($GLOBALS['egw']->categories))
 						{
@@ -970,10 +969,10 @@ 
 						}
 						$cats = $GLOBALS['egw']->categories->return_all_children((int)$value);
 						if (count($cats) > 1) $filters .= '(|';
-						foreach($cats as $cat)
+						foreach ($cats as $cat)
 						{
 							$catName = Api\Translation::convert(
-								$GLOBALS['egw']->categories->id2name($cat),$this->charset,'utf-8');
+								$GLOBALS['egw']->categories->id2name($cat), $this->charset, 'utf-8');
 							$filters .= '(category='.Api\Ldap::quote($catName).')';
 						}
 						if (count($cats) > 1) $filters .= ')';
@@ -982,7 +981,7 @@ 
 
 				case 'carddav_name':
 					if (!is_array($value)) $value = array($value);
-					foreach($value as &$v)
+					foreach ($value as &$v)
 					{
 						$v = basename($v, '.vcf');
 					}
@@ -1000,28 +999,27 @@ 
 					$matches = null;
 					if (!is_int($key))
 					{
-						foreach($this->schema2egw as $mapping)
+						foreach ($this->schema2egw as $mapping)
 						{
 							if (isset($mapping[$key]))
 							{
 								// todo: value = "!''"
-								$filters .= '('.$mapping[$key].'='.($value === "!''" ? '*' :
-									Api\Ldap::quote(Api\Translation::convert($value,$this->charset,'utf-8'))).')';
+								$filters .= '('.$mapping[$key].'='.($value === "!''" ? '*' : Api\Ldap::quote(Api\Translation::convert($value, $this->charset, 'utf-8'))).')';
 								break;
 							}
 						}
 					}
 					// filter for letter-search
-					elseif (preg_match("/^([^ ]+) ".preg_quote($GLOBALS['egw']->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE])." '(.*)%'$/",$value,$matches))
+					elseif (preg_match("/^([^ ]+) ".preg_quote($GLOBALS['egw']->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE])." '(.*)%'$/", $value, $matches))
 					{
-						list(,$name,$value) = $matches;
-						if (strpos($name,'.') !== false) list(,$name) = explode('.',$name);
-						foreach($this->schema2egw as $mapping)
+						list(,$name, $value) = $matches;
+						if (strpos($name, '.') !== false) list(,$name) = explode('.', $name);
+						foreach ($this->schema2egw as $mapping)
 						{
 							if (isset($mapping[$name]))
 							{
 								$filters .= '('.$mapping[$name].'='.Api\Ldap::quote(
-									Api\Translation::convert($value,$this->charset,'utf-8')).'*)';
+									Api\Translation::convert($value, $this->charset, 'utf-8')).'*)';
 								break;
 							}
 						}
@@ -1045,7 +1043,7 @@ 
 		{
 			$filter .= '(|';
 			// unfortunately we have no group-membership attribute in LDAP, like in AD
-			foreach($GLOBALS['egw']->accounts->members($gid, true) as $account_id)
+			foreach ($GLOBALS['egw']->accounts->members($gid, true) as $account_id)
 			{
 				$filter .= '(uidNumber='.(int)$account_id.')';
 			}
@@ -1067,7 +1065,7 @@ 
 	 * @param array $_skipPlugins =null schema-plugins to skip
 	 * @return array/boolean with eGW contacts or false on error
 	 */
-	function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype, array $_skipPlugins=null)
+	function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype, array $_skipPlugins = null)
 	{
 		$this->total = 0;
 
@@ -1080,7 +1078,7 @@ 
 
 		//error_log(__METHOD__."('$_ldapContext', '$_filter', ".array2string($_attributes).", $_addressbooktype)");
 
-		if($_addressbooktype == self::ALL || $_ldapContext == $this->allContactsDN)
+		if ($_addressbooktype == self::ALL || $_ldapContext == $this->allContactsDN)
 		{
 			$result = ldap_search($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit);
 		}
@@ -1088,36 +1086,36 @@ 
 		{
 			$result = @ldap_list($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit);
 		}
-		if(!$result || !$entries = ldap_get_entries($this->ds, $result)) return array();
+		if (!$result || !$entries = ldap_get_entries($this->ds, $result)) return array();
 		//error_log(__METHOD__."('$_ldapContext', '$_filter', ".array2string($_attributes).", $_addressbooktype) result of $entries[count]");
 
 		$this->total = $entries['count'];
-		foreach($entries as $i => $entry)
+		foreach ($entries as $i => $entry)
 		{
-			if (!is_int($i)) continue;	// eg. count
+			if (!is_int($i)) continue; // eg. count
 
 			$contact = array(
 				'id'  => $entry['uid'][0] ? $entry['uid'][0] : $entry['entryuuid'][0],
-				'tid' => 'n',	// the type id for the addressbook
+				'tid' => 'n', // the type id for the addressbook
 			);
-			foreach($entry['objectclass'] as $ii => $objectclass)
+			foreach ($entry['objectclass'] as $ii => $objectclass)
 			{
 				$objectclass = strtolower($objectclass);
 				if (!is_int($ii) || !isset($this->schema2egw[$objectclass]))
 				{
-					continue;	// eg. count or unsupported objectclass
+					continue; // eg. count or unsupported objectclass
 				}
-				foreach($this->schema2egw[$objectclass] as $egwFieldName => $ldapFieldName)
+				foreach ($this->schema2egw[$objectclass] as $egwFieldName => $ldapFieldName)
 				{
-					if(!empty($entry[$ldapFieldName][0]) && !is_int($egwFieldName) && !isset($contact[$egwFieldName]))
+					if (!empty($entry[$ldapFieldName][0]) && !is_int($egwFieldName) && !isset($contact[$egwFieldName]))
 					{
-						$contact[$egwFieldName] = Api\Translation::convert($entry[$ldapFieldName][0],'utf-8');
+						$contact[$egwFieldName] = Api\Translation::convert($entry[$ldapFieldName][0], 'utf-8');
 					}
 				}
 				$objectclass2egw = '_'.$objectclass.'2egw';
-				if (!in_array($objectclass2egw, (array)$_skipPlugins) &&method_exists($this,$objectclass2egw))
+				if (!in_array($objectclass2egw, (array)$_skipPlugins) && method_exists($this, $objectclass2egw))
 				{
-					if (($ret=$this->$objectclass2egw($contact,$entry)) === false)
+					if (($ret = $this->$objectclass2egw($contact, $entry)) === false)
 					{
 						--$this->total;
 						continue 2;
@@ -1127,20 +1125,20 @@ 
 			// read binary jpegphoto only for one result == call by read
 			if ($this->total == 1 && isset($entry['jpegphoto'][0]))
 			{
-				$bin = ldap_get_values_len($this->ds,ldap_first_entry($this->ds,$result),'jpegphoto');
+				$bin = ldap_get_values_len($this->ds, ldap_first_entry($this->ds, $result), 'jpegphoto');
 				$contact['jpegphoto'] = $bin[0];
 			}
 			$matches = null;
-			if(preg_match('/cn=([^,]+),'.preg_quote($this->personalContactsDN,'/').'$/i',$entry['dn'],$matches))
+			if (preg_match('/cn=([^,]+),'.preg_quote($this->personalContactsDN, '/').'$/i', $entry['dn'], $matches))
 			{
 				// personal addressbook
-				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1],'account_lid','u');
+				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'u');
 				$contact['private'] = 0;
 			}
-			elseif(preg_match('/cn=([^,]+),'.preg_quote($this->sharedContactsDN,'/').'$/i',$entry['dn'],$matches))
+			elseif (preg_match('/cn=([^,]+),'.preg_quote($this->sharedContactsDN, '/').'$/i', $entry['dn'], $matches))
 			{
 				// group addressbook
-				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1],'account_lid','g');
+				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g');
 				$contact['private'] = 0;
 			}
 			else
@@ -1149,12 +1147,12 @@ 
 				$contact['owner'] = 0;
 				$contact['private'] = 0;
 			}
-			foreach(array(
+			foreach (array(
 				'createtimestamp' => 'created',
 				'modifytimestamp' => 'modified',
 			) as $ldapFieldName => $egwFieldName)
 			{
-				if(!empty($entry[$ldapFieldName][0]))
+				if (!empty($entry[$ldapFieldName][0]))
 				{
 					$contact[$egwFieldName] = $this->_ldap2ts($entry[$ldapFieldName][0]);
 				}
@@ -1173,8 +1171,8 @@ 
 	 */
 	static function _ldap2ts($date)
 	{
-		return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2),
-			substr($date,4,2),substr($date,6,2),substr($date,0,4));
+		return gmmktime(substr($date, 8, 2), substr($date, 10, 2), substr($date, 12, 2),
+			substr($date, 4, 2), substr($date, 6, 2), substr($date, 0, 4));
 	}
 
 	/**
@@ -1197,20 +1195,20 @@ 
 	function _check_create_dn($baseDN)
 	{
 		// check if $baseDN exists. If not create new one
-		if(@ldap_read($this->ds, $baseDN, 'objectclass=*'))
+		if (@ldap_read($this->ds, $baseDN, 'objectclass=*'))
 		{
 			return false;
 		}
 		//error_log(__METHOD__."('$baseDN') !ldap_read({$this->ds}, '$baseDN', 'objectclass=*') ldap_errno()=".ldap_errno($this->ds).', ldap_error()='.ldap_error($this->ds).get_class($this));
-		if(ldap_errno($this->ds) != 32 || substr($baseDN,0,3) != 'cn=')
+		if (ldap_errno($this->ds) != 32 || substr($baseDN, 0, 3) != 'cn=')
 		{
 			error_log(__METHOD__."('$baseDN') baseDN does NOT exist and we cant/wont create it! ldap_errno()=".ldap_errno($this->ds).', ldap_error()='.ldap_error($this->ds));
-			return $this->_error(__LINE__);	// baseDN does NOT exist and we cant/wont create it
+			return $this->_error(__LINE__); // baseDN does NOT exist and we cant/wont create it
 		}
 
-		list(,$ou) = explode(',',$baseDN);
+		list(,$ou) = explode(',', $baseDN);
 		$adminDS = null;
-		foreach(array(
+		foreach (array(
 			'ou=contacts,'.$this->allContactsDN,
 			$ou.',ou=contacts,'.$this->allContactsDN,
 			$baseDN,
@@ -1219,18 +1217,18 @@ 
 			if (!@ldap_read($this->ds, $dn, 'objectclass=*') && ldap_errno($this->ds) == 32)
 			{
 				// entry does not exist, lets try to create it
-				list($top) = explode(',',$dn);
-				list($var,$val) = explode('=',$top);
+				list($top) = explode(',', $dn);
+				list($var, $val) = explode('=', $top);
 				$data = array(
 					'objectClass' => $var == 'cn' ? 'organizationalRole' : 'organizationalUnit',
 					$var => $val,
 				);
 				// create a admin connection to add the needed DN
 				if (!isset($adminDS)) $adminDS = Api\Ldap::factory();
-				if(!@ldap_add($adminDS, $dn, $data))
+				if (!@ldap_add($adminDS, $dn, $data))
 				{
 					//echo "<p>ldap_add($adminDS,'$dn',".print_r($data,true).")</p>\n";
-					$err = lang("Can't create dn %1",$dn).': '.$this->_error(__LINE__,$adminDS);
+					$err = lang("Can't create dn %1", $dn).': '.$this->_error(__LINE__, $adminDS);
 					return $err;
 				}
 			}
@@ -1245,7 +1243,7 @@ 
 	 * @param int $line
 	 * @return string
 	 */
-	function _error($line,$ds=null)
+	function _error($line, $ds = null)
 	{
 		return ldap_error($ds ? $ds : $this->ds).': '.__CLASS__.': '.$line;
 	}
@@ -1260,27 +1258,27 @@ 
 	 * @param array $data eGW contact data
 	 * @param boolean $isUpdate
 	 */
-	function _egw2evolutionperson(&$ldapContact,$data,$isUpdate)
+	function _egw2evolutionperson(&$ldapContact, $data, $isUpdate)
 	{
-		if(!empty($data['cat_id']))
+		if (!empty($data['cat_id']))
 		{
 			$ldapContact['category'] = array();
-			foreach(is_array($data['cat_id']) ? $data['cat_id'] : explode(',',$data['cat_id'])  as $cat)
+			foreach (is_array($data['cat_id']) ? $data['cat_id'] : explode(',', $data['cat_id'])  as $cat)
 			{
 				$ldapContact['category'][] = Api\Translation::convert(
-					Api\Categories::id2name($cat),$this->charset,'utf-8');
+					Api\Categories::id2name($cat), $this->charset, 'utf-8');
 			}
 		}
-		foreach(array(
-			'postaladdress' => $data['adr_one_street'] .'$'. $data['adr_one_locality'] .', '. $data['adr_one_region'] .'$'. $data['adr_one_postalcode'] .'$$'. $data['adr_one_countryname'],
-			'homepostaladdress' => $data['adr_two_street'] .'$'. $data['adr_two_locality'] .', '. $data['adr_two_region'] .'$'. $data['adr_two_postalcode'] .'$$'. $data['adr_two_countryname'],
+		foreach (array(
+			'postaladdress' => $data['adr_one_street'].'$'.$data['adr_one_locality'].', '.$data['adr_one_region'].'$'.$data['adr_one_postalcode'].'$$'.$data['adr_one_countryname'],
+			'homepostaladdress' => $data['adr_two_street'].'$'.$data['adr_two_locality'].', '.$data['adr_two_region'].'$'.$data['adr_two_postalcode'].'$$'.$data['adr_two_countryname'],
 		) as $attr => $value)
 		{
-			if($value != '$, $$$')
+			if ($value != '$, $$$')
 			{
-				$ldapContact[$attr] = Api\Translation::convert($value,$this->charset,'utf-8');
+				$ldapContact[$attr] = Api\Translation::convert($value, $this->charset, 'utf-8');
 			}
-			elseif($isUpdate)
+			elseif ($isUpdate)
 			{
 				$ldapContact[$attr] = array();
 			}
@@ -1290,7 +1288,7 @@ 
 		{
 			$ldapContact['primaryphone'] = $data[$data['tel_prefer']];
 		}
-		elseif($isUpdate)
+		elseif ($isUpdate)
 		{
 			$ldapContact['primaryphone'] = array();
 		}
@@ -1305,23 +1303,23 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _evolutionperson2egw(&$contact,$data)
+	function _evolutionperson2egw(&$contact, $data)
 	{
 		if ($data['category'] && is_array($data['category']))
 		{
 			$contact['cat_id'] = array();
-			foreach($data['category'] as $iii => $cat)
+			foreach ($data['category'] as $iii => $cat)
 			{
 				if (!is_int($iii)) continue;
 
 				$contact['cat_id'][] = $GLOBALS['egw']->categories->name2id($cat);
 			}
-			if ($contact['cat_id']) $contact['cat_id'] = implode(',',$contact['cat_id']);
+			if ($contact['cat_id']) $contact['cat_id'] = implode(',', $contact['cat_id']);
 		}
 		if ($data['primaryphone'])
 		{
-			unset($contact['tel_prefer']);	// to not find itself
-			$contact['tel_prefer'] = array_search($data['primaryphone'][0],$contact);
+			unset($contact['tel_prefer']); // to not find itself
+			$contact['tel_prefer'] = array_search($data['primaryphone'][0], $contact);
 		}
 	}
 
@@ -1334,10 +1332,10 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _inetorgperson2egw(&$contact, $data, $cn='cn')
+	function _inetorgperson2egw(&$contact, $data, $cn = 'cn')
 	{
 		$matches = null;
-		if(empty($data['givenname'][0]))
+		if (empty($data['givenname'][0]))
 		{
 			$parts = explode($data['sn'][0], $data[$cn][0]);
 			$contact['n_prefix'] = trim($parts[0]);
@@ -1345,8 +1343,8 @@ 
 		}
 		// iOS addressbook either use "givenname surname" or "surname givenname" depending on contact preference display-order
 		// in full name, so we need to check for both when trying to parse prefix, middle name and suffix form full name
-		elseif (preg_match($preg='/^(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*) *'.preg_quote($data['sn'][0], '/').' *(.*)$/', $data[$cn][0], $matches) ||
-			preg_match($preg='/^(.*) *'.preg_quote($data['sn'][0], '/').'[, ]*(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*)$/', $data[$cn][0], $matches))
+		elseif (preg_match($preg = '/^(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*) *'.preg_quote($data['sn'][0], '/').' *(.*)$/', $data[$cn][0], $matches) ||
+			preg_match($preg = '/^(.*) *'.preg_quote($data['sn'][0], '/').'[, ]*(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*)$/', $data[$cn][0], $matches))
 		{
 			list(,$contact['n_prefix'], $contact['n_middle'], $contact['n_suffix']) = $matches;
 			//error_log(__METHOD__."() preg_match('$preg', '{$data[$cn][0]}') = ".array2string($matches));
@@ -1367,11 +1365,11 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _posixaccount2egw(&$contact,$data)
+	function _posixaccount2egw(&$contact, $data)
 	{
-		unset($contact);	// not used, but required by function signature
-		static $shadowExpireNow=null;
-		if (!isset($shadowExpireNow)) $shadowExpireNow = floor((time()-date('Z'))/86400);
+		unset($contact); // not used, but required by function signature
+		static $shadowExpireNow = null;
+		if (!isset($shadowExpireNow)) $shadowExpireNow = floor((time() - date('Z')) / 86400);
 
 		// exclude expired or deactivated accounts
 		if (isset($data['shadowexpire']) && $data['shadowexpire'][0] <= $shadowExpireNow)
@@ -1389,7 +1387,7 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _mozillaabpersonalpha2egw(&$contact,$data)
+	function _mozillaabpersonalpha2egw(&$contact, $data)
 	{
 		if ($data['c'])
 		{
@@ -1407,7 +1405,7 @@ 
 	 * @param array $data eGW contact data
 	 * @param boolean $isUpdate
 	 */
-	function _egw2mozillaabpersonalpha(&$ldapContact,$data,$isUpdate)
+	function _egw2mozillaabpersonalpha(&$ldapContact, $data, $isUpdate)
 	{
 		if ($data['adr_one_countrycode'])
 		{
@@ -1436,9 +1434,9 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _mozillaorgperson2egw(&$contact,$data)
+	function _mozillaorgperson2egw(&$contact, $data)
 	{
-		unset($contact, $data);	// not used, but required by function signature
+		unset($contact, $data); // not used, but required by function signature
 		// no special handling necessary, as it supports two distinct attributes: c, cn
 	}
 
@@ -1452,7 +1450,7 @@ 
 	 * @param array $data eGW contact data
 	 * @param boolean $isUpdate
 	 */
-	function _egw2mozillaorgperson(&$ldapContact,$data,$isUpdate)
+	function _egw2mozillaorgperson(&$ldapContact, $data, $isUpdate)
 	{
 		if ($data['adr_one_countrycode'])
 		{
@@ -1480,7 +1478,7 @@ 
 	 * @param int $account_id account-id of the old owner
 	 * @param int $new_owner account-id of the new owner
 	 */
-	function change_owner($account_id,$new_owner)
+	function change_owner($account_id, $new_owner)
 	{
 		error_log(__METHOD__."($account_id,$new_owner) not yet implemented");
 	}

api/src/Contacts/Sql.php

Indentation +3 added lines, -3 removed lines

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

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

@@ -336,18 +336,18 @@ 
 		$match_count = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] ?
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] : 3;
 
-		$columns = Array();
-		$extra = Array();
+		$columns = array();
+		$extra = array();
 		$order = in_array($param['order'], $group) ? $param['order'] : $group[0];
 		$join .= $this->table_name .'.contact_id != a2.contact_id AND (';
-		$join_fields = Array();
+		$join_fields = array();
 		foreach($group as $field)
 		{
 			$extra[] = "IF({$this->table_name}.$field = a2.$field, 1, 0)";
 			$join_fields[] = $this->table_name . ".$field = a2.$field";
 			$columns[] = "IF({$this->table_name}.$field = a2.$field, {$this->table_name}.$field, '') AS $field";
 		}
-		$extra = Array(
+		$extra = array(
 			implode('+', $extra) . ' AS match_count'
 		);
 		$join .= $this->db->column_data_implode(' OR ',$join_fields) . ')';
@@ -382,7 +382,7 @@ 
 		}
 		
 		$rows = $this->db->query(
-				"SELECT $mysql_calc_rows " . $columns. ', COUNT(contact_id) AS group_count' .
+				"select $mysql_calc_rows " . $columns. ', COUNT(contact_id) AS group_count' .
 				' FROM (' . $sub_query . ') AS matches GROUP BY ' . implode(',',$group) .
 				' HAVING group_count > 1 ORDER BY ' . $order,
 				__LINE__, __FILE__, (int)$param['start'],$mysql_calc_rows ? (int)$param['num_rows'] : -1
@@ -720,7 +720,7 @@ 
 			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
 				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				'',false,0,"join $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}

Braces +144 added lines, -37 removed lines

@@ -112,11 +112,20 @@ 
 		$filter = is_array($param['col_filter']) ? $param['col_filter'] : array();
 		$join = '';
 		$op = 'OR';
-		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
+		if (isset($param['op']) && !empty($param['op']))
+		{
+			$op = $param['op'];
+		}
 		$advanced_search = false;
-		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
+		if (isset($param['advanced_search']) && !empty($param['advanced_search']))
+		{
+			$advanced_search = true;
+		}
 		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard'])))
+		{
+			$wildcard = ($param['wildcard']?$param['wildcard']:'');
+		}
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($filter['cat_id'])
@@ -134,7 +143,11 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int) $filter['owner']])
+				{
+					return false;
+				}
+				// we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -223,7 +236,10 @@ 
 		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
 			array($param['start'],$param['num_rows']),$filter,$join);
 
-		if (!$rows) return false;
+		if (!$rows)
+		{
+			return false;
+		}
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
@@ -298,11 +314,20 @@ 
 		$join = 'JOIN ' . $this->table_name . ' AS a2 ON ';
 		$filter = $param['col_filter'];
 		$op = 'OR';
-		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
+		if (isset($param['op']) && !empty($param['op']))
+		{
+			$op = $param['op'];
+		}
 		$advanced_search = false;
-		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
+		if (isset($param['advanced_search']) && !empty($param['advanced_search']))
+		{
+			$advanced_search = true;
+		}
 		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard'])))
+		{
+			$wildcard = ($param['wildcard']?$param['wildcard']:'');
+		}
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($param['cat_id'])
@@ -333,7 +358,11 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if (array_key_exists('owner', $param))
 			{
-				if (!$this->grants[(int) $param['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int) $param['owner']])
+				{
+					return false;
+				}
+				// we have no access to that addressbook
 
 				$filter[$this->table_name.'.contact_owner'] = $param['owner'];
 				$filter[$this->table_name.'.private'] = 0;
@@ -473,7 +502,10 @@ 
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false, $ignore_acl=false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		}
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -522,7 +554,10 @@ 
 				// no grants for selected owner/addressbook
 				if (!array_intersect((array)$filter['owner'],array_keys($this->grants)))
 				{
-					if (!isset($groupmember_sql)) return false;
+					if (!isset($groupmember_sql))
+					{
+						return false;
+					}
 					$filter[] = substr($groupmember_sql,4);
 					unset($filter['owner']);
 				}
@@ -574,13 +609,16 @@ 
 				$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
 			}
 		}
-		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
+		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))
+		{
+			// search also adds a join for custom fields!
 		{
 			switch(gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
+		}
 				case 'string':
 					$only_keys = explode(',',$only_keys);
 					// fall through
@@ -590,13 +628,23 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				if (!is_array($extra_cols))
+				{
+					$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				}
 				foreach($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
-					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
+					if ($column[0] == '#')
+					{
+						continue;
+					}
+					// order by custom field is handeled in so_sql_cf anyway
+					if (($key = array_search($column, $this->db_cols)) !== false)
+					{
+						$column = $key;
+					}
 					if (strpos($column,'.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
@@ -611,10 +659,13 @@ 
 					}
 					$extra_cols[] = $table.$column.' '.$matches[2];
 					//_debug_array($matches);
-					if (!empty($order_by) && $table) // postgres requires explizit order by
+					if (!empty($order_by) && $table)
+					{
+						// postgres requires explizit order by
 					{
 						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
 					}
+					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
@@ -640,7 +691,11 @@ 
 		}
 		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false)
+		{
+			$this->total = is_array($rows) ? count($rows) : 0;
+		}
+		// so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -682,7 +737,10 @@ 
 		$cat_filter = array();
 		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat))
+			{
+				$cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			}
 		}
 		return $cat_filter;
 	}
@@ -695,10 +753,13 @@ 
 	 */
 	function change_owner($account_id,$new_owner)
 	{
-		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
+		if (!$new_owner)
+		{
+			// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
+		}
 		// contacts
 		$this->db->update($this->table_name,array(
 			'contact_owner' => $new_owner,
@@ -743,7 +804,10 @@ 
 		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
 			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
-			if ($member_attr) $row['members'] = array();
+			if ($member_attr)
+			{
+				$row['members'] = array();
+			}
 			$lists[$row['list_id']] = $row;
 		}
 		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
@@ -806,9 +870,15 @@ 
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
-		if (!$keys && !$data || !(int)$owner) return false;
+		if (!$keys && !$data || !(int)$owner)
+		{
+			return false;
+		}
 
-		if ($keys && !is_array($keys)) $keys = array('list_name' => $keys);
+		if ($keys && !is_array($keys))
+		{
+			$keys = array('list_name' => $keys);
+		}
 		if ($keys)
 		{
 			$keys['list_owner'] = $owner;
@@ -828,9 +898,15 @@ 
 		}
 		$data['list_modified'] = time();
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
-		if (!$data['list_id']) unset($data['list_id']);
+		if (!$data['list_id'])
+		{
+			unset($data['list_id']);
+		}
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
@@ -848,7 +924,10 @@ 
 
 			$this->add2list($list_id,$contacts,array());
 		}
-		if ($keys) $data += $keys;
+		if ($keys)
+		{
+			$data += $keys;
+		}
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
 		return $list_id;
 	}
@@ -863,7 +942,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		if (!is_array($existing))
 		{
@@ -905,7 +987,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		$where = array(
 			'contact_id' => $contact,
@@ -947,7 +1032,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
 
@@ -962,7 +1050,10 @@ 
 	 */
 	function lists_ctag($owner=null)
 	{
-		if (is_null($owner)) $owner = array_keys($this->grants);
+		if (is_null($owner))
+		{
+			$owner = array_keys($this->grants);
+		}
 
 		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
 			__LINE__,__FILE__)->fetchColumn()))
@@ -982,9 +1073,12 @@ 
 	 */
 	function read($keys,$extra_cols='',$join='')
 	{
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
@@ -1004,7 +1098,8 @@ 
 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
-				|| strlen($contact['uid']) < $minimum_uid_length)) {
+				|| strlen($contact['uid']) < $minimum_uid_length))
+		{
 			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
 		}
 		return $contact;
@@ -1021,19 +1116,28 @@ 
 	{
 		unset($extra_where);	// not used, but required by function signature
 
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		$new_entry = !$this->data['id'];
 
-		if (isset($this->data['etag']))		// do we have an etag in the data to write
+		if (isset($this->data['etag']))
+		{
+			// do we have an etag in the data to write
 		{
 			$etag = $this->data['etag'];
+		}
 			unset($this->data['etag']);
 			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
 			{
@@ -1105,7 +1209,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!$list) return false;
+		if (!$list)
+		{
+			return false;
+		}
 
 		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
 	}

Spacing +154 added lines, -158 removed lines

@@ -44,7 +44,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $contacts_id='id';
+	var $contacts_id = 'id';
 
 	/**
 	 * Name of the table for distribution lists
@@ -67,7 +67,7 @@ 
 	 *
 	 * @param Api\Db $db =null
 	 */
-	function __construct(Api\Db $db=null)
+	function __construct(Api\Db $db = null)
 	{
 		parent::__construct('api', 'egw_addressbook', self::EXTRA_TABLE,
 			'contact_', '_name', '_value', '_id', $db);
@@ -115,8 +115,8 @@ 
 		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
 		$advanced_search = false;
 		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
-		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		$wildcard = '%';
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard'] ? $param['wildcard'] : '');
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($filter['cat_id'])
@@ -134,7 +134,7 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int)$filter['owner']]) return false; // we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -143,19 +143,18 @@ 
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "(".$this->table_name.".contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
-					(!$this->grants ? ')' :
-					" OR contact_private=0 AND ".$this->table_name.".contact_owner IN (".
-					implode(',',array_keys($this->grants))."))");
+					(!$this->grants ? ')' : " OR contact_private=0 AND ".$this->table_name.".contact_owner IN (".
+					implode(',', array_keys($this->grants))."))");
 			}
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== 'none')
 			{
 				$join .= self::ACCOUNT_ACTIVE_JOIN;
 				if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '0')
 				{
-					$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+					$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), self::ACOUNT_ACTIVE_FILTER);
 				}
 				else
 				{
@@ -169,7 +168,7 @@ 
 		}
 		else
 		{
-			$filter[] = "org_name != ''";// AND org_name IS NOT NULL";
+			$filter[] = "org_name != ''"; // AND org_name IS NOT NULL";
 		}
 		if (isset($filter['list']))
 		{
@@ -187,7 +186,7 @@ 
 		}
 		$sort = $param['sort'] == 'DESC' ? 'DESC' : 'ASC';
 
-		list(,$by) = explode(',',$param['org_view']);
+		list(,$by) = explode(',', $param['org_view']);
 		if (!$by)
 		{
 			$extra = array(
@@ -200,41 +199,40 @@ 
 		else	// by adr_one_location or org_unit
 		{
 			// org total for more then one $by
-			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" :
-				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
-			parent::search($param['search'],array('org_name'),
+			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" : "COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name HAVING $by_expr > 1 ORDER BY org_name $sort", array(
 				"NULL AS $by",
 				'1 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter,$join);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter, $join);
 			// org by location
-			parent::search($param['search'],array('org_name'),
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name,$by ORDER BY org_name $sort,$by $sort", array(
 				"CASE WHEN $by IS NULL THEN '' ELSE $by END AS $by",
 				'0 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter,$join);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter, $join);
 			$append = "ORDER BY org_name $sort,is_main DESC,$by $sort";
 		}
-		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
-			array($param['start'],$param['num_rows']),$filter,$join);
+		$rows = parent::search($param['search'], array('org_name'), $append, $extra, $wildcard, false, $op/*'OR'*/,
+			array($param['start'], $param['num_rows']), $filter, $join);
 
 		if (!$rows) return false;
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			if ($row['org_unit_count'] == 1 || $row['adr_one_locality_count'] == 1)
 			{
-				$filter['org_name'][$row['org_name']] = $row['org_name'];	// use as key too to have every org only once
+				$filter['org_name'][$row['org_name']] = $row['org_name']; // use as key too to have every org only once
 			}
-			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count']==1 ? $row[$by] : '|||') : '');
+			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count'] == 1 ? $row[$by] : '|||') : '');
 			$row['group_count'] = $row['org_count'];
 			$orgs[$org_key] = $row;
 		}
@@ -242,9 +240,9 @@ 
 
 		if (count($filter['org_name']))
 		{
-			foreach((array) parent::search(null, array('org_name','org_unit','adr_one_locality'),
+			foreach ((array)parent::search(null, array('org_name', 'org_unit', 'adr_one_locality'),
 				'GROUP BY org_name,org_unit,adr_one_locality',
-				'',$wildcard,false,$op/*'AND'*/,false,$filter,$join) as $row)
+				'', $wildcard, false, $op/*'AND'*/, false, $filter, $join) as $row)
 			{
 				$org_key = $row['org_name'].($by ? '|||'.$row[$by] : '');
 				if ($orgs[$org_key]['org_unit_count'] == 1)
@@ -296,27 +294,27 @@ 
 	 */
 	function duplicates($param)
 	{
-		$join = 'JOIN ' . $this->table_name . ' AS a2 ON ';
+		$join = 'JOIN '.$this->table_name.' AS a2 ON ';
 		$filter = $param['col_filter'];
 		$op = 'OR';
 		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
 		$advanced_search = false;
 		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
-		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		$wildcard = '%';
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard'] ? $param['wildcard'] : '');
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($param['cat_id'])
 		{
 			$cat_filter = $this->_cat_filter($filter['cat_id']);
-			$filter[] = str_replace('cat_id', $this->table_name . '.cat_id', $cat_filter);
-			$join .= str_replace('cat_id', 'a2.cat_id', $cat_filter) . ' AND ';
+			$filter[] = str_replace('cat_id', $this->table_name.'.cat_id', $cat_filter);
+			$join .= str_replace('cat_id', 'a2.cat_id', $cat_filter).' AND ';
 			unset($filter['cat_id']);
 		}
 		if ($filter['tid'])
 		{
-			$filter[$this->table_name . '.contact_tid'] = $param['col_filter']['tid'];
-			$join .= 'a2.contact_tid = ' . $this->db->quote($filter['tid']) . ' AND ';
+			$filter[$this->table_name.'.contact_tid'] = $param['col_filter']['tid'];
+			$join .= 'a2.contact_tid = '.$this->db->quote($filter['tid']).' AND ';
 			unset($filter['tid']);
 		}
 		else
@@ -324,33 +322,33 @@ 
 			$join .= 'a2.contact_tid != \'D\' AND ';
 		}
 		// add filter for read ACL in sql, if user is NOT the owner of the addressbook
-		if (array_key_exists('owner',$param) && $param['owner'] == $GLOBALS['egw_info']['user']['account_id'])
+		if (array_key_exists('owner', $param) && $param['owner'] == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			$filter[$this->table_name.'.contact_owner'] = $param['owner'];
-			$join .= 'a2.contact_owner = ' . $this->db->quote($param['owner']) . ' AND ';
+			$join .= 'a2.contact_owner = '.$this->db->quote($param['owner']).' AND ';
 		}
 		else
 		{
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if (array_key_exists('owner', $param))
 			{
-				if (!$this->grants[(int) $param['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int)$param['owner']]) return false; // we have no access to that addressbook
 
 				$filter[$this->table_name.'.contact_owner'] = $param['owner'];
 				$filter[$this->table_name.'.private'] = 0;
-				$join .= 'a2.contact_owner = ' . $this->db->quote($param['owner']) . ' AND ';
-				$join .= 'a2.contact_private = ' . $this->db->quote($filter['private']) . ' AND ';
+				$join .= 'a2.contact_owner = '.$this->db->quote($param['owner']).' AND ';
+				$join .= 'a2.contact_private = '.$this->db->quote($filter['private']).' AND ';
 			}
 			else	// search all addressbooks, incl. accounts
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = $access = "(".$this->table_name.".contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR {$this->table_name}.contact_private=0 AND ".$this->table_name.".contact_owner IN (".
-					implode(',',array_keys($this->grants))."))";
-				$join .= str_replace($this->table_name, 'a2', $access) . ' AND ';
+					implode(',', array_keys($this->grants))."))";
+				$join .= str_replace($this->table_name, 'a2', $access).' AND ';
 			}
 		}
 		if ($param['searchletter'])
@@ -359,34 +357,33 @@ 
 		}
 		$sort = $param['sort'] == 'DESC' ? 'DESC' : 'ASC';
 		$group = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields'] ?
-				explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']):
-				array('n_family', 'org_name', 'contact_email');
+				explode(',', $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']) : array('n_family', 'org_name', 'contact_email');
 		$match_count = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] ?
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'] : 3;
 
 		$columns = Array();
 		$extra = Array();
 		$order = in_array($param['order'], $group) ? $param['order'] : $group[0];
-		$join .= $this->table_name .'.contact_id != a2.contact_id AND (';
+		$join .= $this->table_name.'.contact_id != a2.contact_id AND (';
 		$join_fields = Array();
-		foreach($group as $field)
+		foreach ($group as $field)
 		{
 			$extra[] = "IF({$this->table_name}.$field = a2.$field, 1, 0)";
-			$join_fields[] = $this->table_name . ".$field = a2.$field";
+			$join_fields[] = $this->table_name.".$field = a2.$field";
 			$columns[] = "IF({$this->table_name}.$field = a2.$field, {$this->table_name}.$field, '') AS $field";
 		}
 		$extra = Array(
-			implode('+', $extra) . ' AS match_count'
+			implode('+', $extra).' AS match_count'
 		);
-		$join .= $this->db->column_data_implode(' OR ',$join_fields) . ')';
+		$join .= $this->db->column_data_implode(' OR ', $join_fields).')';
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== 'none')
 		{
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '0')
 			{
-				$join .=' LEFT JOIN egw_accounts AS account_1 ON egw_addressbook.account_id=account_1.account_id ';
-				$join .=' LEFT JOIN egw_accounts AS account_2 ON egw_addressbook.account_id=account_2.account_id ';
-				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'),array(time(),'account_1.account_'),self::ACOUNT_ACTIVE_FILTER);
-				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'),array(time(),'account_2.account_'),self::ACOUNT_ACTIVE_FILTER);
+				$join .= ' LEFT JOIN egw_accounts AS account_1 ON egw_addressbook.account_id=account_1.account_id ';
+				$join .= ' LEFT JOIN egw_accounts AS account_2 ON egw_addressbook.account_id=account_2.account_id ';
+				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'), array(time(), 'account_1.account_'), self::ACOUNT_ACTIVE_FILTER);
+				$filter[] = str_replace(array('UNIX_TIMESTAMP(NOW())', 'account_'), array(time(), 'account_2.account_'), self::ACOUNT_ACTIVE_FILTER);
 			}
 			else
 			{
@@ -400,17 +397,17 @@ 
 		if ($param['search'] && !is_array($param['search']))
 		{
 			$search_cols = array();
-			foreach($group as $col)
+			foreach ($group as $col)
 			{
-				$search_cols[] = $this->table_name . '.' . $col;
+				$search_cols[] = $this->table_name.'.'.$col;
 			}
-			$search = $this->search2criteria($param['search'],$wildcard,$op, null, $search_cols);
+			$search = $this->search2criteria($param['search'], $wildcard, $op, null, $search_cols);
 			$criteria = array($search);
 		}
 		$query = $this->parse_search(array_merge($criteria, $filter), $wildcard, false, ' AND ');
 
 		$sub_query = $this->db->select($this->table_name,
-			'DISTINCT ' . implode(', ',array_merge($columns, $extra)),
+			'DISTINCT '.implode(', ', array_merge($columns, $extra)),
 			$query,
 			False, False, 0, $append, False, -1,
 			$join
@@ -423,15 +420,15 @@ 
 		}
 
 		$rows = $this->db->query(
-				"SELECT $mysql_calc_rows " . $columns. ', COUNT(contact_id) AS group_count' .
-				' FROM (' . $sub_query . ') AS matches GROUP BY ' . implode(',',$group) .
-				' HAVING group_count > 1 ORDER BY ' . $order,
-				__LINE__, __FILE__, (int)$param['start'],$mysql_calc_rows ? (int)$param['num_rows'] : -1
+				"SELECT $mysql_calc_rows ".$columns.', COUNT(contact_id) AS group_count'.
+				' FROM ('.$sub_query.') AS matches GROUP BY '.implode(',', $group).
+				' HAVING group_count > 1 ORDER BY '.$order,
+				__LINE__, __FILE__, (int)$param['start'], $mysql_calc_rows ? (int)$param['num_rows'] : -1
 		);
 
 		// Go through rows and only return one for each pair/triplet/etc. of matches
 		$dupes = array();
-		foreach($rows as $key => $row)
+		foreach ($rows as $key => $row)
 		{
 			$row['email'] = $row['contact_email'];
 			$row['email_home'] = $row['contact_email_home'];
@@ -472,9 +469,9 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return boolean/array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false, $ignore_acl=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false, $ignore_acl = false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -490,10 +487,10 @@ 
 		{
 			if ($filter['cat_id'][0] == '!')
 			{
-				$filter['cat_id'] = substr($filter['cat_id'],1);
+				$filter['cat_id'] = substr($filter['cat_id'], 1);
 				$not = 'NOT';
 			}
-			$filter[] = $this->_cat_filter($filter['cat_id'],$not);
+			$filter[] = $this->_cat_filter($filter['cat_id'], $not);
 			unset($filter['cat_id']);
 		}
 
@@ -503,17 +500,17 @@ 
 		{
 			// add read ACL for groupmembers (they have no
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				(!isset($filter['owner']) || in_array('0',(array)$filter['owner'])))
+				(!isset($filter['owner']) || in_array('0', (array)$filter['owner'])))
 			{
 				$groupmembers = array();
-				foreach($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $group_id)
+				foreach ($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $group_id)
 				{
-					if (($members = $GLOBALS['egw']->accounts->members($group_id,true)))
+					if (($members = $GLOBALS['egw']->accounts->members($group_id, true)))
 					{
-						$groupmembers = array_merge($groupmembers,$members);
+						$groupmembers = array_merge($groupmembers, $members);
 					}
 				}
-				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.',array(
+				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.', array(
 					'account_id' => array_unique($groupmembers),
 				));
 			}
@@ -521,10 +518,10 @@ 
 			if (isset($filter['owner']))
 			{
 				// no grants for selected owner/addressbook
-				if (!array_intersect((array)$filter['owner'],array_keys($this->grants)))
+				if (!array_intersect((array)$filter['owner'], array_keys($this->grants)))
 				{
 					if (!isset($groupmember_sql)) return false;
-					$filter[] = substr($groupmember_sql,4);
+					$filter[] = substr($groupmember_sql, 4);
 					unset($filter['owner']);
 				}
 				// for an owner filter, which does NOT include current user, filter out private entries
@@ -533,22 +530,22 @@ 
 					$filter['private'] = 0;
 				}
 				// if multiple addressbooks (incl. current owner) are searched, we need full acl filter
-				elseif(is_array($filter['owner']) && count($filter['owner']) > 1)
+				elseif (is_array($filter['owner']) && count($filter['owner']) > 1)
 				{
 					$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 						" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-						implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+						implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 				}
 			}
 			else	// search all addressbooks, incl. accounts
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					($this->grants ? " OR contact_private=0 AND $this->table_name.contact_owner IN (".
-						implode(',',array_keys($this->grants)).")" : '').
+						implode(',', array_keys($this->grants)).")" : '').
 					$groupmember_sql." OR $this->table_name.contact_owner IS NULL)";
 			}
 		}
@@ -567,24 +564,24 @@ 
 			unset($filter['list']);
 		}
 		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)
-		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository,0,3) == 'sql' &&
-			strpos($join,$GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id',$filter))
+		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository, 0, 3) == 'sql' &&
+			strpos($join, $GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id', $filter))
 		{
 			$join .= self::ACCOUNT_ACTIVE_JOIN;
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '0')
 			{
-				$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+				$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), self::ACOUNT_ACTIVE_FILTER);
 			}
 		}
 		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
 		{
-			switch(gettype($only_keys))
+			switch (gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
 				case 'string':
-					$only_keys = explode(',',$only_keys);
+					$only_keys = explode(',', $only_keys);
 					// fall through
 			}
 			// postgres requires that expressions in order by appear in the columns of a distinct select
@@ -592,14 +589,14 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
-				foreach($all_matches as $matches)
+				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
+				foreach ($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
+					if ($column[0] == '#') continue; // order by custom field is handeled in so_sql_cf anyway
 					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
-					if (strpos($column,'.') === false)
+					if (strpos($column, '.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
 						if (isset($this->db_cols[$column]))
@@ -615,34 +612,34 @@ 
 					//_debug_array($matches);
 					if (!empty($order_by) && $table) // postgres requires explizit order by
 					{
-						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
+						$order_by = str_replace($matches[0], $table.$column.' '.$matches[2].' '.$matches[3].$matches[4], $order_by);
 					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
 
 			// Understand search by date with wildcard (????.10.??) according to user date preference
-			if(is_string($criteria) && strpos($criteria, '?') !== false)
+			if (is_string($criteria) && strpos($criteria, '?') !== false)
 			{
 				// First, check for a 'date', with wildcards, in the user's format
-				$date_regex = str_replace('Q','d',
-					str_replace(array('Y','m','d','.','-'),
-						array('(?P<Y>(?:\?|\Q){4})','(?P<m>(?:\?|\Q){2})','(?P<d>(?:\?|\Q){2})','\.','\-'),
+				$date_regex = str_replace('Q', 'd',
+					str_replace(array('Y', 'm', 'd', '.', '-'),
+						array('(?P<Y>(?:\?|\Q){4})', '(?P<m>(?:\?|\Q){2})', '(?P<d>(?:\?|\Q){2})', '\.', '\-'),
 							$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
 
-				if(preg_match_all('$'.$date_regex.'$', $criteria, $matches))
+				if (preg_match_all('$'.$date_regex.'$', $criteria, $matches))
 				{
-					foreach($matches[0] as $m_id => $match)
+					foreach ($matches[0] as $m_id => $match)
 					{
 						// Birthday is Y-m-d
-						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*",$criteria);
+						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*", $criteria);
 					}
 				}
 			}
 		}
-		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		$rows = & parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0; // so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -654,18 +651,18 @@ 
 	 * @param int|array $cat_id
 	 * @return string sql to filter by given cat
 	 */
-	function _cat_filter($cat_id, $not='')
+	function _cat_filter($cat_id, $not = '')
 	{
 		if (!is_object($GLOBALS['egw']->categories))
 		{
 			$GLOBALS['egw']->categories = new Api\Categories;
 		}
-		foreach($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
+		foreach ($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
 		{
 			$cat_filter[] = $this->db->concat("','", 'cat_id', "','")." $not LIKE '%,$cat,%'";
 		}
-		$cfilter = '('.implode(' OR ',$cat_filter).')';
-		if(!empty($not))
+		$cfilter = '('.implode(' OR ', $cat_filter).')';
+		if (!empty($not))
 		{
 			$cfilter = "( $cfilter OR cat_id IS NULL )";
 		}
@@ -682,9 +679,9 @@ 
 	function _cat_search($cats)
 	{
 		$cat_filter = array();
-		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
+		foreach (is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',', $cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','", cat_id, "','")." LIKE '%,$cat,%'";
 		}
 		return $cat_filter;
 	}
@@ -695,32 +692,32 @@ 
 	 * @param int $account_id account-id of the old owner
 	 * @param int $new_owner account-id of the new owner
 	 */
-	function change_owner($account_id,$new_owner)
+	function change_owner($account_id, $new_owner)
 	{
 		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
 		// contacts
-		$this->db->update($this->table_name,array(
+		$this->db->update($this->table_name, array(
 			'contact_owner' => $new_owner,
-		),array(
+		), array(
 			'contact_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		// cfs
 		$this->db->update(self::EXTRA_TABLE, array(
 			'contact_owner' => $new_owner
-		),array(
+		), array(
 			'contact_owner' => $account_id
 		), __LINE__, __FILE__);
 
 		// lists
 		$this->db->update($this->lists_table, array(
 			'list_owner' => $new_owner,
-		),array(
+		), array(
 			'list_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -734,21 +731,21 @@ 
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
-	function get_lists($uids,$uid_column='list_owner',$member_attr=null,$limit_in_ab=false)
+	function get_lists($uids, $uid_column = 'list_owner', $member_attr = null, $limit_in_ab = false)
 	{
 		if (is_array($uids) && array_key_exists('list_id', $uids))
 		{
-			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.',array('list_id' => $uids['list_id']));
+			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.', array('list_id' => $uids['list_id']));
 			unset($uids['list_id']);
 		}
 		$lists = array();
-		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
-			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
+		foreach ($this->db->select($this->lists_table, '*', $uid_column ? array($uid_column=>$uids) : $uids, __LINE__, __FILE__,
+			false, 'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
 			if ($member_attr) $row['members'] = array();
 			$lists[$row['list_id']] = $row;
 		}
-		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
+		if ($lists && $member_attr && in_array($member_attr, array('contact_id', 'contact_uid', 'caldav_name')))
 		{
 			if ($limit_in_ab)
 			{
@@ -762,10 +759,9 @@ 
 					$in_ab_join .= "list_owner=$this->table_name.contact_owner";
 				}
 			}
-			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
+			foreach ($this->db->select($this->ab2list_table, "$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
-				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				__LINE__, __FILE__, false, $member_attr == 'contact_id' ? '' : '', false, 0, "JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}
@@ -805,7 +801,7 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
 		if (!$keys && !$data || !(int)$owner) return false;
@@ -819,7 +815,7 @@ 
 		{
 			$data['list_owner'] = $owner;
 		}
-		if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn()))
+		if (!$keys || !($list_id = $this->db->select($this->lists_table, 'list_id', $keys, __LINE__, __FILE__)->fetchColumn()))
 		{
 			$data['list_created'] = time();
 			$data['list_creator'] = $GLOBALS['egw_info']['user']['account_id'];
@@ -832,9 +828,9 @@ 
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		if (!$data['list_id']) unset($data['list_id']);
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table, $data, $keys, __LINE__, __FILE__)) return false;
 
-		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
+		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table, 'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
 		{
 			$update = array();
@@ -846,9 +842,9 @@ 
 			{
 				$update['list_carddav_name'] = $data['list_carddav_name'] = $data['list_uid'].'.vcf';
 			}
-			$this->db->update($this->lists_table,$update,array('list_id'=>$list_id),__LINE__,__FILE__);
+			$this->db->update($this->lists_table, $update, array('list_id'=>$list_id), __LINE__, __FILE__);
 
-			$this->add2list($list_id,$contacts,array());
+			$this->add2list($list_id, $contacts, array());
 		}
 		if ($keys) $data += $keys;
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
@@ -863,39 +859,39 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
 		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
 
 		if (!is_array($existing))
 		{
 			$existing = array();
-			foreach($this->db->select($this->ab2list_table,'contact_id',array('list_id'=>$list),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'contact_id', array('list_id'=>$list), __LINE__, __FILE__) as $row)
 			{
 				$existing[] = $row['contact_id'];
 			}
 		}
-		if (!($to_add = array_diff((array)$contact,$existing)))
+		if (!($to_add = array_diff((array)$contact, $existing)))
 		{
-			return true;	// no need to insert it, would give sql error
+			return true; // no need to insert it, would give sql error
 		}
-		foreach($to_add as $contact)
+		foreach ($to_add as $contact)
 		{
-			$this->db->insert($this->ab2list_table,array(
+			$this->db->insert($this->ab2list_table, array(
 				'contact_id' => $contact,
 				'list_id' => $list,
 				'list_added' => time(),
 				'list_added_by' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(),__LINE__,__FILE__);
+			), array(), __LINE__, __FILE__);
 		}
 		// update etag
-		return $this->db->update($this->lists_table,array(
+		return $this->db->update($this->lists_table, array(
 			'list_etag=list_etag+1',
 			'list_modified' => time(),
 			'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-		),array(
+		), array(
 			'list_id' => $list,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -905,7 +901,7 @@ 
 	 * @param int $list =null list-id or null to remove from all lists
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
 		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
 
@@ -919,24 +915,24 @@ 
 		else
 		{
 			$list = array();
-			foreach($this->db->select($this->ab2list_table,'list_id',$where,__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'list_id', $where, __LINE__, __FILE__) as $row)
 			{
 				$list[] = $row['list_id'];
 			}
 		}
-		if (!$this->db->delete($this->ab2list_table,$where,__LINE__,__FILE__))
+		if (!$this->db->delete($this->ab2list_table, $where, __LINE__, __FILE__))
 		{
 			return false;
 		}
-		foreach((array)$list as $list_id)
+		foreach ((array)$list as $list_id)
 		{
-			$this->db->update($this->lists_table,array(
+			$this->db->update($this->lists_table, array(
 				'list_etag=list_etag+1',
 				'list_modified' => time(),
 				'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(
+			), array(
 				'list_id' => $list_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		return true;
 	}
@@ -949,9 +945,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table, array('list_id' => $list), __LINE__, __FILE__)) return false;
 
-		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
+		$this->db->delete($this->ab2list_table, array('list_id' => $list), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -962,12 +958,12 @@ 
 	 * @param int|array $owner =null null for all lists user has access too
 	 * @return int
 	 */
-	function lists_ctag($owner=null)
+	function lists_ctag($owner = null)
 	{
 		if (is_null($owner)) $owner = array_keys($this->grants);
 
-		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
-			__LINE__,__FILE__)->fetchColumn()))
+		if (!($modified = $this->db->select($this->lists_table, 'MAX(list_modified)', array('list_owner'=>$owner),
+			__LINE__, __FILE__)->fetchColumn()))
 		{
 			return 0;
 		}
@@ -982,7 +978,7 @@ 
 	 * @param string $join
 	 * @return array|boolean
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -995,11 +991,11 @@ 
 			$keys = array('uid' => $keys);
 		}
 		try {
-			$contact = parent::read($keys,$extra_cols,$join);
+			$contact = parent::read($keys, $extra_cols, $join);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 			return false;
 		}
@@ -1007,7 +1003,7 @@ 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
 				|| strlen($contact['uid']) < $minimum_uid_length)) {
-			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
+			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook', $contact['id'])));
 		}
 		return $contact;
 	}
@@ -1021,7 +1017,7 @@ 
 	 */
 	function save($keys = NULL, $extra_where = NULL)
 	{
-		unset($extra_where);	// not used, but required by function signature
+		unset($extra_where); // not used, but required by function signature
 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -1037,9 +1033,9 @@ 
 		{
 			$etag = $this->data['etag'];
 			unset($this->data['etag']);
-			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
+			if (!($err = parent::save(array('contact_etag=contact_etag+1'), array('contact_etag' => $etag))))
 			{
-				$this->data['etag'] = $etag+1;
+				$this->data['etag'] = $etag + 1;
 			}
 			else
 			{
@@ -1059,7 +1055,7 @@ 
 		// enforce a minium uid strength
 		if (!isset($this->data['uid']) || strlen($this->data['uid']) < $minimum_uid_length)
 		{
-			$update['uid'] = Api\CalDAV::generate_uid('addressbook',$this->data['id']);
+			$update['uid'] = Api\CalDAV::generate_uid('addressbook', $this->data['id']);
 			//echo "<p>set uid={$this->data['uid']}, etag={$this->data['etag']}</p>";
 		}
 		// set carddav_name, if not given by caller
@@ -1077,17 +1073,17 @@ 
 					'contact_id' => $this->data['id'],
 				), __LINE__, __FILE__)->fetchColumn();
 			}
-			$path =  Api\Link::vfs_path('addressbook', $this->data['id'], Api\Contacts::FILES_PHOTO);
+			$path = Api\Link::vfs_path('addressbook', $this->data['id'], Api\Contacts::FILES_PHOTO);
 			$backup = Api\Vfs::$is_root; Api\Vfs::$is_root = true;
 			if (empty($this->data['jpegphoto']))
 			{
 				unlink($path);
-				$update['files'] = $this->data['files'] & ~Api\Contacts::FILES_BIT_PHOTO;
+				$update['files'] = $this->data['files']&~Api\Contacts::FILES_BIT_PHOTO;
 			}
 			else
 			{
 				file_put_contents($path, $this->data['jpegphoto']);
-				$update['files'] = $this->data['files'] | Api\Contacts::FILES_BIT_PHOTO;
+				$update['files'] = $this->data['files']|Api\Contacts::FILES_BIT_PHOTO;
 			}
 			Api\Vfs::$is_root = $backup;
 		}
@@ -1109,7 +1105,7 @@ 
 	{
 		if (!$list) return false;
 
-		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
+		return $this->db->select($this->lists_table, '*', array('list_id'=>$list), __LINE__, __FILE__)->fetch();
 	}
 
 	/**
@@ -1120,9 +1116,9 @@ 
 	 * @param array $extra_cols =array() extra-data to be saved
 	 * @return bool false on success, errornumber on failure
 	 */
-	function save_customfields(&$data, array $extra_cols=array())
+	function save_customfields(&$data, array $extra_cols = array())
 	{
-		return parent::save_customfields($data, array('contact_owner' => $data['owner'])+$extra_cols);
+		return parent::save_customfields($data, array('contact_owner' => $data['owner']) + $extra_cols);
 	}
 
 	/**
@@ -1131,6 +1127,6 @@ 
 	*/
 	function delete_customfields($data)
 	{
-		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);
+		$this->db->delete($this->extra_table, $data, __LINE__, __FILE__);
 	}
 }

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);
 	}
 
 	/**

Spacing +226 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
 	 */
@@ -169,10 +169,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();
 
@@ -191,32 +191,32 @@ 
 	 * @param string &$opened_path full path of the file/resource, if the open was successfull and STREAM_USE_PATH was set
 	 * @return boolean true if the ressource was opened successful, otherwise false
 	 */
-	function stream_open ($url, $mode, $options, &$opened_path)
+	function stream_open($url, $mode, $options, &$opened_path)
 	{
 		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($this->overwrite_new) || !($stat = $this->url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!is_null($this->overwrite_new) || !($stat = $this->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=$this->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 = $this->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;
@@ -231,7 +231,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
@@ -239,7 +239,7 @@ 
 				'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),
 			);
@@ -256,35 +256,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;
@@ -293,9 +293,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 :-(
@@ -314,7 +314,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);
@@ -324,7 +324,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!");
 
@@ -336,7 +336,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__."()");
 
@@ -347,7 +347,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(
@@ -370,10 +370,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()))
@@ -406,13 +406,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;
 	}
@@ -428,13 +428,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;
 	}
@@ -451,7 +451,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))
 		{
@@ -465,7 +465,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."()");
 
@@ -488,13 +488,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;
 	}
@@ -506,7 +506,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__."()");
 
@@ -531,11 +531,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);
 	}
 
 	/**
@@ -547,28 +547,28 @@ 
 	 * @param string $url
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function unlink ( $url )
+	function unlink($url)
 	{
 		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
 		$parent_stat = !($dir = Vfs::dirname($path)) ? false :
 			$this->url_stat($dir, STREAM_URL_STAT_LINK);
 
-		if (!$parent_stat || !($stat = $this->url_stat($path,STREAM_URL_STAT_LINK)) ||
+		if (!$parent_stat || !($stat = $this->url_stat($path, STREAM_URL_STAT_LINK)) ||
 			!$dir || !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]);
@@ -576,7 +576,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']));
 			}
@@ -600,13 +600,13 @@ 
 	 * @param string $url_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function rename ( $url_from, $url_to)
+	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);
 
 		if (!($from_stat = $this->url_stat($path_from, 0)) || !$from_dir ||
@@ -615,14 +615,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 = $this->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,7 +633,7 @@ 
 			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 && !$this->unlink($url_to))
@@ -657,7 +657,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 +673,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 +693,19 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function mkdir ( $url, $mode, $options )
+	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 ($this->url_stat($path,STREAM_URL_STAT_QUIET))
+		if ($this->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 +713,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 = $this->url_stat($parent_path,STREAM_URL_STAT_QUIET);
+		if (($query = Vfs::parse_url($url, PHP_URL_QUERY))) $parent_path .= '?'.$query;
+		$parent = $this->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 (!$this->mkdir($parent_path,$mode,$options))
+			if (!$this->mkdir($parent_path, $mode, $options))
 			{
 				return false;
 			}
-			$parent = $this->url_stat($parent_path,0);
+			$parent = $this->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 +762,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 +788,24 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	function rmdir ( $url, $options )
+	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 = $this->url_stat($path, 0)) || $stat['mime'] != self::DIR_MIME_TYPE ||
-			!Vfs::check_access($parent, Vfs::WRITABLE, $this->url_stat($parent,0)))
+			!Vfs::check_access($parent, Vfs::WRITABLE, $this->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 +813,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=?');
@@ -853,10 +852,10 @@ 
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path, $option, ".array2string($value).")");
 
-		switch($option)
+		switch ($option)
 		{
 			case STREAM_META_TOUCH:
-				return $this->touch($path, $value[0]);	// atime is not supported
+				return $this->touch($path, $value[0]); // atime is not supported
 
 			case STREAM_META_ACCESS:
 				return $this->chmod($path, $value);
@@ -885,26 +884,26 @@ 
 	 * @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!
 	 */
-	protected function touch($url,$time=null,$atime=null)
+	protected 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);
 
 		$vfs = new self();
-		if (!($stat = $vfs->url_stat($path,STREAM_URL_STAT_QUIET)))
+		if (!($stat = $vfs->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 (!$time)
 			{
-				return true;	// new (empty) file created with current mod time
+				return true; // new (empty) file created with current mod time
 			}
-			$stat = $vfs->url_stat($path,0);
+			$stat = $vfs->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');
@@ -923,40 +922,40 @@ 
 	 * @param int $owner
 	 * @return boolean
 	 */
-	protected function chown($url,$owner)
+	protected 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);
 
 		$vfs = new self();
-		if (!($stat = $vfs->url_stat($path,0)))
+		if (!($stat = $vfs->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'],
 		));
 	}
@@ -968,37 +967,37 @@ 
 	 * @param int $owner
 	 * @return boolean
 	 */
-	protected function chgrp($url,$owner)
+	protected 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);
 
 		$vfs = new self();
-		if (!($stat = $vfs->url_stat($path,0)))
+		if (!($stat = $vfs->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(
@@ -1014,39 +1013,39 @@ 
 	 * @param int $mode
 	 * @return boolean
 	 */
-	protected function chmod($url,$mode)
+	protected 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);
 
 		$vfs = new self();
-		if (!($stat = $vfs->url_stat($path,0)))
+		if (!($stat = $vfs->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'],
 		));
 	}
@@ -1059,18 +1058,18 @@ 
 	 * @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 = $this->url_stat($url,0)) || 		// dir not found
-			!($stat['mode'] & self::MODE_DIR) && $stat['mime'] != self::DIR_MIME_TYPE ||		// no dir
-			!Vfs::check_access($url,Vfs::EXECUTABLE|Vfs::READABLE,$stat))	// no access
+		if (!($stat = $this->url_stat($url, 0)) || // dir not found
+			!($stat['mode']&self::MODE_DIR) && $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['mode'] & self::MODE_DIR) && $stat['mime'] != self::DIR_MIME_TYPE ?
+			$msg = !($stat['mode']&self::MODE_DIR) && $stat['mime'] != self::DIR_MIME_TYPE ?
 				"$url is no directory" : 'permission denied';
 			if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$options) $msg!");
 			$this->opened_dir = null;
@@ -1087,13 +1086,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;
@@ -1125,26 +1124,26 @@ 
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
 	 * @return array
 	 */
-	function url_stat ( $url, $flags )
+	function url_stat($url, $flags)
 	{
-		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)");
 
-		$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]) && self::$stat_cache[$path] !== false)
@@ -1159,25 +1158,25 @@ 
 		$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 extended acl access to the url, we dont need and can NOT include the sql for the readable check
-		$eacl_access = static::check_extended_acl($path,Vfs::READABLE);
+		$eacl_access = static::check_extended_acl($path, Vfs::READABLE);
 
 		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)
 						{
@@ -1204,7 +1203,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=$eacl_access".' */ '.$query;
@@ -1230,7 +1229,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 $this->url_stat($url, $flags);
 		}
 		self::$stat_cache[$path] = $info;
@@ -1246,18 +1245,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;
@@ -1270,7 +1269,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1289,7 +1288,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1307,7 +1306,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( )");
 
@@ -1329,7 +1328,7 @@ 
 	static function readlink($path)
 	{
 		$vfs = new self();
-		$link = !($lstat = $vfs->url_stat($path,STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
+		$link = !($lstat = $vfs->url_stat($path, STREAM_URL_STAT_LINK)) || is_null($lstat['readlink']) ? false : $lstat['readlink'];
 
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = $link");
 
@@ -1343,32 +1342,32 @@ 
 	 * @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')");
 
 		$inst = new static();
-		if ($inst->url_stat($link,0))
+		if ($inst->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=$inst->url_stat($dir,0)))
+			!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat = $inst->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()),
@@ -1392,24 +1391,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;
 	}
 
@@ -1421,14 +1420,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))
@@ -1437,8 +1436,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));
@@ -1460,24 +1459,24 @@ 
 	 * @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))
 		{
 			$vfs = new self();
-			if (!($stat = $vfs->url_stat($path,0)))
+			if (!($stat = $vfs->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'];
 		}
@@ -1489,16 +1488,16 @@ 
 		{
 			// 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, false);
 		}
 		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;
@@ -1527,10 +1526,10 @@ 
 		if (!($stat = $inst->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,
@@ -1541,7 +1540,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) {
@@ -1560,7 +1559,7 @@ 
 	static function get_minimum_file_id($path)
 	{
 		$vfs = new self();
-		$stat = $vfs->url_stat($path,0);
+		$stat = $vfs->url_stat($path, 0);
 		if ($stat['readlink'])
 		{
 			$stat = $vfs->url_stat($stat['readlink'], 0);
@@ -1600,7 +1599,7 @@ 
 	 * @param int $recursion_count =0 internally used to break infinit recursions
 	 * @return false|string|array path or array or pathes indexed by fs_id, or false on error
 	 */
-	static function id2path($fs_ids, $recursion_count=0)
+	static function id2path($fs_ids, $recursion_count = 0)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')');
 		if ($recursion_count > self::MAX_ID2PATH_RECURSION)
@@ -1611,9 +1610,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]);
@@ -1627,7 +1626,7 @@ 
 		// now search via the database
 		if (count($ids) > 1) $ids = array_map(function($v) { return (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))
@@ -1638,12 +1637,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'];
 			}
@@ -1651,16 +1650,16 @@ 
 		}
 		unset($stmt);
 
-		if ($parents && !($parents = self::id2path($parents, $recursion_count+1)))
+		if ($parents && !($parents = self::id2path($parents, $recursion_count + 1)))
 		{
-			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);
@@ -1684,7 +1683,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
 			{
@@ -1705,9 +1704,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'],
@@ -1752,10 +1750,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'])
@@ -1764,14 +1762,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;
 	}
@@ -1787,7 +1785,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'];
 		}
 	}
@@ -1802,10 +1800,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':
@@ -1828,29 +1826,29 @@ 
 	 * @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)
 	{
 		static $inst = null;
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."(".array2string($path).','.array2string($props));
 		if (!is_numeric($path))
 		{
 			if (!isset($inst)) $inst = new self();
-			if (!($stat = $inst->url_stat($path,0)))
+			if (!($stat = $inst->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;
 
@@ -1895,17 +1893,17 @@ 
 	 * @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)
 	{
 		static $inst = null;
 
 		$ids = is_array($path_ids) ? $path_ids : array($path_ids);
-		foreach($ids as &$id)
+		foreach ($ids as &$id)
 		{
 			if (!is_numeric($id))
 			{
 				if (!isset($inst)) $inst = new self();
-				if (!($stat = $inst->url_stat($id,0)))
+				if (!($stat = $inst->url_stat($id, 0)))
 				{
 					if (self::LOG_LEVEL) error_log(__METHOD__."(".array2string($path_ids).",$ns) path '$id' not found!");
 					return false;
@@ -1915,7 +1913,7 @@ 
 		}
 		if (count($ids) >= 1) $ids = array_map(function($v) { return (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;
 
@@ -1924,7 +1922,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'],
@@ -1934,19 +1932,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) && is_array($id2path = self::id2path(array_keys($props))))	// need to map fs_id's to pathes
 		{
-			foreach($id2path as $id => $path)
+			foreach ($id2path 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 +423 added lines, -106 removed lines

@@ -193,7 +193,10 @@ 
 	 */
 	function stream_open ($url, $mode, $options, &$opened_path)
 	{
-		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);
@@ -205,7 +208,9 @@ 
 
 		parse_str(parse_url($url, PHP_URL_QUERY), $this->dir_url_params);
 
-		if (!is_null($this->overwrite_new) || !($stat = $this->url_stat($path,STREAM_URL_STAT_QUIET)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!is_null($this->overwrite_new) || !($stat = $this->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
@@ -213,7 +218,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);
@@ -225,7 +234,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)),
@@ -243,11 +255,17 @@ 
 				'fs_size'     => 0,
 				'fs_active'   => self::_pdo_boolean(true),
 			);
-			if ($this->overwrite_new) $values = array_merge($values, $this->overwrite_new);
+			if ($this->overwrite_new)
+			{
+				$values = array_merge($values, $this->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)
@@ -259,14 +277,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);
@@ -277,11 +301,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);
@@ -313,7 +343,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
@@ -322,11 +355,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);
 	}
@@ -338,7 +377,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)
 		{
@@ -408,7 +450,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))
 		{
@@ -430,7 +475,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))
 		{
@@ -467,7 +515,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))
 		{
@@ -490,7 +541,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))
 		{
@@ -508,7 +562,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))
 		{
@@ -533,7 +590,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);
 	}
@@ -549,7 +609,10 @@ 
 	 */
 	function unlink ( $url )
 	{
-		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);
 
@@ -561,13 +624,19 @@ 
 			!$dir || !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');
@@ -602,7 +671,10 @@ 
 	 */
 	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 = $this->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 && !$this->unlink($url_to))
 		{
 			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 @@ 
 	 */
 	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 ($this->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 = $this->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 (!$this->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 @@ 
 	 */
 	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);
@@ -851,7 +971,10 @@ 
 	 */
 	function stream_metadata($path, $option, $value)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path, $option, ".array2string($value).")");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($path, $option, ".array2string($value).")");
+		}
 
 		switch($option)
 		{
@@ -863,14 +986,18 @@ 
 
 			case STREAM_META_OWNER_NAME:
 				if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'u')) === false)
-					return false;
+				{
+									return false;
+				}
 				// fall through
 			case STREAM_META_OWNER:
 				return $this->chown($path, $value);
 
 			case STREAM_META_GROUP_NAME:
 				if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'g')) === false)
-					return false;
+				{
+									return false;
+				}
 				// fall through
 			case STREAM_META_GROUP:
 				return $this->chgrp($path, $value);
@@ -888,7 +1015,10 @@ 
 	protected 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);
 
@@ -925,26 +1055,38 @@ 
 	 */
 	protected 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);
 
 		$vfs = new self();
 		if (!($stat = $vfs->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;
@@ -952,7 +1094,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(
@@ -970,35 +1115,54 @@ 
 	 */
 	protected 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);
 
 		$vfs = new self();
 		if (!($stat = $vfs->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(
@@ -1016,33 +1180,48 @@ 
 	 */
 	protected 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);
 
 		$vfs = new self();
 		if (!($stat = $vfs->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(
@@ -1067,12 +1246,18 @@ 
 
 		if (!($stat = $this->url_stat($url,0)) || 		// dir not found
 			!($stat['mode'] & self::MODE_DIR) && $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['mode'] & self::MODE_DIR) && $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;
 		}
@@ -1081,7 +1266,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);
@@ -1093,7 +1281,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;
@@ -1131,9 +1322,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)");
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$url',$flags)");
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
@@ -1196,7 +1394,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();
@@ -1207,7 +1408,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=$eacl_access".' */ '.$query;
+			if (self::LOG_LEVEL > 2)
+			{
+				$query = '/* '.__METHOD__."($url,$flags) eacl_access=$eacl_access".' */ '.$query;
+			}
 			//if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
 
 			if (!($result = self::$pdo->query($query)) || !($info = $result->fetch(\PDO::FETCH_ASSOC)))
@@ -1230,12 +1434,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 $this->url_stat($url, $flags);
 		}
 		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);
 	}
 
@@ -1272,9 +1482,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);
 
@@ -1291,9 +1507,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);
 
@@ -1309,9 +1531,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;
 
@@ -1331,7 +1559,10 @@ 
 		$vfs = new self();
 		$link = !($lstat = $vfs->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;
 	}
@@ -1345,23 +1576,35 @@ 
 	 */
 	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')");
+		}
 
 		$inst = new static();
 		if ($inst->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=$inst->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)]);
 
@@ -1409,7 +1652,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;
 	}
 
@@ -1437,11 +1683,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));
+		}
 	}
 
 	/**
@@ -1471,12 +1721,18 @@ 
 			$vfs = new self();
 			if (!($stat = $vfs->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'];
@@ -1509,7 +1765,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;
 	}
 
@@ -1544,7 +1803,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));
@@ -1602,7 +1862,10 @@ 
 	 */
 	static function id2path($fs_ids, $recursion_count=0)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($fs_ids).')');
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($fs_ids).')');
+		}
 		if ($recursion_count > self::MAX_ID2PATH_RECURSION)
 		{
 			error_log(__METHOD__."(".array2string($fs_ids).", $recursion_count) max recursion depth reached, probably broken filesystem!");
@@ -1619,16 +1882,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) $ids = array_map(function($v) { return (int)$v; }, $ids);
+		if (count($ids) > 1)
+		{
+			$ids = array_map(function($v) { return (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))
 		{
@@ -1655,14 +1928,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);
 	}
 
@@ -1718,7 +1997,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;
 	}
 
@@ -1750,13 +2032,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'])
 		{
@@ -1768,7 +2053,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));
@@ -1831,10 +2120,16 @@ 
 	static function proppatch($path,array $props)
 	{
 		static $inst = null;
-		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 (!isset($inst)) $inst = new self();
+			if (!isset($inst))
+			{
+				$inst = new self();
+			}
 			if (!($stat = $inst->url_stat($path,0)))
 			{
 				return false;
@@ -1852,13 +2147,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,
@@ -1904,20 +2205,33 @@ 
 		{
 			if (!is_numeric($id))
 			{
-				if (!isset($inst)) $inst = new self();
+				if (!isset($inst))
+				{
+					$inst = new self();
+				}
 				if (!($stat = $inst->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) $ids = array_map(function($v) { return (int)$v; }, $ids);
+		if (count($ids) >= 1)
+		{
+			$ids = array_map(function($v) { return (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);
@@ -1936,11 +2250,14 @@ 
 		{
 			$props = $props[$row['fs_id']] ? $props[$row['fs_id']] : array();	// return empty array for no props
 		}
-		elseif ($props && isset($stat) && is_array($id2path = self::id2path(array_keys($props))))	// need to map fs_id's to pathes
+		elseif ($props && isset($stat) && is_array($id2path = self::id2path(array_keys($props))))
+		{
+			// need to map fs_id's to pathes
 		{
 			foreach($id2path as $id => $path)
 			{
 				$props[$path] =& $props[$id];
+		}
 				unset($props[$id]);
 			}
 		}

api/src/Vfs/WebDAV.php

Switch Indentation +10 added lines, -10 removed lines

@@ -171,16 +171,16 @@
 
         if (is_dir($source)) { // resource is a collection
             switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
+            	case "infinity": // valid
+                	break;
+            	case "0": // valid for COPY only
+                	if ($del) { // MOVE?
+                    	return "400 Bad request";
+                	}
+                	break;
+            	case "1": // invalid for both COPY and MOVE
+            	default:
+                	return "400 Bad request";
             }
         }
 

Indentation +196 added lines, -196 removed lines

@@ -52,13 +52,13 @@ 
 	var $debug = 0;
 
 	/**
-	* Serve a webdav request
-	*
-	* Reimplemented to not check our vfs base path with realpath and connect to mysql DB
-	*
-	* @access public
-    * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
-	*/
+	 * Serve a webdav request
+	 *
+	 * Reimplemented to not check our vfs base path with realpath and connect to mysql DB
+	 *
+	 * @access public
+	 * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
+	 */
 	function ServeRequest($prefix=null)
 	{
 		// special treatment for litmus compliance test
@@ -73,11 +73,11 @@ 
 	}
 
 	/**
-	* DELETE method handler
-	*
-	* @param  array  general parameter passing array
-	* @return bool   true on success
-	*/
+	 * DELETE method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
 	function DELETE($options)
 	{
 		$path = $this->base . $options['path'];
@@ -110,118 +110,118 @@ 
 		return '204 No Content';
 	}
 
-    /**
-     * MKCOL method handler
-     *
-     * Reimplemented to NOT use dirname/basename, which has problems with utf-8 chars
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function MKCOL($options)
-    {
-        $path   = $this->_unslashify($this->base .$options["path"]);
-        $parent = Vfs::dirname($path);
-
-        if (!file_exists($parent)) {
-            return "409 Conflict";
-        }
-
-        if (!is_dir($parent)) {
-            return "403 Forbidden";
-        }
-
-        if ( file_exists($path) ) {
-            return "405 Method not allowed";
-        }
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        $stat = mkdir($path, 0777);
-        if (!$stat) {
-            return "403 Forbidden";
-        }
-
-        return ("201 Created");
-    }
+	/**
+	 * MKCOL method handler
+	 *
+	 * Reimplemented to NOT use dirname/basename, which has problems with utf-8 chars
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function MKCOL($options)
+	{
+		$path   = $this->_unslashify($this->base .$options["path"]);
+		$parent = Vfs::dirname($path);
+
+		if (!file_exists($parent)) {
+			return "409 Conflict";
+		}
+
+		if (!is_dir($parent)) {
+			return "403 Forbidden";
+		}
+
+		if ( file_exists($path) ) {
+			return "405 Method not allowed";
+		}
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		$stat = mkdir($path, 0777);
+		if (!$stat) {
+			return "403 Forbidden";
+		}
+
+		return ("201 Created");
+	}
 
 	/**
-     * COPY method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function COPY($options, $del=false)
-    {
-        // TODO Property updates still broken (Litmus should detect this?)
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
-            return "502 bad gateway";
-        }
-
-        $source = $this->base .$options["path"];
-        if (!file_exists($source)) return "404 Not found";
-
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
-            }
-        }
-
-        $dest         = $this->base . $options["dest"];
-        $destdir      = Vfs::dirname($dest);
-
-        if (!file_exists($destdir) || !is_dir($destdir)) {
+	 * COPY method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function COPY($options, $del=false)
+	{
+		// TODO Property updates still broken (Litmus should detect this?)
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		// no copying to different WebDAV Servers yet
+		if (isset($options["dest_url"])) {
+			return "502 bad gateway";
+		}
+
+		$source = $this->base .$options["path"];
+		if (!file_exists($source)) return "404 Not found";
+
+		if (is_dir($source)) { // resource is a collection
+			switch ($options["depth"]) {
+			case "infinity": // valid
+				break;
+			case "0": // valid for COPY only
+				if ($del) { // MOVE?
+					return "400 Bad request";
+				}
+				break;
+			case "1": // invalid for both COPY and MOVE
+			default:
+				return "400 Bad request";
+			}
+		}
+
+		$dest         = $this->base . $options["dest"];
+		$destdir      = Vfs::dirname($dest);
+
+		if (!file_exists($destdir) || !is_dir($destdir)) {
 			//error_log(__METHOD__."(".array2string($options).", $del) file_exists('$destdir')=".array2string(file_exists($destdir)).", is_dir('$destdir')=".array2string(is_dir($destdir)));
-            return "409 Conflict";
-        }
-
-        $new          = !file_exists($dest);
-        $existing_col = false;
-
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
-                    return "412 precondition failed";
-                }
-                $dest .= Vfs::basename($source);
-                if (file_exists($dest)) {
-                    $options["dest"] .= Vfs::basename($source);
-                } else {
-                    $new          = true;
-                    $existing_col = true;
-                }
-            }
-        }
-
-        if (!$new) {
-            if ($options["overwrite"]) {
-                $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
-                    return $stat;
-                }
-            } else {
-                return "412 precondition failed";
-            }
-        }
-
-        if ($del) {
+			return "409 Conflict";
+		}
+
+		$new          = !file_exists($dest);
+		$existing_col = false;
+
+		if (!$new) {
+			if ($del && is_dir($dest)) {
+				if (!$options["overwrite"]) {
+					return "412 precondition failed";
+				}
+				$dest .= Vfs::basename($source);
+				if (file_exists($dest)) {
+					$options["dest"] .= Vfs::basename($source);
+				} else {
+					$new          = true;
+					$existing_col = true;
+				}
+			}
+		}
+
+		if (!$new) {
+			if ($options["overwrite"]) {
+				$stat = $this->DELETE(array("path" => $options["dest"]));
+				if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+					return $stat;
+				}
+			} else {
+				return "412 precondition failed";
+			}
+		}
+
+		if ($del) {
 			try {
 				if (!rename($source, $dest)) {
 					return "500 Internal server error";
@@ -230,51 +230,51 @@ 
 			catch (Exception\ProtectedDirectory $e) {
 				return "403 Forbidden: ".$e->getMessage();
 			}
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
-            	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
-            } else {
-                $files = array($source);
-            }
-
-            if (!is_array($files) || empty($files)) {
-                return "500 Internal server error";
-            }
-
-
-            foreach ($files as $file) {
-                if (is_dir($file)) {
-                    $file = $this->_slashify($file);
-                }
-
-                $destfile = str_replace($source, $dest, $file);
-
-                if (is_dir($file)) {
-                    if (!is_dir($destfile)) {
-                        // TODO "mkdir -p" here? (only natively supported by PHP 5)
-                        if (!@mkdir($destfile)) {
-                            return "409 Conflict";
-                        }
-                    }
-                } else {
-                    if (!@copy($file, $destfile)) {
-                        return "409 Conflict";
-                    }
-                }
-            }
-        }
-        // adding Location header as shown in example in rfc2518 section 8.9.5
+		} else {
+			if (is_dir($source) && $options['depth'] == 'infinity') {
+				$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
+			} else {
+				$files = array($source);
+			}
+
+			if (!is_array($files) || empty($files)) {
+				return "500 Internal server error";
+			}
+
+
+			foreach ($files as $file) {
+				if (is_dir($file)) {
+					$file = $this->_slashify($file);
+				}
+
+				$destfile = str_replace($source, $dest, $file);
+
+				if (is_dir($file)) {
+					if (!is_dir($destfile)) {
+						// TODO "mkdir -p" here? (only natively supported by PHP 5)
+						if (!@mkdir($destfile)) {
+							return "409 Conflict";
+						}
+					}
+				} else {
+					if (!@copy($file, $destfile)) {
+						return "409 Conflict";
+					}
+				}
+			}
+		}
+		// adding Location header as shown in example in rfc2518 section 8.9.5
 		header('Location: '.$this->base_uri.$options['dest']);
 
-        return ($new && !$existing_col) ? "201 Created" : "204 No Content";
-    }
+		return ($new && !$existing_col) ? "201 Created" : "204 No Content";
+	}
 
-    /**
-	* Get properties for a single file/resource
-	*
-	* @param  string  $_path resource path
-	* @return array   resource properties
-	*/
+	/**
+	 * Get properties for a single file/resource
+	 *
+	 * @param  string  $_path resource path
+	 * @return array   resource properties
+	 */
 	function fileinfo($_path)
 	{
 		// internally we require some url-encoding, as vfs_stream_wrapper uses URL's internally
@@ -302,9 +302,9 @@ 
 		$info['props'][] = self::mkprop	('creationdate',    filectime($fspath));
 		$info['props'][] = self::mkprop	('getlastmodified', filemtime($fspath));
 
-        // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
+		// Microsoft extensions: last access time and 'hidden' status
+		$info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
+		$info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
 		if (is_dir($fspath)) {
@@ -442,38 +442,38 @@ 
 	}
 
  	/**
-	 * Used eg. by get
-	 *
-	 * @todo replace all calls to _mimetype with Vfs::mime_content_type()
-	 * @param string $path
-	 * @return string
-	 */
+ 	 * Used eg. by get
+ 	 *
+ 	 * @todo replace all calls to _mimetype with Vfs::mime_content_type()
+ 	 * @param string $path
+ 	 * @return string
+ 	 */
 	function _mimetype($path)
 	{
 		return Vfs::mime_content_type($path);
 	}
 
-    /**
-     * Check if path is readable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_readable($fspath)
-    {
-    	return Vfs::is_readable($fspath);
-    }
-
-    /**
-     * Check if path is writable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_writable($fspath)
-    {
-    	return Vfs::is_writable($fspath);
-    }
+	/**
+	 * Check if path is readable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_readable($fspath)
+	{
+		return Vfs::is_readable($fspath);
+	}
+
+	/**
+	 * Check if path is writable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_writable($fspath)
+	{
+		return Vfs::is_writable($fspath);
+	}
 
 	/**
 	 * PROPPATCH method handler
@@ -616,13 +616,13 @@ 
 	 * @param  string  directory path
 	 * @return void    function has to handle HTTP response itself
 	 */
-    function GetDir($fspath, &$options)
-    {
+	function GetDir($fspath, &$options)
+	{
 		// add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
 		header('Content-type: text/html; charset='.Api\Translation::charset());
 
 		parent::GetDir($fspath, $options);
-    }
+	}
 
 	private $force_download = false;
 

Spacing +85 added lines, -85 removed lines

@@ -59,7 +59,7 @@ 
 	* @access public
     * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	*/
-	function ServeRequest($prefix=null)
+	function ServeRequest($prefix = null)
 	{
 		// special treatment for litmus compliance test
 		// reply on its identifier header
@@ -80,7 +80,7 @@ 
 	*/
 	function DELETE($options)
 	{
-		$path = $this->base . $options['path'];
+		$path = $this->base.$options['path'];
 
 		if (!file_exists($path))
 		{
@@ -120,7 +120,7 @@ 
      */
     function MKCOL($options)
     {
-        $path   = $this->_unslashify($this->base .$options["path"]);
+        $path   = $this->_unslashify($this->base.$options["path"]);
         $parent = Vfs::dirname($path);
 
         if (!file_exists($parent)) {
@@ -131,7 +131,7 @@ 
             return "403 Forbidden";
         }
 
-        if ( file_exists($path) ) {
+        if (file_exists($path)) {
             return "405 Method not allowed";
         }
 
@@ -153,7 +153,7 @@ 
      * @param  array  general parameter passing array
      * @return bool   true on success
      */
-    function COPY($options, $del=false)
+    function COPY($options, $del = false)
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
@@ -166,7 +166,7 @@ 
             return "502 bad gateway";
         }
 
-        $source = $this->base .$options["path"];
+        $source = $this->base.$options["path"];
         if (!file_exists($source)) return "404 Not found";
 
         if (is_dir($source)) { // resource is a collection
@@ -184,7 +184,7 @@ 
             }
         }
 
-        $dest         = $this->base . $options["dest"];
+        $dest         = $this->base.$options["dest"];
         $destdir      = Vfs::dirname($dest);
 
         if (!file_exists($destdir) || !is_dir($destdir)) {
@@ -232,7 +232,7 @@ 
 			}
         } else {
             if (is_dir($source) && $options['depth'] == 'infinity') {
-            	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
+            	$files = Vfs::find($source, array('depth' => true, 'url' => true)); // depth=true: return dirs first, url=true: allow urls!
             } else {
                 $files = array($source);
             }
@@ -278,16 +278,16 @@ 
 	function fileinfo($_path)
 	{
 		// internally we require some url-encoding, as vfs_stream_wrapper uses URL's internally
-		$path = str_replace(array('#','?'),array('%23','%3F'),$_path);
+		$path = str_replace(array('#', '?'), array('%23', '%3F'), $_path);
 
 		//error_log(__METHOD__."($path)");
 		// map URI path to filesystem path
-		$fspath = $this->base . $path;
+		$fspath = $this->base.$path;
 
 		// create result array
 		$info = array();
 		// TODO remove slash append code when base class is able to do it itself
-		$info['path']  = is_dir($fspath) ? $this->_slashify($path) : $path;
+		$info['path'] = is_dir($fspath) ? $this->_slashify($path) : $path;
 
 		// remove all urlencoding we need internally in EGw, HTTP_WebDAV_Server will add it's own!
 		// rawurldecode does NOT touch +
@@ -296,32 +296,32 @@ 
 		$info['props'] = array();
 
 		// no special beautified displayname here ...
-		$info['props'][] = self::mkprop	('displayname', Vfs::basename(self::_unslashify($info['path'])));
+		$info['props'][] = self::mkprop('displayname', Vfs::basename(self::_unslashify($info['path'])));
 
 		// creation and modification time
-		$info['props'][] = self::mkprop	('creationdate',    filectime($fspath));
-		$info['props'][] = self::mkprop	('getlastmodified', filemtime($fspath));
+		$info['props'][] = self::mkprop('creationdate', filectime($fspath));
+		$info['props'][] = self::mkprop('getlastmodified', filemtime($fspath));
 
         // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
+        $info["props"][] = self::mkprop("lastaccessed", fileatime($fspath));
+        $info["props"][] = self::mkprop("ishidden", Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
 		if (is_dir($fspath)) {
 			// directory (WebDAV collection)
-			$info['props'][] = self::mkprop	('resourcetype', array(
+			$info['props'][] = self::mkprop('resourcetype', array(
 			 	self::mkprop('collection', '')));
-			$info['props'][] = self::mkprop	('getcontenttype', 'httpd/unix-directory');
+			$info['props'][] = self::mkprop('getcontenttype', 'httpd/unix-directory');
 		} else {
 			// plain file (WebDAV resource)
-			$info['props'][] = self::mkprop	('resourcetype', '');
+			$info['props'][] = self::mkprop('resourcetype', '');
 			if (Vfs::is_readable($path)) {
-				$info['props'][] = self::mkprop	('getcontenttype', Vfs::mime_content_type($path));
+				$info['props'][] = self::mkprop('getcontenttype', Vfs::mime_content_type($path));
 			} else {
 				error_log(__METHOD__."($path) $fspath is not readable!");
-				$info['props'][] = self::mkprop	('getcontenttype', 'application/x-non-readable');
+				$info['props'][] = self::mkprop('getcontenttype', 'application/x-non-readable');
 			}
-			$info['props'][] = self::mkprop	('getcontentlength', filesize($fspath));
+			$info['props'][] = self::mkprop('getcontentlength', filesize($fspath));
 		}
 		// generate etag from inode (sqlfs: fs_id), modification time and size
 		$stat = stat($fspath);
@@ -375,21 +375,21 @@ 
 	 */
 	function PROPFIND(&$options, &$files)
 	{
-		if (!parent::PROPFIND($options,$files))
+		if (!parent::PROPFIND($options, $files))
 		{
 			return false;
 		}
 		$path2n = array();
-		foreach($files['files'] as $n => $info)
+		foreach ($files['files'] as $n => $info)
 		{
 			// do NOT report /clientsync/.favorites/, as it fails
-			if (strpos($info['path'],'/clientsync/.favorites/') === 0)
+			if (strpos($info['path'], '/clientsync/.favorites/') === 0)
 			{
 				unset($files['files'][$n]);
 				continue;
 			}
 			$_path = $info['path'];
-			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/') $_path = substr($info['path'],0,-1);
+			if (!$n && $info['path'] != '/' && substr($info['path'], -1) == '/') $_path = substr($info['path'], 0, -1);
 
 			// need to encode path again, as $info['path'] is NOT encoded, but Vfs::(stat|propfind) require it
 			// otherwise pathes containing url special chars like ? or # will not stat
@@ -399,21 +399,21 @@ 
 			// adding some properties used instead of regular DAV times
 			if (($stat = Vfs::stat($path)))
 			{
-				$fileprops =& $files['files'][$path2n[$path]]['props'];
-				foreach(self::$auto_props as $attr => $props)
+				$fileprops = & $files['files'][$path2n[$path]]['props'];
+				foreach (self::$auto_props as $attr => $props)
 				{
-					switch($attr)
+					switch ($attr)
 					{
 						case 'ctime':
 						case 'mtime':
 						case 'atime':
-							$value = gmdate('D, d M Y H:i:s T',$stat[$attr]);
+							$value = gmdate('D, d M Y H:i:s T', $stat[$attr]);
 							break;
 
 						default:
 							continue 2;
 					}
-					foreach($props as $prop)
+					foreach ($props as $prop)
 					{
 						$prop['val'] = $value;
 						$fileprops[] = $prop;
@@ -421,17 +421,17 @@ 
 				}
 			}
 		}
-		if ($path2n && ($path2props = Vfs::propfind(array_keys($path2n),null)))
+		if ($path2n && ($path2props = Vfs::propfind(array_keys($path2n), null)))
 		{
-			foreach($path2props as $path => $props)
+			foreach ($path2props as $path => $props)
 			{
-				$fileprops =& $files['files'][$path2n[$path]]['props'];
-				foreach($props as $prop)
+				$fileprops = & $files['files'][$path2n[$path]]['props'];
+				foreach ($props as $prop)
 				{
 					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')	// eGW's customfields
 					{
 						$prop['ns'] .= 'customfields/';
-						$prop['name'] = substr($prop['name'],1);
+						$prop['name'] = substr($prop['name'], 1);
 					}
 					$fileprops[] = $prop;
 				}
@@ -487,36 +487,36 @@ 
 	 */
 	function PROPPATCH(&$options)
 	{
-		$path = Api\Translation::convert($options['path'],'utf-8');
+		$path = Api\Translation::convert($options['path'], 'utf-8');
 
 		foreach ($options['props'] as $key => $prop) {
 			$attributes = array();
-			switch($prop['ns'])
+			switch ($prop['ns'])
 			{
 				// allow Webdrive to set creation and modification time
 				case 'http://www.southrivertech.com/':
-					switch($prop['name'])
+					switch ($prop['name'])
 					{
 						case 'srt_modifiedtime':
 						case 'getlastmodified':
-							Vfs::touch($path,strtotime($prop['val']));
+							Vfs::touch($path, strtotime($prop['val']));
 							break;
 						//case 'srt_creationtime':
 							// no streamwrapper interface / php function to set the ctime currently
 							//$attributes['created'] = strtotime($prop['val']);
 							//break;
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path, array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
 							break;
 					}
 					break;
 
 				case 'DAV:':
-					switch($prop['name'])
+					switch ($prop['name'])
 					{
 						// allow netdrive to change the modification time
 						case 'getlastmodified':
-							Vfs::touch($path,strtotime($prop['val']));
+							Vfs::touch($path, strtotime($prop['val']));
 							break;
 						// not sure why, the filesystem example of the WebDAV class does it ...
 						default:
@@ -526,16 +526,16 @@ 
 					break;
 
 				case 'urn:schemas-microsoft-com:':
-					switch($prop['name'])
+					switch ($prop['name'])
 					{
 						case 'Win32LastModifiedTime':
-							Vfs::touch($path,strtotime($prop['val']));
+							Vfs::touch($path, strtotime($prop['val']));
 							break;
 						case 'Win32CreationTime':	// eg. "Wed, 14 Sep 2011 15:48:26 GMT"
 						case 'Win32LastAccessTime':
 						case 'Win32FileAttributes':	// not sure what that is, it was always "00000000"
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path, array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
 							break;
 					}
 					break;
@@ -545,18 +545,18 @@ 
 					$prop['name'] = '#'.$prop['name'];
 					// fall through
 				default:
-					if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+					if (!Vfs::proppatch($path, array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
 					break;
 			}
 			if ($this->debug) $props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
 		}
 		if ($this->debug)
 		{
-			error_log(__METHOD__.": path=$options[path], props=".implode(', ',$props));
-			if ($attributes) error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			error_log(__METHOD__.": path=$options[path], props=".implode(', ', $props));
+			if ($attributes) error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n", ' ', print_r($attributes, true)));
 		}
 
-		return '';	// this is as the filesystem example handler does it, no true or false ...
+		return ''; // this is as the filesystem example handler does it, no true or false ...
 	}
 
 	/**
@@ -567,18 +567,18 @@ 
 	 */
 	function LOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n", '    '), '', print_r($options, true)).')');
 		// TODO recursive locks on directories not supported yet
-		if (is_dir($this->base . $options['path']) && !empty($options['depth']))
+		if (is_dir($this->base.$options['path']) && !empty($options['depth']))
 		{
 			return '409 Conflict';
 		}
-		$options['timeout'] = time()+300; // 5min. hardcoded
+		$options['timeout'] = time() + 300; // 5min. hardcoded
 
 		// dont know why, but HTTP_WebDAV_Server passes the owner in D:href tags, which get's passed unchanged to checkLock/PROPFIND
 		// that's wrong according to the standard and cadaver does not show it on discover --> strip_tags removes eventual tags
-		if (($ret = Vfs::lock($options['path'],$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']))) && !isset($options['update']))
+		if (($ret = Vfs::lock($options['path'], $options['locktoken'], $options['timeout'], strip_tags($options['owner']),
+			$options['scope'], $options['type'], isset($options['update']))) && !isset($options['update']))
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
@@ -593,8 +593,8 @@ 
 	 */
 	function UNLOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
-		return Vfs::unlock($options['path'],$options['token']) ? '204 No Content' : '409 Conflict';
+		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n", '    '), '', print_r($options, true)).')');
+		return Vfs::unlock($options['path'], $options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
 	/**
@@ -633,9 +633,9 @@ 
 	 */
 	function __construct()
 	{
-		if ($_SERVER['REQUEST_METHOD'] == 'GET' && (($this->force_download = strpos($_SERVER['REQUEST_URI'],'?download')) !== false))
+		if ($_SERVER['REQUEST_METHOD'] == 'GET' && (($this->force_download = strpos($_SERVER['REQUEST_URI'], '?download')) !== false))
 		{
-			$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'],0,$this->force_download);
+			$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 0, $this->force_download);
 		}
 		parent::__construct();
 	}
@@ -650,7 +650,7 @@ 
 	 */
 	function GET(&$options)
 	{
-		if (is_dir($this->base . $options["path"]))
+		if (is_dir($this->base.$options["path"]))
 		{
 			return $this->autoindex($options);
 		}
@@ -658,11 +658,11 @@ 
 		{
 			// mitigate risks of serving javascript or css from our domain
 			Api\Header\Content::safe($options['stream'], $options['path'], $options['mimetype'], $options['size'], false,
-				$this->force_download, true);	// true = do not send content-type and content-length header, but modify values
+				$this->force_download, true); // true = do not send content-type and content-length header, but modify values
 
 			if (!is_resource($options['stream']))
 			{
-				$options['data'] =& $options['stream'];
+				$options['data'] = & $options['stream'];
 				unset($options['stream']);
 			}
 		}
@@ -681,9 +681,9 @@ 
 			'depth' => 1,
 		);
 		$files = array();
-		if (($ret = $this->PROPFIND($propfind_options,$files)) !== true)
+		if (($ret = $this->PROPFIND($propfind_options, $files)) !== true)
 		{
-			return $ret;	// no collection
+			return $ret; // no collection
 		}
 		header('Content-type: text/html; charset='.Api\Translation::charset());
 		echo "<html>\n<head>\n\t<title>".'EGroupware WebDAV server '.htmlspecialchars($options['path'])."</title>\n";
@@ -695,10 +695,10 @@ 
 		echo '<h1>WebDAV ';
 		list(,$base) = explode(parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH), $this->base_uri, 2);
 		$path = $base;
-		foreach(explode('/',$this->_unslashify($options['path'])) as $n => $name)
+		foreach (explode('/', $this->_unslashify($options['path'])) as $n => $name)
 		{
 			$path .= ($n != 1 ? '/' : '').$name;
-			echo Api\Html::a_href(htmlspecialchars($name.'/'),$path);
+			echo Api\Html::a_href(htmlspecialchars($name.'/'), $path);
 		}
 		echo "</h1>\n";
 
@@ -715,18 +715,18 @@ 
 		);
 		$n = 0;
 		$collection_props = null;
-		foreach($files['files'] as $file)
+		foreach ($files['files'] as $file)
 		{
 			if (!isset($collection_props))
 			{
 				$collection_props = $this->props2array($file['props']);
 				echo '<h3>'.lang('Collection listing').': '.htmlspecialchars($collection_props['DAV:displayname'])."</h3>\n";
-				continue;	// own entry --> displaying properies later
+				continue; // own entry --> displaying properies later
 			}
-			if(!$n++)
+			if (!$n++)
 			{
 				echo "<table>\n\t<tr class='th'>\n\t\t<th>#</th>\n\t\t<th>".lang('Name')."</th>";
-				foreach($props2show as $label)
+				foreach ($props2show as $label)
 				{
 					echo "\t\t<th>".lang($label)."</th>\n";
 				}
@@ -736,9 +736,9 @@ 
 			//echo $file['path']; _debug_array($props);
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
 
-			if (substr($file['path'],-1) == '/')
+			if (substr($file['path'], -1) == '/')
 			{
-				$name = Vfs::basename(substr($file['path'],0,-1)).'/';
+				$name = Vfs::basename(substr($file['path'], 0, -1)).'/';
 			}
 			else
 			{
@@ -746,14 +746,14 @@ 
 			}
 
 			echo "\t<tr class='$class'>\n\t\t<td>$n</td>\n\t\t<td>".
-				Api\Html::a_href(htmlspecialchars($name),$base.strtr($file['path'], array(
+				Api\Html::a_href(htmlspecialchars($name), $base.strtr($file['path'], array(
 					'%' => '%25',
 					'#' => '%23',
 					'?' => '%3F',
 				)))."</td>\n";
-			foreach($props2show as $prop => $label)
+			foreach ($props2show as $prop => $label)
 			{
-				echo "\t\t<td>".($prop=='DAV:getlastmodified'&&!empty($props[$prop])?date('Y-m-d H:i:s',$props[$prop]):$props[$prop])."</td>\n";
+				echo "\t\t<td>".($prop == 'DAV:getlastmodified' && !empty($props[$prop]) ?date('Y-m-d H:i:s', $props[$prop]) : $props[$prop])."</td>\n";
 			}
 			echo "\t</tr>\n";
 		}
@@ -767,12 +767,12 @@ 
 		}
 		echo '<h3>'.lang('Properties')."</h3>\n";
 		echo "<table>\n\t<tr class='th'><th>".lang('Namespace')."</th><th>".lang('Name')."</th><th>".lang('Value')."</th></tr>\n";
-		foreach($collection_props as $name => $value)
+		foreach ($collection_props as $name => $value)
 		{
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
-			$parts = explode(':',$name);
+			$parts = explode(':', $name);
 			$name = array_pop($parts);
-			$ns = implode(':',$parts);
+			$ns = implode(':', $parts);
 			echo "\t<tr class='$class'>\n\t\t<td>".htmlspecialchars($ns)."</td><td style='white-space: nowrap'>".htmlspecialchars($name)."</td>\n";
 			echo "\t\t<td>".$value."</td>\n\t</tr>\n";
 		}
@@ -815,11 +815,11 @@ 
 				'wrap'            => 0,
 			));
 		}
-		if (($href=preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i',$value)))
+		if (($href = preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i', $value)))
 		{
-			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/','/').')?([^<]+)\<\/(D:)?href\>/i','<\\1href><a href="\\2\\3">\\3</a></\\4href>',$value);
+			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/', '/').')?([^<]+)\<\/(D:)?href\>/i', '<\\1href><a href="\\2\\3">\\3</a></\\4href>', $value);
 		}
-		$ret = $value[0] == '<'  || strpos($value, "\n") !== false ?
+		$ret = $value[0] == '<' || strpos($value, "\n") !== false ?
 			'<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
 
 		if ($href)
@@ -839,10 +839,10 @@ 
 	protected function props2array(array $props)
 	{
 		$arr = array();
-		foreach($props as $prop)
+		foreach ($props as $prop)
 		{
 			$ns_hash = array('DAV:' => 'D');
-			switch($prop['ns'])
+			switch ($prop['ns'])
 			{
 				case 'DAV:';
 					$ns = 'DAV';
@@ -852,10 +852,10 @@ 
 			}
 			if (is_array($prop['val']))
 			{
-				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs='', $ns_hash);
+				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs = '', $ns_hash);
 				// hack to show real namespaces instead of not (visibly) defined shortcuts
 				unset($ns_hash['DAV:']);
-				$value = strtr($v=$this->prop_value($prop['val']),array_flip($ns_hash));
+				$value = strtr($v = $this->prop_value($prop['val']), array_flip($ns_hash));
 			}
 			else
 			{

Braces +133 added lines, -50 removed lines

@@ -64,7 +64,8 @@ 
 		// special treatment for litmus compliance test
 		// reply on its identifier header
 		// not needed for the test itself but eases debugging
-		if (isset($this->_SERVER['HTTP_X_LITMUS'])) {
+		if (isset($this->_SERVER['HTTP_X_LITMUS']))
+		{
 			error_log("Litmus test ".$this->_SERVER['HTTP_X_LITMUS']);
 			header("X-Litmus-reply: ".$this->_SERVER['HTTP_X_LITMUS']);
 		}
@@ -123,24 +124,30 @@ 
         $path   = $this->_unslashify($this->base .$options["path"]);
         $parent = Vfs::dirname($path);
 
-        if (!file_exists($parent)) {
+        if (!file_exists($parent))
+        {
             return "409 Conflict";
         }
 
-        if (!is_dir($parent)) {
+        if (!is_dir($parent))
+        {
             return "403 Forbidden";
         }
 
-        if ( file_exists($path) ) {
+        if ( file_exists($path) )
+        {
             return "405 Method not allowed";
         }
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        if (!empty($this->_SERVER["CONTENT_LENGTH"]))
+        {
+// no body parsing yet
             return "415 Unsupported media type";
         }
 
         $stat = mkdir($path, 0777);
-        if (!$stat) {
+        if (!$stat)
+        {
             return "403 Forbidden";
         }
 
@@ -157,24 +164,35 @@ 
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        if (!empty($this->_SERVER["CONTENT_LENGTH"]))
+        {
+// no body parsing yet
             return "415 Unsupported media type";
         }
 
         // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
+        if (isset($options["dest_url"]))
+        {
             return "502 bad gateway";
         }
 
         $source = $this->base .$options["path"];
-        if (!file_exists($source)) return "404 Not found";
+        if (!file_exists($source))
+        {
+        	return "404 Not found";
+        }
 
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
+        if (is_dir($source))
+        {
+// resource is a collection
+            switch ($options["depth"])
+            {
             case "infinity": // valid
                 break;
             case "0": // valid for COPY only
-                if ($del) { // MOVE?
+                if ($del)
+                {
+// MOVE?
                     return "400 Bad request";
                 }
                 break;
@@ -187,7 +205,8 @@ 
         $dest         = $this->base . $options["dest"];
         $destdir      = Vfs::dirname($dest);
 
-        if (!file_exists($destdir) || !is_dir($destdir)) {
+        if (!file_exists($destdir) || !is_dir($destdir))
+        {
 			//error_log(__METHOD__."(".array2string($options).", $del) file_exists('$destdir')=".array2string(file_exists($destdir)).", is_dir('$destdir')=".array2string(is_dir($destdir)));
             return "409 Conflict";
         }
@@ -195,69 +214,96 @@ 
         $new          = !file_exists($dest);
         $existing_col = false;
 
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
+        if (!$new)
+        {
+            if ($del && is_dir($dest))
+            {
+                if (!$options["overwrite"])
+                {
                     return "412 precondition failed";
                 }
                 $dest .= Vfs::basename($source);
-                if (file_exists($dest)) {
+                if (file_exists($dest))
+                {
                     $options["dest"] .= Vfs::basename($source);
-                } else {
+                }
+                else
+                {
                     $new          = true;
                     $existing_col = true;
                 }
             }
         }
 
-        if (!$new) {
-            if ($options["overwrite"]) {
+        if (!$new)
+        {
+            if ($options["overwrite"])
+            {
                 $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404"))
+                {
                     return $stat;
                 }
-            } else {
+            }
+            else
+            {
                 return "412 precondition failed";
             }
         }
 
-        if ($del) {
+        if ($del)
+        {
 			try {
-				if (!rename($source, $dest)) {
+				if (!rename($source, $dest))
+				{
 					return "500 Internal server error";
 				}
 			}
 			catch (Exception\ProtectedDirectory $e) {
 				return "403 Forbidden: ".$e->getMessage();
 			}
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
+        }
+        else
+        {
+            if (is_dir($source) && $options['depth'] == 'infinity')
+            {
             	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
-            } else {
+            }
+            else
+            {
                 $files = array($source);
             }
 
-            if (!is_array($files) || empty($files)) {
+            if (!is_array($files) || empty($files))
+            {
                 return "500 Internal server error";
             }
 
 
-            foreach ($files as $file) {
-                if (is_dir($file)) {
+            foreach ($files as $file)
+            {
+                if (is_dir($file))
+                {
                     $file = $this->_slashify($file);
                 }
 
                 $destfile = str_replace($source, $dest, $file);
 
-                if (is_dir($file)) {
-                    if (!is_dir($destfile)) {
+                if (is_dir($file))
+                {
+                    if (!is_dir($destfile))
+                    {
                         // TODO "mkdir -p" here? (only natively supported by PHP 5)
-                        if (!@mkdir($destfile)) {
+                        if (!@mkdir($destfile))
+                        {
                             return "409 Conflict";
                         }
                     }
-                } else {
-                    if (!@copy($file, $destfile)) {
+                }
+                else
+                {
+                    if (!@copy($file, $destfile))
+                    {
                         return "409 Conflict";
                     }
                 }
@@ -307,17 +353,23 @@ 
         $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
-		if (is_dir($fspath)) {
+		if (is_dir($fspath))
+		{
 			// directory (WebDAV collection)
 			$info['props'][] = self::mkprop	('resourcetype', array(
 			 	self::mkprop('collection', '')));
 			$info['props'][] = self::mkprop	('getcontenttype', 'httpd/unix-directory');
-		} else {
+		}
+		else
+		{
 			// plain file (WebDAV resource)
 			$info['props'][] = self::mkprop	('resourcetype', '');
-			if (Vfs::is_readable($path)) {
+			if (Vfs::is_readable($path))
+			{
 				$info['props'][] = self::mkprop	('getcontenttype', Vfs::mime_content_type($path));
-			} else {
+			}
+			else
+			{
 				error_log(__METHOD__."($path) $fspath is not readable!");
 				$info['props'][] = self::mkprop	('getcontenttype', 'application/x-non-readable');
 			}
@@ -389,7 +441,10 @@ 
 				continue;
 			}
 			$_path = $info['path'];
-			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/') $_path = substr($info['path'],0,-1);
+			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/')
+			{
+				$_path = substr($info['path'],0,-1);
+			}
 
 			// need to encode path again, as $info['path'] is NOT encoded, but Vfs::(stat|propfind) require it
 			// otherwise pathes containing url special chars like ? or # will not stat
@@ -428,16 +483,22 @@ 
 				$fileprops =& $files['files'][$path2n[$path]]['props'];
 				foreach($props as $prop)
 				{
-					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')	// eGW's customfields
+					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')
+					{
+						// eGW's customfields
 					{
 						$prop['ns'] .= 'customfields/';
+					}
 						$prop['name'] = substr($prop['name'],1);
 					}
 					$fileprops[] = $prop;
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."() props=".array2string($files['files']));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() props=".array2string($files['files']));
+		}
 		return true;
 	}
 
@@ -489,7 +550,8 @@ 
 	{
 		$path = Api\Translation::convert($options['path'],'utf-8');
 
-		foreach ($options['props'] as $key => $prop) {
+		foreach ($options['props'] as $key => $prop)
+		{
 			$attributes = array();
 			switch($prop['ns'])
 			{
@@ -506,7 +568,10 @@ 
 							//$attributes['created'] = strtotime($prop['val']);
 							//break;
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -535,7 +600,10 @@ 
 						case 'Win32LastAccessTime':
 						case 'Win32FileAttributes':	// not sure what that is, it was always "00000000"
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -545,15 +613,24 @@ 
 					$prop['name'] = '#'.$prop['name'];
 					// fall through
 				default:
-					if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+					if (!Vfs::proppatch($path,array($prop)))
+					{
+						$options['props'][$key]['status'] = '403 Forbidden';
+					}
 					break;
 			}
-			if ($this->debug) $props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
+			if ($this->debug)
+			{
+				$props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
+			}
 		}
 		if ($this->debug)
 		{
 			error_log(__METHOD__.": path=$options[path], props=".implode(', ',$props));
-			if ($attributes) error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			if ($attributes)
+			{
+				error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			}
 		}
 
 		return '';	// this is as the filesystem example handler does it, no true or false ...
@@ -567,7 +644,10 @@ 
 	 */
 	function LOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		}
 		// TODO recursive locks on directories not supported yet
 		if (is_dir($this->base . $options['path']) && !empty($options['depth']))
 		{
@@ -593,7 +673,10 @@ 
 	 */
 	function UNLOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		}
 		return Vfs::unlock($options['path'],$options['token']) ? '204 No Content' : '409 Conflict';
 	}
 

api/src/Vfs/Filesystem/StreamWrapper.php

Indentation +2 added lines, -2 removed lines

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

Braces +87 added lines, -22 removed lines

@@ -131,7 +131,9 @@ 
 		$read_only = str_replace('b','',$mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
-		if (!($stat = $this->url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = $this->url_stat($url,0)) || $mode[0] == 'x')
+		{
+			// file not found or file should NOT exist
 		{
 			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
 				$mode[0] == 'x' ||	// or file should not exist, but does
@@ -139,6 +141,7 @@ 
 				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=$this->url_stat($dir,0)))	// or we are not allowed to 																																			create it
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+		}
 				if (!($options & STREAM_URL_STAT_QUIET))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
@@ -146,9 +149,12 @@ 
 				return false;
 			}
 		}
-		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))
+		{
+			// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
+		}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!",E_USER_WARNING);
@@ -157,7 +163,10 @@ 
 		}
 		if (!$read_only && self::deny_script($url))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
@@ -168,7 +177,10 @@ 
 		// open the "real" file
 		if (!($this->opened_stream = fopen($path=Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH)),$mode,$options)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			}
 			return false;
 		}
 		$this->opened_stream_url = $url;
@@ -313,7 +325,10 @@ 
 		// check access rights (file need to exist and directory need to be writable
 		if (!file_exists($path) || is_dir($path) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		return unlink($path);
@@ -339,17 +354,26 @@ 
 		// check access rights
 		if (!($from_stat = $this->url_stat($url_from,0)) || !($dir = Vfs::dirname($url_from)) || !Vfs::check_access($dir,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		if (!($to_dir = Vfs::dirname($url_to)) || !Vfs::check_access($to_dir,Vfs::WRITABLE,$to_dir_stat = $this->url_stat($to_dir,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			}
 			return false;	// no permission or parent-dir does not exist
 		}
 		if (self::deny_script($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			}
 			return false;
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
@@ -358,13 +382,19 @@ 
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !self::unlink($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			}
 			return false;
 		}
 		return rename(Vfs::decodePath($from['path']),Vfs::decodePath($to['path']));
@@ -399,7 +429,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!$parent_url || file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return mkdir($path, 0700, $recursive);	// setting mode 0700 allows (only) apache to write into the dir
@@ -425,7 +458,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir, Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return rmdir($path);
@@ -448,7 +484,7 @@ 
 	function stream_metadata($url, $option, $value)
 	{
  		if ($option != STREAM_META_TOUCH)
-		{
+ 		{
 			return false;	// not implemented / supported
 		}
 
@@ -458,7 +494,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir, Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 
@@ -475,7 +514,10 @@ 
 	 */
 	function dir_opendir ( $url, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$options)");
+		}
 
 		$this->opened_dir = null;
 
@@ -485,7 +527,10 @@ 
 
 		if (!($this->opened_dir = opendir($path)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			}
 			return false;
 		}
 		return true;
@@ -541,7 +586,10 @@ 
 				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		}
 		return $stat;
 	}
 
@@ -562,14 +610,23 @@ 
 
 			$ignore = !($file === false ||							// stop if no more dirs or
 				($file != '.' && $file != '..' ));					// file not . or ..
-			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
+			if (self::LOG_LEVEL > 1 && $ignore)
+			{
+				error_log(__METHOD__.'() ignoring '.array2string($file));
+			}
 		}
 		while ($ignore);
 
 		// encode special chars messing up url's
-		if ($file !== false) $file = Vfs::encodePathComponent($file);
+		if ($file !== false)
+		{
+			$file = Vfs::encodePathComponent($file);
+		}
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() returning '.array2string($file));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'() returning '.array2string($file));
+		}
 
 		return $file;
 	}
@@ -724,9 +781,17 @@ 
 		list($url,$query) = explode('?',$_url,2);
 		$get = null;
 		parse_str($query,$get);
-		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		if (empty($get['url']))
+		{
+			return false;
+		}
+		// no download url given for this mount-point
 
-		if (!($mount_url = Vfs::mount_url($_url))) return false;	// no mount url found, should not happen
+		if (!($mount_url = Vfs::mount_url($_url)))
+		{
+			return false;
+		}
+		// no mount url found, should not happen
 		list($mount_url) = explode('?',$mount_url);
 
 		$relpath = substr($url,strlen($mount_url));

Spacing +84 added lines, -84 removed lines

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