EGroupware / egroupware

api/src/Contacts/Ldap.php

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_locality','adr_two_locality','note',
-		'email','mozillasecondemail','uidnumber',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_locality', 'adr_two_locality', 'note',
+		'email', 'mozillasecondemail', 'uidnumber',
 	);
 
 	/**
@@ -171,8 +171,8 @@ 
 		#postOfficeBox
 		'mozillaabpersonalpha' => array(
 			'adr_one_street2'	=> 'mozillaworkstreet2',
-			'adr_one_countryname'	=> 'c',	// 2 letter country code
-			'adr_one_countrycode'	=> 'c',	// 2 letter country code
+			'adr_one_countryname'	=> 'c', // 2 letter country code
+			'adr_one_countrycode'	=> 'c', // 2 letter country code
 			'adr_two_street'	=> 'mozillahomestreet',
 			'adr_two_street2'	=> 'mozillahomestreet2',
 			'adr_two_locality'	=> 'mozillahomelocalityname',
@@ -186,8 +186,8 @@ 
 		// similar to the newer mozillaAbPerson, but uses mozillaPostalAddress2 instead of mozillaStreet2
 		'mozillaorgperson' => array(
 			'adr_one_street2'	=> 'mozillapostaladdress2',
-			'adr_one_countrycode'	=> 'c',	// 2 letter country code
-			'adr_one_countryname'	=> 'co',	// human readable country name, must be after 'c' to take precedence on read!
+			'adr_one_countrycode'	=> 'c', // 2 letter country code
+			'adr_one_countryname'	=> 'co', // human readable country name, must be after 'c' to take precedence on read!
 			'adr_two_street'	=> 'mozillahomestreet',
 			'adr_two_street2'	=> 'mozillahomepostaladdress2',
 			'adr_two_locality'	=> 'mozillahomelocalityname',
@@ -213,7 +213,7 @@ 
 			'note'			=> 'note',
 			'tel_car'		=> 'carphone',
 			'tel_prefer'	=> 'primaryphone',
-			'cat_id'		=> 'category',	// special handling in _egw2evolutionperson method
+			'cat_id'		=> 'category', // special handling in _egw2evolutionperson method
 			'role'			=> 'businessrole',
 			'tel_assistent'	=> 'assistantphone',
 			'assistent'		=> 'assistantname',
@@ -222,7 +222,7 @@ 
 			'freebusy_uri'	=> 'freeBusyuri',
 			'calendar_uri'	=> 'calendaruri',
 			'tel_other'		=> 'otherphone',
-			'tel_cell_private' => 'callbackphone',	// not the best choice, but better then nothing
+			'tel_cell_private' => 'callbackphone', // not the best choice, but better then nothing
 		),
 		// additional schema can be added here, including special functions
 
@@ -270,10 +270,10 @@ 
 	 * @param array $ldap_config =null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds =null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	function __construct(array $ldap_config = null, $ds = null)
 	{
 		//$this->db_data_cols 	= $this->stock_contact_fields + $this->non_contact_fields;
-		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -281,12 +281,12 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 		$this->accountContactsDN	= $this->ldap_config['ldap_context'];
-		$this->allContactsDN		= $this->ldap_config['ldap_contact_context'];
-		$this->personalContactsDN	= 'ou=personal,ou=contacts,'. $this->allContactsDN;
-		$this->sharedContactsDN		= 'ou=shared,ou=contacts,'. $this->allContactsDN;
+		$this->allContactsDN = $this->ldap_config['ldap_contact_context'];
+		$this->personalContactsDN = 'ou=personal,ou=contacts,'.$this->allContactsDN;
+		$this->sharedContactsDN		= 'ou=shared,ou=contacts,'.$this->allContactsDN;
 
 		if ($ds)
 		{
@@ -298,9 +298,9 @@ 
 		}
 		$this->ldapServerInfo = $GLOBALS['egw']->ldap->getLDAPServerInfo($this->ldap_config['ldap_contact_host']);
 
-		foreach($this->schema2egw as $attributes)
+		foreach ($this->schema2egw as $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -327,7 +327,7 @@ 
 			$this->ds = Api\Ldap::factory();
 		}
 		// if ldap is NOT the contact repository, we only do accounts and need to use the account-data
-		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'],-4) != 'ldap')	// not (ldap or sql-ldap)
+		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'], -4) != 'ldap')	// not (ldap or sql-ldap)
 		{
 			$this->ldap_config['ldap_contact_host'] = $this->ldap_config['ldap_host'];
 			$this->allContactsDN = $this->ldap_config['ldap_context'];
@@ -351,17 +351,17 @@ 
 	function supported_fields()
 	{
 		$fields = array(
-			'id','tid','owner',
-			'n_middle','n_prefix','n_suffix',	// stored in the cn
-			'created','modified',				// automatic timestamps
-			'creator','modifier',				// automatic for non accounts
-			'private',							// true for personal addressbooks, false otherwise
+			'id', 'tid', 'owner',
+			'n_middle', 'n_prefix', 'n_suffix', // stored in the cn
+			'created', 'modified', // automatic timestamps
+			'creator', 'modifier', // automatic for non accounts
+			'private', // true for personal addressbooks, false otherwise
 		);
-		foreach($this->schema2egw as $objectclass => $mapping)
+		foreach ($this->schema2egw as $objectclass => $mapping)
 		{
-			if($this->ldapServerInfo->supportsObjectClass($objectclass))
+			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
-				$fields = array_merge($fields,array_keys($mapping));
+				$fields = array_merge($fields, array_keys($mapping));
 			}
 		}
 		return array_values(array_unique($fields));
@@ -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,18 +853,18 @@ 
 		{
 			$order = array();
 			$sort = 'ASC';
-			foreach(explode(',',$order_by) as $o)
+			foreach (explode(',', $order_by) as $o)
 			{
-				if (substr($o,0,8) == 'contact_') $o = substr($o,8);
-				if (substr($o,-4) == ' ASC')
+				if (substr($o, 0, 8) == 'contact_') $o = substr($o, 8);
+				if (substr($o, -4) == ' ASC')
 				{
 					$sort = 'ASC';
-					$order[] = substr($o,0,-4);
+					$order[] = substr($o, 0, -4);
 				}
-				elseif (substr($o,-5) == ' DESC')
+				elseif (substr($o, -5) == ' DESC')
 				{
 					$sort = 'DESC';
-					$order[] = substr($o,0,-5);
+					$order[] = substr($o, 0, -5);
 				}
 				elseif ($o)
 				{
@@ -874,9 +873,9 @@ 
 			}
 			usort($rows, function($a, $b) use ($order, $sort)
 			{
-				foreach($order as $f)
+				foreach ($order as $f)
 				{
-					if($sort == 'ASC')
+					if ($sort == 'ASC')
 					{
 						$strc = strcmp($a[$f], $b[$f]);
 					}
@@ -892,13 +891,13 @@ 
 		// if requested ($start !== false) return only limited resultset
 		if (is_array($start))
 		{
-			list($start,$offset) = $start;
+			list($start, $offset) = $start;
 		}
-		if(is_numeric($start) && is_numeric($offset) && $offset >= 0)
+		if (is_numeric($start) && is_numeric($offset) && $offset >= 0)
 		{
 			return array_slice($rows, $start, $offset);
 		}
-		elseif(is_numeric($start))
+		elseif (is_numeric($start))
 		{
 			return array_slice($rows, $start, $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']);
 		}
@@ -916,11 +915,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
@@ -934,7 +933,7 @@ 
 					elseif ($value)
 					{
 						if (is_array($value)) $filters .= '(|';
-						foreach((array)$value as $value)
+						foreach ((array)$value as $value)
 						{
 							$filters .= '(uidNumber='.(int)$value.')';
 						}
@@ -947,7 +946,7 @@ 
 					{
 						$filters .= '(!(category=*))';
 					}
-					elseif((int)$value)
+					elseif ((int)$value)
 					{
 						if (!is_object($GLOBALS['egw']->categories))
 						{
@@ -955,10 +954,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 .= ')';
@@ -967,7 +966,7 @@ 
 
 				case 'carddav_name':
 					if (!is_array($value)) $value = array($value);
-					foreach($value as &$v)
+					foreach ($value as &$v)
 					{
 						$v = basename($v, '.vcf');
 					}
@@ -985,28 +984,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;
 							}
 						}
@@ -1030,7 +1028,7 @@ 
 		{
 			$filter .= '(|';
 			// unfortunately we have no group-membership attribute in LDAP, like in AD
-			foreach($GLOBALS['egw']->accounts->members($gid, true) as $account_id)
+			foreach ($GLOBALS['egw']->accounts->members($gid, true) as $account_id)
 			{
 				$filter .= '(uidNumber='.(int)$account_id.')';
 			}
@@ -1052,7 +1050,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;
 
@@ -1065,7 +1063,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);
 		}
@@ -1073,36 +1071,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;
@@ -1112,20 +1110,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
@@ -1134,12 +1132,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]);
 				}
@@ -1158,8 +1156,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));
 	}
 
 	/**
@@ -1182,22 +1180,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,
@@ -1206,16 +1204,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;
 				}
@@ -1232,7 +1230,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;
 	}
@@ -1247,27 +1245,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();
 			}
@@ -1277,7 +1275,7 @@ 
 		{
 			$ldapContact['primaryphone'] = $data[$data['tel_prefer']];
 		}
-		elseif($isUpdate)
+		elseif ($isUpdate)
 		{
 			$ldapContact['primaryphone'] = array();
 		}
@@ -1292,23 +1290,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);
 		}
 	}
 
@@ -1321,10 +1319,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]);
@@ -1332,8 +1330,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));
@@ -1354,11 +1352,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)
@@ -1376,7 +1374,7 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _mozillaabpersonalpha2egw(&$contact,$data)
+	function _mozillaabpersonalpha2egw(&$contact, $data)
 	{
 		if ($data['c'])
 		{
@@ -1394,7 +1392,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'])
 		{
@@ -1423,9 +1421,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
 	}
 
@@ -1439,7 +1437,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'])
 		{
@@ -1467,7 +1465,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 +101 added lines, -26 removed lines

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