EGroupware / egroupware

api/src/CalDAV.php

Doc Comments +11 added lines, -9 removed lines

@@ -311,6 +311,8 @@ 
 	 * @param string $path
 	 * @param array &$dav
 	 * @param array &$allow
+	 * @param integer[] $dav
+	 * @param boolean $allow
 	 */
 	function OPTIONS($path, &$dav, &$allow)
 	{
@@ -606,7 +608,7 @@ 
 	 * @param string $path / or /<username>/
 	 * @param int $user
 	 * @param int $depth
-	 * @return string|boolean http status or true|false
+	 * @return boolean http status or true|false
 	 */
 	protected function add_home(array &$files, $path, $user, $depth)
 	{
@@ -738,7 +740,7 @@ 
 	 * @param string $path /<username>/
 	 * @param int $app
 	 * @param int $user
-	 * @return string|boolean http status or true|false
+	 * @return boolean http status or true|false
 	 */
 	protected function add_shared(array &$files, $path, $app, $user)
 	{
@@ -1380,7 +1382,7 @@ 
 	 * @param int|string $id
 	 * @param array $attach array of array with values for keys 'name', 'params', 'value'
 	 * @param boolean $delete_via_put
-	 * @return boolean false on error, eg. invalid managed id, for false an xml-error body has been send
+	 * @return null|false false on error, eg. invalid managed id, for false an xml-error body has been send
 	 */
 	public static function handle_attach($app, $id, $attach, $delete_via_put=false)
 	{
@@ -1584,7 +1586,7 @@ 
 	 * @param string $managed_id
 	 * @param string $app =null app-name to check against path
 	 * @param string|int $id =null id to check agains path
-	 * @return string|boolean "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
+	 * @return false|string "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
 	 */
 	static public function managed_id2path($managed_id, $app=null, $id=null)
 	{
@@ -1783,7 +1785,7 @@ 
 	 * MKCOL method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function MKCOL($options)
 	{
@@ -1796,7 +1798,7 @@ 
 	 * MOVE method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function MOVE($options)
 	{
@@ -1809,7 +1811,7 @@ 
 	 * COPY method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function COPY($options, $del=false)
 	{
@@ -1822,7 +1824,7 @@ 
 	 * LOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string|boolean   true on success
 	 */
 	function LOCK(&$options)
 	{
@@ -1856,7 +1858,7 @@ 
 	 * UNLOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function UNLOCK(&$options)
 	{

Spacing +185 added lines, -185 removed lines

@@ -117,12 +117,12 @@ 
 		'inbox' => array(
 			'resourcetype' => array(self::CALDAV => 'schedule-inbox'),
 			'app' => 'calendar',
-			'user-only' => true,	// display just in user home
+			'user-only' => true, // display just in user home
 		),
 		'outbox' => array(
 			'resourcetype' => array(self::CALDAV => 'schedule-outbox'),
 			'app' => 'calendar',
-			'user-only' => true,	// display just in user home
+			'user-only' => true, // display just in user home
 		),
 		'infolog' => array(
 			'resourcetype' => array(self::GROUPDAV => 'vtodo-collection', self::CALDAV => 'calendar'),
@@ -229,14 +229,14 @@ 
 		if ($this->debug > 2) error_log('groupdav: $_SERVER='.array2string($_SERVER));
 
 		// setting our own exception handler, to be able to still log the requests
-		set_exception_handler(array(__CLASS__,'exception_handler'));
+		set_exception_handler(array(__CLASS__, 'exception_handler'));
 
 		// crrnd: client refuses redundand namespace declarations
 		// setting redundand namespaces as the default for (Cal|Card|Group)DAV, as the majority of the clients either require or can live with it
 		$this->crrnd = false;
 
 		// identify clients, which do NOT support path AND full url in <D:href> of PROPFIND request
-		switch(($agent = Handler::get_agent()))
+		switch (($agent = Handler::get_agent()))
 		{
 			case 'kde':	// KAddressbook (at least in 3.5 can NOT subscribe / does NOT find addressbook)
 				$this->client_require_href_as_url = true;
@@ -257,12 +257,12 @@ 
 		if ($this->debug) error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
 
 		// adding EGroupware version to X-Dav-Powered-By header eg. "EGroupware 1.8.001 CalDAV/CardDAV/GroupDAV server"
-		$this->dav_powered_by = str_replace('EGroupware','EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
+		$this->dav_powered_by = str_replace('EGroupware', 'EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
 			$this->dav_powered_by);
 
 		parent::__construct();
 		// hack to allow to use query parameters in WebDAV, which HTTP_WebDAV_Server interprets as part of the path
-		list($this->_SERVER['REQUEST_URI']) = explode('?',$this->_SERVER['REQUEST_URI']);
+		list($this->_SERVER['REQUEST_URI']) = explode('?', $this->_SERVER['REQUEST_URI']);
 		/*if (substr($this->_SERVER['REQUEST_URI'],-13) == '/;add-member/')
 		{
 			$_GET['add-member'] = '';
@@ -277,15 +277,15 @@ 
 		}
 		else
 		{
-			$this->current_user_principal = (@$_SERVER["HTTPS"] === "on" ? "https:" : "http:") .
-				'//' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'] . '/';
+			$this->current_user_principal = (@$_SERVER["HTTPS"] === "on" ? "https:" : "http:").
+				'//'.$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'].'/';
 		}
 		$this->current_user_principal .= 'principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/';
 
 		// if client requires pathes instead of URLs
 		if (!$this->client_require_href_as_url)
 		{
-			$this->current_user_principal = parse_url($this->current_user_principal,PHP_URL_PATH);
+			$this->current_user_principal = parse_url($this->current_user_principal, PHP_URL_PATH);
 		}
 		$this->accounts = $GLOBALS['egw']->accounts;
 
@@ -302,7 +302,7 @@ 
 	{
 		if (isset($this->root[$app]['app'])) $app = $this->root[$app]['app'];
 
-		return Handler::app_handler($app,$this);
+		return Handler::app_handler($app, $this);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	function OPTIONS($path, &$dav, &$allow)
 	{
-		unset($allow);	// not used, but required by function signature
+		unset($allow); // not used, but required by function signature
 
 		// locking support
 		if (!in_array('2', $dav)) $dav[] = '2';
@@ -351,7 +351,7 @@ 
 		}
 		if ($app !== 'calendar')	// CardDAV
 		{
-			$dav[] = 'addressbook';	// CardDAV uses "addressbook" NOT "addressbook-access"
+			$dav[] = 'addressbook'; // CardDAV uses "addressbook" NOT "addressbook-access"
 		}
 		//error_log(__METHOD__."('$path') --> app='$app' --> DAV: ".implode(', ', $dav));
 	}
@@ -363,7 +363,7 @@ 
 	 * @param  array  return array for file properties
 	 * @return bool   true on success
 	 */
-	function PROPFIND(&$options, &$files, $method='PROPFIND')
+	function PROPFIND(&$options, &$files, $method = 'PROPFIND')
 	{
 		if ($this->debug) error_log(__CLASS__."::$method(".array2string($options).')');
 
@@ -372,7 +372,7 @@ 
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
-		if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix) && $app && !$user && $user !== 0)
+		if (!self::_parse_path($options['path'], $id, $app, $user, $user_prefix) && $app && !$user && $user !== 0)
 		{
 			if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
 			return '404 Not Found';
@@ -404,9 +404,9 @@ 
 				$files['files'][] = $this->add_collection('/principals/', array(
 					'displayname' => lang('Accounts'),
 				));
-				foreach($this->accounts->search(array('type' => 'both','order'=>'account_lid')) as $account)
+				foreach ($this->accounts->search(array('type' => 'both', 'order'=>'account_lid')) as $account)
 				{
-					$this->add_home($files, $path.$account['account_lid'].'/', $account['account_id'], $options['depth'] == 'infinity' ? 'infinity' : $options['depth']-1);
+					$this->add_home($files, $path.$account['account_lid'].'/', $account['account_id'], $options['depth'] == 'infinity' ? 'infinity' : $options['depth'] - 1);
 				}
 			}
 			return true;
@@ -418,14 +418,14 @@ 
 		if ($app != 'principals' && !isset($GLOBALS['egw_info']['user']['apps'][$this->root[$app]['app'] ? $this->root[$app]['app'] : $app]))
 		{
 			if ($this->debug) error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
-			return "403 Forbidden: no app rights for '$app'";	// no rights for the given app
+			return "403 Forbidden: no app rights for '$app'"; // no rights for the given app
 		}
 		if (($handler = self::app_handler($app)))
 		{
 			if ($method != 'REPORT' && !$id)	// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
 			{
 				// KAddressbook doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes
-				$files['files'][0] = $this->add_app($app,$app=='addressbook'&&$handler->get_agent()=='kde',$user,
+				$files['files'][0] = $this->add_app($app, $app == 'addressbook' && $handler->get_agent() == 'kde', $user,
 					$this->_slashify($options['path']));
 
 				// Hack for iOS 5.0.1 addressbook to stop asking directory gateway permissions with depth != 0
@@ -436,9 +436,9 @@ 
 					$this->log(__CLASS__."::$method(".array2string($options).') Enabling hack for iOS 5.0.1 addressbook: force Depth: 0 on PROPFIND for directory gateway!');
 					return true;
 				}
-				if (!$options['depth']) return true;	// depth 0 --> show only the self url
+				if (!$options['depth']) return true; // depth 0 --> show only the self url
 			}
-			return $handler->propfind($this->_slashify($options['path']),$options,$files,$user,$id);
+			return $handler->propfind($this->_slashify($options['path']), $options, $files, $user, $id);
 		}
 		return '501 Not Implemented';
 	}
@@ -452,10 +452,10 @@ 
 	 * @param array $supported_privileges =null default $this->supported_privileges
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	public function add_collection($path, array $props = array(), array $privileges=array('read','read-acl','read-current-user-privilege-set'), array $supported_privileges=null)
+	public function add_collection($path, array $props = array(), array $privileges = array('read', 'read-acl', 'read-current-user-privilege-set'), array $supported_privileges = null)
 	{
 		// resourcetype: collection
-		$props['resourcetype'][] = self::mkprop('collection','');
+		$props['resourcetype'][] = self::mkprop('collection', '');
 
 		if (!isset($props['getcontenttype'])) $props['getcontenttype'] = 'httpd/unix-directory';
 
@@ -471,16 +471,16 @@ 
 	 * @param array $supported_privileges =null default $this->supported_privileges
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	public function add_resource($path, array $props = array(), array $privileges=array('read','read-current-user-privilege-set'), array $supported_privileges=null)
+	public function add_resource($path, array $props = array(), array $privileges = array('read', 'read-current-user-privilege-set'), array $supported_privileges = null)
 	{
 		// props for all collections: current-user-principal and principal-collection-set
 		$props['current-user-principal'] = array(
-			self::mkprop('href',$this->current_user_principal));
+			self::mkprop('href', $this->current_user_principal));
 		$props['principal-collection-set'] = array(
-			self::mkprop('href',$this->base_uri.'/principals/'));
+			self::mkprop('href', $this->base_uri.'/principals/'));
 
 		// required props per WebDAV standard
-		foreach(array(
+		foreach (array(
 			'displayname'      => basename($path),
 			'getetag'          => 'none',
 			'getcontentlength' => '',
@@ -496,7 +496,7 @@ 
 		if (is_null($supported_privileges)) $supported_privileges = $this->supported_privileges;
 		if ($this->prop_requested('current-user-privilege-set') === true)
 		{
-			foreach($privileges as $name)
+			foreach ($privileges as $name)
 			{
 				$props['current-user-privilege-set'][] = self::mkprop('privilege', array(
 					is_array($name) ? self::mkprop($name['ns'], $name['name'], '') : self::mkprop($name, '')));
@@ -504,7 +504,7 @@ 
 		}
 		if ($this->prop_requested('supported-privilege-set') === true)
 		{
-			foreach($supported_privileges as $name => $data)
+			foreach ($supported_privileges as $name => $data)
 			{
 				$props['supported-privilege-set'][] = $this->supported_privilege($name, $data, $path);
 			}
@@ -517,7 +517,7 @@ 
 		if ($this->debug > 1) error_log(__METHOD__."(path='$path', props=".array2string($props).')');
 
 		// convert simple associative properties to HTTP_WebDAV_Server ones
-		foreach($props as $name => &$prop)
+		foreach ($props as $name => &$prop)
 		{
 			if (!is_array($prop) || !isset($prop['name']))
 			{
@@ -544,7 +544,7 @@ 
 	 * @param string $path =null path to match with $data['*only*']
 	 * @return array of self::mkprop() arrays
 	 */
-	protected function supported_privilege($name, $data, $path=null)
+	protected function supported_privilege($name, $data, $path = null)
 	{
 		$props = array();
 		$props[] = self::mkprop('privilege', array(is_array($data) && $data['*ns*'] ?
@@ -552,12 +552,12 @@ 
 		$props[] = self::mkprop('description', is_array($data) ? $data['*description*'] : $data);
 		if (is_array($data))
 		{
-			foreach($data as $name => $data)
+			foreach ($data as $name => $data)
 			{
 				if ($name[0] == '*') continue;
 				if (is_array($data) && $data['*only*'] && strpos($path, $data['*only*']) === false)
 				{
-					continue;	// wrong path
+					continue; // wrong path
 				}
 				$props[] = $this->supported_privilege($name, $data, $path);
 			}
@@ -573,20 +573,20 @@ 
 	 * @param boolean $return_prop =false if true return the property array with values for 'name', 'xmlns', 'attrs', 'children'
 	 * @return boolean|string|array true: $name explicitly requested (or autoindex), "all": allprop or "names": propname requested, false: $name was not requested
 	 */
-	function prop_requested($name, $ns=null, $return_prop=false)
+	function prop_requested($name, $ns = null, $return_prop = false)
 	{
 		if (!is_array($this->propfind_options) || !isset($this->propfind_options['props']))
 		{
-			$ret = true;	// no props set, should happen only in autoindex, we return true to show all available props
+			$ret = true; // no props set, should happen only in autoindex, we return true to show all available props
 		}
 		elseif (!is_array($this->propfind_options['props']))
 		{
-			$ret = $this->propfind_options['props'];	// "all": allprop or "names": propname
+			$ret = $this->propfind_options['props']; // "all": allprop or "names": propname
 		}
 		else
 		{
 			$ret = false;
-			foreach($this->propfind_options['props'] as $prop)
+			foreach ($this->propfind_options['props'] as $prop)
 			{
 				if ($prop['name'] == $name && (is_null($ns) || $prop['xmlns'] == $ns))
 				{
@@ -621,7 +621,7 @@ 
 		$account = $this->accounts->read($account_lid);
 
 		$calendar_user_address_set = array(
-			self::mkprop('href','urn:uuid:'.$account['account_lid']),
+			self::mkprop('href', 'urn:uuid:'.$account['account_lid']),
 		);
 		if ($user < 0)
 		{
@@ -632,29 +632,29 @@ 
 		{
 			$principalType = 'users';
 			$displayname = $account['account_fullname'];
-			$calendar_user_address_set[] = self::mkprop('href','mailto:'.$account['account_email']);
+			$calendar_user_address_set[] = self::mkprop('href', 'mailto:'.$account['account_email']);
 		}
-		$calendar_user_address_set[] = self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');
+		$calendar_user_address_set[] = self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');
 
 		if ($depth && $path == '/')
 		{
 			$displayname = 'EGroupware (Cal|Card|Group)DAV server';
 		}
 
-		$displayname = Translation::convert($displayname, Translation::charset(),'utf-8');
+		$displayname = Translation::convert($displayname, Translation::charset(), 'utf-8');
 		// self url
 		$props = array(
 			'displayname' => $displayname,
-			'owner' => $path == '/' ? '' : array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
+			'owner' => $path == '/' ? '' : array(self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
 		);
 
 		if ($path != '/')
 		{
 			// add props modifyable via proppatch from client, eg. jqcalendar stores it's preferences there
-			foreach((array)$GLOBALS['egw_info']['user']['preferences']['groupdav'] as $name => $value)
+			foreach ((array)$GLOBALS['egw_info']['user']['preferences']['groupdav'] as $name => $value)
 			{
-				list($prop,$prop4path,$ns) = explode(':', $name, 3);
-				if ($prop4path == $path && (!in_array($ns,self::$ns_needs_explicit_named_props) ||
+				list($prop, $prop4path, $ns) = explode(':', $name, 3);
+				if ($prop4path == $path && (!in_array($ns, self::$ns_needs_explicit_named_props) ||
 					isset(self::$proppatch_props[$prop]) && self::$proppatch_props[$prop] === $ns))
 				{
 					$props[] = self::mkprop($ns, $prop, $value);
@@ -666,19 +666,19 @@ 
 
 		if ($depth)
 		{
-			foreach($this->root as $app => $data)
+			foreach ($this->root as $app => $data)
 			{
-				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue;	// no rights for the given app
+				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue; // no rights for the given app
 				if (!empty($data['user-only']) && ($path == '/' || $user < 0)) continue;
 
-				$files['files'][] = $this->add_app($app,false,$user,$path.$app.'/');
+				$files['files'][] = $this->add_app($app, false, $user, $path.$app.'/');
 
 				// only add global /addressbook-accounts/ as the one in home-set is added (and controled) by add_shared
 				if ($path == '/' && $app == 'addressbook' &&
 					!$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
 				{
-					$file = $this->add_app($app,false,0,$path.$app.'-accounts/');
-					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+					$file = $this->add_app($app, false, 0, $path.$app.'-accounts/');
+					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER, 'shared', '');
 					$files['files'][] = $file;
 				}
 				// added shared calendars or addressbooks
@@ -701,12 +701,12 @@ 
 	 * @param int $depth =0
 	 * @return string|boolean http status or true|false
 	 */
-	protected function add_resources_collection(array &$files, $path, $depth=0)
+	protected function add_resources_collection(array &$files, $path, $depth = 0)
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
 			if ($this->debug) error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
-			return "403 Forbidden: no app rights for 'resources'";	// no rights for the given app
+			return "403 Forbidden: no app rights for 'resources'"; // no rights for the given app
 		}
 		list(,$what) = explode('/', $path);
 		if (($is_location = ($what == 'locations')))
@@ -719,7 +719,7 @@ 
 		}
 		if ($depth)
 		{
-			foreach(Principals::get_resources() as $resource)
+			foreach (Principals::get_resources() as $resource)
 			{
 				if ($is_location == Principals::resource_is_location($resource))
 				{
@@ -751,11 +751,11 @@ 
 		$handler = $this->app_handler($app);
 		if (($shared = $handler->get_shared()))
 		{
-			foreach($shared as $id => $owner)
+			foreach ($shared as $id => $owner)
 			{
-				$file = $this->add_app($app,false,$id,$path.$owner.'/');
+				$file = $this->add_app($app, false, $id, $path.$owner.'/');
 				// mark other users calendar as shared (iOS 5.0.1 AB does NOT display AB marked as shared!)
-				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER, 'shared', '');
 				$files[] = $file;
 			}
 		}
@@ -785,11 +785,11 @@ 
 		{
 			if ($account < 0)
 			{
-				$name = lang('Group').' '.$this->accounts->id2name($account,'account_lid');
+				$name = lang('Group').' '.$this->accounts->id2name($account, 'account_lid');
 			}
 			else
 			{
-				$name = $this->accounts->id2name($account,'account_fullname');
+				$name = $this->accounts->id2name($account, 'account_fullname');
 			}
 			if (empty($name)) $name = '#'.$account;
 		}
@@ -805,7 +805,7 @@ 
 	 * @param string $path ='/'
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_app($app,$no_extra_types=false,$user=null,$path='/')
+	protected function add_app($app, $no_extra_types = false, $user = null, $path = '/')
 	{
 		if ($this->debug) error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
 		$user_preferences = $GLOBALS['egw_info']['user']['preferences'];
@@ -834,7 +834,7 @@ 
 		if (!isset($displayname)) $displayname = $this->account_name($user);
 
 		$props = array(
-			'owner' => array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
+			'owner' => array(self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
 		);
 
 		switch ($app)
@@ -851,7 +851,7 @@ 
 					$props['displayname'] = lang('All addressbooks');
 					break;
 				}
-				elseif(!$user && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+				elseif (!$user && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
 				{
 					unset($props['owner']);
 					$props['displayname'] = lang($app).' '.lang('Accounts');
@@ -864,40 +864,40 @@ 
 
 		// rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param
 		// leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member
-		if ($app && !in_array($app,array('inbox','outbox','principals')))	// not on inbox, outbox or principals
+		if ($app && !in_array($app, array('inbox', 'outbox', 'principals')))	// not on inbox, outbox or principals
 		{
-			$props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member');
+			$props['add-member'][] = self::mkprop('href', $this->base_uri.$path.'?add-member');
 		}
 
 		// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
 		$ns = null;
-		foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
 		{
 			unset($ns);
-			list($prop,$prop4user,$ns) = explode(':', $name, 3);
+			list($prop, $prop4user, $ns) = explode(':', $name, 3);
 			if ($prop4user == (string)$user && isset(self::$proppatch_props[$prop]) && !isset($ns))
 			{
 				$props[$prop] = self::mkprop(self::$proppatch_props[$prop], $prop, $value);
 				//error_log(__METHOD__."() explicit ".self::$proppatch_props[$prop].":$prop=".array2string($value));
 			}
 			// props in arbitrary namespaces not mentioned in self::$ns_needs_explicit_named_props
-			elseif(isset($ns) && !in_array($ns,self::$ns_needs_explicit_named_props))
+			elseif (isset($ns) && !in_array($ns, self::$ns_needs_explicit_named_props))
 			{
 				$props[] = self::mkprop($ns, $prop, $value);
 				//error_log(__METHOD__."() arbitrary $ns:$prop=".array2string($value));
 			}
 		}
 
-		foreach((array)$this->root[$app] as $prop => $values)
+		foreach ((array)$this->root[$app] as $prop => $values)
 		{
-			switch($prop)
+			switch ($prop)
 			{
 				case 'resourcetype';
 					if (!$no_extra_types)
 					{
-						foreach($this->root[$app]['resourcetype'] as $ns => $type)
+						foreach ($this->root[$app]['resourcetype'] as $ns => $type)
 						{
-							$props['resourcetype'][] = self::mkprop($ns,$type,'');
+							$props['resourcetype'][] = self::mkprop($ns, $type, '');
 						}
 						// add /addressbook/ as directory gateway
 						if ($path == '/addressbook/')
@@ -908,13 +908,13 @@ 
 					break;
 				case 'app':
 				case 'user-only':
-					break;	// no props, already handled
+					break; // no props, already handled
 				default:
 					if (is_array($values))
 					{
-						foreach($values as $ns => $value)
+						foreach ($values as $ns => $value)
 						{
-							$props[$prop] = self::mkprop($ns,$prop,$value);
+							$props[$prop] = self::mkprop($ns, $prop, $value);
 						}
 					}
 					else
@@ -927,20 +927,20 @@ 
 		// add other handler specific properties
 		if (($handler = self::app_handler($app)))
 		{
-			if (method_exists($handler,'extra_properties'))
+			if (method_exists($handler, 'extra_properties'))
 			{
 				$props = $handler->extra_properties($props, $displayname, $this->base_uri, $user, $path);
 			}
 			// add ctag if handler implements it
-			if (method_exists($handler,'getctag') && $this->prop_requested('getctag') === true)
+			if (method_exists($handler, 'getctag') && $this->prop_requested('getctag') === true)
 			{
 				$props['getctag'] = self::mkprop(
-					self::CALENDARSERVER,'getctag',$handler->getctag($path,$user));
+					self::CALENDARSERVER, 'getctag', $handler->getctag($path, $user));
 			}
 			// add sync-token url if handler supports sync-collection report
 			if (isset($props['supported-report-set']['sync-collection']) && $this->prop_requested('sync-token') === true)
 			{
-				$props['sync-token'] = $handler->get_sync_token($path,$user);
+				$props['sync-token'] = $handler->get_sync_token($path, $user);
 			}
 		}
 		if ($handler && !is_null($user))
@@ -963,7 +963,7 @@ 
 	{
 		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($options).')');
 
-		return $this->PROPFIND($options,$files,'REPORT');
+		return $this->PROPFIND($options, $files, 'REPORT');
 	}
 
 	/**
@@ -987,13 +987,13 @@ 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user) || $app == 'principals')
+		if (!$this->_parse_path($options['path'], $id, $app, $user) || $app == 'principals')
 		{
 			return $this->autoindex($options);
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			return $handler->get($options,$id,$user);
+			return $handler->get($options, $id, $user);
 		}
 		error_log(__METHOD__."(".array2string($options).") 501 Not Implemented");
 		return '501 Not Implemented';
@@ -1011,9 +1011,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='.Translation::charset());
 		echo "<html>\n<head>\n\t<title>".'EGroupware (Cal|Card|Group)DAV server '.htmlspecialchars($options['path'])."</title>\n";
@@ -1024,10 +1024,10 @@ 
 
 		echo '<h1>(Cal|Card|Group)DAV ';
 		$path = '/groupdav.php';
-		foreach(explode('/',$this->_unslashify($options['path'])) as $n => $name)
+		foreach (explode('/', $this->_unslashify($options['path'])) as $n => $name)
 		{
 			$path .= ($n != 1 ? '/' : '').$name;
-			echo Html::a_href(htmlspecialchars($name.'/'),$path);
+			echo Html::a_href(htmlspecialchars($name.'/'), $path);
 		}
 		echo "</h1>\n";
 
@@ -1047,18 +1047,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";
 				}
@@ -1068,9 +1068,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 = basename(substr($file['path'],0,-1)).'/';
+				$name = basename(substr($file['path'], 0, -1)).'/';
 			}
 			else
 			{
@@ -1078,14 +1078,14 @@ 
 			}
 
 			echo "\t<tr class='$class'>\n\t\t<td>$n</td>\n\t\t<td>".
-				Html::a_href(htmlspecialchars($name),'/groupdav.php'.strtr($file['path'], array(
+				Html::a_href(htmlspecialchars($name), '/groupdav.php'.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";
 		}
@@ -1099,7 +1099,7 @@ 
 		}
 		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);
@@ -1147,11 +1147,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 ? '<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
+		$ret = $value[0] == '<' || strpos($value, "\n") !== false ? '<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
 
 		if ($href)
 		{
@@ -1169,10 +1169,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';
@@ -1191,10 +1191,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
 			{
@@ -1217,13 +1217,13 @@ 
 		// POST to the collection URL plus a UID like name component (like for regular PUT) to create new entrys
 		if (isset($_GET['add-member']) || Handler::get_agent() == 'cfnetwork')
 		{
-			$_GET['add-member'] = '';	// otherwise we give no Location header
+			$_GET['add-member'] = ''; // otherwise we give no Location header
 			return $this->PUT($options);
 		}
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		$this->_parse_path($options['path'],$id,$app,$user);
+		$this->_parse_path($options['path'], $id, $app, $user);
 
 		if (($handler = self::app_handler($app)))
 		{
@@ -1239,12 +1239,12 @@ 
 				if (isset($options['stream']))
 				{
 					$options['content'] = '';
-					while(!feof($options['stream']))
+					while (!feof($options['stream']))
 					{
-						$options['content'] .= fread($options['stream'],8192);
+						$options['content'] .= fread($options['stream'], 8192);
 					}
 				}
-				return $handler->post($options,$id,$user);
+				return $handler->post($options, $id, $user);
 			}
 		}
 		return '501 Not Implemented';
@@ -1283,7 +1283,7 @@ 
 			return '403 Forbidden';
 		}
 
-		switch($action)
+		switch ($action)
 		{
 			case 'attachment-add':
 				$matches = null;
@@ -1295,8 +1295,8 @@ 
 				}
 				$path = null;
 				if (!($to = self::fopen_attachment($handler->app, $handler->get_id($entry), $filename, $this->_SERVER['CONTENT_TYPE'], $path)) ||
-					isset($options['stream']) && ($copied=stream_copy_to_stream($options['stream'], $to)) === false ||
-					isset($options['content']) && ($copied=fwrite($to, $options['content'])) === false)
+					isset($options['stream']) && ($copied = stream_copy_to_stream($options['stream'], $to)) === false ||
+					isset($options['content']) && ($copied = fwrite($to, $options['content'])) === false)
 				{
 					return '403 Forbidden';
 				}
@@ -1339,8 +1339,8 @@ 
 						}
 					}
 					if (!($to = Vfs::fopen($path, 'w')) ||
-						isset($options['stream']) && ($copied=stream_copy_to_stream($options['stream'], $to)) === false ||
-						isset($options['content']) && ($copied=fwrite($to, $options['content'])) === false)
+						isset($options['stream']) && ($copied = stream_copy_to_stream($options['stream'], $to)) === false ||
+						isset($options['content']) && ($copied = fwrite($to, $options['content'])) === false)
 					{
 						self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id-parameter', ''));
 						return '403 Forbidden';
@@ -1382,23 +1382,23 @@ 
 	 * @param boolean $delete_via_put
 	 * @return boolean false on error, eg. invalid managed id, for false an xml-error body has been send
 	 */
-	public static function handle_attach($app, $id, $attach, $delete_via_put=false)
+	public static function handle_attach($app, $id, $attach, $delete_via_put = false)
 	{
 		error_log(__METHOD__."('$app', $id, attach=".array2string($attach).", delete_via_put=".array2string($delete_via_put).')');
 
 		if (!Link::file_access($app, $id, Acl::EDIT))
 		{
 			error_log(__METHOD__."('$app', $id, ...) no rights to update attachments");
-			return;	// no rights --> nothing to do
+			return; // no rights --> nothing to do
 		}
-		if (!is_array($attach)) $attach = array();	// could be PEAR_Error if not set
+		if (!is_array($attach)) $attach = array(); // could be PEAR_Error if not set
 
 		if ($delete_via_put)
 		{
-			foreach(Vfs::find(Link::vfs_path($app, $id, '', true), array('type' => 'F')) as $path)
+			foreach (Vfs::find(Link::vfs_path($app, $id, '', true), array('type' => 'F')) as $path)
 			{
 				$found = false;
-				foreach($attach as $key => $attr)
+				foreach ($attach as $key => $attr)
 				{
 					if ($attr['params']['MANAGED-ID'] === self::path2managed_id($path))
 					{
@@ -1415,7 +1415,7 @@ 
 			}
 		}
 		// turn inline attachments into managed ones
-		foreach($attach as $key => $attr)
+		foreach ($attach as $key => $attr)
 		{
 			if (!empty($attr['params']['FMTTYPE']))
 			{
@@ -1428,7 +1428,7 @@ 
 						self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id', ''));
 						return false;
 					}
-					if($path == ($link = Link::vfs_path($app, $id, Vfs::basename($path))))
+					if ($path == ($link = Link::vfs_path($app, $id, Vfs::basename($path))))
 					{
 						error_log(__METHOD__."('$app', $id, ...) trying to modify existing MANAGED-ID --> ignored! ".array2string($attr));
 						continue;
@@ -1436,8 +1436,8 @@ 
 					// reuse valid managed-id --> symlink attachment
 					if (Vfs::file_exists($link))
 					{
-						if (Vfs::readlink($link) === $path) continue;	// no need to recreate identical link
-						Vfs::unlink($link);		// symlink will fail, if $link exists
+						if (Vfs::readlink($link) === $path) continue; // no need to recreate identical link
+						Vfs::unlink($link); // symlink will fail, if $link exists
 					}
 					if (!Vfs::symlink($path, $link))
 					{
@@ -1445,9 +1445,9 @@ 
 					}
 					continue;
 				}
-				if (!($to = self::fopen_attachment($app, $id, $filename=$attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
+				if (!($to = self::fopen_attachment($app, $id, $filename = $attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
 					// Horde Icalendar does NOT decode automatic
-					($copied=fwrite($to, $attr['params']['ENCODING'] == 'BASE64' ? base64_decode($attr['value']) : $attr['value'])) === false)
+					($copied = fwrite($to, $attr['params']['ENCODING'] == 'BASE64' ? base64_decode($attr['value']) : $attr['value'])) === false)
 				{
 					error_log(__METHOD__."('$app', $id, ...) failed to add attachment ".array2string($attr).") ");
 					continue;
@@ -1472,16 +1472,16 @@ 
 	 * @param string &$path =null on return path opened
 	 * @return resource
 	 */
-	protected static function fopen_attachment($app, $id, $_filename, $mime=null, &$path=null)
+	protected static function fopen_attachment($app, $id, $_filename, $mime = null, &$path = null)
 	{
 		$filename = empty($_filename) ? 'attachment' : Vfs::basename($_filename);
 
-		if (strpos($mime, ';')) list($mime) = explode(';', $mime);	// in case it contains eg. charset info
+		if (strpos($mime, ';')) list($mime) = explode(';', $mime); // in case it contains eg. charset info
 
 		$ext = !empty($mime) ? MimeMagic::mime2ext($mime) : '';
 
 		$matches = null;
-		if (!$ext || substr($filename, -strlen($ext)-1) == '.'.$ext ||
+		if (!$ext || substr($filename, -strlen($ext) - 1) == '.'.$ext ||
 			preg_match('/\.([^.]+)$/', $filename, $matches) && MimeMagic::ext2mime($matches[1]) == $mime)
 		{
 			$parts = explode('.', $filename);
@@ -1492,7 +1492,7 @@ 
 		{
 			$ext = '.'.$ext;
 		}
-		for($i = 1; $i < 100; ++$i)
+		for ($i = 1; $i < 100; ++$i)
 		{
 			$path = Link::vfs_path($app, $id, $filename.($i > 1 ? '-'.$i : '').$ext, true);
 			if (!Vfs::stat($path)) break;
@@ -1538,7 +1538,7 @@ 
 	 */
 	public static function add_attach($app, $id, array &$attributes, array &$parameters)
 	{
-		foreach(Vfs::find(Link::vfs_path($app, $id, '', true), array(
+		foreach (Vfs::find(Link::vfs_path($app, $id, '', true), array(
 			'type' => 'F',
 			'need_mime' => true,
 		), true) as $path => $stat)
@@ -1546,7 +1546,7 @@ 
 			// handle symlinks --> return target size and mime-type
 			if (($target = Vfs::readlink($path)))
 			{
-				if (!($stat = Vfs::stat($target))) continue;	// broken or inaccessible symlink
+				if (!($stat = Vfs::stat($target))) continue; // broken or inaccessible symlink
 
 				// check if target is in /apps, probably reused MANAGED-ID --> return it
 				if (substr($target, 0, 6) == '/apps/')
@@ -1558,7 +1558,7 @@ 
 			$parameters['ATTACH'][] = array(
 				'MANAGED-ID' => self::path2managed_id($path),
 				'FMTTYPE'    => $stat['mime'],
-				'SIZE'       => (string)$stat['size'],	// Horde_Icalendar renders int as empty string
+				'SIZE'       => (string)$stat['size'], // Horde_Icalendar renders int as empty string
 				'FILENAME'   => Vfs::basename($path),
 			);
 			// if we have attachments, set X-attribute to enable deleting them by put
@@ -1586,7 +1586,7 @@ 
 	 * @param string|int $id =null id to check agains path
 	 * @return string|boolean "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
 	 */
-	static public function managed_id2path($managed_id, $app=null, $id=null)
+	static public function managed_id2path($managed_id, $app = null, $id = null)
 	{
 		$path = base64_decode($managed_id);
 
@@ -1596,7 +1596,7 @@ 
 		}
 		elseif (!empty($app) && !empty($id))
 		{
-			list(,,$a,$i) = explode('/', $path);
+			list(,, $a, $i) = explode('/', $path);
 			if ($a !== $app || $i !== (string)$id)
 			{
 				$path = false;
@@ -1624,7 +1624,7 @@ 
 		'displayname' => self::DAV,
 		'calendar-description' => self::CALDAV,
 		'addressbook-description' => self::CARDDAV,
-		'calendar-color' => self::ICAL,	// only mentioned that old prefs still work
+		'calendar-color' => self::ICAL, // only mentioned that old prefs still work
 		'calendar-order' => self::ICAL,
 		'default-alarm-vevent-date' => self::CALDAV,
 		'default-alarm-vevent-datetime' => self::CALDAV,
@@ -1642,11 +1642,11 @@ 
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
-		self::_parse_path($options['path'],$id,$app,$user,$user_prefix);	// allways returns false if eg. !$id
+		self::_parse_path($options['path'], $id, $app, $user, $user_prefix); // allways returns false if eg. !$id
 		if ($app == 'principals' || $id || $options['path'] == '/')
 		{
 			if ($this->debug > 1) error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
-			foreach($options['props'] as &$prop)
+			foreach ($options['props'] as &$prop)
 			{
 				$prop['status'] = '403 Forbidden';
 			}
@@ -1654,10 +1654,10 @@ 
 		}
 		// store selected props in preferences, eg. calendar-color, see self::$proppatch_props
 		$need_save = array();
-		foreach($options['props'] as &$prop)
+		foreach ($options['props'] as &$prop)
 		{
 			if ((isset(self::$proppatch_props[$prop['name']]) && self::$proppatch_props[$prop['name']] === $prop['xmlns'] ||
-				!in_array($prop['xmlns'],self::$ns_needs_explicit_named_props)))
+				!in_array($prop['xmlns'], self::$ns_needs_explicit_named_props)))
 			{
 				if (!$app)
 				{
@@ -1686,7 +1686,7 @@ 
 			}
 			else
 			{
-				$prop['status'] = '409 Conflict';	// could also be "403 Forbidden"
+				$prop['status'] = '409 Conflict'; // could also be "403 Forbidden"
 			}
 		}
 		if ($need_save)
@@ -1695,7 +1695,7 @@ 
 			// call calendar-hook, if default-alarms are changed, to sync them to calendar prefs
 			if (class_exists('calendar_hooks'))
 			{
-				foreach($need_save as $name)
+				foreach ($need_save as $name)
 				{
 					list($name) = explode(':', $name);
 					if (in_array($name, array('default-alarm-vevent-date', 'default-alarm-vevent-datetime')))
@@ -1720,22 +1720,22 @@ 
 		if (isset($options['stream']))
 		{
 			$options['content'] = '';
-			while(!feof($options['stream']))
+			while (!feof($options['stream']))
 			{
-				$options['content'] .= fread($options['stream'],8192);
+				$options['content'] .= fread($options['stream'], 8192);
 			}
 		}
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = $prefix = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user,$prefix))
+		if (!$this->_parse_path($options['path'], $id, $app, $user, $prefix))
 		{
 			return '404 Not Found';
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			$status = $handler->put($options,$id,$user,$prefix);
+			$status = $handler->put($options, $id, $user, $prefix);
 
 			// set default stati: true --> 204 No Content, false --> should be already handled
 			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
@@ -1765,13 +1765,13 @@ 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user))
+		if (!$this->_parse_path($options['path'], $id, $app, $user))
 		{
 			return '404 Not Found';
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			$status = $handler->delete($options,$id);
+			$status = $handler->delete($options, $id);
 			// set default stati: true --> 204 No Content, false --> should be already handled
 			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
 			return $status;
@@ -1811,7 +1811,7 @@ 
 	 * @param  array  general parameter passing array
 	 * @return bool   true on success
 	 */
-	function COPY($options, $del=false)
+	function COPY($options, $del = false)
 	{
 		if ($this->debug) error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
 
@@ -1827,8 +1827,8 @@ 
 	function LOCK(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
-		$path = Vfs::app_entry_lock_path($app,$id);
+		self::_parse_path($options['path'], $id, $app, $user);
+		$path = Vfs::app_entry_lock_path($app, $id);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
 
@@ -1836,16 +1836,16 @@ 
 		$handler = self::app_handler($app);
 
 		// TODO recursive locks on directories not supported yet
-		if (!$id || !empty($options['depth']) || !$handler->check_access(Acl::EDIT,$id))
+		if (!$id || !empty($options['depth']) || !$handler->check_access(Acl::EDIT, $id))
 		{
 			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($path,$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))		// false = no ACL check
+		if (($ret = Vfs::lock($path, $options['locktoken'], $options['timeout'], strip_tags($options['owner']),
+			$options['scope'], $options['type'], isset($options['update']), false)) && !isset($options['update']))		// false = no ACL check
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
@@ -1861,11 +1861,11 @@ 
 	function UNLOCK(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
-		$path = Vfs::app_entry_lock_path($app,$id);
+		self::_parse_path($options['path'], $id, $app, $user);
+		$path = Vfs::app_entry_lock_path($app, $id);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
-		return Vfs::unlock($path,$options['token']) ? '204 No Content' : '409 Conflict';
+		return Vfs::unlock($path, $options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
 	/**
@@ -1877,7 +1877,7 @@ 
 	function checkLock($path)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($path,$id,$app,$user);
+		self::_parse_path($path, $id, $app, $user);
 
 		return Vfs::checkLock(Vfs::app_entry_lock_path($app, $id));
 	}
@@ -1891,7 +1891,7 @@ 
 	function ACL(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
+		self::_parse_path($options['path'], $id, $app, $user);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
 
@@ -1921,7 +1921,7 @@ 
 	 * @param string &$user_prefix =null
 	 * @return boolean true on success, false on error
 	 */
-	function _parse_path($path,&$id,&$app,&$user,&$user_prefix=null)
+	function _parse_path($path, &$id, &$app, &$user, &$user_prefix = null)
 	{
 		if ($this->debug)
 		{
@@ -1950,7 +1950,7 @@ 
 			}
 		}
 		elseif (($account_id = $this->accounts->name2id($parts[0], 'account_lid')) ||
-			($account_id = $this->accounts->name2id($parts[0]=urldecode($parts[0]))))
+			($account_id = $this->accounts->name2id($parts[0] = urldecode($parts[0]))))
 		{
 			// /$user/$app/...
 			$user = array_shift($parts);
@@ -1974,7 +1974,7 @@ 
 			{
 				$account_id = 0;
 			}
-			elseif($app == 'resource' || $app == 'location')
+			elseif ($app == 'resource' || $app == 'location')
 			{
 				if (!Principals::read_resource($res_id = (int)$username))
 				{
@@ -1984,7 +1984,7 @@ 
 				$app = 'calendar';
 			}
 			elseif (!($account_id = $this->accounts->name2id($username, 'account_lid')) &&
-					!($account_id = $this->accounts->name2id($username=urldecode($username))))
+					!($account_id = $this->accounts->name2id($username = urldecode($username))))
 			{
 				return false;
 			}
@@ -2009,11 +2009,11 @@ 
 		$id = array_pop($parts);
 
 		$ok = ($id || isset($_GET['add-member']) && $_SERVER['REQUEST_METHOD'] == 'POST') &&
-			($user || $user === 0) && in_array($app,array('addressbook','calendar','infolog','principals'));
+			($user || $user === 0) && in_array($app, array('addressbook', 'calendar', 'infolog', 'principals'));
 
 		if ($this->debug)
 		{
-			error_log(__METHOD__."('$path') returning " . ($ok ? 'true' : 'false') . ": id='$id', app='$app', user='$user', user_prefix='$user_prefix'");
+			error_log(__METHOD__."('$path') returning ".($ok ? 'true' : 'false').": id='$id', app='$app', user='$user', user_prefix='$user_prefix'");
 		}
 		return $ok;
 	}
@@ -2035,7 +2035,7 @@ 
 	 */
 	function ServeRequest()
 	{
-		if ((self::$log_level=$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' ||
+		if ((self::$log_level = $GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' ||
 			self::$log_level === 'f' || $this->debug)
 		{
 			self::$request_starttime = microtime(true);
@@ -2055,7 +2055,7 @@ 
 	 *
 	 * @param string $extra ='' extra text to add below request-log, eg. exception thrown
 	 */
-	protected function log_request($extra='')
+	protected function log_request($extra = '')
 	{
 		if (self::$request_starttime)
 		{
@@ -2063,7 +2063,7 @@ 
 			{
 				$msg_file = $GLOBALS['egw_info']['server']['files_dir'];
 				$msg_file .= '/groupdav';
-				if (!file_exists($msg_file) && !mkdir($msg_file,0700))
+				if (!file_exists($msg_file) && !mkdir($msg_file, 0700))
 				{
 					error_log(__METHOD__."() Could NOT create directory '$msg_file'!");
 					return;
@@ -2076,19 +2076,19 @@ 
 				}
 				else
 				{
-					$msg_file .= str_replace('/','!',$_SERVER['HTTP_USER_AGENT']).'.log';
+					$msg_file .= str_replace('/', '!', $_SERVER['HTTP_USER_AGENT']).'.log';
 				}
 				$content = '*** '.$_SERVER['REMOTE_ADDR'].' '.date('c')."\n";
 			}
 			$content .= $_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI'].' HTTP/1.1'."\n";
 			// reconstruct headers
-			foreach($_SERVER as $name => $value)
+			foreach ($_SERVER as $name => $value)
 			{
-				list($type,$name) = explode('_',$name,2);
+				list($type, $name) = explode('_', $name, 2);
 				if ($type == 'HTTP' || $type == 'CONTENT')
 				{
-					$content .= str_replace(' ','-',ucwords(strtolower(($type=='HTTP'?'':$type.' ').str_replace('_',' ',$name)))).
-						': '.($name=='AUTHORIZATION'?'Basic ***************':$value)."\n";
+					$content .= str_replace(' ', '-', ucwords(strtolower(($type == 'HTTP' ? '' : $type.' ').str_replace('_', ' ', $name)))).
+						': '.($name == 'AUTHORIZATION' ? 'Basic ***************' : $value)."\n";
 				}
 			}
 			$content .= "\n";
@@ -2099,29 +2099,29 @@ 
 			$content .= 'HTTP/1.1 '.$this->_http_status."\n";
 			$content .= 'Date: '.str_replace('+0000', 'GMT', gmdate('r'))."\n";
 			$content .= 'Server: '.$_SERVER['SERVER_SOFTWARE']."\n";
-			foreach(headers_list() as $line)
+			foreach (headers_list() as $line)
 			{
 				$content .= $line."\n";
 			}
 			if (($c = ob_get_flush())) $content .= "\n";
-			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c, 0, 1536)."\n*** LOG TRUNKATED\n";
 			$content .= $c;
 			if ($extra) $content .= $extra;
 			if ($this->to_log) $content .= "\n### ".implode("\n### ", $this->to_log)."\n";
-			$content .= $this->_http_status[0] == '4' && substr($this->_http_status,0,3) != '412' ||
-				$this->_http_status[0] == '5' ? '###' : '***';	// mark failed requests with ###, instead of ***
-			$content .= sprintf(' %s --> "%s" took %5.3f s',$_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD']=='REPORT'?' '.$this->propfind_options['root']['name']:'').' '.$_SERVER['PATH_INFO'],$this->_http_status,microtime(true)-self::$request_starttime)."\n\n";
+			$content .= $this->_http_status[0] == '4' && substr($this->_http_status, 0, 3) != '412' ||
+				$this->_http_status[0] == '5' ? '###' : '***'; // mark failed requests with ###, instead of ***
+			$content .= sprintf(' %s --> "%s" took %5.3f s', $_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD'] == 'REPORT' ? ' '.$this->propfind_options['root']['name'] : '').' '.$_SERVER['PATH_INFO'], $this->_http_status, microtime(true) - self::$request_starttime)."\n\n";
 
-			if ($msg_file && ($f = fopen($msg_file,'a')))
+			if ($msg_file && ($f = fopen($msg_file, 'a')))
 			{
-				flock($f,LOCK_EX);
-				fwrite($f,$content);
-				flock($f,LOCK_UN);
+				flock($f, LOCK_EX);
+				fwrite($f, $content);
+				flock($f, LOCK_UN);
 				fclose($f);
 			}
 			else
 			{
-				foreach(explode("\n",$content) as $line)
+				foreach (explode("\n", $content) as $line)
 				{
 					error_log($line);
 				}
@@ -2135,7 +2135,7 @@ 
 	 * @param string|array $xml_error string with name for empty element in DAV NS or array with props
 	 * @param string $human_readable =null human readable error message
 	 */
-	public static function xml_error($xml_error, $human_readable=null)
+	public static function xml_error($xml_error, $human_readable = null)
 	{
 		header('Content-type: application/xml; charset=utf-8');
 
@@ -2152,7 +2152,7 @@ 
 			$xml->writeElement('responsedescription', $human_readable);
 		}
 
-		$xml->endElement();	// DAV:error
+		$xml->endElement(); // DAV:error
 		$xml->endDocument();
 		echo $xml->outputMemory();
 	}
@@ -2168,7 +2168,7 @@ 
 		if (is_string($props)) $props = self::mkprop($props, '');
 		if (isset($props['name'])) $props = array($props);
 
-		foreach($props as $prop)
+		foreach ($props as $prop)
 		{
 			if (isset($prop['ns']) && $prop['ns'] !== 'DAV:')
 			{
@@ -2220,7 +2220,7 @@ 
 	{
 		// logging exception as regular egw_execption_hander does
 		$headline = null;
-		_egw_log_exception($e,$headline);
+		_egw_log_exception($e, $headline);
 
 		// exception handler sending message back to the client as basic auth message
 		$error = str_replace(array("\r", "\n"), array('', ' | '), $e->getMessage());
@@ -2231,7 +2231,7 @@ 
 		// if our own logging is active, log the request plus a trace, if enabled in server-config
 		if (self::$request_starttime && isset(self::$instance))
 		{
-			self::$instance->_http_status = '401 Unauthorized';	// to correctly log it
+			self::$instance->_http_status = '401 Unauthorized'; // to correctly log it
 			if ($GLOBALS['egw_info']['server']['exception_show_trace'])
 			{
 				self::$instance->log_request("\n".$e->getTraceAsString()."\n");
@@ -2253,7 +2253,7 @@ 
 	 */
 	static function generate_uid($_appName, $_eventID)
 	{
-		if(empty($_appName) || empty($_eventID)) return false;
+		if (empty($_appName) || empty($_eventID)) return false;
 
 		return $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
 	}

Braces +260 added lines, -64 removed lines

@@ -222,11 +222,20 @@ 
 	function __construct()
 	{
 		// log which CalDAVTester test is currently running, set as User-Agent header
-		if (substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'scripts/tests/') error_log('****** '.$_SERVER['HTTP_USER_AGENT']);
+		if (substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'scripts/tests/')
+		{
+			error_log('****** '.$_SERVER['HTTP_USER_AGENT']);
+		}
 
-		if (!$this->debug) $this->debug = (int)$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level'];
+		if (!$this->debug)
+		{
+			$this->debug = (int)$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level'];
+		}
 
-		if ($this->debug > 2) error_log('groupdav: $_SERVER='.array2string($_SERVER));
+		if ($this->debug > 2)
+		{
+			error_log('groupdav: $_SERVER='.array2string($_SERVER));
+		}
 
 		// setting our own exception handler, to be able to still log the requests
 		set_exception_handler(array(__CLASS__,'exception_handler'));
@@ -254,7 +263,10 @@ 
 				$this->crrnd = true; // Older Apple Addressbook.app does not cope with namespace redundancy
 				break;
 		}
-		if ($this->debug) error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
+		}
 
 		// adding EGroupware version to X-Dav-Powered-By header eg. "EGroupware 1.8.001 CalDAV/CardDAV/GroupDAV server"
 		$this->dav_powered_by = str_replace('EGroupware','EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
@@ -300,7 +312,10 @@ 
 	 */
 	function app_handler($app)
 	{
-		if (isset($this->root[$app]['app'])) $app = $this->root[$app]['app'];
+		if (isset($this->root[$app]['app']))
+		{
+			$app = $this->root[$app]['app'];
+		}
 
 		return Handler::app_handler($app,$this);
 	}
@@ -317,22 +332,34 @@ 
 		unset($allow);	// not used, but required by function signature
 
 		// locking support
-		if (!in_array('2', $dav)) $dav[] = '2';
+		if (!in_array('2', $dav))
+		{
+			$dav[] = '2';
+		}
 
-		if (preg_match('#/(calendar(-[^/]+)?|inbox|outbox)/#', $path))	// eg. /<username>/calendar-<otheruser>/
+		if (preg_match('#/(calendar(-[^/]+)?|inbox|outbox)/#', $path))
+		{
+			// eg. /<username>/calendar-<otheruser>/
 		{
 			$app = 'calendar';
 		}
-		elseif (preg_match('#/addressbook(-[^/]+)?/#', $path))	// eg. /<username>/addressbook-<otheruser>/
+		}
+		elseif (preg_match('#/addressbook(-[^/]+)?/#', $path))
+		{
+			// eg. /<username>/addressbook-<otheruser>/
 		{
 			$app = 'addressbook';
 		}
+		}
 		// CalDAV and CardDAV
 		$dav[] = 'access-control';
 
-		if ($app !== 'addressbook')	// CalDAV
+		if ($app !== 'addressbook')
+		{
+			// CalDAV
 		{
 			$dav[] = 'calendar-access';
+		}
 			$dav[] = 'calendar-auto-schedule';
 			$dav[] = 'calendar-proxy';
 			// required by iOS iCal to use principal-property-search to autocomplete participants (and locations)
@@ -349,9 +376,13 @@ 
 			//$dav[] = 'calendarserver-sharing';
 			//$dav[] = 'calendarserver-sharing-no-scheduling';
 		}
-		if ($app !== 'calendar')	// CardDAV
+		if ($app !== 'calendar')
 		{
-			$dav[] = 'addressbook';	// CardDAV uses "addressbook" NOT "addressbook-access"
+			// CardDAV
+		{
+			$dav[] = 'addressbook';
+		}
+		// CardDAV uses "addressbook" NOT "addressbook-access"
 		}
 		//error_log(__METHOD__."('$path') --> app='$app' --> DAV: ".implode(', ', $dav));
 	}
@@ -365,7 +396,10 @@ 
 	 */
 	function PROPFIND(&$options, &$files, $method='PROPFIND')
 	{
-		if ($this->debug) error_log(__CLASS__."::$method(".array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__CLASS__."::$method(".array2string($options).')');
+		}
 
 		// make options (readonly) available to all class methods, eg. prop_requested
 		$this->propfind_options = $options;
@@ -374,18 +408,27 @@ 
 		$id = $app = $user = $user_prefix = null;
 		if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix) && $app && !$user && $user !== 0)
 		{
-			if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
+			if ($this->debug > 1)
+			{
+				error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
+			}
 			return '404 Not Found';
 		}
-		if ($this->debug > 1) error_log(__CLASS__."::$method(path='$options[path]'): user='$user', user_prefix='$user_prefix', app='$app', id='$id'");
+		if ($this->debug > 1)
+		{
+			error_log(__CLASS__."::$method(path='$options[path]'): user='$user', user_prefix='$user_prefix', app='$app', id='$id'");
+		}
 
 		$files = array('files' => array());
 		$path = $user_prefix = $this->_slashify($user_prefix);
 
-		if (!$app)	// user root folder containing apps
+		if (!$app)
+		{
+			// user root folder containing apps
 		{
 			// add root with current users apps
 			$this->add_home($files, $path, $user, $options['depth']);
+		}
 
 			if ($path == '/')
 			{
@@ -417,16 +460,22 @@ 
 		}
 		if ($app != 'principals' && !isset($GLOBALS['egw_info']['user']['apps'][$this->root[$app]['app'] ? $this->root[$app]['app'] : $app]))
 		{
-			if ($this->debug) error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
+			if ($this->debug)
+			{
+				error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
+			}
 			return "403 Forbidden: no app rights for '$app'";	// no rights for the given app
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			if ($method != 'REPORT' && !$id)	// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
+			if ($method != 'REPORT' && !$id)
+			{
+				// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
 			{
 				// KAddressbook doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes
 				$files['files'][0] = $this->add_app($app,$app=='addressbook'&&$handler->get_agent()=='kde',$user,
 					$this->_slashify($options['path']));
+			}
 
 				// Hack for iOS 5.0.1 addressbook to stop asking directory gateway permissions with depth != 0
 				// values for depth are 0, 1, "infinit" or not set which has to be interpreted as "infinit"
@@ -436,7 +485,11 @@ 
 					$this->log(__CLASS__."::$method(".array2string($options).') Enabling hack for iOS 5.0.1 addressbook: force Depth: 0 on PROPFIND for directory gateway!');
 					return true;
 				}
-				if (!$options['depth']) return true;	// depth 0 --> show only the self url
+				if (!$options['depth'])
+				{
+					return true;
+				}
+				// depth 0 --> show only the self url
 			}
 			return $handler->propfind($this->_slashify($options['path']),$options,$files,$user,$id);
 		}
@@ -457,7 +510,10 @@ 
 		// resourcetype: collection
 		$props['resourcetype'][] = self::mkprop('collection','');
 
-		if (!isset($props['getcontenttype'])) $props['getcontenttype'] = 'httpd/unix-directory';
+		if (!isset($props['getcontenttype']))
+		{
+			$props['getcontenttype'] = 'httpd/unix-directory';
+		}
 
 		return $this->add_resource($path, $props, $privileges, $supported_privileges);
 	}
@@ -489,11 +545,17 @@ 
 			'resourcetype'     => '',
 		) as $name => $default)
 		{
-			if (!isset($props[$name])) $props[$name] = $default;
+			if (!isset($props[$name]))
+			{
+				$props[$name] = $default;
+			}
 		}
 
 		// if requested add privileges
-		if (is_null($supported_privileges)) $supported_privileges = $this->supported_privileges;
+		if (is_null($supported_privileges))
+		{
+			$supported_privileges = $this->supported_privileges;
+		}
 		if ($this->prop_requested('current-user-privilege-set') === true)
 		{
 			foreach($privileges as $name)
@@ -514,7 +576,10 @@ 
 			$props['owner'] = '';
 		}
 
-		if ($this->debug > 1) error_log(__METHOD__."(path='$path', props=".array2string($props).')');
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."(path='$path', props=".array2string($props).')');
+		}
 
 		// convert simple associative properties to HTTP_WebDAV_Server ones
 		foreach($props as $name => &$prop)
@@ -554,7 +619,10 @@ 
 		{
 			foreach($data as $name => $data)
 			{
-				if ($name[0] == '*') continue;
+				if ($name[0] == '*')
+				{
+					continue;
+				}
 				if (is_array($data) && $data['*only*'] && strpos($path, $data['*only*']) === false)
 				{
 					continue;	// wrong path
@@ -668,8 +736,15 @@ 
 		{
 			foreach($this->root as $app => $data)
 			{
-				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue;	// no rights for the given app
-				if (!empty($data['user-only']) && ($path == '/' || $user < 0)) continue;
+				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app])
+				{
+					continue;
+				}
+				// no rights for the given app
+				if (!empty($data['user-only']) && ($path == '/' || $user < 0))
+				{
+					continue;
+				}
 
 				$files['files'][] = $this->add_app($app,false,$user,$path.$app.'/');
 
@@ -705,7 +780,10 @@ 
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
-			if ($this->debug) error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
+			}
 			return "403 Forbidden: no app rights for 'resources'";	// no rights for the given app
 		}
 		list(,$what) = explode('/', $path);
@@ -744,10 +822,13 @@ 
 	{
 		// currently only show shared calendars/addressbooks for current user and not in the root
 		if ($path == '/' || $user != $GLOBALS['egw_info']['user']['account_id'] ||
-			!isset($GLOBALS['egw_info']['user']['apps'][$app]))	// also avoids principals, inbox and outbox
+			!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+		{
+			// also avoids principals, inbox and outbox
 		{
 			return true;
 		}
+		}
 		$handler = $this->app_handler($app);
 		if (($shared = $handler->get_shared()))
 		{
@@ -755,7 +836,10 @@ 
 			{
 				$file = $this->add_app($app,false,$id,$path.$owner.'/');
 				// mark other users calendar as shared (iOS 5.0.1 AB does NOT display AB marked as shared!)
-				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				if ($app == 'calendar')
+				{
+					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				}
 				$files[] = $file;
 			}
 		}
@@ -791,7 +875,10 @@ 
 			{
 				$name = $this->accounts->id2name($account,'account_fullname');
 			}
-			if (empty($name)) $name = '#'.$account;
+			if (empty($name))
+			{
+				$name = '#'.$account;
+			}
 		}
 		return $name;
 	}
@@ -807,7 +894,10 @@ 
 	 */
 	protected function add_app($app,$no_extra_types=false,$user=null,$path='/')
 	{
-		if ($this->debug) error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
+		}
 		$user_preferences = $GLOBALS['egw_info']['user']['preferences'];
 		if (is_string($user) && $user[0] == 'r' && ($resource = Principals::read_resource(substr($user, 1))))
 		{
@@ -831,7 +921,10 @@ 
 			$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
 			$principalType = 'users';
 		}
-		if (!isset($displayname)) $displayname = $this->account_name($user);
+		if (!isset($displayname))
+		{
+			$displayname = $this->account_name($user);
+		}
 
 		$props = array(
 			'owner' => array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
@@ -864,10 +957,13 @@ 
 
 		// rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param
 		// leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member
-		if ($app && !in_array($app,array('inbox','outbox','principals')))	// not on inbox, outbox or principals
+		if ($app && !in_array($app,array('inbox','outbox','principals')))
+		{
+			// not on inbox, outbox or principals
 		{
 			$props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member');
 		}
+		}
 
 		// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
 		$ns = null;
@@ -961,7 +1057,10 @@ 
 	 */
 	function REPORT(&$options, &$files)
 	{
-		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return $this->PROPFIND($options,$files,'REPORT');
 	}
@@ -984,7 +1083,10 @@ 
 	 */
 	function GET(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user) || $app == 'principals')
@@ -1220,7 +1322,10 @@ 
 			$_GET['add-member'] = '';	// otherwise we give no Location header
 			return $this->PUT($options);
 		}
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		$this->_parse_path($options['path'],$id,$app,$user);
@@ -1391,7 +1496,11 @@ 
 			error_log(__METHOD__."('$app', $id, ...) no rights to update attachments");
 			return;	// no rights --> nothing to do
 		}
-		if (!is_array($attach)) $attach = array();	// could be PEAR_Error if not set
+		if (!is_array($attach))
+		{
+			$attach = array();
+		}
+		// could be PEAR_Error if not set
 
 		if ($delete_via_put)
 		{
@@ -1436,7 +1545,11 @@ 
 					// reuse valid managed-id --> symlink attachment
 					if (Vfs::file_exists($link))
 					{
-						if (Vfs::readlink($link) === $path) continue;	// no need to recreate identical link
+						if (Vfs::readlink($link) === $path)
+						{
+							continue;
+						}
+						// no need to recreate identical link
 						Vfs::unlink($link);		// symlink will fail, if $link exists
 					}
 					if (!Vfs::symlink($path, $link))
@@ -1476,7 +1589,11 @@ 
 	{
 		$filename = empty($_filename) ? 'attachment' : Vfs::basename($_filename);
 
-		if (strpos($mime, ';')) list($mime) = explode(';', $mime);	// in case it contains eg. charset info
+		if (strpos($mime, ';'))
+		{
+			list($mime) = explode(';', $mime);
+		}
+		// in case it contains eg. charset info
 
 		$ext = !empty($mime) ? MimeMagic::mime2ext($mime) : '';
 
@@ -1495,9 +1612,15 @@ 
 		for($i = 1; $i < 100; ++$i)
 		{
 			$path = Link::vfs_path($app, $id, $filename.($i > 1 ? '-'.$i : '').$ext, true);
-			if (!Vfs::stat($path)) break;
+			if (!Vfs::stat($path))
+			{
+				break;
+			}
+		}
+		if ($i >= 100)
+		{
+			return null;
 		}
-		if ($i >= 100) return null;
 
 		if (!Vfs::file_exists($dir = Vfs::dirname($path)) && !Vfs::mkdir($dir, 0777, STREAM_MKDIR_RECURSIVE))
 		{
@@ -1546,7 +1669,11 @@ 
 			// handle symlinks --> return target size and mime-type
 			if (($target = Vfs::readlink($path)))
 			{
-				if (!($stat = Vfs::stat($target))) continue;	// broken or inaccessible symlink
+				if (!($stat = Vfs::stat($target)))
+				{
+					continue;
+				}
+				// broken or inaccessible symlink
 
 				// check if target is in /apps, probably reused MANAGED-ID --> return it
 				if (substr($target, 0, 6) == '/apps/')
@@ -1638,14 +1765,20 @@ 
 	 */
 	function PROPPATCH(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__."(".array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($options).')');
+		}
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
 		self::_parse_path($options['path'],$id,$app,$user,$user_prefix);	// allways returns false if eg. !$id
 		if ($app == 'principals' || $id || $options['path'] == '/')
 		{
-			if ($this->debug > 1) error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
+			if ($this->debug > 1)
+			{
+				error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
+			}
 			foreach($options['props'] as &$prop)
 			{
 				$prop['status'] = '403 Forbidden';
@@ -1670,11 +1803,14 @@ 
 						self::$proppatch_props[$prop['name']] == $prop['ns'] ? '' : ':'.$prop['ns']);
 				}
 				//error_log("preferences['user']['$app']['$name']=".array2string($GLOBALS['egw_info']['user']['preferences'][$app][$name]).($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'] ? ' !== ':' === ')."prop['val']=".array2string($prop['val']));
-				if ($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'])	// nothing to change otherwise
+				if ($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'])
+				{
+					// nothing to change otherwise
 				{
 					if (isset($prop['val']))
 					{
 						$GLOBALS['egw']->preferences->add($app, $name, $prop['val']);
+				}
 					}
 					else
 					{
@@ -1726,7 +1862,10 @@ 
 			}
 		}
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = $prefix = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user,$prefix))
@@ -1738,7 +1877,10 @@ 
 			$status = $handler->put($options,$id,$user,$prefix);
 
 			// set default stati: true --> 204 No Content, false --> should be already handled
-			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
+			if (is_bool($status))
+			{
+				$status = $status ? '204 No Content' : '400 Something went wrong';
+			}
 
 			// check/handle Prefer: return-representation
 			if ($status[0] === '2' || $status === true)
@@ -1762,7 +1904,10 @@ 
 	 */
 	function DELETE($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user))
@@ -1773,7 +1918,10 @@ 
 		{
 			$status = $handler->delete($options,$id);
 			// set default stati: true --> 204 No Content, false --> should be already handled
-			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
+			if (is_bool($status))
+			{
+				$status = $status ? '204 No Content' : '400 Something went wrong';
+			}
 			return $status;
 		}
 		return '501 Not Implemented';
@@ -1787,7 +1935,10 @@ 
 	 */
 	function MKCOL($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1800,7 +1951,10 @@ 
 	 */
 	function MOVE($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1813,7 +1967,10 @@ 
 	 */
 	function COPY($options, $del=false)
 	{
-		if ($this->debug) error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1830,7 +1987,10 @@ 
 		self::_parse_path($options['path'],$id,$app,$user);
 		$path = Vfs::app_entry_lock_path($app,$id);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$path");
+		}
 
 		// get the app handler, to check if the user has edit access to the entry (required to make locks)
 		$handler = self::app_handler($app);
@@ -1845,10 +2005,13 @@ 
 		// 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($path,$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))		// false = no ACL check
+			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))
+		{
+			// false = no ACL check
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
+		}
 		return $ret;
 	}
 
@@ -1864,7 +2027,10 @@ 
 		self::_parse_path($options['path'],$id,$app,$user);
 		$path = Vfs::app_entry_lock_path($app,$id);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$path");
+		}
 		return Vfs::unlock($path,$options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
@@ -1893,7 +2059,10 @@ 
 		$id = $app = $user = null;
 		self::_parse_path($options['path'],$id,$app,$user);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
+		}
 
 		$options['errors'] = array();
 		switch ($app)
@@ -1956,7 +2125,10 @@ 
 			$user = array_shift($parts);
 		}
 
-		if (!isset($app)) $app = array_shift($parts);
+		if (!isset($app))
+		{
+			$app = array_shift($parts);
+		}
 
 		// /addressbook-accounts/
 		if (!$account_id && $app == 'addressbook-accounts')
@@ -2047,7 +2219,10 @@ 
 		}
 		parent::ServeRequest();
 
-		if (self::$request_starttime) self::log_request();
+		if (self::$request_starttime)
+		{
+			self::log_request();
+		}
 	}
 
 	/**
@@ -2103,11 +2278,23 @@ 
 			{
 				$content .= $line."\n";
 			}
-			if (($c = ob_get_flush())) $content .= "\n";
-			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			if (($c = ob_get_flush()))
+			{
+				$content .= "\n";
+			}
+			if (self::$log_level !== 'f' && strlen($c) > 1536)
+			{
+				$c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			}
 			$content .= $c;
-			if ($extra) $content .= $extra;
-			if ($this->to_log) $content .= "\n### ".implode("\n### ", $this->to_log)."\n";
+			if ($extra)
+			{
+				$content .= $extra;
+			}
+			if ($this->to_log)
+			{
+				$content .= "\n### ".implode("\n### ", $this->to_log)."\n";
+			}
 			$content .= $this->_http_status[0] == '4' && substr($this->_http_status,0,3) != '412' ||
 				$this->_http_status[0] == '5' ? '###' : '***';	// mark failed requests with ###, instead of ***
 			$content .= sprintf(' %s --> "%s" took %5.3f s',$_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD']=='REPORT'?' '.$this->propfind_options['root']['name']:'').' '.$_SERVER['PATH_INFO'],$this->_http_status,microtime(true)-self::$request_starttime)."\n\n";
@@ -2165,8 +2352,14 @@ 
 	 */
 	protected static function add_prop(\XMLWriter $xml, $props)
 	{
-		if (is_string($props)) $props = self::mkprop($props, '');
-		if (isset($props['name'])) $props = array($props);
+		if (is_string($props))
+		{
+			$props = self::mkprop($props, '');
+		}
+		if (isset($props['name']))
+		{
+			$props = array($props);
+		}
 
 		foreach($props as $prop)
 		{
@@ -2253,7 +2446,10 @@ 
 	 */
 	static function generate_uid($_appName, $_eventID)
 	{
-		if(empty($_appName) || empty($_eventID)) return false;
+		if(empty($_appName) || empty($_eventID))
+		{
+			return false;
+		}
 
 		return $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
 	}

api/src/CalDAV/Handler.php

Doc Comments +3 added lines, -4 removed lines

@@ -151,7 +151,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array $filter
-	 * @param array|boolean $start false=return all or array(start,num)
+	 * @param integer[] $start false=return all or array(start,num)
 	 * @param int &$total
 	 * @return array with "files" array with values for keys path and props
 	 */
@@ -193,7 +193,6 @@ 
 	 * Read an entry
 	 *
 	 * @param string|int $id
-	 * @param string $path =null implementation can use it, used in call from _common_get_put_delete
 	 * @return array|boolean array with entry, false if no read rights, null if $id does not exist
 	 */
 	abstract function read($id /*,$path=null*/);
@@ -238,7 +237,7 @@ 
 	 * Get the etag for an entry, can be reimplemented for other algorithm or field names
 	 *
 	 * @param array|int $entry array with event or cal_id
-	 * @return string|boolean string with etag or false
+	 * @return false|string string with etag or false
 	 */
 	function get_etag($entry)
 	{
@@ -423,7 +422,7 @@ 
 	/**
 	 * Identify know GroupDAV agents by HTTP_USER_AGENT header
 	 *
-	 * @return string|boolean agent name or false
+	 * @return string|false agent name or false
 	 */
 	static function get_agent()
 	{

Spacing +60 added lines, -60 removed lines

@@ -144,7 +144,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function propfind($path,&$options,&$files,$user);
+	abstract function propfind($path, &$options, &$files, $user);
 
 	/**
 	 * Propfind callback, if interator is used
@@ -155,9 +155,9 @@ 
 	 * @param int &$total
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path, array $filter,$start,&$total)
+	function &propfind_callback($path, array $filter, $start, &$total)
 	{
-		unset($path, $filter, $start, $total);	// not used, but required by function signature
+		unset($path, $filter, $start, $total); // not used, but required by function signature
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function get(&$options,$id,$user=null);
+	abstract function get(&$options, $id, $user = null);
 
 	/**
 	 * Handle get request for an applications entry
@@ -178,7 +178,7 @@ 
 	 * @param int $user =null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function put(&$options,$id,$user=null);
+	abstract function put(&$options, $id, $user = null);
 
 	/**
 	 * Handle get request for an applications entry
@@ -187,7 +187,7 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function delete(&$options,$id);
+	abstract function delete(&$options, $id);
 
 	/**
 	 * Read an entry
@@ -216,7 +216,7 @@ 
 	 * @param array|int $entry entry-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	abstract function check_access($acl,$entry);
+	abstract function check_access($acl, $entry);
 
 	/**
 	 * Add extra properties for collections
@@ -227,9 +227,9 @@ 
 	 * @param int $user =null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null, $user=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null)
 	{
-		unset($displayname, $base_uri, $user);	// not used, but required by function signature
+		unset($displayname, $base_uri, $user); // not used, but required by function signature
 
 		return $props;
 	}
@@ -262,7 +262,7 @@ 
 	 */
 	static function etag2value($etag)
 	{
-		list(,$val) = explode(':',$etag,2);
+		list(,$val) = explode(':', $etag, 2);
 
 		return $val;
 	}
@@ -280,18 +280,18 @@ 
 	 * @param boolean $ignore_if_match =false if true, ignore If-Match precondition
 	 * @return array|string entry on success, string with http-error-code on failure, null for PUT on an unknown id
 	 */
-	function _common_get_put_delete($method,&$options,&$id,&$return_no_access=false,$ignore_if_match=false)
+	function _common_get_put_delete($method, &$options, &$id, &$return_no_access = false, $ignore_if_match = false)
 	{
-		if (self::$path_extension) $id = basename($id,self::$path_extension);
+		if (self::$path_extension) $id = basename($id, self::$path_extension);
 
 		if ($this->app != 'principals' && !$GLOBALS['egw_info']['user']['apps'][$this->app])
 		{
 			if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
-			return '403 Forbidden';		// no app rights
+			return '403 Forbidden'; // no app rights
 		}
 		$extra_acl = $this->method2acl[$method];
 		if ($id && !($entry = $this->read($id, $options['path'])) && ($method != 'PUT' || $entry === false) ||
-			($extra_acl != Api\Acl::READ && $this->check_access($extra_acl,$entry) === false))
+			($extra_acl != Api\Acl::READ && $this->check_access($extra_acl, $entry) === false))
 		{
 			if ($return_no_access && !is_null($entry))
 			{
@@ -300,7 +300,7 @@ 
 			}
 			else
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry === false ? 'false' : 'null'));
 				return !is_null($entry) ? '403 Forbidden' : '404 Not Found';
 			}
 		}
@@ -330,7 +330,7 @@ 
 				if ($if_none_match[0] == '"') $if_none_match = substr($if_none_match, 1, -1);
 
 				// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
-				if (in_array($method, array('GET','HEAD')) && $etag === $if_none_match)
+				if (in_array($method, array('GET', 'HEAD')) && $etag === $if_none_match)
 				{
 					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
 					return '304 Not Modified';
@@ -355,7 +355,7 @@ 
 	 * @param int $user =null account_id
 	 * @return string|boolean http status of get or null if no representation was requested
 	 */
-	public function check_return_representation($options, $id, $user=null)
+	public function check_return_representation($options, $id, $user = null)
 	{
 		//error_log(__METHOD__."(, $id, $user) start ".function_backtrace());
 		if (isset($_SERVER['HTTP_PREFER']) && in_array('return=representation', preg_split('/, ?/', $_SERVER['HTTP_PREFER'])))
@@ -394,7 +394,7 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		unset($entry);	// not used, but required by function signature
+		unset($entry); // not used, but required by function signature
 	}
 
 	/**
@@ -409,7 +409,7 @@ 
 	{
 		static $handler_cache = array();
 
-		if (!array_key_exists($app,$handler_cache))
+		if (!array_key_exists($app, $handler_cache))
 		{
 			$class = $app.'_groupdav';
 			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app))) return null;
@@ -427,36 +427,36 @@ 
 	 */
 	static function get_agent()
 	{
-		static $agent=null;
+		static $agent = null;
 
 		if (is_null($agent))
 		{
 			$agent = false;
 			// identify the agent (GroupDAV client) from the HTTP_USER_AGENT header
 			$user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
-			foreach(array(
-				'carddav-sync'      => 'carddav-sync',	// dmfs.org CardDAV client for Android: CardDAV-Sync (Android) (like iOS/5.0.1 (9A405) dataaccessd/1.0) gzip
-				'iphone'            => 'iphone',	// Apple iPhone iCal
-				'davkit'            => 'davkit',	// Apple iCal 10.6
-				'coredav'           => 'coredav',	// Apple iCal 10.7
-				'calendarstore'     => 'calendarstore',	// Apple iCal 5.0.1 under OS X 10.7.2
-				'calendaragent/'    => 'calendaragent',	// Apple iCal OS X 10.8*: Mac OS X/10.8.2 (12C54) CalendarAgent/55
-				'dataaccess'        => 'dataaccess',	// Apple addressbook iPhone
-				'cfnetwork'         => 'cfnetwork',	// Apple Addressbook 10.6/7
-				'addressbook/'      => 'cfnetwork',	// Apple Addressbook OS X 10.8*: Mac OS X/10.8.2 (12C54) AddressBook/1167
-				'bionicmessage.net' => 'funambol',	// funambol GroupDAV connector from bionicmessage.net
-				'zideone'           => 'zideone',	// zideone outlook plugin
-				'lightning'         => 'lightning',	// Lighting (incl. SOGo connector for addressbook)
-				'webkit'			=> 'webkit',	// Webkit Browser (also reports KHTML!)
-				'akonadi'			=> 'akonadi',	// new KDE PIM framework (also reports KHTML!)
-				'khtml'             => 'kde',		// KDE clients
+			foreach (array(
+				'carddav-sync'      => 'carddav-sync', // dmfs.org CardDAV client for Android: CardDAV-Sync (Android) (like iOS/5.0.1 (9A405) dataaccessd/1.0) gzip
+				'iphone'            => 'iphone', // Apple iPhone iCal
+				'davkit'            => 'davkit', // Apple iCal 10.6
+				'coredav'           => 'coredav', // Apple iCal 10.7
+				'calendarstore'     => 'calendarstore', // Apple iCal 5.0.1 under OS X 10.7.2
+				'calendaragent/'    => 'calendaragent', // Apple iCal OS X 10.8*: Mac OS X/10.8.2 (12C54) CalendarAgent/55
+				'dataaccess'        => 'dataaccess', // Apple addressbook iPhone
+				'cfnetwork'         => 'cfnetwork', // Apple Addressbook 10.6/7
+				'addressbook/'      => 'cfnetwork', // Apple Addressbook OS X 10.8*: Mac OS X/10.8.2 (12C54) AddressBook/1167
+				'bionicmessage.net' => 'funambol', // funambol GroupDAV connector from bionicmessage.net
+				'zideone'           => 'zideone', // zideone outlook plugin
+				'lightning'         => 'lightning', // Lighting (incl. SOGo connector for addressbook)
+				'webkit'			=> 'webkit', // Webkit Browser (also reports KHTML!)
+				'akonadi'			=> 'akonadi', // new KDE PIM framework (also reports KHTML!)
+				'khtml'             => 'kde', // KDE clients
 				'neon'              => 'neon',
-				'ical4ol'			=> 'ical4ol',	// iCal4OL client
-				'evolution'         => 'evolution',	// Evolution
-				'thunderbird'       => 'thunderbird',	// SOGo connector for addressbook, no Lightning installed
+				'ical4ol'			=> 'ical4ol', // iCal4OL client
+				'evolution'         => 'evolution', // Evolution
+				'thunderbird'       => 'thunderbird', // SOGo connector for addressbook, no Lightning installed
 			) as $pattern => $name)
 			{
-				if (strpos($user_agent,$pattern) !== false)
+				if (strpos($user_agent, $pattern) !== false)
 				{
 					$agent = $name;
 					break;
@@ -512,35 +512,35 @@ 
 	 * @param int $user =null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
-		unset($path);	// not used, but required by function signature
+		unset($path); // not used, but required by function signature
 
-		static $grants=null;
+		static $grants = null;
 		if (is_null($grants))
 		{
 			$grants = $this->get_grants();
 		}
 		$priviledes = array('read-current-user-privilege-set' => 'read-current-user-privilege-set');
 
-		if (is_null($user) || $grants[$user] & Api\Acl::READ)
+		if (is_null($user) || $grants[$user]&Api\Acl::READ)
 		{
 			$priviledes['read'] = 'read';
 			// allows on all calendars/addressbooks to write properties, as we store them on a per-user basis
 			// and only allow to modify explicit named properties in CalDAV, CardDAV or Calendarserver name-space
 			$priviledes['write-properties'] = 'write-properties';
 		}
-		if (is_null($user) || $grants[$user] & Api\Acl::ADD)
+		if (is_null($user) || $grants[$user]&Api\Acl::ADD)
 		{
-			$priviledes['bind'] = 'bind';	// PUT for new resources
+			$priviledes['bind'] = 'bind'; // PUT for new resources
 		}
-		if (is_null($user) || $grants[$user] & Api\Acl::EDIT)
+		if (is_null($user) || $grants[$user]&Api\Acl::EDIT)
 		{
-			$priviledes['write-content'] = 'write-content';	// otherwise iOS calendar does not allow to add events
+			$priviledes['write-content'] = 'write-content'; // otherwise iOS calendar does not allow to add events
 		}
-		if (is_null($user) || $grants[$user] & Api\Acl::DELETE)
+		if (is_null($user) || $grants[$user]&Api\Acl::DELETE)
 		{
-			$priviledes['unbind'] = 'unbind';	// DELETE
+			$priviledes['unbind'] = 'unbind'; // DELETE
 		}
 		// copy/move of existing resources might require write-properties, thought we do not support an explicit PROPATCH
 		//error_log(__METHOD__."('$path', ".array2string($user).') returning '.array2string($priviledes).' '.function_backtrace());
@@ -567,7 +567,7 @@ 
 	 * @param boolean $path_attr_is_name =true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
 	 * @param string $etag =null etag, to not calculate it again (if != null)
 	 */
-	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true, $etag=null)
+	function put_response_headers($entry, $path, $retval, $path_attr_is_name = true, $etag = null)
 	{
 		//error_log(__METHOD__."(".array2string($entry).", '$path', ".array2string($retval).", path_attr_is_name=$path_attr_is_name, etag=".array2string($etag).")");
 		// we should not return an etag here, as EGroupware never stores ical/vcard byte-by-byte
@@ -610,7 +610,7 @@ 
 	 */
 	static function get_settings($hook_data)
 	{
-		unset($hook_data);	// not used, but required by function signature
+		unset($hook_data); // not used, but required by function signature
 
 		return array();
 	}
@@ -630,7 +630,7 @@ 
 		{
 			$props['getetag'] = $this->get_etag($entry);
 		}
-		foreach(array(
+		foreach (array(
 			'getcontenttype' => 'text/calendar',
 			'getlastmodified' => $entry['modified'],
 			'displayname' => $entry['title'],
@@ -668,17 +668,17 @@ 
 	 * @param boolean $full_uri =true
 	 * @return string eg. https://domain.com/egroupware/groupdav.php
 	 */
-	public function base_uri($full_uri=true)
+	public function base_uri($full_uri = true)
 	{
-		static $uri=null;
-		static $path=null;
+		static $uri = null;
+		static $path = null;
 
 		if (!isset($uri))
 		{
 			$uri = $path = $this->caldav->base_uri;
 			if ($uri[0] == '/')
 			{
-				$uri = ($_SERVER["HTTPS"] === "on" ? "https:" : "http:") .'//' . $_SERVER['HTTP_HOST'] . $uri;
+				$uri = ($_SERVER["HTTPS"] === "on" ? "https:" : "http:").'//'.$_SERVER['HTTP_HOST'].$uri;
 			}
 			else
 			{
@@ -702,7 +702,7 @@ 
 	 * @param int $user parameter necessary to call getctag, if no $token specified
 	 * @return string
 	 */
-	public function get_sync_collection_token($path, $user=null, $more_results=null)
+	public function get_sync_collection_token($path, $user = null, $more_results = null)
 	{
 		//error_log(__METHOD__."('$path', $user, more_results=$more_results) this->sync_collection_token=".$this->sync_collection_token);
 		if ($more_results)
@@ -716,7 +716,7 @@ 
 ';
 			if ($this->caldav->crrnd)
 			{
-				$error = str_replace(array('<D:', '</D:'),  array('<', '</'), $error);
+				$error = str_replace(array('<D:', '</D:'), array('<', '</'), $error);
 			}
 			echo $error;
 		}
@@ -739,7 +739,7 @@ 
 	 * @param int $token =null modification time, default call getctag($path, $user) to fetch it
 	 * @return string
 	 */
-	public function get_sync_token($path, $user, $token=null)
+	public function get_sync_token($path, $user, $token = null)
 	{
 		if (!isset($token)) $token = $this->getctag($path, $user);
 

Braces +60 added lines, -15 removed lines

@@ -123,7 +123,10 @@ 
 	function __construct($app, Api\CalDAV $caldav)
 	{
 		$this->app = $app;
-		if (!is_null($caldav->debug)) $this->debug = $caldav->debug;
+		if (!is_null($caldav->debug))
+		{
+			$this->debug = $caldav->debug;
+		}
 		$this->base_uri = $caldav->base_uri;
 		$this->caldav = $caldav;
 
@@ -282,11 +285,17 @@ 
 	 */
 	function _common_get_put_delete($method,&$options,&$id,&$return_no_access=false,$ignore_if_match=false)
 	{
-		if (self::$path_extension) $id = basename($id,self::$path_extension);
+		if (self::$path_extension)
+		{
+			$id = basename($id,self::$path_extension);
+		}
 
 		if ($this->app != 'principals' && !$GLOBALS['egw_info']['user']['apps'][$this->app])
 		{
-			if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
+			}
 			return '403 Forbidden';		// no app rights
 		}
 		$extra_acl = $this->method2acl[$method];
@@ -295,12 +304,18 @@ 
 		{
 			if ($return_no_access && !is_null($entry))
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id,$return_no_access) \$entry=".array2string($entry).", \$return_no_access set to false");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($method,,$id,$return_no_access) \$entry=".array2string($entry).", \$return_no_access set to false");
+				}
 				$return_no_access = false;
 			}
 			else
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				}
 				return !is_null($entry) ? '403 Forbidden' : '404 Not Found';
 			}
 		}
@@ -313,11 +328,17 @@ 
 			{
 				$this->http_if_match = $_SERVER['HTTP_IF_MATCH'];
 				// strip of quotes around etag, if they exist, that way we allow etag with and without quotes
-				if ($this->http_if_match[0] == '"') $this->http_if_match = substr($this->http_if_match, 1, -1);
+				if ($this->http_if_match[0] == '"')
+				{
+					$this->http_if_match = substr($this->http_if_match, 1, -1);
+				}
 
 				if ($this->http_if_match !== $etag)
 				{
-					if ($this->debug) error_log(__METHOD__."($method,path=$options[path],$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed".array2string($entry));
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,path=$options[path],$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed".array2string($entry));
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id);
 					return '412 Precondition Failed';
@@ -327,17 +348,26 @@ 
 			{
 				$if_none_match = $_SERVER['HTTP_IF_NONE_MATCH'];
 				// strip of quotes around etag, if they exist, that way we allow etag with and without quotes
-				if ($if_none_match[0] == '"') $if_none_match = substr($if_none_match, 1, -1);
+				if ($if_none_match[0] == '"')
+				{
+					$if_none_match = substr($if_none_match, 1, -1);
+				}
 
 				// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
 				if (in_array($method, array('GET','HEAD')) && $etag === $if_none_match)
 				{
-					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
+					}
 					return '304 Not Modified';
 				}
 				if ($method == 'PUT' && ($if_none_match == '*' || $if_none_match == $etag))
 				{
-					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 412 Precondition failed");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 412 Precondition failed");
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id);
 					return '412 Precondition Failed';
@@ -376,7 +406,10 @@ 
 
 			if (($ret = $this->get($options, $id ? $id : $this->new_id, $user)) && !empty($options['data']))
 			{
-				if (!$this->caldav->use_compression()) header('Content-Length: '.$this->caldav->bytes($options['data']));
+				if (!$this->caldav->use_compression())
+				{
+					header('Content-Length: '.$this->caldav->bytes($options['data']));
+				}
 				header('Content-Type: '.$options['mimetype']);
 				echo $options['data'];
 			}
@@ -412,7 +445,10 @@ 
 		if (!array_key_exists($app,$handler_cache))
 		{
 			$class = $app.'_groupdav';
-			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app))) return null;
+			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app)))
+			{
+				return null;
+			}
 
 			$handler_cache[$app] = new $class($app, $groupdav);
 		}
@@ -474,7 +510,10 @@ 
 						$matches = null;
 						if (preg_match('/address%20book\/([0-9.]+)/', $user_agent, $matches))
 						{
-							if ((int)$matches[1] < 868) $agent .= '_old';
+							if ((int)$matches[1] < 868)
+							{
+								$agent .= '_old';
+							}
 						}
 						break;
 					case 'kde':
@@ -575,7 +614,10 @@ 
 		// --> as all clients dislike not getting an ETag for a PUT, we sending it again even not storing byte-by-byte
 		//if (get_class($this) == 'addressbook_groupdav' && in_array(self::get_agent(),array('thunderbird','lightning')))
 		{
-			if (is_null($etag)) $etag = $this->get_etag($entry);
+			if (is_null($etag))
+			{
+				$etag = $this->get_etag($entry);
+			}
 			header('ETag: "'.$etag.'"');
 		}
 
@@ -741,7 +783,10 @@ 
 	 */
 	public function get_sync_token($path, $user, $token=null)
 	{
-		if (!isset($token)) $token = $this->getctag($path, $user);
+		if (!isset($token))
+		{
+			$token = $this->getctag($path, $user);
+		}
 
 		// never return current time, as more modifications might happen due to second granularity --> return 1sec less
 		if ($token >= (int)$GLOBALS['egw_info']['flags']['page_start_time'])

api/src/CalDAV/Principals.php

Doc Comments +8 added lines, -11 removed lines

@@ -256,7 +256,7 @@ 
 	 * @param array &$options
 	 * @param array &$files
 	 * @param int $user account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function expand_property_report($path,&$options,&$files,$user)
 	{
@@ -1191,7 +1191,7 @@ 
 	 * Check if resource is a location
 	 *
 	 * @param array|int $resource
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public static function resource_is_location($resource)
 	{
@@ -1470,7 +1470,6 @@ 
 	 * Get proxy-groups for given user $account: users or groups who GRANT proxy rights to $account
 	 *
 	 * @param int $account who is the proxy
-	 * @param string|array $app_proxys =null applications for which proxys should be added
 	 * @return array with href props
 	 */
 	protected function get_resource_proxy_groups($account)
@@ -1608,8 +1607,6 @@ 
 	/**
 	 * Do propfind of /principals/
 	 *
-	 * @param string $name name of group or empty
-	 * @param string $rest name of rest of path behind group-name
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
@@ -1640,7 +1637,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -1655,7 +1652,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null)
 	{
@@ -1669,7 +1666,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function delete(&$options,$id)
 	{
@@ -1681,7 +1678,7 @@ 
 	/**
 	 * Read an entry
 	 *
-	 * @param string|int $id
+	 * @param integer $id
 	 * @return array/boolean array with entry, false if no read rights, null if $id does not exist
 	 */
 	function read($id)
@@ -1696,7 +1693,7 @@ 
 	 *
 	 * @param int $acl Api\Acl::READ, Api\Acl::EDIT or Api\Acl::DELETE
 	 * @param array|int $entry entry-array or id
-	 * @return boolean null if entry does not exist, false if no access, true if access permitted
+	 * @return null|boolean null if entry does not exist, false if no access, true if access permitted
 	 */
 	function check_access($acl,$entry)
 	{
@@ -1739,7 +1736,7 @@ 
 	 *
 	 * @param string $path path of collection
 	 * @param int $user =null owner of the collection, default current user
-	 * @return array with privileges
+	 * @return string[] with privileges
 	 */
 	public function current_user_privileges($path, $user=null)
 	{

Spacing +186 added lines, -187 removed lines

@@ -89,19 +89,18 @@ 
 	 * @param array $reports =null
 	 * @return array Api\CalDAV::mkprop('supported-report-set', ...)
 	 */
-	protected function supported_report_set($path, array $reports=null)
+	protected function supported_report_set($path, array $reports = null)
 	{
-		unset($path);	// not used, but required by function signature
+		unset($path); // not used, but required by function signature
 
 		if (is_null($reports)) $reports = $this->supported_reports;
 
 		$supported = array();
-		foreach($reports as $name => $data)
+		foreach ($reports as $name => $data)
 		{
-			$supported[$name] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					!$data['ns'] ? Api\CalDAV::mkprop($name, '') :
-						Api\CalDAV::mkprop($data['ns'], $name, '')))));
+			$supported[$name] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					!$data['ns'] ? Api\CalDAV::mkprop($name, '') : Api\CalDAV::mkprop($data['ns'], $name, '')))));
 		}
 		return $supported;
 	}
@@ -115,7 +114,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user)
+	function propfind($path, &$options, &$files, $user)
 	{
 		if (($report = isset($_GET['report']) ? $_GET['report'] : $options['root']['name']) && $report != 'propfind')
 		{
@@ -127,7 +126,7 @@ 
 			$this->caldav->log(__METHOD__."('$path', ".array2string($options).",, $user) not implemented report, returning 501 Not Implemented");
 			return '501 Not Implemented';
 		}
-		list(,,$type,$name,$rest) = explode('/',$path,5);
+		list(,, $type, $name, $rest) = explode('/', $path, 5);
 		// /principals/users/$name/
 		//            /users/$name/calendar-proxy-read/
 		//            /users/$name/calendar-proxy-write/
@@ -136,19 +135,19 @@ 
 		//            /locations/$resource/
 		//            /__uids__/$uid/.../
 
-		switch($type)
+		switch ($type)
 		{
 			case 'users':
-				$files['files'] = $this->propfind_users($name,$rest,$options);
+				$files['files'] = $this->propfind_users($name, $rest, $options);
 				break;
 			case 'groups':
-				$files['files'] = $this->propfind_groups($name,$rest,$options);
+				$files['files'] = $this->propfind_groups($name, $rest, $options);
 				break;
 			case 'resources':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,false);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, false);
 				break;
 			case 'locations':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,true);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, true);
 				break;
 			/*case '__uids__':
 				$files['files'] = $this->propfind_uids($name,$rest,$options);
@@ -258,11 +257,11 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function expand_property_report($path,&$options,&$files,$user)
+	function expand_property_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 		$requested_props = $options['other'];
-		while(($requested_prop = array_shift($requested_props)))
+		while (($requested_prop = array_shift($requested_props)))
 		{
 			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1) continue;
 
@@ -270,11 +269,11 @@ 
 			$prop_name = $requested_prop['attrs']['name'];
 			$prop_path = $path;
 			// calendarserver has some special property-names for expansion
-			switch($prop_name)
+			switch ($prop_name)
 			{
 				case 'calendar-proxy-read-for':
 				case 'calendar-proxy-write-for':
-					$prop_path = $path . substr($prop_name, 0, -4).'/';
+					$prop_path = $path.substr($prop_name, 0, -4).'/';
 					$prop_name = 'group-member-set';
 					$prop_ns = Api\CalDAV::DAV;
 					break;
@@ -294,14 +293,14 @@ 
 				'xmlns' => $prop_ns,
 			));
 			$prop_files = array();
-			$this->caldav->options = $options;	// also modify global variable
+			$this->caldav->options = $options; // also modify global variable
 			if (empty($prop_name) || $this->propfind($prop_path, $options, $prop_files, $user) !== true)
 			{
 				$this->caldav->log('### NO expand-property report for '.$requested_prop['attrs']['name']);
 				continue;
 			}
 			// find prop to expand
-			foreach($prop_files['files'][0]['props'] as $expand_prop)
+			foreach ($prop_files['files'][0]['props'] as $expand_prop)
 			{
 				if ($expand_prop['name'] === $prop_name) break;
 			}
@@ -315,7 +314,7 @@ 
 			// requested properties of each href are in depth=2 properties
 			// set them as regular propfind properties to $options['props']
 			$options2 = array('props' => 'all');
-			while(($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
+			while (($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
 			{
 				if ($prop['name'] == 'property' && $prop['depth'] == 2)
 				{
@@ -331,10 +330,10 @@ 
 			}
 			// put back evtl. read top-level property
 			if ($prop && $prop['depth'] == 1) array_unshift($requested_props, $prop);
-			$this->caldav->options = $options2;	// also modify global variable
+			$this->caldav->options = $options2; // also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
-			foreach($expand_prop['val'] as $key => &$prop_val)
+			foreach ($expand_prop['val'] as $key => &$prop_val)
 			{
 				list(,$expand_path) = explode($this->caldav->base_uri, $prop_val['val']);
 				//error_log(__METHOD__."('$path', ..., $user) calling propfind('$expand_path', ".array2string($options2).', '.array2string($prop_val).", $user)");
@@ -429,23 +428,23 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_property_search_report($path,&$options,&$files,$user)
+	function principal_property_search_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
 		// cant find the test attribute to root principal-property-search element in WebDAV rfc, but iPhones use it ...
-		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof';	// "allof" (default) or "anyof"
+		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof'; // "allof" (default) or "anyof"
 
 		// parse property-search prop(s) contained in $options['other']
-		foreach($options['other'] as $n => $prop)
+		foreach ($options['other'] as $n => $prop)
 		{
-			switch($prop['name'])
+			switch ($prop['name'])
 			{
 				case 'apply-to-principal-collection-set':	// optinal prop to apply search on principal-collection-set == '/principals/'
 					$path = '/principals/';
 					break;
 				case 'property-search':
-					$property_search = $n;	// should be 1
+					$property_search = $n; // should be 1
 					break;
 				case 'prop':
 					if (isset($property_search))
@@ -475,7 +474,7 @@ 
 			return '400 Bad Request';
 		}
 		// make sure search property is included in toplevel props (can be missing and defaults to property-search/prop's)
-		foreach($search_props as $prop)
+		foreach ($search_props as $prop)
 		{
 			if (!$this->caldav->prop_requested($prop['name'], $prop['xmlns']))
 			{
@@ -488,7 +487,7 @@ 
 			// but interprets returning all principals (all have a matching calendar-home-set) as NOT supporting CalDAV scheduling
 			// --> search only current user's principal
 			if ($prop['name'] == 'calendar-home-set' && stripos($_SERVER['HTTP_USER_AGENT'], 'Lightning') !== false &&
-				substr($search_props[0]['match'],-13) == '/groupdav.php')
+				substr($search_props[0]['match'], -13) == '/groupdav.php')
 			{
 				$path = '/principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/';
 				$this->caldav->log('Enabling hack for Lightning prior 1.1.1 for searching calendar-home-set matching "/groupdav.php": limiting search to '.$path);
@@ -497,7 +496,7 @@ 
 		// check type attribute to limit search on a certain tree
 		if (isset($options['root']['attrs']['type']))
 		{
-			switch($options['root']['attrs']['type'])
+			switch ($options['root']['attrs']['type'])
 			{
 				case 'INDIVIDUAL':
 					$path = '/principals/users/';
@@ -524,7 +523,7 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
 			if (count(explode('/', $resource['path'])) < 5)	// hack to only return principals, not the collections itself
 			{
@@ -533,18 +532,18 @@ 
 			}
 			// match with $search_props
 			$matches = 0;
-			foreach($search_props as $search_prop)
+			foreach ($search_props as $search_prop)
 			{
 				// search resource for $search_prop
-				foreach($resource['props'] as $prop)
+				foreach ($resource['props'] as $prop)
 				{
 					if ($prop['name'] === $search_prop['name']) break;
 				}
 				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
 				{
-					foreach((array)$prop['val'] as $value)
+					foreach ((array)$prop['val'] as $value)
 					{
-						if (is_array($value)) $value = $value['val'];	// eg. href prop
+						if (is_array($value)) $value = $value['val']; // eg. href prop
 						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)	// prop does match
 						{
 							++$matches;
@@ -556,7 +555,7 @@ 
 				if ($anyof && $matches || $matches == count($search_props))
 				{
 					//error_log("$resource[path]: anyof=$anyof, $matches matches --> keep");
-					continue 2;	// enough matches --> keep
+					continue 2; // enough matches --> keep
 				}
 			}
 			//error_log("$resource[path]: anyof=$anyof, $matches matches --> skip");
@@ -574,9 +573,9 @@ 
 	 * @param string $match criteria/sub-string
 	 * @param string $match_type ='contains' 'starts-with', 'ends-with' or 'equals'
 	 */
-	private static function match($value, $match, $match_type='contains')
+	private static function match($value, $match, $match_type = 'contains')
 	{
-		switch($match_type)
+		switch ($match_type)
 		{
 			case 'equals':
 				return $value === $match;
@@ -646,9 +645,9 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_search_property_set_report($path,&$options,&$files,$user)
+	function principal_search_property_set_report($path, &$options, &$files, $user)
 	{
-		unset($path, $options, $files, $user);	// not used, but required by function signature
+		unset($path, $options, $files, $user); // not used, but required by function signature
 
 		static $search_props = array(
 			// from iOS iCal
@@ -670,7 +669,7 @@ 
 		$xml->startDocument('1.0', 'UTF-8');
 		$xml->startElementNs(null, 'principal-search-property-set', 'DAV:');
 
-		foreach($search_props as $name => $data)
+		foreach ($search_props as $name => $data)
 		{
 			$xml->startElement('principal-search-property');
 			$xml->startElement('prop');
@@ -682,16 +681,16 @@ 
 			{
 				$xml->writeElement($name);
 			}
-			$xml->endElement();	// prop
+			$xml->endElement(); // prop
 
 			$xml->startElement('description');
 			$xml->writeAttribute('xml:lang', 'en');
 			$xml->text(is_array($data) ? $data['description'] : $data);
-			$xml->endElement();	// description
+			$xml->endElement(); // description
 
-			$xml->endElement();	// principal-search-property
+			$xml->endElement(); // principal-search-property
 		}
-		$xml->endElement();	// principal-search-property-set
+		$xml->endElement(); // principal-search-property-set
 		$xml->endDocument();
 		echo $xml->outputMemory();
 
@@ -726,7 +725,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function acl_principal_prop_set_report($path,&$options,&$files,$user)
+	function acl_principal_prop_set_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
@@ -745,13 +744,13 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
-			foreach($resource['props']['resourcetype']['val'] as $prop)
+			foreach ($resource['props']['resourcetype']['val'] as $prop)
 			{
 				if ($prop['name'] == 'principal') continue 2;
 			}
-			unset($files['files'][$n]);	// not a principal --> do not return
+			unset($files['files'][$n]); // not a principal --> do not return
 		}
 		// we should not return it
 		unset($options['props']['resourcetype']);
@@ -767,7 +766,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_users($name,$rest,array $options)
+	protected function propfind_users($name, $rest, array $options)
 	{
 		//error_log(__METHOD__."($name,$rest,".array2string($options).')');
 		if (empty($name))
@@ -786,7 +785,7 @@ 
 				else
 				{
 					// add all users (account_selection == groupmembers is handled by accounts->search())
-					foreach($this->accounts->search(array('type' => 'accounts','order' => 'account_lid')) as $account)
+					foreach ($this->accounts->search(array('type' => 'accounts', 'order' => 'account_lid')) as $account)
 					{
 						$files[] = $this->add_account($account);
 					}
@@ -795,18 +794,18 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','u')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'u')) ||
 				!($account = $this->accounts->read($id)) ||
 				!$this->accounts->visible($name))
 			{
 				$this->caldav->log(__METHOD__."('$name', ...) account '$name' NOT found OR not visible to you (check account-selection preference)!");
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_account($account);
@@ -836,7 +835,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_groups($name,$rest,array $options)
+	protected function propfind_groups($name, $rest, array $options)
 	{
 		//echo "<p>".__METHOD__."($name,$rest,".array2string($options).")</p>\n";
 		if (empty($name))
@@ -848,11 +847,11 @@ 
 			if ($options['depth'])
 			{
 				// only show own groups, if account-selection is groupmembers or none
-				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) ?
+				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) ?
 					'owngroups' : 'groups';
 
 				// add all groups or only membergroups
-				foreach($this->accounts->search(array('type' => $type,'order' => 'account_lid')) as $account)
+				foreach ($this->accounts->search(array('type' => $type, 'order' => 'account_lid')) as $account)
 				{
 					$files[] = $this->add_group($account);
 				}
@@ -860,19 +859,19 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','g')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'g')) ||
 				!($account = $this->accounts->read($id)) ||
 				// do NOT allow other groups, if account-selection is groupmembers or none
-				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) &&
-				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true)))
+				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) &&
+				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)))
 			{
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_group($account);
@@ -903,10 +902,10 @@ 
 	{
 		$addressbooks = array();
 		$ab_home_set = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		if (empty($ab_home_set)) $ab_home_set = 'P';	// personal addressbook
+		if (empty($ab_home_set)) $ab_home_set = 'P'; // personal addressbook
 		$addressbook_home_set = explode(',', $ab_home_set);
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'P' => $GLOBALS['egw_info']['user']['account_id'],
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 			'U' => '0',
@@ -917,13 +916,13 @@ 
 				$addressbook_home_set[$key] = $id;
 			}
 		}
-		if (in_array('O',$addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
+		if (in_array('O', $addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
 		{
 			$addressbooks[] = '/';
 		}
-		foreach(array_keys($GLOBALS['egw']->contacts->get_addressbooks(Api\Acl::READ)) as $id)
+		foreach (array_keys($GLOBALS['egw']->contacts->get_addressbooks(Api\Acl::READ)) as $id)
 		{
-			if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
+			if ((in_array('A', $addressbook_home_set) || in_array((string)$id, $addressbook_home_set)) &&
 				is_numeric($id) && ($owner = $this->accounts->id2name($id)))
 			{
 				$addressbooks[] = '/'.$owner.'/';
@@ -947,45 +946,45 @@ 
 		$calendars[] = Api\CalDAV::mkprop('href',
 			$this->base_uri.'/'.$account['account_lid'].'/');
 
-		$displayname = Api\Translation::convert($account['account_fullname'], Api\Translation::charset(),'utf-8');
+		$displayname = Api\Translation::convert($account['account_fullname'], Api\Translation::charset(), 'utf-8');
 
 		return $this->add_principal('users/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
 			// CalDAV
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',$calendars),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', $calendars),
 			// CalDAV scheduling
-			'schedule-outbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'schedule-outbox-URL',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
-			'schedule-inbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'schedule-inbox-URL',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href','mailto:'.$account['account_email']),
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
+			'schedule-outbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'schedule-outbox-URL', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
+			'schedule-inbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'schedule-inbox-URL', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', 'mailto:'.$account['account_email']),
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
 			)),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type','INDIVIDUAL'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', 'INDIVIDUAL'),
 			// Calendarserver
-			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address-set',array(
-				Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address',$account['account_email']))),
-			'last-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'last-name',$account['account_lastname']),
-			'first-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'first-name',$account['account_firstname']),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type','users'),
+			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address-set', array(
+				Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address', $account['account_email']))),
+			'last-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'last-name', $account['account_lastname']),
+			'first-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'first-name', $account['account_firstname']),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', 'users'),
 			// WebDAV ACL and CalDAV proxy
 			'group-membership' => $this->principal_set('group-membership', $this->accounts->memberships($account['account_id']),
-				array('calendar', 'resources'), $account['account_id']),	// add proxy-rights
+				array('calendar', 'resources'), $account['account_id']), // add proxy-rights
 			'alternate-URI-set' => array(
-				Api\CalDAV::mkprop('href','mailto:'.$account['account_email'])),
+				Api\CalDAV::mkprop('href', 'mailto:'.$account['account_email'])),
 			// CardDAV
-			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-home-set',$addressbooks),
-			'principal-address' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'principal-address',
+			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-home-set', $addressbooks),
+			'principal-address' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'principal-address',
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] ? '' : array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
+				Api\CalDAV::mkprop('href', $this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
 			// CardDAV directory
-			'directory-gateway' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'directory-gateway',array(
+			'directory-gateway' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'directory-gateway', array(
 				Api\CalDAV::mkprop('href', $this->base_uri.'/addressbook/'))),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -997,7 +996,7 @@ 
 	 * @param string $cn =null common name to be stored in case of an "e" uid
 	 * @return int|string|boolean integer account_id, string calendar uid or false if not a supported uid
 	 */
-	static public function url2uid($url, $only_type=null, $cn=null)
+	static public function url2uid($url, $only_type = null, $cn = null)
 	{
 		if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
 
@@ -1011,17 +1010,17 @@ 
 		}
 		if (empty($rest)) return false;
 
-		switch(strtolower($schema))
+		switch (strtolower($schema))
 		{
 			case 'http':
 			case 'https':
 				list(,$rest) = explode('/groupdav.php/principals/', $url);
 				list($type, $name) = explode('/', $rest);
-				switch($type)
+				switch ($type)
 				{
 					case 'users':
 					case 'groups':
-						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]);	// u=users, g=groups
+						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]); // u=users, g=groups
 						break;
 					case 'resources':
 					case 'locations':
@@ -1038,9 +1037,9 @@ 
 				}
 				// search contacts for email
 				if ((list($data) = $GLOBALS['egw']->contacts->search(array('email' => $rest, 'email_home' => $rest),
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					// found an addressbook entry
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
@@ -1058,7 +1057,7 @@ 
 				list($type, $id, $install_id) = explode('-', $uid);
 				if ($type == 'accounts' && empty($id))	// groups have a negative id, eg. "urn:uuid:accounts--1-..."
 				{
-					list($type, , $id_abs, $install_id) = explode('-', $uid);
+					list($type,, $id_abs, $install_id) = explode('-', $uid);
 					$id = -$id_abs;
 				}
 				// own urn
@@ -1071,9 +1070,9 @@ 
 					}
 					else
 					{
-						static $calendar_bo=null;
+						static $calendar_bo = null;
 						if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
-						foreach($calendar_bo->resources as $letter => $info)
+						foreach ($calendar_bo->resources as $letter => $info)
 						{
 							if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
 							{
@@ -1086,7 +1085,7 @@ 
 				break;
 
 			default:
-				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'],'groupdav'))
+				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'], 'groupdav'))
 				{
 					$GLOBALS['groupdav']->log(__METHOD__."('$url') unsupported principal URL '$url'!");
 				}
@@ -1104,7 +1103,7 @@ 
 	 */
 	protected function add_group(array $account)
 	{
-		$displayname = Api\Translation::convert(lang('Group').' '.$account['account_lid'],	Api\Translation::charset(), 'utf-8');
+		$displayname = Api\Translation::convert(lang('Group').' '.$account['account_lid'], Api\Translation::charset(), 'utf-8');
 
 		// only return current user, if account-selection == 'none'
 		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none')
@@ -1119,19 +1118,19 @@ 
 		return $this->add_principal('groups/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
 			)),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type','groups'),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type','GROUP'),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', 'groups'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', 'GROUP'),
 			'group-member-set' => $this->principal_set('group-member-set', $groupmembers),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -1142,7 +1141,7 @@ 
 	 * @param boolean $is_location =null
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal_resource(array $resource, $is_location=null)
+	protected function add_principal_resource(array $resource, $is_location = null)
 	{
 		$displayname = null;
 		$name = $this->resource2name($resource, $is_location, $displayname);
@@ -1150,18 +1149,18 @@ 
 		return $this->add_principal($name, array(
 			'getetag' => $this->get_resource_etag($resource),
 			'displayname' => $displayname,
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/'.$name.'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/'.$name.'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id'])),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/'.$name.'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/'.$name.'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id'])),
 			)),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type',$is_location ? 'locations' : 'resources'),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type',$is_location ? 'ROOM' : 'RESOURCE'),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id']))),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', $is_location ? 'locations' : 'resources'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', $is_location ? 'ROOM' : 'RESOURCE'),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id']))),
 			// Calendarserver also reports empty email-address-set, thought iCal still does not show resources (only locations)
-			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address-set',''),
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$name.'/'))),
+			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address-set', ''),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$name.'/'))),
 		));
 	}
 
@@ -1173,7 +1172,7 @@ 
 	 * @param string &$displayname=null on return displayname of resource
 	 * @return string eg. "locations/123-some-room" or "resouces/345-some-device"
 	 */
-	public static function resource2name($resource, &$is_location=null, &$displayname=null)
+	public static function resource2name($resource, &$is_location = null, &$displayname = null)
 	{
 		if (!is_array($resource) && !($resource = self::read_resource($resource)))
 		{
@@ -1181,10 +1180,10 @@ 
 		}
 		if (is_null($is_location)) $is_location = self::resource_is_location($resource);
 
-		$displayname = Api\Translation::convert($resource['name'],	Api\Translation::charset(), 'utf-8');
+		$displayname = Api\Translation::convert($resource['name'], Api\Translation::charset(), 'utf-8');
 
 		return ($is_location ? 'locations/' : 'resources/').$resource['res_id'].'-'.
-			preg_replace('/[^a-z0-9]+/i','-', Api\Translation::to_ascii($resource['name']));
+			preg_replace('/[^a-z0-9]+/i', '-', Api\Translation::to_ascii($resource['name']));
 	}
 
 	/**
@@ -1195,7 +1194,7 @@ 
 	 */
 	public static function resource_is_location($resource)
 	{
-		static $location_cats=null;
+		static $location_cats = null;
 		if (is_null($location_cats))
 		{
 			$config = Api\Config::read('resources');
@@ -1216,7 +1215,7 @@ 
 	 */
 	public static function read_resource($res_id)
 	{
-		static $cache=null;	// some per-request caching
+		static $cache = null; // some per-request caching
 
 		if (isset(self::$all_resources) && isset(self::$all_resources[$res_id]))
 		{
@@ -1258,7 +1257,7 @@ 
 	 * @param int $user =null account_if of user, or null for current user
 	 * @return array of array with values for res_id, cat_id and name (no other values1)
 	 */
-	public static function get_resources($user=null)
+	public static function get_resources($user = null)
 	{
 		if (!isset(self::$all_resources))
 		{
@@ -1266,18 +1265,18 @@ 
 
 			self::$all_resources = array();
 			$query = array(
-				'show_bookable' => true,	// ignore non-bookable resources
+				'show_bookable' => true, // ignore non-bookable resources
 				'filter2' => -3,
 				'start' => 0,
-				'num_rows' => 10000,	// return all aka first 10000 entries
+				'num_rows' => 10000, // return all aka first 10000 entries
 			);
 			$rows = $readonlys = null;
 			if (self::$resources->get_rows($query, $rows, $readonlys))
 			{
 				//_debug_array($rows);
-				foreach($rows as $resource)
+				foreach ($rows as $resource)
 				{
-					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true,'cat_id'=>true,'name'=>true));
+					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true, 'cat_id'=>true, 'name'=>true));
 				}
 			}
 		}
@@ -1293,7 +1292,7 @@ 
 	 */
 	protected function get_resource_rights()
 	{
-		static $grants=null;
+		static $grants = null;
 
 		if (is_null($grants))
 		{
@@ -1326,19 +1325,19 @@ 
 	 * @param string $principal_url =null include given principal url, relative to principal-collection-set, default $principal
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal($principal, array $props = array(), $principal_url=null)
+	protected function add_principal($principal, array $props = array(), $principal_url = null)
 	{
 		$props['resourcetype'][] = Api\CalDAV::mkprop('principal', '');
 
 		// required props per WebDAV ACL
-		foreach(array('alternate-URI-set', 'group-membership') as $name)
+		foreach (array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name,'');
+			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name, '');
 		}
 		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
-			Api\CalDAV::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
+			Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.$principal.'/'));
 
 		return $this->add_collection('/principals/'.$principal.'/', $props);
 	}
@@ -1354,20 +1353,20 @@ 
 	 * @param array $resource =null resource to use (to not query it multiple times from the database)
 	 * @return array with values for 'path' and 'props'
 	 */
-	protected function add_proxys($principal, $type, array $proxys=array(), array $resource=null)
+	protected function add_proxys($principal, $type, array $proxys = array(), array $resource = null)
 	{
 		list($app,,$what) = explode('-', $type);
 
-		if (true) $proxys = array();	// ignore parameter!
-		list($account_type,$account) = explode('/', $principal);
+		if (true) $proxys = array(); // ignore parameter!
+		list($account_type, $account) = explode('/', $principal);
 
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'users':
 			case 'groups':
 				$account = $location = $this->accounts->name2id($account, 'account_lid', $account_type[0]);
 				$right = $what == 'write' ? Api\Acl::EDIT : Api\Acl::READ;
-				$mask = $what == 'write' ? Api\Acl::EDIT : Api\Acl::EDIT|Api\Acl::READ;	// do NOT report write+read in read
+				$mask = $what == 'write' ? Api\Acl::EDIT : Api\Acl::EDIT|Api\Acl::READ; // do NOT report write+read in read
 				break;
 
 			case 'locations':
@@ -1379,18 +1378,18 @@ 
 				}
 				$location = 'L'.$resource['cat_id'];
 				$right = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_CALREAD;
-				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD;	// do NOT report write+read in read
+				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD; // do NOT report write+read in read
 				break;
 		}
 		static $principal2grants = array();
-		$grants =& $principal2grants[$principal];
+		$grants = & $principal2grants[$principal];
 		if (!isset($grants))
 		{
-			switch($app)
+			switch ($app)
 			{
 				case 'resources':
 					$res_grants = $this->get_resource_rights();
-					$grants = (array)$res_grants[$location];	// returns array($location => $grants)
+					$grants = (array)$res_grants[$location]; // returns array($location => $grants)
 					break;
 
 				case 'calendar':
@@ -1400,9 +1399,9 @@ 
 			}
 			//echo "<p>type=$type --> app=$app, what=$what --> right=$right, mask=$mask, account=$account, location=$location --> grants=".array2string($grants)."</p>\n";
 		}
-		foreach($grants as $account_id => $rights)
+		foreach ($grants as $account_id => $rights)
 		{
-			if ($account_id !== 'run' && $account_id != $account && ($rights & $mask) == $right &&
+			if ($account_id !== 'run' && $account_id != $account && ($rights&$mask) == $right &&
 				($account_lid = $this->accounts->id2name($account_id)))
 			{
 				// ignore "broken" grants (eg. negative account_id for a user), as they lead to further errors (no members)
@@ -1433,12 +1432,12 @@ 
 	 * @param int $account who is the proxy
 	 * @return array with href props
 	 */
-	protected function principal_set($prop, array $accounts=array(), $app_proxys=null, $account=null)
+	protected function principal_set($prop, array $accounts = array(), $app_proxys = null, $account = null)
 	{
-		unset($prop);	// not used, but required by function signature
+		unset($prop); // not used, but required by function signature
 
 		$set = array();
-		foreach($accounts as $account_id => $account_lid)
+		foreach ($accounts as $account_id => $account_lid)
 		{
 			if ($this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
 			{
@@ -1447,11 +1446,11 @@ 
 		}
 		if ($app_proxys)
 		{
-			foreach((array)$app_proxys as $app)
+			foreach ((array)$app_proxys as $app)
 			{
 				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
 
-				switch($app)
+				switch ($app)
 				{
 					case 'resources':
 						$proxy_groups = $this->get_resource_proxy_groups($account);
@@ -1483,11 +1482,11 @@ 
 			// get location grants for $account (incl. his memberships)
 			$memberships = $GLOBALS['egw']->accounts->memberships($account, true);
 			$location_grants = array();
-			foreach($all_location_grants as $location => $grants)
+			foreach ($all_location_grants as $location => $grants)
 			{
-				foreach($grants as $account_id => $rights)
+				foreach ($grants as $account_id => $rights)
 				{
-					if (($rights & (EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) &&	// we only care for these rights
+					if (($rights&(EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) && // we only care for these rights
 						($account_id == $account || in_array($account_id, $memberships)))
 					{
 						if (!isset($location_grants[$location])) $location_grants[$location] = 0;
@@ -1496,13 +1495,13 @@ 
 				}
 			}
 			// now add proxy-groups for all resources user has rights to
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$rights = $location_grants['L'.$resource['cat_id']];
 				if (isset($rights))
 				{
 					$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.$this->resource2name($resource).
-						'/calendar-proxy-'.($rights & EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
+						'/calendar-proxy-'.($rights&EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
 				}
 			}
 		}
@@ -1517,18 +1516,18 @@ 
 	 * @param string|array $app ='calendar' applications for which proxys should be added
 	 * @return array with href props
 	 */
-	protected function get_calendar_proxy_groups($account, $app='calendar')
+	protected function get_calendar_proxy_groups($account, $app = 'calendar')
 	{
 		$set = array();
-		foreach($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
+		foreach ($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
 		{
-			if ($account_id != $account && ($rights & Api\Acl::READ) &&
+			if ($account_id != $account && ($rights&Api\Acl::READ) &&
 				($account_lid = $this->accounts->id2name($account_id)) &&
 				$this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
-					$account_lid.'/'.$app.'-proxy-'.($rights & Api\Acl::EDIT ? 'write' : 'read').'/');
+					$account_lid.'/'.$app.'-proxy-'.($rights&Api\Acl::EDIT ? 'write' : 'read').'/');
 			}
 		}
 		return $set;
@@ -1543,7 +1542,7 @@ 
 	 * @param boolean $do_locations =false false: /principal/resources, true: /principals/locations
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_resources($name,$rest,array $options,$do_locations=false)
+	protected function propfind_resources($name, $rest, array $options, $do_locations = false)
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
@@ -1562,7 +1561,7 @@ 
 				if (($resources = $this->get_resources()))
 				{
 					//_debug_array($resources);
-					foreach($resources as $resource)
+					foreach ($resources as $resource)
 					{
 						if (($is_location = self::resource_is_location($resource)) == $do_locations)
 						{
@@ -1579,11 +1578,11 @@ 
 				return '404 Not Found';
 			}
 			$path = ($is_location ? 'locations/' : 'resources/').$name;
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_principal_resource($resource);
@@ -1622,12 +1621,12 @@ 
 		if ($options['depth'])
 		{
 			if (is_numeric($options['depth'])) --$options['depth'];
-			$files = array_merge($files, $this->propfind_users('','',$options),
-				$this->propfind_groups('','',$options));
+			$files = array_merge($files, $this->propfind_users('', '', $options),
+				$this->propfind_groups('', '', $options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])
 			{
-				$files = array_merge($files, $this->propfind_resources('','',$options,false),	// resources
-					$this->propfind_resources('','',$options,true));	// locations
+				$files = array_merge($files, $this->propfind_resources('', '', $options, false), // resources
+					$this->propfind_resources('', '', $options, true)); // locations
 			}
 			//$files = array_merge($files,$this->propfind_uids('','',$options));
 		}
@@ -1642,9 +1641,9 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		unset($options, $id, $user);	// not used, but required by function signature
+		unset($options, $id, $user); // not used, but required by function signature
 
 		return false;
 	}
@@ -1657,9 +1656,9 @@ 
 	 * @param int $user =null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null)
+	function put(&$options, $id, $user = null)
 	{
-		unset($options, $id, $user);	// not used, but required by function signature
+		unset($options, $id, $user); // not used, but required by function signature
 
 		return false;
 	}
@@ -1671,9 +1670,9 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
-		unset($options, $id);	// not used, but required by function signature
+		unset($options, $id); // not used, but required by function signature
 
 		return false;
 	}
@@ -1686,7 +1685,7 @@ 
 	 */
 	function read($id)
 	{
-		unset($id);	// not used, but required by function signature
+		unset($id); // not used, but required by function signature
 
 		return false;
 	}
@@ -1698,13 +1697,13 @@ 
 	 * @param array|int $entry entry-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$entry)
+	function check_access($acl, $entry)
 	{
 		if ($acl != Api\Acl::READ)
 		{
 			return false;
 		}
-		if (!is_array($entry) && !$this->accounts->name2id($entry,'account_lid','u'))
+		if (!is_array($entry) && !$this->accounts->name2id($entry, 'account_lid', 'u'))
 		{
 			return null;
 		}
@@ -1741,9 +1740,9 @@ 
 	 * @param int $user =null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
-		unset($path, $user);	// not used, but required by function signature
+		unset($path, $user); // not used, but required by function signature
 
 		return array('read', 'read-current-user-privilege-set');
 	}

Braces +116 added lines, -29 removed lines

@@ -49,7 +49,10 @@ 
 	{
 		parent::__construct($app, $caldav);
 
-		if (!isset(self::$resources)) self::$resources = new resources_bo();
+		if (!isset(self::$resources))
+		{
+			self::$resources = new resources_bo();
+		}
 	}
 
 	/**
@@ -93,7 +96,10 @@ 
 	{
 		unset($path);	// not used, but required by function signature
 
-		if (is_null($reports)) $reports = $this->supported_reports;
+		if (is_null($reports))
+		{
+			$reports = $this->supported_reports;
+		}
 
 		$supported = array();
 		foreach($reports as $name => $data)
@@ -264,7 +270,10 @@ 
 		$requested_props = $options['other'];
 		while(($requested_prop = array_shift($requested_props)))
 		{
-			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1) continue;
+			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1)
+			{
+				continue;
+			}
 
 			$prop_ns = $requested_prop['attrs']['namespace'];
 			$prop_name = $requested_prop['attrs']['name'];
@@ -303,7 +312,10 @@ 
 			// find prop to expand
 			foreach($prop_files['files'][0]['props'] as $expand_prop)
 			{
-				if ($expand_prop['name'] === $prop_name) break;
+				if ($expand_prop['name'] === $prop_name)
+				{
+					break;
+				}
 			}
 			if ($expand_prop['name'] !== $prop_name || !is_array($expand_prop['val']) ||
 				$expand_prop['val'] && $expand_prop['val'][0]['name'] !== 'href')
@@ -319,10 +331,13 @@ 
 			{
 				if ($prop['name'] == 'property' && $prop['depth'] == 2)
 				{
-					if (!is_array($options2['props']))	// is "all" initially
+					if (!is_array($options2['props']))
+					{
+						// is "all" initially
 					{
 						$options2['props'] = array();
 					}
+					}
 					$options2['props'][] = array(
 						'name' => $prop['attrs']['name'],
 						'xmlns' => isset($prop['attrs']['namespace']) ? $prop['attrs']['namespace'] : $prop['xmlns'],
@@ -330,7 +345,10 @@ 
 				}
 			}
 			// put back evtl. read top-level property
-			if ($prop && $prop['depth'] == 1) array_unshift($requested_props, $prop);
+			if ($prop && $prop['depth'] == 1)
+			{
+				array_unshift($requested_props, $prop);
+			}
 			$this->caldav->options = $options2;	// also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
@@ -526,9 +544,12 @@ 
 		// now filter out not matching "files"
 		foreach($files['files'] as $n => $resource)
 		{
-			if (count(explode('/', $resource['path'])) < 5)	// hack to only return principals, not the collections itself
+			if (count(explode('/', $resource['path'])) < 5)
+			{
+				// hack to only return principals, not the collections itself
 			{
 				unset($files['files'][$n]);
+			}
 				continue;
 			}
 			// match with $search_props
@@ -538,16 +559,26 @@ 
 				// search resource for $search_prop
 				foreach($resource['props'] as $prop)
 				{
-					if ($prop['name'] === $search_prop['name']) break;
+					if ($prop['name'] === $search_prop['name'])
+					{
+						break;
+					}
 				}
-				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
+				if ($prop['name'] === $search_prop['name'])
+				{
+					// search_prop NOT found
 				{
 					foreach((array)$prop['val'] as $value)
 					{
-						if (is_array($value)) $value = $value['val'];	// eg. href prop
-						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)	// prop does match
+						if (is_array($value)) $value = $value['val'];
+				}
+				// eg. href prop
+						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)
+						{
+							// prop does match
 						{
 							++$matches;
+						}
 							//error_log("$matches: $resource[path]: $search_prop[name]=".array2string($prop['name'] !== $search_prop['name'] ? null : $prop['val'])." does match '$search_prop[match]'");
 							break;
 						}
@@ -749,7 +780,10 @@ 
 		{
 			foreach($resource['props']['resourcetype']['val'] as $prop)
 			{
-				if ($prop['name'] == 'principal') continue 2;
+				if ($prop['name'] == 'principal')
+				{
+					continue 2;
+				}
 			}
 			unset($files['files'][$n]);	// not a principal --> do not return
 		}
@@ -903,7 +937,11 @@ 
 	{
 		$addressbooks = array();
 		$ab_home_set = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		if (empty($ab_home_set)) $ab_home_set = 'P';	// personal addressbook
+		if (empty($ab_home_set))
+		{
+			$ab_home_set = 'P';
+		}
+		// personal addressbook
 		$addressbook_home_set = explode(',', $ab_home_set);
 		// replace symbolic id's with real nummeric id's
 		foreach(array(
@@ -917,10 +955,13 @@ 
 				$addressbook_home_set[$key] = $id;
 			}
 		}
-		if (in_array('O',$addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
+		if (in_array('O',$addressbook_home_set))
+		{
+			// "all in one" from groupdav.php/addressbook/
 		{
 			$addressbooks[] = '/';
 		}
+		}
 		foreach(array_keys($GLOBALS['egw']->contacts->get_addressbooks(Api\Acl::READ)) as $id)
 		{
 			if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
@@ -999,7 +1040,10 @@ 
 	 */
 	static public function url2uid($url, $only_type=null, $cn=null)
 	{
-		if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
+		if (!$only_type)
+		{
+			$only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
+		}
 
 		if ($url[0] == '/')
 		{
@@ -1009,7 +1053,10 @@ 
 		{
 			list($schema, $rest) = explode(':', $url, 2);
 		}
-		if (empty($rest)) return false;
+		if (empty($rest))
+		{
+			return false;
+		}
 
 		switch(strtolower($schema))
 		{
@@ -1056,9 +1103,12 @@ 
 			case 'urn':
 				list($urn_type, $uid) = explode(':', $rest, 2);
 				list($type, $id, $install_id) = explode('-', $uid);
-				if ($type == 'accounts' && empty($id))	// groups have a negative id, eg. "urn:uuid:accounts--1-..."
+				if ($type == 'accounts' && empty($id))
+				{
+					// groups have a negative id, eg. "urn:uuid:accounts--1-..."
 				{
 					list($type, , $id_abs, $install_id) = explode('-', $uid);
+				}
 					$id = -$id_abs;
 				}
 				// own urn
@@ -1072,7 +1122,10 @@ 
 					else
 					{
 						static $calendar_bo=null;
-						if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
+						if (is_null($calendar_bo))
+						{
+							$calendar_bo = new calendar_bo();
+						}
 						foreach($calendar_bo->resources as $letter => $info)
 						{
 							if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
@@ -1179,7 +1232,10 @@ 
 		{
 			return null;
 		}
-		if (is_null($is_location)) $is_location = self::resource_is_location($resource);
+		if (is_null($is_location))
+		{
+			$is_location = self::resource_is_location($resource);
+		}
 
 		$displayname = Api\Translation::convert($resource['name'],	Api\Translation::charset(), 'utf-8');
 
@@ -1225,7 +1281,10 @@ 
 
 		if (!isset($cache[$res_id]))
 		{
-			if (!isset(self::$resources)) self::$resources = new resources_bo();
+			if (!isset(self::$resources))
+			{
+				self::$resources = new resources_bo();
+			}
 
 			if (!($cache[$res_id] = self::$resources->read($res_id)))
 			{
@@ -1262,7 +1321,10 @@ 
 	{
 		if (!isset(self::$all_resources))
 		{
-			if (!isset(self::$resources)) self::$resources = new resources_bo($user);
+			if (!isset(self::$resources))
+			{
+				self::$resources = new resources_bo($user);
+			}
 
 			self::$all_resources = array();
 			$query = array(
@@ -1333,9 +1395,15 @@ 
 		// required props per WebDAV ACL
 		foreach(array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name,'');
+			if (!isset($props[$name]))
+			{
+				$props[$name] = Api\CalDAV::mkprop($name,'');
+			}
+		}
+		if (!$principal_url)
+		{
+			$principal_url = $principal;
 		}
-		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
 			Api\CalDAV::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
@@ -1358,7 +1426,11 @@ 
 	{
 		list($app,,$what) = explode('-', $type);
 
-		if (true) $proxys = array();	// ignore parameter!
+		if (true)
+		{
+			$proxys = array();
+		}
+		// ignore parameter!
 		list($account_type,$account) = explode('/', $principal);
 
 		switch($account_type)
@@ -1440,16 +1512,22 @@ 
 		$set = array();
 		foreach($accounts as $account_id => $account_lid)
 		{
-			if ($this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
+			if ($this->accounts->visible($account_lid))
+			{
+				// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.($account_id < 0 ? 'groups/' : 'users/').$account_lid.'/');
 			}
+			}
 		}
 		if ($app_proxys)
 		{
 			foreach((array)$app_proxys as $app)
 			{
-				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
+				if (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+				{
+					continue;
+				}
 
 				switch($app)
 				{
@@ -1490,7 +1568,10 @@ 
 					if (($rights & (EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) &&	// we only care for these rights
 						($account_id == $account || in_array($account_id, $memberships)))
 					{
-						if (!isset($location_grants[$location])) $location_grants[$location] = 0;
+						if (!isset($location_grants[$location]))
+						{
+							$location_grants[$location] = 0;
+						}
 						$location_grants[$location] |= $rights;
 					}
 				}
@@ -1524,12 +1605,15 @@ 
 		{
 			if ($account_id != $account && ($rights & Api\Acl::READ) &&
 				($account_lid = $this->accounts->id2name($account_id)) &&
-				$this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
+				$this->accounts->visible($account_lid))
+			{
+				// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
 					$account_lid.'/'.$app.'-proxy-'.($rights & Api\Acl::EDIT ? 'write' : 'read').'/');
 			}
+			}
 		}
 		return $set;
 	}
@@ -1621,7 +1705,10 @@ 
 
 		if ($options['depth'])
 		{
-			if (is_numeric($options['depth'])) --$options['depth'];
+			if (is_numeric($options['depth']))
+			{
+				--$options['depth'];
+			}
 			$files = array_merge($files, $this->propfind_users('','',$options),
 				$this->propfind_groups('','',$options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])

api/src/CalDAV/PropfindIterator.php

Doc Comments +1 added lines

@@ -94,6 +94,7 @@
 	 * @param Handler $handler
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
+	 * @param string $path
 	 */
 	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
 	{

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @var int
 	 */
-	protected $start=0;
+	protected $start = 0;
 
 	/**
 	 * Number of entries queried from callback in one call
@@ -95,7 +95,7 @@ 
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
 	 */
-	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
+	public function __construct(Handler $handler, $path, array $filter, array &$files = array())
 	{
 		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
 		$this->path    = $path;
@@ -126,7 +126,7 @@ 
 		$current = current($this->files);
 
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
-		return $current['path'];	// we return path as key
+		return $current['path']; // we return path as key
 	}
 
 	/**
@@ -146,11 +146,11 @@ 
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
-		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
+		$this->files = $this->handler->propfind_callback($this->path, $this->filter, array($this->start, self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
 			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
-			return false;	// no further entries
+			return false; // no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
@@ -169,7 +169,7 @@ 
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files) $this->next(); // otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -178,7 +178,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
 		return current($this->files) !== false;

Braces +41 added lines, -10 removed lines

@@ -97,7 +97,10 @@ 
 	 */
 	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
 	{
-		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		}
 		$this->path    = $path;
 		$this->handler = $handler;
 		$this->filter  = $filter;
@@ -112,7 +115,10 @@ 
 	 */
 	public function current()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		}
 		return current($this->files);
 	}
 
@@ -125,7 +131,10 @@ 
 	{
 		$current = current($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string($current['path']));
+		}
 		return $current['path'];	// we return path as key
 	}
 
@@ -136,26 +145,38 @@ 
 	{
 		if (next($this->files) !== false)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning TRUE");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning TRUE");
+			}
 			return true;
 		}
 		// check if previous query gave less then CHUNK_SIZE entries --> we're done
 		if ($this->start && count($this->files) < self::CHUNK_SIZE)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
 		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;	// no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		}
 
 		return current($this->files) !== false;
 	}
@@ -165,11 +186,18 @@ 
 	 */
 	public function rewind()
 	{
-		if ($this->debug) error_log(__METHOD__."()");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files)
+		{
+			$this->next();
+		}
+		// otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -180,7 +208,10 @@ 
 	 */
 	public function valid ()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		}
 		return current($this->files) !== false;
 	}
 }

api/src/Categories.php

Doc Comments +6 added lines, -6 removed lines

@@ -322,13 +322,13 @@ 
 	 * return a sorted array populated with categories (main sorting criteria is hierachy!)
 	 *
 	 * @param int $start =0 see $limit
-	 * @param boolean|int $limit if true limited query to maxmatches rows (starting with $start)
+	 * @param boolean $limit if true limited query to maxmatches rows (starting with $start)
 	 * @param string $query ='' query-pattern
 	 * @param string $sort ='ASC' sort order, either defaults to 'ASC'
 	 * @param string $order ='cat_name' order by
 	 * @param boolean|string $globals includes the global egroupware categories or not,
 	 * 	'all_no_acl' to return global and all non-private user categories independent of ACL
-	 * @param array|int $parent_id =0 return only subcats of $parent_id(s)
+	 * @param integer $parent_id =0 return only subcats of $parent_id(s)
 	 * @param boolean $unserialize_data =true return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
@@ -507,7 +507,7 @@ 
 	 * @param mixed $category category as array or the category_id
 	 * @param boolean $no_acl_check =false if true, grants are NOT checked, gives access to all non-private categories of all users
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
-	 * @return boolean true permission granted, false for permission denied, null for category does not exist
+	 * @return null|boolean true permission granted, false for permission denied, null for category does not exist
 	 */
 	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
 	{
@@ -675,7 +675,7 @@ 
 	 * check_consistency4update - for edit
 	 *
 	 * @param array $values array with cat-data (it need to be complete, as everything get's written)
-	 * @return mixed string/boolean errorstring if consitency check failed / true if the consistency check did not fail
+	 * @return string|boolean string/boolean errorstring if consitency check failed / true if the consistency check did not fail
 	 */
 	function check_consistency4update($values)
 	{
@@ -822,7 +822,7 @@ 
 	 *
 	 * @param int|array $cat
 	 * @param boolean $application_global =false true check for application global categories only (appname == 'phpgw')
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	static function is_global($cat,$application_global=false)
 	{
@@ -1030,7 +1030,7 @@ 
 	 *
 	 * @param string appname
 	 *
-	 * @return Returns the URL, but you do not need to do anything with it.
+	 * @return string the URL, but you do not need to do anything with it.
 	 */
 	public static function css($appname)
 	{

Indentation +7 added lines, -7 removed lines

@@ -1044,13 +1044,13 @@
 	}
 
 	/**
-	* Get the color of a category
-	*
-	* For multiple cats, the first with a color is used
-	*
-	* @param int|string $_cats multiple comma-separated cat_id's
-	* @return string
-	*/
+	 * Get the color of a category
+	 *
+	 * For multiple cats, the first with a color is used
+	 *
+	 * @param int|string $_cats multiple comma-separated cat_id's
+	 * @return string
+	 */
 	static function cats2color($_cats)
 	{
 		static $cat2color = array();

Spacing +120 added lines, -120 removed lines

@@ -120,23 +120,23 @@ 
 	 * @param int|string $accountid ='' account id or lid, default to current user
 	 * @param string $app_name ='' app name defaults to current app
 	 */
-	function __construct($accountid='',$app_name = '')
+	function __construct($accountid = '', $app_name = '')
 	{
 		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
 		{
-			$this->account_id = (int) $accountid;
+			$this->account_id = (int)$accountid;
 		}
 		else
 		{
-			$this->account_id	= (int) get_account_id($accountid);
+			$this->account_id = (int)get_account_id($accountid);
 			$this->global_owners = $this->account_id ? $GLOBALS['egw']->accounts->memberships($this->account_id, true) : array();
 			$this->global_owners[] = self::GLOBAL_ACCOUNT;
 		}
-		$this->app_name		= $app_name;
-		$this->db			= $GLOBALS['egw']->db;
+		$this->app_name = $app_name;
+		$this->db = $GLOBALS['egw']->db;
 
 		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
 		{
@@ -156,12 +156,12 @@ 
 	 */
 	function return_all_children($cat_id)
 	{
-		$all_children = (array) $cat_id;
+		$all_children = (array)$cat_id;
 
-		$children = $this->return_array('subs',0,False,'','','',True,$cat_id,-1,'id');
+		$children = $this->return_array('subs', 0, False, '', '', '', True, $cat_id, -1, 'id');
 		if (is_array($children) && count($children))
 		{
-			$all_children = array_merge($all_children,$this->return_all_children($children));
+			$all_children = array_merge($all_children, $this->return_all_children($children));
 		}
 		return $all_children;
 	}
@@ -183,24 +183,24 @@ 
 	 * @param array $filter =null array with column-name (without cat_-prefix) => value pairs (! negates the value)
 	 * @return array of cat-arrays or $column values
 	 */
-	function return_array($type='all', $start=0, $limit=true, $query='', $sort='ASC',$order='',$globals=false, $parent_id=null, $lastmod=-1, $column='', $filter=null)
+	function return_array($type = 'all', $start = 0, $limit = true, $query = '', $sort = 'ASC', $order = '', $globals = false, $parent_id = null, $lastmod = -1, $column = '', $filter = null)
 	{
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,globals=$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).") account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 		$cats = array();
-		foreach(self::$cache as $cat)
+		foreach (self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter) foreach ($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1) || trim($cat[$col]) == substr($val, 1)) continue 2;
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1)) continue 2;
 					}
 				}
 				elseif (is_array($val))
@@ -208,11 +208,11 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col], $val) && !in_array(trim($cat[$col]), $val)) continue 2;
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col], $val)) continue 2;
 					}
 				}
 				else
@@ -229,7 +229,7 @@ 
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'], (array)$parent_id)) continue;
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -238,7 +238,7 @@ 
 			}
 
 			// check for read permission
-			if(!$this->check_perms(Acl::READ, $cat, $globals === 'all_no_acl'))
+			if (!$this->check_perms(Acl::READ, $cat, $globals === 'all_no_acl'))
 			{
 				continue;
 			}
@@ -247,7 +247,7 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent']) continue 2; // 2 for switch AND foreach!
 					break;
 				case 'mains':
 					if ($cat['parent']) continue 2;
@@ -267,7 +267,7 @@ 
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'], $query) === false && stristr($cat['description'], $query) === false) continue;
 
 			// check if last modified since
 			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
@@ -284,37 +284,37 @@ 
 		if (!$sort) $sort = 'ASC';
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
-			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
+			preg_match('/^[a-zA-Z_(), ]+$/', $order) && preg_match('/^(ASC|DESC|asc|desc)$/', $sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order, 'cat_data') !== false) $order = 'cat_data'; // sitemgr orders by round(cat_data)!
+			if (substr($order, 0, 4) == 'cat_') $order = substr($order, 4);
 			$sign = strtoupper($sort) == 'DESC' ? -1 : 1;
 			usort($cats, function($a, $b) use ($order, $sign)
 			{
-				if (in_array($order, array('name','description','appname','app_name')))
+				if (in_array($order, array('name', 'description', 'appname', 'app_name')))
 				{
 					return $sign * strcasecmp($a[$order], $b[$order]);
 				}
-				return $sign*(int)$a[$order] - $sign*(int)$b[$order];
+				return $sign * (int)$a[$order] - $sign * (int)$b[$order];
 			});
 		}
 		// limit the number of returned rows
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
 		// return only a certain column (why not return is as value?)
 		if ($column)
 		{
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k] = $cat[$column];
 			}
 		}
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).",$unserialize_data) account_id=$this->account_id, appname=$this->app_name = ".array2string($cats));
 
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -332,7 +332,7 @@ 
 	 * @param boolean $unserialize_data =true return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
-	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
+	function return_sorted_array($start = 0, $limit = True, $query = '', $sort = 'ASC', $order = 'cat_name', $globals = False, $parent_id = 0, $unserialize_data = true, $filter = null)
 	{
 		if (!$sort)  $sort = 'ASC';
 		if (!$order) $order = 'cat_name';
@@ -342,27 +342,27 @@ 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
-		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
+		if ($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if (!($cats = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parent_id, -1, '', $filter, $unserialize_data)))
 		{
 			$cats = array();
 		}
-		foreach($cats as $cat)
+		foreach ($cats as $cat)
 		{
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if ($parent_id || !$cats) // Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
 			{
-				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
+				if (!($subs = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parents, -1, '', $filter, $unserialize_data)))
 				{
 					break;
 				}
 				$parents = $children = array();
-				foreach($subs as $cat)
+				foreach ($subs as $cat)
 				{
 					$parents[] = $cat['id'];
 					$children[$cat['parent']][] = $cat;
@@ -372,12 +372,12 @@ 
 				{
 					$cats2 = $cats;
 					$cats = array();
-					foreach($cats2 as $cat)
+					foreach ($cats2 as $cat)
 					{
 						$cats[] = $cat;
 						if (isset($children[$cat['id']]))
 						{
-							foreach($children[$cat['id']] as $child)
+							foreach ($children[$cat['id']] as $child)
 							{
 								$cats[] = $child;
 							}
@@ -392,9 +392,9 @@ 
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -415,7 +415,7 @@ 
 		if (!isset(self::$cache[$id])) return false;
 
 		$cat = self::$cache[$id];
-		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
+		$cat['data'] = $cat['data'] ? ((($arr = json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
 			$arr : $cat['data']) : array();
 
 		return $cat;
@@ -433,31 +433,31 @@ 
 	{
 		if ((int)$values['parent'] > 0)
 		{
-			$values['level'] = $this->id2name($values['parent'],'level')+1;
-			$values['main'] = $this->id2name($values['parent'],'main');
+			$values['level'] = $this->id2name($values['parent'], 'level') + 1;
+			$values['main'] = $this->id2name($values['parent'], 'main');
 		}
 		else
 		{
 			$values['level'] = 0;
 		}
-		$this->db->insert(self::TABLE,$cat=array(
+		$this->db->insert(self::TABLE, $cat = array(
 			'cat_parent'  => $values['parent'],
 			'cat_owner' => isset($values['owner']) ? $values['owner'] : $this->account_id,
 			'cat_access'  => isset($values['access']) ? $values['access'] : 'public',
 			'cat_appname' => $this->app_name,
 			'cat_name'    => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from returned one
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from returned one
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_main'    => $values['main'],
 			'cat_level'   => $values['level'],
 			'last_mod'    => time(),
-		),(int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(),__LINE__,__FILE__);
+		), (int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(), __LINE__, __FILE__);
 
-		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE,'cat_id');
+		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE, 'cat_id');
 
 		if (!(int)$values['parent'] && $id != $values['main'])
 		{
-			$this->db->update(self::TABLE,array('cat_main' => $id),array('cat_id' => $id),__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_main' => $id), array('cat_id' => $id), __LINE__, __FILE__);
 			$cat['cat_main'] = $id;
 		}
 		// update cache accordingly
@@ -479,20 +479,20 @@ 
 		if (empty($cat_list)) return $cat_list;
 		if (is_array($cat_list))
 		{
-			$cat_list = implode(',',$cat_list);
+			$cat_list = implode(',', $cat_list);
 			//error_log(__METHOD__.__LINE__.' string expected, array found for cat_list. Converted to:'.$cat_list);
 		}
-		$cat_arr = explode(',',$cat_list);
+		$cat_arr = explode(',', $cat_list);
 		if (!empty($cat_arr) && is_array($cat_arr) && count($cat_arr) > 0)
 		{
-			foreach($cat_arr as $id=>$cat_id)
+			foreach ($cat_arr as $id=>$cat_id)
 			{
 				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))	// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
 			}
-			$cat_list = implode(',',$cat_arr);
+			$cat_list = implode(',', $cat_arr);
 		}
 
 		return $cat_list;
@@ -509,7 +509,7 @@ 
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
 	 * @return boolean true permission granted, false for permission denied, null for category does not exist
 	 */
-	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
+	public function check_perms($needed, $category, $no_acl_check = false, $allow_global_read = false)
 	{
 		if (!is_array($category) && !($category = self::read($category)))
 		{
@@ -525,8 +525,8 @@ 
 		}
 
 		// Read access to global categories
-		if ($needed == Acl::READ && (($is_global=array_intersect(explode(',',$category['owner']),$this->global_owners)) ||
-			$no_acl_check && $category['access'] == 'public') &&	// no_acl_check only means public cats
+		if ($needed == Acl::READ && (($is_global = array_intersect(explode(',', $category['owner']), $this->global_owners)) ||
+			$no_acl_check && $category['access'] == 'public') && // no_acl_check only means public cats
 			($category['appname'] == self::GLOBAL_APPNAME || $category['appname'] == $this->app_name ||
 			$is_global && $allow_global_read))
 		{
@@ -549,16 +549,16 @@ 
 		// Load the application grants
 		if ($category['appname'] == $this->app_name && is_null($this->grants))
 		{
-			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name,true);
+			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name, true);
 		}
 
 		// Check for ACL granted access, the self::GLOBAL_ACCOUNT user must not get access by ACL to keep old behaviour
 		$acl_grant = $this->account_id != self::GLOBAL_ACCOUNT && $category['appname'] == $this->app_name;
 		$owner_grant = false;
-		foreach(explode(',',$category['owner']) as $owner)
+		foreach (explode(',', $category['owner']) as $owner)
 		{
-			$owner_grant = $owner_grant || (($this->grants[$owner] & $needed) &&
-				($category['access'] == 'public' ||  ($this->grants[$owner] & Acl::PRIVAT)));
+			$owner_grant = $owner_grant || (($this->grants[$owner]&$needed) &&
+				($category['access'] == 'public' || ($this->grants[$owner]&Acl::PRIVAT)));
 		}
 		return $acl_grant && $owner_grant;
 	}
@@ -575,35 +575,35 @@ 
 		//error_log(__METHOD__."(".array2string($cat_id).', drop_subs='.array2string($drop_subs).', modify_subs='.array2string($modify_subs).') '.function_backtrace());
 		if ($modify_subs)
 		{
-			$new_parent = $this->id2name($cat_id,'parent');
+			$new_parent = $this->id2name($cat_id, 'parent');
 
-			foreach ((array) $this->return_sorted_array('',False,'','','',False, $cat_id) as $cat)
+			foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $cat_id) as $cat)
 			{
 				if ($cat['level'] == 1)
 				{
-					$this->db->update(self::TABLE,array(
+					$this->db->update(self::TABLE, array(
 						'cat_level'  => 0,
 						'cat_parent' => 0,
 						'cat_main'   => $cat['id'],
-					),array(
+					), array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 
 					$new_main = $cat['id'];
 				}
 				else
 				{
-					$update = array('cat_level' => $cat['level']-1);
+					$update = array('cat_level' => $cat['level'] - 1);
 
 					if ($new_main) $update['cat_main'] = $new_main;
 
 					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
 
-					$this->db->update(self::TABLE,$update,array(
+					$this->db->update(self::TABLE, $update, array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 				}
 			}
 		}
@@ -624,16 +624,16 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if ($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			Hooks::process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			Hooks::process($GLOBALS['hook_values'], False, True); // called for every app now, not only enabled ones)
 		}
 		else
 		{
-			Hooks::single($GLOBALS['hook_values'], self::id2name($cat_id,'appname'));
+			Hooks::single($GLOBALS['hook_values'], self::id2name($cat_id, 'appname'));
 		}
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		// update cache accordingly
 		self::invalidate_cache($modify_subs ? null : $where['cat_id']);
@@ -649,17 +649,17 @@ 
 	 */
 	function adapt_level_in_subtree($values)
 	{
-		foreach ((array) $this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['parent'] == $values['id'])
 			{
-				$this->db->update(self::TABLE,array(
-					'cat_level' => $values['level']+1,
+				$this->db->update(self::TABLE, array(
+					'cat_level' => $values['level'] + 1,
 					'last_mod' => time(),
-				),array(
+				), array(
 					'cat_id' => $cat['id'],
 					'cat_appname' => $this->app_name,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 				$cat['level'] = $values['level'] + 1;
 				self::invalidate_cache($cat['id']);
 				$this->adapt_level_in_subtree($cat);
@@ -680,14 +680,14 @@ 
 	function check_consistency4update($values)
 	{
 		// check if we try to move an element down its own subtree, which will fail
-		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ($this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent'] == $values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent'] > 0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
 		return true;
 	}
 
@@ -706,7 +706,7 @@ 
 			$ret = $this->check_consistency4update($values);
 			if ($ret !== true) throw new Exception\WrongUserinput($ret);
 			// everything seems in order -> proceed
-			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
+			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'], 'level') + 1 : 0);
 			$this->adapt_level_in_subtree($values);
 
 			return $this->add($values);
@@ -720,8 +720,8 @@ 
 				if ($ret !== true) throw new Exception\WrongUserinput($ret);
 
 				// everything seems in order -> proceed
-				$values['main']  = $this->id2name($values['parent'],'main');
-				$values['level'] = $this->id2name($values['parent'],'level') + 1;
+				$values['main']  = $this->id2name($values['parent'], 'main');
+				$values['level'] = $this->id2name($values['parent'], 'level') + 1;
 			}
 			else
 			{
@@ -732,9 +732,9 @@ 
 			// adapt the level info in each child
 			$this->adapt_level_in_subtree($values);
 		}
-		$this->db->update(self::TABLE,$cat=array(
+		$this->db->update(self::TABLE, $cat = array(
 			'cat_name' => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from the one read
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from the one read
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_parent' => $values['parent'],
 			'cat_access' => $values['access'],
@@ -742,10 +742,10 @@ 
 			'cat_main' => $values['main'],
 			'cat_level' => $values['level'],
 			'last_mod' => time(),
-		),array(
+		), array(
 			'cat_id' => $values['id'],
 			'cat_appname' => $this->app_name,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		$cat['cat_id'] = $values['id'];
 		$cat['cat_appname'] = $this->app_name;
@@ -769,9 +769,9 @@ 
 	 * @param boolean|string $strip =false if true, strips 'X-'  ($strip) from category names added by some SyncML clients
 	 * @return int cat-id or 0 if not found
 	 */
-	function name2id($cat_name, $strip=false)
+	function name2id($cat_name, $strip = false)
 	{
-		static $cache = array();	// a litle bit of caching
+		static $cache = array(); // a litle bit of caching
 
 		if (isset($cache[$cat_name])) return $cache[$cat_name];
 
@@ -792,17 +792,17 @@ 
 			$cats[] = $stripped_cat_name;
 		}
 
-		if (!($cats = $this->return_array('all',0,false,'','','',true,null,-1,'',array(
+		if (!($cats = $this->return_array('all', 0, false, '', '', '', true, null, -1, '', array(
 			'name' => $cats,
 			'appname' => array($this->app_name, self::GLOBAL_APPNAME),
 		))))
 		{
-			return 0;	// cat not found, dont cache it, as it might be created in this request
+			return 0; // cat not found, dont cache it, as it might be created in this request
 		}
 		if (count($cats) > 1)
 		{
 			// if more the one cat matches we weight them by: exact name match; own, global, other users cat; appplication cats
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k]['weight'] = 100 * ($cat['name'] == $cat_name) +
 					10 * ($cat['owner'] == $this->account_id ? 3 : ($cat['owner'] <= self::GLOBAL_ACCOUNT ? 2 : 1)) +
@@ -814,7 +814,7 @@ 
 				return $b['weight'] - $a['weight'];
 			});
 		}
-		return $cache[$cat['cat_name']] = (int) $cats[0]['id'];
+		return $cache[$cat['cat_name']] = (int)$cats[0]['id'];
 	}
 
 	/**
@@ -824,12 +824,12 @@ 
 	 * @param boolean $application_global =false true check for application global categories only (appname == 'phpgw')
 	 * @return boolean
 	 */
-	static function is_global($cat,$application_global=false)
+	static function is_global($cat, $application_global = false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat))) return null; // cat not found
 
 		$global_owner = false;
-		foreach(explode(',',$cat['owner']) as $owner)
+		foreach (explode(',', $cat['owner']) as $owner)
 		{
 			$global_owner = $global_owner || $owner <= self::GLOBAL_ACCOUNT;
 		}
@@ -846,9 +846,9 @@ 
 	 * @param string $item ='name' requested information, 'path' = / delimited path of category names (incl. parents)
 	 * @return string information or '--' if not found or !$cat_id
 	 */
-	static function id2name($cat_id=0, $item='name')
+	static function id2name($cat_id = 0, $item = 'name')
 	{
-		if(!$cat_id) return '--';
+		if (!$cat_id) return '--';
 		if (!$item) $item = 'parent';
 
 		if (is_null(self::$cache)) self::init_cache();
@@ -858,7 +858,7 @@ 
 		{
 			if ($cat['parent'])
 			{
-				return self::id2name($cat['parent'],'path').' / '.$cat['name'];
+				return self::id2name($cat['parent'], 'path').' / '.$cat['name'];
 			}
 			$item = 'name';
 		}
@@ -887,7 +887,7 @@ 
 	 * @param int $parent =0 category id of parent
 	 * @return int/boolean cat_id or false if cat not exists
 	 */
-	function exists($type,$cat_name = '',$cat_id = 0,$parent = 0)
+	function exists($type, $cat_name = '', $cat_id = 0, $parent = 0)
 	{
 		if ($cat_name)
 		{
@@ -898,7 +898,7 @@ 
 		{
 			$filter['id'] = $cat_id;
 		}
-		if (!($cats = $this->return_array($type,0,false,'','','',true,$parent,-1,'id',$filter)))
+		if (!($cats = $this->return_array($type, 0, false, '', '', '', true, $parent, -1, 'id', $filter)))
 		{
 			$ret = false;
 		}
@@ -917,7 +917,7 @@ 
 	 * @param int $to =0 new owner or 0 to delete the cats
 	 * @param string $app ='' if given only cats matching $app are modifed/deleted
 	 */
-	function change_owner($owner,$to=0,$app='')
+	function change_owner($owner, $to = 0, $app = '')
 	{
 		$where = array('cat_owner' => $owner);
 
@@ -925,11 +925,11 @@ 
 
 		if ((int)$to)
 		{
-			$this->db->update(self::TABLE,array('cat_owner' => $to),$where,__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_owner' => $to), $where, __LINE__, __FILE__);
 		}
 		else
 		{
-			$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+			$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 		}
 		// update cache accordingly
 		self::invalidate_cache();
@@ -947,10 +947,10 @@ 
 		if (is_null(self::$cache))
 		{
 			// check if we are already updated to global owner == 0, if not do it now
-			if (!$GLOBALS['egw']->db->select(self::TABLE,'COUNT(*)',array('cat_owner'=>'0'),__LINE__,__FILE__)->fetchColumn())
+			if (!$GLOBALS['egw']->db->select(self::TABLE, 'COUNT(*)', array('cat_owner'=>'0'), __LINE__, __FILE__)->fetchColumn())
 			{
-				$GLOBALS['egw']->db->update(self::TABLE,array('cat_owner'=>'0'),"(cat_owner='-1' OR cat_appname='phpgw')",__LINE__,__FILE__);
-				$GLOBALS['egw']->db->insert(self::TABLE,array(
+				$GLOBALS['egw']->db->update(self::TABLE, array('cat_owner'=>'0'), "(cat_owner='-1' OR cat_appname='phpgw')", __LINE__, __FILE__);
+				$GLOBALS['egw']->db->insert(self::TABLE, array(
 					'cat_main'    => 0,
 					'cat_parent'  => 0,
 					'cat_level'   => 0,
@@ -959,15 +959,15 @@ 
 					'cat_name'    => 'global=0',
 					'cat_description' => 'global=0',
 					'last_mod'    => time(),
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 			self::$cache = array();
 			// read all cats (cant use $this->db!)
-			foreach($GLOBALS['egw']->db->select(self::TABLE,'*',false,__LINE__,__FILE__,
-				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
+			foreach ($GLOBALS['egw']->db->select(self::TABLE, '*', false, __LINE__, __FILE__,
+				false, 'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
-				$cat = Db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				$cat = Db::strip_array_keys($cat, 'cat_');
+				if ($cat['appname'] == '*update*') continue; // --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -977,7 +977,7 @@ 
 				if (isset(self::$cache[$cat['id']]))
 				{
 					$cat['children'] = self::$cache[$cat['id']]['children'];
-					unset(self::$cache[$cat['id']]);	// otherwise the order gets messed up!
+					unset(self::$cache[$cat['id']]); // otherwise the order gets messed up!
 				}
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -994,7 +994,7 @@ 
 	 *
 	 * @param int|array $cat concerned id(s) or array with cat-data or null for all cats
 	 */
-	public static function invalidate_cache($cat=null)
+	public static function invalidate_cache($cat = null)
 	{
 		//error_log(__METHOD__."(".array2string($cat).') '.function_backtrace());
 
@@ -1006,12 +1006,12 @@ 
 		{
 			if (!is_array($cat) || isset($cat[0]))
 			{
-				foreach((array)$cat as $cat_id)
+				foreach ((array)$cat as $cat_id)
 				{
 					unset(self::$cache[$cat_id]);
 				}
 			}
-			elseif($cat['id'])
+			elseif ($cat['id'])
 			{
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -1034,8 +1034,8 @@ 
 	 */
 	public static function css($appname)
 	{
-		$cats = new Categories('',$appname);
-		$last_mod = $cats->return_array('all',0,1,'','DESC','last_mod', $appname == self::GLOBAL_APPNAME);
+		$cats = new Categories('', $appname);
+		$last_mod = $cats->return_array('all', 0, 1, '', 'DESC', 'last_mod', $appname == self::GLOBAL_APPNAME);
 		$time = count($last_mod) ? $last_mod[0]['last_mod'] : time();
 		$path = '/api/categories.php?app='.$appname.'&'.$time;
 		Framework::includeCSS($path);
@@ -1065,7 +1065,7 @@ 
 			return $cat2color[$cats];
 		}
 
-		foreach(explode(',', $cats) as $cat)
+		foreach (explode(',', $cats) as $cat)
 		{
 			if (isset($cat2color[$cat]))
 			{
@@ -1088,13 +1088,13 @@ 
 	 * @param int $new_owner =null for users data can be transfered to new owner
 	 * @return int number of deleted or modified categories
 	 */
-	public static function delete_account($account_id, $new_owner=null)
+	public static function delete_account($account_id, $new_owner = null)
 	{
 		if (is_null(self::$cache)) self::init_cache();
 
 		$deleted = 0;
 		$cat = null;
-		foreach(self::$cache as $cat_id => $data)
+		foreach (self::$cache as $cat_id => $data)
 		{
 			if ($data['owner'] && ($owners = explode(',', $data['owner'])) && ($owner_key = array_search($account_id, $owners)) !== false)
 			{
@@ -1136,9 +1136,9 @@ 
 
 		$checked = array();
 		$deleted = 0;
-		foreach(self::$cache as $data)
+		foreach (self::$cache as $data)
 		{
-			foreach(explode(',', $data['owner']) as $owner)
+			foreach (explode(',', $data['owner']) as $owner)
 			{
 				if ($owner && !in_array($owner, $checked))
 				{

Braces +208 added lines, -52 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	function __construct($accountid='',$app_name = '')
 	{
-		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app_name)
+		{
+			$app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
@@ -138,10 +141,13 @@ 
 		$this->app_name		= $app_name;
 		$this->db			= $GLOBALS['egw']->db;
 
-		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
+		if (is_null(self::$cache))
+		{
+			// should not be necessary, as cache is load and restored by egw object
 		{
 			self::init_cache();
 		}
+		}
 		if (is_null(self::$global_marker))
 		{
 			// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
@@ -189,7 +195,9 @@ 
 		$cats = array();
 		foreach(self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter)
+			{
+				foreach($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
@@ -197,10 +205,14 @@ 
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
 						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+			}
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val,1))
+						{
+							continue 2;
+						}
 					}
 				}
 				elseif (is_array($val))
@@ -208,11 +220,17 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val))
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col],$val))
+						{
+							continue 2;
+						}
 					}
 				}
 				else
@@ -220,16 +238,25 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] != $val && trim($cat[$col]) != $val) continue 2;
+						if ($cat[$col] != $val && trim($cat[$col]) != $val)
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if ($cat[$col] != $val) continue 2;
+						if ($cat[$col] != $val)
+						{
+							continue 2;
+						}
 					}
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'],(array)$parent_id))
+			{
+				continue;
+			}
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -247,30 +274,55 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent'])
+					{
+						continue 2;
+					}
+					// 2 for switch AND foreach!
 					break;
 				case 'mains':
-					if ($cat['parent']) continue 2;
+					if ($cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandmains':
-					if ($cat['appname'] != $this->app_name || $cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandsubs':
-					if ($cat['appname'] != $this->app_name || !$cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || !$cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobal':
-					if ($cat['appname'] == $this->app_name) continue 2;
+					if ($cat['appname'] == $this->app_name)
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobalapp':
-					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id)
+					{
+						continue 2;
+					}
 					break;
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false)
+			{
+				continue;
+			}
 
 			// check if last modified since
-			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
+			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod)
+			{
+				continue;
+			}
 
 			$cat['data'] = $cat['data'] ? json_php_unserialize($cat['data'], true) : array();
 
@@ -281,13 +333,23 @@ 
 			//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = FALSE");
 			return array();
 		}
-		if (!$sort) $sort = 'ASC';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
 			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order,'cat_data') !== false)
+			{
+				$order = 'cat_data';
+			}
+			// sitemgr orders by round(cat_data)!
+			if (substr($order,0,4) == 'cat_')
+			{
+				$order = substr($order,4);
+			}
 			$sign = strtoupper($sort) == 'DESC' ? -1 : 1;
 			usort($cats, function($a, $b) use ($order, $sign)
 			{
@@ -301,7 +363,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		// return only a certain column (why not return is as value?)
@@ -334,15 +399,24 @@ 
 	 */
 	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
 	{
-		if (!$sort)  $sort = 'ASC';
-		if (!$order) $order = 'cat_name';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
+		if (!$order)
+		{
+			$order = 'cat_name';
+		}
 
 		//error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id,$unserialize_data) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if($parent_id !== false && $parent_id !== null)
+		{
+			$parent_id = (array)$parent_id;
+		}
 		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
 		{
 			$cats = array();
@@ -352,7 +426,9 @@ 
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if($parent_id || !$cats)
+		{
+			// Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
@@ -360,6 +436,7 @@ 
 				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
 				{
 					break;
+		}
 				}
 				$parents = $children = array();
 				foreach($subs as $cat)
@@ -391,7 +468,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
@@ -410,9 +490,15 @@ 
 	 */
 	static function read($id)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
-		if (!isset(self::$cache[$id])) return false;
+		if (!isset(self::$cache[$id]))
+		{
+			return false;
+		}
 
 		$cat = self::$cache[$id];
 		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
@@ -475,8 +561,11 @@ 
 	 * @return string truncated commaseparated list of category ids
 	 */
 	function check_list($needed, $cat_list)
- 	{
-		if (empty($cat_list)) return $cat_list;
+	{
+		if (empty($cat_list))
+		{
+			return $cat_list;
+		}
 		if (is_array($cat_list))
 		{
 			$cat_list = implode(',',$cat_list);
@@ -487,10 +576,13 @@ 
 		{
 			foreach($cat_arr as $id=>$cat_id)
 			{
-				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))	// allow reading all global cats
+				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))
+				{
+					// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
+				}
 			}
 			$cat_list = implode(',',$cat_arr);
 		}
@@ -596,9 +688,15 @@ 
 				{
 					$update = array('cat_level' => $cat['level']-1);
 
-					if ($new_main) $update['cat_main'] = $new_main;
+					if ($new_main)
+					{
+						$update['cat_main'] = $new_main;
+					}
 
-					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
+					if ($cat['parent'] == $cat_id)
+					{
+						$update['cat_parent'] = $new_parent;
+					}
 
 					$this->db->update(self::TABLE,$update,array(
 						'cat_id' => $cat['id'],
@@ -624,9 +722,13 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if($this->is_global($cat_id, true))
+		{
+			// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			Hooks::process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			Hooks::process($GLOBALS['hook_values'],False,True);
+		}
+		// called for every app now, not only enabled ones)
 		}
 		else
 		{
@@ -682,12 +784,22 @@ 
 		// check if we try to move an element down its own subtree, which will fail
 		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
 		{
-			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			if ($cat['id'] == $values['parent'])
+			{
+				return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			}
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent']==$values['id'])
+		{
+			return lang('Cannot set this cat as its own parent!');
+		}
+		// deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent']>0 && !$this->read($values['parent']))
+		{
+			return lang('Chosen parent category no longer exists');
+		}
 		return true;
 	}
 
@@ -704,7 +816,10 @@ 
 		if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent'])
 		{
 			$ret = $this->check_consistency4update($values);
-			if ($ret !== true) throw new Exception\WrongUserinput($ret);
+			if ($ret !== true)
+			{
+				throw new Exception\WrongUserinput($ret);
+			}
 			// everything seems in order -> proceed
 			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
 			$this->adapt_level_in_subtree($values);
@@ -717,7 +832,10 @@ 
 			if ($values['parent'] > 0)
 			{
 				$ret = $this->check_consistency4update($values);
-				if ($ret !== true) throw new Exception\WrongUserinput($ret);
+				if ($ret !== true)
+				{
+					throw new Exception\WrongUserinput($ret);
+				}
 
 				// everything seems in order -> proceed
 				$values['main']  = $this->id2name($values['parent'],'main');
@@ -773,7 +891,10 @@ 
 	{
 		static $cache = array();	// a litle bit of caching
 
-		if (isset($cache[$cat_name])) return $cache[$cat_name];
+		if (isset($cache[$cat_name]))
+		{
+			return $cache[$cat_name];
+		}
 
 		if ($strip === true)
 		{
@@ -826,7 +947,11 @@ 
 	 */
 	static function is_global($cat,$application_global=false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat)))
+		{
+			return null;
+		}
+		// cat not found
 
 		$global_owner = false;
 		foreach(explode(',',$cat['owner']) as $owner)
@@ -848,10 +973,19 @@ 
 	 */
 	static function id2name($cat_id=0, $item='name')
 	{
-		if(!$cat_id) return '--';
-		if (!$item) $item = 'parent';
+		if(!$cat_id)
+		{
+			return '--';
+		}
+		if (!$item)
+		{
+			$item = 'parent';
+		}
 
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$cat = self::$cache[$cat_id];
 		if ($item == 'path')
@@ -892,7 +1026,10 @@ 
 		if ($cat_name)
 		{
 			$filter['name'] = $cat_name;
-			if ($cat_id) $filter['id'] = '!'.(int)$cat_id;
+			if ($cat_id)
+			{
+				$filter['id'] = '!'.(int)$cat_id;
+			}
 		}
 		elseif ($cat_id)
 		{
@@ -921,7 +1058,10 @@ 
 	{
 		$where = array('cat_owner' => $owner);
 
-		if ($app) $where['cat_appname'] = $app;
+		if ($app)
+		{
+			$where['cat_appname'] = $app;
+		}
 
 		if ((int)$to)
 		{
@@ -967,7 +1107,11 @@ 
 				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
 				$cat = Db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				if ($cat['appname'] == '*update*')
+				{
+					continue;
+				}
+				// --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -1058,7 +1202,10 @@ 
 		// ACL check
 		$cats = $GLOBALS['egw']->categories->check_list(Acl::READ, $_cats);
 
-		if (!$cats) return null;
+		if (!$cats)
+		{
+			return null;
+		}
 
 		if (isset($cat2color[$cats]))
 		{
@@ -1090,7 +1237,10 @@ 
 	 */
 	public static function delete_account($account_id, $new_owner=null)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$deleted = 0;
 		$cat = null;
@@ -1110,7 +1260,10 @@ 
 				else
 				{
 					unset($owners[$owner_key]);
-					if ($new_owner && $account_id > 0) $owners[] = $new_owner;
+					if ($new_owner && $account_id > 0)
+					{
+						$owners[] = $new_owner;
+					}
 					$data['owner'] = implode(',', $owners);
 					// app_name have to match cat to update!
 					if (!isset($cat) || $cat->app_name != $data['appname'])
@@ -1132,7 +1285,10 @@ 
 	 */
 	public static function delete_orphans()
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$checked = array();
 		$deleted = 0;

api/src/Config.php

Doc Comments +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 	/**
 	 * sets a single value in the repositry, you need to call save_repository after
 	 *
-	 * @param $variable_name string name of the config
+	 * @param string $variable_name string name of the config
 	 * @param $variable_data mixed the content
 	 */
 	function value($variable_name,$variable_data)

Spacing +27 added lines, -27 removed lines

@@ -86,11 +86,11 @@ 
 	{
 		if (is_array($this->config_data))
 		{
-			foreach($this->config_data as $name => $value)
+			foreach ($this->config_data as $name => $value)
 			{
 				self::save_value($name, $value, $this->appname, false);
 			}
-			foreach(self::$configs[$this->appname] as $name => $value)
+			foreach (self::$configs[$this->appname] as $name => $value)
 			{
 				if (!isset($this->config_data[$name]))	// has been deleted
 				{
@@ -99,9 +99,9 @@ 
 				}
 			}
 
-			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache(); // in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			self::$configs[$this->appname] = $this->config_data;
 
@@ -122,13 +122,13 @@ 
 	 * @throws Exception\WrongParameter if no $app parameter given for static call
 	 * @return boolean|int true if no change, else number of affected rows
 	 */
-	static function save_value($name, $value, $app, $update_cache=true)
+	static function save_value($name, $value, $app, $update_cache = true)
 	{
-		if (!$app && (!isset($this) || !is_a($this,__CLASS__)))
+		if (!$app && (!isset($this) || !is_a($this, __CLASS__)))
 		{
 			throw new Exception\WrongParameter('$app parameter required for static call of Config::save_value($name,$value,$app)!');
 		}
-		if (!$app || isset($this) && is_a($this,__CLASS__) && $app == $this->appname)
+		if (!$app || isset($this) && is_a($this, __CLASS__) && $app == $this->appname)
 		{
 			$app = $this->appname;
 			$this->config_data[$name] = $value;
@@ -140,25 +140,25 @@ 
 
 		if (isset(self::$configs[$app][$name]) && self::$configs[$app][$name] === $value)
 		{
-			return True;	// no change ==> exit
+			return True; // no change ==> exit
 		}
 
 		if (!isset($value) || $value === '')
 		{
 			if (isset(self::$configs[$app])) unset(self::$configs[$app][$name]);
-			self::$db->delete(self::TABLE,array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			self::$db->delete(self::TABLE, array('config_app'=>$app, 'config_name'=>$name), __LINE__, __FILE__);
 		}
 		else
 		{
 			self::$configs[$app][$name] = $value;
-			if(is_array($value)) $value = json_encode($value);
-			self::$db->insert(self::TABLE,array('config_value'=>$value),array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
+			if (is_array($value)) $value = json_encode($value);
+			self::$db->insert(self::TABLE, array('config_value'=>$value), array('config_app'=>$app, 'config_name'=>$name), __LINE__, __FILE__);
 		}
 		if ($update_cache)
 		{
-			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache(); // in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			Cache::setInstance(__CLASS__, 'configs', self::$configs);
 		}
@@ -175,7 +175,7 @@ 
 		{
 			self::init_static();
 		}
-		self::$db->delete(self::TABLE,array('config_app' => $this->appname),__LINE__,__FILE__);
+		self::$db->delete(self::TABLE, array('config_app' => $this->appname), __LINE__, __FILE__);
 
 		unset(self::$configs[$this->appname]);
 		Cache::setInstance(__CLASS__, 'configs', self::$configs);
@@ -197,7 +197,7 @@ 
 	 * @param $variable_name string name of the config
 	 * @param $variable_data mixed the content
 	 */
-	function value($variable_name,$variable_data)
+	function value($variable_name, $variable_data)
 	{
 		$this->config_data[$variable_name] = $variable_data;
 	}
@@ -228,7 +228,7 @@ 
 	 * @deprecated use Api\Storage\Customfields::get()
 	 * @return array with customfields
 	 */
-	static function get_customfields($app, $all_private_too=false, $only_type2=null)
+	static function get_customfields($app, $all_private_too = false, $only_type2 = null)
 	{
 		//error_log(__METHOD__."('$app', $all_private_too, $only_type2) deprecated, use Storage\Customfields::get() in ".  function_backtrace());
 		return Storage\Customfields::get($app, $all_private_too, $only_type2);
@@ -258,12 +258,12 @@ 
 	{
 		static $white_list = array(
 			'all' => array('customfields', 'types'),
-			'phpgwapi' => array('webserver_url','server_timezone','enforce_ssl','system_charset',
-				'checkfornewversion','checkappversions','email_address_format',	// admin >> site config
-				'site_title','login_logo_file','login_logo_url','login_logo_title','favicon_file',
-				'markuntranslated','link_list_thumbnail','enabled_spellcheck','debug_minify',
-				'call_link','call_popup','geolocation_url',	// addressbook
-				'hide_birthdays','calview_no_consolidate', 'egw_tutorial_disable','fw_mobile_app_list'),	// calendar
+			'phpgwapi' => array('webserver_url', 'server_timezone', 'enforce_ssl', 'system_charset',
+				'checkfornewversion', 'checkappversions', 'email_address_format', // admin >> site config
+				'site_title', 'login_logo_file', 'login_logo_url', 'login_logo_title', 'favicon_file',
+				'markuntranslated', 'link_list_thumbnail', 'enabled_spellcheck', 'debug_minify',
+				'call_link', 'call_popup', 'geolocation_url', // addressbook
+				'hide_birthdays', 'calview_no_consolidate', 'egw_tutorial_disable', 'fw_mobile_app_list'), // calendar
 			'projectmanager' => array('hours_per_workday', 'duration_units'),
 			'manual' => array('manual_remote_egw_url'),
 			'infolog' => array('status'),
@@ -274,9 +274,9 @@ 
 			self::init_static();
 		}
 		$client_config = array();
-		foreach(self::$configs as $app => $config)
+		foreach (self::$configs as $app => $config)
 		{
-			foreach($config as $name => $value)
+			foreach ($config as $name => $value)
 			{
 				if (strpos($name, 'pass') !== false) continue;
 
@@ -314,12 +314,12 @@ 
 		}
 		// handling of old PHP serialized config values
 		$data = php_safe_unserialize($str);
-		if($data === false)
+		if ($data === false)
 		{
 			// manually retrieve the string lengths of the serialized array if unserialize failed (iso / utf-8 conversation)
 			$data = php_safe_unserialize(preg_replace_callback('!s:(\d+):"(.*?)";!s', function($matches)
 			{
-				return 's:'.mb_strlen($matches[2],'8bit').':"'.$matches[2].'";';
+				return 's:'.mb_strlen($matches[2], '8bit').':"'.$matches[2].'";';
 			}, $str));
 		}
 		// returning original string, if unserialize failed, eg. for "a:hello"
@@ -344,7 +344,7 @@ 
 		if (!(self::$configs = Cache::getInstance(__CLASS__, 'configs')) || !is_array(self::$configs['phpgwapi']))
 		{
 			self::$configs = array();
-			foreach(self::$db->select(self::TABLE,'*',false,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', false, __LINE__, __FILE__) as $row)
 			{
 				self::$configs[$row['config_app']][$row['config_name']] = self::unserialize($row['config_value']);
 				//error_log(__METHOD__."() configs[$row[config_app]][$row[config_name]]=".array2string(self::$configs[$row['config_app']][$row['config_name']]));

Braces +28 added lines, -8 removed lines

@@ -92,16 +92,23 @@ 
 			}
 			foreach(self::$configs[$this->appname] as $name => $value)
 			{
-				if (!isset($this->config_data[$name]))	// has been deleted
+				if (!isset($this->config_data[$name]))
+				{
+					// has been deleted
 				{
 					self::save_value($name, null, $this->appname, false);
+				}
 					//self::$db->delete(self::TABLE,array('config_app'=>$this->appname,'config_name'=>$name),__LINE__,__FILE__);
 				}
 			}
 
-			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($this->appname == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
+			// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			self::$configs[$this->appname] = $this->config_data;
 
@@ -145,20 +152,30 @@ 
 
 		if (!isset($value) || $value === '')
 		{
-			if (isset(self::$configs[$app])) unset(self::$configs[$app][$name]);
+			if (isset(self::$configs[$app]))
+			{
+				unset(self::$configs[$app][$name]);
+			}
 			self::$db->delete(self::TABLE,array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
 		}
 		else
 		{
 			self::$configs[$app][$name] = $value;
-			if(is_array($value)) $value = json_encode($value);
+			if(is_array($value))
+			{
+				$value = json_encode($value);
+			}
 			self::$db->insert(self::TABLE,array('config_value'=>$value),array('config_app'=>$app,'config_name'=>$name),__LINE__,__FILE__);
 		}
 		if ($update_cache)
 		{
-			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if ($app == 'phpgwapi' && method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
-				$GLOBALS['egw']->invalidate_session_cache();	// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
+				$GLOBALS['egw']->invalidate_session_cache();
+			}
+			// in case egw_info is cached in the session (phpgwapi is in egw_info[server])
 			}
 			Cache::setInstance(__CLASS__, 'configs', self::$configs);
 		}
@@ -278,7 +295,10 @@ 
 		{
 			foreach($config as $name => $value)
 			{
-				if (strpos($name, 'pass') !== false) continue;
+				if (strpos($name, 'pass') !== false)
+				{
+					continue;
+				}
 
 				if (in_array($name, $white_list['all']) || isset($white_list[$app]) && in_array($name, $white_list[$app]))
 				{

api/src/Contacts.php

Doc Comments +7 added lines, -5 removed lines

@@ -484,7 +484,6 @@ 
 	/**
 	 * get selectbox options for the customfields
 	 *
-	 * @param array $field =null
 	 * @return array with options:
 	 */
 	public static function cf_options()
@@ -536,7 +535,7 @@ 
 	 * @param string $fileas_type '' or type of $this->fileas_types
 	 * @param int $all =false update all contacts or only ones with empty values
 	 * @param int &$errors=null on return number of errors
-	 * @return int|boolean number of contacts updated, false for wrong fileas type
+	 * @return string|null number of contacts updated, false for wrong fileas type
 	 */
 	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
 	{
@@ -597,7 +596,7 @@ 
 	 * remove unneeded carriage returns or set empty fields to NULL
 	 *
 	 * @param int &$errors=null on return number of errors
-	 * @return int|boolean number of contacts updated
+	 * @return integer number of contacts updated
 	 */
 	function set_all_cleanup(&$errors=null,$ignore_acl=false)
 	{
@@ -1122,7 +1121,7 @@ 
 	 * @param mixed $contact contact as array or the contact-id
 	 * @param boolean $deny_account_delete =false if true never allow to delete accounts
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
+	 * @return null|boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
 	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
 	{
@@ -1179,7 +1178,7 @@ 
 	 * @param int $check Acl::READ for read and Acl::EDIT for write or delete access
 	 * @param string $rel_path =null currently not used in InfoLog
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if access is granted or false otherwise
+	 * @return null|boolean true if access is granted or false otherwise
 	 */
 	function file_access($id,$check,$rel_path=null,$user=null)
 	{
@@ -2094,6 +2093,9 @@ 
 		return $cat_id_list;
 	}
 
+	/**
+	 * @param string $cat_id_list
+	 */
 	function get_categories($cat_id_list)
 	{
 		if (!is_object($this->categories))

Indentation +29 added lines, -29 removed lines

@@ -145,19 +145,19 @@ 
 	var $categories;
 
 	/**
-	* Tracking changes
-	*
-	* @var Contacts\Tracking
-	*/
+	 * Tracking changes
+	 *
+	 * @var Contacts\Tracking
+	 */
 	protected $tracking;
 
 	/**
-	* Keep deleted addresses, or really delete them
-	* Set in Admin -> Addressbook -> Site Configuration
-	* ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
- 	*
-	* @var string
- 	*/
+	 * Keep deleted addresses, or really delete them
+	 * Set in Admin -> Addressbook -> Site Configuration
+	 * ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
+	 *
+	 * @var string
+	 */
 	protected $delete_history = '';
 
 	/**
@@ -786,13 +786,13 @@ 
 	}
 
 	/**
-	* deletes contact in db
-	*
-	* @param mixed &$contact contact array with key id or (array of) id(s)
-	* @param boolean $deny_account_delete =true if true never allow to delete accounts
-	* @param int $check_etag =null
-	* @return boolean|int true on success or false on failiure, 0 if etag does not match
-	*/
+	 * deletes contact in db
+	 *
+	 * @param mixed &$contact contact array with key id or (array of) id(s)
+	 * @param boolean $deny_account_delete =true if true never allow to delete accounts
+	 * @param int $check_etag =null
+	 * @return boolean|int true on success or false on failiure, 0 if etag does not match
+	 */
 	function delete($contact,$deny_account_delete=true,$check_etag=null)
 	{
 		if (is_array($contact) && isset($contact['id']))
@@ -844,12 +844,12 @@ 
 	}
 
 	/**
-	* saves contact to db
-	*
-	* @param array &$contact contact array from etemplate::exec
-	* @param boolean $ignore_acl =false should the acl be checked or not
-	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
-	*/
+	 * saves contact to db
+	 *
+	 * @param array &$contact contact array from etemplate::exec
+	 * @param boolean $ignore_acl =false should the acl be checked or not
+	 * @return int/string/boolean id on success, false on failure, the error-message is in $this->error
+	 */
 	function save(&$contact,$ignore_acl=false)
 	{
 		// remember if we add or update a entry
@@ -1069,12 +1069,12 @@ 
 	}
 
 	/**
-	* reads contacts matched by key and puts all cols in the data array
-	*
-	* @param int|string $contact_id
-	* @param boolean $ignore_acl =false true: no acl check
-	* @return array|boolean array with contact data, null if not found or false on no view perms
-	*/
+	 * reads contacts matched by key and puts all cols in the data array
+	 *
+	 * @param int|string $contact_id
+	 * @param boolean $ignore_acl =false true: no acl check
+	 * @return array|boolean array with contact data, null if not found or false on no view perms
+	 */
 	function read($contact_id, $ignore_acl=false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl

Spacing +248 added lines, -248 removed lines

@@ -16,7 +16,7 @@ 
 
 namespace EGroupware\Api;
 
-use calendar_bo;	// to_do: do NOT require it, just use if there
+use calendar_bo; // to_do: do NOT require it, just use if there
 
 /**
  * Business object for contacts
@@ -31,7 +31,7 @@ 
 	/**
 	 * @var array $timestamps timestamps
 	 */
-	var $timestamps = array('modified','created');
+	var $timestamps = array('modified', 'created');
 
 	/**
 	 * @var array $fileas_types
@@ -166,28 +166,28 @@ 
 	 * @param string $contact_app ='addressbook' used for acl->get_grants()
 	 * @param Db $db =null
 	 */
-	function __construct($contact_app='addressbook',Db $db=null)
+	function __construct($contact_app = 'addressbook', Db $db = null)
 	{
-		parent::__construct($contact_app,$db);
+		parent::__construct($contact_app, $db);
 		if ($this->log)
 		{
 			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir'].'/log-addressbook_bo';
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3 ,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3, $this->logfile);
 		}
 
-		$this->now_su = DateTime::to('now','ts');
+		$this->now_su = DateTime::to('now', 'ts');
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['addressbook'];
 		// get the default addressbook from the users prefs
 		$this->default_addressbook = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] ?
 			(int)$GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] : $this->user;
-		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'],-1) == 'p';
+		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'], -1) == 'p';
 		if ($this->default_addressbook > 0 && $this->default_addressbook != $this->user &&
 			($this->default_private ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->forced['addressbook']['add_default'] ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->default['addressbook']['add_default']))
 		{
-			$this->default_addressbook = $this->user;	// admin set a default or forced pref for personal addressbook
+			$this->default_addressbook = $this->user; // admin set a default or forced pref for personal addressbook
 		}
 		$this->private_addressbook = self::private_addressbook($this->contact_repository == 'sql', $this->prefs);
 
@@ -292,27 +292,27 @@ 
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
 		if (!is_array($this->own_account_acl)) $this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
-		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
+		if ($this->own_account_acl && in_array('n_fn', $this->own_account_acl))
 		{
-			$this->own_account_acl = array_merge($this->own_account_acl,array('n_prefix','n_given','n_middle','n_family','n_suffix'));
+			$this->own_account_acl = array_merge($this->own_account_acl, array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix'));
 		}
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
-			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
+			$this->org_fields = $GLOBALS['egw_info']['server']['org_fileds_to_update'];
 			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
 
 			// Set country code if country name is selected
-			$supported_fields = $this->get_fields('supported',null,0);
-			if(in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname',$this->org_fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$this->org_fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_two_countrycode';
 			}
 		}
-		$this->categories = new Categories($this->user,'addressbook');
+		$this->categories = new Categories($this->user, 'addressbook');
 
 		$this->delete_history = $GLOBALS['egw_info']['server']['history'];
 	}
@@ -326,7 +326,7 @@ 
 	 * @param array $prefs addressbook preferences
 	 * @return boolean
 	 */
-	public static function private_addressbook($contact_repository, array $prefs=null)
+	public static function private_addressbook($contact_repository, array $prefs = null)
 	{
 		return $contact_repository == 'sql' && $prefs['private_addressbook'];
 	}
@@ -340,7 +340,7 @@ 
 	 * @param int $user =null account_id or null for current user
 	 * @return array with owner => label pairs
 	 */
-	function get_addressbooks($required=Acl::READ,$extra_label=null,$user=null)
+	function get_addressbooks($required = Acl::READ, $extra_label = null, $user = null)
 	{
 		if (is_null($user))
 		{
@@ -359,11 +359,11 @@ 
 		if ($extra_label) $addressbooks[''] = $extra_label;
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if (($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
+			if (($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 			{
-				$to_sort[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
+				$to_sort[$uid] = lang('Group %1', $GLOBALS['egw']->accounts->id2name($uid));
 			}
 		}
 		if ($to_sort)
@@ -371,19 +371,19 @@ 
 			asort($to_sort);
 			$addressbooks += $to_sort;
 		}
-		if ($required != Acl::ADD &&	// do NOT allow to set accounts as default addressbook (AB can add accounts)
+		if ($required != Acl::ADD && // do NOT allow to set accounts as default addressbook (AB can add accounts)
 			!$preferences['addressbook']['hide_accounts'] && (
-				($grants[0] & $required) == $required ||
+				($grants[0]&$required) == $required ||
 				$preferences['common']['account_selection'] == 'groupmembers' &&
-				$this->account_repository != 'ldap' && ($required & Acl::READ)))
+				$this->account_repository != 'ldap' && ($required&Acl::READ)))
 		{
 			$addressbooks[0] = lang('Accounts');
 		}
 		// add all other user addressbooks the user has the necessary rights too
 		$to_sort = array();
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if ($uid != $user && ($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
+			if ($uid != $user && ($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
 			{
 				$to_sort[$uid] = Accounts::username($uid);
 			}
@@ -408,22 +408,22 @@ 
 	 * @param boolean $isUpdate =false If true, reads the old record for any not set fields
 	 * @return string
 	 */
-	function fileas($contact,$type=null, $isUpdate=false)
+	function fileas($contact, $type = null, $isUpdate = false)
 	{
 		if (is_null($type)) $type = $contact['fileas_type'];
 		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type, 'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
 
-		if($isUpdate)
+		if ($isUpdate)
 		{
-			$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality','bday');
+			$fileas_fields = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix', 'n_fn', 'org_name', 'org_unit', 'adr_one_locality', 'bday');
 			$old = null;
-			foreach($fileas_fields as $field)
+			foreach ($fileas_fields as $field)
 			{
-				if(!isset($contact[$field]))
+				if (!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if (is_null($old)) $old = $this->read($contact['id']);
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -431,8 +431,8 @@ 
 		}
 
 		// removing empty delimiters, caused by empty contact fields
-		$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),
-			array(': ',': ',': ',', ',': ',''),
+		$fileas = str_replace(array(', , : ', ', : ', ': , ', ', , ', ': : ', ' ()'),
+			array(': ', ': ', ': ', ', ', ': ', ''),
 			strtr($type, array(
 				'n_prefix' => $contact['n_prefix'],
 				'n_given'  => $contact['n_given'],
@@ -446,13 +446,13 @@ 
 				'bday'     => (int)$contact['bday'] ? DateTime::to($contact['bday'], true) : $contact['bday'],
 			)));
 
-		while ($fileas[0] == ':' ||  $fileas[0] == ',')
+		while ($fileas[0] == ':' || $fileas[0] == ',')
 		{
-			$fileas = substr($fileas,2);
+			$fileas = substr($fileas, 2);
 		}
-		while (substr($fileas,-2) == ': ' || substr($fileas,-2) == ', ')
+		while (substr($fileas, -2) == ': ' || substr($fileas, -2) == ', ')
 		{
-			$fileas = substr($fileas,0,-2);
+			$fileas = substr($fileas, 0, -2);
 		}
 		return $fileas;
 	}
@@ -464,15 +464,15 @@ 
 	 * @param string $file_as =null file_as type, default null to read it from the contact, unknown/not set type default to the first one
 	 * @return string
 	 */
-	function fileas_type($contact,$file_as=null)
+	function fileas_type($contact, $file_as = null)
 	{
 		if (is_null($file_as)) $file_as = $contact['n_fileas'];
 
 		if ($file_as)
 		{
-			foreach($this->fileas_types as $type)
+			foreach ($this->fileas_types as $type)
 			{
-				if ($this->fileas($contact,$type) == $file_as)
+				if ($this->fileas($contact, $type) == $file_as)
 				{
 					return $type;
 				}
@@ -489,10 +489,10 @@ 
 	 */
 	public static function cf_options()
 	{
-		$cf_fields = Storage\Customfields::get('addressbook',TRUE);
-		foreach ($cf_fields as $key => $value )
+		$cf_fields = Storage\Customfields::get('addressbook', TRUE);
+		foreach ($cf_fields as $key => $value)
 		{
-			$options[$key]= $value['label'];
+			$options[$key] = $value['label'];
 		}
 		return $options;
 	}
@@ -503,7 +503,7 @@ 
 	 * @param array $contact =null real content to use, default none
 	 * @return array with options: fileas type => label pairs
 	 */
-	function fileas_options($contact=null)
+	function fileas_options($contact = null)
 	{
 		$labels = array(
 			'n_prefix' => lang('prefix'),
@@ -517,13 +517,13 @@ 
 			'adr_one_locality' => lang('city'),
 			'bday'     => lang('Birthday'),
 		);
-		foreach(array_keys($labels) as $name)
+		foreach (array_keys($labels) as $name)
 		{
 			if ($contact[$name]) $labels[$name] = $contact[$name];
 		}
-		foreach($this->fileas_types as $fileas_type)
+		foreach ($this->fileas_types as $fileas_type)
 		{
-			$options[$fileas_type] = $this->fileas($labels,$fileas_type);
+			$options[$fileas_type] = $this->fileas($labels, $fileas_type);
 		}
 		return $options;
 	}
@@ -538,7 +538,7 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated, false for wrong fileas type
 	 */
-	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
+	function set_all_fileas($fileas_type, $all = false, &$errors = null, $ignore_acl = false)
 	{
 		if ($fileas_type != '' && !in_array($fileas_type, $this->fileas_types))
 		{
@@ -546,17 +546,17 @@ 
 		}
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
+		for ($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
 			'n_fileas IS NULL',
 			"n_fileas=''",
 			'n_fn IS NULL',
 			"n_fn=''",
-		),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$old_fn     = $contact['n_fn'];
 				$old_fileas = $contact['n_fileas'];
@@ -564,19 +564,19 @@ 
 				// only update fileas if type is given AND (all should be updated or n_fileas is empty)
 				if ($fileas_type && ($all || empty($contact['n_fileas'])))
 				{
-					$contact['n_fileas'] = $this->fileas($contact,$fileas_type);
+					$contact['n_fileas'] = $this->fileas($contact, $fileas_type);
 				}
 				if ($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])
 				{
 					// only specify/write updated fields plus "keys"
-					$contact = array_intersect_key($contact,array(
+					$contact = array_intersect_key($contact, array(
 						'id' => true,
 						'owner' => true,
 						'private' => true,
 						'account_id' => true,
 						'uid' => true,
-					)+($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array())+($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
-					if ($this->save($contact,$ignore_acl))
+					) + ($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array()) + ($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
+					if ($this->save($contact, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -599,11 +599,11 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated
 	 */
-	function set_all_cleanup(&$errors=null,$ignore_acl=false)
+	function set_all_cleanup(&$errors = null, $ignore_acl = false)
 	{
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 
 		// fields that must not be touched
@@ -625,14 +625,14 @@ 
 		);
 
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search(array(),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		for ($n = $updated = $errors = 0; ($contacts = parent::search(array(), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$fields_to_update = array();
-				foreach($contact as $field_name => $field_value)
+				foreach ($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if ($fields_exclude[$field_name] === true) continue; // dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -642,9 +642,9 @@ 
 							$fields_to_update[$field_name] = $field_value = trim($field_value);
 						}
 						// check if field contains a carriage return - exclude notes
-						if ($field_name != 'note' && strpos($field_value,"\x0D\x0A") !== false)
+						if ($field_name != 'note' && strpos($field_value, "\x0D\x0A") !== false)
 						{
-							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A"," ",$field_value);
+							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A", " ", $field_value);
 						}
 					}
 					// check if a field contains an empty string
@@ -654,13 +654,13 @@ 
 					}
 					// check for valid birthday date
 					if ($field_name == 'bday' && $field_value != null &&
-						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/',$field_value))
+						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/', $field_value))
 					{
 						$fields_to_update[$field_name] = $field_value = null;
 					}
 				}
 
-				if(count($fields_to_update) > 0)
+				if (count($fields_to_update) > 0)
 				{
 					$contact_to_save = array(
 						'id' => $contact['id'],
@@ -669,7 +669,7 @@ 
 						'account_id' => $contact['account_id'],
 						'uid' => $contact['uid']) + $fields_to_update;
 
-					if ($this->save($contact_to_save,$ignore_acl))
+					if ($this->save($contact_to_save, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -694,14 +694,14 @@ 
 		if (empty($contact['n_family']) && empty($contact['n_given'])) {
 			$cpart = array('org_name');
 		} else {
-			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
+			$cpart = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix');
 		}
 		$parts = array();
-		foreach($cpart as $n)
+		foreach ($cpart as $n)
 		{
 			if ($contact[$n]) $parts[] = $contact[$n];
 		}
-		return implode(' ',$parts);
+		return implode(' ', $parts);
 	}
 
 	/**
@@ -715,7 +715,7 @@ 
 	 *
 	 * @return array updated data
 	 */
-	function db2data($data, $date_format='ts')
+	function db2data($data, $date_format = 'ts')
 	{
 		static $fb_url = false;
 
@@ -727,7 +727,7 @@ 
 				$data[$name] = DateTime::server2user($data[$name], $date_format);
 			}
 		}
-		$data['photo'] = $this->photo_src($data['id'],$data['jpegphoto'],'',$data['etag']);
+		$data['photo'] = $this->photo_src($data['id'], $data['jpegphoto'], '', $data['etag']);
 
 		// set freebusy_uri for accounts
 		if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
@@ -750,13 +750,13 @@ 
 	 * @param string $etag =null etag to set in url to allow caching with Expires header
 	 * @return string/array
 	 */
-	function photo_src($id,$jpeg,$default='',$etag=null)
+	function photo_src($id, $jpeg, $default = '', $etag = null)
 	{
 		//error_log(__METHOD__."($id, ..., etag=$etag) ".  function_backtrace());
 		return $jpeg ? array(
 			'menuaction' => 'addressbook.addressbook_ui.photo',
 			'contact_id' => $id,
-		)+(isset($etag) ? array(
+		) + (isset($etag) ? array(
 			'etag'       => $etag,
 		) : array()) : $default;
 	}
@@ -772,7 +772,7 @@ 
 	 *
 	 * @return array upated data
 	 */
-	function data2db($data, $date_format='ts')
+	function data2db($data, $date_format = 'ts')
 	{
 		// convert timestamps from user-time to server-time in the db
 		foreach ($this->timestamps as $name)
@@ -793,7 +793,7 @@ 
 	* @param int $check_etag =null
 	* @return boolean|int true on success or false on failiure, 0 if etag does not match
 	*/
-	function delete($contact,$deny_account_delete=true,$check_etag=null)
+	function delete($contact, $deny_account_delete = true, $check_etag = null)
 	{
 		if (is_array($contact) && isset($contact['id']))
 		{
@@ -803,12 +803,12 @@ 
 		{
 			$contact = array($contact);
 		}
-		foreach($contact as $c)
+		foreach ($contact as $c)
 		{
 			$id = is_array($c) ? $c['id'] : $c;
 
 			$ok = false;
-			if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
+			if ($this->check_perms(Acl::DELETE, $c, $deny_account_delete))
 			{
 				if (!($old = $this->read($id))) return false;
 				// check if we only mark contacts as deleted, or really delete them
@@ -819,12 +819,12 @@ 
 					$delete = $old;
 					$delete['tid'] = self::DELETED_TYPE;
 					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
-					Link::unlink(0,'addressbook',$id,'','','',true);
+					if (($ok = $this->save($delete))) $ok = true; // we have to return true or false
+					Link::unlink(0, 'addressbook', $id, '', '', '', true);
 				}
-				elseif (($ok = parent::delete($id,$check_etag)))
+				elseif (($ok = parent::delete($id, $check_etag)))
 				{
-					Link::unlink(0,'addressbook',$id);
+					Link::unlink(0, 'addressbook', $id);
 				}
 
 				// Don't notify of final purge
@@ -850,7 +850,7 @@ 
 	* @param boolean $ignore_acl =false should the acl be checked or not
 	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
 	*/
-	function save(&$contact,$ignore_acl=false)
+	function save(&$contact, $ignore_acl = false)
 	{
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
@@ -859,11 +859,11 @@ 
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
-					if(!isset($contact['owner']))
+					if (!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
 					}
-					if(!isset($contact['private']))
+					if (!isset($contact['private']))
 					{
 						$contact['private'] = $old['private'];
 					}
@@ -895,7 +895,7 @@ 
 		{
 			$contact['private'] = 0;
 		}
-		if(!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD,$contact))
+		if (!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD, $contact))
 		{
 			$this->error = 'access denied';
 			return false;
@@ -908,15 +908,15 @@ 
 		// convert categories
 		if (is_array($contact['cat_id']))
 		{
-			$contact['cat_id'] = implode(',',$contact['cat_id']);
+			$contact['cat_id'] = implode(',', $contact['cat_id']);
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
+		foreach (array('adr_one_', 'adr_two_') as $c_prefix) {
+			if ($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = Country::country_code($contact[$c_prefix.'countryname']))
 			{
-				if(strlen($code) == 2)
+				if (strlen($code) == 2)
 				{
 					$contact[$c_prefix.'countrycode'] = $code;
 				}
@@ -925,7 +925,7 @@ 
 					$contact[$c_prefix.'countrycode'] = null;
 				}
 			}
-			if($contact[$c_prefix.'countrycode'] != null)
+			if ($contact[$c_prefix.'countrycode'] != null)
 			{
 				$contact[$c_prefix.'countryname'] = null;
 			}
@@ -950,9 +950,9 @@ 
 		// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
 		if (!$ignore_acl && !$contact['owner'] && !($this->is_admin($contact) || $this->allow_account_edit()))
 		{
-			foreach(array_keys($contact) as $field)
+			foreach (array_keys($contact) as $field)
 			{
-				if (!in_array($field,$this->own_account_acl) && !in_array($field,array('id','owner','account_id','modified','modifier')))
+				if (!in_array($field, $this->own_account_acl) && !in_array($field, array('id', 'owner', 'account_id', 'modified', 'modifier')))
 				{
 					// user is not allowed to change that
 					if ($old)
@@ -973,12 +973,12 @@ 
 		{
 			if (isset($to_write['owner']) && !empty($to_write['owner']))
 			{
-				error_log(__METHOD__.__LINE__." Trying to change account to owner:". $to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
+				error_log(__METHOD__.__LINE__." Trying to change account to owner:".$to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
 				unset($to_write['owner']);
 			}
 		}
 
-		if(!($this->error = parent::save($to_write)))
+		if (!($this->error = parent::save($to_write)))
 		{
 			$contact['id'] = $to_write['id'];
 			$contact['uid'] = $to_write['uid'];
@@ -992,27 +992,27 @@ 
 				$GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']);
 				// call edit-accout hook, to let other apps know about changed account (names or email)
 				$GLOBALS['hook_values'] = $GLOBALS['egw']->accounts->read($contact['account_id']);
-				Hooks::process($GLOBALS['hook_values']+array(
+				Hooks::process($GLOBALS['hook_values'] + array(
 					'location' => 'editaccount',
-				),False,True);	// called for every app now, not only enabled ones)
+				), False, True); // called for every app now, not only enabled ones)
 			}
 			// notify interested apps about changes in the account-contact data
 			if (!$to_write['owner'] && $to_write['account_id'] && $isUpdate)
 			{
 				$to_write['location'] = 'editaccountcontact';
-				Hooks::process($to_write,False,True);	// called for every app now, not only enabled ones));
+				Hooks::process($to_write, False, True); // called for every app now, not only enabled ones));
 			}
 			// Notify linked apps about changes in the contact data
-			Link::notify_update('addressbook',  $contact['id'], $contact);
+			Link::notify_update('addressbook', $contact['id'], $contact);
 
 			// Check for restore of deleted contact, restore held links
-			if($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
+			if ($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
 			{
 				Link::restore('addressbook', $contact['id']);
 			}
 
 			// Record change history for sql - doesn't work for LDAP accounts
-			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
+			if (!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
 				if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
@@ -1030,7 +1030,7 @@ 
 	 * @param int $dst_w =240 max width to resize to
 	 * @return string with resized jpeg photo, null on error
 	 */
-	public static function resize_photo($photo,$dst_w=240)
+	public static function resize_photo($photo, $dst_w = 240)
 	{
 		if (is_resource($photo))
 		{
@@ -1046,15 +1046,15 @@ 
 		//error_log(__METHOD__."() got image $src_w * $src_h, is_jpeg=".array2string(substr($photo,0,2) === "\377\330"));
 
 		// if $photo is to width or not a jpeg image --> resize it
-		if ($src_w > $dst_w || cut_bytes($photo,0,2) !== "\377\330")
+		if ($src_w > $dst_w || cut_bytes($photo, 0, 2) !== "\377\330")
 		{
 			//error_log(__METHOD__."(,dst_w=$dst_w) src_w=$src_w, cut_bytes(photo,0,2)=".array2string(cut_bytes($photo,0,2)).' --> resizing');
 			// scale the image to a width of 60 and a height according to the proportion of the source image
-			$resized = imagecreatetruecolor($dst_w,$dst_h = round($src_h * $dst_w / $src_w));
-			imagecopyresized($resized,$image,0,0,0,0,$dst_w,$dst_h,$src_w,$src_h);
+			$resized = imagecreatetruecolor($dst_w, $dst_h = round($src_h * $dst_w / $src_w));
+			imagecopyresized($resized, $image, 0, 0, 0, 0, $dst_w, $dst_h, $src_w, $src_h);
 
 			ob_start();
-			imagejpeg($resized,null,90);
+			imagejpeg($resized, null, 90);
 			$photo = ob_get_contents();
 			ob_end_clean();
 
@@ -1075,7 +1075,7 @@ 
 	* @param boolean $ignore_acl =false true: no acl check
 	* @return array|boolean array with contact data, null if not found or false on no view perms
 	*/
-	function read($contact_id, $ignore_acl=false)
+	function read($contact_id, $ignore_acl = false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl
 		if ($ignore_acl && is_a($this->somain, __CLASS__.'\\Sql'))
@@ -1085,11 +1085,11 @@ 
 		}
 		if (!($data = parent::read($contact_id)))
 		{
-			$data = null;	// not found
+			$data = null; // not found
 		}
-		elseif (!$ignore_acl && !$this->check_perms(Acl::READ,$data))
+		elseif (!$ignore_acl && !$this->check_perms(Acl::READ, $data))
 		{
-			$data = false;	// no view perms
+			$data = false; // no view perms
 		}
 		else
 		{
@@ -1097,10 +1097,10 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if ($data['adr_one_countrycode'] != null) {
 				$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if ($data['adr_two_countrycode'] != null) {
 				$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1124,7 +1124,7 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
-	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
+	function check_perms($needed, $contact, $deny_account_delete = false, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1135,7 +1135,7 @@ 
 		else
 		{
 			$grants = $this->get_grants($user);
-			$memberships =  $GLOBALS['egw']->accounts->memberships($user,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		}
 
 		if ((!is_array($contact) || !isset($contact['owner'])) &&
@@ -1161,12 +1161,12 @@ 
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']))
 		{
-			$access = !!array_intersect($memberships,$GLOBALS['egw']->accounts->memberships($contact['account_id'],true));
+			$access = !!array_intersect($memberships, $GLOBALS['egw']->accounts->memberships($contact['account_id'], true));
 		}
 		else
 		{
-			$access = ($grants[$owner] & $needed) &&
-				(!$contact['private'] || ($grants[$owner] & Acl::PRIVAT) || in_array($owner,$memberships));
+			$access = ($grants[$owner]&$needed) &&
+				(!$contact['private'] || ($grants[$owner]&Acl::PRIVAT) || in_array($owner, $memberships));
 		}
 		//error_log(__METHOD__."($needed,$contact[id],$deny_account_delete,$user) returning ".array2string($access));
 		return $access;
@@ -1181,11 +1181,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_perms($check,$id,false,$user);
+		return $this->check_perms($check, $id, false, $user);
 	}
 
 	/**
@@ -1197,18 +1197,18 @@ 
 	function read_org($org_id)
 	{
 		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (strpos($org_id, '*AND*') !== false) $org_id = str_replace('*AND*', '&', $org_id);
 		$org = array();
-		foreach(explode('|||',$org_id) as $part)
+		foreach (explode('|||', $org_id) as $part)
 		{
-			list($name,$value) = explode(':',$part,2);
+			list($name, $value) = explode(':', $part, 2);
 			$org[$name] = $value;
 		}
-		$csvs = array('cat_id');	// fields with comma-separated-values
+		$csvs = array('cat_id'); // fields with comma-separated-values
 
 		// split regular fields and custom fields
 		$custom_fields = $regular_fields = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if ($name[0] != '#')
 			{
@@ -1216,9 +1216,9 @@ 
 			}
 			else
 			{
-				$custom_fields[] = $name = substr($name,1);
+				$custom_fields[] = $name = substr($name, 1);
 				$regular_fields['id'] = 'id';
-				if (substr($this->customfields[$name]['type'],0,6)=='select' && $this->customfields[$name]['rows'] ||	// multiselection
+				if (substr($this->customfields[$name]['type'], 0, 6) == 'select' && $this->customfields[$name]['rows'] || // multiselection
 					$this->customfields[$name]['type'] == 'radio')
 				{
 					$csvs[] = '#'.$name;
@@ -1226,24 +1226,24 @@ 
 			}
 		}
 		// read the regular fields
-		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
+		$contacts = parent::search('', $regular_fields, '', '', '', false, 'AND', false, $org);
 		if (!$contacts) return false;
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
-			if (($cfs = $this->read_customfields($ids,$custom_fields)))
+			if (($cfs = $this->read_customfields($ids, $custom_fields)))
 			{
 				foreach ($contacts as &$contact)
 				{
 					$id = $contact['id'];
 					if (isset($cfs[$id]))
 					{
-						foreach($cfs[$id] as $name => $value)
+						foreach ($cfs[$id] as $name => $value)
 						{
 							$contact['#'.$name] = $value;
 						}
@@ -1255,33 +1255,33 @@ 
 
 		// create a statistic about the commonness of each fields values
 		$fields = array();
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$fields[$name][$value]++;
 				}
 				else
 				{
 					// for comma separated fields, we have to use each single value
-					foreach(explode(',',$value) as $val)
+					foreach (explode(',', $value) as $val)
 					{
 						$fields[$name][$val]++;
 					}
 				}
 			}
 		}
-		foreach($fields as $name => $values)
+		foreach ($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name, $this->org_fields)) continue;
 
-			arsort($values,SORT_NUMERIC);
-			list($value,$num) = each($values);
-			if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+			arsort($values, SORT_NUMERIC);
+			list($value, $num) = each($values);
+			if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$org[$name] = $value;
 				}
@@ -1290,12 +1290,12 @@ 
 					$org[$name] = array();
 					foreach ($values as $value => $num)
 					{
-						if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+						if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 						{
 							$org[$name][] = $value;
 						}
 					}
-					$org[$name] = implode(',',$org[$name]);
+					$org[$name] = implode(',', $org[$name]);
 				}
 			}
 		}
@@ -1309,10 +1309,10 @@ 
 	 * @param array $fields field-name => value pairs
 	 * @return array with contacts
 	 */
-	function org_similar($org_name,$fields)
+	function org_similar($org_name, $fields)
 	{
 		$criteria = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if (isset($fields[$name]))
 			{
@@ -1326,7 +1326,7 @@ 
 				}
 			}
 		}
-		return parent::search($criteria,false,'n_family,n_given','','',false,'OR',false,array('org_name'=>$org_name));
+		return parent::search($criteria, false, 'n_family,n_given', '', '', false, 'OR', false, array('org_name'=>$org_name));
 	}
 
 	/**
@@ -1337,10 +1337,10 @@ 
 	 * @param boolean $only_org_fields =true check and return only org_fields, default true
 	 * @return array with field-name => value from $from
 	 */
-	function changed_fields($from,$to,$only_org_fields=true)
+	function changed_fields($from, $to, $only_org_fields = true)
 	{
 		// we only care about countryname, if contrycode is empty
-		foreach(array(
+		foreach (array(
 			'adr_one_countryname' => 'adr_one_countrycode',
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
@@ -1349,13 +1349,13 @@ 
 			if (!empty($to[$code])) $to[$name] = '';
 		}
 		$changed = array();
-		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
+		foreach ($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name, array('modified', 'modifier')))	// never count these
 			{
 				continue;
 			}
-			if ((string) $from[$name] != (string) $to[$name])
+			if ((string)$from[$name] != (string)$to[$name])
 			{
 				$changed[$name] = $from[$name];
 			}
@@ -1372,35 +1372,35 @@ 
 	 * @param array $members =null org-members to change, default null --> function queries them itself
 	 * @return array/boolean (changed-members,changed-fields,failed-members) or false if no org_fields changed or no (other) members matching that fields
 	 */
-	function change_org($org_name,$from,$to,$members=null)
+	function change_org($org_name, $from, $to, $members = null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from, $to, true))) return false;
 
 		if (is_null($members) || !is_array($members))
 		{
-			$members = $this->org_similar($org_name,$changed);
+			$members = $this->org_similar($org_name, $changed);
 		}
 		if (!$members) return false;
 
 		$ids = array();
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			$ids[] = $member['id'];
 		}
 		$customfields = $this->read_customfields($ids);
 
 		$changed_members = $changed_fields = $failed_members = 0;
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			if (isset($customfields[$member['id']]))
 			{
-				foreach(array_keys($this->customfields) as $name)
+				foreach (array_keys($this->customfields) as $name)
 				{
 					$member['#'.$name] = $customfields[$member['id']][$name];
 				}
 			}
 			$fields = 0;
-			foreach($changed as $name => $value)
+			foreach ($changed as $name => $value)
 			{
 				if ((string)$value == (string)$member[$name])
 				{
@@ -1410,7 +1410,7 @@ 
 			}
 			if ($fields)
 			{
-				if (!$this->check_perms(Acl::EDIT,$member) || !$this->save($member))
+				if (!$this->check_perms(Acl::EDIT, $member) || !$this->save($member))
 				{
 					++$failed_members;
 				}
@@ -1421,7 +1421,7 @@ 
 				}
 			}
 		}
-		return array($changed_members,$changed_fields,$failed_members);
+		return array($changed_members, $changed_fields, $failed_members);
 	}
 
 	/**
@@ -1448,12 +1448,12 @@ 
 			if ($contact['n_fileas']) return $contact['n_fileas'];
 			$type = null;
 		}
-		$title =  $this->fileas($contact,$type);
+		$title = $this->fileas($contact, $type);
 		if ($this->prefs['link_title_cf'] && $contact['#'.$this->prefs['link_title_cf']])
 		{
-			$title .= ' ' . $contact['#'.$this->prefs['link_title_cf']];
+			$title .= ' '.$contact['#'.$this->prefs['link_title_cf']];
 		}
-		return $title ;
+		return $title;
 	}
 
 	/**
@@ -1467,21 +1467,21 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($contacts =& $this->search(array('contact_id' => $ids),false)))
+		if (($contacts = & $this->search(array('contact_id' => $ids), false)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-			   	$titles[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+			   	$titles[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 			}
 		}
 		// we assume all not returned contacts are not readable for the user (as we report all deleted contacts to egw_link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -1508,23 +1508,23 @@ 
 		{
 			$criteria = is_array($pattern) ? $pattern['search'] : $pattern;
 		}
-		if($options['start'] || $options['num_rows'])
+		if ($options['start'] || $options['num_rows'])
 		{
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
-		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
+		if (($contacts = & parent::search($criteria, false, 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', $limit, $filter)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-				$result[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+				$result[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 				// make sure to return a correctly quoted rfc822 address, if requested
 				if ($options['type'] === 'email')
 				{
@@ -1565,7 +1565,7 @@ 
 		// let link query know, to append email to list
 		$options['type'] = 'email';
 
-		return $this->link_query($pattern,$options);
+		return $this->link_query($pattern, $options);
 	}
 
 	/**
@@ -1579,7 +1579,7 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach(!is_array($ids) ? array($ids) : $ids as $id)
+		foreach (!is_array($ids) ? array($ids) : $ids as $id)
 		{
 			if (!($contact = $this->read($id))) continue;
 
@@ -1601,12 +1601,12 @@ 
 	 * @param boolean $extra_title =true if true, use a short date only title and put the full title as extra_title (tooltip)
 	 * @return array
 	 */
-	function read_calendar($ids,$extra_title=true)
+	function read_calendar($ids, $extra_title = true)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
 
 		$uids = array();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (is_numeric($id)) $uids[] = 'c'.$id;
 		}
@@ -1621,15 +1621,15 @@ 
 
 		//_debug_array($events);
 		$calendars = array();
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				if ($uid[0] != 'c' || ($status == 'R' && !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected']))
 				{
 					continue;
 				}
-				$id = (int)substr($uid,1);
+				$id = (int)substr($uid, 1);
 
 				if ($event['start'] < $this->now_su)	// past event --> check for last event
 				{
@@ -1641,13 +1641,13 @@ 
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
 							'extra_args' => array(
-								'date' => date('Ymd',$event['start']),
+								'date' => date('Ymd', $event['start']),
 							),
 						);
 						if ($extra_title)
 						{
 							$link['extra_title'] = $link['title'];
-							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],$event['start']);
+							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $event['start']);
 						}
 						$calendars[$id]['last_link'] = $link;
 					}
@@ -1662,13 +1662,13 @@ 
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
 							'extra_args' => array(
-								'date' => date('Ymd',$event['start']),
+								'date' => date('Ymd', $event['start']),
 							),
 						);
 						if ($extra_title)
 						{
 							$link['extra_title'] = $link['title'];
-							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],$event['start']);
+							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $event['start']);
 						}
 						$calendars[$id]['next_link'] = $link;
 					}
@@ -1697,7 +1697,7 @@ 
 	{
 		// get all cats if you want to drop sub cats
 		$drop_subs = ($data['drop_subs'] && !$data['modify_subs']);
-		if($drop_subs)
+		if ($drop_subs)
 		{
 			$cats = new Categories('', 'addressbook');
 			$cat_ids = $cats->return_all_children($data['cat_id']);
@@ -1708,14 +1708,14 @@ 
 		}
 
 		// Get addresses that use the category
-		@set_time_limit( 0 );
-		foreach($cat_ids as $cat_id)
+		@set_time_limit(0);
+		foreach ($cat_ids as $cat_id)
 		{
 			if (($ids = $this->search(array('cat_id' => $cat_id), false)))
 			{
-				foreach($ids as &$info)
+				foreach ($ids as &$info)
 				{
-					$info['cat_id'] = implode(',',array_diff(explode(',',$info['cat_id']), $cat_ids));
+					$info['cat_id'] = implode(',', array_diff(explode(',', $info['cat_id']), $cat_ids));
 					$this->save($info);
 				}
 			}
@@ -1737,14 +1737,14 @@ 
 		$account = null;
 		$custom_fields = Storage\Customfields::get('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach (parent::search(array('id'=>$ids), false) as $contact)	// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
-					return false;	// we dont deal with two accounts!
+					return false; // we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
@@ -1752,7 +1752,7 @@ 
 			// Add in custom fields
 			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
 
-			$pos = array_search($contact['id'],$ids);
+			$pos = array_search($contact['id'], $ids);
 			$contacts[$pos] = $contact;
 		}
 		if (!is_null($account))	// we found an account, so we merge the contacts into it
@@ -1765,38 +1765,38 @@ 
 			$target = $contacts[0];
 			unset($contacts[0]);
 		}
-		if (!$this->check_perms(Acl::EDIT,$target))
+		if (!$this->check_perms(Acl::EDIT, $target))
 		{
 			echo $this->error = 'No edit permission for the target contact!';
 			return 0;
 		}
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
 				if (!$value) continue;
 
-				switch($name)
+				switch ($name)
 				{
 					case 'id':
 					case 'tid':
 					case 'owner':
 					case 'private':
 					case 'etag';
-						break;	// ignored
+						break; // ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
-						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
+						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',', $target['cat_id']) : array();
+						$target['cat_id'] = array_unique(array_merge($target['cat_id'], is_array($value) ? $value : explode(',', $value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if ($name[0] == '#') {
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
-								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
+							if ($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
+								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',', $target[$name]) : array();
+								$target[$name] = implode(',', array_unique(array_merge($target[$name], is_array($value) ? $value : explode(',', $value))));
 							}
 						}
 						if (!$target[$name]) $target[$name] = $value;
@@ -1807,29 +1807,29 @@ 
 		if (!$this->save($target)) return 0;
 
 		$success = 1;
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			if (!$this->check_perms(Acl::DELETE,$contact))
+			if (!$this->check_perms(Acl::DELETE, $contact))
 			{
 				continue;
 			}
-			foreach(Link::get_links('addressbook',$contact['id']) as $data)
+			foreach (Link::get_links('addressbook', $contact['id']) as $data)
 			{
 				//_debug_array(array('function'=>__METHOD__,'line'=>__LINE__,'app'=>'addressbook','id'=>$contact['id'],'data:'=>$data,'target'=>$target['id']));
 				// info_from and info_link_id (main link)
-				$newlinkID = Link::link('addressbook',$target['id'],$data['app'],$data['id'],$data['remark'],$target['owner']);
+				$newlinkID = Link::link('addressbook', $target['id'], $data['app'], $data['id'], $data['remark'], $target['owner']);
 				//_debug_array(array('newLinkID'=>$newlinkID));
 				if ($newlinkID)
 				{
 					// update egw_infolog set info_link_id=$newlinkID where info_id=$data['id'] and info_link_id=$data['link_id']
-					if ($data['app']=='infolog')
+					if ($data['app'] == 'infolog')
 					{
-						$this->db->update('egw_infolog',array(
+						$this->db->update('egw_infolog', array(
 								'info_link_id' => $newlinkID
-							),array(
+							), array(
 								'info_id' => $data['id'],
 								'info_link_id' => $data['link_id']
-							),__LINE__,__FILE__,'infolog');
+							), __LINE__, __FILE__, 'infolog');
 					}
 					unset($newlinkID);
 				}
@@ -1854,14 +1854,14 @@ 
 	 * @param int $owner =null
 	 * @return boolean
 	 */
-	function check_list($list,$required,$owner=null)
+	function check_list($list, $required, $owner = null)
 	{
 		if ($list && ($list_data = $this->read_list($list)))
 		{
 			$owner = $list_data['list_owner'];
 		}
 		//error_log(__METHOD__."($list, $required, $owner) grants[$owner]=".$this->grants[$owner]." returning ".array2string(!!($this->grants[$owner] & $required)));
-		return !!($this->grants[$owner] & $required);
+		return !!($this->grants[$owner]&$required);
 	}
 
 	/**
@@ -1873,17 +1873,17 @@ 
 	 * @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())
 	{
-		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner)) return false;
+		if (!$this->check_list(null, Acl::ADD|Acl::EDIT, $owner)) return false;
 
 		try {
-			$ret = parent::add_list($keys,$owner,$contacts,$data);
+			$ret = parent::add_list($keys, $owner, $contacts, $data);
 			if ($ret) unset(self::$list_cache[$ret]);
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
-		catch(Api\Db\Exception\InvalidSql $e) {
-			unset($e);	// not used
+		catch (Api\Db\Exception\InvalidSql $e) {
+			unset($e); // not used
 			return false;
 		}
 		return $ret;
@@ -1897,13 +1897,13 @@ 
 	 * @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 (!$this->check_list($list,Acl::EDIT)) return false;
+		if (!$this->check_list($list, Acl::EDIT)) return false;
 
 		unset(self::$list_cache[$list]);
 
-		return parent::add2list($contact,$list,$existing);
+		return parent::add2list($contact, $list, $existing);
 	}
 
 	/**
@@ -1913,9 +1913,9 @@ 
 	 * @param int $list list-id
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
-		if ($list && !$this->check_list($list,Acl::EDIT)) return false;
+		if ($list && !$this->check_list($list, Acl::EDIT)) return false;
 
 		if ($list)
 		{
@@ -1926,7 +1926,7 @@ 
 			self::$list_cache = array();
 		}
 
-		return parent::remove_from_list($contact,$list);
+		return parent::remove_from_list($contact, $list);
 	}
 
 	/**
@@ -1937,9 +1937,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->check_list($list,Acl::DELETE)) return false;
+		if (!$this->check_list($list, Acl::DELETE)) return false;
 
-		foreach((array)$list as $l)
+		foreach ((array)$list as $l)
 		{
 			unset(self::$list_cache[$l]);
 		}
@@ -1975,7 +1975,7 @@ 
 	{
 		$code = Country::country_code($country);
 
-		switch($code)
+		switch ($code)
 		{
 			case 'AU':
 			case 'CA':
@@ -2039,12 +2039,12 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $contact_id=null)
+	function find_or_add_categories($catname_list, $contact_id = null)
 	{
 		if ($contact_id && $contact_id > 0 && ($old_contact = $this->read($contact_id)))
 		{
 			// preserve categories without users read access
-			$old_categories = explode(',',$old_contact['cat_id']);
+			$old_categories = explode(',', $old_contact['cat_id']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -2098,15 +2098,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Categories($this->user,'addressbook');
+			$this->categories = new Categories($this->user, 'addressbook');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(Acl::READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -2138,14 +2138,14 @@ 
 	 * @param boolean $relax =false if asked to relax, we only match against some key fields
 	 * @return array od matching contact_ids
 	 */
-	function find_contact($contact, $relax=false)
+	function find_contact($contact, $relax = false)
 	{
 		$empty_addr_one = $empty_addr_two = true;
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX': 'EXACT') . ')[ContactData]:'
+				. '('.($relax ? 'RELAX' : 'EXACT').')[ContactData]:'
 				. array2string($contact)
 				. "\n", 3, $this->logfile);
 		}
@@ -2156,7 +2156,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactID]: ' . $contact['id']
+					. '()[ContactID]: '.$contact['id']
 					. "\n", 3, $this->logfile);
 			}
 			// We only do a simple consistency check
@@ -2174,11 +2174,11 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactUID]: ' . $contact['uid']
+					. '()[ContactUID]: '.$contact['uid']
 					. "\n", 3, $this->logfile);
 			}
 			// Try the given UID first
-			$criteria = array ('contact_uid' => $contact['uid']);
+			$criteria = array('contact_uid' => $contact['uid']);
 			if (($foundContacts = parent::search($criteria)))
 			{
 				foreach ($foundContacts as $egwContact)
@@ -2261,7 +2261,7 @@ 
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 				. '()[Addressbook FIND Step 1]: '
-				. 'CRITERIA = ' . array2string($criteria)
+				. 'CRITERIA = '.array2string($criteria)
 				. "\n", 3, $this->logfile);
 		}
 
@@ -2290,7 +2290,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 2]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 
@@ -2314,7 +2314,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[Addressbook FIND Step 3]: '
-						. 'CRITERIA = ' . array2string($criteria)
+						. 'CRITERIA = '.array2string($criteria)
 						. "\n", 3, $this->logfile);
 				}
 
@@ -2340,7 +2340,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 4]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 			if (($foundContacts = parent::search($criteria, true, '', '', '', true)))
@@ -2354,7 +2354,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]: ' . array2string($matchingContacts)
+				. '()[FOUND]: '.array2string($matchingContacts)
 				. "\n", 3, $this->logfile);
 		}
 		return $matchingContacts;
@@ -2371,9 +2371,9 @@ 
 	 * @param int|array $owner =null 0=accounts, null=all addressbooks or integer account_id of user or group
 	 * @return string
 	 */
-	public function get_ctag($owner=null)
+	public function get_ctag($owner = null)
 	{
-		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
+		$filter = array('tid' => null); // tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
 		if (!is_null($owner)) $filter['owner'] = $owner;
 
@@ -2382,11 +2382,11 @@ 
 		{
 			$filter['account_id'] = null;
 		}
-		$result = $this->search(array(),'contact_modified','contact_modified DESC','','',false,'AND',array(0,1),$filter);
+		$result = $this->search(array(), 'contact_modified', 'contact_modified DESC', '', '', false, 'AND', array(0, 1), $filter);
 
 		if (!$result || !isset($result[0]['modified']))
 		{
-			$ctag = 'empty';	// ctag for empty addressbook
+			$ctag = 'empty'; // ctag for empty addressbook
 		}
 		else
 		{

Braces +259 added lines, -68 removed lines

@@ -290,7 +290,10 @@ 
 		);
 		//_debug_array($this->contact_fields);
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
-		if (!is_array($this->own_account_acl)) $this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
+		if (!is_array($this->own_account_acl))
+		{
+			$this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
+		}
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
 		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
 		{
@@ -299,7 +302,10 @@ 
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
 			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
-			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
+			if (!is_array($this->org_fields))
+			{
+				$this->org_fields = unserialize($this->org_fields);
+			}
 
 			// Set country code if country name is selected
 			$supported_fields = $this->get_fields('supported',null,0);
@@ -356,7 +362,10 @@ 
 		}
 
 		$addressbooks = $to_sort = array();
-		if ($extra_label) $addressbooks[''] = $extra_label;
+		if ($extra_label)
+		{
+			$addressbooks[''] = $extra_label;
+		}
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
 		foreach($grants as $uid => $rights)
@@ -410,10 +419,19 @@ 
 	 */
 	function fileas($contact,$type=null, $isUpdate=false)
 	{
-		if (is_null($type)) $type = $contact['fileas_type'];
-		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		if (is_null($type))
+		{
+			$type = $contact['fileas_type'];
+		}
+		if (!$type)
+		{
+			$type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		}
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type,'n_fn') !== false)
+		{
+			$contact['n_fn'] = $this->fullname($contact);
+		}
 
 		if($isUpdate)
 		{
@@ -423,7 +441,10 @@ 
 			{
 				if(!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if(is_null($old))
+					{
+						$old = $this->read($contact['id']);
+					}
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -466,7 +487,10 @@ 
 	 */
 	function fileas_type($contact,$file_as=null)
 	{
-		if (is_null($file_as)) $file_as = $contact['n_fileas'];
+		if (is_null($file_as))
+		{
+			$file_as = $contact['n_fileas'];
+		}
 
 		if ($file_as)
 		{
@@ -519,7 +543,10 @@ 
 		);
 		foreach(array_keys($labels) as $name)
 		{
-			if ($contact[$name]) $labels[$name] = $contact[$name];
+			if ($contact[$name])
+			{
+				$labels[$name] = $contact[$name];
+			}
 		}
 		foreach($this->fileas_types as $fileas_type)
 		{
@@ -632,7 +659,11 @@ 
 				$fields_to_update = array();
 				foreach($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if($fields_exclude[$field_name] === true)
+					{
+						continue;
+					}
+					// dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -691,15 +722,21 @@ 
 	 */
 	function fullname($contact)
 	{
-		if (empty($contact['n_family']) && empty($contact['n_given'])) {
+		if (empty($contact['n_family']) && empty($contact['n_given']))
+		{
 			$cpart = array('org_name');
-		} else {
+		}
+		else
+		{
 			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
 		}
 		$parts = array();
 		foreach($cpart as $n)
 		{
-			if ($contact[$n]) $parts[] = $contact[$n];
+			if ($contact[$n])
+			{
+				$parts[] = $contact[$n];
+			}
 		}
 		return implode(' ',$parts);
 	}
@@ -810,7 +847,10 @@ 
 			$ok = false;
 			if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
 			{
-				if (!($old = $this->read($id))) return false;
+				if (!($old = $this->read($id)))
+				{
+					return false;
+				}
 				// check if we only mark contacts as deleted, or really delete them
 				// already marked as deleted item and accounts are always really deleted
 				// we cant mark accounts as deleted, as no such thing exists for accounts!
@@ -818,8 +858,15 @@ 
 				{
 					$delete = $old;
 					$delete['tid'] = self::DELETED_TYPE;
-					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
+					if ($check_etag)
+					{
+						$delete['etag'] = $check_etag;
+					}
+					if (($ok = $this->save($delete)))
+					{
+						$ok = true;
+					}
+					// we have to return true or false
 					Link::unlink(0,'addressbook',$id,'','','',true);
 				}
 				elseif (($ok = parent::delete($id,$check_etag)))
@@ -830,7 +877,10 @@ 
 				// Don't notify of final purge
 				if ($ok && $old['tid'] != self::DELETED_TYPE)
 				{
-					if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
+					if (!isset($this->tracking))
+					{
+						$this->tracking = new Contacts\Tracking($this);
+					}
 					$this->tracking->track(array('id' => $id), array('id' => $id), null, true);
 				}
 			}
@@ -855,13 +905,16 @@ 
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
 		{
-			if (!isset($contact['owner']) || !isset($contact['private']))	// owner/private not set on update, eg. SyncML
+			if (!isset($contact['owner']) || !isset($contact['private']))
+			{
+				// owner/private not set on update, eg. SyncML
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
 					if(!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
+			}
 					}
 					if(!isset($contact['private']))
 					{
@@ -877,18 +930,33 @@ 
 		else
 		{
 			// if no owner/addressbook set use the setting of the add_default prefs (if set, otherwise the users personal addressbook)
-			if (!isset($contact['owner'])) $contact['owner'] = $this->default_addressbook;
-			if (!isset($contact['private'])) $contact['private'] = (int)$this->default_private;
+			if (!isset($contact['owner']))
+			{
+				$contact['owner'] = $this->default_addressbook;
+			}
+			if (!isset($contact['private']))
+			{
+				$contact['private'] = (int)$this->default_private;
+			}
 			// do NOT allow to create new accounts via addressbook, they are broken without an account_id
 			if (!$contact['owner'] && empty($contact['account_id']))
 			{
 				$contact['owner'] = $this->default_addressbook ? $this->default_addressbook : $this->user;
 			}
 			// allow admins to import contacts with creator / created date set
-			if (!$contact['creator'] || !$this->is_admin($contact)) $contact['creator'] = $this->user;
-			if (!$contact['created'] || !$this->is_admin($contact)) $contact['created'] = $this->now_su;
+			if (!$contact['creator'] || !$this->is_admin($contact))
+			{
+				$contact['creator'] = $this->user;
+			}
+			if (!$contact['created'] || !$this->is_admin($contact))
+			{
+				$contact['created'] = $this->now_su;
+			}
 
-			if (!$contact['tid']) $contact['tid'] = 'n';
+			if (!$contact['tid'])
+			{
+				$contact['tid'] = 'n';
+			}
 		}
 		// ensure accounts and group addressbooks are never private!
 		if ($contact['owner'] <= 0)
@@ -912,7 +980,8 @@ 
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
+		foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+		{
 			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = Country::country_code($contact[$c_prefix.'countryname']))
 			{
@@ -939,7 +1008,10 @@ 
 		{
 			$contact['n_fn'] = $this->fullname($contact);
 		}
-		if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact, null, false);
+		if (isset($contact['org_name']))
+		{
+			$contact['n_fileas'] = $this->fileas($contact, null, false);
+		}
 
 		// Get old record for tracking changes
 		if (!isset($old) && $isUpdate)
@@ -1015,7 +1087,10 @@ 
 			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
-				if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
+				if (!isset($this->tracking))
+				{
+					$this->tracking = new Contacts\Tracking($this);
+				}
 				$this->tracking->track($to_write, $old ? $old : null, null, $deleted);
 			}
 		}
@@ -1097,10 +1172,12 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if($data['adr_one_countrycode'] != null)
+			{
 				$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if($data['adr_two_countrycode'] != null)
+			{
 				$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1126,7 +1203,10 @@ 
 	 */
 	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1196,8 +1276,14 @@ 
 	 */
 	function read_org($org_id)
 	{
-		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (!$org_id)
+		{
+			return false;
+		}
+		if (strpos($org_id,'*AND*')!== false)
+		{
+			$org_id = str_replace('*AND*','&',$org_id);
+		}
 		$org = array();
 		foreach(explode('|||',$org_id) as $part)
 		{
@@ -1227,7 +1313,10 @@ 
 		}
 		// read the regular fields
 		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
-		if (!$contacts) return false;
+		if (!$contacts)
+		{
+			return false;
+		}
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
@@ -1275,7 +1364,10 @@ 
 		}
 		foreach($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name,$this->org_fields))
+			{
+				continue;
+			}
 
 			arsort($values,SORT_NUMERIC);
 			list($value,$num) = each($values);
@@ -1345,16 +1437,25 @@ 
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
 		{
-			if (!empty($from[$code])) $from[$name] = '';
-			if (!empty($to[$code])) $to[$name] = '';
+			if (!empty($from[$code]))
+			{
+				$from[$name] = '';
+			}
+			if (!empty($to[$code]))
+			{
+				$to[$name] = '';
+			}
 		}
 		$changed = array();
 		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name,array('modified','modifier')))
+			{
+				// never count these
 			{
 				continue;
 			}
+			}
 			if ((string) $from[$name] != (string) $to[$name])
 			{
 				$changed[$name] = $from[$name];
@@ -1374,13 +1475,19 @@ 
 	 */
 	function change_org($org_name,$from,$to,$members=null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from,$to,true)))
+		{
+			return false;
+		}
 
 		if (is_null($members) || !is_array($members))
 		{
 			$members = $this->org_similar($org_name,$changed);
 		}
-		if (!$members) return false;
+		if (!$members)
+		{
+			return false;
+		}
 
 		$ids = array();
 		foreach($members as $member)
@@ -1445,7 +1552,10 @@ 
 		$type = $this->prefs['link_title'];
 		if (!$type || $type === 'n_fileas')
 		{
-			if ($contact['n_fileas']) return $contact['n_fileas'];
+			if ($contact['n_fileas'])
+			{
+				return $contact['n_fileas'];
+			}
 			$type = null;
 		}
 		$title =  $this->fileas($contact,$type);
@@ -1513,7 +1623,10 @@ 
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
-		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
+		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+		{
+			$filter['account_id'] = null;
+		}
 		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
 		{
 			$ids = array();
@@ -1576,12 +1689,18 @@ 
 	 */
 	function calendar_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach(!is_array($ids) ? array($ids) : $ids as $id)
 		{
-			if (!($contact = $this->read($id))) continue;
+			if (!($contact = $this->read($id)))
+			{
+				continue;
+			}
 
 			$data[] = array(
 				'res_id' => $id,
@@ -1603,21 +1722,33 @@ 
 	 */
 	function read_calendar($ids,$extra_title=true)
 	{
-		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
+		if (!$GLOBALS['egw_info']['user']['apps']['calendar'])
+		{
+			return array();
+		}
 
 		$uids = array();
 		foreach($ids as $id)
 		{
-			if (is_numeric($id)) $uids[] = 'c'.$id;
+			if (is_numeric($id))
+			{
+				$uids[] = 'c'.$id;
+			}
+		}
+		if (!$uids)
+		{
+			return array();
 		}
-		if (!$uids) return array();
 
 		$bocal = new calendar_bo();
 		$events = $bocal->search(array(
 			'users' => $uids,
 			'enum_recuring' => true,
 		));
-		if (!$events) return array();
+		if (!$events)
+		{
+			return array();
+		}
 
 		//_debug_array($events);
 		$calendars = array();
@@ -1631,11 +1762,14 @@ 
 				}
 				$id = (int)substr($uid,1);
 
-				if ($event['start'] < $this->now_su)	// past event --> check for last event
+				if ($event['start'] < $this->now_su)
+				{
+					// past event --> check for last event
 				{
 					if (!isset($calendars[$id]['last_event']) || $event['start'] > $calendars[$id]['last_event'])
 					{
 						$calendars[$id]['last_event'] = $event['start'];
+				}
 						$link = array(
 							'id' => $event['id'],
 							'app' => 'calendar',
@@ -1737,27 +1871,36 @@ 
 		$account = null;
 		$custom_fields = Storage\Customfields::get('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach(parent::search(array('id'=>$ids),false) as $contact)
+		{
+			// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
+		}
 					return false;	// we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
 			}
 			// Add in custom fields
-			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			if (is_array($custom_field_list[$contact['id']]))
+			{
+				$contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			}
 
 			$pos = array_search($contact['id'],$ids);
 			$contacts[$pos] = $contact;
 		}
-		if (!is_null($account))	// we found an account, so we merge the contacts into it
+		if (!is_null($account))
+		{
+			// we found an account, so we merge the contacts into it
 		{
 			$target = $account;
+		}
 			unset($account);
 		}
 		else					// we found no account, so we merge all but the first into the first
@@ -1774,7 +1917,10 @@ 
 		{
 			foreach($contact as $name => $value)
 			{
-				if (!$value) continue;
+				if (!$value)
+				{
+					continue;
+				}
 
 				switch($name)
 				{
@@ -1786,25 +1932,39 @@ 
 						break;	// ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						if (!is_array($target['cat_id']))
+						{
+							$target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						}
 						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if($name[0] == '#')
+						{
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1)
+							{
+								if (!is_array($target[$name]))
+								{
+									$target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+								}
 								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
 							}
 						}
-						if (!$target[$name]) $target[$name] = $value;
+						if (!$target[$name])
+						{
+							$target[$name] = $value;
+						}
 						break;
 				}
 			}
 		}
-		if (!$this->save($target)) return 0;
+		if (!$this->save($target))
+		{
+			return 0;
+		}
 
 		$success = 1;
 		foreach($contacts as $contact)
@@ -1834,7 +1994,10 @@ 
 					unset($newlinkID);
 				}
 			}
-			if ($this->delete($contact['id'])) $success++;
+			if ($this->delete($contact['id']))
+			{
+				$success++;
+			}
 		}
 		return $success;
 	}
@@ -1875,11 +2038,17 @@ 
 	 */
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
-		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner)) return false;
+		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner))
+		{
+			return false;
+		}
 
 		try {
 			$ret = parent::add_list($keys,$owner,$contacts,$data);
-			if ($ret) unset(self::$list_cache[$ret]);
+			if ($ret)
+			{
+				unset(self::$list_cache[$ret]);
+			}
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
 		catch(Api\Db\Exception\InvalidSql $e) {
@@ -1899,7 +2068,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!$this->check_list($list,Acl::EDIT)) return false;
+		if (!$this->check_list($list,Acl::EDIT))
+		{
+			return false;
+		}
 
 		unset(self::$list_cache[$list]);
 
@@ -1915,7 +2087,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if ($list && !$this->check_list($list,Acl::EDIT)) return false;
+		if ($list && !$this->check_list($list,Acl::EDIT))
+		{
+			return false;
+		}
 
 		if ($list)
 		{
@@ -1937,7 +2112,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->check_list($list,Acl::DELETE)) return false;
+		if (!$this->check_list($list,Acl::DELETE))
+		{
+			return false;
+		}
 
 		foreach((array)$list as $l)
 		{
@@ -1955,7 +2133,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (isset(self::$list_cache[$list])) return self::$list_cache[$list];
+		if (isset(self::$list_cache[$list]))
+		{
+			return self::$list_cache[$list];
+		}
 
 		return self::$list_cache[$list] = parent::read_list($list);
 	}
@@ -2210,7 +2391,10 @@ 
 
 		foreach ($columns_to_search as $field)
 		{
-			if ($relax && in_array($field, $tolerance_fields)) continue;
+			if ($relax && in_array($field, $tolerance_fields))
+			{
+				continue;
+			}
 
 			if (empty($contact[$field]))
 			{
@@ -2275,7 +2459,10 @@ 
 		}
 
 		// No need for more searches for relaxed matching
-		if ($relax || count($matchingContacts)) return $matchingContacts;
+		if ($relax || count($matchingContacts))
+		{
+			return $matchingContacts;
+		}
 
 
 		if (!$empty_addr_one && $empty_addr_two)
@@ -2328,7 +2515,8 @@ 
 			}
 		}
 		elseif (!$empty_addr_one && !$empty_addr_two)
-		{ // try again after address swap
+		{
+// try again after address swap
 
 			foreach ($addr_one_fields as $key => $field)
 			{
@@ -2375,7 +2563,10 @@ 
 	{
 		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
-		if (!is_null($owner)) $filter['owner'] = $owner;
+		if (!is_null($owner))
+		{
+			$filter['owner'] = $owner;
+		}
 
 		// should we hide the accounts addressbook
 		if (!$owner && $GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])

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

@@ -1500,7 +1500,7 @@ 
 	 * @param array $options Array of options for the search
 	 * @return array with id - title pairs of the matching entries
 	 */
-	function link_query($pattern, Array &$options = array())
+	function link_query($pattern, array &$options = array())
 	{
 		$result = $criteria = array();
 		$limit = false;
@@ -1553,7 +1553,7 @@ 
 	 * @param array $options
 	 * @return Ambigous <multitype:, string, multitype:Ambigous <multitype:, string> string >
 	 */
-	function link_query_email($pattern, Array &$options = array())
+	function link_query_email($pattern, array &$options = array())
 	{
 		if (isset($options['filter']) && !is_array($options['filter']))
 		{

api/src/Contacts/Ads.php

Doc Comments -1 removed lines

@@ -213,7 +213,6 @@
 	/**
 	 * Remove attributes we are not allowed to update
 	 *
-	 * @param array $attributes
 	 */
 	function sanitize_update(array &$ldapContact)
 	{

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,15 +174,14 @@ 
 	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));
 			$_contact_id = $GLOBALS['egw']->accounts->id2name($account_id, 'person_id');
 		}
-		$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;
 	}

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * while it uses select-account for owner in historylog (containing all users).
 	 *
 	 * @param string $cname
-	*/
+	 */
 	public function beforeSendToClient($cname)
 	{
 		$form_name = self::form_name($cname, $this->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');
 	}

api/src/Contacts/Ldap.php

Doc Comments +3 added lines, -4 removed lines

@@ -425,7 +425,6 @@ 
 	/**
 	 * Remove attributes we are not allowed to update
 	 *
-	 * @param array $attributes
 	 */
 	function sanitize_update(array &$ldapContact)
 	{
@@ -703,14 +702,14 @@ 
 	 *
 	 * '*' and '?' are replaced with sql-wildcards '%' and '_'
 	 *
-	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
+	 * @param boolean $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
 	 * @param boolean|string $only_keys =true True returns only keys, False returns all cols. comma seperated list of keys to return
 	 * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard ='' appended befor and after each criteria
 	 * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
-	 * @param mixed $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
+	 * @param boolean $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
 	 * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!

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']) ||

Spacing +183 added lines, -185 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_location','adr_two_location','note',
-		'email','mozillasecondemail','uidnumber',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_location', 'adr_two_location', '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));
@@ -391,7 +391,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);
 		}
@@ -407,9 +407,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
 		{
@@ -432,7 +432,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']);
 	}
@@ -443,28 +443,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'] ||
@@ -472,7 +472,7 @@ 
 		{
 			// account
 			$baseDN = $this->accountContactsDN;
-			$cn	= false;
+			$cn = false;
 			// we need an admin connection
 			$this->connect(true);
 
@@ -485,7 +485,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)))
@@ -494,55 +494,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();
 				}
@@ -550,9 +549,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)
@@ -570,11 +569,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;
@@ -583,15 +582,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=*');
@@ -602,20 +601,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__);
@@ -644,22 +643,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
 	}
 
 	/**
@@ -668,28 +667,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++;
 				}
@@ -717,10 +716,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']))
 		{
@@ -742,7 +741,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))
@@ -758,11 +757,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)
 			{
@@ -786,7 +785,7 @@ 
 			$addressbookType = self::ACCOUNTS;
 		}
 		// create the search filter
-		switch($addressbookType)
+		switch ($addressbookType)
 		{
 			case self::ACCOUNTS:
 				$objectFilter = $this->accountsFilter;
@@ -801,28 +800,28 @@ 
 		// 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')))
 				{
 					$searchFilter .= $this->ids_filter($searchValue);
 					continue;
 				}
-				foreach($this->schema2egw as $mapping)
+				foreach ($this->schema2egw as $mapping)
 				{
-					if(($ldapSearchKey = $mapping[$egwSearchKey]))
+					if (($ldapSearchKey = $mapping[$egwSearchKey]))
 					{
-						$searchString = Api\Translation::convert($searchValue,$this->charset,'utf-8');
+						$searchString = Api\Translation::convert($searchValue, $this->charset, 'utf-8');
 						$searchFilter .= '('.$ldapSearchKey.'='.$wildcard.Api\Ldap::quote($searchString).$wildcard.')';
 						break;
 					}
 				}
 			}
-			if($op == 'AND')
+			if ($op == 'AND')
 			{
 				$searchFilter = "(&$searchFilter)";
 			}
@@ -841,9 +840,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;
@@ -854,36 +853,36 @@ 
 		{
 			$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)
 				{
 					$order[] = $o;
 				}
 			}
-			$rows = ExecMethod2('phpgwapi.arrayfunctions.arfsort',$rows,$order,$sort);
+			$rows = ExecMethod2('phpgwapi.arrayfunctions.arfsort', $rows, $order, $sort);
 		}
 		// 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']);
 		}
@@ -901,11 +900,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
@@ -928,7 +927,7 @@ 
 					{
 						$filters .= '(!(category=*))';
 					}
-					elseif((int)$value)
+					elseif ((int)$value)
 					{
 						if (!is_object($GLOBALS['egw']->categories))
 						{
@@ -936,10 +935,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 .= ')';
@@ -948,7 +947,7 @@ 
 
 				case 'carddav_name':
 					if (!is_array($value)) $value = array($value);
-					foreach($value as &$v)
+					foreach ($value as &$v)
 					{
 						$v = basename($v, '.vcf');
 					}
@@ -962,28 +961,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;
 							}
 						}
@@ -1007,7 +1005,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;
 
@@ -1020,7 +1018,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);
 		}
@@ -1028,36 +1026,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;
@@ -1067,20 +1065,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
@@ -1089,12 +1087,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]);
 				}
@@ -1113,8 +1111,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));
 	}
 
 	/**
@@ -1137,22 +1135,22 @@ 
 	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
 		}
 		// create a admin connection to add the needed DN
 		$adminLDAP = new ldap;
 		$adminDS = $adminLDAP->ldapConnect();
 
-		list(,$ou) = explode(',',$baseDN);
-		foreach(array(
+		list(,$ou) = explode(',', $baseDN);
+		foreach (array(
 			'ou=contacts,'.$this->allContactsDN,
 			$ou.',ou=contacts,'.$this->allContactsDN,
 			$baseDN,
@@ -1161,16 +1159,16 @@ 
 			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,
 				);
-				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);
 					$adminLDAP->ldapDisconnect();
 					return $err;
 				}
@@ -1187,7 +1185,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;
 	}
@@ -1202,27 +1200,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();
 			}
@@ -1232,7 +1230,7 @@ 
 		{
 			$ldapContact['primaryphone'] = $data[$data['tel_prefer']];
 		}
-		elseif($isUpdate)
+		elseif ($isUpdate)
 		{
 			$ldapContact['primaryphone'] = array();
 		}
@@ -1247,23 +1245,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);
 		}
 	}
 
@@ -1276,10 +1274,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]);
@@ -1287,8 +1285,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));
@@ -1309,11 +1307,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)
@@ -1331,11 +1329,11 @@ 
 	 * @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'])
 		{
-			$contact['adr_one_countryname'] = ExecMethod('phpgwapi.country.get_full_name',$data['c'][0]);
+			$contact['adr_one_countryname'] = ExecMethod('phpgwapi.country.get_full_name', $data['c'][0]);
 		}
 	}
 
@@ -1349,7 +1347,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'])
 		{
@@ -1357,7 +1355,7 @@ 
 		}
 		elseif ($data['adr_one_countryname'])
 		{
-			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']);
+			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code', $data['adr_one_countryname']);
 			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
 			{
 				$ldapContact['c'] = array(); // should return error...
@@ -1378,9 +1376,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
 	}
 
@@ -1394,7 +1392,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'])
 		{
@@ -1403,7 +1401,7 @@ 
 		}
 		elseif ($data['adr_one_countryname'])
 		{
-			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']);
+			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code', $data['adr_one_countryname']);
 			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
 			{
 				$ldapContact['c'] = array(); // should return error...
@@ -1422,7 +1420,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");
 	}

Braces +89 added lines, -23 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';
@@ -898,12 +919,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)
 			{
@@ -935,19 +962,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');
@@ -977,7 +1013,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]))
@@ -1028,13 +1067,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],
@@ -1254,11 +1300,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'])
 		{
@@ -1313,7 +1365,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)
@@ -1358,9 +1413,13 @@ 
 		elseif ($data['adr_one_countryname'])
 		{
 			$ldapContact['c'] = ExecMethod('phpgwapi.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)
@@ -1399,14 +1458,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'] = ExecMethod('phpgwapi.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)