EGroupware / egroupware

api/src/Contacts.php

Spacing +290 added lines, -292 removed lines

@@ -16,7 +16,7 @@ 
 
 namespace EGroupware\Api;
 
-use calendar_bo;	// to_do: do NOT require it, just use if there
+use calendar_bo; // to_do: do NOT require it, just use if there
 
 /**
  * Business object for contacts
@@ -38,7 +38,7 @@ 
 	/**
 	 * @var array $timestamps timestamps
 	 */
-	var $timestamps = array('modified','created');
+	var $timestamps = array('modified', 'created');
 
 	/**
 	 * @var array $fileas_types
@@ -173,32 +173,32 @@ 
 	 * @param string $contact_app ='addressbook' used for acl->get_grants()
 	 * @param Db $db =null
 	 */
-	function __construct($contact_app='addressbook',Db $db=null)
+	function __construct($contact_app = 'addressbook', Db $db = null)
 	{
-		parent::__construct($contact_app,$db);
+		parent::__construct($contact_app, $db);
 		if ($this->log)
 		{
 			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir'].'/log-addressbook_bo';
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3 ,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3, $this->logfile);
 		}
 
-		$this->now_su = DateTime::to('now','ts');
+		$this->now_su = DateTime::to('now', 'ts');
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
-		if(!isset($this->prefs['hide_accounts']))
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['addressbook'];
+		if (!isset($this->prefs['hide_accounts']))
 		{
 			$this->prefs['hide_accounts'] = '0';
 		}
 		// get the default addressbook from the users prefs
 		$this->default_addressbook = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] ?
 			(int)$GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] : $this->user;
-		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'],-1) == 'p';
+		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'], -1) == 'p';
 		if ($this->default_addressbook > 0 && $this->default_addressbook != $this->user &&
 			($this->default_private ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->forced['addressbook']['add_default'] ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->default['addressbook']['add_default']))
 		{
-			$this->default_addressbook = $this->user;	// admin set a default or forced pref for personal addressbook
+			$this->default_addressbook = $this->user; // admin set a default or forced pref for personal addressbook
 		}
 		$this->private_addressbook = self::private_addressbook($this->contact_repository == 'sql', $this->prefs);
 
@@ -303,27 +303,27 @@ 
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
 		if (!is_array($this->own_account_acl)) $this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
-		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
+		if ($this->own_account_acl && in_array('n_fn', $this->own_account_acl))
 		{
-			$this->own_account_acl = array_merge($this->own_account_acl,array('n_prefix','n_given','n_middle','n_family','n_suffix'));
+			$this->own_account_acl = array_merge($this->own_account_acl, array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix'));
 		}
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
-			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
+			$this->org_fields = $GLOBALS['egw_info']['server']['org_fileds_to_update'];
 			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
 
 			// Set country code if country name is selected
-			$supported_fields = $this->get_fields('supported',null,0);
-			if(in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname',$this->org_fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$this->org_fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_two_countrycode';
 			}
 		}
-		$this->categories = new Categories($this->user,'addressbook');
+		$this->categories = new Categories($this->user, 'addressbook');
 
 		$this->delete_history = $GLOBALS['egw_info']['server']['history'];
 	}
@@ -337,7 +337,7 @@ 
 	 * @param array $prefs addressbook preferences
 	 * @return boolean
 	 */
-	public static function private_addressbook($contact_repository, array $prefs=null)
+	public static function private_addressbook($contact_repository, array $prefs = null)
 	{
 		return $contact_repository == 'sql' && $prefs['private_addressbook'];
 	}
@@ -351,7 +351,7 @@ 
 	 * @param int $user =null account_id or null for current user
 	 * @return array with owner => label pairs
 	 */
