EGroupware / egroupware

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

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)

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,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");
 	}

api/src/Contacts/Sql.php

Doc Comments +2 added lines, -2 removed lines

@@ -250,7 +250,7 @@ 
 	 * For a union-query you call search for each query with $start=='UNION' and one more with only $order_by and $start set to run the union-query.
 	 *
 	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
-	 * @param boolean|string|array $only_keys =true True returns only keys, False returns all cols. or
+	 * @param boolean|string $only_keys =true True returns only keys, False returns all cols. or
 	 *	comma seperated list or array of columns 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"
@@ -508,7 +508,7 @@ 
 	 * 	or whole where array: column-name => value(s) pairs
 	 * @param string $uid_column ='list_owner' column-name or null to use $uids as where array
 	 * @param string $member_attr =null null: no members, 'contact_uid', 'contact_id', 'caldav_name' return members as that attribute
-	 * @param boolean|int|array $limit_in_ab =false if true only return members from the same owners addressbook,
+	 * @param boolean $limit_in_ab =false if true only return members from the same owners addressbook,
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */

Indentation +3 added lines, -3 removed lines

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

Braces +127 added lines, -33 removed lines

@@ -111,11 +111,20 @@ 
 	{
 		$filter = is_array($param['col_filter']) ? $param['col_filter'] : array();
 		$op = 'OR';
-		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
+		if (isset($param['op']) && !empty($param['op']))
+		{
+			$op = $param['op'];
+		}
 		$advanced_search = false;
-		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
+		if (isset($param['advanced_search']) && !empty($param['advanced_search']))
+		{
+			$advanced_search = true;
+		}
 		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard'])))
+		{
+			$wildcard = ($param['wildcard']?$param['wildcard']:'');
+		}
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ((int)$filter['cat_id'])
@@ -133,7 +142,11 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int) $filter['owner']])
+				{
+					return false;
+				}
+				// we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -196,7 +209,10 @@ 
 		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
 			array($param['start'],$param['num_rows']),$filter);
 
-		if (!$rows) return false;
+		if (!$rows)
+		{
+			return false;
+		}
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
@@ -266,7 +282,10 @@ 
 	 */
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		}
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -314,7 +333,10 @@ 
 				// no grants for selected owner/addressbook
 				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants))))
 				{
-					if (!isset($groupmember_sql)) return false;
+					if (!isset($groupmember_sql))
+					{
+						return false;
+					}
 					$filter[] = substr($groupmember_sql,4);
 					unset($filter['owner']);
 				}
@@ -354,13 +376,16 @@ 
 			$join .= self::ACCOUNT_ACTIVE_JOIN;
 			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
 		}
-		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
+		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))
+		{
+			// search also adds a join for custom fields!
 		{
 			switch(gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
+		}
 				case 'string':
 					$only_keys = explode(',',$only_keys);
 					// fall through
@@ -370,13 +395,23 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				if (!is_array($extra_cols))
+				{
+					$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+				}
 				foreach($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
-					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
+					if ($column[0] == '#')
+					{
+						continue;
+					}
+					// order by custom field is handeled in so_sql_cf anyway
+					if (($key = array_search($column, $this->db_cols)) !== false)
+					{
+						$column = $key;
+					}
 					if (strpos($column,'.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
@@ -391,10 +426,13 @@ 
 					}
 					$extra_cols[] = $table.$column.' '.$matches[2];
 					//_debug_array($matches);
-					if (!empty($order_by) && $table) // postgres requires explizit order by
+					if (!empty($order_by) && $table)
+					{
+						// postgres requires explizit order by
 					{
 						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
 					}
+					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
@@ -420,7 +458,11 @@ 
 		}
 		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false)
+		{
+			$this->total = is_array($rows) ? count($rows) : 0;
+		}
+		// so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -462,7 +504,10 @@ 
 		$cat_filter = array();
 		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat))
+			{
+				$cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			}
 		}
 		return $cat_filter;
 	}
@@ -475,10 +520,13 @@ 
 	 */
 	function change_owner($account_id,$new_owner)
 	{
-		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
+		if (!$new_owner)
+		{
+			// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
+		}
 		// contacts
 		$this->db->update($this->table_name,array(
 			'contact_owner' => $new_owner,
@@ -523,7 +571,10 @@ 
 		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
 			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
-			if ($member_attr) $row['members'] = array();
+			if ($member_attr)
+			{
+				$row['members'] = array();
+			}
 			$lists[$row['list_id']] = $row;
 		}
 		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
@@ -564,9 +615,15 @@ 
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
-		if (!$keys && !$data || !(int)$owner) return false;
+		if (!$keys && !$data || !(int)$owner)
+		{
+			return false;
+		}
 
-		if ($keys && !is_array($keys)) $keys = array('list_name' => $keys);
+		if ($keys && !is_array($keys))
+		{
+			$keys = array('list_name' => $keys);
+		}
 		if ($keys)
 		{
 			$keys['list_owner'] = $owner;
@@ -586,9 +643,15 @@ 
 		}
 		$data['list_modified'] = time();
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
-		if (!$data['list_id']) unset($data['list_id']);
+		if (!$data['list_id'])
+		{
+			unset($data['list_id']);
+		}
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
@@ -606,7 +669,10 @@ 
 
 			$this->add2list($list_id,$contacts,array());
 		}
-		if ($keys) $data += $keys;
+		if ($keys)
+		{
+			$data += $keys;
+		}
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
 		return $list_id;
 	}
@@ -621,7 +687,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		if (!is_array($existing))
 		{
@@ -663,7 +732,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
+		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact)
+		{
+			return false;
+		}
 
 		$where = array(
 			'contact_id' => $contact,
@@ -705,7 +777,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__))
+		{
+			return false;
+		}
 
 		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
 
@@ -720,7 +795,10 @@ 
 	 */
 	function lists_ctag($owner=null)
 	{
-		if (is_null($owner)) $owner = array_keys($this->grants);
+		if (is_null($owner))
+		{
+			$owner = array_keys($this->grants);
+		}
 
 		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
 			__LINE__,__FILE__)->fetchColumn()))
@@ -740,9 +818,12 @@ 
 	 */
 	function read($keys,$extra_cols='',$join='')
 	{
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
@@ -762,7 +843,8 @@ 
 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
-				|| strlen($contact['uid']) < $minimum_uid_length)) {
+				|| strlen($contact['uid']) < $minimum_uid_length))
+		{
 			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
 		}
 		return $contact;
@@ -779,19 +861,28 @@ 
 	{
 		unset($extra_where);	// not used, but required by function signature
 
-		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
+		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
+		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-		} else {
+		}
+		else
+		{
 			$minimum_uid_length = 8;
 		}
 
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		$new_entry = !$this->data['id'];
 
-		if (isset($this->data['etag']))		// do we have an etag in the data to write
+		if (isset($this->data['etag']))
+		{
+			// do we have an etag in the data to write
 		{
 			$etag = $this->data['etag'];
+		}
 			unset($this->data['etag']);
 			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
 			{
@@ -839,7 +930,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!$list) return false;
+		if (!$list)
+		{
+			return false;
+		}
 
 		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
 	}

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

@@ -543,7 +543,7 @@
 			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
 				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				'',false,0,"join $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}

Spacing +117 added lines, -119 removed lines

@@ -44,7 +44,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $contacts_id='id';
+	var $contacts_id = 'id';
 
 	/**
 	 * Name of the table for distribution lists
@@ -67,7 +67,7 @@ 
 	 *
 	 * @param Api\Db $db =null
 	 */
-	function __construct(Api\Db $db=null)
+	function __construct(Api\Db $db = null)
 	{
 		parent::__construct('api', 'egw_addressbook', self::EXTRA_TABLE,
 			'contact_', '_name', '_value', '_id', $db);
@@ -114,8 +114,8 @@ 
 		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
 		$advanced_search = false;
 		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
-		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		$wildcard = '%';
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard'] ? $param['wildcard'] : '');
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($filter['cat_id'])
@@ -133,7 +133,7 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int)$filter['owner']]) return false; // we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -142,11 +142,11 @@ 
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "(".$this->table_name.".contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND ".$this->table_name.".contact_owner IN (".
-					implode(',',array_keys($this->grants))."))";
+					implode(',', array_keys($this->grants))."))";
 			}
 		}
 		if ($param['searchletter'])
@@ -155,11 +155,11 @@ 
 		}
 		else
 		{
-			$filter[] = "org_name != ''";// AND org_name IS NOT NULL";
+			$filter[] = "org_name != ''"; // AND org_name IS NOT NULL";
 		}
 		$sort = $param['sort'] == 'DESC' ? 'DESC' : 'ASC';
 
-		list(,$by) = explode(',',$param['org_view']);
+		list(,$by) = explode(',', $param['org_view']);
 		if (!$by)
 		{
 			$extra = array(
@@ -172,50 +172,49 @@ 
 		else	// by adr_one_location or org_unit
 		{
 			// org total for more then one $by
-			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" :
-				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
-			parent::search($param['search'],array('org_name'),
+			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" : "COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name HAVING $by_expr > 1 ORDER BY org_name $sort", array(
 				"NULL AS $by",
 				'1 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter);
 			// org by location
-			parent::search($param['search'],array('org_name'),
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name,$by ORDER BY org_name $sort,$by $sort", array(
 				"CASE WHEN $by IS NULL THEN '' ELSE $by END AS $by",
 				'0 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter);
 			$append = "ORDER BY org_name $sort,is_main DESC,$by $sort";
 		}
-		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
-			array($param['start'],$param['num_rows']),$filter);
+		$rows = parent::search($param['search'], array('org_name'), $append, $extra, $wildcard, false, $op/*'OR'*/,
+			array($param['start'], $param['num_rows']), $filter);
 
 		if (!$rows) return false;
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			if ($row['org_unit_count'] == 1 || $row['adr_one_locality_count'] == 1)
 			{
-				$filter['org_name'][$row['org_name']] = $row['org_name'];	// use as key too to have every org only once
+				$filter['org_name'][$row['org_name']] = $row['org_name']; // use as key too to have every org only once
 			}
-			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count']==1 ? $row[$by] : '|||') : '');
+			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count'] == 1 ? $row[$by] : '|||') : '');
 			$orgs[$org_key] = $row;
 		}
 		unset($rows);
 
 		if (count($filter['org_name']))
 		{
-			foreach((array) parent::search(null, array('org_name','org_unit','adr_one_locality'),
+			foreach ((array)parent::search(null, array('org_name', 'org_unit', 'adr_one_locality'),
 				'GROUP BY org_name,org_unit,adr_one_locality',
-				'',$wildcard,false,$op/*'AND'*/,false,$filter) as $row)
+				'', $wildcard, false, $op/*'AND'*/, false, $filter) as $row)
 			{
 				$org_key = $row['org_name'].($by ? '|||'.$row[$by] : '');
 				if ($orgs[$org_key]['org_unit_count'] == 1)
@@ -264,9 +263,9 @@ 
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
 	 * @return boolean/array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	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)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -282,10 +281,10 @@ 
 		{
 			if ($filter['cat_id'][0] == '!')
 			{
-				$filter['cat_id'] = substr($filter['cat_id'],1);
+				$filter['cat_id'] = substr($filter['cat_id'], 1);
 				$not = 'NOT';
 			}
-			$filter[] = $this->_cat_filter($filter['cat_id'],$not);
+			$filter[] = $this->_cat_filter($filter['cat_id'], $not);
 			unset($filter['cat_id']);
 		}
 
@@ -294,17 +293,17 @@ 
 		{
 			// add read ACL for groupmembers (they have no
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				(!isset($filter['owner']) || in_array('0',(array)$filter['owner'])))
+				(!isset($filter['owner']) || in_array('0', (array)$filter['owner'])))
 			{
 				$groupmembers = array();
-				foreach($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $group_id)
+				foreach ($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $group_id)
 				{
-					if (($members = $GLOBALS['egw']->accounts->members($group_id,true)))
+					if (($members = $GLOBALS['egw']->accounts->members($group_id, true)))
 					{
-						$groupmembers = array_merge($groupmembers,$members);
+						$groupmembers = array_merge($groupmembers, $members);
 					}
 				}
-				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.',array(
+				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.', array(
 					'account_id' => array_unique($groupmembers),
 				));
 			}
@@ -312,34 +311,34 @@ 
 			if (isset($filter['owner']))
 			{
 				// no grants for selected owner/addressbook
-				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants))))
+				if (!($filter['owner'] = array_intersect((array)$filter['owner'], array_keys($this->grants))))
 				{
 					if (!isset($groupmember_sql)) return false;
-					$filter[] = substr($groupmember_sql,4);
+					$filter[] = substr($groupmember_sql, 4);
 					unset($filter['owner']);
 				}
 				// for an owner filter, which does NOT include current user, filter out private entries
-				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'],$filter['owner']))
+				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'], $filter['owner']))
 				{
 					$filter['private'] = 0;
 				}
 				// if multiple addressbooks (incl. current owner) are searched, we need full acl filter
-				elseif(count($filter['owner']) > 1)
+				elseif (count($filter['owner']) > 1)
 				{
 					$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 						" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-						implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+						implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 				}
 			}
 			else	// search all addressbooks, incl. accounts
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-					implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+					implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 			}
 		}
 		if (isset($filter['list']))
@@ -349,21 +348,21 @@ 
 			unset($filter['list']);
 		}
 		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)