-	function get_addressbooks($required=Acl::READ,$extra_label=null,$user=null)
+	function get_addressbooks($required = Acl::READ, $extra_label = null, $user = null)
 	{
 		if (is_null($user))
 		{
@@ -370,11 +370,11 @@ 
 		if ($extra_label) $addressbooks[''] = $extra_label;
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if (($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
+			if (($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 			{
-				$to_sort[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
+				$to_sort[$uid] = lang('Group %1', $GLOBALS['egw']->accounts->id2name($uid));
 			}
 		}
 		if ($to_sort)
@@ -382,19 +382,19 @@ 
 			asort($to_sort);
 			$addressbooks += $to_sort;
 		}
-		if ($required != Acl::ADD &&	// do NOT allow to set accounts as default addressbook (AB can add accounts)
+		if ($required != Acl::ADD && // do NOT allow to set accounts as default addressbook (AB can add accounts)
 			$preferences['addressbook']['hide_accounts'] !== '1' && (
-				($grants[0] & $required) == $required ||
+				($grants[0]&$required) == $required ||
 				$preferences['common']['account_selection'] == 'groupmembers' &&
-				$this->account_repository != 'ldap' && ($required & Acl::READ)))
+				$this->account_repository != 'ldap' && ($required&Acl::READ)))
 		{
 			$addressbooks[0] = lang('Accounts');
 		}
 		// add all other user addressbooks the user has the necessary rights too
 		$to_sort = array();
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if ($uid != $user && ($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
+			if ($uid != $user && ($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
 			{
 				$to_sort[$uid] = Accounts::username($uid);
 			}
@@ -419,22 +419,22 @@ 
 	 * @param boolean $isUpdate =false If true, reads the old record for any not set fields
 	 * @return string
 	 */
-	function fileas($contact,$type=null, $isUpdate=false)
+	function fileas($contact, $type = null, $isUpdate = false)
 	{
 		if (is_null($type)) $type = $contact['fileas_type'];
 		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type, 'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
 
-		if($isUpdate)
+		if ($isUpdate)
 		{
-			$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality','bday');
+			$fileas_fields = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix', 'n_fn', 'org_name', 'org_unit', 'adr_one_locality', 'bday');
 			$old = null;
-			foreach($fileas_fields as $field)
+			foreach ($fileas_fields as $field)
 			{
-				if(!isset($contact[$field]))
+				if (!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if (is_null($old)) $old = $this->read($contact['id']);
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -442,8 +442,8 @@ 
 		}
 
 		// removing empty delimiters, caused by empty contact fields
-		$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),
-			array(': ',': ',': ',', ',': ',''),
+		$fileas = str_replace(array(', , : ', ', : ', ': , ', ', , ', ': : ', ' ()'),
+			array(': ', ': ', ': ', ', ', ': ', ''),
 			strtr($type, array(
 				'n_prefix' => $contact['n_prefix'],
 				'n_given'  => $contact['n_given'],
@@ -457,13 +457,13 @@ 
 				'bday'     => (int)$contact['bday'] ? DateTime::to($contact['bday'], true) : $contact['bday'],
 			)));
 
-		while ($fileas[0] == ':' ||  $fileas[0] == ',')
+		while ($fileas[0] == ':' || $fileas[0] == ',')
 		{
-			$fileas = substr($fileas,2);
+			$fileas = substr($fileas, 2);
 		}
-		while (substr($fileas,-2) == ': ' || substr($fileas,-2) == ', ')
+		while (substr($fileas, -2) == ': ' || substr($fileas, -2) == ', ')
 		{
-			$fileas = substr($fileas,0,-2);
+			$fileas = substr($fileas, 0, -2);
 		}
 		return $fileas;
 	}
@@ -475,15 +475,15 @@ 
 	 * @param string $file_as =null file_as type, default null to read it from the contact, unknown/not set type default to the first one
 	 * @return string
 	 */
-	function fileas_type($contact,$file_as=null)
+	function fileas_type($contact, $file_as = null)
 	{
 		if (is_null($file_as)) $file_as = $contact['n_fileas'];
 
 		if ($file_as)
 		{
-			foreach($this->fileas_types as $type)
+			foreach ($this->fileas_types as $type)
 			{
-				if ($this->fileas($contact,$type) == $file_as)
+				if ($this->fileas($contact, $type) == $file_as)
 				{
 					return $type;
 				}
@@ -500,10 +500,10 @@ 
 	 */
 	public static function cf_options()
 	{
-		$cf_fields = Storage\Customfields::get('addressbook',TRUE);
-		foreach ($cf_fields as $key => $value )
+		$cf_fields = Storage\Customfields::get('addressbook', TRUE);
+		foreach ($cf_fields as $key => $value)
 		{
-			$options[$key]= $value['label'];
+			$options[$key] = $value['label'];
 		}
 		return $options;
 	}
@@ -514,7 +514,7 @@ 
 	 * @param array $contact =null real content to use, default none
 	 * @return array with options: fileas type => label pairs
 	 */
-	function fileas_options($contact=null)
+	function fileas_options($contact = null)
 	{
 		$labels = array(
 			'n_prefix' => lang('prefix'),
@@ -528,13 +528,13 @@ 
 			'adr_one_locality' => lang('city'),
 			'bday'     => lang('Birthday'),
 		);
-		foreach(array_keys($labels) as $name)
+		foreach (array_keys($labels) as $name)
 		{
 			if ($contact[$name]) $labels[$name] = $contact[$name];
 		}
-		foreach($this->fileas_types as $fileas_type)
+		foreach ($this->fileas_types as $fileas_type)
 		{
-			$options[$fileas_type] = $this->fileas($labels,$fileas_type);
+			$options[$fileas_type] = $this->fileas($labels, $fileas_type);
 		}
 		return $options;
 	}
@@ -549,7 +549,7 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated, false for wrong fileas type
 	 */
-	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
+	function set_all_fileas($fileas_type, $all = false, &$errors = null, $ignore_acl = false)
 	{
 		if ($fileas_type != '' && !in_array($fileas_type, $this->fileas_types))
 		{
@@ -557,17 +557,17 @@ 
 		}
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
+		for ($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
 			'n_fileas IS NULL',
 			"n_fileas=''",
 			'n_fn IS NULL',
 			"n_fn=''",
-		),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$old_fn     = $contact['n_fn'];
 				$old_fileas = $contact['n_fileas'];
@@ -575,19 +575,19 @@ 
 				// only update fileas if type is given AND (all should be updated or n_fileas is empty)
 				if ($fileas_type && ($all || empty($contact['n_fileas'])))
 				{
-					$contact['n_fileas'] = $this->fileas($contact,$fileas_type);
+					$contact['n_fileas'] = $this->fileas($contact, $fileas_type);
 				}
 				if ($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])
 				{
 					// only specify/write updated fields plus "keys"
-					$contact = array_intersect_key($contact,array(
+					$contact = array_intersect_key($contact, array(
 						'id' => true,
 						'owner' => true,
 						'private' => true,
 						'account_id' => true,
 						'uid' => true,
-					)+($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array())+($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
-					if ($this->save($contact,$ignore_acl))
+					) + ($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array()) + ($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
+					if ($this->save($contact, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -610,11 +610,11 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated
 	 */
-	function set_all_cleanup(&$errors=null,$ignore_acl=false)
+	function set_all_cleanup(&$errors = null, $ignore_acl = false)
 	{
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 
 		// fields that must not be touched
@@ -636,14 +636,14 @@ 
 		);
 
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search(array(),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		for ($n = $updated = $errors = 0; ($contacts = parent::search(array(), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$fields_to_update = array();
-				foreach($contact as $field_name => $field_value)
+				foreach ($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if ($fields_exclude[$field_name] === true) continue; // dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -653,9 +653,9 @@ 
 							$fields_to_update[$field_name] = $field_value = trim($field_value);
 						}
 						// check if field contains a carriage return - exclude notes
-						if ($field_name != 'note' && strpos($field_value,"\x0D\x0A") !== false)
+						if ($field_name != 'note' && strpos($field_value, "\x0D\x0A") !== false)
 						{
-							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A"," ",$field_value);
+							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A", " ", $field_value);
 						}
 					}
 					// check if a field contains an empty string
@@ -665,13 +665,13 @@ 
 					}
 					// check for valid birthday date
 					if ($field_name == 'bday' && $field_value != null &&
-						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/',$field_value))
+						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/', $field_value))
 					{
 						$fields_to_update[$field_name] = $field_value = null;
 					}
 				}
 
-				if(count($fields_to_update) > 0)
+				if (count($fields_to_update) > 0)
 				{
 					$contact_to_save = array(
 						'id' => $contact['id'],
@@ -680,7 +680,7 @@ 
 						'account_id' => $contact['account_id'],
 						'uid' => $contact['uid']) + $fields_to_update;
 
-					if ($this->save($contact_to_save,$ignore_acl))
+					if ($this->save($contact_to_save, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -705,14 +705,14 @@ 
 		if (empty($contact['n_family']) && empty($contact['n_given'])) {
 			$cpart = array('org_name');
 		} else {
-			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
+			$cpart = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix');
 		}
 		$parts = array();
-		foreach($cpart as $n)
+		foreach ($cpart as $n)
 		{
 			if ($contact[$n]) $parts[] = $contact[$n];
 		}
-		return implode(' ',$parts);
+		return implode(' ', $parts);
 	}
 
 	/**
@@ -726,7 +726,7 @@ 
 	 *
 	 * @return array updated data
 	 */
-	function db2data($data, $date_format='ts')
+	function db2data($data, $date_format = 'ts')
 	{
 		static $fb_url = false;
 
@@ -738,7 +738,7 @@ 
 				$data[$name] = DateTime::server2user($data[$name], $date_format);
 			}
 		}
-		$data['photo'] = $this->photo_src($data['id'],$data['jpegphoto'] || ($data['files'] & self::FILES_BIT_PHOTO), '', $data['etag']);
+		$data['photo'] = $this->photo_src($data['id'], $data['jpegphoto'] || ($data['files']&self::FILES_BIT_PHOTO), '', $data['etag']);
 
 		// set freebusy_uri for accounts
 		if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
@@ -761,12 +761,12 @@ 
 	 * @param string $etag =null etag to set in url to allow caching with Expires header
 	 * @return string
 	 */
-	function photo_src($id,$jpeg,$default='',$etag=null)
+	function photo_src($id, $jpeg, $default = '', $etag = null)
 	{
 		//error_log(__METHOD__."($id, ..., etag=$etag) ".  function_backtrace());
 		return $jpeg || !$default ? Egw::link('/api/avatar.php', array(
 			'contact_id' => $id
-		)+(isset($etag) ? array(
+		) + (isset($etag) ? array(
 			'etag'       => $etag,
 		) : array())) : $default;
 	}
@@ -782,7 +782,7 @@ 
 	 *
 	 * @return array upated data
 	 */
-	function data2db($data, $date_format='ts')
+	function data2db($data, $date_format = 'ts')
 	{
 		// convert timestamps from user-time to server-time in the db
 		foreach ($this->timestamps as $name)
@@ -803,7 +803,7 @@ 
 	* @param int $check_etag =null
 	* @return boolean|int true on success or false on failiure, 0 if etag does not match
 	*/
-	function delete($contact,$deny_account_delete=true,$check_etag=null)
+	function delete($contact, $deny_account_delete = true, $check_etag = null)
 	{
 		if (is_array($contact) && isset($contact['id']))
 		{
@@ -813,12 +813,12 @@ 
 		{
 			$contact = array($contact);
 		}
-		foreach($contact as $c)
+		foreach ($contact as $c)
 		{
 			$id = is_array($c) ? $c['id'] : $c;
 
 			$ok = false;
-			if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
+			if ($this->check_perms(Acl::DELETE, $c, $deny_account_delete))
 			{
 				if (!($old = $this->read($id))) return false;
 				// check if we only mark contacts as deleted, or really delete them
@@ -829,12 +829,12 @@ 
 					$delete = $old;
 					$delete['tid'] = self::DELETED_TYPE;
 					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
-					Link::unlink(0,'addressbook',$id,'','','',true);
+					if (($ok = $this->save($delete))) $ok = true; // we have to return true or false
+					Link::unlink(0, 'addressbook', $id, '', '', '', true);
 				}
-				elseif (($ok = parent::delete($id,$check_etag)))
+				elseif (($ok = parent::delete($id, $check_etag)))
 				{
-					Link::unlink(0,'addressbook',$id);
+					Link::unlink(0, 'addressbook', $id);
 				}
 
 				// Don't notify of final purge
@@ -861,11 +861,11 @@ 
 	* @param boolean $touch_modified =true should modified/r be updated
 	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
 	*/
-	function save(&$contact, $ignore_acl=false, $touch_modified=true)
+	function save(&$contact, $ignore_acl = false, $touch_modified = true)
 	{
 		// Make sure photo remains unchanged unless its purposely set to be false
 		// which means photo has changed.
-		if (!array_key_exists('photo_unchanged',$contact)) $contact['photo_unchanged'] = true;
+		if (!array_key_exists('photo_unchanged', $contact)) $contact['photo_unchanged'] = true;
 
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
@@ -874,11 +874,11 @@ 
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
-					if(!isset($contact['owner']))
+					if (!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
 					}
-					if(!isset($contact['private']))
+					if (!isset($contact['private']))
 					{
 						$contact['private'] = $old['private'];
 					}
@@ -910,7 +910,7 @@ 
 		{
 			$contact['private'] = 0;
 		}
-		if(!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD,$contact))
+		if (!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD, $contact))
 		{
 			$this->error = 'access denied';
 			return false;
@@ -923,15 +923,15 @@ 
 		// convert categories
 		if (is_array($contact['cat_id']))
 		{
-			$contact['cat_id'] = implode(',',$contact['cat_id']);
+			$contact['cat_id'] = implode(',', $contact['cat_id']);
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
+		foreach (array('adr_one_', 'adr_two_') as $c_prefix) {
+			if ($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = Country::country_code($contact[$c_prefix.'countryname']))
 			{
-				if(strlen($code) == 2)
+				if (strlen($code) == 2)
 				{
 					$contact[$c_prefix.'countrycode'] = $code;
 				}
@@ -940,7 +940,7 @@ 
 					$contact[$c_prefix.'countrycode'] = null;
 				}
 			}
-			if($contact[$c_prefix.'countrycode'] != null)
+			if ($contact[$c_prefix.'countrycode'] != null)
 			{
 				$contact[$c_prefix.'countryname'] = null;
 			}
@@ -968,9 +968,9 @@ 
 		// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
 		if (!$ignore_acl && !$contact['owner'] && !($this->is_admin($contact) || $this->allow_account_edit()))
 		{
-			foreach(array_keys($contact) as $field)
+			foreach (array_keys($contact) as $field)
 			{
-				if (!in_array($field,$this->own_account_acl) && !in_array($field,array('id','owner','account_id','modified','modifier', 'photo_unchanged')))
+				if (!in_array($field, $this->own_account_acl) && !in_array($field, array('id', 'owner', 'account_id', 'modified', 'modifier', 'photo_unchanged')))
 				{
 					// user is not allowed to change that
 					if ($old)
@@ -991,12 +991,12 @@ 
 		{
 			if (isset($to_write['owner']) && !empty($to_write['owner']))
 			{
-				error_log(__METHOD__.__LINE__." Trying to change account to owner:". $to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
+				error_log(__METHOD__.__LINE__." Trying to change account to owner:".$to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
 				unset($to_write['owner']);
 			}
 		}
 
-		if(!($this->error = parent::save($to_write)))
+		if (!($this->error = parent::save($to_write)))
 		{
 			$contact['id'] = $to_write['id'];
 			$contact['uid'] = $to_write['uid'];
@@ -1005,9 +1005,9 @@ 
 
 			// Clear any files saved with new entries
 			// They've been dealt with already and they cause errors with linking
-			foreach(array_keys($this->customfields) as $field)
+			foreach (array_keys($this->customfields) as $field)
 			{
-				if(is_array($to_write[Storage::CF_PREFIX.$field]))
+				if (is_array($to_write[Storage::CF_PREFIX.$field]))
 				{
 					unset($to_write[Storage::CF_PREFIX.$field]);
 				}
@@ -1021,27 +1021,27 @@ 
 				$GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']);
 				// call edit-accout hook, to let other apps know about changed account (names or email)
 				$GLOBALS['hook_values'] = (array)$GLOBALS['egw']->accounts->read($contact['account_id']);
-				Hooks::process($GLOBALS['hook_values']+array(
+				Hooks::process($GLOBALS['hook_values'] + array(
 					'location' => 'editaccount',
-				),False,True);	// called for every app now, not only enabled ones)
+				), False, True); // called for every app now, not only enabled ones)
 			}
 			// notify interested apps about changes in the account-contact data
 			if (!$to_write['owner'] && $to_write['account_id'] && $isUpdate)
 			{
 				$to_write['location'] = 'editaccountcontact';
-				Hooks::process($to_write,False,True);	// called for every app now, not only enabled ones));
+				Hooks::process($to_write, False, True); // called for every app now, not only enabled ones));
 			}
 			// Notify linked apps about changes in the contact data
-			Link::notify_update('addressbook',  $contact['id'], $contact);
+			Link::notify_update('addressbook', $contact['id'], $contact);
 
 			// Check for restore of deleted contact, restore held links
-			if($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
+			if ($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
 			{
 				Link::restore('addressbook', $contact['id']);
 			}
 
 			// Record change history for sql - doesn't work for LDAP accounts
-			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
+			if (!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
 				if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
@@ -1049,9 +1049,9 @@ 
 			}
 
 			// Expire birthday cache for this year and next if birthday changed
-			if($isUpdate && $old['bday'] !== $to_write['bday'] || !$isUpdate && $to_write['bday'])
+			if ($isUpdate && $old['bday'] !== $to_write['bday'] || !$isUpdate && $to_write['bday'])
 			{
-				$year = (int) date('Y',time());
+				$year = (int)date('Y', time());
 				$this->clear_birthday_cache($year, $to_write['owner']);
 				$year++;
 				$this->clear_birthday_cache($year, $to_write['owner']);
@@ -1070,9 +1070,9 @@ 
 	protected function clear_birthday_cache($year, $owner)
 	{
 		// Cache is kept per-language, so clear them all
-		foreach(array_keys(Translation::get_installed_langs()) as $lang)
+		foreach (array_keys(Translation::get_installed_langs()) as $lang)
 		{
-			Cache::unsetInstance(__CLASS__,"birthday-$year-{$owner}-$lang");
+			Cache::unsetInstance(__CLASS__, "birthday-$year-{$owner}-$lang");
 		}
 	}
 
@@ -1085,7 +1085,7 @@ 
 	 * @param int $dst_w =240 max width to resize to
 	 * @return string with resized jpeg photo, null on error
 	 */
-	public static function resize_photo($photo, $dst_w=240)
+	public static function resize_photo($photo, $dst_w = 240)
 	{
 		if (is_resource($photo))
 		{
@@ -1101,15 +1101,15 @@ 
 		//error_log(__METHOD__."() got image $src_w * $src_h, is_jpeg=".array2string(substr($photo,0,2) === "\377\330"));
 
 		// if $photo is to width or not a jpeg image --> resize it
-		if ($src_w > $dst_w || cut_bytes($photo,0,2) !== "\377\330")
+		if ($src_w > $dst_w || cut_bytes($photo, 0, 2) !== "\377\330")
 		{
 			//error_log(__METHOD__."(,dst_w=$dst_w) src_w=$src_w, cut_bytes(photo,0,2)=".array2string(cut_bytes($photo,0,2)).' --> resizing');
 			// scale the image to a width of 60 and a height according to the proportion of the source image
-			$resized = imagecreatetruecolor($dst_w,$dst_h = round($src_h * $dst_w / $src_w));
-			imagecopyresized($resized,$image,0,0,0,0,$dst_w,$dst_h,$src_w,$src_h);
+			$resized = imagecreatetruecolor($dst_w, $dst_h = round($src_h * $dst_w / $src_w));
+			imagecopyresized($resized, $image, 0, 0, 0, 0, $dst_w, $dst_h, $src_w, $src_h);
 
 			ob_start();
-			imagejpeg($resized,null,90);
+			imagejpeg($resized, null, 90);
 			$photo = ob_get_contents();
 			ob_end_clean();
 
@@ -1130,7 +1130,7 @@ 
 	* @param boolean $ignore_acl =false true: no acl check
 	* @return array|boolean array with contact data, null if not found or false on no view perms
 	*/
-	function read($contact_id, $ignore_acl=false)
+	function read($contact_id, $ignore_acl = false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl
 		if ($ignore_acl && is_a($this->somain, __CLASS__.'\\Sql'))
@@ -1140,11 +1140,11 @@ 
 		}
 		if (!($data = parent::read($contact_id)))
 		{
-			$data = null;	// not found
+			$data = null; // not found
 		}
-		elseif (!$ignore_acl && !$this->check_perms(Acl::READ,$data))
+		elseif (!$ignore_acl && !$this->check_perms(Acl::READ, $data))
 		{
-			$data = false;	// no view perms
+			$data = false; // no view perms
 		}
 		else
 		{
@@ -1152,10 +1152,10 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if ($data['adr_one_countrycode'] != null) {
 				$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if ($data['adr_two_countrycode'] != null) {
 				$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1179,7 +1179,7 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
-	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
+	function check_perms($needed, $contact, $deny_account_delete = false, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1190,7 +1190,7 @@ 
 		else
 		{
 			$grants = $this->get_grants($user);
-			$memberships =  $GLOBALS['egw']->accounts->memberships($user,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		}
 
 		if ((!is_array($contact) || !isset($contact['owner'])) &&
@@ -1216,7 +1216,7 @@ 
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']))
 		{
-			$access = !!array_intersect($memberships,$GLOBALS['egw']->accounts->memberships($contact['account_id'],true));
+			$access = !!array_intersect($memberships, $GLOBALS['egw']->accounts->memberships($contact['account_id'], true));
 		}
 		else if ($contact['id'] && $GLOBALS['egw']->acl->check('A'.$contact['id'], $needed, 'addressbook'))
 		{
@@ -1224,8 +1224,8 @@ 
 		}
 		else
 		{
-			$access = ($grants[$owner] & $needed) &&
-				(!$contact['private'] || ($grants[$owner] & Acl::PRIVAT) || in_array($owner,$memberships));
+			$access = ($grants[$owner]&$needed) &&
+				(!$contact['private'] || ($grants[$owner]&Acl::PRIVAT) || in_array($owner, $memberships));
 		}
 		//error_log(__METHOD__."($needed,$contact[id],$deny_account_delete,$user) returning ".array2string($access));
 		return $access;
@@ -1240,11 +1240,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_perms($check,$id,false,$user);
+		return $this->check_perms($check, $id, false, $user);
 	}
 
 	/**
@@ -1256,18 +1256,18 @@ 
 	function read_org($org_id)
 	{
 		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (strpos($org_id, '*AND*') !== false) $org_id = str_replace('*AND*', '&', $org_id);
 		$org = array();
-		foreach(explode('|||',$org_id) as $part)
+		foreach (explode('|||', $org_id) as $part)
 		{
-			list($name,$value) = explode(':',$part,2);
+			list($name, $value) = explode(':', $part, 2);
 			$org[$name] = $value;
 		}
-		$csvs = array('cat_id');	// fields with comma-separated-values
+		$csvs = array('cat_id'); // fields with comma-separated-values
 
 		// split regular fields and custom fields
 		$custom_fields = $regular_fields = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if ($name[0] != '#')
 			{
@@ -1275,9 +1275,9 @@ 
 			}
 			else
 			{
-				$custom_fields[] = $name = substr($name,1);
+				$custom_fields[] = $name = substr($name, 1);
 				$regular_fields['id'] = 'id';
-				if (substr($this->customfields[$name]['type'],0,6)=='select' && $this->customfields[$name]['rows'] ||	// multiselection
+				if (substr($this->customfields[$name]['type'], 0, 6) == 'select' && $this->customfields[$name]['rows'] || // multiselection
 					$this->customfields[$name]['type'] == 'radio')
 				{
 					$csvs[] = '#'.$name;
@@ -1285,24 +1285,24 @@ 
 			}
 		}
 		// read the regular fields
-		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
+		$contacts = parent::search('', $regular_fields, '', '', '', false, 'AND', false, $org);
 		if (!$contacts) return false;
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
-			if (($cfs = $this->read_customfields($ids,$custom_fields)))
+			if (($cfs = $this->read_customfields($ids, $custom_fields)))
 			{
 				foreach ($contacts as &$contact)
 				{
 					$id = $contact['id'];
 					if (isset($cfs[$id]))
 					{
-						foreach($cfs[$id] as $name => $value)
+						foreach ($cfs[$id] as $name => $value)
 						{
 							$contact['#'.$name] = $value;
 						}
@@ -1314,34 +1314,34 @@ 
 
 		// create a statistic about the commonness of each fields values
 		$fields = array();
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$fields[$name][$value]++;
 				}
 				else
 				{
 					// for comma separated fields, we have to use each single value
-					foreach(explode(',',$value) as $val)
+					foreach (explode(',', $value) as $val)
 					{
 						$fields[$name][$val]++;
 					}
 				}
 			}
 		}
-		foreach($fields as $name => $values)
+		foreach ($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name, $this->org_fields)) continue;
 
-			arsort($values,SORT_NUMERIC);
+			arsort($values, SORT_NUMERIC);
 			$value = key($values);
 			$num = current($values);
-			if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+			if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$org[$name] = $value;
 				}
@@ -1350,12 +1350,12 @@ 
 					$org[$name] = array();
 					foreach ($values as $value => $num)
 					{
-						if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+						if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 						{
 							$org[$name][] = $value;
 						}
 					}
-					$org[$name] = implode(',',$org[$name]);
+					$org[$name] = implode(',', $org[$name]);
 				}
 			}
 		}
@@ -1369,10 +1369,10 @@ 
 	 * @param array $fields field-name => value pairs
 	 * @return array with contacts
 	 */
-	function org_similar($org_name,$fields)
+	function org_similar($org_name, $fields)
 	{
 		$criteria = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if (isset($fields[$name]))
 			{
@@ -1386,7 +1386,7 @@ 
 				}
 			}
 		}
-		return parent::search($criteria,false,'n_family,n_given','','',false,'OR',false,array('org_name'=>$org_name));
+		return parent::search($criteria, false, 'n_family,n_given', '', '', false, 'OR', false, array('org_name'=>$org_name));
 	}
 
 	/**
@@ -1397,10 +1397,10 @@ 
 	 * @param boolean $only_org_fields =true check and return only org_fields, default true
 	 * @return array with field-name => value from $from
 	 */
-	function changed_fields($from,$to,$only_org_fields=true)
+	function changed_fields($from, $to, $only_org_fields = true)
 	{
 		// we only care about countryname, if contrycode is empty
-		foreach(array(
+		foreach (array(
 			'adr_one_countryname' => 'adr_one_countrycode',
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
@@ -1409,13 +1409,13 @@ 
 			if (!empty($to[$code])) $to[$name] = '';
 		}
 		$changed = array();
-		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
+		foreach ($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name, array('modified', 'modifier')))	// never count these
 			{
 				continue;
 			}
-			if ((string) $from[$name] != (string) $to[$name])
+			if ((string)$from[$name] != (string)$to[$name])
 			{
 				$changed[$name] = $from[$name];
 			}
@@ -1432,35 +1432,35 @@ 
 	 * @param array $members =null org-members to change, default null --> function queries them itself
 	 * @return array/boolean (changed-members,changed-fields,failed-members) or false if no org_fields changed or no (other) members matching that fields
 	 */
-	function change_org($org_name,$from,$to,$members=null)
+	function change_org($org_name, $from, $to, $members = null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from, $to, true))) return false;
 
 		if (is_null($members) || !is_array($members))
 		{
-			$members = $this->org_similar($org_name,$changed);
+			$members = $this->org_similar($org_name, $changed);
 		}
 		if (!$members) return false;
 
 		$ids = array();
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			$ids[] = $member['id'];
 		}
 		$customfields = $this->read_customfields($ids);
 
 		$changed_members = $changed_fields = $failed_members = 0;
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			if (isset($customfields[$member['id']]))
 			{
-				foreach(array_keys($this->customfields) as $name)
+				foreach (array_keys($this->customfields) as $name)
 				{
 					$member['#'.$name] = $customfields[$member['id']][$name];
 				}
 			}
 			$fields = 0;
-			foreach($changed as $name => $value)
+			foreach ($changed as $name => $value)
 			{
 				if ((string)$value == (string)$member[$name])
 				{
@@ -1470,7 +1470,7 @@ 
 			}
 			if ($fields)
 			{
-				if (!$this->check_perms(Acl::EDIT,$member) || !$this->save($member))
+				if (!$this->check_perms(Acl::EDIT, $member) || !$this->save($member))
 				{
 					++$failed_members;
 				}
@@ -1481,7 +1481,7 @@ 
 				}
 			}
 		}
-		return array($changed_members,$changed_fields,$failed_members);
+		return array($changed_members, $changed_fields, $failed_members);
 	}
 
 	/**
@@ -1508,20 +1508,20 @@ 
 			if ($contact['n_fileas']) return $contact['n_fileas'];
 			$type = null;
 		}
-		$title =  $this->fileas($contact,$type);
+		$title = $this->fileas($contact, $type);
 
 		if (!empty($this->prefs['link_title_cf']))
 		{
 			$field_list = is_string($this->prefs['link_title_cf']) ? explode(',', $this->prefs['link_title_cf']) : $this->prefs['link_title_cf'];
 			foreach ($field_list as $field)
 			{
-				if($contact['#'.$field])
+				if ($contact['#'.$field])
 				{
-				   $title .= ', ' . $contact['#'.$field];
+				   $title .= ', '.$contact['#'.$field];
 				}
 			}
 		}
-		return $title ;
+		return $title;
 	}
 
 	/**
@@ -1535,21 +1535,21 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($contacts =& $this->search(array('contact_id' => $ids),false,'',$extra_cols='','',False,'AND',False,array('tid'=>null))))
+		if (($contacts = & $this->search(array('contact_id' => $ids), false, '', $extra_cols = '', '', False, 'AND', False, array('tid'=>null))))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-			   	$titles[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+			   	$titles[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 			}
 		}
 		// we assume all not returned contacts are not readable for the user (as we report all deleted contacts to egw_link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -1576,23 +1576,23 @@ 
 		{
 			$criteria = is_array($pattern) ? $pattern['search'] : $pattern;
 		}
-		if($options['start'] || $options['num_rows'])
+		if ($options['start'] || $options['num_rows'])
 		{
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1') $filter['account_id'] = null;
-		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
+		if (($contacts = & parent::search($criteria, false, 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', $limit, $filter)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-				$result[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+				$result[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 				// make sure to return a correctly quoted rfc822 address, if requested
 				if ($options['type'] === 'email')
 				{
@@ -1633,7 +1633,7 @@ 
 		// let link query know, to append email to list
 		$options['type'] = 'email';
 
-		return $this->link_query($pattern,$options);
+		return $this->link_query($pattern, $options);
 	}
 
 	/**
@@ -1647,14 +1647,14 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach(!is_array($ids) ? array($ids) : $ids as $id)
+		foreach (!is_array($ids) ? array($ids) : $ids as $id)
 		{
 			if (!($contact = $this->read($id))) continue;
 
 			$data[] = array(
 				'res_id' => $id,
 				'email' => $contact['email'] ? $contact['email'] : $contact['email_home'],
-				'rights' => Acl::CUSTOM1|Acl::CUSTOM3,	// calendar_bo::ACL_READ_FOR_PARTICIPANTS|ACL_INVITE
+				'rights' => Acl::CUSTOM1|Acl::CUSTOM3, // calendar_bo::ACL_READ_FOR_PARTICIPANTS|ACL_INVITE
 				'name' => $this->link_title($contact),
 				'cn' => trim($contact['n_given'].' '.$contact['n_family']),
 			);
@@ -1669,37 +1669,37 @@ 
 	 * @param boolean $extra_title =true if true, use a short date only title and put the full title as extra_title (tooltip)
 	 * @return array
 	 */
-	function read_calendar($uids,$extra_title=true)
+	function read_calendar($uids, $extra_title = true)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
 
 		$split_uids = array();
 		$events = array();
 
-		foreach($uids as $id => $uid)
+		foreach ($uids as $id => $uid)
 		{
 			$type = is_numeric($uid[0]) ? 'u' : $uid[0];
-			if($GLOBALS['egw_info']['server']['disable_event_column'] == 'contacts' && $type == 'u')
+			if ($GLOBALS['egw_info']['server']['disable_event_column'] == 'contacts' && $type == 'u')
 			{
 				continue;
 			}
 			$split_uids[$type][$id] = str_replace($type, '', $uid);
 		}
 
-		foreach($split_uids as $type => $s_uids)
+		foreach ($split_uids as $type => $s_uids)
 		{
 			$events += $this->read_calendar_type($s_uids, $type, $extra_title);
 		}
 		return $events;
 	}
 
-	private function read_calendar_type($uids, $type='c', $extra_title = true)
+	private function read_calendar_type($uids, $type = 'c', $extra_title = true)
 	{
 		$calendars = array();
 		$bocal = new calendar_bo();
-		$type_field = $type=='u' ? 'account_id' : 'contact_id';
+		$type_field = $type == 'u' ? 'account_id' : 'contact_id';
 		$type_field_varchar = $this->db->to_varchar($type_field);
-		$concat_start_id_recurrance = $this->db->concat('cal_start',"':'",'egw_cal_user.cal_id',"':'",'cal_recur_date');
+		$concat_start_id_recurrance = $this->db->concat('cal_start', "':'", 'egw_cal_user.cal_id', "':'", 'cal_recur_date');
 		$now = $this->db->unix_timestamp('NOW()');
 		$sql = "SELECT n_fn,org_name,$type_field AS user_id,
 			(
@@ -1708,7 +1708,7 @@ 
 				JOIN egw_cal_dates on egw_cal_dates.cal_id=egw_cal_user.cal_id and (cal_recur_date=0 or cal_recur_date=cal_start)
 				JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id AND egw_cal.cal_deleted IS NULL
 				WHERE cal_user_type='$type' and cal_user_id=$type_field_varchar and cal_start < $now";
-		if ( !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
+		if (!$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
 		{
 			$sql .= " AND egw_cal_user.cal_status != 'R'";
 		}
@@ -1721,7 +1721,7 @@ 
 				JOIN egw_cal_dates on egw_cal_dates.cal_id=egw_cal_user.cal_id and (cal_recur_date=0 or cal_recur_date=cal_start)
 				JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id AND egw_cal.cal_deleted IS NULL
 				WHERE cal_user_type='$type' and cal_user_id=$type_field_varchar and cal_start > $now";
-		if ( !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
+		if (!$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
 		{
 			$sql .= " AND egw_cal_user.cal_status != 'R'";
 		}
@@ -1732,7 +1732,7 @@ 
 			WHERE '.$this->db->expression('egw_addressbook', array($type_field => $uids));
 
 
-		$contacts =& $this->db->query($sql, __LINE__, __FILE__);
+		$contacts = & $this->db->query($sql, __LINE__, __FILE__);
 
 		if (!$contacts) return array();
 
@@ -1742,11 +1742,11 @@ 
 			list($start, $cal_id, $recur_date) = explode(':', $contact[$key.'_event']);
 
 			$link = array(
-				'id' => $cal_id,//.':'.$start,
+				'id' => $cal_id, //.':'.$start,
 				'app' => 'calendar',
-				'title' => $bocal->link_title($cal_id . ($start ? '-'.$start : '')),
+				'title' => $bocal->link_title($cal_id.($start ? '-'.$start : '')),
 				'extra_args' => array(
-					'date' => \EGroupware\Api\DateTime::server2user($start,\EGroupware\Api\DateTime::ET2),
+					'date' => \EGroupware\Api\DateTime::server2user($start, \EGroupware\Api\DateTime::ET2),
 					'exception'=> 1
 				),
 			);
@@ -1755,18 +1755,18 @@ 
 				$link['extra_title'] = $link['title'];
 				$link['title'] = \EGroupware\Api\DateTime::server2user($start, true);
 			}
-			$user_id = ($type == 'u' ? '' : $type) . $contact['user_id'];
+			$user_id = ($type == 'u' ? '' : $type).$contact['user_id'];
 			$calendars[$user_id][$key.'_event'] = $start;
 			$calendars[$user_id][$key.'_link'] = $link;
 		};
 
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			if($contact['last_event'])
+			if ($contact['last_event'])
 			{
 				$do_event('last', $contact);
 			}
-			if($contact['next_event'])
+			if ($contact['next_event'])
 			{
 				$do_event('next', $contact);
 			}
@@ -1783,7 +1783,7 @@ 
 	 */
 	public function read_birthdays($addressbook, $year)
 	{
-		if (($birthdays = Cache::getInstance(__CLASS__,"birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'])) !== null)
+		if (($birthdays = Cache::getInstance(__CLASS__, "birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'])) !== null)
 		{
 			return $birthdays;
 		}
@@ -1794,7 +1794,7 @@ 
 			'n_family' => "!''",
 			'bday' => "!''",
 		);
-		$bdays =& $this->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
+		$bdays = & $this->search('', array('id', 'n_family', 'n_given', 'n_prefix', 'n_middle', 'bday'),
 			'contact_bday ASC', '', '', false, 'AND', false, $filter);
 
 		if ($bdays)
@@ -1802,35 +1802,34 @@ 
 			// sort by month and day only
 			usort($bdays, function($a, $b)
 			{
-				return (int) $a['bday'] == (int) $b['bday'] ?
-					strcmp($a['bday'], $b['bday']) :
-					(int) $a['bday'] - (int) $b['bday'];
+				return (int)$a['bday'] == (int)$b['bday'] ?
+					strcmp($a['bday'], $b['bday']) : (int)$a['bday'] - (int)$b['bday'];
 			});
-			foreach($bdays as $pers)
+			foreach ($bdays as $pers)
 			{
-				if (empty($pers['bday']) || $pers['bday']=='0000-00-00 0' || $pers['bday']=='0000-00-00' || $pers['bday']=='0.0.00')
+				if (empty($pers['bday']) || $pers['bday'] == '0000-00-00 0' || $pers['bday'] == '0000-00-00' || $pers['bday'] == '0.0.00')
 				{
 					//error_log(__METHOD__.__LINE__.' Skipping entry for invalid birthday:'.array2string($pers));
 					continue;
 				}
-				list($y,$m,$d) = explode('-',$pers['bday']);
+				list($y, $m, $d) = explode('-', $pers['bday']);
 				if ($y > $year)
 				{
 					// not yet born
 					continue;
 				}
-				$birthdays[sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
+				$birthdays[sprintf('%04d%02d%02d', $year, $m, $d)][] = array(
 					'day'       => $d,
 					'month'     => $m,
 					'occurence' => 0,
-					'name'      => implode(' ', array_filter(array(lang('Birthday'),($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']), $pers['n_middle'],
-						$pers['n_family'], ($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ($year - $y): '')))).
-						($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('','age')) ? ' ('.$y.')' : ''),
-					'birthyear' => $y,	// this can be used to identify birthdays from holidays
+					'name'      => implode(' ', array_filter(array(lang('Birthday'), ($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']), $pers['n_middle'],
+						$pers['n_family'], ($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ($year - $y) : '')))).
+						($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('', 'age')) ? ' ('.$y.')' : ''),
+					'birthyear' => $y, // this can be used to identify birthdays from holidays
 				);
 			}
 		}
-		Cache::setInstance(__CLASS__,"birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'], $birthdays, self::BIRTHDAY_CACHE_TIME);
+		Cache::setInstance(__CLASS__, "birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'], $birthdays, self::BIRTHDAY_CACHE_TIME);
 		return $birthdays;
 	}
 
@@ -1853,7 +1852,7 @@ 
 	{
 		// get all cats if you want to drop sub cats
 		$drop_subs = ($data['drop_subs'] && !$data['modify_subs']);
-		if($drop_subs)
+		if ($drop_subs)
 		{
 			$cats = new Categories('', 'addressbook');
 			$cat_ids = $cats->return_all_children($data['cat_id']);
@@ -1864,14 +1863,14 @@ 
 		}
 
 		// Get addresses that use the category
-		@set_time_limit( 0 );
-		foreach($cat_ids as $cat_id)
+		@set_time_limit(0);
+		foreach ($cat_ids as $cat_id)
 		{
 			if (($ids = $this->search(array('cat_id' => $cat_id), false)))
 			{
-				foreach($ids as &$info)
+				foreach ($ids as &$info)
 				{
-					$info['cat_id'] = implode(',',array_diff(explode(',',$info['cat_id']), $cat_ids));
+					$info['cat_id'] = implode(',', array_diff(explode(',', $info['cat_id']), $cat_ids));
 					$this->save($info);
 				}
 			}
@@ -1893,14 +1892,14 @@ 
 		$account = null;
 		$custom_fields = Storage\Customfields::get('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach (parent::search(array('id'=>$ids), false) as $contact)	// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
-					return false;	// we dont deal with two accounts!
+					return false; // we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
@@ -1908,7 +1907,7 @@ 
 			// Add in custom fields
 			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
 
-			$pos = array_search($contact['id'],$ids);
+			$pos = array_search($contact['id'], $ids);
 			$contacts[$pos] = $contact;
 		}
 		if (!is_null($account))	// we found an account, so we merge the contacts into it
@@ -1921,38 +1920,38 @@ 
 			$target = $contacts[0];
 			unset($contacts[0]);
 		}
-		if (!$this->check_perms(Acl::EDIT,$target))
+		if (!$this->check_perms(Acl::EDIT, $target))
 		{
 			echo $this->error = 'No edit permission for the target contact!';
 			return 0;
 		}
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
 				if (!$value) continue;
 
-				switch($name)
+				switch ($name)
 				{
 					case 'id':
 					case 'tid':
 					case 'owner':
 					case 'private':
 					case 'etag';
-						break;	// ignored
+						break; // ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
-						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
+						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',', $target['cat_id']) : array();
+						$target['cat_id'] = array_unique(array_merge($target['cat_id'], is_array($value) ? $value : explode(',', $value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if ($name[0] == '#') {
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
-								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
+							if ($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
+								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',', $target[$name]) : array();
+								$target[$name] = implode(',', array_unique(array_merge($target[$name], is_array($value) ? $value : explode(',', $value))));
 							}
 						}
 						if (!$target[$name]) $target[$name] = $value;
@@ -1962,7 +1961,7 @@ 
 
 			// Merge distribution lists
 			$lists = $this->read_distributionlist(array($contact['id']));
-			foreach($lists[$contact['id']] as $list_id => $list_name)
+			foreach ($lists[$contact['id']] as $list_id => $list_name)
 			{
 				parent::add2list($target['id'], $list_id);
 			}
@@ -1970,29 +1969,29 @@ 
 		if (!$this->save($target)) return 0;
 
 		$success = 1;
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			if (!$this->check_perms(Acl::DELETE,$contact))
+			if (!$this->check_perms(Acl::DELETE, $contact))
 			{
 				continue;
 			}
-			foreach(Link::get_links('addressbook',$contact['id']) as $data)
+			foreach (Link::get_links('addressbook', $contact['id']) as $data)
 			{
 				//_debug_array(array('function'=>__METHOD__,'line'=>__LINE__,'app'=>'addressbook','id'=>$contact['id'],'data:'=>$data,'target'=>$target['id']));
 				// info_from and info_link_id (main link)
-				$newlinkID = Link::link('addressbook',$target['id'],$data['app'],$data['id'],$data['remark'],$target['owner']);
+				$newlinkID = Link::link('addressbook', $target['id'], $data['app'], $data['id'], $data['remark'], $target['owner']);
 				//_debug_array(array('newLinkID'=>$newlinkID));
 				if ($newlinkID)
 				{
 					// update egw_infolog set info_link_id=$newlinkID where info_id=$data['id'] and info_link_id=$data['link_id']
-					if ($data['app']=='infolog')
+					if ($data['app'] == 'infolog')
 					{
-						$this->db->update('egw_infolog',array(
+						$this->db->update('egw_infolog', array(
 								'info_link_id' => $newlinkID
-							),array(
+							), array(
 								'info_id' => $data['id'],
 								'info_link_id' => $data['link_id']
-							),__LINE__,__FILE__,'infolog');
+							), __LINE__, __FILE__, 'infolog');
 					}
 					unset($newlinkID);
 				}
@@ -2015,7 +2014,7 @@ 
 	protected function merge_calendar($old_id, $new_id)
 	{
 		static $bo;
-		if(!is_object($bo))
+		if (!is_object($bo))
 		{
 			$bo = new \calendar_boupdate();
 		}
@@ -2023,7 +2022,7 @@ 
 		// Find all events with this contact
 		$events = $bo->search(array('users' => $old_id, 'ignore_acl' => true));
 
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$event['participants'][$new_id] = $event['participants'][$old_id];
 			unset($event['participants'][$old_id]);
@@ -2048,14 +2047,14 @@ 
 	 * @param int $owner =null
 	 * @return boolean
 	 */
-	function check_list($list,$required,$owner=null)
+	function check_list($list, $required, $owner = null)
 	{
 		if ($list && ($list_data = $this->read_list($list)))
 		{
 			$owner = $list_data['list_owner'];
 		}
 		//error_log(__METHOD__."($list, $required, $owner) grants[$owner]=".$this->grants[$owner]." returning ".array2string(!!($this->grants[$owner] & $required)));
-		return !!($this->grants[$owner] & $required);
+		return !!($this->grants[$owner]&$required);
 	}
 
 	/**
@@ -2067,17 +2066,17 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
-		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner)) return false;
+		if (!$this->check_list(null, Acl::ADD|Acl::EDIT, $owner)) return false;
 
 		try {
-			$ret = parent::add_list($keys,$owner,$contacts,$data);
+			$ret = parent::add_list($keys, $owner, $contacts, $data);
 			if ($ret) unset(self::$list_cache[$ret]);
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
-		catch(Db\Exception\InvalidSql $e) {
-			unset($e);	// not used
+		catch (Db\Exception\InvalidSql $e) {
+			unset($e); // not used
 			return false;
 		}
 		return $ret;
@@ -2091,13 +2090,13 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
-		if (!$this->check_list($list,Acl::EDIT)) return false;
+		if (!$this->check_list($list, Acl::EDIT)) return false;
 
 		unset(self::$list_cache[$list]);
 
-		return parent::add2list($contact,$list,$existing);
+		return parent::add2list($contact, $list, $existing);
 	}
 
 	/**
@@ -2107,9 +2106,9 @@ 
 	 * @param int $list list-id
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
-		if ($list && !$this->check_list($list,Acl::EDIT)) return false;
+		if ($list && !$this->check_list($list, Acl::EDIT)) return false;
 
 		if ($list)
 		{
@@ -2120,7 +2119,7 @@ 
 			self::$list_cache = array();
 		}
 
-		return parent::remove_from_list($contact,$list);
+		return parent::remove_from_list($contact, $list);
 	}
 
 	/**
@@ -2131,7 +2130,7 @@ 
 	 */
 	function delete_list($list)
 	{
-		foreach((array)$list as $l)
+		foreach ((array)$list as $l)
 		{
 			if (!$this->check_list($l, Acl::DELETE)) return false;
 
@@ -2169,7 +2168,7 @@ 
 	{
 		$code = Country::country_code($country);
 
-		switch($code)
+		switch ($code)
 		{
 			case 'AU':
 			case 'CA':
@@ -2233,12 +2232,12 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $contact_id=null)
+	function find_or_add_categories($catname_list, $contact_id = null)
 	{
 		if ($contact_id && $contact_id > 0 && ($old_contact = $this->read($contact_id)))
 		{
 			// preserve categories without users read access
-			$old_categories = explode(',',$old_contact['cat_id']);
+			$old_categories = explode(',', $old_contact['cat_id']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -2292,15 +2291,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Categories($this->user,'addressbook');
+			$this->categories = new Categories($this->user, 'addressbook');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(Acl::READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -2332,14 +2331,14 @@ 
 	 * @param boolean $relax =false if asked to relax, we only match against some key fields
 	 * @return array od matching contact_ids
 	 */
-	function find_contact($contact, $relax=false)
+	function find_contact($contact, $relax = false)
 	{
 		$empty_addr_one = $empty_addr_two = true;
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX': 'EXACT') . ')[ContactData]:'
+				. '('.($relax ? 'RELAX' : 'EXACT').')[ContactData]:'
 				. array2string($contact)
 				. "\n", 3, $this->logfile);
 		}
@@ -2350,7 +2349,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactID]: ' . $contact['id']
+					. '()[ContactID]: '.$contact['id']
 					. "\n", 3, $this->logfile);
 			}
 			// We only do a simple consistency check
@@ -2368,11 +2367,11 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactUID]: ' . $contact['uid']
+					. '()[ContactUID]: '.$contact['uid']
 					. "\n", 3, $this->logfile);
 			}
 			// Try the given UID first
-			$criteria = array ('contact_uid' => $contact['uid']);
+			$criteria = array('contact_uid' => $contact['uid']);
 			if (($foundContacts = parent::search($criteria)))
 			{
 				foreach ($foundContacts as $egwContact)
@@ -2455,7 +2454,7 @@ 
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 				. '()[Addressbook FIND Step 1]: '
-				. 'CRITERIA = ' . array2string($criteria)
+				. 'CRITERIA = '.array2string($criteria)
 				. "\n", 3, $this->logfile);
 		}
 
@@ -2484,7 +2483,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 2]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 
@@ -2508,7 +2507,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[Addressbook FIND Step 3]: '
-						. 'CRITERIA = ' . array2string($criteria)
+						. 'CRITERIA = '.array2string($criteria)
 						. "\n", 3, $this->logfile);
 				}
 
@@ -2534,7 +2533,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 4]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 			if (($foundContacts = parent::search($criteria, true, '', '', '', true)))
@@ -2548,7 +2547,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]: ' . array2string($matchingContacts)
+				. '()[FOUND]: '.array2string($matchingContacts)
 				. "\n", 3, $this->logfile);
 		}
 		return $matchingContacts;
@@ -2565,9 +2564,9 @@ 
 	 * @param int|array $owner =null 0=accounts, null=all addressbooks or integer account_id of user or group
 	 * @return string
 	 */
-	public function get_ctag($owner=null)
+	public function get_ctag($owner = null)
 	{
-		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
+		$filter = array('tid' => null); // tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
 		if (!is_null($owner)) $filter['owner'] = $owner;
 
@@ -2576,11 +2575,11 @@ 
 		{
 			$filter['account_id'] = null;
 		}
-		$result = $this->search(array(),'contact_modified','contact_modified DESC','','',false,'AND',array(0,1),$filter);
+		$result = $this->search(array(), 'contact_modified', 'contact_modified DESC', '', '', false, 'AND', array(0, 1), $filter);
 
 		if (!$result || !isset($result[0]['modified']))
 		{
-			$ctag = 'empty';	// ctag for empty addressbook
+			$ctag = 'empty'; // ctag for empty addressbook
 		}
 		else
 		{
@@ -2599,25 +2598,24 @@ 
 	{
 		ob_start();
 
-		$contact_id = isset($_GET['contact_id']) ? $_GET['contact_id'] :
-			(isset($_GET['account_id']) ? 'account:'.$_GET['account_id'] : 0);
+		$contact_id = isset($_GET['contact_id']) ? $_GET['contact_id'] : (isset($_GET['account_id']) ? 'account:'.$_GET['account_id'] : 0);
 
-		if (substr($contact_id,0,8) == 'account:')
+		if (substr($contact_id, 0, 8) == 'account:')
 		{
-			$contact_id = $GLOBALS['egw']->accounts->id2name(substr($contact_id,8),'person_id');
+			$contact_id = $GLOBALS['egw']->accounts->id2name(substr($contact_id, 8), 'person_id');
 		}
 
 		$contact = $this->read($contact_id);
 
 		if (!($contact) ||
-			empty($contact['jpegphoto']) &&                           // LDAP/AD (not updated SQL)
-			!(($contact['files'] & \EGroupware\Api\Contacts::FILES_BIT_PHOTO) && // new SQL in VFS
-				($size = filesize($url= \EGroupware\Api\Link::vfs_path('addressbook', $contact_id, \EGroupware\Api\Contacts::FILES_PHOTO)))))
+			empty($contact['jpegphoto']) && // LDAP/AD (not updated SQL)
+			!(($contact['files']&\EGroupware\Api\Contacts::FILES_BIT_PHOTO) && // new SQL in VFS
+				($size = filesize($url = \EGroupware\Api\Link::vfs_path('addressbook', $contact_id, \EGroupware\Api\Contacts::FILES_PHOTO)))))
 		{
 			if (is_array($contact))
 			{
 				header('Content-type: image/jpeg');
-				$contact['jpegphoto'] =  \EGroupware\Api\avatar::lavatar(array(
+				$contact['jpegphoto'] = \EGroupware\Api\avatar::lavatar(array(
 					'id' => $contact['id'],
 					'firstname' => $contact['n_given'],
 					'lastname' => $contact['n_family'])
@@ -2635,14 +2633,14 @@ 
 			// different url with different etag parameter will force a reload
 			if (isset($_GET['etag']))
 			{
-				\EGroupware\Api\Session::cache_control(30*86400);	// cache for 30 days
+				\EGroupware\Api\Session::cache_control(30 * 86400); // cache for 30 days
 			}
 			// if servers send a If-None-Match header, response with 304 Not Modified, if etag matches
 			if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag)
 			{
 				header("HTTP/1.1 304 Not Modified");
 			}
-			elseif(!empty($contact['jpegphoto']))
+			elseif (!empty($contact['jpegphoto']))
 			{
 				header('Content-length: '.bytes($contact['jpegphoto']));
 				echo $contact['jpegphoto'];
@@ -2654,6 +2652,6 @@ 
 			}
 			exit();
 		}
-		Egw::redirect(\EGroupware\Api\Image::find('addressbook','photo'));
+		Egw::redirect(\EGroupware\Api\Image::find('addressbook', 'photo'));
 	}
 }

admin/inc/class.admin_cmd.inc.php

Spacing +125 added lines, -126 removed lines

@@ -60,14 +60,14 @@ 
 	const successful = 2;
 	const failed     = 3;
 	const pending    = 4;
-	const queued     = 5;	// command waits to be fetched from remote
+	const queued     = 5; // command waits to be fetched from remote
 
 	/**
 	 * Status which stil need passwords available
 	 *
 	 * @var array
 	 */
-	static $require_pw_stati = array(self::scheduled,self::pending,self::queued);
+	static $require_pw_stati = array(self::scheduled, self::pending, self::queued);
 
 	/**
 	 * The status of the command, one of either scheduled, successful, failed or deleted
@@ -153,7 +153,7 @@ 
 	 * @return string success message
 	 * @throws Exception()
 	 */
-	protected abstract function exec($check_only=false);
+	protected abstract function exec($check_only = false);
 
 	/**
 	 * Return a title / string representation for a given command, eg. to display it
@@ -190,7 +190,7 @@ 
 
 		$this->type = get_class($this);
 
-		foreach($data as $name => $value)
+		foreach ($data as $name => $value)
 		{
 			$this->$name = $name == 'data' && !is_array($value) ? json_php_unserialize($value) : $value;
 		}
@@ -209,13 +209,13 @@ 
 	 * @return mixed return value of the command
 	 * @throws Exceptions on error
 	 */
-	function run($time=null,$set_modifier=true,$skip_checks=false,$dry_run=false)
+	function run($time = null, $set_modifier = true, $skip_checks = false, $dry_run = false)
 	{
 		if (!is_null($time))
 		{
 			$this->scheduled = $time;
 			$this->status = admin_cmd::scheduled;
-			$ret = lang('Command scheduled to run at %1',date('Y-m-d H:i',$time));
+			$ret = lang('Command scheduled to run at %1', date('Y-m-d H:i', $time));
 			// running the checks of the arguments for local commands, if not explicitly requested to not run them
 			if (!$this->remote_id && !$skip_checks)
 			{
@@ -281,21 +281,21 @@ 
 	{
 		if (!($remote = $this->read_remote($this->remote_id)))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!',$this->remote_id),997);
+			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!', $this->remote_id), 997);
 		}
 		if (!$this->uid)
 		{
-			$this->save();	// to get the uid
+			$this->save(); // to get the uid
 		}
 		$secret = md5($this->uid.$remote['remote_hash']);
 
 		$postdata = $this->as_array();
 		if (is_object($GLOBALS['egw']->translation))
 		{
-			$postdata = Api\Translation::convert($postdata,Api\Translation::charset(),'utf-8');
+			$postdata = Api\Translation::convert($postdata, Api\Translation::charset(), 'utf-8');
 		}
 		// dont send the id's which have no meaning on the remote install
-		foreach(array('id','creator','modifier','requested','remote_id') as $name)
+		foreach (array('id', 'creator', 'modifier', 'requested', 'remote_id') as $name)
 		{
 			unset($postdata[$name]);
 		}
@@ -321,12 +321,12 @@ 
 		}
 		if (is_object($GLOBALS['egw']->translation))
 		{
-			$message = Api\Translation::convert($message,'utf-8');
+			$message = Api\Translation::convert($message, 'utf-8');
 		}
 		$matches = null;
-		if (is_string($message) && preg_match('/^([0-9]+) (.*)$/',$message,$matches))
+		if (is_string($message) && preg_match('/^([0-9]+) (.*)$/', $message, $matches))
 		{
-			throw new Api\Exception($matches[2],(int)$matches[1]);
+			throw new Api\Exception($matches[2], (int)$matches[1]);
 		}
 		return $message;
 	}
@@ -352,7 +352,7 @@ 
 	 * @param boolean $set_modifier =true set the current user as modifier or 0 (= run by the system)
 	 * @return boolean true on success, false otherwise
 	 */
-	function save($set_modifier=true)
+	function save($set_modifier = true)
 	{
 		admin_cmd::_instanciate_sql();
 
@@ -367,7 +367,7 @@ 
 			$this->modifier = $set_modifier ? $GLOBALS['egw_info']['user']['account_id'] : 0;
 			if ($set_modifier) $this->modifier_email = admin_cmd::user_email();
 		}
-		$vars = get_object_vars($this);	// does not work in php5.1.2 due a bug
+		$vars = get_object_vars($this); // does not work in php5.1.2 due a bug
 
 		// data is stored serialized
 		// paswords are masked / removed, if we dont need them anymore
@@ -406,7 +406,7 @@ 
 			$this->set_periodic_job();
 		}
 		// existing object with no rrule, cancle evtl. running periodic job
-		elseif($vars['id'])
+		elseif ($vars['id'])
 		{
 			$this->cancel_periodic_job();
 		}
@@ -420,13 +420,13 @@ 
 	 * @param boolean $return_serialized =true true: return json serialized string, false: return array
 	 * @return string|array see $return_serialized
 	 */
-	static function mask_passwords($data, $return_serialized=true)
+	static function mask_passwords($data, $return_serialized = true)
 	{
 		if (!is_array($data))
 		{
 			$data = json_php_unserialize($data);
 		}
-		foreach($data as $key => &$value)
+		foreach ($data as $key => &$value)
 		{
 			if (is_array($value))
 			{
@@ -474,10 +474,10 @@ 
 		{
 			$data['data'] = json_php_unserialize($data['data']);
 		}
-		if (!(class_exists($class = 'EGroupware\\'.$data['type']) ||	// namespaced class
+		if (!(class_exists($class = 'EGroupware\\'.$data['type']) || // namespaced class
 			class_exists($class = $data['type'])) || $data['type'] == 'admin_cmd')
 		{
-			throw new Api\Exception\WrongParameter(lang('Unknown command %1!',$class), 10);
+			throw new Api\Exception\WrongParameter(lang('Unknown command %1!', $class), 10);
 		}
 		$cmd = new $class($data);
 
@@ -485,7 +485,7 @@ 
 		{
 			return $cmd;
 		}
-		throw new Api\Exception\WrongParameter(lang('%1 is no command!',$class), 10);
+		throw new Api\Exception\WrongParameter(lang('%1 is no command!', $class), 10);
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 * @param array $readonlys
 	 * @return int
 	 */
-	static function get_rows($query,&$rows,$readonlys)
+	static function get_rows($query, &$rows, $readonlys)
 	{
 		admin_cmd::_instanciate_sql();
 
@@ -514,21 +514,21 @@ 
 			$query['col_filter'][] = 'cmd_rrule IS NOT NULL';
 		}
 		unset($query['col_filter']['periodic']);
-		if($query['col_filter']['parent'])
+		if ($query['col_filter']['parent'])
 		{
 			$query['col_filter']['parent'] = (int)$query['col_filter']['parent'];
 		}
 
-		$total = admin_cmd::$sql->get_rows($query,$rows,$readonlys);
+		$total = admin_cmd::$sql->get_rows($query, $rows, $readonlys);
 
 		if (!$rows) return 0;
 
 		$async = new Api\Asyncservice();
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			try {
 				$cmd = admin_cmd::instanciate($row);
-				$row['title'] = $cmd->__tostring();	// we call __tostring explicit, as a cast to string requires php5.2+
+				$row['title'] = $cmd->__tostring(); // we call __tostring explicit, as a cast to string requires php5.2+
 			}
 			catch (Exception $e) {
 				$row['title'] = $e->getMessage();
@@ -536,25 +536,24 @@ 
 
 			$row['value'] = $cmd->value;
 
-			if(method_exists($cmd, 'summary'))
+			if (method_exists($cmd, 'summary'))
 			{
 				$row['data'] = $cmd->summary();
 			}
 			else
 			{
-				$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' :
-					json_encode($data+(empty($row['rrule'])?array():array('rrule' => $row['rrule'])),
+				$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' : json_encode($data + (empty($row['rrule']) ? array() : array('rrule' => $row['rrule'])),
 						JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
 			}
-			if($row['rrule'])
+			if ($row['rrule'])
 			{
-				$rrule = calendar_rrule::event2rrule(calendar_rrule::parseRrule($row['rrule'],true)+array(
+				$rrule = calendar_rrule::event2rrule(calendar_rrule::parseRrule($row['rrule'], true) + array(
 					'start' => time(),
 					'tzid'=> Api\DateTime::$server_timezone->getName()
 				));
 				$row['rrule'] = ''.$rrule;
 			}
-			if(!$row['scheduled'] && $cmd && $cmd->async_job_id)
+			if (!$row['scheduled'] && $cmd && $cmd->async_job_id)
 			{
 				$job = $async->read($cmd->async_job_id);
 
@@ -580,11 +579,11 @@ 
 			admin_cmd::_instanciate_sql();
 
 			// Need a new one to avoid column name modification
-			$sql = new Api\Storage\Base('admin','egw_admin_queue',null);
+			$sql = new Api\Storage\Base('admin', 'egw_admin_queue', null);
 			$labels = $sql->query_list('cmd_type');
 
 			// for admin app we also add all available cmd objects
-			foreach(scandir(__DIR__) as $file)
+			foreach (scandir(__DIR__) as $file)
 			{
 				$matches = null;
 				if (preg_match('/^class\.(admin_cmd_.*)\.inc\.php$/', $file, $matches))
@@ -595,15 +594,15 @@ 
 					}
 				}
 			}
-			foreach($labels as $class => &$label)
+			foreach ($labels as $class => &$label)
 			{
-				if(class_exists($class))
+				if (class_exists($class))
 				{
 					$label = $class::name();
 				}
-				elseif (class_exists('EGroupware\\' . $class))
+				elseif (class_exists('EGroupware\\'.$class))
 				{
-					$class = 'EGroupware\\' . $class;
+					$class = 'EGroupware\\'.$class;
 					$label = $class::name();
 				}
 			}
@@ -634,11 +633,11 @@ 
 	 * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
 	 * @return array
 	 */
-	static function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null)
+	static function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null)
 	{
 		admin_cmd::_instanciate_sql();
 
-		return admin_cmd::$sql->search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter);
+		return admin_cmd::$sql->search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter);
 	}
 
 	/**
@@ -650,7 +649,7 @@ 
 	{
 		if (is_null(admin_cmd::$sql))
 		{
-			admin_cmd::$sql = new Api\Storage\Base('admin','egw_admin_queue',null,'cmd_');
+			admin_cmd::$sql = new Api\Storage\Base('admin', 'egw_admin_queue', null, 'cmd_');
 		}
 	}
 
@@ -663,7 +662,7 @@ 
 	{
 		if (is_null(admin_cmd::$remote))
 		{
-			admin_cmd::$remote = new Api\Storage\Base('admin','egw_admin_remote');
+			admin_cmd::$remote = new Api\Storage\Base('admin', 'egw_admin_remote');
 		}
 	}
 
@@ -675,11 +674,11 @@ 
 	 */
 	function __get($property)
 	{
-		if (property_exists('admin_cmd',$property))
+		if (property_exists('admin_cmd', $property))
 		{
-			return $this->$property;	// making all (non static) class vars readonly available
+			return $this->$property; // making all (non static) class vars readonly available
 		}
-		switch($property)
+		switch ($property)
 		{
 			case 'accounts':
 				self::_instanciate_accounts();
@@ -698,9 +697,9 @@ 
 	 */
 	function __isset($property)
 	{
-		if (property_exists('admin_cmd',$property))
+		if (property_exists('admin_cmd', $property))
 		{
-			return isset($this->$property);	// making all (non static) class vars readonly available
+			return isset($this->$property); // making all (non static) class vars readonly available
 		}
 		return isset($this->data[$property]);
 	}
@@ -712,7 +711,7 @@ 
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	function __set($property,$value)
+	function __set($property, $value)
 	{
 		$this->data[$property] = $value;
 	}
@@ -734,19 +733,19 @@ 
 	 */
 	function as_array()
 	{
-		if (version_compare(PHP_VERSION,'5.1.2','>'))
+		if (version_compare(PHP_VERSION, '5.1.2', '>'))
 		{
-			$vars = get_object_vars($this);	// does not work in php5.1.2 due a bug
+			$vars = get_object_vars($this); // does not work in php5.1.2 due a bug
 		}
 		else
 		{
-			foreach(array_keys(get_class_vars(__CLASS__)) as $name)
+			foreach (array_keys(get_class_vars(__CLASS__)) as $name)
 			{
 				$vars[$name] = $this->$name;
 			}
 		}
 		unset($vars['data']);
-		if ($this->data) $vars = array_merge($this->data,$vars);
+		if ($this->data) $vars = array_merge($this->data, $vars);
 
 		return $vars;
 	}
@@ -758,14 +757,14 @@ 
 	 * @param int $extra_deny =null further admin rights to check, eg. 16 = deny edit Api\Accounts
 	 * @throws Api\Exception\NoPermission\Admin
 	 */
-	protected function _check_admin($extra_acl=null,$extra_deny=null)
+	protected function _check_admin($extra_acl = null, $extra_deny = null)
 	{
 		if ($this->creator)
 		{
 			admin_cmd::_instanciate_acl($this->creator);
 			// todo: check only if and with $this->creator
-			if (!admin_cmd::$acl->check('run',1,'admin') &&		// creator is no longer admin
-				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl,$extra_deny,'admin'))	// creator is explicitly forbidden to do something
+			if (!admin_cmd::$acl->check('run', 1, 'admin') && // creator is no longer admin
+				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl, $extra_deny, 'admin'))	// creator is explicitly forbidden to do something
 			{
 				throw new Api\Exception\NoPermission\Admin();
 			}
@@ -781,13 +780,13 @@ 
 	 */
 	static function parse_apps(array $apps)
 	{
-		foreach($apps as $key => $name)
+		foreach ($apps as $key => $name)
 		{
 			if (!isset($GLOBALS['egw_info']['apps'][$name]))
 			{
-				foreach($GLOBALS['egw_info']['apps'] as $app => $data)	// check against title and localised name
+				foreach ($GLOBALS['egw_info']['apps'] as $app => $data)	// check against title and localised name
 				{
-					if (!strcasecmp($name,$data['title']) || !strcasecmp($name,lang($app)))
+					if (!strcasecmp($name, $data['title']) || !strcasecmp($name, lang($app)))
 					{
 						$apps[$key] = $name = $app;
 						break;
@@ -796,7 +795,7 @@ 
 			}
 			if (!isset($GLOBALS['egw_info']['apps'][$name]))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
+				throw new Api\Exception\WrongUserinput(lang("Application '%1' not found (maybe not installed or misspelled)!", $name), 8);
 			}
 		}
 		return $apps;
@@ -811,20 +810,20 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$account), 15);
 	 * @throws Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')), 16);
 	 */
-	static function parse_account($account,$allow_only_user=null)
+	static function parse_account($account, $allow_only_user = null)
 	{
 		admin_cmd::_instanciate_accounts();
 
 		if (!($type = admin_cmd::$accounts->exists($account)) ||
-			!is_numeric($id=$account) && !($id = admin_cmd::$accounts->name2id($account)))
+			!is_numeric($id = $account) && !($id = admin_cmd::$accounts->name2id($account)))
 		{
-			throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$account), 15);
+			throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!", $account), 15);
 		}
 		if (!is_null($allow_only_user) && $allow_only_user !== ($type == 1))
 		{
-			throw new Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')), 16);
+			throw new Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!", $account, $allow_only_user ?lang('user') : lang('group')), 16);
 		}
-		if ($type == 2 && $id > 0) $id = -$id;	// groups use negative id's internally, fix it, if user given the wrong sign
+		if ($type == 2 && $id > 0) $id = -$id; // groups use negative id's internally, fix it, if user given the wrong sign
 
 		return $id;
 	}
@@ -838,14 +837,14 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$account), 15);
 	 * @throws Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only?lang('user'):lang('group')), 16);
 	 */
-	static function parse_accounts($accounts,$allow_only_user=null)
+	static function parse_accounts($accounts, $allow_only_user = null)
 	{
 		if (!$accounts) return null;
 
 		$ids = array();
-		foreach(is_array($accounts) ? $accounts : explode(',',$accounts) as $account)
+		foreach (is_array($accounts) ? $accounts : explode(',', $accounts) as $account)
 		{
-			$ids[] = admin_cmd::parse_account($account,$allow_only_user);
+			$ids[] = admin_cmd::parse_account($account, $allow_only_user);
 		}
 		return $ids;
 	}
@@ -863,11 +862,11 @@ 
 		{
 			$datein = $date;
 			// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
-			$date = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})$/','\3-\2-\1',$date);
+			$date = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})$/', '\3-\2-\1', $date);
 
-			if (($date = strtotime($date))  === false)
+			if (($date = strtotime($date)) === false)
 			{
-				throw new Api\Exception\WrongUserinput(lang('Invalid formated date "%1"!',$datein),6);
+				throw new Api\Exception\WrongUserinput(lang('Invalid formated date "%1"!', $datein), 6);
 			}
 		}
 		return (int)$date;
@@ -881,7 +880,7 @@ 
 	 * @return boolean
 	 * @throws Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!',$value),998);
 	 */
-	static function parse_boolean($value,$default=null)
+	static function parse_boolean($value, $default = null)
 	{
 		if (is_bool($value) || is_int($value))
 		{
@@ -891,15 +890,15 @@ 
 		{
 			return $default;
 		}
-		if (in_array($value,array('1','yes','true',lang('yes'),lang('true'))))
+		if (in_array($value, array('1', 'yes', 'true', lang('yes'), lang('true'))))
 		{
 			return true;
 		}
-		if (in_array($value,array('0','no','false',lang('no'),lang('false'))))
+		if (in_array($value, array('0', 'no', 'false', lang('no'), lang('false'))))
 		{
 			return false;
 		}
-		throw new Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!',$value),998);
+		throw new Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!', $value), 998);
 	}
 
 	/**
@@ -917,9 +916,9 @@ 
 			'remote_id' => $id_or_name,
 			'remote_name' => $id_or_name,
 			'remote_domain' => $id_or_name,
-		),true,'','','',false,'OR')) || count($remotes) != 1)
+		), true, '', '', '', false, 'OR')) || count($remotes) != 1)
 		{
-			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!',$id_or_name),997);
+			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!', $id_or_name), 997);
 		}
 		return $remotes[0]['remote_id'];
 	}
@@ -936,7 +935,7 @@ 
 		{
 			if (!is_object($GLOBALS['egw']->accounts))
 			{
-				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated','accounts'),999);
+				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated', 'accounts'), 999);
 			}
 			admin_cmd::$accounts = $GLOBALS['egw']->accounts;
 		}
@@ -949,13 +948,13 @@ 
 	 * @param int $account =null account_id the class needs to be instanciated for, default need only account-independent methods
 	 * @throws Api\Exception\AssertionFailed(lang('%1 class not instanciated','acl'),999);
 	 */
-	protected function _instanciate_acl($account=null)
+	protected function _instanciate_acl($account = null)
 	{
 		if (!is_object(admin_cmd::$acl) || $account && admin_cmd::$acl->account_id != $account)
 		{
 			if (!is_object($GLOBALS['egw']->acl))
 			{
-				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated','acl'),999);
+				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated', 'acl'), 999);
 			}
 			if ($account && $GLOBALS['egw']->acl->account_id != $account)
 			{
@@ -975,20 +974,20 @@ 
 	 * @param $account_id =null account_id, default current user
 	 * @return string
 	 */
-	static function user_email($account_id=null)
+	static function user_email($account_id = null)
 	{
 		if ($account_id)
 		{
 			admin_cmd::_instanciate_accounts();
-			$fullname = admin_cmd::$accounts->id2name($account_id,'account_fullname');
-			$email = admin_cmd::$accounts->id2name($account_id,'account_email');
+			$fullname = admin_cmd::$accounts->id2name($account_id, 'account_fullname');
+			$email = admin_cmd::$accounts->id2name($account_id, 'account_email');
 		}
 		else
 		{
 			$fullname = $GLOBALS['egw_info']['user']['account_fullname'];
 			$email = $GLOBALS['egw_info']['user']['account_email'];
 		}
-		return $fullname . ($email ? ' <'.$email.'>' : '');
+		return $fullname.($email ? ' <'.$email.'>' : '');
 	}
 
 	/**
@@ -1012,11 +1011,11 @@ 
 		{
 			return false;
 		}
-		if (!($jobs = admin_cmd::search(array(),false,'cmd_scheduled','','',false,'AND',array(0,1),array(
+		if (!($jobs = admin_cmd::search(array(), false, 'cmd_scheduled', '', '', false, 'AND', array(0, 1), array(
 			'cmd_status' => admin_cmd::scheduled,
 		))))
 		{
-			return false;		// no schduled command, no need to setup the job
+			return false; // no schduled command, no need to setup the job
 		}
 		$next = $jobs[0];
 		if (($time = $next['scheduled']) < time())	// should run immediatly
@@ -1026,11 +1025,11 @@ 
 		$async = new Api\Asyncservice();
 
 		// we cant use this class as callback, as it's abstract and ExecMethod used by the async service instanciated the class!
-		list($app) = explode('_',$class=$next['type']);
+		list($app) = explode('_', $class = $next['type']);
 		$callback = $app.'.'.$class.'.run_queued_jobs';
 
-		$async->cancel_timer(admin_cmd::async_job_id);	// we delete it in case a job already exists
-		return $async->set_timer($time,admin_cmd::async_job_id,$callback,null,$next['creator']);
+		$async->cancel_timer(admin_cmd::async_job_id); // we delete it in case a job already exists
+		return $async->set_timer($time, admin_cmd::async_job_id, $callback, null, $next['creator']);
 	}
 
 	/**
@@ -1040,20 +1039,20 @@ 
 	 */
 	static function run_queued_jobs()
 	{
-		if (!($jobs = admin_cmd::search(array(),false,'cmd_scheduled','','',false,'AND',false,array(
+		if (!($jobs = admin_cmd::search(array(), false, 'cmd_scheduled', '', '', false, 'AND', false, array(
 			'cmd_status' => admin_cmd::scheduled,
 			'cmd_scheduled <= '.time(),
 		))))
 		{
-			return false;		// no schduled commands, no need to setup the job
+			return false; // no schduled commands, no need to setup the job
 		}
-		admin_cmd::$running_queued_jobs = true;	// stop admin_cmd::run() which calls admin_cmd::save() to install a new job
+		admin_cmd::$running_queued_jobs = true; // stop admin_cmd::run() which calls admin_cmd::save() to install a new job
 
-		foreach($jobs as $job)
+		foreach ($jobs as $job)
 		{
 			try {
 				$cmd = admin_cmd::instanciate($job);
-				$cmd->run(null,false);	// false = dont set current user as modifier, as job is run by the queue/system itself
+				$cmd->run(null, false); // false = dont set current user as modifier, as job is run by the queue/system itself
 			}
 			catch (Exception $e) {	// we need to mark that command as failed, to prevent further execution
 				_egw_log_exception($e);
@@ -1083,13 +1082,13 @@ 
 		if (empty($this->rrule)) return false;
 
 		// parse rrule and calculate next execution time
-		$event = calendar_rrule::parseRrule($this->rrule, true);	// true: allow HOURLY or MINUTELY
+		$event = calendar_rrule::parseRrule($this->rrule, true); // true: allow HOURLY or MINUTELY
 		// rrule can depend on start-time, use policy creation time by default, if rrule_start is not set
 		$event['start'] = empty($this->rrule_start) ? $this->created : $this->rrule_start;
 		$event['tzid'] = Api\DateTime::$server_timezone->getName();
-		$rrule = calendar_rrule::event2rrule($event, false);	// false = server timezone
+		$rrule = calendar_rrule::event2rrule($event, false); // false = server timezone
 		$rrule->rewind();
-		while((($time = $rrule->current()->format('ts'))) <= time())
+		while ((($time = $rrule->current()->format('ts'))) <= time())
 		{
 			$rrule->next();
 		}
@@ -1097,7 +1096,7 @@ 
 		// schedule run_periodic_job to run at that time
 		$async = new Api\Asyncservice();
 		$job_id = empty($this->async_job_id) ? self::PERIOD_ASYNC_ID_PREFIX.$this->id : $this->async_job_id;
-		$async->cancel_timer($job_id);	// we delete it in case a job already exists
+		$async->cancel_timer($job_id); // we delete it in case a job already exists
 		return $async->set_timer($time, $job_id, __CLASS__.'::run_periodic_job', $this->as_array(), $this->creator);
 	}
 
@@ -1110,7 +1109,7 @@ 
 	{
 		$async = new Api\Asyncservice();
 		$job_id = empty($this->async_job_id) ? self::PERIOD_ASYNC_ID_PREFIX.$this->id : $this->async_job_id;
-		$async->cancel_timer($job_id);	// we delete it in case a job already exists
+		$async->cancel_timer($job_id); // we delete it in case a job already exists
 	}
 
 	/**
@@ -1127,10 +1126,10 @@ 
 		$single = $cmd->as_array();
 		$single['parent'] = $single['id'];
 		$single = array_diff_key($single, array_flip(array(
-			'id','uid',
-			'created','modified','modifier',
-			'async_job_id','rrule','scheduled',
-			'status', 'set', 'old','value','result'
+			'id', 'uid',
+			'created', 'modified', 'modifier',
+			'async_job_id', 'rrule', 'scheduled',
+			'status', 'set', 'old', 'value', 'result'
 		)));
 
 		$periodic = admin_cmd::instanciate($single);
@@ -1156,9 +1155,9 @@ 
 		admin_cmd::_instanciate_remote();
 
 		$sites = array(lang('local'));
-		if (($remote = admin_cmd::$remote->query_list('remote_name','remote_id')))
+		if (($remote = admin_cmd::$remote->query_list('remote_name', 'remote_id')))
 		{
-			$sites = array_merge($sites,$remote);
+			$sites = array_merge($sites, $remote);
 		}
 		return $sites;
 	}
@@ -1171,11 +1170,11 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	static function get_remotes($query,&$rows,&$readonlys)
+	static function get_remotes($query, &$rows, &$readonlys)
 	{
 		admin_cmd::_instanciate_remote();
 
-		return admin_cmd::$remote->get_rows($query,$rows,$readonlys);
+		return admin_cmd::$remote->get_rows($query, $rows, $readonlys);
 	}
 
 	/**
@@ -1203,7 +1202,7 @@ 
 
 		if ($data['install_id'] && $data['config_passwd'])	// calculate hash
 		{
-			$data['remote_hash'] = self::remote_hash($data['install_id'],$data['config_passwd']);
+			$data['remote_hash'] = self::remote_hash($data['install_id'], $data['config_passwd']);
 		}
 		elseif (!$data['remote_hash'] && !($data['install_id'] && $data['config_passwd']))
 		{
@@ -1215,12 +1214,12 @@ 
 		// check if a unique key constrain would be violated by saving the entry
 		if (($num = admin_cmd::$remote->not_unique()))
 		{
-			$col = admin_cmd::$remote->table_def['uc'][$num-1];	// $num is 1 based!
-			throw new egw_exception_db_not_unique(lang('Value for column %1 is not unique!',$this->table_name.'.'.$col),$num);
+			$col = admin_cmd::$remote->table_def['uc'][$num - 1]; // $num is 1 based!
+			throw new egw_exception_db_not_unique(lang('Value for column %1 is not unique!', $this->table_name.'.'.$col), $num);
 		}
 		if (admin_cmd::$remote->save() != 0)
 		{
-			throw new Api\Db\Exception(lang('Error saving to db:').' '.$this->sql->db->Error.' ('.$this->sql->db->Errno.')',$this->sql->db->Errno);
+			throw new Api\Db\Exception(lang('Error saving to db:').' '.$this->sql->db->Error.' ('.$this->sql->db->Errno.')', $this->sql->db->Errno);
 		}
 		return admin_cmd::$remote->data['remote_id'];
 	}
@@ -1232,11 +1231,11 @@ 
 	 * @param string $config_passwd
 	 * @return string 32char md5 hash
 	 */
-	static function remote_hash($install_id,$config_passwd)
+	static function remote_hash($install_id, $config_passwd)
 	{
 		if (empty($config_passwd) || !self::is_md5($install_id))
 		{
-			throw new Api\Exception\WrongParameter(empty($config_passwd)?'Empty Api\Config password':'install_id no md5 hash');
+			throw new Api\Exception\WrongParameter(empty($config_passwd) ? 'Empty Api\Config password' : 'install_id no md5 hash');
 		}
 		if (!self::is_md5($config_passwd)) $config_passwd = md5($config_passwd);
 
@@ -1266,7 +1265,7 @@ 
 	 */
 	static function is_md5($str)
 	{
-		return preg_match('/^[0-9a-f]{32}$/',$str);
+		return preg_match('/^[0-9a-f]{32}$/', $str);
 	}
 
 	/**
@@ -1283,26 +1282,26 @@ 
 	 * @param string $config_passwd of the current domain
 	 * @throws Api\Exception\NoPermission
 	 */
-	function check_remote_access($secret,$config_passwd)
+	function check_remote_access($secret, $config_passwd)
 	{
 		// as a security measure remote administration need to be enabled under Admin > Site configuration
-		list(,$remote_admin_install_id) = explode('-',$this->uid);
-		$allowed_remote_admin_ids = $GLOBALS['egw_info']['server']['allow_remote_admin'] ? explode(',',$GLOBALS['egw_info']['server']['allow_remote_admin']) : array();
+		list(,$remote_admin_install_id) = explode('-', $this->uid);
+		$allowed_remote_admin_ids = $GLOBALS['egw_info']['server']['allow_remote_admin'] ? explode(',', $GLOBALS['egw_info']['server']['allow_remote_admin']) : array();
 
 		// to authenticate with the installation we use a secret, which is a md5 hash build from the uid
 		// of the command (to not allow to send new commands with an earsdroped secret) and the md5 hash
 		// of the md5 hash of the Api\Config password and the install_id (egw_admin_remote.remote_hash)
-		if (is_null($config_passwd) || is_numeric($this->uid) || !in_array($remote_admin_install_id,$allowed_remote_admin_ids) ||
-			$secret != ($md5=md5($this->uid.$this->remote_hash($GLOBALS['egw_info']['server']['install_id'],$config_passwd))))
+		if (is_null($config_passwd) || is_numeric($this->uid) || !in_array($remote_admin_install_id, $allowed_remote_admin_ids) ||
+			$secret != ($md5 = md5($this->uid.$this->remote_hash($GLOBALS['egw_info']['server']['install_id'], $config_passwd))))
 		{
 			//die("secret='$secret' != '$md5', is_null($config_passwd)=".is_null($config_passwd).", uid=$this->uid, remote_install_id=$remote_admin_install_id, allowed: ".implode(', ',$allowed_remote_admin_ids));
 			unset($md5);
 			$msg = lang('Permission denied!');
-			if (!in_array($remote_admin_install_id,$allowed_remote_admin_ids))
+			if (!in_array($remote_admin_install_id, $allowed_remote_admin_ids))
 			{
 				$msg .= "\n".lang('Remote administration need to be enabled in the remote instance under Admin > Site configuration!');
 			}
-			throw new Api\Exception\NoPermission($msg,0);
+			throw new Api\Exception\NoPermission($msg, 0);
 		}
 	}
 
@@ -1312,7 +1311,7 @@ 
 	 * @param int $len =16
 	 * @return string
 	 */
-	static function randomstring($len=16)
+	static function randomstring($len = 16)
 	{
 		return Api\Auth::randomstring($len);
 	}
@@ -1334,7 +1333,7 @@ 
 	 */
 	protected function get_etemplate()
 	{
-		static $tpl = null;	// some caching to not instanciate it twice
+		static $tpl = null; // some caching to not instanciate it twice
 
 		if (!isset($tpl))
 		{
@@ -1364,7 +1363,7 @@ 
 		{
 			$tpl->run(function($cname, $expand, $widget) use (&$labels, &$label)
 			{
-				switch($widget->type)
+				switch ($widget->type)
 				{
 					// remember label from last description widget
 					case 'description':
@@ -1407,7 +1406,7 @@ 
 		{
 			$tpl->run(function($cname, $expand, $widget) use (&$widgets, &$last_select, $selectboxes)
 			{
-				switch($widget->type)
+				switch ($widget->type)
 				{
 					// ignore non input-widgets
 					case 'hbox': case 'vbox': case 'box': case 'groupbox':
@@ -1472,12 +1471,12 @@ 
 	 */
 	public function get_result()
 	{
-		if($this->result)
+		if ($this->result)
 		{
 			return is_array($this->result) ? implode("\n", $this->result) : $this->result;
 		}
 		return lang("Command was run %1 on %2",
-				static::$stati[ $this->status ],
+				static::$stati[$this->status],
 				Api\DateTime::to($this->created));
 	}
 }

Braces +85 added lines, -21 removed lines

@@ -172,7 +172,10 @@ 
 	 */
 	public static function name()
 	{
-		if (self::NAME) return self::NAME;
+		if (self::NAME)
+		{
+			return self::NAME;
+		}
 
 		return ucfirst(str_replace(['_cmd_', '_', '\\'], ' ', get_called_class()));
 	}
@@ -242,7 +245,10 @@ 
 				{
 					$ret = $this->remote_exec($dry_run);
 				}
-				if (is_null($this->status)) $this->status = admin_cmd::successful;
+				if (is_null($this->status))
+				{
+					$this->status = admin_cmd::successful;
+				}
 			}
 			catch (Exception $e) {
 				_egw_log_exception($e);
@@ -339,7 +345,10 @@ 
 	function delete()
 	{
 		$this->cancel_periodic_job();
-		if ($this->status != admin_cmd::scheduled) return false;
+		if ($this->status != admin_cmd::scheduled)
+		{
+			return false;
+		}
 
 		$this->status = admin_cmd::deleted;
 
@@ -365,7 +374,10 @@ 
 		{
 			$this->modified = time();
 			$this->modifier = $set_modifier ? $GLOBALS['egw_info']['user']['account_id'] : 0;
-			if ($set_modifier) $this->modifier_email = admin_cmd::user_email();
+			if ($set_modifier)
+			{
+				$this->modifier_email = admin_cmd::user_email();
+			}
 		}
 		$vars = get_object_vars($this);	// does not work in php5.1.2 due a bug
 
@@ -481,10 +493,13 @@ 
 		}
 		$cmd = new $class($data);
 
-		if ($cmd instanceof admin_cmd)	// dont allow others classes to be executed that way!
+		if ($cmd instanceof admin_cmd)
+		{
+			// dont allow others classes to be executed that way!
 		{
 			return $cmd;
 		}
+		}
 		throw new Api\Exception\WrongParameter(lang('%1 is no command!',$class), 10);
 	}
 
@@ -521,7 +536,10 @@ 
 
 		$total = admin_cmd::$sql->get_rows($query,$rows,$readonlys);
 
-		if (!$rows) return 0;
+		if (!$rows)
+		{
+			return 0;
+		}
 
 		$async = new Api\Asyncservice();
 		foreach($rows as &$row)
@@ -746,7 +764,10 @@ 
 			}
 		}
 		unset($vars['data']);
-		if ($this->data) $vars = array_merge($this->data,$vars);
+		if ($this->data)
+		{
+			$vars = array_merge($this->data,$vars);
+		}
 
 		return $vars;
 	}
@@ -765,10 +786,13 @@ 
 			admin_cmd::_instanciate_acl($this->creator);
 			// todo: check only if and with $this->creator
 			if (!admin_cmd::$acl->check('run',1,'admin') &&		// creator is no longer admin
-				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl,$extra_deny,'admin'))	// creator is explicitly forbidden to do something
+				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl,$extra_deny,'admin'))
+			{
+				// creator is explicitly forbidden to do something
 			{
 				throw new Api\Exception\NoPermission\Admin();
 			}
+			}
 		}
 	}
 
@@ -785,11 +809,14 @@ 
 		{
 			if (!isset($GLOBALS['egw_info']['apps'][$name]))
 			{
-				foreach($GLOBALS['egw_info']['apps'] as $app => $data)	// check against title and localised name
+				foreach($GLOBALS['egw_info']['apps'] as $app => $data)
+				{
+					// check against title and localised name
 				{
 					if (!strcasecmp($name,$data['title']) || !strcasecmp($name,lang($app)))
 					{
 						$apps[$key] = $name = $app;
+				}
 						break;
 					}
 				}
@@ -824,7 +851,11 @@ 
 		{
 			throw new Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')), 16);
 		}
-		if ($type == 2 && $id > 0) $id = -$id;	// groups use negative id's internally, fix it, if user given the wrong sign
+		if ($type == 2 && $id > 0)
+		{
+			$id = -$id;
+		}
+		// groups use negative id's internally, fix it, if user given the wrong sign
 
 		return $id;
 	}
@@ -840,7 +871,10 @@ 
 	 */
 	static function parse_accounts($accounts,$allow_only_user=null)
 	{
-		if (!$accounts) return null;
+		if (!$accounts)
+		{
+			return null;
+		}
 
 		$ids = array();
 		foreach(is_array($accounts) ? $accounts : explode(',',$accounts) as $account)
@@ -859,9 +893,12 @@ 
 	 */
 	static function parse_date($date)
 	{
-		if (!is_numeric($date))	// we allow to input a timestamp
+		if (!is_numeric($date))
+		{
+			// we allow to input a timestamp
 		{
 			$datein = $date;
+		}
 			// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
 			$date = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})$/','\3-\2-\1',$date);
 
@@ -1019,10 +1056,13 @@ 
 			return false;		// no schduled command, no need to setup the job
 		}
 		$next = $jobs[0];
-		if (($time = $next['scheduled']) < time())	// should run immediatly
+		if (($time = $next['scheduled']) < time())
+		{
+			// should run immediatly
 		{
 			return admin_cmd::run_queued_jobs();
 		}
+		}
 		$async = new Api\Asyncservice();
 
 		// we cant use this class as callback, as it's abstract and ExecMethod used by the async service instanciated the class!
@@ -1080,7 +1120,10 @@ 
 	 */
 	public function set_periodic_job()
 	{
-		if (empty($this->rrule)) return false;
+		if (empty($this->rrule))
+		{
+			return false;
+		}
 
 		// parse rrule and calculate next execution time
 		$event = calendar_rrule::parseRrule($this->rrule, true);	// true: allow HOURLY or MINUTELY
@@ -1201,10 +1244,13 @@ 
 	{
 		admin_cmd::_instanciate_remote();
 
-		if ($data['install_id'] && $data['config_passwd'])	// calculate hash
+		if ($data['install_id'] && $data['config_passwd'])
+		{
+			// calculate hash
 		{
 			$data['remote_hash'] = self::remote_hash($data['install_id'],$data['config_passwd']);
 		}
+		}
 		elseif (!$data['remote_hash'] && !($data['install_id'] && $data['config_passwd']))
 		{
 			throw new Api\Exception\WrongUserinput(lang('Either Install ID AND Api\Config password needed OR the remote hash!'));
@@ -1238,7 +1284,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter(empty($config_passwd)?'Empty Api\Config password':'install_id no md5 hash');
 		}
-		if (!self::is_md5($config_passwd)) $config_passwd = md5($config_passwd);
+		if (!self::is_md5($config_passwd))
+		{
+			$config_passwd = md5($config_passwd);
+		}
 
 		return md5($config_passwd.$install_id);
 	}
@@ -1368,7 +1417,10 @@ 
 				{
 					// remember label from last description widget
 					case 'description':
-						if (!empty($widget->attrs['value'])) $label = $widget->attrs['value'];
+						if (!empty($widget->attrs['value']))
+						{
+							$label = $widget->attrs['value'];
+						}
 						break;
 					// ignore non input-widgets
 					case 'hbox': case 'vbox': case 'box': case 'groupbox':
@@ -1380,8 +1432,14 @@ 
 					default:
 						if (!empty($widget->id))
 						{
-							if (!empty($widget->attrs['label'])) $label = $widget->attrs['label'];
-							if (!empty($label)) $labels[$widget->id] = $label;
+							if (!empty($widget->attrs['label']))
+							{
+								$label = $widget->attrs['label'];
+							}
+							if (!empty($label))
+							{
+								$labels[$widget->id] = $label;
+							}
 							$label = null;
 						}
 						break;
@@ -1419,7 +1477,10 @@ 
 					case 'button': case 'buttononly': case 'taglist-thumbnail':
 						break;
 					case 'radio':
-						if (!is_array($widgets[$widget->id])) $widgets[$widget->id] = [];
+						if (!is_array($widgets[$widget->id]))
+						{
+							$widgets[$widget->id] = [];
+						}
 						$label = (string)$widget->attrs['label'];
 						// translate "{something} {else}" type options
 						if (strpos($label, '{') !== false)
@@ -1433,7 +1494,10 @@ 
 						break;
 					// config templates have options in the template
 					case 'option':
-						if (!is_array($widgets[$last_select])) $widgets[$last_select] = [];
+						if (!is_array($widgets[$last_select]))
+						{
+							$widgets[$last_select] = [];
+						}
 						$label = (string)$widget->attrs['#text'];
 						// translate "{something} {else}" type options
 						if (strpos($label, '{') !== false)