-		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository,0,3) == 'sql' &&
-			strpos($join,$GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id',$filter))
+		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository, 0, 3) == 'sql' &&
+			strpos($join, $GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id', $filter))
 		{
 			$join .= self::ACCOUNT_ACTIVE_JOIN;
-			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), self::ACOUNT_ACTIVE_FILTER);
 		}
 		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
 		{
-			switch(gettype($only_keys))
+			switch (gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
 				case 'string':
-					$only_keys = explode(',',$only_keys);
+					$only_keys = explode(',', $only_keys);
 					// fall through
 			}
 			// postgres requires that expressions in order by appear in the columns of a distinct select
@@ -371,14 +370,14 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
-				foreach($all_matches as $matches)
+				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
+				foreach ($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
+					if ($column[0] == '#') continue; // order by custom field is handeled in so_sql_cf anyway
 					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
-					if (strpos($column,'.') === false)
+					if (strpos($column, '.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
 						if (isset($this->db_cols[$column]))
@@ -394,34 +393,34 @@ 
 					//_debug_array($matches);
 					if (!empty($order_by) && $table) // postgres requires explizit order by
 					{
-						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
+						$order_by = str_replace($matches[0], $table.$column.' '.$matches[2].' '.$matches[3].$matches[4], $order_by);
 					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
 
 			// Understand search by date with wildcard (????.10.??) according to user date preference
-			if(is_string($criteria) && strpos($criteria, '?') !== false)
+			if (is_string($criteria) && strpos($criteria, '?') !== false)
 			{
 				// First, check for a 'date', with wildcards, in the user's format
-				$date_regex = str_replace('Q','d',
-					str_replace(array('Y','m','d','.','-'),
-						array('(?P<Y>(?:\?|\Q){4})','(?P<m>(?:\?|\Q){2})','(?P<d>(?:\?|\Q){2})','\.','\-'),
+				$date_regex = str_replace('Q', 'd',
+					str_replace(array('Y', 'm', 'd', '.', '-'),
+						array('(?P<Y>(?:\?|\Q){4})', '(?P<m>(?:\?|\Q){2})', '(?P<d>(?:\?|\Q){2})', '\.', '\-'),
 							$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
 
-				if(preg_match_all('$'.$date_regex.'$', $criteria, $matches))
+				if (preg_match_all('$'.$date_regex.'$', $criteria, $matches))
 				{
-					foreach($matches[0] as $m_id => $match)
+					foreach ($matches[0] as $m_id => $match)
 					{
 						// Birthday is Y-m-d
-						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*",$criteria);
+						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*", $criteria);
 					}
 				}
 			}
 		}
-		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		$rows = & parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0; // so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -433,18 +432,18 @@ 
 	 * @param int|array $cat_id
 	 * @return string sql to filter by given cat
 	 */
-	function _cat_filter($cat_id, $not='')
+	function _cat_filter($cat_id, $not = '')
 	{
 		if (!is_object($GLOBALS['egw']->categories))
 		{
 			$GLOBALS['egw']->categories = new Api\Categories;
 		}
-		foreach($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
+		foreach ($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
 		{
-			$cat_filter[] = $this->db->concat("','",cat_id,"','")." $not LIKE '%,$cat,%'";
+			$cat_filter[] = $this->db->concat("','", cat_id, "','")." $not LIKE '%,$cat,%'";
 		}
-		$cfilter = '('.implode(' OR ',$cat_filter).')';
-		if(!empty($not))
+		$cfilter = '('.implode(' OR ', $cat_filter).')';
+		if (!empty($not))
 		{
 			$cfilter = "( $cfilter OR cat_id IS NULL )";
 		}
@@ -461,9 +460,9 @@ 
 	function _cat_search($cats)
 	{
 		$cat_filter = array();
-		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
+		foreach (is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',', $cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','", cat_id, "','")." LIKE '%,$cat,%'";
 		}
 		return $cat_filter;
 	}
@@ -474,32 +473,32 @@ 
 	 * @param int $account_id account-id of the old owner
 	 * @param int $new_owner account-id of the new owner
 	 */
-	function change_owner($account_id,$new_owner)
+	function change_owner($account_id, $new_owner)
 	{
 		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
 		// contacts
-		$this->db->update($this->table_name,array(
+		$this->db->update($this->table_name, array(
 			'contact_owner' => $new_owner,
-		),array(
+		), array(
 			'contact_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		// cfs
 		$this->db->update(self::EXTRA_TABLE, array(
 			'contact_owner' => $new_owner
-		),array(
+		), array(
 			'contact_owner' => $account_id
 		), __LINE__, __FILE__);
 
 		// lists
 		$this->db->update($this->lists_table, array(
 			'list_owner' => $new_owner,
-		),array(
+		), array(
 			'list_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -513,21 +512,21 @@ 
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
-	function get_lists($uids,$uid_column='list_owner',$member_attr=null,$limit_in_ab=false)
+	function get_lists($uids, $uid_column = 'list_owner', $member_attr = null, $limit_in_ab = false)
 	{
 		if (is_array($uids) && array_key_exists('list_id', $uids))
 		{
-			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.',array('list_id' => $uids['list_id']));
+			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.', array('list_id' => $uids['list_id']));
 			unset($uids['list_id']);
 		}
 		$lists = array();
-		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
-			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
+		foreach ($this->db->select($this->lists_table, '*', $uid_column ? array($uid_column=>$uids) : $uids, __LINE__, __FILE__,
+			false, 'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
 			if ($member_attr) $row['members'] = array();
 			$lists[$row['list_id']] = $row;
 		}
-		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
+		if ($lists && $member_attr && in_array($member_attr, array('contact_id', 'contact_uid', 'caldav_name')))
 		{
 			if ($limit_in_ab)
 			{
@@ -541,10 +540,9 @@ 
 					$in_ab_join .= "list_owner=$this->table_name.contact_owner";
 				}
 			}
-			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
+			foreach ($this->db->select($this->ab2list_table, "$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
-				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				__LINE__, __FILE__, false, $member_attr == 'contact_id' ? '' : '', false, 0, "JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}
@@ -562,7 +560,7 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
 		if (!$keys && !$data || !(int)$owner) return false;
@@ -576,7 +574,7 @@ 
 		{
 			$data['list_owner'] = $owner;
 		}
-		if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn()))
+		if (!$keys || !($list_id = $this->db->select($this->lists_table, 'list_id', $keys, __LINE__, __FILE__)->fetchColumn()))
 		{
 			$data['list_created'] = time();
 			$data['list_creator'] = $GLOBALS['egw_info']['user']['account_id'];
@@ -589,9 +587,9 @@ 
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		if (!$data['list_id']) unset($data['list_id']);
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table, $data, $keys, __LINE__, __FILE__)) return false;
 
-		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
+		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table, 'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
 		{
 			$update = array();
@@ -603,9 +601,9 @@ 
 			{
 				$update['list_carddav_name'] = $data['list_carddav_name'] = $data['list_uid'].'.vcf';
 			}
-			$this->db->update($this->lists_table,$update,array('list_id'=>$list_id),__LINE__,__FILE__);
+			$this->db->update($this->lists_table, $update, array('list_id'=>$list_id), __LINE__, __FILE__);
 
-			$this->add2list($list_id,$contacts,array());
+			$this->add2list($list_id, $contacts, array());
 		}
 		if ($keys) $data += $keys;
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
@@ -620,39 +618,39 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
 		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
 
 		if (!is_array($existing))
 		{
 			$existing = array();
-			foreach($this->db->select($this->ab2list_table,'contact_id',array('list_id'=>$list),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'contact_id', array('list_id'=>$list), __LINE__, __FILE__) as $row)
 			{
 				$existing[] = $row['contact_id'];
 			}
 		}
-		if (!($to_add = array_diff((array)$contact,$existing)))
+		if (!($to_add = array_diff((array)$contact, $existing)))
 		{
-			return true;	// no need to insert it, would give sql error
+			return true; // no need to insert it, would give sql error
 		}
-		foreach($to_add as $contact)
+		foreach ($to_add as $contact)
 		{
-			$this->db->insert($this->ab2list_table,array(
+			$this->db->insert($this->ab2list_table, array(
 				'contact_id' => $contact,
 				'list_id' => $list,
 				'list_added' => time(),
 				'list_added_by' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(),__LINE__,__FILE__);
+			), array(), __LINE__, __FILE__);
 		}
 		// update etag
-		return $this->db->update($this->lists_table,array(
+		return $this->db->update($this->lists_table, array(
 			'list_etag=list_etag+1',
 			'list_modified' => time(),
 			'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-		),array(
+		), array(
 			'list_id' => $list,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -662,7 +660,7 @@ 
 	 * @param int $list =null list-id or null to remove from all lists
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
 		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
 
@@ -676,24 +674,24 @@ 
 		else
 		{
 			$list = array();
-			foreach($this->db->select($this->ab2list_table,'list_id',$where,__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'list_id', $where, __LINE__, __FILE__) as $row)
 			{
 				$list[] = $row['list_id'];
 			}
 		}
-		if (!$this->db->delete($this->ab2list_table,$where,__LINE__,__FILE__))
+		if (!$this->db->delete($this->ab2list_table, $where, __LINE__, __FILE__))
 		{
 			return false;
 		}
-		foreach((array)$list as $list_id)
+		foreach ((array)$list as $list_id)
 		{
-			$this->db->update($this->lists_table,array(
+			$this->db->update($this->lists_table, array(
 				'list_etag=list_etag+1',
 				'list_modified' => time(),
 				'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(
+			), array(
 				'list_id' => $list_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		return true;
 	}
@@ -706,9 +704,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table, array('list_id' => $list), __LINE__, __FILE__)) return false;
 
-		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
+		$this->db->delete($this->ab2list_table, array('list_id' => $list), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -719,12 +717,12 @@ 
 	 * @param int|array $owner =null null for all lists user has access too
 	 * @return int
 	 */
-	function lists_ctag($owner=null)
+	function lists_ctag($owner = null)
 	{
 		if (is_null($owner)) $owner = array_keys($this->grants);
 
-		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
-			__LINE__,__FILE__)->fetchColumn()))
+		if (!($modified = $this->db->select($this->lists_table, 'MAX(list_modified)', array('list_owner'=>$owner),
+			__LINE__, __FILE__)->fetchColumn()))
 		{
 			return 0;
 		}
@@ -739,7 +737,7 @@ 
 	 * @param string $join
 	 * @return array|boolean
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -752,11 +750,11 @@ 
 			$keys = array('uid' => $keys);
 		}
 		try {
-			$contact = parent::read($keys,$extra_cols,$join);
+			$contact = parent::read($keys, $extra_cols, $join);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 			return false;
 		}
@@ -764,7 +762,7 @@ 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
 				|| strlen($contact['uid']) < $minimum_uid_length)) {
-			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
+			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook', $contact['id'])));
 		}
 		return $contact;
 	}
@@ -778,7 +776,7 @@ 
 	 */
 	function save($keys = NULL, $extra_where = NULL)
 	{
-		unset($extra_where);	// not used, but required by function signature
+		unset($extra_where); // not used, but required by function signature
 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -794,9 +792,9 @@ 
 		{
 			$etag = $this->data['etag'];
 			unset($this->data['etag']);
-			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
+			if (!($err = parent::save(array('contact_etag=contact_etag+1'), array('contact_etag' => $etag))))
 			{
-				$this->data['etag'] = $etag+1;
+				$this->data['etag'] = $etag + 1;
 			}
 			else
 			{
@@ -816,7 +814,7 @@ 
 		// enforce a minium uid strength
 		if (!isset($this->data['uid']) || strlen($this->data['uid']) < $minimum_uid_length)
 		{
-			$update['uid'] = Api\CalDAV::generate_uid('addressbook',$this->data['id']);
+			$update['uid'] = Api\CalDAV::generate_uid('addressbook', $this->data['id']);
 			//echo "<p>set uid={$this->data['uid']}, etag={$this->data['etag']}</p>";
 		}
 		// set carddav_name, if not given by caller
@@ -842,7 +840,7 @@ 
 	{
 		if (!$list) return false;
 
-		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
+		return $this->db->select($this->lists_table, '*', array('list_id'=>$list), __LINE__, __FILE__)->fetch();
 	}
 
 	/**
@@ -853,9 +851,9 @@ 
 	 * @param array $extra_cols =array() extra-data to be saved
 	 * @return bool false on success, errornumber on failure
 	 */
-	function save_customfields($data, array $extra_cols=array())
+	function save_customfields($data, array $extra_cols = array())
 	{
-		return parent::save_customfields($data, array('contact_owner' => $data['owner'])+$extra_cols);
+		return parent::save_customfields($data, array('contact_owner' => $data['owner']) + $extra_cols);
 	}
 
 	/**
@@ -864,6 +862,6 @@ 
 	*/
 	function delete_customfields($data)
 	{
-		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);
+		$this->db->delete($this->extra_table, $data, __LINE__, __FILE__);
 	}
 }

api/src/Contacts/Storage.php

Doc Comments +1 added lines, -3 removed lines

@@ -592,7 +592,7 @@ 
 	 * @param array|string $criteria array of key and data cols, OR string to search over all standard search fields
 	 * @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
@@ -814,8 +814,6 @@ 
 	 * delete / move all contacts of an addressbook
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] owner to change
-	 * @param int $data['new_owner']  new owner or 0 for delete
 	 */
 	function deleteaccount($data)
 	{

Indentation +37 added lines, -37 removed lines

@@ -44,23 +44,23 @@ 
 	var $extra_table = 'egw_addressbook_extra';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_id = 'contact_id';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_owner = 'contact_owner';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_key = 'contact_name';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $extra_value = 'contact_value';
 
 	/**
@@ -71,23 +71,23 @@ 
 	var $distributionlist_view ='(SELECT contact_id, egw_addressbook_lists.list_id as list_id, egw_addressbook_lists.list_name as list_name, egw_addressbook_lists.list_owner as list_owner FROM egw_addressbook_lists, egw_addressbook2list where egw_addressbook_lists.list_id=egw_addressbook2list.list_id) d_view ';
 	var $distributionlist_tabledef = array();
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_id = 'contact_id';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_owner = 'list_owner';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_key = 'list_id';
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	var $distri_value = 'list_name';
 
 	/**
@@ -160,10 +160,10 @@ 
 	var $content_types = array();
 
 	/**
-	* Special content type to indicate a deleted addressbook
-	*
-	* @var String;
-	*/
+	 * Special content type to indicate a deleted addressbook
+	 *
+	 * @var String;
+	 */
 	const DELETED_TYPE = 'D';
 
 	/**
@@ -268,7 +268,7 @@ 
 			$this->distributionlist_tabledef = array('fd' => array(
 					$this->distri_id => $tda2list['fd'][$this->distri_id],
 					$this->distri_owner => $tdlists['fd'][$this->distri_owner],
-        	    	$this->distri_key => $tdlists['fd'][$this->distri_key],
+					$this->distri_key => $tdlists['fd'][$this->distri_key],
 					$this->distri_value => $tdlists['fd'][$this->distri_value],
 				), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(),
 			);
@@ -469,12 +469,12 @@ 
 	}
 
 	/**
-	* deletes contact entry including custom fields
-	*
-	* @param mixed $contact array with id or just the id
-	* @param int $check_etag =null
-	* @return boolean|int true on success or false on failiure, 0 if etag does not match
-	*/
+	 * deletes contact entry including custom fields
+	 *
+	 * @param mixed $contact array with id or just the id
+	 * @param int $check_etag =null
+	 * @return boolean|int true on success or false on failiure, 0 if etag does not match
+	 */
 	function delete($contact,$check_etag=null)
 	{
 		if (is_array($contact)) $contact = $contact['id'];
@@ -510,11 +510,11 @@ 
 	}
 
 	/**
-	* saves contact data including custom fields
-	*
-	* @param array &$contact contact data from etemplate::exec
-	* @return bool false on success, errornumber on failure
-	*/
+	 * saves contact data including custom fields
+	 *
+	 * @param array &$contact contact data from etemplate::exec
+	 * @return bool false on success, errornumber on failure
+	 */
 	function save(&$contact)
 	{
 		// save mainfields
@@ -566,7 +566,7 @@ 
 	 *
 	 * @param int|string $contact_id contact_id or 'a'.account_id
 	 * @return array|boolean data if row could be retrived else False
-	*/
+	 */
 	function read($contact_id)
 	{
 		if (!is_array($contact_id) && substr($contact_id,0,8) == 'account:')
@@ -796,10 +796,10 @@ 
 	}
 
  	/**
-	 * gets all contact fields from database
-	 *
-	 * @return array of (internal) field-names
-	 */
+ 	 * gets all contact fields from database
+ 	 *
+ 	 * @return array of (internal) field-names
+ 	 */
 	function get_contact_columns()
 	{
 		$fields = $this->get_fields('all');

Braces +132 added lines, -33 removed lines

@@ -239,10 +239,13 @@ 
 
 			// remove some columns, absolutly not necessary to search in sql
 			$this->columns_to_search = array_diff(array_values($this->somain->db_cols),$this->sql_cols_not_to_search);
-			if ($this->customfields)	// add custom fields, if configured
+			if ($this->customfields)
+			{
+				// add custom fields, if configured
 			{
 				$this->columns_to_search[] = Sql::EXTRA_TABLE.'.'.Sql::EXTRA_VALUE;
 			}
+			}
 		}
 		if ($this->user)
 		{
@@ -319,7 +322,10 @@ 
 	 */
 	function get_grants($user, $contact_app='addressbook', $preferences=null)
 	{
-		if (!isset($preferences)) $preferences = $GLOBALS['egw_info']['user']['preferences'];
+		if (!isset($preferences))
+		{
+			$preferences = $GLOBALS['egw_info']['user']['preferences'];
+		}
 
 		if ($user)
 		{
@@ -347,12 +353,25 @@ 
 				$grants[0] = Api\Acl::READ;
 			}
 			// add account grants for admins (only for current user!)
-			if ($user == $this->user && $this->is_admin())	// admin rights can be limited by ACL!
+			if ($user == $this->user && $this->is_admin())
+			{
+				// admin rights can be limited by ACL!
 			{
-				$grants[0] = Api\Acl::READ;	// admins always have read-access
-				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin')) $grants[0] |= Api\Acl::EDIT;
-				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))  $grants[0] |= Api\Acl::ADD;
-				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin')) $grants[0] |= Api\Acl::DELETE;
+				$grants[0] = Api\Acl::READ;
+			}
+			// admins always have read-access
+				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin'))
+				{
+					$grants[0] |= Api\Acl::EDIT;
+				}
+				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))
+				{
+					$grants[0] |= Api\Acl::ADD;
+				}
+				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin'))
+				{
+					$grants[0] |= Api\Acl::DELETE;
+				}
 			}
 			// allow certain groups to edit contact-data of accounts
 			if (self::allow_account_edit($user))
@@ -422,12 +441,22 @@ 
 		}
 		foreach($ids as $key => $id)
 		{
-			if (!is_numeric($id)) unset($ids[$key]);
+			if (!is_numeric($id))
+			{
+				unset($ids[$key]);
+			}
 		}
-		if (!$ids) return array();	// nothing to do, eg. all these contacts are in ldap
+		if (!$ids)
+		{
+			return array();
+		}
+		// nothing to do, eg. all these contacts are in ldap
 		$fields = array();
 		$filter[$this->distri_id]=$ids;
-		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
+		if (count($dl_allowed))
+		{
+			$filter[$this->distri_key]=$dl_allowed;
+		}
 		$distri_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
 		#_debug_array($this->distributionlist_tabledef);
 		foreach($this->db->select($distri_view, '*', $filter, __LINE__, __FILE__,
@@ -477,10 +506,16 @@ 
 	*/
 	function delete($contact,$check_etag=null)
 	{
-		if (is_array($contact)) $contact = $contact['id'];
+		if (is_array($contact))
+		{
+			$contact = $contact['id'];
+		}
 
 		$where = array('id' => $contact);
-		if ($check_etag) $where['etag'] = $check_etag;
+		if ($check_etag)
+		{
+			$where['etag'] = $check_etag;
+		}
 
 		// delete mainfields
 		if ($this->somain->delete($where))
@@ -556,7 +591,10 @@ 
 				}
 			}
 		}
-		if($error_nr) return $error_nr;
+		if($error_nr)
+		{
+			return $error_nr;
+		}
 
 		return false;	// no error
 	}
@@ -580,7 +618,10 @@ 
 			return $contact;
 		}
 		$dl_list=$this->read_distributionlist(array($contact['id']));
-		if (count($dl_list)) $contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		if (count($dl_list))
+		{
+			$contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		}
 		return $this->db2data($contact);
 	}
 
@@ -613,7 +654,10 @@ 
 			unset($filter['adr_one_countrycode']);
 		}
 		// Hide deleted items unless type is specifically deleted
-		if(!is_array($filter)) $filter = $filter ? (array) $filter : array();
+		if(!is_array($filter))
+		{
+			$filter = $filter ? (array) $filter : array();
+		}
 
 		if (isset($filter['cols_to_search']))
 		{
@@ -624,10 +668,13 @@ 
 		// if no tid set or tid==='' do NOT return deleted entries ($tid === null returns all entries incl. deleted)
 		if(!array_key_exists('tid', $filter) || $filter['tid'] === '')
 		{
-			if ($join && strpos($join,'RIGHT JOIN') !== false)	// used eg. to search for groups
+			if ($join && strpos($join,'RIGHT JOIN') !== false)
+			{
+				// used eg. to search for groups
 			{
 				$filter[] = '(contact_tid != \'' . self::DELETED_TYPE . '\' OR contact_tid IS NULL)';
 			}
+			}
 			else
 			{
 				$filter[] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
@@ -675,7 +722,10 @@ 
 							unset($cols[$key]);
 						}
 					}
-					if ($col=='contact_id') $col='egw_addressbook.contact_id';
+					if ($col=='contact_id')
+					{
+						$col='egw_addressbook.contact_id';
+					}
 				}
 
 				$backend->columns_to_search = $cols;
@@ -750,7 +800,11 @@ 
 			{
 				foreach($this->columns_to_search as $col)
 				{
-					if ($col != 'contact_value') $param['search'][$col] = $search;	// we dont search the customfields
+					if ($col != 'contact_value')
+					{
+						$param['search'][$col] = $search;
+					}
+					// we dont search the customfields
 				}
 			}
 		}
@@ -770,11 +824,17 @@ 
 		$rows = $this->somain->organisations($param);
 		$this->total = $this->somain->total;
 
-		if (!$rows) return array();
+		if (!$rows)
+		{
+			return array();
+		}
 
 		foreach($rows as $n => $row)
 		{
-			if (strpos($row['org_name'],'&')!==false) $row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			if (strpos($row['org_name'],'&')!==false)
+			{
+				$row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			}
 			$rows[$n]['id'] = 'org_name:'.$row['org_name'];
 			foreach(array(
 				'org_unit' => lang('departments'),
@@ -787,7 +847,10 @@ 
 				}
 				else
 				{
-					if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
+					if (strpos($row[$by],'&')!==false)
+					{
+						$row[$by] = str_replace('&','*AND*',$row[$by]);
+					}
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
 				}
 			}
@@ -847,7 +910,10 @@ 
 	 */
 	function get_backend($keys=null,$owner=null)
 	{
-		if ($owner === '') $owner = null;
+		if ($owner === '')
+		{
+			$owner = null;
+		}
 
 		$contact_id = !is_array($keys) ? $keys :
 			(isset($keys['id']) ? $keys['id'] : $keys['contact_id']);
@@ -911,7 +977,10 @@ 
 		$ds = $GLOBALS['egw']->ldap->ldapConnect();
 		$ldap_contacts = new Ldap(null, $ds);
 
-		if (!is_array($type)) $type = explode(',', $type);
+		if (!is_array($type))
+		{
+			$type = explode(',', $type);
+		}
 
 		$start = $n = 0;
 		$num = 100;
@@ -927,7 +996,10 @@ 
 			{
 				foreach($contacts as $contact)
 				{
-					if ($contact['account_id']) $contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
+					if ($contact['account_id'])
+					{
+						$contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
+					}
 
 					$ldap_contacts->data = $contact;
 					$n++;
@@ -955,10 +1027,13 @@ 
 				false, $filter) as $contact)
 			{
 				//error_log(__METHOD__."(".array2string($type).") do=".array2string($type)." migrating ".array2string($contact));
-				if ($contact['jpegphoto'])	// photo is NOT read by LDAP backend on search, need to do an extra read
+				if ($contact['jpegphoto'])
+				{
+					// photo is NOT read by LDAP backend on search, need to do an extra read
 				{
 					$contact = $ldap_contacts->read($contact['id']);
 				}
+				}
 				unset($contact['id']);	// ldap uid/account_lid
 				if ($contact['account_id'] && ($old = $sql_contacts->read(array('account_id' => $contact['account_id']))))
 				{
@@ -992,7 +1067,10 @@ 
 	 */
 	function get_lists($required=Api\Acl::READ,$extra_labels=null)
 	{
-		if (!method_exists($this->somain,'get_lists')) return false;
+		if (!method_exists($this->somain,'get_lists'))
+		{
+			return false;
+		}
 
 		$uids = array();
 		foreach($this->grants as $uid => $rights)
@@ -1026,7 +1104,10 @@ 
 	function read_lists($keys,$member_attr=null,$limit_in_ab=false)
 	{
 		$backend = (string)$limit_in_ab === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
-		if (!method_exists($backend, 'get_lists')) return false;
+		if (!method_exists($backend, 'get_lists'))
+		{
+			return false;
+		}
 
 		return $backend->get_lists($keys,null,$member_attr,$limit_in_ab);
 	}
@@ -1043,7 +1124,10 @@ 
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
 		$backend = (string)$owner === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
-		if (!method_exists($backend, 'add_list')) return false;
+		if (!method_exists($backend, 'add_list'))
+		{
+			return false;
+		}
 
 		return $backend->add_list($keys,$owner,$contacts,$data);
 	}
@@ -1058,7 +1142,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!method_exists($this->somain,'add2list')) return false;
+		if (!method_exists($this->somain,'add2list'))
+		{
+			return false;
+		}
 
 		return $this->somain->add2list($contact,$list,$existing);
 	}
@@ -1072,7 +1159,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if (!method_exists($this->somain,'remove_from_list')) return false;
+		if (!method_exists($this->somain,'remove_from_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->remove_from_list($contact,$list);
 	}
@@ -1085,7 +1175,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!method_exists($this->somain,'delete_list')) return false;
+		if (!method_exists($this->somain,'delete_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->delete_list($list);
 	}
@@ -1098,7 +1191,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!method_exists($this->somain,'read_list')) return false;
+		if (!method_exists($this->somain,'read_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->read_list($list);
 	}
@@ -1124,7 +1220,10 @@ 
 	 */
 	function lists_ctag($owner=null)
 	{
-		if (!method_exists($this->somain,'lists_ctag')) return 0;
+		if (!method_exists($this->somain,'lists_ctag'))
+		{
+			return 0;
+		}
 
 		return $this->somain->lists_ctag($owner);
 	}

Spacing +131 added lines, -133 removed lines

@@ -68,7 +68,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $distributionlist_view ='(SELECT contact_id, egw_addressbook_lists.list_id as list_id, egw_addressbook_lists.list_name as list_name, egw_addressbook_lists.list_owner as list_owner FROM egw_addressbook_lists, egw_addressbook2list where egw_addressbook_lists.list_id=egw_addressbook2list.list_id) d_view ';
+	var $distributionlist_view = '(SELECT contact_id, egw_addressbook_lists.list_id as list_id, egw_addressbook_lists.list_name as list_name, egw_addressbook_lists.list_owner as list_owner FROM egw_addressbook_lists, egw_addressbook2list where egw_addressbook_lists.list_id=egw_addressbook2list.list_id) d_view ';
 	var $distributionlist_tabledef = array();
 	/**
 	* @var string
@@ -122,10 +122,10 @@ 
 	 * In SQL we can search all columns, though a view make on real sense
 	 */
 	var $sql_cols_not_to_search = array(
-		'jpegphoto','owner','tid','private','cat_id','etag',
-		'modified','modifier','creator','created','tz','account_id',
-		'uid','carddav_name','freebusy_uri','calendar_uri',
-		'geo','pubkey',
+		'jpegphoto', 'owner', 'tid', 'private', 'cat_id', 'etag',
+		'modified', 'modifier', 'creator', 'created', 'tz', 'account_id',
+		'uid', 'carddav_name', 'freebusy_uri', 'calendar_uri',
+		'geo', 'pubkey',
 	);
 	/**
 	 * columns to search, if we search for a single pattern
@@ -205,12 +205,12 @@ 
 	 * @param string $contact_app ='addressbook' used for acl->get_grants()
 	 * @param Api\Db $db =null
 	 */
-	function __construct($contact_app='addressbook',Api\Db $db=null)
+	function __construct($contact_app = 'addressbook', Api\Db $db = null)
 	{
-		$this->db     = is_null($db) ? $GLOBALS['egw']->db : $db;
+		$this->db = is_null($db) ? $GLOBALS['egw']->db : $db;
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
-		$this->memberships = $GLOBALS['egw']->accounts->memberships($this->user,true);
+		$this->memberships = $GLOBALS['egw']->accounts->memberships($this->user, true);
 
 		// account backend used
 		if ($GLOBALS['egw_info']['server']['account_repository'])
@@ -223,7 +223,7 @@ 
 		}
 		$this->customfields = Api\Storage\Customfields::get('addressbook');
 		// contacts backend (contacts in LDAP require accounts in LDAP!)
-		if($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
+		if ($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
 		{
 			$this->contact_repository = 'ldap';
 			$this->somain = new Ldap();
@@ -238,7 +238,7 @@ 
 			$this->somain = new Sql($db);
 
 			// remove some columns, absolutly not necessary to search in sql
-			$this->columns_to_search = array_diff(array_values($this->somain->db_cols),$this->sql_cols_not_to_search);
+			$this->columns_to_search = array_diff(array_values($this->somain->db_cols), $this->sql_cols_not_to_search);
 			if ($this->customfields)	// add custom fields, if configured
 			{
 				$this->columns_to_search[] = Sql::EXTRA_TABLE.'.'.Sql::EXTRA_VALUE;
@@ -246,7 +246,7 @@ 
 		}
 		if ($this->user)
 		{
-			$this->grants = $this->get_grants($this->user,$contact_app);
+			$this->grants = $this->get_grants($this->user, $contact_app);
 		}
 		if ($this->account_repository != 'sql' && $this->contact_repository == 'sql')
 		{
@@ -263,8 +263,8 @@ 
 		}
 		if ($this->contact_repository == 'sql' || $this->contact_repository == 'sql-ldap')
 		{
-			$tda2list = $this->db->get_table_definitions('api','egw_addressbook2list');
-			$tdlists = $this->db->get_table_definitions('api','egw_addressbook_lists');
+			$tda2list = $this->db->get_table_definitions('api', 'egw_addressbook2list');
+			$tdlists = $this->db->get_table_definitions('api', 'egw_addressbook_lists');
 			$this->distributionlist_tabledef = array('fd' => array(
 					$this->distri_id => $tda2list['fd'][$this->distri_id],
 					$this->distri_owner => $tdlists['fd'][$this->distri_owner],
@@ -274,11 +274,11 @@ 
 			);
 		}
 		// ToDo: it should be the other way arround, the backend should set the grants it uses
-		$this->somain->grants =& $this->grants;
+		$this->somain->grants = & $this->grants;
 
-		if($this->somain instanceof Sql)
+		if ($this->somain instanceof Sql)
 		{
-			$this->soextra =& $this->somain;
+			$this->soextra = & $this->somain;
 		}
 		else
 		{
@@ -298,7 +298,7 @@ 
 
 		// Add in deleted type, if holding deleted contacts
 		$config = Api\Config::read('phpgwapi');
-		if($config['history'])
+		if ($config['history'])
 		{
 			$this->content_types[self::DELETED_TYPE] = array(
 				'name'	=>	lang('Deleted'),
@@ -317,18 +317,18 @@ 
 	 * @param string $contact_app ='addressbook'
 	 * @return array
 	 */
-	function get_grants($user, $contact_app='addressbook', $preferences=null)
+	function get_grants($user, $contact_app = 'addressbook', $preferences = null)
 	{
 		if (!isset($preferences)) $preferences = $GLOBALS['egw_info']['user']['preferences'];
 
 		if ($user)
 		{
 			// contacts backend (contacts in LDAP require accounts in LDAP!)
-			if($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
+			if ($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap' && $this->account_repository == 'ldap')
 			{
 				// static grants from ldap: all rights for the own personal addressbook and the group ones of the meberships
 				$grants = array($user => ~0);
-				foreach($GLOBALS['egw']->accounts->memberships($user,true) as $gid)
+				foreach ($GLOBALS['egw']->accounts->memberships($user, true) as $gid)
 				{
 					$grants[$gid] = ~0;
 				}
@@ -337,22 +337,22 @@ 
 			{
 				// group grants are now grants for the group addressbook and NOT grants for all its members,
 				// therefor the param false!
-				$grants = $GLOBALS['egw']->acl->get_grants($contact_app,false,$user);
+				$grants = $GLOBALS['egw']->acl->get_grants($contact_app, false, $user);
 			}
 			// add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access,
 			// if he has not set the hide_accounts preference
 			// ToDo: be more specific for 'groupmembers', they should be able to see the groupmembers
-			if (!in_array($preferences['common']['account_selection'], array('none','groupmembers')))
+			if (!in_array($preferences['common']['account_selection'], array('none', 'groupmembers')))
 			{
 				$grants[0] = Api\Acl::READ;
 			}
 			// add account grants for admins (only for current user!)
 			if ($user == $this->user && $this->is_admin())	// admin rights can be limited by ACL!
 			{
-				$grants[0] = Api\Acl::READ;	// admins always have read-access
-				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin')) $grants[0] |= Api\Acl::EDIT;
-				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))  $grants[0] |= Api\Acl::ADD;
-				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin')) $grants[0] |= Api\Acl::DELETE;
+				$grants[0] = Api\Acl::READ; // admins always have read-access
+				if (!$GLOBALS['egw']->acl->check('account_access', 16, 'admin')) $grants[0] |= Api\Acl::EDIT;
+				if (!$GLOBALS['egw']->acl->check('account_access', 4, 'admin'))  $grants[0] |= Api\Acl::ADD;
+				if (!$GLOBALS['egw']->acl->check('account_access', 32, 'admin')) $grants[0] |= Api\Acl::DELETE;
 			}
 			// allow certain groups to edit contact-data of accounts
 			if (self::allow_account_edit($user))
@@ -376,11 +376,11 @@ 
 	 * @param array $contact =null for future use, where admins might not be admins for all accounts
 	 * @return boolean
 	 */
-	function is_admin($contact=null)
+	function is_admin($contact = null)
 	{
-		unset($contact);	// not (yet) used
+		unset($contact); // not (yet) used
 
-		return isset($GLOBALS['egw_info']['user']['apps']['admin']) && !$GLOBALS['egw']->acl->check('account_access',16,'admin');
+		return isset($GLOBALS['egw_info']['user']['apps']['admin']) && !$GLOBALS['egw']->acl->check('account_access', 16, 'admin');
 	}
 
 	/**
@@ -389,7 +389,7 @@ 
 	 * @param int $user =null default $this->user
 	 * @return boolean
 	 */
-	function allow_account_edit($user=null)
+	function allow_account_edit($user = null)
 	{
 		return $GLOBALS['egw_info']['server']['allow_account_edit'] &&
 			array_intersect($GLOBALS['egw_info']['server']['allow_account_edit'],
@@ -403,9 +403,9 @@ 
 	 * @param array $field_names =null custom fields to read, default all
 	 * @return array id => name => value
 	 */
-	function read_customfields($ids,$field_names=null)
+	function read_customfields($ids, $field_names = null)
 	{
-		return $this->soextra->read_customfields($ids,$field_names);
+		return $this->soextra->read_customfields($ids, $field_names);
 	}
 
 	/**
@@ -414,26 +414,26 @@ 
 	 * @param int|array $ids
 	 * @return array id => name => value
 	 */
-	function read_distributionlist($ids, $dl_allowed=array())
+	function read_distributionlist($ids, $dl_allowed = array())
 	{
 		if ($this->contact_repository == 'ldap')
 		{
-			return array();	// ldap does not support distributionlists
+			return array(); // ldap does not support distributionlists
 		}
-		foreach($ids as $key => $id)
+		foreach ($ids as $key => $id)
 		{
 			if (!is_numeric($id)) unset($ids[$key]);
 		}
-		if (!$ids) return array();	// nothing to do, eg. all these contacts are in ldap
+		if (!$ids) return array(); // nothing to do, eg. all these contacts are in ldap
 		$fields = array();
-		$filter[$this->distri_id]=$ids;
-		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
-		$distri_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
+		$filter[$this->distri_id] = $ids;
+		if (count($dl_allowed)) $filter[$this->distri_key] = $dl_allowed;
+		$distri_view = str_replace(') d_view', ' and '.$this->distri_id.' in ('.implode(',', $ids).')) d_view', $this->distributionlist_view);
 		#_debug_array($this->distributionlist_tabledef);
-		foreach($this->db->select($distri_view, '*', $filter, __LINE__, __FILE__,
+		foreach ($this->db->select($distri_view, '*', $filter, __LINE__, __FILE__,
 			false, 'ORDER BY '.$this->distri_id, false, 0, '', $this->distributionlist_tabledef) as $row)
 		{
-			if ((isset($row[$this->distri_id])&&strlen($row[$this->distri_value])>0))
+			if ((isset($row[$this->distri_id]) && strlen($row[$this->distri_value]) > 0))
 			{
 				$fields[$row[$this->distri_id]][$row[$this->distri_key]] = $row[$this->distri_value].' ('.
 					Api\Accounts::username($row[$this->distri_owner]).')';
@@ -475,7 +475,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,$check_etag=null)
+	function delete($contact, $check_etag = null)
 	{
 		if (is_array($contact)) $contact = $contact['id'];
 
@@ -486,7 +486,7 @@ 
 		if ($this->somain->delete($where))
 		{
 			// delete customfields, can return 0 if there are no customfields
-			if(!($this->somain instanceof Sql))
+			if (!($this->somain instanceof Sql))
 			{
 				$this->soextra->delete_customfields(array($this->extra_id => $contact));
 			}
@@ -506,7 +506,7 @@ 
 			}
 			return true;
 		}
-		return $check_etag ? 0 : false;		// if etag given, we return 0 on failure, thought it could also mean the whole contact does not exist
+		return $check_etag ? 0 : false; // if etag given, we return 0 on failure, thought it could also mean the whole contact does not exist
 	}
 
 	/**
@@ -556,9 +556,9 @@ 
 				}
 			}
 		}
-		if($error_nr) return $error_nr;
+		if ($error_nr) return $error_nr;
 
-		return false;	// no error
+		return false; // no error
 	}
 
 	/**
@@ -569,18 +569,18 @@ 
 	*/
 	function read($contact_id)
 	{
-		if (!is_array($contact_id) && substr($contact_id,0,8) == 'account:')
+		if (!is_array($contact_id) && substr($contact_id, 0, 8) == 'account:')
 		{
-			$contact_id = array('account_id' => (int) substr($contact_id,8));
+			$contact_id = array('account_id' => (int)substr($contact_id, 8));
 		}
 		// read main data
-		$backend =& $this->get_backend($contact_id);
+		$backend = & $this->get_backend($contact_id);
 		if (!($contact = $backend->read($contact_id)))
 		{
 			return $contact;
 		}
-		$dl_list=$this->read_distributionlist(array($contact['id']));
-		if (count($dl_list)) $contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		$dl_list = $this->read_distributionlist(array($contact['id']));
+		if (count($dl_list)) $contact['distrib_lists'] = implode("\n", $dl_list[$contact['id']]);
 		return $this->db2data($contact);
 	}
 
@@ -602,18 +602,18 @@ 
 	 * @param string $join ='' sql to do a join (only used by sql backend!), eg. " RIGHT JOIN egw_accounts USING(account_id)"
 	 * @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='')
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '')
 	{
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',".array2string($start).','.array2string($filter,true).",'$join')");
 
 		// Handle 'None' country option
-		if(is_array($filter) && $filter['adr_one_countrycode'] == '-custom-')
+		if (is_array($filter) && $filter['adr_one_countrycode'] == '-custom-')
 		{
 			$filter[] = 'adr_one_countrycode IS NULL';
 			unset($filter['adr_one_countrycode']);
 		}
 		// Hide deleted items unless type is specifically deleted
-		if(!is_array($filter)) $filter = $filter ? (array) $filter : array();
+		if (!is_array($filter)) $filter = $filter ? (array)$filter : array();
 
 		if (isset($filter['cols_to_search']))
 		{
@@ -622,22 +622,22 @@ 
 		}
 
 		// if no tid set or tid==='' do NOT return deleted entries ($tid === null returns all entries incl. deleted)
-		if(!array_key_exists('tid', $filter) || $filter['tid'] === '')
+		if (!array_key_exists('tid', $filter) || $filter['tid'] === '')
 		{
-			if ($join && strpos($join,'RIGHT JOIN') !== false)	// used eg. to search for groups
+			if ($join && strpos($join, 'RIGHT JOIN') !== false)	// used eg. to search for groups
 			{
-				$filter[] = '(contact_tid != \'' . self::DELETED_TYPE . '\' OR contact_tid IS NULL)';
+				$filter[] = '(contact_tid != \''.self::DELETED_TYPE.'\' OR contact_tid IS NULL)';
 			}
 			else
 			{
-				$filter[] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
+				$filter[] = 'contact_tid != \''.self::DELETED_TYPE.'\'';
 			}
 		}
-		elseif(is_null($filter['tid']))
+		elseif (is_null($filter['tid']))
 		{
-			unset($filter['tid']);	// return all entries incl. deleted
+			unset($filter['tid']); // return all entries incl. deleted
 		}
-		$backend = $this->get_backend(null,$filter['owner']);
+		$backend = $this->get_backend(null, $filter['owner']);
 		// single string to search for --> create so_sql conformant search criterial for the standard search columns
 		if ($criteria && !is_array($criteria))
 		{
@@ -658,34 +658,34 @@ 
 			{
 				$cols = $this->account_cols_to_search;
 			}
-			if($backend instanceof Sql)
+			if ($backend instanceof Sql)
 			{
 				// Keep a string, let the parent handle it
 				$criteria = $search;
 
-				foreach($cols as $key => &$col)
+				foreach ($cols as $key => &$col)
 				{
-					if($col != Sql::EXTRA_VALUE &&
+					if ($col != Sql::EXTRA_VALUE &&
 						$col != Sql::EXTRA_TABLE.'.'.Sql::EXTRA_VALUE &&
 						!array_key_exists($col, $backend->db_cols))
 					{
-						if(!($col = array_search($col, $backend->db_cols)))
+						if (!($col = array_search($col, $backend->db_cols)))
 						{
 							// Can't search this column, it will error if we try
 							unset($cols[$key]);
 						}
 					}
-					if ($col=='contact_id') $col='egw_addressbook.contact_id';
+					if ($col == 'contact_id') $col = 'egw_addressbook.contact_id';
 				}
 
 				$backend->columns_to_search = $cols;
 			}
 			else
 			{
-				foreach($cols as $col)
+				foreach ($cols as $col)
 				{
 					// remove from LDAP backend not understood use-AND-syntax
-					$criteria[$col] = str_replace(' +',' ',$search);
+					$criteria[$col] = str_replace(' +', ' ', $search);
 				}
 			}
 		}
@@ -709,7 +709,7 @@ 
 
 		if ($rows)
 		{
-			foreach($rows as $n => $row)
+			foreach ($rows as $n => $row)
 			{
 				$rows[$n] = $this->db2data($row);
 			}
@@ -732,7 +732,7 @@ 
 	 */
 	function organisations($param)
 	{
-		if (!method_exists($this->somain,'organisations'))
+		if (!method_exists($this->somain, 'organisations'))
 		{
 			$this->total = 0;
 			return false;
@@ -741,16 +741,16 @@ 
 		{
 			$search = $param['search'];
 			$param['search'] = array();
-			if($this->somain instanceof Sql)
+			if ($this->somain instanceof Sql)
 			{
 				// Keep the string, let the parent deal with it
 				$param['search'] = $search;
 			}
 			else
 			{
-				foreach($this->columns_to_search as $col)
+				foreach ($this->columns_to_search as $col)
 				{
-					if ($col != 'contact_value') $param['search'][$col] = $search;	// we dont search the customfields
+					if ($col != 'contact_value') $param['search'][$col] = $search; // we dont search the customfields
 				}
 			}
 		}
@@ -758,13 +758,13 @@ 
 		{
 			$param['search'] = $this->data2db($param['search']);
 		}
-		if(!array_key_exists('tid', $param['col_filter']) || $param['col_filter']['tid'] === '')
+		if (!array_key_exists('tid', $param['col_filter']) || $param['col_filter']['tid'] === '')
 		{
-			$param['col_filter'][] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
+			$param['col_filter'][] = 'contact_tid != \''.self::DELETED_TYPE.'\'';
 		}
-		elseif(is_null($param['col_filter']['tid']))
+		elseif (is_null($param['col_filter']['tid']))
 		{
-			unset($param['col_filter']['tid']);	// return all entries incl. deleted
+			unset($param['col_filter']['tid']); // return all entries incl. deleted
 		}
 
 		$rows = $this->somain->organisations($param);
@@ -772,11 +772,11 @@ 
 
 		if (!$rows) return array();
 
-		foreach($rows as $n => $row)
+		foreach ($rows as $n => $row)
 		{
-			if (strpos($row['org_name'],'&')!==false) $row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			if (strpos($row['org_name'], '&') !== false) $row['org_name'] = str_replace('&', '*AND*', $row['org_name']);
 			$rows[$n]['id'] = 'org_name:'.$row['org_name'];
-			foreach(array(
+			foreach (array(
 				'org_unit' => lang('departments'),
 				'adr_one_locality' => lang('locations'),
 			) as $by => $by_label)
@@ -787,7 +787,7 @@ 
 				}
 				else
 				{
-					if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
+					if (strpos($row[$by], '&') !== false) $row[$by] = str_replace('&', '*AND*', $row[$by]);
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
 				}
 			}
@@ -820,11 +820,11 @@ 
 	function deleteaccount($data)
 	{
 		$account_id = $data['account_id'];
-		$new_owner =  $data['new_owner'];
+		$new_owner = $data['new_owner'];
 
 		if (!$new_owner)
 		{
-			$this->somain->delete(array('owner' => $account_id));	// so_sql_cf::delete() takes care of cfs too
+			$this->somain->delete(array('owner' => $account_id)); // so_sql_cf::delete() takes care of cfs too
 
 			if (method_exists($this->somain, 'get_lists') &&
 				($lists = $this->somain->get_lists($account_id)))
@@ -834,7 +834,7 @@ 
 		}
 		else
 		{
-			$this->somain->change_owner($account_id,$new_owner);
+			$this->somain->change_owner($account_id, $new_owner);
 		}
 	}
 
@@ -845,16 +845,15 @@ 
 	 * @param int $owner =null account_id of owner or 0 for accounts
 	 * @return Sql
 	 */
-	function get_backend($keys=null,$owner=null)
+	function get_backend($keys = null, $owner = null)
 	{
 		if ($owner === '') $owner = null;
 
-		$contact_id = !is_array($keys) ? $keys :
-			(isset($keys['id']) ? $keys['id'] : $keys['contact_id']);
+		$contact_id = !is_array($keys) ? $keys : (isset($keys['id']) ? $keys['id'] : $keys['contact_id']);
 
 		if ($this->contact_repository != $this->account_repository && is_object($this->so_accounts) &&
 			(!is_null($owner) && !$owner || is_array($keys) && $keys['account_id'] || !is_null($contact_id) &&
-			($this->contact_repository == 'sql' && (!is_numeric($contact_id) && !is_array($contact_id) )||
+			($this->contact_repository == 'sql' && (!is_numeric($contact_id) && !is_array($contact_id)) ||
 			 $this->contact_repository == 'ldap' && is_numeric($contact_id))))
 		{
 			return $this->so_accounts;
@@ -870,28 +869,28 @@ 
 	 * @param int $owner =null account_id of owner or 0 for accounts
 	 * @return array with eGW contact field names
 	 */
-	function get_fields($type='all',$contact_id=null,$owner=null)
+	function get_fields($type = 'all', $contact_id = null, $owner = null)
 	{
-		$def = $this->db->get_table_definitions('api','egw_addressbook');
+		$def = $this->db->get_table_definitions('api', 'egw_addressbook');
 
 		$all_fields = array();
-		foreach(array_keys($def['fd']) as $field)
+		foreach (array_keys($def['fd']) as $field)
 		{
-			$all_fields[] = substr($field,0,8) == 'contact_' ? substr($field,8) : $field;
+			$all_fields[] = substr($field, 0, 8) == 'contact_' ? substr($field, 8) : $field;
 		}
 		if ($type == 'all')
 		{
 			return $all_fields;
 		}
-		$backend =& $this->get_backend($contact_id,$owner);
+		$backend = & $this->get_backend($contact_id, $owner);
 
-		$supported_fields = method_exists($backend,supported_fields) ? $backend->supported_fields() : $all_fields;
+		$supported_fields = method_exists($backend, supported_fields) ? $backend->supported_fields() : $all_fields;
 
 		if ($type == 'supported')
 		{
 			return $supported_fields;
 		}
-		return array_diff($all_fields,$supported_fields);
+		return array_diff($all_fields, $supported_fields);
 	}
 
 	/**
@@ -919,13 +918,12 @@ 
 		// direction SQL --> LDAP, either only accounts, or only contacts or both
 		if (($do = array_intersect($type, array('contacts', 'accounts'))))
 		{
-			$filter = count($do) == 2 ? null :
-				array($do[0] == 'contacts' ? 'contact_owner != 0' : 'contact_owner = 0');
+			$filter = count($do) == 2 ? null : array($do[0] == 'contacts' ? 'contact_owner != 0' : 'contact_owner = 0');
 
-			while (($contacts = $sql_contacts->search(false,false,'n_family,n_given','','',false,'AND',
-				array($start,$num),$filter)))
+			while (($contacts = $sql_contacts->search(false, false, 'n_family,n_given', '', '', false, 'AND',
+				array($start, $num), $filter)))
 			{
-				foreach($contacts as $contact)
+				foreach ($contacts as $contact)
 				{
 					if ($contact['account_id']) $contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
 
@@ -946,12 +944,12 @@ 
 			}
 		}
 		// direction LDAP --> SQL: either "sql" (contacts and accounts) or "accounts-back" (only accounts)
-		if (($do = array_intersect(array('accounts-back','sql'), $type)))
+		if (($do = array_intersect(array('accounts-back', 'sql'), $type)))
 		{
 			//error_log(__METHOD__."(".array2string($type).") do=".array2string($type));
 			$filter = in_array('sql', $do) ? null : array('owner' => 0);
 
-			foreach($ldap_contacts->search(false,false,'n_family,n_given','','',false,'AND',
+			foreach ($ldap_contacts->search(false, false, 'n_family,n_given', '', '', false, 'AND',
 				false, $filter) as $contact)
 			{
 				//error_log(__METHOD__."(".array2string($type).") do=".array2string($type)." migrating ".array2string($contact));
@@ -960,7 +958,7 @@ 
 					$contact = $ldap_contacts->read($contact['id']);
 				}
 				$old_contact_id = $contact['id'];
-				unset($contact['id']);	// ldap uid/account_lid
+				unset($contact['id']); // ldap uid/account_lid
 				if ($contact['account_id'] && ($old = $sql_contacts->read(array('account_id' => $contact['account_id']))))
 				{
 					$contact['id'] = $old['id'];
@@ -972,24 +970,24 @@ 
 				{
 					echo '<p style="margin: 0px;">'.$n.': '.$contact['n_fn'].
 						($contact['org_name'] ? ' ('.$contact['org_name'].')' : '')." --> SQL (".
-						($contact['owner']?lang('User'):lang('Contact')).")<br>\n";
+						($contact['owner'] ? lang('User') : lang('Contact')).")<br>\n";
 
 					$new_contact_id = $sql_contacts->data['id'];
-					echo "&nbsp;&nbsp;&nbsp;&nbsp;" . $old_contact_id . " --> " . $new_contact_id . " / ";
+					echo "&nbsp;&nbsp;&nbsp;&nbsp;".$old_contact_id." --> ".$new_contact_id." / ";
 
-					$tq = $this->db->update('egw_links',array(
+					$tq = $this->db->update('egw_links', array(
 						'link_id1' => $new_contact_id,
-					),array(
+					), array(
 						'link_app1' => 'addressbook',
 						'link_id1' => $old_contact_id
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 
-					$tq = $this->db->update('egw_links',array(
+					$tq = $this->db->update('egw_links', array(
 						'link_id2' => $new_contact_id,
-					),array(
+					), array(
 						'link_app2' => 'addressbook',
 						'link_id2' => $old_contact_id
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 					echo "</p>\n";
 				}
 				else
@@ -1009,21 +1007,21 @@ 
 	 * @param string $extra_labels =null first labels if given (already translated)
 	 * @return array with id => label pairs or false if backend does not support lists
 	 */
-	function get_lists($required=Api\Acl::READ,$extra_labels=null)
+	function get_lists($required = Api\Acl::READ, $extra_labels = null)
 	{
-		if (!method_exists($this->somain,'get_lists')) return false;
+		if (!method_exists($this->somain, 'get_lists')) return false;
 
 		$uids = array();
-		foreach($this->grants as $uid => $rights)
+		foreach ($this->grants as $uid => $rights)
 		{
-			if (($rights & $required) == $required)
+			if (($rights&$required) == $required)
 			{
 				$uids[] = $uid;
 			}
 		}
 		$lists = is_array($extra_labels) ? $extra_labels : array();
 
-		foreach($this->somain->get_lists($uids) as $list_id => $data)
+		foreach ($this->somain->get_lists($uids) as $list_id => $data)
 		{
 			$lists[$list_id] = $data['list_name'];
 			if ($data['list_owner'] != $this->user)
@@ -1042,12 +1040,12 @@ 
 	 * @param boolean $limit_in_ab =false if true only return members from the same owners addressbook
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
-	function read_lists($keys,$member_attr=null,$limit_in_ab=false)
+	function read_lists($keys, $member_attr = null, $limit_in_ab = false)
 	{
 		$backend = (string)$limit_in_ab === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
 		if (!method_exists($backend, 'get_lists')) return false;
 
-		return $backend->get_lists($keys,null,$member_attr,$limit_in_ab);
+		return $backend->get_lists($keys, null, $member_attr, $limit_in_ab);
 	}
 
 	/**
@@ -1059,12 +1057,12 @@ 
 	 * @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())
 	{
 		$backend = (string)$owner === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
 		if (!method_exists($backend, 'add_list')) return false;
 
-		return $backend->add_list($keys,$owner,$contacts,$data);
+		return $backend->add_list($keys, $owner, $contacts, $data);
 	}
 
 	/**
@@ -1075,11 +1073,11 @@ 
 	 * @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 (!method_exists($this->somain,'add2list')) return false;
+		if (!method_exists($this->somain, 'add2list')) return false;
 
-		return $this->somain->add2list($contact,$list,$existing);
+		return $this->somain->add2list($contact, $list, $existing);
 	}
 
 	/**
@@ -1089,11 +1087,11 @@ 
 	 * @param int $list =null list-id or null to remove from all lists
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
-		if (!method_exists($this->somain,'remove_from_list')) return false;
+		if (!method_exists($this->somain, 'remove_from_list')) return false;
 
-		return $this->somain->remove_from_list($contact,$list);
+		return $this->somain->remove_from_list($contact, $list);
 	}
 
 	/**
@@ -1104,7 +1102,7 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!method_exists($this->somain,'delete_list')) return false;
+		if (!method_exists($this->somain, 'delete_list')) return false;
 
 		return $this->somain->delete_list($list);
 	}
@@ -1117,7 +1115,7 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!method_exists($this->somain,'read_list')) return false;
+		if (!method_exists($this->somain, 'read_list')) return false;
 
 		return $this->somain->read_list($list);
 	}
@@ -1128,11 +1126,11 @@ 
 	 * @param int|string $owner ='' addressbook (eg. 0 = accounts), default '' = "all" addressbook (uses the main backend)
 	 * @return boolean
 	 */
-	function lists_available($owner='')
+	function lists_available($owner = '')
 	{
-		$backend =& $this->get_backend(null,$owner);
+		$backend = & $this->get_backend(null, $owner);
 
-		return method_exists($backend,'read_list');
+		return method_exists($backend, 'read_list');
 	}
 
 	/**
@@ -1141,9 +1139,9 @@ 
 	 * @param int|array $owner =null null for all lists user has access too
 	 * @return int
 	 */
-	function lists_ctag($owner=null)
+	function lists_ctag($owner = null)
 	{
-		if (!method_exists($this->somain,'lists_ctag')) return 0;
+		if (!method_exists($this->somain, 'lists_ctag')) return 0;
 
 		return $this->somain->lists_ctag($owner);
 	}

api/src/DateTime.php

Doc Comments +2 added lines, -1 removed lines

@@ -91,6 +91,7 @@ 
 	 * 	array with values for keys('year','month','day') or 'full' plus 'hour','minute' and optional 'second'
 	 * @param DateTimeZone $tz =null timezone, default user time (PHP DateTime default to server time!)
 	 * @param string &$type=null on return type of $time (optional)
+	 * @param string $type
 	 * @throws Exception if $time can NOT be parsed
 	 */
 	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
@@ -573,7 +574,7 @@ 
 	 * - return UTC and oceans at the end
 	 * - if (user lang is a european language), move Europe to top
 	 *
-	 * @return array continent|ocean => array(tz-name => tz-label incl. current time)
+	 * @return string continent|ocean => array(tz-name => tz-label incl. current time)
 	 */
 	public static function getTimezones()
 	{

Braces +76 added lines, -18 removed lines

@@ -95,7 +95,11 @@ 
 	 */
 	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz))
+		{
+			$tz = self::$user_timezone;
+		}
+		// default user timezone
 
 		switch(($type = gettype($time)))
 		{
@@ -108,7 +112,11 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8)
+					{
+						$t_str .= 'T000000';
+					}
+					// 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
 						parent::__construct($t_str,$tz);
@@ -116,7 +124,10 @@ 
 					}
 					catch(Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
-						if (!is_numeric($time)) throw $e;
+						if (!is_numeric($time))
+						{
+							throw $e;
+						}
 					}
 				}
 				$type = 'integer';
@@ -137,7 +148,9 @@ 
 
 			case 'array':
 				parent::__construct('now',$tz);
-				if (isset($time['Y']))	// array format used in eTemplate
+				if (isset($time['Y']))
+				{
+					// array format used in eTemplate
 				{
 					$time = array(
 						'year'   => $time['Y'],
@@ -148,13 +161,17 @@ 
 						'second' => $time['s'],
 					);
 				}
+				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
 					$time['year']  = (int)substr($time['full'],0,4);
 					$time['month'] = (int)substr($time['full'],4,2);
 					$time['day']   = (int)substr($time['full'],6,2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				if (isset($time['year']))
+				{
+					$this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				}
 				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
 				break;
 
@@ -178,7 +195,10 @@ 
 	 */
 	public function add($interval)
 	{
-		if (is_string($interval)) $interval = DateInterval::createFromDateString($interval);
+		if (is_string($interval))
+		{
+			$interval = DateInterval::createFromDateString($interval);
+		}
 
 		parent::add($interval);
 	}
@@ -202,7 +222,10 @@ 
 				$wstart = -($wday ? $wday-1 : 6);
 				break;
 		}
-		if ($wstart) $this->add($wstart.'days');
+		if ($wstart)
+		{
+			$this->add($wstart.'days');
+		}
 	}
 
 	/**
@@ -263,15 +286,27 @@ 
 			}
 			elseif ($sday || $eday)
 			{
-				if ($sday) $start->add($sday.'days');
-				if ($eday) $end->add($eday.'days');
+				if ($sday)
+				{
+					$start->add($sday.'days');
+				}
+				if ($eday)
+				{
+					$end->add($eday.'days');
+				}
 			}
 			elseif ($sweek || $eweek)
 			{
 				$start->setWeekstart();
-				if ($sweek) $start->add($sweek.'weeks');
+				if ($sweek)
+				{
+					$start->add($sweek.'weeks');
+				}
 				$end->setWeekstart();
-				if ($eweek) $end->add($eweek.'weeks');
+				if ($eweek)
+				{
+					$end->add($eweek.'weeks');
+				}
 			}
 		}
 		// convert start + end from user to servertime for the filter
@@ -416,7 +451,10 @@ 
 		}
 		$time->setUser();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -446,7 +484,10 @@ 
 		}
 		$time->setServer();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -489,7 +530,10 @@ 
 	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
-		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
+		if (!empty($dateformat))
+		{
+			self::$user_dateformat = $dateformat;
+		}
 
 		switch($timeformat)
 		{
@@ -527,7 +571,10 @@ 
 	 */
 	public static function tz_offset_s($time='now')
 	{
-		if (!($time instanceof DateTime)) $time = new DateTime($time);
+		if (!($time instanceof DateTime))
+		{
+			$time = new DateTime($time);
+		}
 
 		return self::$user_timezone->getOffset($time) - self::$server_timezone->getOffset($time);
 	}
@@ -635,9 +682,17 @@ 
 		);
 		foreach(DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			if (in_array($name,$no_vtimezone))
+			{
+				continue;
+			}
+			// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
 			list($continent) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
+			if (!isset($tzs[$continent]))
+			{
+				continue;
+			}
+			// old depricated timezones
 			$datetime = new DateTime('now',new DateTimeZone($name));
 			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
 			unset($datetime);
@@ -676,10 +731,13 @@ 
 		{
 			$user_tzs = array_merge(array($tz),$user_tzs);
 		}
-		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
+		if (!$user_tzs)
+		{
+			// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
+		}
 		if ($extra && !in_array($extra,$user_tzs))
 		{
 			$user_tzs = array_merge(array($extra),$user_tzs);

Spacing +77 added lines, -77 removed lines

@@ -93,11 +93,11 @@ 
 	 * @param string &$type=null on return type of $time (optional)
 	 * @throws Exception if $time can NOT be parsed
 	 */
-	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
+	public function __construct($time = 'now', DateTimeZone $tz = null, &$type = null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz)) $tz = self::$user_timezone; // default user timezone
 
-		switch(($type = gettype($time)))
+		switch (($type = gettype($time)))
 		{
 			case 'NULL':
 			case 'boolean':	// depricated use in calendar for 'now'
@@ -108,13 +108,13 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000'; // 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
-						parent::__construct($t_str,$tz);
+						parent::__construct($t_str, $tz);
 						break;
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
 						if (!is_numeric($time)) throw $e;
 					}
@@ -131,12 +131,12 @@ 
 				}
 				else*/
 				{
-					parent::__construct(date('Y-m-d H:i:s',$time),$tz);
+					parent::__construct(date('Y-m-d H:i:s', $time), $tz);
 				}
 				break;
 
 			case 'array':
-				parent::__construct('now',$tz);
+				parent::__construct('now', $tz);
 				if (isset($time['Y']))	// array format used in eTemplate
 				{
 					$time = array(
@@ -150,18 +150,18 @@ 
 				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
-					$time['year']  = (int)substr($time['full'],0,4);
-					$time['month'] = (int)substr($time['full'],4,2);
-					$time['day']   = (int)substr($time['full'],6,2);
+					$time['year']  = (int)substr($time['full'], 0, 4);
+					$time['month'] = (int)substr($time['full'], 4, 2);
+					$time['day']   = (int)substr($time['full'], 6, 2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
-				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
+				if (isset($time['year'])) $this->setDate((int)$time['year'], (int)$time['month'], isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				$this->setTime((int)$time['hour'], (int)$time['minute'], (int)$time['second']);
 				break;
 
 			case 'object':
 				if ($time instanceof \DateTime)
 				{
-					parent::__construct($time->format('Y-m-d H:i:s'),$time->getTimezone());
+					parent::__construct($time->format('Y-m-d H:i:s'), $time->getTimezone());
 					$this->setTimezone($tz);
 					break;
 				}
@@ -188,18 +188,18 @@ 
 	 */
 	public function setWeekstart()
 	{
-		$wday = (int) $this->format('w'); // 0=sun, ..., 6=sat
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		$wday = (int)$this->format('w'); // 0=sun, ..., 6=sat
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$wstart = -$wday;
 				break;
 			case 'Saturday':
-				$wstart =  -(6-$wday);
+				$wstart = -(6 - $wday);
 				break;
 			case 'Moday':
 			default:
-				$wstart = -($wday ? $wday-1 : 6);
+				$wstart = -($wday ? $wday - 1 : 6);
 				break;
 		}
 		if ($wstart) $this->add($wstart.'days');
@@ -215,7 +215,7 @@ 
 	 * @param array $filters $name => list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) pairs with offsets
 	 * @return string
 	 */
-	public static function sql_filter($name, &$start, &$end, $column, array $filters=array())
+	public static function sql_filter($name, &$start, &$end, $column, array $filters = array())
 	{
 		if ($name == 'custom' && $start)
 		{
@@ -240,26 +240,26 @@ 
 			$end   = new DateTime('now');
 			$end->setTime(0, 0, 0);
 
-			$year  = (int) $start->format('Y');
-			$month = (int) $start->format('m');
+			$year  = (int)$start->format('Y');
+			$month = (int)$start->format('m');
 
-			list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) = $filters[$name];
+			list($syear, $smonth, $sday, $sweek, $eyear, $emonth, $eday, $eweek) = $filters[$name];
 
 			// Handle quarters
-			if(stripos($name, 'quarter') !== false)
+			if (stripos($name, 'quarter') !== false)
 			{
-				$start->setDate($year, ((int)floor(($smonth+$month) / 3.1)) * 3 + 1, 1);
-				$end->setDate($year, ((int)floor(($emonth+$month) / 3.1)+1) * 3 + 1, 1);
+				$start->setDate($year, ((int)floor(($smonth + $month) / 3.1)) * 3 + 1, 1);
+				$end->setDate($year, ((int)floor(($emonth + $month) / 3.1) + 1) * 3 + 1, 1);
 			}
 			elseif ($syear || $eyear)
 			{
-				$start->setDate($year+$syear, 1, 1);
-				$end->setDate($year+$eyear, 1, 1);
+				$start->setDate($year + $syear, 1, 1);
+				$end->setDate($year + $eyear, 1, 1);
 			}
 			elseif ($smonth || $emonth)
 			{
-				$start->setDate($year, $month+$smonth, 1);
-				$end->setDate($year, $month+$emonth, 1);
+				$start->setDate($year, $month + $smonth, 1);
+				$end->setDate($year, $month + $emonth, 1);
 			}
 			elseif ($sday || $eday)
 			{
@@ -276,9 +276,9 @@ 
 		}
 		// convert start + end from user to servertime for the filter
 		$sql = '('.DateTime::user2server($start, 'ts').' <= '.$column;
-		if($end)
+		if ($end)
 		{
-			$sql .=' AND '.$column.' < '.DateTime::user2server($end, 'ts');
+			$sql .= ' AND '.$column.' < '.DateTime::user2server($end, 'ts');
 
 			// returned timestamps: $end is an inclusive date, eg. for today it's equal to start!
 			$end->add('-1day');
@@ -320,9 +320,9 @@ 
 	 * 		true = date only, false = time only as in user prefs, '' = date+time as in user prefs
 	 * @return int|string|array|datetime see $type
 	 */
-	public function format($type='')
+	public function format($type = '')
 	{
-		switch((string)$type)
+		switch ((string)$type)
 		{
 			case '':	// empty string:  date and time as in user prefs
 			//case '':	// boolean false: time as in user prefs
@@ -347,7 +347,7 @@ 
 			case 'integer':
 			case 'ts':
 				// ToDo: Check if PHP5.3 getTimestamp does the same, or always returns UTC timestamp
-				return mktime(parent::format('H'),parent::format('i'),parent::format('s'),parent::format('m'),parent::format('d'),parent::format('Y'));
+				return mktime(parent::format('H'), parent::format('i'), parent::format('s'), parent::format('m'), parent::format('d'), parent::format('Y'));
 
 			case 'object':
 			case 'datetime':
@@ -365,7 +365,7 @@ 
 					'second' => (int)parent::format('s'),
 					'full'   => parent::format('Ymd'),
 				);
-				$arr['raw'] = mktime($arr['hour'],$arr['minute'],$arr['second'],$arr['month'],$arr['day'],$arr['year']);
+				$arr['raw'] = mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year']);
 				return $arr;
 
 			case 'date_array':	// array with short keys used by date: Y, m, d, H, i, s (used in eTemplate)
@@ -399,19 +399,19 @@ 
 	 * @param string $type =null type or return-value, default (null) same as $time
 	 * @return int|string|array|datetime null if time could not be parsed
 	 */
-	public static function server2user($time,$type=null)
+	public static function server2user($time, $type = null)
 	{
-		$typeof='DateTime';
+		$typeof = 'DateTime';
 		if (!($time instanceof DateTime))
 		{
 			try
 			{
 				$time = new DateTime($time, self::$server_timezone, $typeof);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				unset($e);
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		$time->setUser();
@@ -429,19 +429,19 @@ 
 	 * @param string $type =null type or return-value, default (null) same as $time
 	 * @return int|string|array|datetime null if time could not be parsed
 	 */
-	public static function user2server($time,$type=null)
+	public static function user2server($time, $type = null)
 	{
-		$typeof='DateTime';
+		$typeof = 'DateTime';
 		if (!($time instanceof DateTime))
 		{
 			try
 			{
-				$time = new DateTime($time,self::$user_timezone,$typeof);
+				$time = new DateTime($time, self::$user_timezone, $typeof);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				unset($e);
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		$time->setServer();
@@ -461,7 +461,7 @@ 
 	 * 		true = date only, false = time only as in user prefs, '' = date+time as in user prefs
 	 * @return int|string|array|datetime see $type, null if time could not be parsed
 	 */
-	public static function to($time='now',$type='')
+	public static function to($time = 'now', $type = '')
 	{
 		if (!($time instanceof DateTime))
 		{
@@ -469,10 +469,10 @@ 
 			{
 				$time = new DateTime($time);
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				unset($e);
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		return $time->format($type);
@@ -486,12 +486,12 @@ 
 	 * @param string|int $timeformat ='' integer 12, 24, or format string eg. 'H:i'
 	 * @return DateTimeZone
 	 */
-	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
+	public static function setUserPrefs($tz, $dateformat = '', $timeformat = '')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
 		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
 
-		switch($timeformat)
+		switch ($timeformat)
 		{
 			case '':
 				break;
@@ -508,7 +508,7 @@ 
 		try {
 			self::$user_timezone = new DateTimeZone($tz);
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			unset($e);
 			// silently use server timezone, as we have no means to report the wrong timezone to the user from this class
@@ -525,7 +525,7 @@ 
 	 * @param int|string|DateTime $time ='now'
 	 * @return int difference in seconds between user and server time (for the given time!)
 	 */
-	public static function tz_offset_s($time='now')
+	public static function tz_offset_s($time = 'now')
 	{
 		if (!($time instanceof DateTime)) $time = new DateTime($time);
 
@@ -546,17 +546,17 @@ 
 		try {
 			self::$server_timezone = new DateTimeZone($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			try {
 				self::$server_timezone = new DateTimeZone(date_default_timezone_get());
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				self::$server_timezone = new DateTimeZone('Europe/Berlin');
 			}
 			error_log(__METHOD__."() invalid server_timezone='{$GLOBALS['egw_info']['server']['server_timezone']}' setting now '".self::$server_timezone->getName()."'!");
-			Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = self::$server_timezone->getName(),'phpgwapi');
+			Config::save_value('server_timezone', $GLOBALS['egw_info']['server']['server_timezone'] = self::$server_timezone->getName(), 'phpgwapi');
 		}
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['common']['tz']))
 		{
@@ -579,15 +579,15 @@ 
 	{
 		// prepare list of timezones from php, ignoring depricated ones and sort as follows
 		$tzs = array(
-			'Africa'     => array(),	// Contients
+			'Africa'     => array(), // Contients
 			'America'    => array(),
 			'Asia'       => array(),
 			'Australia'  => array(),
 			'Europe'     => array(),
-			'Atlantic'   => array(),	// Oceans
+			'Atlantic'   => array(), // Oceans
 			'Pacific'    => array(),
 			'Indian'     => array(),
-			'Antarctica' => array(),	// Poles
+			'Antarctica' => array(), // Poles
 			'Arctic'     => array(),
 			'UTC'        => array('UTC' => 'UTC'),
 		);
@@ -633,27 +633,27 @@ 
 			'Australia/Yancowinna',
 			'Pacific/Samoa',
 		);
-		foreach(DateTimeZone::listIdentifiers() as $name)
+		foreach (DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
-			list($continent) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
-			$datetime = new DateTime('now',new DateTimeZone($name));
-			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
+			if (in_array($name, $no_vtimezone)) continue; // do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			list($continent) = explode('/', $name, 2);
+			if (!isset($tzs[$continent])) continue; // old depricated timezones
+			$datetime = new DateTime('now', new DateTimeZone($name));
+			$tzs[$continent][$name] = str_replace(array('_', '/'), array(' ', ' / '), $name)."  ".$datetime->format();
 			unset($datetime);
 		}
-		foreach($tzs as $continent => &$data)
+		foreach ($tzs as $continent => &$data)
 		{
-			natcasesort($data);	// sort cities
+			natcasesort($data); // sort cities
 		}
 		unset($data);
 
 		// if user lang or installed langs contain a european language --> move Europe to top of tz list
 		$langs = class_exists('EGroupware\\Api\\Translation') ? Translation::get_installed_langs() : array();
-		if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang'])+array_keys($langs),
-			array('de','fr','it','nl','bg','ca','cs','da','el','es-es','et','eu','fi','hr','hu','lt','no','pl','pt','sk','sl','sv','tr','uk')))
+		if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang']) + array_keys($langs),
+			array('de', 'fr', 'it', 'nl', 'bg', 'ca', 'cs', 'da', 'el', 'es-es', 'et', 'eu', 'fi', 'hr', 'hu', 'lt', 'no', 'pl', 'pt', 'sk', 'sl', 'sv', 'tr', 'uk')))
 		{
-			$tzs = array_merge(array('Europe' => $tzs['Europe']),$tzs);
+			$tzs = array_merge(array('Europe' => $tzs['Europe']), $tzs);
 		}
 		return $tzs;
 	}
@@ -664,30 +664,30 @@ 
 	 * @param string $extra extra timezone to add, if not already included in user timezones
 	 * @return array tzid => label
 	 */
-	public static function getUserTimezones($extra=null)
+	public static function getUserTimezones($extra = null)
 	{
 		$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
-		$user_tzs = explode(',',$GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
+		$user_tzs = explode(',', $GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
 		if (count($user_tzs) <= 1)
 		{
 			$user_tzs = $tz ? array($tz) : array();
 		}
-		if ($tz && !in_array($tz,$user_tzs))
+		if ($tz && !in_array($tz, $user_tzs))
 		{
-			$user_tzs = array_merge(array($tz),$user_tzs);
+			$user_tzs = array_merge(array($tz), $user_tzs);
 		}
 		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		if ($extra && !in_array($extra,$user_tzs))
+		if ($extra && !in_array($extra, $user_tzs))
 		{
-			$user_tzs = array_merge(array($extra),$user_tzs);
+			$user_tzs = array_merge(array($extra), $user_tzs);
 		}
-		$ret_user_tzs = array_combine($user_tzs,$user_tzs);
-		foreach($ret_user_tzs as &$label)
+		$ret_user_tzs = array_combine($user_tzs, $user_tzs);
+		foreach ($ret_user_tzs as &$label)
 		{
-			$label = str_replace(array('_','/'),array(' ',' / '),$label);
+			$label = str_replace(array('_', '/'), array(' ', ' / '), $label);
 		}
 		return $ret_user_tzs;
 	}

api/src/Db.php

Doc Comments +4 added lines, -12 removed lines

@@ -371,7 +371,7 @@ 
 	 * require_once(EGW_INCLUDE_ROOT.'/api/src/Db.php');
 	 * EGroupware\Api\Db::$health_check = array('EGroupware\Api\Db', 'galera_cluster_health');
 	 *
-	 * @param Api\Db $db already connected Api\Db instance to check
+	 * @param Db $db already connected Api\Db instance to check
 	 * @throws Db\Exception\Connection if node should NOT be used
 	 */
 	static function galera_cluster_health(Db $db)
@@ -1077,7 +1077,6 @@ 
 	 *
 	 * Example: $db->concat($db->quote('Hallo '),'username') would return
 	 *	for mysql "concat('Hallo ',username)" or "'Hallo ' || username" for postgres
-	 * @param string $str1 already quoted stringliteral or column-name, variable number of arguments
 	 * @return string to be used in a query
 	 */
 	function concat(/*$str1, ...*/)
@@ -1097,7 +1096,7 @@ 
 	 * @param string $expr column-name or expression optional prefixed with "DISTINCT"
 	 * @param string $order_by ='' optional order
 	 * @param string $separator =',' optional separator, default is comma
-	 * @return string|boolean false if not supported by dbms
+	 * @return false|string false if not supported by dbms
 	 */
 	function group_concat($expr, $order_by='', $separator=',')
 	{
@@ -1430,7 +1429,7 @@ 
 	*	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
 	* @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
 	*	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
-	* @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
+	* @param boolean $only if set to an array only colums which are set (as data !!!) are written
 	*	typicaly used to form a WHERE-clause from the primary keys.
 	*	If set to True, only columns from the colum_definitons are written.
 	* @param array|boolean $column_definitions this can be set to the column-definitions-array
@@ -1910,13 +1909,6 @@ 
 	 * gives "(name='test\'ed' AND lang='en') OR 'owner' IN (0,4,5,6,10)" if name,lang are strings and owner is an integer
 	 *
 	 * @param string|array $table_def table-name or definition array
-	 * @param mixed $args variable number of arguments of the following types:
-	 *	string: get's as is into the result
-	 *	array:	column-name / value pairs: the value gets quoted according to the type of the column and prefixed
-	 *		with column-name=, multiple pairs are AND'ed together, see db::column_data_implode
-	 *	bool: If False or is_null($arg): the next 2 (!) arguments gets ignored
-	 *
-	 * Please note: As the function has a variable number of arguments, you CAN NOT add further parameters !!!
 	 *
 	 * @return string the expression generated from the arguments
 	 */
@@ -2054,7 +2046,7 @@ 
 	 * Strip eg. a prefix from the keys of an array
 	 *
 	 * @param array $arr
-	 * @param string|array $strip
+	 * @param string $strip
 	 * @return array
 	 */
 	static function strip_array_keys($arr,$strip)

Indentation +241 added lines, -241 removed lines

@@ -67,43 +67,43 @@ 
 	 */
 	const FETCH_BOTH = ADODB_FETCH_BOTH;
 	/**
-	* @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
-	*/
+	 * @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
+	 */
 	var $Type     = '';
 
 	/**
-	* @var string $type database type as defined in the header.inc.php, eg. mysqlt
-	*/
+	 * @var string $type database type as defined in the header.inc.php, eg. mysqlt
+	 */
 	var $setupType     = '';
 
 	/**
-	* @var string $Host database host to connect to
-	*/
+	 * @var string $Host database host to connect to
+	 */
 	var $Host     = '';
 
 	/**
-	* @var string $Port port number of database to connect to
-	*/
+	 * @var string $Port port number of database to connect to
+	 */
 	var $Port     = '';
 
 	/**
-	* @var string $Database name of database to use
-	*/
+	 * @var string $Database name of database to use
+	 */
 	var $Database = '';
 
 	/**
-	* @var string $User name of database user
-	*/
+	 * @var string $User name of database user
+	 */
 	var $User     = '';
 
 	/**
-	* @var string $Password password for database user
-	*/
+	 * @var string $Password password for database user
+	 */
 	var $Password = '';
 
 	/**
-	* @var int $Debug enable debuging - 0 no, 1 yes
-	*/
+	 * @var int $Debug enable debuging - 0 no, 1 yes
+	 */
 	var $Debug         = 0;
 
 	/**
@@ -114,23 +114,23 @@ 
 	var $log_updates = false;
 
 	/**
-	* @var array $Record current record
-	*/
+	 * @var array $Record current record
+	 */
 	var $Record   = array();
 
 	/**
-	* @var int row number for current record
-	*/
+	 * @var int row number for current record
+	 */
 	var $Row;
 
 	/**
-	* @var int $Errno internal rdms error number for last error
-	*/
+	 * @var int $Errno internal rdms error number for last error
+	 */
 	var $Errno    = 0;
 
 	/**
-	* @var string descriptive text from last error
-	*/
+	 * @var string descriptive text from last error
+	 */
 	var $Error    = '';
 
 	/**
@@ -270,8 +270,8 @@ 
 	}
 
 	/**
-	* @param string $query query to be executed (optional)
-	*/
+	 * @param string $query query to be executed (optional)
+	 */
 
 	function db($query = '')
 	{
@@ -279,8 +279,8 @@ 
 	}
 
 	/**
-	* @return int current connection id
-	*/
+	 * @return int current connection id
+	 */
 	function link_id()
 	{
 		return $this->Link_ID;
@@ -652,8 +652,8 @@ 
 	}
 
 	/**
-	* Close a connection to a database
-	*/
+	 * Close a connection to a database
+	 */
 	function disconnect()
 	{
 		if (!$this->privat_Link_ID)
@@ -667,11 +667,11 @@ 
 	}
 
 	/**
-	* Convert a unix timestamp to a rdms specific timestamp
-	*
-	* @param int unix timestamp
-	* @return string rdms specific timestamp
-	*/
+	 * Convert a unix timestamp to a rdms specific timestamp
+	 *
+	 * @param int unix timestamp
+	 * @return string rdms specific timestamp
+	 */
 	function to_timestamp($epoch)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -683,11 +683,11 @@ 
 	}
 
 	/**
-	* Convert a rdms specific timestamp to a unix timestamp
-	*
-	* @param string rdms specific timestamp
-	* @return int unix timestamp
-	*/
+	 * Convert a rdms specific timestamp to a unix timestamp
+	 *
+	 * @param string rdms specific timestamp
+	 * @return int unix timestamp
+	 */
 	function from_timestamp($timestamp)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -709,19 +709,19 @@ 
 	}
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from, default 0
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
-	* @return ADORecordSet or false, if the query fails
-	* @throws Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $offset row to start from, default 0
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
+	 * @return ADORecordSet or false, if the query fails
+	 * @throws Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
+	 */
 	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=self::FETCH_BOTH, $reconnect=true)
 	{
 		unset($line, $file);	// not used anymore
@@ -786,26 +786,26 @@ 
 	}
 
 	/**
-	* Execute a query with limited result set
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $offset row to start from, default 0
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Execute a query with limited result set
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $offset row to start from, default 0
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '',$inputarr=false)
 	{
 		return $this->query($Query_String,$line,$file,$offset,$num_rows,$inputarr);
 	}
 
 	/**
-	* Begin Transaction
-	*
-	* @return int/boolean current transaction-id, of false if no connection
-	*/
+	 * Begin Transaction
+	 *
+	 * @return int/boolean current transaction-id, of false if no connection
+	 */
 	function transaction_begin()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -817,10 +817,10 @@ 
 	}
 
 	/**
-	* Complete the transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Complete the transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_commit()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -832,10 +832,10 @@ 
 	}
 
 	/**
-	* Rollback the current transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Rollback the current transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_abort()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -847,12 +847,12 @@ 
 	}
 
 	/**
-	* Find the primary key of the last insertion on the current db connection
-	*
-	* @param string $table name of table the insert was performed on
-	* @param string $field the autoincrement primary key of the table
-	* @return int the id, -1 if fails
-	*/
+	 * Find the primary key of the last insertion on the current db connection
+	 *
+	 * @param string $table name of table the insert was performed on
+	 * @param string $field the autoincrement primary key of the table
+	 * @return int the id, -1 if fails
+	 */
 	function get_last_insert_id($table, $field)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -875,10 +875,10 @@ 
 	}
 
 	/**
-	* Get the number of rows affected by last update or delete
-	*
-	* @return int number of rows
-	*/
+	 * Get the number of rows affected by last update or delete
+	 *
+	 * @return int number of rows
+	 */
 	function affected_rows()
 	{
 		if ($this->log_updates) return 0;
@@ -891,14 +891,14 @@ 
 	}
 
 	/**
-	* Get description of a table
-	*
-	* Beside the column-name all other data depends on the db-type !!!
-	*
-	* @param string $table name of table to describe
-	* @param bool $full optional, default False summary information, True full information
-	* @return array table meta data
-	*/
+	 * Get description of a table
+	 *
+	 * Beside the column-name all other data depends on the db-type !!!
+	 *
+	 * @param string $table name of table to describe
+	 * @param bool $full optional, default False summary information, True full information
+	 * @return array table meta data
+	 */
 	function metadata($table='',$full=false)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -980,10 +980,10 @@ 
 	}
 
 	/**
-	* Return a list of indexes in current database
-	*
-	* @return array list of indexes
-	*/
+	 * Return a list of indexes in current database
+	 *
+	 * @return array list of indexes
+	 */
 	function index_names()
 	{
 		$indices = array();
@@ -1004,10 +1004,10 @@ 
 	}
 
 	/**
-	* Returns an array containing column names that are the primary keys of $tablename.
-	*
-	* @return array of columns
-	*/
+	 * Returns an array containing column names that are the primary keys of $tablename.
+	 *
+	 * @return array of columns
+	 */
 	function pkey_columns($tablename)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -1018,13 +1018,13 @@ 
 	}
 
 	/**
-	* Create a new database
-	*
-	* @param string $adminname name of database administrator user (optional)
-	* @param string $adminpasswd password for the database administrator user (optional)
-	* @param string $charset default charset for the database
-	* @param string $grant_host ='localhost' host/ip of the webserver
-	*/
+	 * Create a new database
+	 *
+	 * @param string $adminname name of database administrator user (optional)
+	 * @param string $adminpasswd password for the database administrator user (optional)
+	 * @param string $charset default charset for the database
+	 * @param string $grant_host ='localhost' host/ip of the webserver
+	 */
 	function create_database($adminname = '', $adminpasswd = '', $charset='', $grant_host='localhost')
 	{
 		$currentUser = $this->User;
@@ -1280,12 +1280,12 @@ 
 	}
 
 	/**
-	* Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
-	*
-	* This is mostly copy & paste from adodb's datadict class
-	* @param string $_name
-	* @return string quoted string
-	*/
+	 * Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
+	 *
+	 * This is mostly copy & paste from adodb's datadict class
+	 * @param string $_name
+	 * @return string quoted string
+	 */
 	function name_quote($_name = NULL)
 	{
 		if (!is_string($_name))
@@ -1324,19 +1324,19 @@ 
 	}
 
 	/**
-	* Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
-	*
-	* Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
-	* Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
-	* Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
-	*
-	* @param mixed $value the value to be escaped
-	* @param string|boolean $type =false string the type of the db-column, default False === varchar
-	* @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
-	* @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
-	* @param string $glue =',' used to glue array values together for the string type
-	* @return string escaped sting
-	*/
+	 * Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
+	 *
+	 * Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
+	 * Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
+	 * Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
+	 *
+	 * @param mixed $value the value to be escaped
+	 * @param string|boolean $type =false string the type of the db-column, default False === varchar
+	 * @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
+	 * @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
+	 * @param string $glue =',' used to glue array values together for the string type
+	 * @return string escaped sting
+	 */
 	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
 	{
 		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
@@ -1417,27 +1417,27 @@ 
 	}
 
 	/**
-	* Implodes an array of column-value pairs for the use in sql-querys.
-	* All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
-	* @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
-	*	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
-	*	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
-	*	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
-	*	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
-	* @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
-	*	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
-	* @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
-	*	typicaly used to form a WHERE-clause from the primary keys.
-	*	If set to True, only columns from the colum_definitons are written.
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	* @return string SQL
-	*/
+	 * Implodes an array of column-value pairs for the use in sql-querys.
+	 * All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
+	 * @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
+	 *	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
+	 *	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
+	 *	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
+	 *	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
+	 * @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
+	 *	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
+	 * @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
+	 *	typicaly used to form a WHERE-clause from the primary keys.
+	 *	If set to True, only columns from the colum_definitons are written.
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 * @return string SQL
+	 */
 	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 	{
 		if (!is_array($array))	// this allows to give an SQL-string for delete or update
@@ -1523,14 +1523,14 @@ 
 	}
 
 	/**
-	* Sets the default column-definitions for use with column_data_implode()
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	*/
+	 * Sets the default column-definitions for use with column_data_implode()
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 */
 	function set_column_definitions($column_definitions=False)
 	{
 		$this->column_definitions=$column_definitions;
@@ -1570,17 +1570,17 @@ 
 	}
 
 	/**
-	* reads the table-definitions from the app's setup/tables_current.inc.php file
-	*
-	* The already read table-definitions are shared between all db-instances via a static var.
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
-	*	true to search the already loaded table-definitions for $table and then search all existing apps for it
-	* @param bool|string $table if set return only defintions of that table, else return all defintions
-	* @return mixed array with table-defintions or False if file not found
-	*/
+	 * reads the table-definitions from the app's setup/tables_current.inc.php file
+	 *
+	 * The already read table-definitions are shared between all db-instances via a static var.
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
+	 *	true to search the already loaded table-definitions for $table and then search all existing apps for it
+	 * @param bool|string $table if set return only defintions of that table, else return all defintions
+	 * @return mixed array with table-defintions or False if file not found
+	 */
 	function get_table_definitions($app=False,$table=False)
 	{
 		// ease the transition to api
@@ -1676,21 +1676,21 @@ 
 	}
 
 	/**
-	* Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
-	*	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
+	 *	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
@@ -1786,20 +1786,20 @@ 
 	}
 
 	/**
-	* Updates the data of one or more rows in a table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Updates the data of one or more rows in a table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
@@ -1876,18 +1876,18 @@ 
 	}
 
 	/**
-	* Deletes one or more rows in table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Deletes one or more rows in table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function delete($table,$where,$line,$file,$app=False,$table_def=False)
 	{
 		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
@@ -1953,25 +1953,25 @@ 
 	}
 
 	/**
-	* Selects one or more rows in table depending on where, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array|string $cols string or array of column-names / select-expressions
-	* @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param string $append string to append to the end of the query, eg. ORDER BY ...
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param string $join =null 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!
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Selects one or more rows in table depending on where, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array|string $cols string or array of column-names / select-expressions
+	 * @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param string $append string to append to the end of the query, eg. ORDER BY ...
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param string $join =null 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!
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=self::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
@@ -2006,20 +2006,20 @@ 
 	}
 
 	/**
-	* Does a union over multiple selects
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
-	*	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string $order_by ORDER BY statement for the union
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Does a union over multiple selects
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
+	 *	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string $order_by ORDER BY statement for the union
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=self::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";

Braces +244 added lines, -61 removed lines

@@ -383,7 +383,10 @@ 
 			if ($state['wsrep_local_state_comment'] == 'Synced' ||
 				// if we have only 2 nodes (2. one starting), we can only use the donor
 				$state['wsrep_local_state_comment'] == 'Donor/Desynced' &&
-					$state['wsrep_cluster_size'] == 2) return;
+					$state['wsrep_cluster_size'] == 2)
+			{
+				return;
+			}
 
 			throw new Db\Exception\Connection('Node is NOT Synced! '.array2string($state));
 		}
@@ -402,7 +405,10 @@ 
 		$hosts = explode(';', $this->Host[0] == '@' ? getenv(substr($this->Host, 1)) : $this->Host);
 		$num_hosts = count($hosts);
 		$n =& Cache::getSession(__CLASS__, $this->Host);
-		if (!isset($n)) $n = 0;
+		if (!isset($n))
+		{
+			$n = 0;
+		}
 
 		if ($next && ++$n >= $num_hosts+2)
 		{
@@ -432,7 +438,10 @@ 
 			foreach(array('Database','User','Password','Port','Type') as $name)
 			{
 				$$name = $this->$name;
-				if (${$name}[0] == '@' && $name != 'Password') $$name = getenv(substr($$name, 1));
+				if (${$name}[0] == '@' && $name != 'Password')
+				{
+					$$name = getenv(substr($$name, 1));
+				}
 			}
 			$this->setupType = $php_extension = $Type;
 
@@ -451,7 +460,10 @@ 
 					$Type = 'mssql';
 					// fall through
 				case 'mssql':
-					if ($Port) $Host .= ','.$Port;
+					if ($Port)
+					{
+						$Host .= ','.$Port;
+					}
 					break;
 
 				case 'odbc_oracle':
@@ -486,7 +498,10 @@ 
 					$this->Type = 'mysql';		// need to be "mysql", so apps can check just for "mysql"!
 					// fall through
 				default:
-					if ($Port) $Host .= ':'.$Port;
+					if ($Port)
+					{
+						$Host .= ':'.$Port;
+					}
 					break;
 			}
 			if (!isset($GLOBALS['egw']->ADOdb) ||	// we have no connection so far
@@ -501,10 +516,13 @@ 
 				{
 					throw new Db\Exception\Connection("Necessary php database support for $this->Type (".PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX.") not loaded and can't be loaded, exiting !!!");
 				}
-				if (!isset($GLOBALS['egw']->ADOdb))	// use the global object to store the connection
+				if (!isset($GLOBALS['egw']->ADOdb))
+				{
+					// use the global object to store the connection
 				{
 					$this->Link_ID =& $GLOBALS['egw']->ADOdb;
 				}
+				}
 				else
 				{
 					$this->privat_Link_ID = True;	// remember that we use a privat Link_ID for disconnect
@@ -600,7 +618,11 @@ 
 	 */
 	function __sleep()
 	{
-		if (!empty($this->setupType)) $this->Type = $this->setupType;	// restore Type eg. to mysqli
+		if (!empty($this->setupType))
+		{
+			$this->Type = $this->setupType;
+		}
+		// restore Type eg. to mysqli
 
 		$vars = get_object_vars($this);
 		unset($vars['Link_ID']);
@@ -663,7 +685,10 @@ 
 		unset($this->Link_ID);
 		$this->Link_ID = 0;
 
-		if (!empty($this->setupType)) $this->Type = $this->setupType;
+		if (!empty($this->setupType))
+		{
+			$this->Type = $this->setupType;
+		}
 	}
 
 	/**
@@ -772,16 +797,22 @@ 
 		}
 		if (!$rs)
 		{
-			if ($reconnect && $this->Type == 'mysql' && $this->Errno == 2006)	// Server has gone away
+			if ($reconnect && $this->Type == 'mysql' && $this->Errno == 2006)
+			{
+				// Server has gone away
 			{
 				$this->disconnect();
+			}
 				return $this->query($Query_String, $line, $file, $offset, $num_rows, $inputarr, $fetchmode, false);
 			}
 			throw new Db\Exception\InvalidSql("Invalid SQL: ".(is_array($Query_String)?$Query_String[0]:$Query_String).
 				"\n$this->Error ($this->Errno)".
 				($inputarr ? "\nParameters: '".implode("','",$inputarr)."'":''), $this->Errno);
 		}
-		elseif(empty($rs->sql)) $rs->sql = $Query_String;
+		elseif(empty($rs->sql))
+		{
+			$rs->sql = $Query_String;
+		}
 		return $rs;
 	}
 
@@ -865,9 +896,12 @@ 
 		}
 		$id = $this->Link_ID->PO_Insert_ID($table,$field);	// simulates Insert_ID with "SELECT MAX($field) FROM $table" if not native availible
 
-		if ($id === False)	// function not supported
+		if ($id === False)
+		{
+			// function not supported
 		{
 			echo "<p>db::get_last_insert_id(table='$table',field='$field') not yet implemented for db-type '$this->Type' OR no insert operation before</p>\n";
+		}
 			echo '<p>'.function_backtrace()."</p>\n";
 			return -1;
 		}
@@ -881,7 +915,10 @@ 
 	*/
 	function affected_rows()
 	{
-		if ($this->log_updates) return 0;
+		if ($this->log_updates)
+		{
+			return 0;
+		}
 
 		if (!$this->Link_ID && !$this->connect())
 		{
@@ -915,9 +952,18 @@ 
 		{
 			// for backwards compatibilty (depreciated)
 			$flags = null;
-			if($column->auto_increment) $flags .= "auto_increment ";
-			if($column->primary_key) $flags .= "primary_key ";
-			if($column->binary) $flags .= "binary ";
+			if($column->auto_increment)
+			{
+				$flags .= "auto_increment ";
+			}
+			if($column->primary_key)
+			{
+				$flags .= "primary_key ";
+			}
+			if($column->binary)
+			{
+				$flags .= "binary ";
+			}
 
 			$metadata[$i] = array(
 				'table' => $table,
@@ -954,7 +1000,10 @@ 
 	 */
 	function table_names($just_name=false)
 	{
-		if (!$this->Link_ID) $this->connect();
+		if (!$this->Link_ID)
+		{
+			$this->connect();
+		}
 		if (!$this->Link_ID)
 		{
 			return False;
@@ -1105,8 +1154,14 @@ 
 		{
 			case 'mysql':
 				$sql = 'GROUP_CONCAT('.$expr;
-				if ($order_by) $sql .= ' ORDER BY '.$order_by;
-				if ($separator != ',') $sql .= ' SEPARATOR '.$this->quote($separator);
+				if ($order_by)
+				{
+					$sql .= ' ORDER BY '.$order_by;
+				}
+				if ($separator != ',')
+				{
+					$sql .= ' SEPARATOR '.$this->quote($separator);
+				}
 				$sql .= ')';
 				break;
 
@@ -1116,7 +1171,10 @@ 
 					return false;
 				}
 				$sql = 'ARRAY_TO_STRING(ARRAY_AGG('.$expr;
-				if ($order_by) $sql .= ' ORDER BY '.$order_by;
+				if ($order_by)
+				{
+					$sql .= ' ORDER BY '.$order_by;
+				}
 				$sql .= '), '.$this->quote($separator).')';
 				break;
 
@@ -1339,12 +1397,18 @@ 
 	*/
 	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
 	{
-		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		}
 
-		if (!$not_null && is_null($value))	// writing unset php-variables and those set to NULL now as SQL NULL
+		if (!$not_null && is_null($value))
+		{
+			// writing unset php-variables and those set to NULL now as SQL NULL
 		{
 			return 'NULL';
 		}
+		}
 		switch($type)
 		{
 			case 'int':
@@ -1359,10 +1423,13 @@ 
 				// There for we have to keep it as float by using round instead the int cast.
 				return is_float($value) ? round($value) : (int) $value;
 			case 'bool':
-				if ($this->Type == 'mysql')		// maybe it's not longer necessary with mysql5
+				if ($this->Type == 'mysql')
+				{
+					// maybe it's not longer necessary with mysql5
 				{
 					return $value ? 1 : 0;
 				}
+				}
 				return $value ? 'true' : 'false';
 			case 'float':
 			case 'decimal':
@@ -1410,7 +1477,10 @@ 
 		}
 		// casting boolean explicitly to string, as ADODB_postgres64::qstr() has an unwanted special handling
 		// for boolean types, causing it to return "true" or "false" and not a quoted string like "'1'"!
-		if (is_bool($value)) $value = (string)$value;
+		if (is_bool($value))
+		{
+			$value = (string)$value;
+		}
 
 		// need to cast to string, as ADOdb 5.20 would return NULL instead of '' for NULL, causing us to write that into NOT NULL columns
 		return $this->Link_ID->qstr((string)$value);
@@ -1440,15 +1510,21 @@ 
 	*/
 	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 	{
-		if (!is_array($array))	// this allows to give an SQL-string for delete or update
+		if (!is_array($array))
+		{
+			// this allows to give an SQL-string for delete or update
 		{
 			return $array;
 		}
+		}
 		if (!$column_definitions)
 		{
 			$column_definitions = $this->column_definitions;
 		}
-		if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		}
 
 		// do we need to truncate varchars to their max length (INSERT and UPDATE on Postgres)
 		$truncate_varchar = $glue == ',' && $this->capabilities[self::CAPABILITY_REQUIRE_TRUNCATE_VARCHAR];
@@ -1465,7 +1541,10 @@ 
 				// fix "table.column" expressions, to not trigger exception, if column alone would work
 				if (!is_int($key) && is_array($column_definitions) && !isset($column_definitions[$key]))
 				{
-					if (strpos($key, '.') !== false) list(, $col) = explode('.', $key);
+					if (strpos($key, '.') !== false)
+					{
+						list(, $col) = explode('.', $key);
+					}
 					if (!isset($column_definitions[$col]))
 					{
 						throw new Db\Exception\InvalidSql("db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre><b>nothing known about column '$key'!</b>");
@@ -1505,7 +1584,11 @@ 
 				}
 				elseif (is_int($key) && $use_key===True)
 				{
-					if (empty($data)) continue;	// would give SQL error
+					if (empty($data))
+					{
+						continue;
+					}
+					// would give SQL error
 					$values[] = $data;
 				}
 				elseif ($glue != ',' && $use_key === True && !$not_null && is_null($data))
@@ -1559,7 +1642,10 @@ 
 	function set_app($app)
 	{
 		// ease the transition to api
-		if ($app == 'phpgwapi') $app = 'api';
+		if ($app == 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		if ($this === $GLOBALS['egw']->db && $app != self::API_APPNAME)
 		{
@@ -1584,7 +1670,10 @@ 
 	function get_table_definitions($app=False,$table=False)
 	{
 		// ease the transition to api
-		if ($app === 'phpgwapi') $app = 'api';
+		if ($app === 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		static $all_app_data = array();
 		if ($app === true && $table)
@@ -1642,10 +1731,16 @@ 
 		}
 		if ($table && (!$app_data || !isset($app_data[$table])))
 		{
-			if ($this->Debug) echo "<p>!!!get_table_definitions($app,$table) failed!!!</p>\n";
+			if ($this->Debug)
+			{
+				echo "<p>!!!get_table_definitions($app,$table) failed!!!</p>\n";
+			}
 			return False;
 		}
-		if ($this->Debug) echo "<p>get_table_definitions($app,$table) succeeded</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>get_table_definitions($app,$table) succeeded</p>\n";
+		}
 		return $table ? $app_data[$table] : $app_data;
 	}
 
@@ -1670,7 +1765,10 @@ 
 			$table_def = $db->get_table_definitions($app,$table);
 			$cached_columns = is_array($table_def) ? $table_def['fd'] : false;
 		}
-		if ($cached_columns === false) return null;
+		if ($cached_columns === false)
+		{
+			return null;
+		}
 
 		return is_null($attribute) ? $cached_columns[$column] : $cached_columns[$column][$attribute];
 	}
@@ -1693,9 +1791,15 @@ 
 	*/
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		}
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		$sql_append = '';
 		$cmd = 'INSERT';
@@ -1737,9 +1841,12 @@ 
 			$table = self::$tablealiases[$table];
 		}
 		$inputarr = false;
-		if (isset($data[0]) && is_array($data[0]))	// multiple data rows
+		if (isset($data[0]) && is_array($data[0]))
+		{
+			// multiple data rows
 		{
 			if ($where) throw new Exception\WrongParameter('Can NOT use $where together with multiple data rows in $data!');
+		}
 
 			$sql = "$cmd INTO $table ";
 			foreach($data as $k => $d)
@@ -1755,15 +1862,22 @@ 
 			}
 			$sql .= $sql_append;
 		}
-		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
+		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)
 		{
-			$this->Link_ID->Param(false);	// reset param-counter
+			// eg. MaxDB
+		{
+			$this->Link_ID->Param(false);
+		}
+		// reset param-counter
 			$cols = array_keys($data);
 			foreach($cols as $k => $col)
 			{
-				if (!isset($table_def['fd'][$col]))	// ignore columns not in this table
+				if (!isset($table_def['fd'][$col]))
+				{
+					// ignore columns not in this table
 				{
 					unset($cols[$k]);
+				}
 					continue;
 				}
 				$params[] = $this->Link_ID->Param($col);
@@ -1781,7 +1895,10 @@ 
 		{
 			$sql = "$cmd INTO $table ".$this->column_data_implode(',',$data,'VALUES',true,$table_def['fd']).$sql_append;
 		}
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
+		}
 		return $this->query($sql,$line,$file,0,-1,$inputarr);
 	}
 
@@ -1802,8 +1919,14 @@ 
 	*/
 	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
-		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if ($this->Debug)
+		{
+			echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
+		}
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		$blobs2update = array();
 		// SapDB/MaxDB cant update LONG columns / blob's: if a blob-column is included in the update we remember it in $blobs2update
@@ -1812,7 +1935,10 @@ 
 		{
 			case 'sapdb':
 			case 'maxdb':
-				if ($use_prepared_statement) break;
+				if ($use_prepared_statement)
+				{
+					break;
+				}
 				// check if data contains any LONG columns
 				foreach($data as $col => $val)
 				{
@@ -1837,12 +1963,20 @@ 
 		if (count($data))
 		{
 			$inputarr = false;
-			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
+			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)
+			{
+				// eg. MaxDB
 			{
-				$this->Link_ID->Param(false);	// reset param-counter
+				$this->Link_ID->Param(false);
+			}
+			// reset param-counter
 				foreach($data as $col => $val)
 				{
-					if (!isset($table_def['fd'][$col])) continue;	// ignore columns not in this table
+					if (!isset($table_def['fd'][$col]))
+					{
+						continue;
+					}
+					// ignore columns not in this table
 					$params[] = $this->name_quote($col).'='.$this->Link_ID->Param($col);
 				}
 				$sql = "UPDATE $table SET ".implode(',',$params).' WHERE '.$where_str;
@@ -1860,7 +1994,10 @@ 
 					$this->column_data_implode(',',$data,True,true,$table_def['fd']).' WHERE '.$where_str;
 			}
 			$ret = $this->query($sql,$line,$file,0,-1,$inputarr);
-			if ($this->Debug) echo "<p>db::query('$sql',$line,$file)</p>\n";
+			if ($this->Debug)
+			{
+				echo "<p>db::query('$sql',$line,$file)</p>\n";
+			}
 		}
 		// if we have any blobs to update, we do so now
 		if (($ret || !count($data)) && count($blobs2update))
@@ -1868,8 +2005,14 @@ 
 			foreach($blobs2update as $col => $val)
 			{
 				$ret = $this->Link_ID->UpdateBlob($table,$col,$val,$where_str,$table_def['fd'][$col]['type'] == 'blob' ? 'BLOB' : 'CLOB');
-				if ($this->Debug) echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
-				if (!$ret) throw new Db\Exception\InvalidSql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				if ($this->Debug)
+				{
+					echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
+				}
+				if (!$ret)
+				{
+					throw new Db\Exception\InvalidSql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				}
 			}
 		}
 		return $ret;
@@ -1890,7 +2033,10 @@ 
 	*/
 	function delete($table,$where,$line,$file,$app=False,$table_def=False)
 	{
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
@@ -1922,19 +2068,29 @@ 
 	 */
 	function expression($table_def/*,$args, ...*/)
 	{
-		if (!is_array($table_def)) $table_def = $this->get_table_definitions(true,$table_def);
+		if (!is_array($table_def))
+		{
+			$table_def = $this->get_table_definitions(true,$table_def);
+		}
 		$sql = '';
 		$ignore_next = 0;
 		foreach(func_get_args() as $n => $arg)
 		{
-			if ($n < 1) continue;	// table-name
+			if ($n < 1)
+			{
+				continue;
+			}
+			// table-name
 
 			if ($ignore_next)
 			{
 				--$ignore_next;
 				continue;
 			}
-			if (is_null($arg)) $arg = False;
+			if (is_null($arg))
+			{
+				$arg = False;
+			}
 
 			switch(gettype($arg))
 			{
@@ -1974,9 +2130,15 @@ 
 	*/
 	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=self::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		}
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 		if (is_array($cols))
 		{
 			$cols = implode(',',$cols);
@@ -1992,16 +2154,28 @@ 
 		$sql = "SELECT $cols FROM $table $join";
 
 		// if we have a where clause, we need to add it together with the WHERE statement, if thats not in the join
-		if ($where) $sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		if ($where)
+		{
+			$sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		}
 
-		if ($append) $sql .= ' '.$append;
+		if ($append)
+		{
+			$sql .= ' '.$append;
+		}
 
-		if ($this->Debug) echo "<p>sql='$sql'</p>";
+		if ($this->Debug)
+		{
+			echo "<p>sql='$sql'</p>";
+		}
 
-		if ($line === false && $file === false)	// call by union, to return the sql rather then run the query
+		if ($line === false && $file === false)
+		{
+			// call by union, to return the sql rather then run the query
 		{
 			return $sql;
 		}
+		}
 		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
 	}
 
@@ -2022,7 +2196,10 @@ 
 	*/
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=self::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		}
 
 		$union = array();
 		foreach($selects as $select)
@@ -2043,9 +2220,15 @@ 
 		}
 		$sql = count($union) > 1 ? '(' . implode(")\nUNION\n(",$union).')' : 'SELECT DISTINCT'.substr($union[0],6);
 
-		if ($order_by) $sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		if ($order_by)
+		{
+			$sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		}
 
-		if ($this->Debug) echo "<p>sql='$sql'</p>";
+		if ($this->Debug)
+		{
+			echo "<p>sql='$sql'</p>";
+		}
 
 		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
 	}

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

@@ -1845,7 +1845,7 @@ 
 					if (!isset($table_def['fd'][$col])) continue;	// ignore columns not in this table
 					$params[] = $this->name_quote($col).'='.$this->Link_ID->Param($col);
 				}
-				$sql = "UPDATE $table SET ".implode(',',$params).' WHERE '.$where_str;
+				$sql = "update $table SET ".implode(',',$params).' WHERE '.$where_str;
 				// check if we already prepared that statement
 				if (!isset($this->prepared_sql[$sql]))
 				{
@@ -1856,7 +1856,7 @@ 
 			}
 			else
 			{
-				$sql = "UPDATE $table SET ".
+				$sql = "update $table SET ".
 					$this->column_data_implode(',',$data,True,true,$table_def['fd']).' WHERE '.$where_str;
 			}
 			$ret = $this->query($sql,$line,$file,0,-1,$inputarr);
@@ -1989,7 +1989,7 @@ 
 		{
 			$table = self::$tablealiases[$table];
 		}
-		$sql = "SELECT $cols FROM $table $join";
+		$sql = "select $cols FROM $table $join";
 
 		// if we have a where clause, we need to add it together with the WHERE statement, if thats not in the join
 		if ($where) $sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;

Spacing +202 added lines, -203 removed lines

@@ -13,7 +13,7 @@ 
 
 namespace EGroupware\Api;
 
-if(empty($GLOBALS['egw_info']['server']['db_type']))
+if (empty($GLOBALS['egw_info']['server']['db_type']))
 {
 	$GLOBALS['egw_info']['server']['db_type'] = 'mysql';
 }
@@ -69,22 +69,22 @@ 
 	/**
 	* @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
 	*/
-	var $Type     = '';
+	var $Type = '';
 
 	/**
 	* @var string $type database type as defined in the header.inc.php, eg. mysqlt
 	*/
-	var $setupType     = '';
+	var $setupType = '';
 
 	/**
 	* @var string $Host database host to connect to
 	*/
-	var $Host     = '';
+	var $Host = '';
 
 	/**
 	* @var string $Port port number of database to connect to
 	*/
-	var $Port     = '';
+	var $Port = '';
 
 	/**
 	* @var string $Database name of database to use
@@ -94,7 +94,7 @@ 
 	/**
 	* @var string $User name of database user
 	*/
-	var $User     = '';
+	var $User = '';
 
 	/**
 	* @var string $Password password for database user
@@ -104,7 +104,7 @@ 
 	/**
 	* @var int $Debug enable debuging - 0 no, 1 yes
 	*/
-	var $Debug         = 0;
+	var $Debug = 0;
 
 	/**
 	 * Log update querys to error_log, do not run them
@@ -116,7 +116,7 @@ 
 	/**
 	* @var array $Record current record
 	*/
-	var $Record   = array();
+	var $Record = array();
 
 	/**
 	* @var int row number for current record
@@ -126,12 +126,12 @@ 
 	/**
 	* @var int $Errno internal rdms error number for last error
 	*/
-	var $Errno    = 0;
+	var $Errno = 0;
 
 	/**
 	* @var string descriptive text from last error
 	*/
-	var $Error    = '';
+	var $Error = '';
 
 	/**
 	 * eGW's own query log, independent of the db-type, eg. /tmp/query.log
@@ -151,7 +151,7 @@ 
 	 *
 	 * @var ADOConnection
 	 */
-	var $privat_Link_ID = False;	// do we use a privat Link_ID or a reference to the global ADOdb object
+	var $privat_Link_ID = False; // do we use a privat Link_ID or a reference to the global ADOdb object
 
 	/**
 	 * Can be used to transparently convert tablenames, eg. 'mytable' => 'otherdb.othertable'
@@ -187,11 +187,11 @@ 
 	/**
 	 * db is able to use DISTINCT on text or blob columns
 	 */
-	const CAPABILITY_DISTINCT_ON_TEXT =	'distinct_on_text';
+	const CAPABILITY_DISTINCT_ON_TEXT = 'distinct_on_text';
 	/**
 	 * DB is able to use LIKE on text columns
 	 */
-	const CAPABILITY_LIKE_ON_TEXT =	'like_on_text';
+	const CAPABILITY_LIKE_ON_TEXT = 'like_on_text';
 	/**
 	 * DB allows ORDER on text columns
 	 *
@@ -243,18 +243,18 @@ 
 		self::CAPABILITY_CAST_AS_VARCHAR   => 'CAST(%s AS varchar)',
 	);
 
-	var $prepared_sql = array();	// sql is the index
+	var $prepared_sql = array(); // sql is the index
 
 	/**
 	 * Constructor
 	 *
 	 * @param array $db_data =null values for keys 'db_name', 'db_host', 'db_port', 'db_user', 'db_pass', 'db_type'
 	 */
-	function __construct(array $db_data=null)
+	function __construct(array $db_data = null)
 	{
 		if (!is_null($db_data))
 		{
-			foreach(array(
+			foreach (array(
 				'Database' => 'db_name',
 				'Host'     => 'db_host',
 				'Port'     => 'db_port',
@@ -307,15 +307,15 @@ 
 		}
 		if (!is_null($Host) && $Host)
 		{
-			$this->Host     = $Host;
+			$this->Host = $Host;
 		}
 		if (!is_null($Port) && $Port)
 		{
-			$this->Port     = $Port;
+			$this->Port = $Port;
 		}
 		if (!is_null($User) && $User)
 		{
-			$this->User     = $User;
+			$this->User = $User;
 		}
 		if (!is_null($Password) && $Password)
 		{
@@ -332,7 +332,7 @@ 
 		// on connection failure re-try with an other host
 		// remembering in session which host we used last time
 		$use_host_from_session = true;
-		while(($host = $this->get_host(!$use_host_from_session)))
+		while (($host = $this->get_host(!$use_host_from_session)))
 		{
 			try {
 				//error_log(__METHOD__."() this->Host(s)=$this->Host, n=$n --> host=$host");
@@ -346,11 +346,11 @@ 
 				//error_log(__METHOD__."() host=$host, new_connection=$new_connection, this->Type=$this->Type, this->Host=$this->Host, wsrep_local_state=".array2string($state));
 				return $this->Link_ID;
 			}
-			catch(Db\Exception\Connection $e) {
+			catch (Db\Exception\Connection $e) {
 				//_egw_log_exception($e);
-				$this->disconnect();	// force a new connect
-				$this->Type = $this->setupType;	// get set to "mysql" for "mysqli"
-				$use_host_from_session = false;	// re-try with next host from list
+				$this->disconnect(); // force a new connect
+				$this->Type = $this->setupType; // get set to "mysql" for "mysqli"
+				$use_host_from_session = false; // re-try with next host from list
 			}
 		}
 		if (!isset($e))
@@ -401,12 +401,12 @@ 
 	{
 		$hosts = explode(';', $this->Host[0] == '@' ? getenv(substr($this->Host, 1)) : $this->Host);
 		$num_hosts = count($hosts);
-		$n =& Cache::getSession(__CLASS__, $this->Host);
+		$n = & Cache::getSession(__CLASS__, $this->Host);
 		if (!isset($n)) $n = 0;
 
-		if ($next && ++$n >= $num_hosts+2)
+		if ($next && ++$n >= $num_hosts + 2)
 		{
-			$n = 0;	// start search again with default on next request
+			$n = 0; // start search again with default on next request
 			$ret = false;
 		}
 		else
@@ -429,21 +429,21 @@ 
 		if (!$this->Link_ID)
 		{
 			$Database = $User = $Password = $Port = $Type = '';
-			foreach(array('Database','User','Password','Port','Type') as $name)
+			foreach (array('Database', 'User', 'Password', 'Port', 'Type') as $name)
 			{
 				$$name = $this->$name;
 				if (${$name}[0] == '@' && $name != 'Password') $$name = getenv(substr($$name, 1));
 			}
 			$this->setupType = $php_extension = $Type;
 
-			switch($Type)	// convert to ADO db-type-names
+			switch ($Type)	// convert to ADO db-type-names
 			{
 				case 'pgsql':
 					$Type = 'postgres'; // name in ADOdb
 					// create our own pgsql connection-string, to allow unix domain soccets if !$Host
 					$Host = "dbname=$Database".($Host ? " host=$Host".($Port ? " port=$Port" : '') : '').
 						" user=$User".($Password ? " password='".addslashes($Password)."'" : '');
-					$User = $Password = $Database = '';	// to indicate $Host is a connection-string
+					$User = $Password = $Database = ''; // to indicate $Host is a connection-string
 					break;
 
 				case 'odbc_mssql':
@@ -466,7 +466,7 @@ 
 					$Type = 'maxdb';
 					// fall through
 				case 'maxdb':
-					$Type ='sapdb';	// name in ADOdb
+					$Type = 'sapdb'; // name in ADOdb
 					$php_extension = 'odbc';
 					break;
 
@@ -479,18 +479,18 @@ 
 					}
 					else
 					{
-						$php_extension = 'mysql';	// you can use $this->setupType to determine if it's mysqlt or mysql
+						$php_extension = 'mysql'; // you can use $this->setupType to determine if it's mysqlt or mysql
 					}
 					// fall through
 				case 'mysqli':
-					$this->Type = 'mysql';		// need to be "mysql", so apps can check just for "mysql"!
+					$this->Type = 'mysql'; // need to be "mysql", so apps can check just for "mysql"!
 					// fall through
 				default:
 					if ($Port) $Host .= ':'.$Port;
 					break;
 			}
-			if (!isset($GLOBALS['egw']->ADOdb) ||	// we have no connection so far
-				(is_object($GLOBALS['egw']->db) &&	// we connect to a different db, then the global one
+			if (!isset($GLOBALS['egw']->ADOdb) || // we have no connection so far
+				(is_object($GLOBALS['egw']->db) && // we connect to a different db, then the global one
 					($this->Type != $GLOBALS['egw']->db->Type ||
 					$this->Database != $GLOBALS['egw']->db->Database ||
 					$this->User != $GLOBALS['egw']->db->User ||
@@ -503,11 +503,11 @@ 
 				}
 				if (!isset($GLOBALS['egw']->ADOdb))	// use the global object to store the connection
 				{
-					$this->Link_ID =& $GLOBALS['egw']->ADOdb;
+					$this->Link_ID = & $GLOBALS['egw']->ADOdb;
 				}
 				else
 				{
-					$this->privat_Link_ID = True;	// remember that we use a privat Link_ID for disconnect
+					$this->privat_Link_ID = True; // remember that we use a privat Link_ID for disconnect
 				}
 				$this->Link_ID = ADONewConnection($Type);
 				if (!$this->Link_ID)
@@ -523,7 +523,7 @@ 
 				if (($Ok = $this->Link_ID->$connect($Host, $User, $Password, $Database)))
 				{
 					$this->ServerInfo = $this->Link_ID->ServerInfo();
-					$this->set_capabilities($Type,$this->ServerInfo['version']);
+					$this->set_capabilities($Type, $this->ServerInfo['version']);
 
 					// switch off MySQL 5.7+ ONLY_FULL_GROUP_BY sql_mode
 					if (substr($this->Type, 0, 5) == 'mysql' && $this->ServerInfo['version'] >= 5.7 && $this->ServerInfo['version'] < 10.0)
@@ -533,7 +533,7 @@ 
 				}
 				if (!$Ok)
 				{
-					$Host = preg_replace('/password=[^ ]+/','password=$Password',$Host);	// eg. postgres dsn contains password
+					$Host = preg_replace('/password=[^ ]+/', 'password=$Password', $Host); // eg. postgres dsn contains password
 					throw new Db\Exception\Connection("ADOdb::$connect($Host, $User, \$Password, $Database) failed.");
 				}
 				if ($this->Debug)
@@ -549,8 +549,8 @@ 
 					// this is the format ADOdb expects
 					$this->Link_ID->Execute('SET DATEFORMAT ymd');
 					// sets the limit to the maximum
-					ini_set('mssql.textlimit',2147483647);
-					ini_set('mssql.sizelimit',2147483647);
+					ini_set('mssql.textlimit', 2147483647);
+					ini_set('mssql.sizelimit', 2147483647);
 				}
 				// set our default charset
 				$this->Link_ID->SetCharSet($this->Type == 'mysql' ? 'utf8' : 'utf-8');
@@ -559,12 +559,12 @@ 
 			}
 			else
 			{
-				$this->Link_ID =& $GLOBALS['egw']->ADOdb;
+				$this->Link_ID = & $GLOBALS['egw']->ADOdb;
 			}
 		}
 		if (!$this->Link_ID->isConnected() && !$this->Link_ID->Connect())
 		{
-			$Host = preg_replace('/password=[^ ]+/','password=$Password',$Host);	// eg. postgres dsn contains password
+			$Host = preg_replace('/password=[^ ]+/', 'password=$Password', $Host); // eg. postgres dsn contains password
 			throw new Db\Exception\Connection("ADOdb::$connect($Host, $User, \$Password, $Database) reconnect failed.");
 		}
 		// fix due to caching and reusing of connection not correctly set $this->Type == 'mysql'
@@ -575,9 +575,9 @@ 
 		}
 		if ($new_connection)
 		{
-			foreach(get_included_files() as $file)
+			foreach (get_included_files() as $file)
 			{
-				if (strpos($file,'adodb') !== false && !in_array($file,(array)$_SESSION['egw_required_files']))
+				if (strpos($file, 'adodb') !== false && !in_array($file, (array)$_SESSION['egw_required_files']))
 				{
 					$_SESSION['egw_required_files'][] = $file;
 					//error_log(__METHOD__."() egw_required_files[] = $file");
@@ -593,7 +593,7 @@ 
 	 */
 	function __wakeup()
 	{
-		$this->connect();	// we need to re-connect
+		$this->connect(); // we need to re-connect
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 	 */
 	function __sleep()
 	{
-		if (!empty($this->setupType)) $this->Type = $this->setupType;	// restore Type eg. to mysqli
+		if (!empty($this->setupType)) $this->Type = $this->setupType; // restore Type eg. to mysqli
 
 		$vars = get_object_vars($this);
 		unset($vars['Link_ID']);
@@ -620,23 +620,23 @@ 
 	 * @param string $adodb_driver mysql, postgres, mssql, sapdb, oci8
 	 * @param string $db_version version-number of connected db-server, as reported by ServerInfo
 	 */
-	function set_capabilities($adodb_driver,$db_version)
+	function set_capabilities($adodb_driver, $db_version)
 	{
-		switch($adodb_driver)
+		switch ($adodb_driver)
 		{
 			case 'mysql':
 			case 'mysqlt':
 			case 'mysqli':
-				$this->capabilities[self::CAPABILITY_SUB_QUERIES] = (float) $db_version >= 4.1;
-				$this->capabilities[self::CAPABILITY_UNION] = (float) $db_version >= 4.0;
+				$this->capabilities[self::CAPABILITY_SUB_QUERIES] = (float)$db_version >= 4.1;
+				$this->capabilities[self::CAPABILITY_UNION] = (float)$db_version >= 4.0;
 				$this->capabilities[self::CAPABILITY_NAME_CASE] = 'preserv';
-				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float) $db_version >= 4.1;
+				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float)$db_version >= 4.1;
 				$this->capabilities[self::CAPABILITY_CAST_AS_VARCHAR] = 'CAST(%s AS char)';
 				break;
 
 			case 'postgres':
 				$this->capabilities[self::CAPABILITY_NAME_CASE] = 'lower';
-				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float) $db_version >= 7.4;
+				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float)$db_version >= 7.4;
 				$this->capabilities[self::CAPABILITY_OUTER_JOIN] = true;
 				$this->capabilities[self::CAPABILITY_CASE_INSENSITIV_LIKE] = '::text ILIKE';
 				$this->capabilities[self::CAPABILITY_REQUIRE_TRUNCATE_VARCHAR] = true;
@@ -685,7 +685,7 @@ 
 			return False;
 		}
 		// the substring is needed as the string is already in quotes
-		return substr($this->Link_ID->DBTimeStamp($epoch),1,-1);
+		return substr($this->Link_ID->DBTimeStamp($epoch), 1, -1);
 	}
 
 	/**
@@ -711,7 +711,7 @@ 
 	 */
 	public static function from_bool($val)
 	{
-		return $val && $val[0] !== 'f';	// everthing other then 0 or f[alse] is returned as true
+		return $val && $val[0] !== 'f'; // everthing other then 0 or f[alse] is returned as true
 	}
 
 	/**
@@ -728,9 +728,9 @@ 
 	* @return ADORecordSet or false, if the query fails
 	* @throws Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
 	*/
-	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=self::FETCH_BOTH, $reconnect=true)
+	function query($Query_String, $line = '', $file = '', $offset = 0, $num_rows = -1, $inputarr = false, $fetchmode = self::FETCH_BOTH, $reconnect = true)
 	{
-		unset($line, $file);	// not used anymore
+		unset($line, $file); // not used anymore
 
 		if ($Query_String == '')
 		{
@@ -756,23 +756,23 @@ 
 		}
 		if ($num_rows > 0)
 		{
-			$rs = $this->Link_ID->SelectLimit($Query_String,$num_rows,(int)$offset,$inputarr);
+			$rs = $this->Link_ID->SelectLimit($Query_String, $num_rows, (int)$offset, $inputarr);
 		}
 		else
 		{
-			$rs = $this->Link_ID->Execute($Query_String,$inputarr);
+			$rs = $this->Link_ID->Execute($Query_String, $inputarr);
 		}
 		$this->Row = 0;
 		$this->Errno  = $this->Link_ID->ErrorNo();
 		$this->Error  = $this->Link_ID->ErrorMsg();
 
-		if ($this->query_log && ($f = @fopen($this->query_log,'a+')))
+		if ($this->query_log && ($f = @fopen($this->query_log, 'a+')))
 		{
-			fwrite($f,'['.(isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->ConfigDomain : $GLOBALS['egw_info']['user']['domain']).'] ');
-			fwrite($f,date('Y-m-d H:i:s ').$Query_String.($inputarr ? "\n".print_r($inputarr,true) : '')."\n");
+			fwrite($f, '['.(isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->ConfigDomain : $GLOBALS['egw_info']['user']['domain']).'] ');
+			fwrite($f, date('Y-m-d H:i:s ').$Query_String.($inputarr ? "\n".print_r($inputarr, true) : '')."\n");
 			if (!$rs)
 			{
-				fwrite($f,"*** Error $this->Errno: $this->Error\n".function_backtrace()."\n");
+				fwrite($f, "*** Error $this->Errno: $this->Error\n".function_backtrace()."\n");
 			}
 			fclose($f);
 		}
@@ -783,11 +783,11 @@ 
 				$this->disconnect();
 				return $this->query($Query_String, $line, $file, $offset, $num_rows, $inputarr, $fetchmode, false);
 			}
-			throw new Db\Exception\InvalidSql("Invalid SQL: ".(is_array($Query_String)?$Query_String[0]:$Query_String).
+			throw new Db\Exception\InvalidSql("Invalid SQL: ".(is_array($Query_String) ? $Query_String[0] : $Query_String).
 				"\n$this->Error ($this->Errno)".
-				($inputarr ? "\nParameters: '".implode("','",$inputarr)."'":''), $this->Errno);
+				($inputarr ? "\nParameters: '".implode("','", $inputarr)."'" : ''), $this->Errno);
 		}
-		elseif(empty($rs->sql)) $rs->sql = $Query_String;
+		elseif (empty($rs->sql)) $rs->sql = $Query_String;
 		return $rs;
 	}
 
@@ -802,9 +802,9 @@ 
 	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '',$inputarr=false)
+	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '', $inputarr = false)
 	{
-		return $this->query($Query_String,$line,$file,$offset,$num_rows,$inputarr);
+		return $this->query($Query_String, $line, $file, $offset, $num_rows, $inputarr);
 	}
 
 	/**
@@ -862,7 +862,7 @@ 
 	 * @param string $where ='true' where clause to use, eg: "WHERE row=12". Defaults to lock whole table.
 	 * @param string $col ='1 as adodbignore'
 	 */
-	function row_lock($table, $where='true', $col='1 as adodbignore')
+	function row_lock($table, $where = 'true', $col = '1 as adodbignore')
 	{
 		if (!$this->Link_ID && !$this->connect())
 		{
@@ -933,7 +933,7 @@ 
 		{
 			$table = self::$tablealiases[$table];
 		}
-		$id = $this->Link_ID->PO_Insert_ID($table,$field);	// simulates Insert_ID with "SELECT MAX($field) FROM $table" if not native availible
+		$id = $this->Link_ID->PO_Insert_ID($table, $field); // simulates Insert_ID with "SELECT MAX($field) FROM $table" if not native availible
 
 		if ($id === False)	// function not supported
 		{
@@ -969,7 +969,7 @@ 
 	* @param bool $full optional, default False summary information, True full information
 	* @return array table meta data
 	*/
-	function metadata($table='',$full=false)
+	function metadata($table = '', $full = false)
 	{
 		if (!$this->Link_ID && !$this->connect())
 		{
@@ -981,13 +981,13 @@ 
 
 		$metadata = array();
 		$i = 0;
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			// for backwards compatibilty (depreciated)
 			$flags = null;
-			if($column->auto_increment) $flags .= "auto_increment ";
-			if($column->primary_key) $flags .= "primary_key ";
-			if($column->binary) $flags .= "binary ";
+			if ($column->auto_increment) $flags .= "auto_increment ";
+			if ($column->primary_key) $flags .= "primary_key ";
+			if ($column->binary) $flags .= "binary ";
 
 			$metadata[$i] = array(
 				'table' => $table,
@@ -1022,7 +1022,7 @@ 
 	 * @param boolean $just_name =false true return array of table-names, false return old format
 	 * @return array list of the tables
 	 */
-	function table_names($just_name=false)
+	function table_names($just_name = false)
 	{
 		if (!$this->Link_ID) $this->connect();
 		if (!$this->Link_ID)
@@ -1033,7 +1033,7 @@ 
 		$tables = $this->Link_ID->MetaTables('TABLES');
 		if (is_array($tables))
 		{
-			foreach($tables as $table)
+			foreach ($tables as $table)
 			{
 				if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')
 				{
@@ -1062,7 +1062,7 @@ 
 			echo "<p>db::index_names() not yet implemented for db-type '$this->Type'</p>\n";
 			return $indices;
 		}
-		foreach($this->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relkind ='i' ORDER BY relname") as $row)
+		foreach ($this->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relkind ='i' ORDER BY relname") as $row)
 		{
 			$indices[] = array(
 				'index_name'      => $row[0],
@@ -1095,7 +1095,7 @@ 
 	* @param string $charset default charset for the database
 	* @param string $grant_host ='localhost' host/ip of the webserver
 	*/
-	function create_database($adminname = '', $adminpasswd = '', $charset='', $grant_host='localhost')
+	function create_database($adminname = '', $adminpasswd = '', $charset = '', $grant_host = 'localhost')
 	{
 		$currentUser = $this->User;
 		$currentPassword = $this->Password;
@@ -1119,7 +1119,7 @@ 
 			case 'mysqli':
 			case 'mysqlt':
 				$create = "CREATE DATABASE `$currentDatabase`";
-				if ($charset && isset($this->Link_ID->charset2mysql[$charset]) && (float) $this->ServerInfo['version'] >= 4.1)
+				if ($charset && isset($this->Link_ID->charset2mysql[$charset]) && (float)$this->ServerInfo['version'] >= 4.1)
 				{
 					$create .= ' DEFAULT CHARACTER SET '.$this->Link_ID->charset2mysql[$charset].';';
 				}
@@ -1130,9 +1130,9 @@ 
 				throw new Exception\WrongParameter(__METHOD__."(user=$adminname, \$pw) not yet implemented for DB-type '$this->Type'");
 		}
 		//error_log(__METHOD__."() this->Type=$this->Type: sqls=".array2string($sqls));
-		foreach($sqls as $sql)
+		foreach ($sqls as $sql)
 		{
-			$this->query($sql,__LINE__,__FILE__);
+			$this->query($sql, __LINE__, __FILE__);
 		}
 		$this->disconnect();
 
@@ -1158,7 +1158,7 @@ 
 		{
 			return False;
 		}
-		return call_user_func_array(array(&$this->Link_ID,'concat'),$args);
+		return call_user_func_array(array(&$this->Link_ID, 'concat'), $args);
 	}
 
 	/**
@@ -1169,9 +1169,9 @@ 
 	 * @param string $separator =',' optional separator, default is comma
 	 * @return string|boolean false if not supported by dbms
 	 */
-	function group_concat($expr, $order_by='', $separator=',')
+	function group_concat($expr, $order_by = '', $separator = ',')
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				$sql = 'GROUP_CONCAT('.$expr;
@@ -1205,7 +1205,7 @@ 
 	 */
 	function strpos($str, $substr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "LOCATE($substr,$str)";
@@ -1225,7 +1225,7 @@ 
 	 */
 	function unix_timestamp($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "UNIX_TIMESTAMP($expr)";
@@ -1246,7 +1246,7 @@ 
 	 */
 	function from_unixtime($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "FROM_UNIXTIME($expr)";
@@ -1255,7 +1255,7 @@ 
 				return "(TIMESTAMP WITH TIME ZONE 'epoch' + ($expr) * INTERVAL '1 sec')";
 
 			case 'mssql':	// we use date(,0) as we store server-time
-				return "DATEADD(second,($expr),'".date('Y-m-d H:i:s',0)."')";
+				return "DATEADD(second,($expr),'".date('Y-m-d H:i:s', 0)."')";
 		}
 		return false;
 	}
@@ -1269,30 +1269,30 @@ 
 	 * @param string $format format specifier like '%Y-%m-%d %H:%i:%s' or '%V%X' ('%v%x') weeknumber & year with Sunday (Monday) as first day
 	 * @return string SQL expression of type timestamp
 	 */
-	function date_format($expr,$format)
+	function date_format($expr, $format)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "DATE_FORMAT($expr,'$format')";
 
 			case 'pgsql':
 				$format = str_replace(
-					array('%Y',  '%y','%m','%d','%H',  '%h','%i','%s','%V','%v','%X',  '%x'),
-					array('YYYY','YY','MM','DD','HH24','HH','MI','SS','IW','IW','YYYY','YYYY'),
+					array('%Y', '%y', '%m', '%d', '%H', '%h', '%i', '%s', '%V', '%v', '%X', '%x'),
+					array('YYYY', 'YY', 'MM', 'DD', 'HH24', 'HH', 'MI', 'SS', 'IW', 'IW', 'YYYY', 'YYYY'),
 					$format);
 				return "TO_CHAR($expr,'$format')";
 
 			case 'mssql':
 				$from = $to = array();
-				foreach(array('%Y'=>'yyyy','%y'=>'yy','%m'=>'mm','%d'=>'dd','%H'=>'hh','%i'=>'mi','%s'=>'ss','%V'=>'wk','%v'=>'wk','%X'=>'yyyy','%x'=>'yyyy') as $f => $t)
+				foreach (array('%Y'=>'yyyy', '%y'=>'yy', '%m'=>'mm', '%d'=>'dd', '%H'=>'hh', '%i'=>'mi', '%s'=>'ss', '%V'=>'wk', '%v'=>'wk', '%X'=>'yyyy', '%x'=>'yyyy') as $f => $t)
 				{
 					$from[] = $f;
 					$to[] = "'+DATEPART($t,($expr))+'";
 				}
 				$from[] = "''+"; $to[] = '';
 				$from[] = "+''"; $to[] = '';
-				return str_replace($from,$to,$format);
+				return str_replace($from, $to, $format);
 		}
 		return false;
 	}
@@ -1305,7 +1305,7 @@ 
 	 */
 	function to_double($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'pgsql':
 				return $expr.'::double';
@@ -1323,7 +1323,7 @@ 
 	 */
 	function to_int($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'pgsql':
 				return $expr.'::integer';
@@ -1341,7 +1341,7 @@ 
 	 */
 	function to_varchar($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'pgsql':
 				return 'CAST('.$expr.' AS varchar)';
@@ -1385,7 +1385,7 @@ 
 			// always quote for postgreSQL, as this is the only way to support mixed case names
 			if (preg_match('/\W/', $name) || $type == 'pgsql' && preg_match('/[A-Z]+/', $name) || $name == 'index')
 			{
-				return $quote . $name . $quote;
+				return $quote.$name.$quote;
 			}
 			return $name;
 		}, explode('.', $name));
@@ -1407,27 +1407,27 @@ 
 	* @param string $glue =',' used to glue array values together for the string type
 	* @return string escaped sting
 	*/
-	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
+	function quote($value, $type = False, $not_null = true, $length = null, $glue = ',')
 	{
-		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		if ($this->Debug) echo "<p>db::quote(".(is_null($value) ? 'NULL' : "'$value'").",'$type','$not_null')</p>\n";
 
 		if (!$not_null && is_null($value))	// writing unset php-variables and those set to NULL now as SQL NULL
 		{
 			return 'NULL';
 		}
-		switch($type)
+		switch ($type)
 		{
 			case 'int':
 				// if DateTime object given, convert it to a unix timestamp (NOT converting the timezone!)
 				if (is_object($value) && ($value instanceof \DateTime))
 				{
-					return ($value instanceof DateTime) ? $value->format('ts') : DateTime::to($value,'ts');
+					return ($value instanceof DateTime) ? $value->format('ts') : DateTime::to($value, 'ts');
 				}
 			case 'auto':
 				// atm. (php5.2) php has only 32bit integers, it converts everything else to float.
 				// Casting it to int gives a negative number instead of the big 64bit integer!
 				// There for we have to keep it as float by using round instead the int cast.
-				return is_float($value) ? round($value) : (int) $value;
+				return is_float($value) ? round($value) : (int)$value;
 			case 'bool':
 				if ($this->Type == 'mysql')		// maybe it's not longer necessary with mysql5
 				{
@@ -1436,23 +1436,23 @@ 
 				return $value ? 'true' : 'false';
 			case 'float':
 			case 'decimal':
-				return (double) $value;
+				return (double)$value;
 		}
 		if (!$this->Link_ID && !$this->connect())
 		{
 			return False;
 		}
-		switch($type)
+		switch ($type)
 		{
 			case 'blob':
 				switch ($this->Link_ID->blobEncodeType)
 				{
 					case 'C':	// eg. postgres
-						return "'" . $this->Link_ID->BlobEncode($value) . "'";
+						return "'".$this->Link_ID->BlobEncode($value)."'";
 					case 'I':
 						return $this->Link_ID->BlobEncode($value);
 				}
-				break;	// handled like strings
+				break; // handled like strings
 			case 'date':
 				// if DateTime object given, convert it (NOT converting the timezone!)
 				if (is_object($value) && ($value instanceof \DateTime))
@@ -1470,7 +1470,7 @@ 
 		}
 		if (is_array($value))
 		{
-			$value = implode($glue,$value);
+			$value = implode($glue, $value);
 		}
 		// only truncate string if length given and <= 255
 		// to not unnecessary truncate varchar(>255) as PostgreSQL uses text anyway and MySQL truncates itself silently (unless strict mode!)
@@ -1508,7 +1508,7 @@ 
 	*	If its set, the column-type-data determinates if (int) or addslashes is used.
 	* @return string SQL
 	*/
-	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
+	function column_data_implode($glue, $array, $use_key = True, $only = False, $column_definitions = False)
 	{
 		if (!is_array($array))	// this allows to give an SQL-string for delete or update
 		{
@@ -1518,16 +1518,16 @@ 
 		{
 			$column_definitions = $this->column_definitions;
 		}
-		if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array, True).",'$use_key',".print_r($only, True).",<pre>".print_r($column_definitions, True)."</pre>\n";
 
 		// do we need to truncate varchars to their max length (INSERT and UPDATE on Postgres)
 		$truncate_varchar = $glue == ',' && $this->capabilities[self::CAPABILITY_REQUIRE_TRUNCATE_VARCHAR];
 
 		$keys = $values = array();
-		foreach($array as $key => $data)
+		foreach ($array as $key => $data)
 		{
 			if (is_int($key) && $use_key !== 'VALUES' || !$only || $only === True && isset($column_definitions[$key]) ||
-				is_array($only) && in_array($key,$only))
+				is_array($only) && in_array($key, $only))
 			{
 				$keys[] = $this->name_quote($key);
 
@@ -1538,7 +1538,7 @@ 
 					if (strpos($key, '.') !== false) list(, $col) = explode('.', $key);
 					if (!isset($column_definitions[$col]))
 					{
-						throw new Db\Exception\InvalidSql("db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre><b>nothing known about column '$key'!</b>");
+						throw new Db\Exception\InvalidSql("db::column_data_implode('$glue',".print_r($array, True).",'$use_key',".print_r($only, True).",<pre>".print_r($column_definitions, True)."</pre><b>nothing known about column '$key'!</b>");
 					}
 				}
 				$column_type = is_array($column_definitions) ? @$column_definitions[$col]['type'] : False;
@@ -1547,7 +1547,7 @@ 
 				$maxlength = null;
 				if ($truncate_varchar)
 				{
-					$maxlength = in_array($column_definitions[$col]['type'], array('varchar','ascii')) ? $column_definitions[$col]['precision'] : null;
+					$maxlength = in_array($column_definitions[$col]['type'], array('varchar', 'ascii')) ? $column_definitions[$col]['precision'] : null;
 				}
 				// dont use IN ( ), if there's only one value, it's slower for MySQL
 				if (is_array($data) && count($data) == 1)
@@ -1557,39 +1557,38 @@ 
 				if (is_array($data))
 				{
 					$or_null = '';
-					foreach($data as $k => $v)
+					foreach ($data as $k => $v)
 					{
-						if (!$not_null && $use_key===True && is_null($v))
+						if (!$not_null && $use_key === True && is_null($v))
 						{
 							$or_null = $this->name_quote($key).' IS NULL)';
 							unset($data[$k]);
 							continue;
 						}
-						$data[$k] = $this->quote($v,$column_type,$not_null,$maxlength);
+						$data[$k] = $this->quote($v, $column_type, $not_null, $maxlength);
 					}
-					$values[] = ($or_null?'(':'').(!count($data) ?
+					$values[] = ($or_null ? '(' : '').(!count($data) ?
 						// empty array on insert/update, store as NULL, or if not allowed whatever value NULL is casted to
-						$this->quote(null, $column_type, $not_null) :
-						($use_key===True ? $this->name_quote($key).' IN ' : '') .
-						'('.implode(',',$data).')'.($or_null ? ' OR ' : '')).$or_null;
+						$this->quote(null, $column_type, $not_null) : ($use_key === True ? $this->name_quote($key).' IN ' : '').
+						'('.implode(',', $data).')'.($or_null ? ' OR ' : '')).$or_null;
 				}
-				elseif (is_int($key) && $use_key===True)
+				elseif (is_int($key) && $use_key === True)
 				{
-					if (empty($data)) continue;	// would give SQL error
+					if (empty($data)) continue; // would give SQL error
 					$values[] = $data;
 				}
 				elseif ($glue != ',' && $use_key === True && !$not_null && is_null($data))
 				{
-					$values[] = $this->name_quote($key) .' IS NULL';
+					$values[] = $this->name_quote($key).' IS NULL';
 				}
 				else
 				{
-					$values[] = ($use_key===True ? $this->name_quote($key) . '=' : '') . $this->quote($data,$column_type,$not_null,$maxlength);
+					$values[] = ($use_key === True ? $this->name_quote($key).'=' : '').$this->quote($data, $column_type, $not_null, $maxlength);
 				}
 			}
 		}
-		return ($use_key==='VALUES' ? '('.implode(',',$keys).') VALUES (' : '').
-			implode($glue,$values) . ($use_key==='VALUES' ? ')' : '');
+		return ($use_key === 'VALUES' ? '('.implode(',', $keys).') VALUES (' : '').
+			implode($glue, $values).($use_key === 'VALUES' ? ')' : '');
 	}
 
 	/**
@@ -1601,9 +1600,9 @@ 
 	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
 	*	If its set, the column-type-data determinates if (int) or addslashes is used.
 	*/
-	function set_column_definitions($column_definitions=False)
+	function set_column_definitions($column_definitions = False)
 	{
-		$this->column_definitions=$column_definitions;
+		$this->column_definitions = $column_definitions;
 	}
 
 	/**
@@ -1616,7 +1615,7 @@ 
 	 *
 	 * @var string
 	 */
-	private $app=self::API_APPNAME;
+	private $app = self::API_APPNAME;
 
 	/**
 	 * Sets the application in which the db-class looks for table-defintions
@@ -1651,7 +1650,7 @@ 
 	* @param bool|string $table if set return only defintions of that table, else return all defintions
 	* @return mixed array with table-defintions or False if file not found
 	*/
-	function get_table_definitions($app=False,$table=False)
+	function get_table_definitions($app = False, $table = False)
 	{
 		// ease the transition to api
 		if ($app === 'phpgwapi') $app = 'api';
@@ -1659,7 +1658,7 @@ 
 		static $all_app_data = array();
 		if ($app === true && $table)
 		{
-			foreach($all_app_data as $app => &$app_data)
+			foreach ($all_app_data as $app => &$app_data)
 			{
 				if (isset($app_data[$table]))
 				{
@@ -1667,13 +1666,13 @@ 
 				}
 			}
 			// $table not found in loaded apps, check not yet loaded ones
-			foreach(scandir(EGW_INCLUDE_ROOT) as $app)
+			foreach (scandir(EGW_INCLUDE_ROOT) as $app)
 			{
 				if ($app[0] == '.' || !is_dir(EGW_INCLUDE_ROOT.'/'.$app) || isset($all_app_data[$app]))
 				{
 					continue;
 				}
-				$tables_current = EGW_INCLUDE_ROOT . "/$app/setup/tables_current.inc.php";
+				$tables_current = EGW_INCLUDE_ROOT."/$app/setup/tables_current.inc.php";
 				if (!@file_exists($tables_current))
 				{
 					$all_app_data[$app] = False;
@@ -1682,7 +1681,7 @@ 
 				{
 					$phpgw_baseline = null;
 					include($tables_current);
-					$all_app_data[$app] =& $phpgw_baseline;
+					$all_app_data[$app] = & $phpgw_baseline;
 					unset($phpgw_baseline);
 
 					if (isset($all_app_data[$app][$table]))
@@ -1697,17 +1696,17 @@ 
 		{
 			$app = $this->app ? $this->app : $GLOBALS['egw_info']['flags']['currentapp'];
 		}
-		$app_data =& $all_app_data[$app];
+		$app_data = & $all_app_data[$app];
 
 		if (!isset($app_data))
 		{
-			$tables_current = EGW_INCLUDE_ROOT . "/$app/setup/tables_current.inc.php";
+			$tables_current = EGW_INCLUDE_ROOT."/$app/setup/tables_current.inc.php";
 			if (!@file_exists($tables_current))
 			{
 				return $app_data = False;
 			}
 			include($tables_current);
-			$app_data =& $phpgw_baseline;
+			$app_data = & $phpgw_baseline;
 			unset($phpgw_baseline);
 		}
 		if ($table && (!$app_data || !isset($app_data[$table])))
@@ -1730,14 +1729,14 @@ 
 	 * @param string $attribute='comment' what field to return, NULL for array with all fields, default 'comment' to return the comment
 	 * @return string|array NULL if table or column or attribute not found
 	 */
-	/* static */ function get_column_attribute($column,$table,$app=null,$attribute='comment')
+	/* static */ function get_column_attribute($column, $table, $app = null, $attribute = 'comment')
 	{
-		static $cached_columns=null,$cached_table=null;	// some caching
+		static $cached_columns = null, $cached_table = null; // some caching
 
 		if ($cached_table !== $table || is_null($cached_columns))
 		{
 			$db = isset($this) ? $this : $GLOBALS['egw']->db;
-			$table_def = $db->get_table_definitions($app,$table);
+			$table_def = $db->get_table_definitions($app, $table);
 			$cached_columns = is_array($table_def) ? $table_def['fd'] : false;
 		}
 		if ($cached_columns === false) return null;
@@ -1761,38 +1760,38 @@ 
 	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
+	function insert($table, $data, $where, $line, $file, $app = False, $use_prepared_statement = false, $table_def = False)
 	{
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data, True).",".print_r($where, True).",$line,$file,'$app')</p>\n";
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 
 		$sql_append = '';
 		$cmd = 'INSERT';
 		if (is_array($where) && count($where))
 		{
-			switch($this->Type)
+			switch ($this->Type)
 			{
 				case 'sapdb': case 'maxdb':
 					$sql_append = ' UPDATE DUPLICATES';
 					break;
 				case 'mysql':
 					// use replace if primary keys are included
-					if (count(array_intersect(array_keys($where),(array)$table_def['pk'])) == count($table_def['pk']))
+					if (count(array_intersect(array_keys($where), (array)$table_def['pk'])) == count($table_def['pk']))
 					{
 						$cmd = 'REPLACE';
 						break;
 					}
 					// fall through !!!
 				default:
-					if ($this->select($table,'count(*)',$where,$line,$file)->fetchColumn())
+					if ($this->select($table, 'count(*)', $where, $line, $file)->fetchColumn())
 					{
-						return !!$this->update($table,$data,$where,$line,$file,$app,$use_prepared_statement,$table_def);
+						return !!$this->update($table, $data, $where, $line, $file, $app, $use_prepared_statement, $table_def);
 					}
 					break;
 			}
 			// the checked values need to be inserted too, value in data has precedence, also cant insert sql strings (numerical id)
-			foreach($where as $column => $value)
+			foreach ($where as $column => $value)
 			{
 				if (!is_numeric($column) && !isset($data[$column]) &&
 					// skip auto-id of 0 or NULL, as PostgreSQL does NOT create an auto-id, if they are given
@@ -1812,24 +1811,24 @@ 
 			if ($where) throw new Exception\WrongParameter('Can NOT use $where together with multiple data rows in $data!');
 
 			$sql = "$cmd INTO $table ";
-			foreach($data as $k => $d)
+			foreach ($data as $k => $d)
 			{
 				if (!$k)
 				{
-					$sql .= $this->column_data_implode(',',$d,'VALUES',true,$table_def['fd']);
+					$sql .= $this->column_data_implode(',', $d, 'VALUES', true, $table_def['fd']);
 				}
 				else
 				{
-					$sql .= ",\n(".$this->column_data_implode(',',$d,false,true,$table_def['fd']).')';
+					$sql .= ",\n(".$this->column_data_implode(',', $d, false, true, $table_def['fd']).')';
 				}
 			}
 			$sql .= $sql_append;
 		}
 		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
 		{
-			$this->Link_ID->Param(false);	// reset param-counter
+			$this->Link_ID->Param(false); // reset param-counter
 			$cols = array_keys($data);
-			foreach($cols as $k => $col)
+			foreach ($cols as $k => $col)
 			{
 				if (!isset($table_def['fd'][$col]))	// ignore columns not in this table
 				{
@@ -1838,7 +1837,7 @@ 
 				}
 				$params[] = $this->Link_ID->Param($col);
 			}
-			$sql = "$cmd INTO $table (".implode(',',$cols).') VALUES ('.implode(',',$params).')'.$sql_append;
+			$sql = "$cmd INTO $table (".implode(',', $cols).') VALUES ('.implode(',', $params).')'.$sql_append;
 			// check if we already prepared that statement
 			if (!isset($this->prepared_sql[$sql]))
 			{
@@ -1849,10 +1848,10 @@ 
 		}
 		else
 		{
-			$sql = "$cmd INTO $table ".$this->column_data_implode(',',$data,'VALUES',true,$table_def['fd']).$sql_append;
+			$sql = "$cmd INTO $table ".$this->column_data_implode(',', $data, 'VALUES', true, $table_def['fd']).$sql_append;
 		}
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
-		return $this->query($sql,$line,$file,0,-1,$inputarr);
+		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data, True).",".print_r($where, True).",$line,$file,'$app') sql='$sql'</p>\n";
+		return $this->query($sql, $line, $file, 0, -1, $inputarr);
 	}
 
 	/**
@@ -1870,10 +1869,10 @@ 
 	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
+	function update($table, $data, $where, $line, $file, $app = False, $use_prepared_statement = false, $table_def = False)
 	{
-		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if ($this->Debug) echo "<p>db::update('$table',".print_r($data, true).','.print_r($where, true).",$line,$file,'$app')</p>\n";
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 
 		$blobs2update = array();
 		// SapDB/MaxDB cant update LONG columns / blob's: if a blob-column is included in the update we remember it in $blobs2update
@@ -1884,7 +1883,7 @@ 
 			case 'maxdb':
 				if ($use_prepared_statement) break;
 				// check if data contains any LONG columns
-				foreach($data as $col => $val)
+				foreach ($data as $col => $val)
 				{
 					switch ($table_def['fd'][$col]['type'])
 					{
@@ -1898,7 +1897,7 @@ 
 				}
 				break;
 		}
-		$where_str = $this->column_data_implode(' AND ',$where,True,true,$table_def['fd']);
+		$where_str = $this->column_data_implode(' AND ', $where, True, true, $table_def['fd']);
 
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
@@ -1909,13 +1908,13 @@ 
 			$inputarr = false;
 			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
 			{
-				$this->Link_ID->Param(false);	// reset param-counter
-				foreach($data as $col => $val)
+				$this->Link_ID->Param(false); // reset param-counter
+				foreach ($data as $col => $val)
 				{
-					if (!isset($table_def['fd'][$col])) continue;	// ignore columns not in this table
+					if (!isset($table_def['fd'][$col])) continue; // ignore columns not in this table
 					$params[] = $this->name_quote($col).'='.$this->Link_ID->Param($col);
 				}
-				$sql = "UPDATE $table SET ".implode(',',$params).' WHERE '.$where_str;
+				$sql = "UPDATE $table SET ".implode(',', $params).' WHERE '.$where_str;
 				// check if we already prepared that statement
 				if (!isset($this->prepared_sql[$sql]))
 				{
@@ -1927,19 +1926,19 @@ 
 			else
 			{
 				$sql = "UPDATE $table SET ".
-					$this->column_data_implode(',',$data,True,true,$table_def['fd']).' WHERE '.$where_str;
+					$this->column_data_implode(',', $data, True, true, $table_def['fd']).' WHERE '.$where_str;
 			}
-			$ret = $this->query($sql,$line,$file,0,-1,$inputarr);
+			$ret = $this->query($sql, $line, $file, 0, -1, $inputarr);
 			if ($this->Debug) echo "<p>db::query('$sql',$line,$file)</p>\n";
 		}
 		// if we have any blobs to update, we do so now
 		if (($ret || !count($data)) && count($blobs2update))
 		{
-			foreach($blobs2update as $col => $val)
+			foreach ($blobs2update as $col => $val)
 			{
-				$ret = $this->Link_ID->UpdateBlob($table,$col,$val,$where_str,$table_def['fd'][$col]['type'] == 'blob' ? 'BLOB' : 'CLOB');
+				$ret = $this->Link_ID->UpdateBlob($table, $col, $val, $where_str, $table_def['fd'][$col]['type'] == 'blob' ? 'BLOB' : 'CLOB');
 				if ($this->Debug) echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
-				if (!$ret) throw new Db\Exception\InvalidSql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				if (!$ret) throw new Db\Exception\InvalidSql("Error in UpdateBlob($table,$col,\$val,$where_str)", $line, $file);
 			}
 		}
 		return $ret;
@@ -1958,18 +1957,18 @@ 
 	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function delete($table,$where,$line,$file,$app=False,$table_def=False)
+	function delete($table, $where, $line, $file, $app = False, $table_def = False)
 	{
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
 			$table = self::$tablealiases[$table];
 		}
 		$sql = "DELETE FROM $table WHERE ".
-			$this->column_data_implode(' AND ',$where,True,False,$table_def['fd']);
+			$this->column_data_implode(' AND ', $where, True, False, $table_def['fd']);
 
-		return $this->query($sql,$line,$file);
+		return $this->query($sql, $line, $file);
 	}
 
 	/**
@@ -1992,12 +1991,12 @@ 
 	 */
 	function expression($table_def/*,$args, ...*/)
 	{
-		if (!is_array($table_def)) $table_def = $this->get_table_definitions(true,$table_def);
+		if (!is_array($table_def)) $table_def = $this->get_table_definitions(true, $table_def);
 		$sql = '';
 		$ignore_next = 0;
-		foreach(func_get_args() as $n => $arg)
+		foreach (func_get_args() as $n => $arg)
 		{
-			if ($n < 1) continue;	// table-name
+			if ($n < 1) continue; // table-name
 
 			if ($ignore_next)
 			{
@@ -2006,7 +2005,7 @@ 
 			}
 			if (is_null($arg)) $arg = False;
 
-			switch(gettype($arg))
+			switch (gettype($arg))
 			{
 				case 'string':
 					$sql .= $arg;
@@ -2015,7 +2014,7 @@ 
 					$ignore_next += !$arg ? 2 : 0;
 					break;
 				case 'array':
-					$sql .= $this->column_data_implode(' AND ',$arg,True,False,$table_def['fd']);
+					$sql .= $this->column_data_implode(' AND ', $arg, True, False, $table_def['fd']);
 					break;
 			}
 		}
@@ -2042,18 +2041,18 @@ 
 	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=self::FETCH_ASSOC)
+	function select($table, $cols, $where, $line, $file, $offset = False, $append = '', $app = False, $num_rows = 0, $join = '', $table_def = False, $fetchmode = self::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols, True).",".print_r($where, True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 		if (is_array($cols))
 		{
-			$cols = implode(',',$cols);
+			$cols = implode(',', $cols);
 		}
 		if (is_array($where))
 		{
-			$where = $this->column_data_implode(' AND ',$where,True,False,$table_def['fd']);
+			$where = $this->column_data_implode(' AND ', $where, True, False, $table_def['fd']);
 		}
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
@@ -2062,7 +2061,7 @@ 
 		$sql = "SELECT $cols FROM $table $join";
 
 		// if we have a where clause, we need to add it together with the WHERE statement, if thats not in the join
-		if ($where) $sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		if ($where) $sql .= (strpos($join, "WHERE") !== false) ? ' AND ('.$where.')' : ' WHERE '.$where;
 
 		if ($append) $sql .= ' '.$append;
 
@@ -2072,7 +2071,7 @@ 
 		{
 			return $sql;
 		}
-		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
+		return $this->query($sql, $line, $file, $offset, $offset === False ? -1 : (int)$num_rows, false, $fetchmode);
 	}
 
 	/**
@@ -2090,34 +2089,34 @@ 
 	* @param int $fetchmode =self::FETCH_ASSOC self::FETCH_ASSOC (default), self::FETCH_BOTH or self::FETCH_NUM
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=self::FETCH_ASSOC)
+	function union($selects, $line, $file, $order_by = '', $offset = false, $num_rows = 0, $fetchmode = self::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		if ($this->Debug) echo "<p>db::union(".print_r($selects, True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
 
 		$union = array();
-		foreach($selects as $select)
+		foreach ($selects as $select)
 		{
-			$union[] = call_user_func_array(array($this,'select'),array(
+			$union[] = call_user_func_array(array($this, 'select'), array(
 				$select['table'],
 				$select['cols'],
 				$select['where'],
-				false,	// line
-				false,	// file
-				false,	// offset
+				false, // line
+				false, // file
+				false, // offset
 				$select['append'],
 				$select['app'],
-				0,		// num_rows,
+				0, // num_rows,
 				$select['join'],
 				$select['table_def'],
 			));
 		}
-		$sql = count($union) > 1 ? '(' . implode(")\nUNION\n(",$union).')' : 'SELECT DISTINCT'.substr($union[0],6);
+		$sql = count($union) > 1 ? '('.implode(")\nUNION\n(", $union).')' : 'SELECT DISTINCT'.substr($union[0], 6);
 
-		if ($order_by) $sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		if ($order_by) $sql .= (!stristr($order_by, 'ORDER BY') ? "\nORDER BY " : '').$order_by;
 
 		if ($this->Debug) echo "<p>sql='$sql'</p>";
 
-		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
+		return $this->query($sql, $line, $file, $offset, $offset === False ? -1 : (int)$num_rows, false, $fetchmode);
 	}
 
 	/**
@@ -2127,15 +2126,15 @@ 
 	 * @param string|array $strip
 	 * @return array
 	 */
-	static function strip_array_keys($arr,$strip)
+	static function strip_array_keys($arr, $strip)
 	{
 		$keys = array_keys($arr);
 
 		return array_walk($keys, function(&$v, $k, $strip)
 		{
-			unset($k);	// not used, but required by function signature
+			unset($k); // not used, but required by function signature
 			$v = str_replace($strip, '', $v);
 		}, $strip) ?
-			array_combine($keys,$arr) : $arr;
+			array_combine($keys, $arr) : $arr;
 	}
 }

api/src/Db/Backup.php

Doc Comments +3 added lines, -2 removed lines

@@ -496,7 +496,7 @@ 
 	 * Restore data from a (compressed) csv file
 	 *
 	 * @param resource $f file opened with fopen for reading
-	 * @param int|string $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert
+	 * @param integer $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert
 	 * @returns int number of rows read from csv file
 	 */
 	function db_restore($f, $insert_n_rows=10)
@@ -1044,7 +1044,7 @@ 
 	/**
 	 * Backup all schemas in the form of a setup/tables_current.inc.php file
 	 *
-	 * @param resource|boolean $f
+	 * @param resource $f
 	 */
 	function schema_backup($f=False)
 	{
@@ -1089,6 +1089,7 @@ 
 	 * Dump an array as php source
 	 *
 	 * copied from etemplate/inc/class.db_tools.inc.php
+	 * @param integer $depth
 	 */
 	private static function write_array($arr,$depth,$parent='')
 	{

Indentation +5 added lines, -5 removed lines

@@ -381,7 +381,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -719,9 +719,9 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+				self::remove_dir_content($dir.'/'.$file);
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+				unlink($dir.'/'.$file);
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -967,8 +967,8 @@ 
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
 			}
 
-		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+			fclose($f);
+			if (file_exists($name)) unlink($name);
 			return TRUE;
 		}
 		// save files ....

Spacing +155 added lines, -155 removed lines

@@ -51,9 +51,9 @@ 
 	 * @var array
 	 */
 	var $exclude_tables = array(
-		'egw_sessions','egw_app_sessions','phpgw_sessions','phpgw_app_sessions',	// eGW's session-tables
-		'phpgw_anglemail',	// email's cache
-		'egw_felamimail_cache','egw_felamimail_folderstatus','phpgw_felamimail_cache','phpgw_felamimail_folderstatus',	// felamimail's cache
+		'egw_sessions', 'egw_app_sessions', 'phpgw_sessions', 'phpgw_app_sessions', // eGW's session-tables
+		'phpgw_anglemail', // email's cache
+		'egw_felamimail_cache', 'egw_felamimail_folderstatus', 'phpgw_felamimail_cache', 'phpgw_felamimail_folderstatus', // felamimail's cache
 		'egw_phpfreechat', // as of the fieldnames of the table a restore would fail within egroupware, and chatcontent is of no particular intrest
 	);
 	/**
@@ -85,7 +85,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $backup_files = false ;
+	var $backup_files = false;
 	/**
 	 * Reference to schema_proc's Api\Db object
 	 *
@@ -100,7 +100,7 @@ 
 	{
 		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']) && !isset($GLOBALS['egw_setup']->db))
 		{
-			$GLOBALS['egw_setup']->loaddb();	// we run inside setup, but db object is not loaded
+			$GLOBALS['egw_setup']->loaddb(); // we run inside setup, but db object is not loaded
 		}
 		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))	// schema_proc already instanciated, use it
 		{
@@ -118,21 +118,21 @@ 
 		{
 			if ($GLOBALS['egw_setup']->config_table && $GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->config_table)))
 			{
-				if (!($this->files_dir = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'",__LINE__,__FILE__)->fetchColumn()))
+				if (!($this->files_dir = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'", __LINE__, __FILE__)->fetchColumn()))
 				{
 					error_log(__METHOD__."->"."No files Directory set/found");
 				}
-				if (!($this->backup_dir = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'",__LINE__,__FILE__)->fetchColumn()))
+				if (!($this->backup_dir = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'", __LINE__, __FILE__)->fetchColumn()))
 				{
 					$this->backup_dir = $this->files_dir.'/db_backup';
 				}
-				$this->charset = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='system_charset'",__LINE__,__FILE__)->fetchColumn();
-				$this->api_version = $this->db->select($GLOBALS['egw_setup']->applications_table,'app_version',array('app_name'=>array('api','phpgwapi')),
-					__LINE__,__FILE__,0,'ORDER BY app_name ASC')->fetchColumn();
+				$this->charset = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='system_charset'", __LINE__, __FILE__)->fetchColumn();
+				$this->api_version = $this->db->select($GLOBALS['egw_setup']->applications_table, 'app_version', array('app_name'=>array('api', 'phpgwapi')),
+					__LINE__, __FILE__, 0, 'ORDER BY app_name ASC')->fetchColumn();
 				// Backup settings
-				$this->backup_mincount = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_mincount'",__LINE__,__FILE__)->fetchColumn();
+				$this->backup_mincount = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_mincount'", __LINE__, __FILE__)->fetchColumn();
 				// backup files too
-				$this->backup_files = (bool)$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_files'",__LINE__,__FILE__)->fetchColumn();
+				$this->backup_files = (bool)$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_files'", __LINE__, __FILE__)->fetchColumn();
 			}
 			if (!$this->charset) $this->charset = 'utf-8';
 		}
@@ -147,7 +147,7 @@ 
 			$this->backup_files = $GLOBALS['egw_info']['server']['backup_files'];
 			$this->charset = Api\Translation::charset();
 
-			$this->api_version = $GLOBALS['egw_info']['apps'][isset($GLOBALS['egw_info']['apps']['api'])?'api':'phpgwapi']['version'];
+			$this->api_version = $GLOBALS['egw_info']['apps'][isset($GLOBALS['egw_info']['apps']['api']) ? 'api' : 'phpgwapi']['version'];
 		}
 		// Set a default value if not set.
 		if (!isset($this->backup_mincount))
@@ -163,7 +163,7 @@ 
 		{
 			mkdir($this->backup_dir);
 		}
-		switch($this->db->Type)
+		switch ($this->db->Type)
 		{
 			case 'sapdb':
 			case 'maxdb':
@@ -180,7 +180,7 @@ 
 	 * @param $reading =false opening for reading ('rb') or writing ('wb')
 	 * @return string/resource/zip error-msg of file-handle
 	 */
-	function fopen_backup($name=false,$reading=false)
+	function fopen_backup($name = false, $reading = false)
 	{
 		//echo "function fopen_backup($name,$reading)<br>";	// !
 		if (!$name)
@@ -189,27 +189,27 @@ 
 			if (!$this->backup_dir || !is_writable($this->backup_dir))
 			{
 				//echo '   -> !$this->backup_dir || !is_writable($this->backup_dir)<br>';	// !
-				return lang("backupdir '%1' is not writeable by the webserver",$this->backup_dir);
+				return lang("backupdir '%1' is not writeable by the webserver", $this->backup_dir);
 			}
 			$name = $this->backup_dir.'/db_backup-'.date('YmdHi');
 		}
 		else	// remove the extension, to use the correct wrapper based on the extension
 		{
 			//echo '-> else<br>';	// !
-			$name = preg_replace('/\.(bz2|gz)$/i','',$name);
+			$name = preg_replace('/\.(bz2|gz)$/i', '', $name);
 		}
 		$mode = $reading ? 'rb' : 'wb';
-		list( , $type) = explode('.', basename($name));
-		if($type == 'zip' && $reading && $this->backup_files)
+		list(, $type) = explode('.', basename($name));
+		if ($type == 'zip' && $reading && $this->backup_files)
 		{
 			//echo '-> $type == "zip" && $reading<br>';	// !
-			if(!class_exists('ZipArchive', false))
+			if (!class_exists('ZipArchive', false))
 			{
 				$this->backup_files = false;
 				//echo '   -> (new ZipArchive) == NULL<br>';	// !
 				return lang("Cant open %1, needs ZipArchive", $name)."<br>\n";
 			}
-			if(!($f = fopen($name, $mode)))
+			if (!($f = fopen($name, $mode)))
 			{
 				//echo '   -> !($f = fopen($name, $mode))<br>';	// !
 				$lang_mode = $reading ? lang("reading") : lang("writing");
@@ -217,10 +217,10 @@ 
 			}
 			return $f;
 		}
-		if(class_exists('ZipArchive', false) && !$reading && $this->backup_files)
+		if (class_exists('ZipArchive', false) && !$reading && $this->backup_files)
 		{
 			//echo '-> (new ZipArchive) != NULL && !$reading; '.$name.'<br>';	// !
-			if(!($f = fopen($name, $mode)))
+			if (!($f = fopen($name, $mode)))
 			{
 				//echo '   -> !($f = fopen($name, $mode))<br>';	// !
 				$lang_mode = $reading ? lang("reading") : lang("writing");
@@ -228,9 +228,9 @@ 
 			}
 			return $f;
 		}
-		if(!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
-	 		!($f = fopen("compress.zlib://$name.gz",$mode)) &&
- 		 	!($f = fopen($name,$mode))
+		if (!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
+	 		!($f = fopen("compress.zlib://$name.gz", $mode)) &&
+ 		 	!($f = fopen($name, $mode))
 		)
 		{
 			//echo '-> !($f = fopen("compress.bzip2://$name.bz2", $mode))<br>';	// !
@@ -257,13 +257,13 @@ 
 		/* Search the backup directory for matching files. */
 		$handle = @opendir($this->backup_dir);
 		$files = array();
-		while($handle && ($file = readdir($handle)))
+		while ($handle && ($file = readdir($handle)))
 		{
 			/* Filter for only the files with the regular name (un-renamed).
 			 * Leave special backup files (renamed) in place.
 			 * Note that this also excludes "." and "..".
 			 */
-			if (preg_match("/^db_backup-[0-9]{12}(\.bz2|\.gz|\.zip|)$/",$file))
+			if (preg_match("/^db_backup-[0-9]{12}(\.bz2|\.gz|\.zip|)$/", $file))
 			{
 				$files[filectime($this->backup_dir.'/'.$file)] = $file;
 			}
@@ -273,7 +273,7 @@ 
 		/* Sort the files by ctime. */
 		krsort($files);
 		$count = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if ($count >= $this->backup_mincount)//
 			{
@@ -283,7 +283,7 @@ 
 					array_push($files_return, $file);
 				}
 			}
-			$count ++;
+			$count++;
 		}
 	}
 
@@ -293,13 +293,13 @@ 
 	 * @param int $minCount Minimum number of backups to keep.
 	 * @param boolean $backupFiles include files in backup or not, default dont change!
 	 */
-	function saveConfig($minCount,$backupFiles=null)
+	function saveConfig($minCount, $backupFiles = null)
 	{
-		Api\Config::save_value('backup_mincount',$this->backup_mincount=(int)$minCount,'phpgwapi');
+		Api\Config::save_value('backup_mincount', $this->backup_mincount = (int)$minCount, 'phpgwapi');
 
 		if (!is_null($backupFiles))
 		{
-			Api\Config::save_value('backup_files',$this->backup_files=(boolean)$backupFiles,'phpgwapi');
+			Api\Config::save_value('backup_files', $this->backup_files = (boolean)$backupFiles, 'phpgwapi');
 		}
 	}
 
@@ -322,7 +322,7 @@ 
 		'httpproxy_server_password',
 		'system_charset',
 		'usecookies',
-		'install_id',	// do not restore install_id, as that would give two systems with identical install_id
+		'install_id', // do not restore install_id, as that would give two systems with identical install_id
 	);
 
 	/**
@@ -336,20 +336,20 @@ 
 	 *
 	 * @returns An empty string or an error message in case of failure.
 	 */
-	function restore($f,$convert_to_system_charset=true,$filename='',$protect_system_config=true, $insert_n_rows=10)
+	function restore($f, $convert_to_system_charset = true, $filename = '', $protect_system_config = true, $insert_n_rows = 10)
 	{
 		@set_time_limit(0);
-		ini_set('auto_detect_line_endings',true);
+		ini_set('auto_detect_line_endings', true);
 
-		if (true) $convert_to_system_charset = true;	// enforce now utf-8 as system charset restores of old backups
+		if (true) $convert_to_system_charset = true; // enforce now utf-8 as system charset restores of old backups
 
 		if ($protect_system_config)
 		{
 			$system_config = array();
-			foreach($this->db->select(self::TABLE,'*',array(
+			foreach ($this->db->select(self::TABLE, '*', array(
 				'config_app' => 'phpgwapi',
 				'config_name' => self::$system_config,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$system_config[] = $row;
 			}
@@ -358,7 +358,7 @@ 
 		// as MySQL 5.7+ has sql_mode STRICT_(ALL|TRANS)_TABLES enabled by default,
 		// it will no longer restore '0000-00-00 00:00:00' in timestamps it created before,
 		// so switching strict-mode off temporary for the restore (we dont create these!)
-		if (substr($this->db->Type,0,5) == 'mysql')
+		if (substr($this->db->Type, 0, 5) == 'mysql')
 		{
 			$this->query("SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'STRICT_ALL_TABLES',''),'STRICT_TRANS_TABLES',''))", __LINE__, __FILE__);
 		}
@@ -369,17 +369,17 @@ 
 
 
 		// drop all existing tables
-		foreach($this->adodb->MetaTables('TABLES') as $table)
+		foreach ($this->adodb->MetaTables('TABLES') as $table)
 		{
-			if ($this->system_tables && preg_match($this->system_tables,$table) ||
-				$this->egw_tables && !preg_match($this->egw_tables,$table))
+			if ($this->system_tables && preg_match($this->system_tables, $table) ||
+				$this->egw_tables && !preg_match($this->egw_tables, $table))
 			{
 				 continue;
 			}
 			$this->schema_proc->DropTable($table);
 		}
 		// it could be an old backup
-		list( , $type) = explode('.', basename($filename));
+		list(, $type) = explode('.', basename($filename));
 		$dir = $this->files_dir; // $GLOBALS['egw_info']['server']['files_dir'];
 		// we may have to clean up old backup - left overs
 		if (is_dir($dir.'/database_backup'))
@@ -392,20 +392,20 @@ 
 		$name = "";
 		$zip = NULL;
 		$_f = NULL;
-		if($type == 'zip')
+		if ($type == 'zip')
 	    {
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
-			if(($zip->open($filename)) !== TRUE)
+			if (($zip->open($filename)) !== TRUE)
 			{
 				return lang("Cant open '%1' for %2", $filename, lang("reading"))."<br>\n";
 			}
-			self::remove_dir_content($dir);  // removes the files-dir
+			self::remove_dir_content($dir); // removes the files-dir
 			$zip->extractTo($dir);
 			$_f = $f;
 			$list = $this->get_file_list($dir.'/database_backup/');
 			$name = $dir.'/database_backup/'.basename($list[0]);
-			if(!($f = fopen($name, 'rb')))
+			if (!($f = fopen($name, 'rb')))
 			{
 				return lang("Cant open '%1' for %2", $filename, lang("reading"))."<br>\n";
 			}
@@ -422,46 +422,46 @@ 
 		{
 			$this->db->insert(Api\Config::TABLE, array(
 				'config_value' => $this->schema_proc->system_charset,
-			),array(
+			), array(
 				'config_app' => 'phpgwapi',
 				'config_name' => 'system_charset',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		// restore protected system config
 		if ($protect_system_config)
 		{
-			foreach($system_config as $row)
+			foreach ($system_config as $row)
 			{
-				$this->db->insert(self::TABLE,array('config_value'=>$row['config_value']),array(
+				$this->db->insert(self::TABLE, array('config_value'=>$row['config_value']), array(
 					'config_name' => $row['config_name'],
 					'config_app'  => $row['config_app'],
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 			// check and reset cookie configuration, if it does not match current enviroment
 			// if $_SERVER[HTTP_HOST] does not end with cookiedomain --> delete cookiedomain
-			if (($cookiedomain = $this->db->select(self::TABLE,'config_value',array(
+			if (($cookiedomain = $this->db->select(self::TABLE, 'config_value', array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiedomain',
-				),__LINE__,__FILE__)->fetchColumn()) && isset($_SERVER['HTTP_HOST']) &&
-				(list($hostname) = explode(':',$_SERVER['HTTP_HOST'])) &&
-				substr($hostname,-strlen($cookiedomain) !== $cookiedomain))
+				), __LINE__, __FILE__)->fetchColumn()) && isset($_SERVER['HTTP_HOST']) &&
+				(list($hostname) = explode(':', $_SERVER['HTTP_HOST'])) &&
+				substr($hostname, -strlen($cookiedomain) !== $cookiedomain))
 			{
-				$this->db->delete(self::TABLE,array(
+				$this->db->delete(self::TABLE, array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiedomain',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 			// if configured webserver_url does NOT start with cookiepath --> delete cookiepath
-			if (($cookiepath = $this->db->select(self::TABLE,'config_value',array(
+			if (($cookiepath = $this->db->select(self::TABLE, 'config_value', array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiepath',
-				),__LINE__,__FILE__)->fetchColumn()) &&
-				substr(parse_url($system_config['webserver_url'], PHP_URL_PATH),0,strlen($cookiepath) !== $cookiepath))
+				), __LINE__, __FILE__)->fetchColumn()) &&
+				substr(parse_url($system_config['webserver_url'], PHP_URL_PATH), 0, strlen($cookiepath) !== $cookiepath))
 			{
-				$this->db->delete(self::TABLE,array(
+				$this->db->delete(self::TABLE, array(
 					'config_app' => 'phpgwapi',
 					'config_name' => 'cookiepath',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		// restore original Halt_On_Error state (if changed)
@@ -470,13 +470,13 @@ 
 			$this->db->Halt_On_Error = $backup_db_halt_on_error;
 		}
 		// zip?
-		if($type == 'zip')
+		if ($type == 'zip')
 		{
 			fclose($f);
 			unlink($name);
 			rmdir($dir.'/database_backup');
 		}
-		if (substr($this->db->Type,0,5) != 'mysql')
+		if (substr($this->db->Type, 0, 5) != 'mysql')
 		{
 			if (!$this->db->transaction_commit())
 			{
@@ -511,26 +511,26 @@ 
 	 * @param int|string $insert_n_rows =10 how many rows to insert in one sql statement, or string with column-name used as unique key for insert
 	 * @returns int number of rows read from csv file
 	 */
-	function db_restore($f, $insert_n_rows=10)
+	function db_restore($f, $insert_n_rows = 10)
 	{
 		$convert_to_system_charset = true;
 		$table = null;
 		$n = 0;
 		$rows = array();
-		while(!feof($f))
+		while (!feof($f))
 		{
 			$line = trim(fgets($f)); ++$n;
 
 			if (empty($line)) continue;
 
-			if (substr($line,0,9) == 'version: ')
+			if (substr($line, 0, 9) == 'version: ')
 			{
-				$api_version = trim(substr($line,9));
+				$api_version = trim(substr($line, 9));
 				continue;
 			}
-			if (substr($line,0,9) == 'charset: ')
+			if (substr($line, 0, 9) == 'charset: ')
 			{
-				$charset = trim(substr($line,9));
+				$charset = trim(substr($line, 9));
 				// needed if mbstring.func_overload > 0, else eg. substr does not work with non ascii chars
 				$ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset';
 				@ini_set($ini_default_charset, $charset);
@@ -538,29 +538,29 @@ 
 				// check if we really need to convert the charset, as it's not perfect and can do some damage
 				if ($convert_to_system_charset && !strcasecmp($this->schema_proc->system_charset, $charset))
 				{
-					$convert_to_system_charset = false;	// no conversation necessary
+					$convert_to_system_charset = false; // no conversation necessary
 				}
 				// set the DB's client encoding (for mysql only if api_version >= 1.0.1.019)
 				if ((!$convert_to_system_charset || $this->db->capabilities['client_encoding']) &&
-					(substr($this->db->Type,0,5) != 'mysql' || !is_object($GLOBALS['egw_setup']) ||
-					$api_version && !$GLOBALS['egw_setup']->alessthanb($api_version,'1.0.1.019')))
+					(substr($this->db->Type, 0, 5) != 'mysql' || !is_object($GLOBALS['egw_setup']) ||
+					$api_version && !$GLOBALS['egw_setup']->alessthanb($api_version, '1.0.1.019')))
 				{
 					$this->db->Link_ID->SetCharSet($charset);
 					if (!$convert_to_system_charset)
 					{
-						$this->schema_proc->system_charset = $charset;	// so schema_proc uses it for the creation of the tables
+						$this->schema_proc->system_charset = $charset; // so schema_proc uses it for the creation of the tables
 					}
 				}
 				continue;
 			}
-			if (substr($line,0,8) == 'schema: ')
+			if (substr($line, 0, 8) == 'schema: ')
 			{
 				// create the tables in the backup set
-				$this->schemas = json_php_unserialize(trim(substr($line,8)));
-				foreach($this->schemas as $table_name => $schema)
+				$this->schemas = json_php_unserialize(trim(substr($line, 8)));
+				foreach ($this->schemas as $table_name => $schema)
 				{
 					// if column is longtext in current schema, convert text to longtext, in case user already updated column
-					foreach($schema['fd'] as $col => &$def)
+					foreach ($schema['fd'] as $col => &$def)
 					{
 						if ($def['type'] == 'text' && $this->db->get_column_attribute($col, $table_name, true, 'type') == 'longtext')
 						{
@@ -572,27 +572,27 @@ 
 				}
 				continue;
 			}
-			if (substr($line,0,7) == 'table: ')
+			if (substr($line, 0, 7) == 'table: ')
 			{
 				if ($rows)	// flush pending rows of last table
 				{
 					$this->insert_multiple($table, $rows, $this->schemas[$table]);
 				}
 				$rows = array();
-				$table = substr($line,7);
+				$table = substr($line, 7);
 				if (!isset($this->schemas[$table])) $this->schemas[$table] = $this->db->get_table_definitions(true, $table);
 				$auto_id = count($this->schemas[$table]['pk']) == 1 ? $this->schemas[$table]['pk'][0] : null;
 
-				$cols = self::csv_split($line=fgets($f)); ++$n;
+				$cols = self::csv_split($line = fgets($f)); ++$n;
 				$blobs = array();
-				foreach($this->schemas[$table]['fd'] as $col => $data)
+				foreach ($this->schemas[$table]['fd'] as $col => $data)
 				{
 					if ($data['type'] == 'blob') $blobs[] = $col;
 				}
 				// check if we have an old PostgreSQL backup useing 't'/'f' for bool values
 				// --> convert them to MySQL and our new PostgreSQL format of 1/0
 				$bools = array();
-				foreach($this->schemas[$table]['fd'] as $col => $def)
+				foreach ($this->schemas[$table]['fd'] as $col => $def)
 				{
 					if ($def['type'] === 'bool') $bools[] = $col;
 				}
@@ -616,15 +616,15 @@ 
 				$import = true;
 				$data = self::csv_split($line, $cols, $blobs, $bools);
 
-				if ($table == 'egw_async' && in_array('##last-check-run##',$data))
+				if ($table == 'egw_async' && in_array('##last-check-run##', $data))
 				{
 					//echo '<p>'.lang("Line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
 					//echo 'data=<pre>'.print_r($data,true)."</pre>\n";
 					$import = false;
 				}
-				if (in_array($table,$this->exclude_tables))
+				if (in_array($table, $this->exclude_tables))
 				{
-					echo '<p><b>'.lang("Table %1 is excluded from backup and restore. Data will not be restored.",$table)."</b></p>\n";
+					echo '<p><b>'.lang("Table %1 is excluded from backup and restore. Data will not be restored.", $table)."</b></p>\n";
 					$import = false; // dont restore data of excluded tables
 				}
 				if ($import)
@@ -633,7 +633,7 @@ 
 					{
 						if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
 						{
-							$data = Api\Translation::convert($data,$charset);
+							$data = Api\Translation::convert($data, $charset);
 						}
 						if ($insert_n_rows > 1)
 						{
@@ -645,27 +645,27 @@ 
 							}
 						}
 						// update existing table using given unique key in $insert_n_rows (also removing auto-id/sequence)
-						elseif(!is_numeric($insert_n_rows))
+						elseif (!is_numeric($insert_n_rows))
 						{
 							$where = array($insert_n_rows => $data[$insert_n_rows]);
 							unset($data[$insert_n_rows]);
 							if ($auto_id) unset($data[$auto_id]);
-							$this->db->insert($table,$data,$where,__LINE__,__FILE__,false,false,$this->schemas[$table]);
+							$this->db->insert($table, $data, $where, __LINE__, __FILE__, false, false, $this->schemas[$table]);
 						}
 						else
 						{
 							try {
-								$this->db->insert($table,$data,False,__LINE__,__FILE__,false,false,$this->schemas[$table]);
+								$this->db->insert($table, $data, False, __LINE__, __FILE__, false, false, $this->schemas[$table]);
 							}
-							catch(Exception\InvalidSql $e) {
+							catch (Exception\InvalidSql $e) {
 								echo "<p>".$e->getMessage()."</p>\n";
 							}
 						}
 					}
 					else
 					{
-						echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
-						echo 'data=<pre>'.print_r($data,true)."</pre>\n";
+						echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>", $n, $line, $table)."</p>\n";
+						echo 'data=<pre>'.print_r($data, true)."</pre>\n";
 					}
 				}
 			}
@@ -675,14 +675,14 @@ 
 			$this->insert_multiple($table, $rows, $this->schemas[$table]);
 		}
 		// updated the sequences, if the DB uses them
-		foreach($this->schemas as $table => $schema)
+		foreach ($this->schemas as $table => $schema)
 		{
-			foreach($schema['fd'] as $column => $definition)
+			foreach ($schema['fd'] as $column => $definition)
 			{
 				if ($definition['type'] == 'auto')
 				{
-					$this->schema_proc->UpdateSequence($table,$column);
-					break;	// max. one per table
+					$this->schema_proc->UpdateSequence($table, $column);
+					break; // max. one per table
 				}
 			}
 		}
@@ -705,15 +705,15 @@ 
 		try {
 			$this->db->insert($table, $rows, False, __LINE__, __FILE__, false, false, $schema);
 		}
-		catch(Exception\InvalidSql $e)
+		catch (Exception\InvalidSql $e)
 		{
 			// try inserting them one by one, ignoring doublicates
-			foreach($rows as $data)
+			foreach ($rows as $data)
 			{
 				try {
 					$this->db->insert($table, $data, False, __LINE__, __FILE__, false, false, $schema);
 				}
-				catch(Exception\InvalidSql $e) {
+				catch (Exception\InvalidSql $e) {
 					echo "<p>".$e->getMessage()."</p>\n";
 				}
 			}
@@ -728,11 +728,11 @@ 
 	private static function remove_dir_content($dir)
 	{
 		$list = scandir($dir);
-		while($file = $list[0])
+		while ($file = $list[0])
 		{
-			if(is_dir($file) && $file != '.' && $file != '..')
+			if (is_dir($file) && $file != '.' && $file != '..')
 			    self::remove_dir_content($dir.'/'.$file);
-			if(is_file($file) && $file != '.' && $file != '..')
+			if (is_file($file) && $file != '.' && $file != '..')
 			    unlink($dir.'/'.$file);
 			array_shift($list);
 		}
@@ -757,7 +757,7 @@ 
 	 * @param array $bools =array() bool columns, values might be 't'/'f' for old PostgreSQL backups
 	 * @return array
 	 */
-	public static function csv_split($line, $keys=null, $blobs=array(), $bools=array())
+	public static function csv_split($line, $keys = null, $blobs = array(), $bools = array())
 	{
 		if (function_exists('str_getcsv'))	// php5.3+
 		{
@@ -770,9 +770,9 @@ 
 				'\\n'    => "\n",
 				'\\r'    => "\r")), ',', '"', '\0');
 			// replace NULL-token again with 'NULL', 'NULL' with null and BACKSLASH-token with a backslash
-			foreach($fields as &$field)
+			foreach ($fields as &$field)
 			{
-				switch($field)
+				switch ($field)
 				{
 					case self::NULL_TOKEN:
 						$field = 'NULL';
@@ -789,7 +789,7 @@ 
 			{
 				$fields = array_combine($keys, $fields);
 				// base64-decode blob columns, if they are base64 encoded
-				foreach($blobs as $key)
+				foreach ($blobs as $key)
 				{
 					if (!is_null($fields[$key]) && ($tmp = base64_decode($fields[$key], true)) !== false)
 					{
@@ -797,7 +797,7 @@ 
 					}
 				}
 				// decode bool columns, they might be 't'/'f' for old PostgreSQL backups
-				foreach($bools as $key)
+				foreach ($bools as $key)
 				{
 					$fields[$key] = Api\Db::from_bool($fields[$key]);
 				}
@@ -805,11 +805,11 @@ 
 			return $fields;
 		}
 		// pre 5.3 implementation
-		$fields = explode(',',trim($line));
+		$fields = explode(',', trim($line));
 
 		$str_pending = False;
 		$n = 0;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			if ($str_pending !== False)
 			{
@@ -820,12 +820,12 @@ 
 
 			if ($field[0] == '"')
 			{
-				if (substr($field,-1) !== '"' || $field === '"' || !preg_match('/[^\\\\]+(\\\\\\\\)*"$/',$field))
+				if (substr($field, -1) !== '"' || $field === '"' || !preg_match('/[^\\\\]+(\\\\\\\\)*"$/', $field))
 				{
 					$str_pending = $field;
 					continue;
 				}
-				$arr[$key] = str_replace(self::BACKSLASH_TOKEN,'\\',str_replace(array('\\\\','\\n','\\r','\\"'),array(self::BACKSLASH_TOKEN,"\n","\r",'"'),substr($field,1,-1)));
+				$arr[$key] = str_replace(self::BACKSLASH_TOKEN, '\\', str_replace(array('\\\\', '\\n', '\\r', '\\"'), array(self::BACKSLASH_TOKEN, "\n", "\r", '"'), substr($field, 1, -1)));
 			}
 			elseif ($keys && strlen($field) > 26)
 			{
@@ -847,7 +847,7 @@ 
 	/**
 	 * escape data for csv
 	 */
-	public static function escape_data(&$data,$col,$defs)
+	public static function escape_data(&$data, $col, $defs)
 	{
 		if (is_null($data))
 		{
@@ -855,7 +855,7 @@ 
 		}
 		else
 		{
-			switch($defs[$col]['type'])
+			switch ($defs[$col]['type'])
 			{
 				case 'int':
 				case 'auto':
@@ -870,7 +870,7 @@ 
 					$data = (int)Api\Db::from_bool($data);
 					break;
 				default:
-					$data = '"'.str_replace(array('\\',"\n","\r",'"'),array('\\\\','\\n','\\r','\\"'),$data).'"';
+					$data = '"'.str_replace(array('\\', "\n", "\r", '"'), array('\\\\', '\\n', '\\r', '\\"'), $data).'"';
 					break;
 			}
 		}
@@ -889,7 +889,7 @@ 
 	 *	default of null limits memory usage if there is no primary key, by locking table and use ROW_CHUCK
 	 * @todo use https://github.com/maennchen/ZipStream-PHP to not assemble all files in memmory
 	 */
-	function backup($f, $lock_table=null)
+	function backup($f, $lock_table = null)
 	{
 		//echo "function backup($f)<br>";	// !
 		@set_time_limit(0);
@@ -905,15 +905,15 @@ 
 		$name = $this->backup_dir.'/db_backup-'.date('YmdHi');
 		$filename = $name.'.zip';
 		$zippresent = false;
-		if(class_exists('ZipArchive') && $this->backup_files)
+		if (class_exists('ZipArchive') && $this->backup_files)
 		{
 			$zip = new ZipArchive;
-			if(is_object($zip))
+			if (is_object($zip))
 			{
 				$zippresent = true;
 				//echo '-> is_object($zip); '.$filename.'<br>';	// !
 				$res = $zip->open($filename, ZipArchive::CREATE);
-				if($res !== TRUE)
+				if ($res !== TRUE)
 				{
 					//echo '   -> !$res<br>';	// !
 					return lang("Cant open '%1' for %2", $filename, lang("writing"))."<br>\n";
@@ -921,19 +921,19 @@ 
 				$file_list = $this->get_file_list($dir);
 			}
 		}
-		fwrite($f,"EGroupware backup from ".date('Y-m-d H:i:s')."\n\n");
+		fwrite($f, "EGroupware backup from ".date('Y-m-d H:i:s')."\n\n");
 
-		fwrite($f,"version: $this->api_version\n\n");
+		fwrite($f, "version: $this->api_version\n\n");
 
-		fwrite($f,"charset: $this->charset\n\n");
+		fwrite($f, "charset: $this->charset\n\n");
 
-		$this->schema_backup($f);	// add the schema in a human readable form too
+		$this->schema_backup($f); // add the schema in a human readable form too
 
-		fwrite($f,"\nschema: ".json_encode($this->schemas)."\n");
+		fwrite($f, "\nschema: ".json_encode($this->schemas)."\n");
 
-		foreach($this->schemas as $table => $schema)
+		foreach ($this->schemas as $table => $schema)
 		{
-			if (in_array($table,$this->exclude_tables)) continue;	// dont backup
+			if (in_array($table, $this->exclude_tables)) continue; // dont backup
 
 			// do we have a primary key?
 			// --> use it to order and limit rows, to kope with rows being added during backup
@@ -949,7 +949,7 @@ 
 			do {
 				$num_rows = 0;
 				// querying only chunks for 10000 rows, to not run into memory limit on huge tables
-				foreach($this->db->select($table, '*',
+				foreach ($this->db->select($table, '*',
 					// limit by maximum primary key already received
 					empty($pk) || !$max ? false : $pk.' > '.$this->db->quote($max, $schema['fd'][$pk]['type']),
 					__LINE__, __FILE__,
@@ -960,19 +960,19 @@ 
 					false, self::ROW_CHUNK) as $row)
 				{
 					if (!empty($pk)) $max = $row[$pk];
-					if ($total === 0) fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					if ($total === 0) fwrite($f, "\ntable: $table\n".implode(',', array_keys($row))."\n");
 
 					array_walk($row, array(__CLASS__, 'escape_data'), $schema['fd']);
-					fwrite($f,implode(',',$row)."\n");
+					fwrite($f, implode(',', $row)."\n");
 					++$total;
 					++$num_rows;
 				}
 			}
-			while((!empty($pk) || $lock_table !== false) && !($total % self::ROW_CHUNK) && $num_rows);
+			while ((!empty($pk) || $lock_table !== false) && !($total % self::ROW_CHUNK) && $num_rows);
 
 			if (!$pk) $this->db->Link_ID->RollbackLock($table);
 		}
-		if(!$zippresent)  // save without files
+		if (!$zippresent)  // save without files
 		{
 			if ($this->backup_files)
 			{
@@ -987,16 +987,16 @@ 
 		//echo $name.'<br>';
 		$zip->addFile($name, 'database_backup/'.basename($name));
 		$count = 1;
-		foreach($file_list as $file)
+		foreach ($file_list as $file)
 		{
 			//echo substr($file,strlen($dir)+1).'<br>';
 			//echo $file.'<br>';
-			$zip->addFile($file,substr($file,strlen($dir)+1));//,substr($file);
-			if(($count++) == 100) { // the file descriptor limit
+			$zip->addFile($file, substr($file, strlen($dir) + 1)); //,substr($file);
+			if (($count++) == 100) { // the file descriptor limit
 				$zip->close();
-				if(($zip = new ZipArchive())) {
+				if (($zip = new ZipArchive())) {
 					$zip->open($filename);
-					$count =0;
+					$count = 0;
 				}
 			}
 		}
@@ -1019,17 +1019,17 @@ 
 	{
 		//chdir($f);
 		//echo "Processing $f <br>";
-		if ($path_name =='') $path_name = $f;
+		if ($path_name == '') $path_name = $f;
 		$tlist = scandir($f);
 		$list = array();
 		$i = $cnt;
-		while($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
+		while ($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
 		{
-			if($file == '.' || $file == '..')
+			if ($file == '.' || $file == '..')
 			{
 				array_shift($tlist);
 			}
-			elseif ($file == 'debug.txt' && stripos($f,'activesync')!==false)
+			elseif ($file == 'debug.txt' && stripos($f, 'activesync') !== false)
 			{
 				// skip activesync debug.txt on backupFiles
 				//error_log(__METHOD__.__LINE__.'->'.$f.'/'.$file);
@@ -1037,7 +1037,7 @@ 
 			}
 			else
 			{
-				if(is_dir($f.'/'.$file))
+				if (is_dir($f.'/'.$file))
 				{
 					$nlist = $this->get_file_list($f.'/'.$file, $i);
 					$list += $nlist;
@@ -1058,12 +1058,12 @@ 
 	 *
 	 * @param resource|boolean $f
 	 */
-	function schema_backup($f=False)
+	function schema_backup($f = False)
 	{
-		foreach($this->adodb->MetaTables('TABLES') as $table)
+		foreach ($this->adodb->MetaTables('TABLES') as $table)
 		{
-			if ($this->system_tables && preg_match($this->system_tables,$table) ||
-				$this->egw_tables && !preg_match($this->egw_tables,$table))
+			if ($this->system_tables && preg_match($this->system_tables, $table) ||
+				$this->egw_tables && !preg_match($this->egw_tables, $table))
 			{
 				continue;
 			}
@@ -1082,17 +1082,17 @@ 
 			}
 		}
 		$def = "\t\$phpgw_baseline = ";
-		$def .= self::write_array($this->schemas,1);
+		$def .= self::write_array($this->schemas, 1);
 		$def .= ";\n";
 
 		if ($f)
 		{
-			fwrite($f,$def);
+			fwrite($f, $def);
 		}
 		else
 		{
 			$def = "<?php\n\t/* EGroupware schema-backup from ".date('Y-m-d H:i:s')." */\n\n".$def;
-			Api\Header\Content::type('schema-backup-'.date('YmdHi').'.inc.php','text/plain',bytes($def));
+			Api\Header\Content::type('schema-backup-'.date('YmdHi').'.inc.php', 'text/plain', bytes($def));
 			echo $def;
 		}
 	}
@@ -1102,9 +1102,9 @@ 
 	 *
 	 * copied from etemplate/inc/class.db_tools.inc.php
 	 */
-	private static function write_array($arr,$depth,$parent='')
+	private static function write_array($arr, $depth, $parent = '')
 	{
-		if (in_array($parent,array('pk','fk','ix','uc')))
+		if (in_array($parent, array('pk', 'fk', 'ix', 'uc')))
 		{
 			$depth = 0;
 		}
@@ -1120,7 +1120,7 @@ 
 		$def = "array($tabs".($tabs ? "\t" : '');
 
 		$n = 0;
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			if (!is_int($key))
 			{
@@ -1128,7 +1128,7 @@ 
 			}
 			if (is_array($val))
 			{
-				$def .= self::write_array($val,$parent == 'fd' ? 0 : $depth,$key);
+				$def .= self::write_array($val, $parent == 'fd' ? 0 : $depth, $key);
 			}
 			else
 			{
@@ -1141,7 +1141,7 @@ 
 					$def .= "'$val'";
 				}
 			}
-			if ($n < count($arr)-1)
+			if ($n < count($arr) - 1)
 			{
 				$def .= ",$tabs".($tabs ? "\t" : '');
 			}

Braces +127 added lines, -35 removed lines

@@ -102,25 +102,34 @@ 
 		{
 			$GLOBALS['egw_setup']->loaddb();	// we run inside setup, but db object is not loaded
 		}
-		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))	// schema_proc already instanciated, use it
+		if (isset($GLOBALS['egw_setup']->oProc) && is_object($GLOBALS['egw_setup']->oProc))
+		{
+			// schema_proc already instanciated, use it
 		{
 			$this->schema_proc = $GLOBALS['egw_setup']->oProc;
 		}
+		}
 		else
 		{
 			$this->schema_proc = new Api\Db\Schema();
 		}
 
 		$this->db = $this->schema_proc->m_odb;
-		if (!$this->db->Link_ID) $this->db->connect();
+		if (!$this->db->Link_ID)
+		{
+			$this->db->connect();
+		}
 		$this->adodb = $this->db->Link_ID;
-		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']))		// called from setup
+		if (isset($GLOBALS['egw_setup']) && is_object($GLOBALS['egw_setup']))
+		{
+			// called from setup
 		{
 			if ($GLOBALS['egw_setup']->config_table && $GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->config_table)))
 			{
 				if (!($this->files_dir = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='files_dir'",__LINE__,__FILE__)->fetchColumn()))
 				{
 					error_log(__METHOD__."->"."No files Directory set/found");
+		}
 				}
 				if (!($this->backup_dir = $this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_dir'",__LINE__,__FILE__)->fetchColumn()))
 				{
@@ -134,7 +143,10 @@ 
 				// backup files too
 				$this->backup_files = (bool)$this->db->query("SELECT config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_app='phpgwapi' AND config_name='backup_files'",__LINE__,__FILE__)->fetchColumn();
 			}
-			if (!$this->charset) $this->charset = 'utf-8';
+			if (!$this->charset)
+			{
+				$this->charset = 'utf-8';
+			}
 		}
 		else	// called from eGW
 		{
@@ -231,8 +243,7 @@ 
 		if(!($f = fopen("compress.bzip2://$name.bz2", $mode)) &&
 	 		!($f = fopen("compress.zlib://$name.gz",$mode)) &&
  		 	!($f = fopen($name,$mode))
-		)
-		{
+		) {
 			//echo '-> !($f = fopen("compress.bzip2://$name.bz2", $mode))<br>';	// !
 			$lang_mode = $reading ? lang("reading") : lang("writing");
 			return lang("Cant open '%1' for %2", $name, $lang_mode)."<br>";
@@ -268,16 +279,22 @@ 
 				$files[filectime($this->backup_dir.'/'.$file)] = $file;
 			}
 		}
-		if ($handle) closedir($handle);
+		if ($handle)
+		{
+			closedir($handle);
+		}
 
 		/* Sort the files by ctime. */
 		krsort($files);
 		$count = 0;
 		foreach($files as $file)
 		{
-			if ($count >= $this->backup_mincount)//
+			if ($count >= $this->backup_mincount)
+			{
+				//
 			{
 				$ret = unlink($this->backup_dir.'/'.$file);
+			}
 				if (($ret) && (is_array($files_return)))
 				{
 					array_push($files_return, $file);
@@ -341,7 +358,11 @@ 
 		@set_time_limit(0);
 		ini_set('auto_detect_line_endings',true);
 
-		if (true) $convert_to_system_charset = true;	// enforce now utf-8 as system charset restores of old backups
+		if (true)
+		{
+			$convert_to_system_charset = true;
+		}
+		// enforce now utf-8 as system charset restores of old backups
 
 		if ($protect_system_config)
 		{
@@ -393,7 +414,7 @@ 
 		$zip = NULL;
 		$_f = NULL;
 		if($type == 'zip')
-	    {
+		{
 			// has already been verified to be available in fopen_backup
 			$zip = new ZipArchive;
 			if(($zip->open($filename)) !== TRUE)
@@ -412,7 +433,9 @@ 
 		}
 		$this->db_restore($f, $insert_n_rows);
 
-		if ($convert_to_system_charset)	// store the changed charset
+		if ($convert_to_system_charset)
+		{
+			// store the changed charset
 		{
 			$this->db->insert(Api\Config::TABLE, array(
 				'config_value' => $this->schema_proc->system_charset,
@@ -421,6 +444,7 @@ 
 				'config_name' => 'system_charset',
 			),__LINE__,__FILE__);
 		}
+		}
 		// restore protected system config
 		if ($protect_system_config)
 		{
@@ -510,7 +534,10 @@ 
 		{
 			$line = trim(fgets($f)); ++$n;
 
-			if (empty($line)) continue;
+			if (empty($line))
+			{
+				continue;
+			}
 
 			if (substr($line,0,9) == 'version: ')
 			{
@@ -563,31 +590,49 @@ 
 			}
 			if (substr($line,0,7) == 'table: ')
 			{
-				if ($rows)	// flush pending rows of last table
+				if ($rows)
+				{
+					// flush pending rows of last table
 				{
 					$this->insert_multiple($table, $rows, $this->schemas[$table]);
 				}
+				}
 				$rows = array();
 				$table = substr($line,7);
-				if (!isset($this->schemas[$table])) $this->schemas[$table] = $this->db->get_table_definitions(true, $table);
+				if (!isset($this->schemas[$table]))
+				{
+					$this->schemas[$table] = $this->db->get_table_definitions(true, $table);
+				}
 				$auto_id = count($this->schemas[$table]['pk']) == 1 ? $this->schemas[$table]['pk'][0] : null;
 
 				$cols = self::csv_split($line=fgets($f)); ++$n;
 				$blobs = array();
 				foreach($this->schemas[$table]['fd'] as $col => $data)
 				{
-					if ($data['type'] == 'blob') $blobs[] = $col;
+					if ($data['type'] == 'blob')
+					{
+						$blobs[] = $col;
+					}
 				}
 				// check if we have an old PostgreSQL backup useing 't'/'f' for bool values
 				// --> convert them to MySQL and our new PostgreSQL format of 1/0
 				$bools = array();
 				foreach($this->schemas[$table]['fd'] as $col => $def)
 				{
-					if ($def['type'] === 'bool') $bools[] = $col;
+					if ($def['type'] === 'bool')
+					{
+						$bools[] = $col;
+					}
+				}
+				if ($table == 'egw_cal_dates')
+				{
+					error_log(__METHOD__."() $table: bools=".array2string($bools).", schema[fd]=".array2string($this->schemas[$table]['fd']));
 				}
-				if ($table == 'egw_cal_dates') error_log(__METHOD__."() $table: bools=".array2string($bools).", schema[fd]=".array2string($this->schemas[$table]['fd']));
 
-				if (feof($f)) break;
+				if (feof($f))
+				{
+					break;
+				}
 				continue;
 			}
 			if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
@@ -600,9 +645,12 @@ 
 					}
 				}
 			}
-			if ($table)	// do we already reached the data part
+			if ($table)
+			{
+				// do we already reached the data part
 			{
 				$import = true;
+			}
 				$data = self::csv_split($line, $cols, $blobs, $bools);
 
 				if ($table == 'egw_async' && in_array('##last-check-run##',$data))
@@ -638,7 +686,10 @@ 
 						{
 							$where = array($insert_n_rows => $data[$insert_n_rows]);
 							unset($data[$insert_n_rows]);
-							if ($auto_id) unset($data[$auto_id]);
+							if ($auto_id)
+							{
+								unset($data[$auto_id]);
+							}
 							$this->db->insert($table,$data,$where,__LINE__,__FILE__,false,false,$this->schemas[$table]);
 						}
 						else
@@ -659,10 +710,13 @@ 
 				}
 			}
 		}
-		if ($rows)	// flush pending rows
+		if ($rows)
+		{
+			// flush pending rows
 		{
 			$this->insert_multiple($table, $rows, $this->schemas[$table]);
 		}
+		}
 		// updated the sequences, if the DB uses them
 		foreach($this->schemas as $table => $schema)
 		{
@@ -720,9 +774,13 @@ 
 		while($file = $list[0])
 		{
 			if(is_dir($file) && $file != '.' && $file != '..')
-			    self::remove_dir_content($dir.'/'.$file);
+			{
+						    self::remove_dir_content($dir.'/'.$file);
+			}
 			if(is_file($file) && $file != '.' && $file != '..')
-			    unlink($dir.'/'.$file);
+			{
+						    unlink($dir.'/'.$file);
+			}
 			array_shift($list);
 		}
 		//rmdir($dir);  // dont remove own dir
@@ -748,7 +806,9 @@ 
 	 */
 	public static function csv_split($line, $keys=null, $blobs=array(), $bools=array())
 	{
-		if (function_exists('str_getcsv'))	// php5.3+
+		if (function_exists('str_getcsv'))
+		{
+			// php5.3+
 		{
 			// we need to take care of literal "NULL" values, replacing them we a special token as str_getcsv removes enclosures around strings
 			// str_getcsv uses '""' for '"' instead of '\\"' and does not unescape '\\n', '\\r' or '\\\\' (two backslashes)
@@ -758,6 +818,7 @@ 
 				'\\"'    => '""',
 				'\\n'    => "\n",
 				'\\r'    => "\r")), ',', '"', '\0');
+		}
 			// replace NULL-token again with 'NULL', 'NULL' with null and BACKSLASH-token with a backslash
 			foreach($fields as &$field)
 			{
@@ -774,9 +835,12 @@ 
 						break;
 				}
 			}
-			if ($keys)	// if string keys are to be used --> combine keys and values
+			if ($keys)
+			{
+				// if string keys are to be used --> combine keys and values
 			{
 				$fields = array_combine($keys, $fields);
+			}
 				// base64-decode blob columns, if they are base64 encoded
 				foreach($blobs as $key)
 				{
@@ -925,7 +989,11 @@ 
 
 		foreach($this->schemas as $table => $schema)
 		{
-			if (in_array($table,$this->exclude_tables)) continue;	// dont backup
+			if (in_array($table,$this->exclude_tables))
+			{
+				continue;
+			}
+			// dont backup
 
 			// do we have a primary key?
 			// --> use it to order and limit rows, to kope with rows being added during backup
@@ -951,8 +1019,14 @@ 
 					empty($pk) ? '' : 'ORDER BY '.$this->db->name_quote($pk).' ASC',
 					false, self::ROW_CHUNK) as $row)
 				{
-					if (!empty($pk)) $max = $row[$pk];
-					if ($total === 0) fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					if (!empty($pk))
+					{
+						$max = $row[$pk];
+					}
+					if ($total === 0)
+					{
+						fwrite($f,"\ntable: $table\n".implode(',',array_keys($row))."\n");
+					}
 
 					array_walk($row, array(__CLASS__, 'escape_data'), $schema['fd']);
 					fwrite($f,implode(',',$row)."\n");
@@ -962,21 +1036,30 @@ 
 			}
 			while((!empty($pk) || $lock_table !== false) && !($total % self::ROW_CHUNK) && $num_rows);
 
-			if (!$pk) $this->db->rollback_lock($table);
+			if (!$pk)
+			{
+				$this->db->rollback_lock($table);
+			}
 		}
 
 		// let apps know that backup is finished
 		Api\Hooks::process('backup_finished', array(), true);
 
-		if(!$zippresent)  // save without files
+		if(!$zippresent)
+		{
+			// save without files
 		{
 			if ($this->backup_files)
 			{
 				echo '<center>'.lang("Cant open %1, needs ZipArchive", $name)."<br>\n".'</center>';
+		}
 			}
 
 		    fclose($f);
-		    if (file_exists($name)) unlink($name);
+		    if (file_exists($name))
+		    {
+		    	unlink($name);
+		    }
 			return TRUE;
 		}
 		// save files ....
@@ -988,9 +1071,12 @@ 
 			//echo substr($file,strlen($dir)+1).'<br>';
 			//echo $file.'<br>';
 			$zip->addFile($file,substr($file,strlen($dir)+1));//,substr($file);
-			if(($count++) == 100) { // the file descriptor limit
+			if(($count++) == 100)
+			{
+// the file descriptor limit
 				$zip->close();
-				if(($zip = new ZipArchive())) {
+				if(($zip = new ZipArchive()))
+				{
 					$zip->open($filename);
 					$count =0;
 				}
@@ -1015,15 +1101,21 @@ 
 	{
 		//chdir($f);
 		//echo "Processing $f <br>";
-		if ($path_name =='') $path_name = $f;
+		if ($path_name =='')
+		{
+			$path_name = $f;
+		}
 		$tlist = scandir($f);
 		$list = array();
 		$i = $cnt;
-		while($file = $tlist[0]) // remove all '.' and '..' and transfer to $list
+		while($file = $tlist[0])
+		{
+			// remove all '.' and '..' and transfer to $list
 		{
 			if($file == '.' || $file == '..')
 			{
 				array_shift($tlist);
+		}
 			}
 			elseif ($file == 'debug.txt' && stripos($f,'activesync')!==false)
 			{

api/src/Db/CallbackIterator.php

Doc Comments +2 added lines, -2 removed lines

@@ -94,10 +94,10 @@
 	/**
 	 * Constructor
 	 *
-	 * @param Traversable $rs
+	 * @param \Traversable $rs
 	 * @param callback $callback
 	 * @param array $params =array() additional parameters, row is always first parameter
-	 * @param $key_callback =null optional callback, if you want different keys
+	 * @param \Closure $key_callback =null optional callback, if you want different keys
 	 */
 	public function __construct(\Traversable $rs, $callback, $params=array(), $key_callback=null)
 	{

Spacing +9 added lines, -10 removed lines

@@ -99,13 +99,13 @@ 
 	 * @param array $params =array() additional parameters, row is always first parameter
 	 * @param $key_callback =null optional callback, if you want different keys
 	 */
-	public function __construct(\Traversable $rs, $callback, $params=array(), $key_callback=null)
+	public function __construct(\Traversable $rs, $callback, $params = array(), $key_callback = null)
 	{
 		$this->callback = $callback;
 		$this->params = $params;
 		$this->key_callback = $key_callback;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -122,7 +122,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$params = $this->params;
 			array_unshift($params, $this->rs->current());
@@ -138,11 +138,10 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->key_callback ?
-				call_user_func($this->key_callback, $this->rs->current()) :
-				$this->rs->key();
+				call_user_func($this->key_callback, $this->rs->current()) : $this->rs->key();
 		}
 		return 0;
 	}
@@ -152,7 +151,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -163,7 +162,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -174,9 +173,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

api/src/Db/Deprecated.php

Doc Comments +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
 	* @deprecated not used anymore as it costs to much performance, use transactions if needed
 	* @param string $table name of table to lock
 	* @param string $mode type of lock required (optional), default write
-	* @return bool True if sucessful, False if fails
+	* @return boolean|null True if sucessful, False if fails
 	*/
 	function lock($table, $mode='write')
 	{
@@ -196,7 +196,7 @@ 
 	* Unlock a table
 	*
 	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @return bool True if sucessful, False if fails
+	* @return boolean|null True if sucessful, False if fails
 	*/
 	function unlock()
 	{}

Indentation +81 added lines, -81 removed lines

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

Spacing +11 added lines, -11 removed lines

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

Braces +17 added lines, -5 removed lines

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