EGroupware / egroupware

addressbook/inc/class.addressbook_ui.inc.php

Spacing +411 added lines, -417 removed lines

@@ -79,7 +79,7 @@ 
 	 *
 	 * @param string $contact_app
 	 */
-	function __construct($contact_app='addressbook')
+	function __construct($contact_app = 'addressbook')
 	{
 		parent::__construct($contact_app);
 
@@ -92,23 +92,23 @@ 
 		);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','addressbook')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit', 'addressbook')) Api\Hooks::read(true);
 
-		$this->config =& $GLOBALS['egw_info']['server'];
+		$this->config = & $GLOBALS['egw_info']['server'];
 
 		// check if a contact specific export limit is set, if yes use it also for etemplate's csv export
-		$this->config['export_limit'] = $this->config['contact_export_limit'] = Api\Storage\Merge::getExportLimit($app='addressbook');
+		$this->config['export_limit'] = $this->config['contact_export_limit'] = Api\Storage\Merge::getExportLimit($app = 'addressbook');
 
 		if ($this->config['copy_fields'] && ($fields = is_array($this->config['copy_fields']) ?
 			$this->config['copy_fields'] : unserialize($this->config['copy_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',$fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $fields))
 			{
 				$fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $fields))
 			{
 				$fields[] = 'adr_two_countrycode';
 			}
@@ -124,7 +124,7 @@ 
 	 * @param string $msg =null	message to show
 	 * @param boolean $do_email =false do an email-selection popup or the regular index-page
 	 */
-	function index($_content=null,$msg=null,$do_email=false)
+	function index($_content = null, $msg = null, $do_email = false)
 	{
 		//echo "<p>uicontacts::index(".print_r($_content,true).",'$msg')</p>\n";
 		if (($re_submit = is_array($_content)))
@@ -156,16 +156,16 @@ 
 				else
 				{
 					$success = $failed = $action_msg = null;
-					if ($this->action($_content['nm']['action'],$_content['nm']['selected'],$_content['nm']['select_all'],
-						$success,$failed,$action_msg,$_content['do_email'] ? 'email' : 'index',$msg,$_content['nm']['checkboxes']))
+					if ($this->action($_content['nm']['action'], $_content['nm']['selected'], $_content['nm']['select_all'],
+						$success, $failed, $action_msg, $_content['do_email'] ? 'email' : 'index', $msg, $_content['nm']['checkboxes']))
 					{
-						$msg .= lang('%1 contact(s) %2',$success,$action_msg);
+						$msg .= lang('%1 contact(s) %2', $success, $action_msg);
 						Framework::message($msg);
 					}
-					elseif(is_null($msg))
+					elseif (is_null($msg))
 					{
-						$msg .= lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-						Framework::message($msg,'error');
+						$msg .= lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+						Framework::message($msg, 'error');
 					}
 					$msg = '';
 				}
@@ -185,9 +185,9 @@ 
 			}
 			$typeselection = $_content['nm']['col_filter']['tid'];
 		}
-		elseif($_GET['add_list'])
+		elseif ($_GET['add_list'])
 		{
-			$list = $this->add_list($_GET['add_list'],$_GET['owner']?$_GET['owner']:$this->user);
+			$list = $this->add_list($_GET['add_list'], $_GET['owner'] ? $_GET['owner'] : $this->user);
 			if ($list === true)
 			{
 				$msg = lang('List already exists!');
@@ -206,7 +206,7 @@ 
 		);
 		$to = $_content['nm']['to'];
 		$content = array();
-		if($msg || $_GET['msg'])
+		if ($msg || $_GET['msg'])
 		{
 			Framework::message($msg ? $msg : $_GET['msg']);
 		}
@@ -215,23 +215,23 @@ 
 		if (!is_array($content['nm']))
 		{
 			$content['nm'] = array(
-				'get_rows'       =>	'addressbook.addressbook_ui.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-				'bottom_too'     => false,		// I  show the nextmatch-line (arrows, filters, search, ...) again after the rows
-				'never_hide'     => True,		// I  never hide the nextmatch-line if less then maxmatch entrie
-				'start'          =>	0,			// IO position in list
-				'cat_id'         =>	'',			// IO category, if not 'no_cat' => True
-				'search'         =>	'',			// IO search pattern
-				'order'          =>	'n_family',	// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'ASC',		// IO direction of the sort: 'ASC' or 'DESC'
-				'col_filter'     =>	array(),	// IO array of column-name value pairs (optional for the filterheaders)
+				'get_rows'       =>	'addressbook.addressbook_ui.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+				'bottom_too'     => false, // I  show the nextmatch-line (arrows, filters, search, ...) again after the rows
+				'never_hide'     => True, // I  never hide the nextmatch-line if less then maxmatch entrie
+				'start'          =>	0, // IO position in list
+				'cat_id'         =>	'', // IO category, if not 'no_cat' => True
+				'search'         =>	'', // IO search pattern
+				'order'          =>	'n_family', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
+				'col_filter'     =>	array(), // IO array of column-name value pairs (optional for the filterheaders)
 				//'cat_id_label' => lang('Categories'),
 				//'filter_label' => lang('Addressbook'),	// I  label for filter    (optional)
-				'filter'         =>	'',	// =All	// IO filter, if not 'no_filter' => True
-				'filter_no_lang' => True,		// I  set no_lang for filter (=dont translate the options)
-				'no_filter2'     => True,		// I  disable the 2. filter (params are the same as for filter)
+				'filter'         =>	'', // =All	// IO filter, if not 'no_filter' => True
+				'filter_no_lang' => True, // I  set no_lang for filter (=dont translate the options)
+				'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
 				//'filter2_label'=>	lang('Distribution lists'),			// IO filter2, if not 'no_filter2' => True
-				'filter2'        =>	'',			// IO filter2, if not 'no_filter2' => True
-				'filter2_no_lang'=> True,		// I  set no_lang for filter2 (=dont translate the options)
+				'filter2'        =>	'', // IO filter2, if not 'no_filter2' => True
+				'filter2_no_lang'=> True, // I  set no_lang for filter2 (=dont translate the options)
 				'lettersearch'   => true,
 				'do_email'       => $do_email ? 1 : 0,
 				// using a positiv list now, as we constantly adding new columns in addressbook, but not removing them from default
@@ -241,7 +241,7 @@ 
 				/* old negative list
 				'default_cols'   => '!cat_id,contact_created_contact_modified,distribution_list,contact_id,owner,room',*/
 				'filter2_onchange' => "return app.addressbook.filter2_onchange();",
-				'manual'         => $do_email ? ' ' : false,	// space for the manual icon
+				'manual'         => $do_email ? ' ' : false, // space for the manual icon
 				//'actions'        => $this->get_actions(),		// set on each request, as it depends on some filters
 				'row_id'         => 'id',
 				'row_modified'   => 'modified',
@@ -258,13 +258,13 @@ 
 			// use the state of the last session stored in the user prefs
 			if (($state = @unserialize($this->prefs[$do_email ? 'email_state' : 'index_state'])))
 			{
-				$content['nm'] = array_merge($content['nm'],$state);
+				$content['nm'] = array_merge($content['nm'], $state);
 			}
 		}
 		$sel_options['cat_id'] = array('' => lang('All categories'), '0' => lang('None'));
 
 		// Edit and delete list actions depends on permissions
-		if($this->get_lists(Acl::EDIT))
+		if ($this->get_lists(Acl::EDIT))
 		{
 			$content['nm']['placeholder_actions'][] = 'rename_list';
 			$content['nm']['placeholder_actions'][] = 'delete_list';
@@ -277,11 +277,11 @@ 
 		if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection;
 		// save the tid for use in creating new addressbook entrys via UI. Current tid is to be used as type of new entrys
 		//error_log(__METHOD__.__LINE__.' '.$content['nm']['col_filter']['tid']);
-		Api\Cache::setSession('addressbook','active_tid',$content['nm']['col_filter']['tid']);
+		Api\Cache::setSession('addressbook', 'active_tid', $content['nm']['col_filter']['tid']);
 		if ($this->lists_available())
 		{
-			$sel_options['filter2'] = $this->get_lists(Acl::READ,array('' => lang('No distribution list')));
-			$sel_options['filter2']['add'] = lang('Add a new list').'...';	// put it at the end
+			$sel_options['filter2'] = $this->get_lists(Acl::READ, array('' => lang('No distribution list')));
+			$sel_options['filter2']['add'] = lang('Add a new list').'...'; // put it at the end
 		}
 		if ($do_email)
 		{
@@ -299,7 +299,7 @@ 
 			$content['nm']['header_left'] = 'addressbook.email.left';
 		}
 		// Organisation stuff is not (yet) availible with ldap
-		elseif($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
+		elseif ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
 		{
 			$content['nm']['header_left'] = 'addressbook.index.left';
 		}
@@ -312,12 +312,12 @@ 
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('No country selected');
 
 		// if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export
-		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit'];
+		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit'] = $this->config['contact_export_limit'];
 
 		// dont show tid-selection if we have only one content_type
 		// be a bit more sophisticated about it
 		$availabletypes = array_keys($this->content_types);
-		if ($content['nm']['col_filter']['tid'] && !in_array($content['nm']['col_filter']['tid'],$availabletypes))
+		if ($content['nm']['col_filter']['tid'] && !in_array($content['nm']['col_filter']['tid'], $availabletypes))
 		{
 			//_debug_array(array('Typefilter:'=> $content['nm']['col_filter']['tid'],'Available Types:'=>$availabletypes,'action:'=>'remove invalid filter'));
 			unset($content['nm']['col_filter']['tid']);
@@ -325,7 +325,7 @@ 
 		if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0];
 		if (count($this->content_types) > 1)
 		{
-			foreach($this->content_types as $tid => $data)
+			foreach ($this->content_types as $tid => $data)
 			{
 				$sel_options['tid'][$tid] = $data['name'];
 			}
@@ -343,22 +343,22 @@ 
 
 		$content['nm']['actions'] = $this->get_actions($content['nm']['col_filter']['tid'], $content['nm']['org_view']);
 
-		if (!isset($sel_options['org_view'][(string) $content['nm']['org_view']]))
+		if (!isset($sel_options['org_view'][(string)$content['nm']['org_view']]))
 		{
 			$sel_options['org_view'] += $this->_get_org_name((string)$content['nm']['org_view']);
 		}
 		// unset the filters regarding organisations, when there is no organisation selected
-		if (empty($sel_options['org_view'][(string) $content['nm']['org_view']]) || stripos($org_view,":") === false )
+		if (empty($sel_options['org_view'][(string)$content['nm']['org_view']]) || stripos($org_view, ":") === false)
 		{
 			unset($content['nm']['col_filter']['org_name']);
 			unset($content['nm']['col_filter']['org_unit']);
 			unset($content['nm']['col_filter']['adr_one_locality']);
 		}
-		$content['nm']['org_view_label'] = $sel_options['org_view'][(string) $content['nm']['org_view']];
+		$content['nm']['org_view_label'] = $sel_options['org_view'][(string)$content['nm']['org_view']];
 
 		$this->tmpl->read($do_email ? 'addressbook.email' : 'addressbook.index');
 		return $this->tmpl->exec($do_email ? 'addressbook.addressbook_ui.emailpopup' : 'addressbook.addressbook_ui.index',
-			$content,$sel_options,array(),$preserv,$do_email ? 2 : 0);
+			$content, $sel_options, array(), $preserv, $do_email ? 2 : 0);
 	}
 
 	/**
@@ -367,7 +367,7 @@ 
 	 * @param string $tid_filter =null
 	 * @return array see Etemplate\Widget\Nextmatch::get_actions()
 	 */
-	public function get_actions($tid_filter=null)
+	public function get_actions($tid_filter = null)
 	{
 		// Contact view
 		$actions = array(
@@ -375,7 +375,7 @@ 
 				'caption' => 'CRM-View',
 				'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] != '~edit~',
 				'allowOnMultiple' => false,
-				'group' => $group=1,
+				'group' => $group = 1,
 				'onExecute' => 'javaScript:app.addressbook.view',
 				'disableClass' => 'contact_organisation',
 				'hideOnDisabled' => true,
@@ -418,14 +418,14 @@ 
 		);
 		// CRM view options
 		$crm_count = 0;
-		$crm_apps = array('infolog','tracker');
-		foreach($crm_apps as $app)
+		$crm_apps = array('infolog', 'tracker');
+		foreach ($crm_apps as $app)
 		{
 			if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
 		}
-		if($crm_count > 1)
+		if ($crm_count > 1)
 		{
-			foreach($crm_apps as $app)
+			foreach ($crm_apps as $app)
 			{
 				$actions['view']['children']["view-$app"] = array(
 					'caption' => $app,
@@ -440,7 +440,7 @@ 
 				'caption' => 'View',
 				'default' => true,
 				'allowOnMultiple' => false,
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'contact_contact',
 				'hideOnDisabled' => true
 			),
@@ -455,23 +455,23 @@ 
 			),
 		);
 
-		++$group;	// other AB related stuff group: lists, AB's, categories
+		++$group; // other AB related stuff group: lists, AB's, categories
 		// categories submenu
 		$actions['cat'] = array(
 			'caption' => 'Categories',
 			'group' => $group,
 			'children' => array(
 				'cat_add' => Etemplate\Widget\Nextmatch::category_action(
-					'addressbook',$group,'Add category', 'cat_add_',
-					true, 0,Etemplate\Widget\Nextmatch::DEFAULT_MAX_MENU_LENGTH,false
-				)+array(
+					'addressbook', $group, 'Add category', 'cat_add_',
+					true, 0, Etemplate\Widget\Nextmatch::DEFAULT_MAX_MENU_LENGTH, false
+				) + array(
 					'icon' => 'foldertree_nolines_plus',
 					'disableClass' => 'rowNoEdit',
 				),
 				'cat_del' => Etemplate\Widget\Nextmatch::category_action(
-					'addressbook',$group,'Delete category', 'cat_del_',
-					true, 0,Etemplate\Widget\Nextmatch::DEFAULT_MAX_MENU_LENGTH,false
-				)+array(
+					'addressbook', $group, 'Delete category', 'cat_del_',
+					true, 0, Etemplate\Widget\Nextmatch::DEFAULT_MAX_MENU_LENGTH, false
+				) + array(
 					'icon' => 'foldertree_nolines_minus',
 					'disableClass' => 'rowNoEdit',
 				),
@@ -498,7 +498,7 @@ 
 					'children' => $add_lists,
 					'prefix' => 'to_list_',
 					'icon' => 'foldertree_nolines_plus',
-					'enabled' => ($add_lists?true:false), // if there are editable lists, allow to add a contact to one of them,
+					'enabled' => ($add_lists ? true : false), // if there are editable lists, allow to add a contact to one of them,
 					//'disableClass' => 'rowNoEdit',	  // wether you are allowed to edit the contact or not, as you alter a list, not the contact
 				),
 				'remove_from_list' => array(
@@ -507,14 +507,14 @@ 
 					'icon' => 'foldertree_nolines_minus',
 					'enabled' => 'javaScript:app.addressbook.nm_compare_field',
 					'fieldId' => 'exec[nm][filter2]',
-					'fieldValue' => '!',	// enable if list != ''
+					'fieldValue' => '!', // enable if list != ''
 				),
 				'rename_list' => array(
 					'caption' => 'Rename selected distribution list',
 					'icon' => 'edit',
 					'enabled' => 'javaScript:app.addressbook.nm_compare_field',
 					'fieldId' => 'exec[nm][filter2]',
-					'fieldValue' => '!',	// enable if list != ''
+					'fieldValue' => '!', // enable if list != ''
 					'onExecute' => 'javaScript:app.addressbook.rename_list'
 				),
 				'delete_list' => array(
@@ -523,10 +523,10 @@ 
 					'icon' => 'delete',
 					'enabled' => 'javaScript:app.addressbook.nm_compare_field',
 					'fieldId' => 'exec[nm][filter2]',
-					'fieldValue' => '!',	// enable if list != ''
+					'fieldValue' => '!', // enable if list != ''
 				),
 			);
-			if(is_subclass_of('etemplate', 'etemplate_new'))
+			if (is_subclass_of('etemplate', 'etemplate_new'))
 			{
 				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
 				$actions['lists']['children']['rename_list']['fieldId'] = 'filter2';
@@ -536,18 +536,18 @@ 
 		// move to AB
 		if (($move2addressbooks = $this->get_addressbooks(Acl::ADD)))	// do we have addressbooks, we should
 		{
-			unset($move2addressbooks[0]);	// do not offer action to move contact to an account, as we dont support that currrently
-			foreach($move2addressbooks as $owner => $label)
+			unset($move2addressbooks[0]); // do not offer action to move contact to an account, as we dont support that currrently
+			foreach ($move2addressbooks as $owner => $label)
 			{
 				$icon = $type_label = null;
-				$this->type_icon((int)$owner, substr($owner,-1) == 'p', 'n', $icon, $type_label);
+				$this->type_icon((int)$owner, substr($owner, -1) == 'p', 'n', $icon, $type_label);
 				$move2addressbooks[$owner] = array(
 					'icon' => $icon,
 					'caption' => $label,
 				);
 			}
 			// copy checkbox
-			$move2addressbooks= array(
+			$move2addressbooks = array(
 				'copy' =>array(
 					'id' => 'move_to_copy',
 					'caption' => 'Copy instead of move',
@@ -571,7 +571,7 @@ 
 			'hideOnMobile' => true
 		);
 
-		++$group;	// integration with other apps: infolog, calendar, filemanager
+		++$group; // integration with other apps: infolog, calendar, filemanager
 		if ($GLOBALS['egw_info']['user']['apps']['infolog'])
 		{
 			$actions['infolog_app'] = array(
@@ -591,7 +591,7 @@ 
 						'icon' => 'new',
 						'url' => 'menuaction=infolog.infolog_ui.edit&type=task&action=addressbook&action_id=$id',
 						'popup' => Link::get_registry('infolog', 'add_popup'),
-						'onExecute' => 'javaScript:app.addressbook.add_task',	// call server for org-view only
+						'onExecute' => 'javaScript:app.addressbook.add_task', // call server for org-view only
 					),
 				),
 				'hideOnMobile' => true
@@ -608,7 +608,7 @@ 
 						'caption' => 'Show',
 						'icon' => 'view',
 						'onExecute' => 'javaScript:app.addressbook.view_calendar',
-						'targetapp' => 'calendar',	// open in calendar tab,
+						'targetapp' => 'calendar', // open in calendar tab,
 						'hideOnDisabled' => true,
 					),
 					'calendar_add' => array(
@@ -687,7 +687,7 @@ 
 			'caption' => 'GeoLocation',
 			'icon' => 'map',
 			'group' => ++$group,
-			'children' => array (
+			'children' => array(
 				'private' => array(
 					'caption' => 'Private Address',
 					'enabled' => 'javaScript:app.addressbook.geoLocation_enabled',
@@ -704,7 +704,7 @@ 
 		);
 		// check if user is an admin or the export is not generally turned off (contact_export_limit is non-numerical, eg. no)
 		$exception = Api\Storage\Merge::is_export_limit_excepted();
-		if ((isset($GLOBALS['egw_info']['user']['apps']['admin']) || $exception)  || !$this->config['contact_export_limit'] || (int)$this->config['contact_export_limit'])
+		if ((isset($GLOBALS['egw_info']['user']['apps']['admin']) || $exception) || !$this->config['contact_export_limit'] || (int)$this->config['contact_export_limit'])
 		{
 			$actions['export'] = array(
 				'caption' => 'Export',
@@ -719,7 +719,7 @@ 
 					),
 					'vcard'  => array(
 						'caption' => 'Export as VCard',
-						'postSubmit' => true,	// download needs post submit (not Ajax) to work
+						'postSubmit' => true, // download needs post submit (not Ajax) to work
 						'icon' => Vfs::mime_icon('text/vcard'),
 					),
 				),
@@ -731,7 +731,7 @@ 
 			$this->prefs['document_dir'], $group, 'Insert in document', 'document_',
 			$this->prefs['default_document'], $this->config['contact_export_limit']
 		);
-		if (isset($GLOBALS['egw_info']['apps']['stylite']) && ($GLOBALS['egw_info']['user']['apps']['felamimail']||$GLOBALS['egw_info']['user']['apps']['mail']))
+		if (isset($GLOBALS['egw_info']['apps']['stylite']) && ($GLOBALS['egw_info']['user']['apps']['felamimail'] || $GLOBALS['egw_info']['user']['apps']['mail']))
 		{
 			$actions['mail'] = array(
 				'caption' => lang('Mail VCard'),
@@ -754,7 +754,7 @@ 
 				'disableClass' => 'rowNoDelete',
 			);
 		}
-		if ($this->grants[0] & Acl::DELETE)
+		if ($this->grants[0]&Acl::DELETE)
 		{
 			$actions['delete_account'] = array(
 				'caption' => 'Delete',
@@ -767,7 +767,7 @@ 
 			);
 			$actions['delete']['hideOnDisabled'] = true;
 		}
-		if($tid_filter == 'D')
+		if ($tid_filter == 'D')
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',
@@ -778,7 +778,7 @@ 
 		}
 		if (isset($actions['export']['children']['csv']) &&
 			(!isset($GLOBALS['egw_info']['user']['apps']['importexport']) ||
-			!importexport_helper_functions::has_definitions('addressbook','export')))
+			!importexport_helper_functions::has_definitions('addressbook', 'export')))
 		{
 			unset($actions['export']['children']['csv']);
 		}
@@ -811,13 +811,13 @@ 
 	private function _get_org_name($org)
 	{
 		$org_name = array();
-		if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
-		foreach(explode('|||',$org) as $part)
+		if (strpos($org, '*AND*') !== false) $org = str_replace('*AND*', '&', $org);
+		foreach (explode('|||', $org) as $part)
 		{
-			list(,$name) = explode(':',$part,2);
+			list(,$name) = explode(':', $part, 2);
 			if ($name) $org_name[] = $name;
 		}
-		$name = implode(': ',$org_name);
+		$name = implode(': ', $org_name);
 		return $name ? array($org => $name) : array();
 	}
 
@@ -827,12 +827,12 @@ 
 	 * @param array $content =null submitted content
 	 * @param string $msg =null	message to show
 	 */
-	function emailpopup($content=null,$msg=null)
+	function emailpopup($content = null, $msg = null)
 	{
-		if (strpos($GLOBALS['egw_info']['flags']['java_script'],'addEmail') === false)
+		if (strpos($GLOBALS['egw_info']['flags']['java_script'], 'addEmail') === false)
 		{
 			$handler = 'opener.addEmail(to,email)';
-			$GLOBALS['egw_info']['flags']['java_script'].= "
+			$GLOBALS['egw_info']['flags']['java_script'] .= "
 <script>
 window.egw_LAB.wait(function() {
 	window.focus();
@@ -862,7 +862,7 @@ 
 </script>
 ";
 		}
-		return $this->index($content,$msg,true);
+		return $this->index($content, $msg, true);
 	}
 
 	/**
@@ -876,19 +876,19 @@ 
 	{
 		$org_contacts = array();
 		$query = !$_query ? Api\Cache::getSession('addressbook', 'index') : $_query;
-		$query['num_rows'] = -1;	// all
-		if(!is_array($query['col_filter'])) $query['col_filter'] = array();
+		$query['num_rows'] = -1; // all
+		if (!is_array($query['col_filter'])) $query['col_filter'] = array();
 
-		if(!is_array($org)) $org = array($org);
-		foreach($org as $org_name)
+		if (!is_array($org)) $org = array($org);
+		foreach ($org as $org_name)
 		{
 			$query['org_view'] = $org_name;
 			$checked = array();
 			$readonlys = null;
-			$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
-			if($checked[0])
+			$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
+			if ($checked[0])
 			{
-				$org_contacts = array_merge($org_contacts,$checked);
+				$org_contacts = array_merge($org_contacts, $checked);
 			}
 		}
 		Api\Json\Response::get()->data(array_unique($org_contacts));
@@ -902,33 +902,33 @@ 
 	function infolog_org_view($org)
 	{
 		$query = Api\Cache::getSession('addressbook', 'index');
-		$query['num_rows'] = -1;	// all
+		$query['num_rows'] = -1; // all
 		$query['org_view'] = $org;
 		$query['searchletter'] = '';
 		$checked = $readonlys = null;
-		$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+		$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
 
 		if (count($checked) > 1)	// use a nicely formatted org-name as title in infolog
 		{
 			$parts = array();
-			if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
-			foreach(explode('|||',$org) as $part)
+			if (strpos($org, '*AND*') !== false) $org = str_replace('*AND*', '&', $org);
+			foreach (explode('|||', $org) as $part)
 			{
-				list(,$part) = explode(':',$part,2);
+				list(,$part) = explode(':', $part, 2);
 				if ($part) $parts[] = $part;
 			}
-			$org = implode(', ',$parts);
+			$org = implode(', ', $parts);
 		}
 		else
 		{
-			$org = '';	// use infolog default of link-title
+			$org = ''; // use infolog default of link-title
 		}
-		Egw::redirect_link('/index.php',array(
+		Egw::redirect_link('/index.php', array(
 			'menuaction' => 'infolog.infolog_ui.index',
 			'action' => 'addressbook',
-			'action_id' => implode(',',$checked),
+			'action_id' => implode(',', $checked),
 			'action_title' => $org,
-		),'infolog');
+		), 'infolog');
 	}
 
 	/**
@@ -953,31 +953,31 @@ 
 			$owner = $this->default_addressbook;
 		}
 		// Check for valid list & permissions
-		if(!(int)$list_id && !$this->check_list(null,EGW_ACL_ADD|EGW_ACL_EDIT,$owner))
+		if (!(int)$list_id && !$this->check_list(null, EGW_ACL_ADD|EGW_ACL_EDIT, $owner))
 		{
-			Api\Json\Response::get()->apply('egw.message', array(  lang('List creation failed, no rights!'),'error'));
+			Api\Json\Response::get()->apply('egw.message', array(lang('List creation failed, no rights!'), 'error'));
 			return;
 		}
 		if ((int)$list_id && !$this->check_list((int)$list_id, Acl::EDIT, $owner))
 		{
-			Api\Json\Response::get()->apply('egw.message', array(  lang('Insufficent rights to edit this list!'),'error'));
+			Api\Json\Response::get()->apply('egw.message', array(lang('Insufficent rights to edit this list!'), 'error'));
 			return;
 		}
 
 		$list = array('list_owner' => $owner);
 
 		// Rename
-		if($list_id)
+		if ($list_id)
 		{
 			$list = $this->read_list((int)$list_id);
 		}
 		$list['list_name'] = $new_name;
 
-		$new_id = $this->add_list(array('list_id' => (int)$list_id), $list['list_owner'],array(),$list);
+		$new_id = $this->add_list(array('list_id' => (int)$list_id), $list['list_owner'], array(), $list);
 
-		if($contacts)
+		if ($contacts)
 		{
-			$this->add2list($contacts,$new_id);
+			$this->add2list($contacts, $new_id);
 		}
 		Api\Json\Response::get()->apply('egw.message', array(
 			$new_id == $list_id ? lang('Distribution list renamed') : lang('List created'),
@@ -992,7 +992,7 @@ 
 	 *
 	 * @param string $account_id
 	 */
-	function ajax_get_contact ($account_id)
+	function ajax_get_contact($account_id)
 	{
 		$bo = new Api\Contacts();
 		$contact = $bo->read('account:'.$account_id);
@@ -1009,7 +1009,7 @@ 
 	{
 		$query = Api\Cache::getSession('addressbook', 'index');
 		unset($query['advanced_search']);
-		Api\Cache::setSession('addressbook','index',$query);
+		Api\Cache::setSession('addressbook', 'index', $query);
 		Api\Cache::setSession('addressbook', 'advanced_search', false);
 	}
 
@@ -1025,78 +1025,78 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg, $checkboxes = NULL)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg, $checkboxes = NULL)
 	{
 		//echo "<p>uicontacts::action('$action',".print_r($checked,true).','.(int)$use_all.",...)</p>\n";
 		$success = $failed = 0;
-		if ($use_all || in_array($action,array('remove_from_list','delete_list')))
+		if ($use_all || in_array($action, array('remove_from_list', 'delete_list')))
 		{
 			// get the whole selection
 			$query = is_array($session_name) ? $session_name : Api\Cache::getSession('addressbook', $session_name);
 
 			if ($use_all)
 			{
-				@set_time_limit(0);			// switch off the execution time limit, as it's for big selections to small
-				$query['num_rows'] = -1;	// all
+				@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+				$query['num_rows'] = -1; // all
 				$readonlys = null;
-				$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+				$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
 			}
 		}
 		// replace org_name:* id's with all id's of that org
 		$org_contacts = array();
-		foreach((array)$checked as $n => $id)
+		foreach ((array)$checked as $n => $id)
 		{
-			if (substr($id,0,9) == 'org_name:')
+			if (substr($id, 0, 9) == 'org_name:')
 			{
 				if (count($checked) == 1 && !count($org_contacts) && $action == 'infolog')
 				{
-					return $this->infolog_org_view($id);	// uses the org-name, instead of 'selected contacts'
+					return $this->infolog_org_view($id); // uses the org-name, instead of 'selected contacts'
 				}
 				unset($checked[$n]);
 				$query = Api\Cache::getSession('addressbook', $session_name);
-				$query['num_rows'] = -1;	// all
+				$query['num_rows'] = -1; // all
 				$query['org_view'] = $id;
 				unset($query['filter2']);
 				$extra = $readonlys = null;
-				$this->get_rows($query,$extra,$readonlys,true);	// true = only return the id's
-				if ($extra[0]) $org_contacts = array_merge($org_contacts,$extra);
+				$this->get_rows($query, $extra, $readonlys, true); // true = only return the id's
+				if ($extra[0]) $org_contacts = array_merge($org_contacts, $extra);
 			}
 		}
-		if ($org_contacts) $checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		if ($org_contacts) $checked = array_unique($checked ? array_merge($checked, $org_contacts) : $org_contacts);
 		//_debug_array($checked); exit;
 
-		if (substr($action,0,8) == 'move_to_')
+		if (substr($action, 0, 8) == 'move_to_')
 		{
-			$action = (int)substr($action,8).(substr($action,-1) == 'p' ? 'p' : '');
+			$action = (int)substr($action, 8).(substr($action, -1) == 'p' ? 'p' : '');
 		}
-		elseif (substr($action,0,8) == 'to_list_')
+		elseif (substr($action, 0, 8) == 'to_list_')
 		{
-			$to_list = (int)substr($action,8);
+			$to_list = (int)substr($action, 8);
 			$action = 'to_list';
 		}
-		elseif (substr($action,0,9) == 'document_')
+		elseif (substr($action, 0, 9) == 'document_')
 		{
-			$document = substr($action,9);
+			$document = substr($action, 9);
 			$action = 'document';
 		}
-		elseif(substr($action,0,4) == 'cat_')	// cat_add_123 or cat_del_456
+		elseif (substr($action, 0, 4) == 'cat_')	// cat_add_123 or cat_del_456
 		{
 			$cat_id = (int)substr($action, 8);
-			$action = substr($action,0,7);
+			$action = substr($action, 0, 7);
 		}
 		// Security: stop non-admins to export more then the configured number of contacts
-		if (in_array($action,array('csv','vcard')) && $this->config['contact_export_limit'] && !Api\Storage\Merge::is_export_limit_excepted() &&
+		if (in_array($action, array('csv', 'vcard')) && $this->config['contact_export_limit'] && !Api\Storage\Merge::is_export_limit_excepted() &&
 			(!is_numeric($this->config['contact_export_limit']) || count($checked) > $this->config['contact_export_limit']))
 		{
 			$action_msg = lang('exported');
 			$failed = count($checked);
 			return false;
 		}
-		switch($action)
+		switch ($action)
 		{
 			case 'vcard':
 				$action_msg = lang('exported');
-				$vcard = new addressbook_vcal('addressbook','text/vcard');
+				$vcard = new addressbook_vcal('addressbook', 'text/vcard');
 				$vcard->export($checked);
 				// does not return!
 				$Ok = false;
@@ -1104,10 +1104,10 @@ 
 
 			case 'merge':
 				$error_msg = null;
-				$success = $this->merge($checked,$error_msg);
+				$success = $this->merge($checked, $error_msg);
 				$failed = count($checked) - (int)$success;
 				$action_msg = lang('merged');
-				$checked = array();	// to not start the single actions
+				$checked = array(); // to not start the single actions
 				break;
 
 			case 'delete_list':
@@ -1115,7 +1115,7 @@ 
 				{
 					$msg = lang('You need to select a distribution list');
 				}
-				elseif($this->delete_list($query['filter2']) === false)
+				elseif ($this->delete_list($query['filter2']) === false)
 				{
 					$msg = lang('Insufficent rights to delete this list!');
 				}
@@ -1135,49 +1135,49 @@ 
 				return false;
 
 			case 'infolog_add':
-				Framework::popup(Egw::link('/index.php',array(
+				Framework::popup(Egw::link('/index.php', array(
 						'menuaction' => 'infolog.infolog_ui.edit',
 						'type' => 'task',
 						'action' => 'addressbook',
-						'action_id' => implode(',',$checked),
-					)),'_blank',Link::get_registry('infolog', 'add_popup'));
-				$msg = '';	// no message, as we send none in javascript too and users sees opening popup
+						'action_id' => implode(',', $checked),
+					)), '_blank', Link::get_registry('infolog', 'add_popup'));
+				$msg = ''; // no message, as we send none in javascript too and users sees opening popup
 				return false;
 
 			case 'calendar_add':	// add appointment for org-views, other views are handled directly in javascript
-				Framework::popup(Egw::link('/index.php',array(
+				Framework::popup(Egw::link('/index.php', array(
 						'menuaction' => 'calendar.calendar_uiforms.edit',
-						'participants' => 'c'.implode(',c',$checked),
-					)),'_blank',Link::get_registry('calendar', 'add_popup'));
-				$msg = '';	// no message, as we send none in javascript too and users sees opening popup
+						'participants' => 'c'.implode(',c', $checked),
+					)), '_blank', Link::get_registry('calendar', 'add_popup'));
+				$msg = ''; // no message, as we send none in javascript too and users sees opening popup
 				return false;
 
 			case 'calendar_view':	// show calendar for org-views, although all views are handled directly in javascript
-				Egw::redirect_link('/index.php',array(
+				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'calendar.calendar_uiviews.index',
-					'owner' => 'c'.implode(',c',$checked),
+					'owner' => 'c'.implode(',c', $checked),
 				));
 		}
-		foreach($checked as $id)
+		foreach ($checked as $id)
 		{
-			switch($action)
+			switch ($action)
 			{
 				case 'cat_add':
 				case 'cat_del':
-					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::EDIT,$contact)))
+					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::EDIT, $contact)))
 					{
 						$action_msg = $action == 'cat_add' ? lang('categorie added') : lang('categorie delete');
-						$cat_ids = $contact['cat_id'] ? explode(',', $contact['cat_id']) : array();   //existing Api\Categories
+						$cat_ids = $contact['cat_id'] ? explode(',', $contact['cat_id']) : array(); //existing Api\Categories
 						if ($action == 'cat_add')
 						{
 							$cat_ids[] = $cat_id;
 							$cat_ids = array_unique($cat_ids);
 						}
-						elseif ((($key = array_search($cat_id,$cat_ids))) !== false)
+						elseif ((($key = array_search($cat_id, $cat_ids))) !== false)
 						{
 							unset($cat_ids[$key]);
 						}
-						$ids = $cat_ids ? implode(',',$cat_ids) : null;
+						$ids = $cat_ids ? implode(',', $cat_ids) : null;
 						if ($ids !== $contact['cat_id'])
 						{
 							$contact['cat_id'] = $ids;
@@ -1188,10 +1188,10 @@ 
 
 				case 'delete':
 					$action_msg = lang('deleted');
-					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::DELETE,$contact)))
+					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::DELETE, $contact)))
 					{
-						if ($contact['owner'] ||	// regular contact or
-							empty($contact['account_id']) ||	// accounts without account_id
+						if ($contact['owner'] || // regular contact or
+							empty($contact['account_id']) || // accounts without account_id
 							// already deleted account (should no longer happen, but needed to allow for cleanup)
 							$contact['tid'] == self::DELETED_TYPE)
 						{
@@ -1200,7 +1200,7 @@ 
 						// delete single account --> redirect to admin
 						elseif (count($checked) == 1 && $contact['account_id'])
 						{
-							Egw::redirect_link('/index.php',array(
+							Egw::redirect_link('/index.php', array(
 								'menuaction' => 'admin.admin_account.delete',
 								'account_id' => $contact['account_id'],
 							));
@@ -1262,7 +1262,7 @@ 
 					}
 					else
 					{
-						$Ok = $this->remove_from_list($id,$query['filter2']) !== false;
+						$Ok = $this->remove_from_list($id, $query['filter2']) !== false;
 					}
 					break;
 
@@ -1275,28 +1275,28 @@ 
 					}
 					else
 					{
-						$Ok = $this->add2list($id,$to_list) !== false;
+						$Ok = $this->add2list($id, $to_list) !== false;
 					}
 					break;
 
 				default:	// move to an other addressbook
-					if (!(int)$action || !($this->grants[(string) (int) $action] & Acl::EDIT))	// might be ADD in the future
+					if (!(int)$action || !($this->grants[(string)(int)$action]&Acl::EDIT))	// might be ADD in the future
 					{
 						return false;
 					}
 					if (!$checkboxes['move_to_copy'])
 					{
 						$action_msg = lang('moved');
-						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::DELETE,$contact)))
+						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::DELETE, $contact)))
 						{
 							if (!$contact['owner'])		// no (mass-)move of Api\Accounts
 							{
 								$Ok = false;
 							}
-							elseif ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action,-1) == 'p'))
+							elseif ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action, -1) == 'p'))
 							{
-								$contact['owner'] = (int) $action;
-								$contact['private'] = (int)(substr($action,-1) == 'p');
+								$contact['owner'] = (int)$action;
+								$contact['private'] = (int)(substr($action, -1) == 'p');
 								$Ok = $this->save($contact);
 							}
 						}
@@ -1304,14 +1304,14 @@ 
 					else
 					{
 						$action_msg = lang('copied');
-						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::READ,$contact)))
+						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::READ, $contact)))
 						{
-							if ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action,-1) == 'p'))
+							if ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action, -1) == 'p'))
 							{
-								$this->copy_contact($contact, false);	// do NOT use self::$copy_fields, copy everything but uid etc.
+								$this->copy_contact($contact, false); // do NOT use self::$copy_fields, copy everything but uid etc.
 								$links = $contact['link_to']['to_id'];
-								$contact['owner'] = (int) $action;
-								$contact['private'] = (int)(substr($action,-1) == 'p');
+								$contact['owner'] = (int)$action;
+								$contact['private'] = (int)(substr($action, -1) == 'p');
 								$Ok = $this->save($contact);
 								if ($Ok && is_array($links))
 								{
@@ -1343,22 +1343,22 @@ 
 	 * @param boolean $only_copy_fields =true true: only copy fields configured for copying (eg. no name),
 	 *		false: copy everything, but never to copy fields
 	 */
-	function copy_contact(array &$content, $only_copy_fields=true)
+	function copy_contact(array &$content, $only_copy_fields = true)
 	{
 		$content['link_to']['to_id'] = 0;
-		Link::link('addressbook',$content['link_to']['to_id'],'addressbook',$content['id'],
-			lang('Copied by %1, from record #%2.',Api\Accounts::format_username('',
-			$GLOBALS['egw_info']['user']['account_firstname'],$GLOBALS['egw_info']['user']['account_lastname']),
+		Link::link('addressbook', $content['link_to']['to_id'], 'addressbook', $content['id'],
+			lang('Copied by %1, from record #%2.', Api\Accounts::format_username('',
+			$GLOBALS['egw_info']['user']['account_firstname'], $GLOBALS['egw_info']['user']['account_lastname']),
 			$content['id']));
 		// create a new contact with the content of the old
-		foreach(array_keys($content) as $key)
+		foreach (array_keys($content) as $key)
 		{
-			if($only_copy_fields && !in_array($key, self::$copy_fields) || in_array($key, array('id','etag','carddav_name','uid')))
+			if ($only_copy_fields && !in_array($key, self::$copy_fields) || in_array($key, array('id', 'etag', 'carddav_name', 'uid')))
 			{
 				unset($content[$key]);
 			}
 		}
-		if(!isset($content['owner']))
+		if (!isset($content['owner']))
 		{
 			$content['owner'] = $this->default_private ? $this->user.'p' : $this->default_addressbook;
 		}
@@ -1376,7 +1376,7 @@ 
 	 * @param boolean $id_only =false if true only return (via $rows) an array of contact-ids, dont save state to session
 	 * @return int total number of contacts matching the selection
 	 */
-	function get_rows(&$query,&$rows,&$readonlys,$id_only=false)
+	function get_rows(&$query, &$rows, &$readonlys, $id_only = false)
 	{
 		$do_email = $query['do_email'];
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
@@ -1385,7 +1385,7 @@ 
 		{
 			$store_query = $query;
 			// Do not store these
-			foreach(array('options-cat_id','actions','action_links','placeholder_actions') as $key)
+			foreach (array('options-cat_id', 'actions', 'action_links', 'placeholder_actions') as $key)
 			{
 				unset($store_query[$key]);
 			}
@@ -1396,22 +1396,22 @@ 
 		{
 			$old_state = Api\Cache::getSession('addressbook', $what);
 		}
-		if (!isset($this->org_views[(string) $query['org_view']]) || strpos($query['org_view'],':') === false)   // we dont have an org view, unset the according col_filters
+		if (!isset($this->org_views[(string)$query['org_view']]) || strpos($query['org_view'], ':') === false)   // we dont have an org view, unset the according col_filters
 		{
 			if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
 			if (isset($query['col_filter']['adr_one_locality'])) unset($query['col_filter']['adr_one_locality']);
 			if (isset($query['col_filter']['org_unit'])) unset($query['col_filter']['org_unit']);
 		}
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view, reset the advanced search
+		if (isset($this->org_views[(string)$query['org_view']]))	// we have an org view, reset the advanced search
 		{
 			//_debug_array(array('Search'=>$query['search'],
 			//	'AdvancedSearch'=>$query['advanced_search']));
 			//if (is_array($query['search'])) unset($query['search']);
 			//unset($query['advanced_search']);
-			if(!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
+			if (!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
 		}
-		elseif(!$query['search'] && array_key_exists('advanced_search',$old_state))	// eg. paging in an advanced search
+		elseif (!$query['search'] && array_key_exists('advanced_search', $old_state))	// eg. paging in an advanced search
 		{
 			$query['advanced_search'] = $old_state['advanced_search'];
 		}
@@ -1422,11 +1422,11 @@ 
 		}*/
 
 		// Make sure old lettersearch filter doesn't stay - current letter filter will be added later
-		foreach($query['col_filter'] as $key => $col_filter)
+		foreach ($query['col_filter'] as $key => $col_filter)
 		{
-			if(!is_numeric($key)) continue;
-			if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
-				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/',$col_filter) == 1
+			if (!is_numeric($key)) continue;
+			if (preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
+				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/', $col_filter) == 1
 			)
 			{
 				unset($query['col_filter'][$key]);
@@ -1441,16 +1441,16 @@ 
 			{
 				if ($old_state['filter'] === '0')	// user changed to org_view
 				{
-					$query['filter'] = '';			// --> change filter to all contacts
+					$query['filter'] = ''; // --> change filter to all contacts
 				}
 				else								// user changed to accounts
 				{
-					$query['org_view'] = '';		// --> change to regular contacts view
+					$query['org_view'] = ''; // --> change to regular contacts view
 				}
 			}
 			if ($query['org_view'] && isset($this->org_views[$old_state['org_view']]) && !isset($this->org_views[$query['org_view']]))
 			{
-				$query['searchletter'] = '';		// reset lettersearch if viewing the contacts of one organisation
+				$query['searchletter'] = ''; // reset lettersearch if viewing the contacts of one organisation
 			}
 			// save the state of the index in the user prefs
 			$state = serialize(array(
@@ -1463,9 +1463,9 @@ 
 			));
 			if ($state != $this->prefs[$what.'_state'] && !$query['csv_export'])
 			{
-				$GLOBALS['egw']->preferences->add('addressbook',$what.'_state',$state);
+				$GLOBALS['egw']->preferences->add('addressbook', $what.'_state', $state);
 				// save prefs, but do NOT invalid the cache (unnecessary)
-				$GLOBALS['egw']->preferences->save_repository(false,'user',false);
+				$GLOBALS['egw']->preferences->save_repository(false, 'user', false);
 			}
 		}
 		unset($old_state);
@@ -1480,11 +1480,11 @@ 
 		}
 		if ($query['filter'] !== '')	// not all addressbooks
 		{
-			$query['col_filter']['owner'] = (string) (int) $query['filter'];
+			$query['col_filter']['owner'] = (string)(int)$query['filter'];
 
 			if ($this->private_addressbook)
 			{
-				$query['col_filter']['private'] = substr($query['filter'],-1) == 'p' ? 1 : 0;
+				$query['col_filter']['private'] = substr($query['filter'], -1) == 'p' ? 1 : 0;
 			}
 		}
 		else
@@ -1494,7 +1494,7 @@ 
 		}
 		if ((int)$query['filter2'])	// not no distribution list
 		{
-			$query['col_filter']['list'] = (string) (int) $query['filter2'];
+			$query['col_filter']['list'] = (string)(int)$query['filter2'];
 		}
 		else
 		{
@@ -1507,18 +1507,18 @@ 
 		// all backends allow now at least to use groups as distribution lists
 		$query['no_filter2'] = false;
 
-		if (isset($this->org_views[(string) $query['org_view']]) && !$query['col_filter']['parent_id'])	// we have an org view
+		if (isset($this->org_views[(string)$query['org_view']]) && !$query['col_filter']['parent_id'])	// we have an org view
 		{
 			// Query doesn't like empties
 			unset($query['col_filter']['parent_id']);
 
-			if($query['actions'] && $query['actions']['open'])
+			if ($query['actions'] && $query['actions']['open'])
 			{
 				// Just switched from contact view, update actions
 				$query['actions'] = $this->get_actions($query['col_filter']['tid'], $query['org_view']);
 			}
-			unset($query['col_filter']['list']);	// does not work together
-			$query['no_filter2'] = true;			// switch the distribution list selection off
+			unset($query['col_filter']['list']); // does not work together
+			$query['no_filter2'] = true; // switch the distribution list selection off
 
 			$query['template'] = 'addressbook.index.org_rows';
 
@@ -1556,7 +1556,7 @@ 
 			{
 				$query['template'] = $do_email ? 'addressbook.email.rows' : 'addressbook.index.rows';
 			}
-			if($query['col_filter']['parent_id'])
+			if ($query['col_filter']['parent_id'])
 			{
 				$query['org_view'] = $query['col_filter']['parent_id'];
 				$query['template'] = 'addressbook.index.org_rows';
@@ -1565,25 +1565,25 @@ 
 			unset($query['col_filter']['parent_id']);
 			if ($query['org_view'])	// view the contacts of one organisation only
 			{
-				if (strpos($query['org_view'],'*AND*') !== false) $query['org_view'] = str_replace('*AND*','&',$query['org_view']);
-				foreach(explode('|||',$query['org_view']) as $part)
+				if (strpos($query['org_view'], '*AND*') !== false) $query['org_view'] = str_replace('*AND*', '&', $query['org_view']);
+				foreach (explode('|||', $query['org_view']) as $part)
 				{
-					list($name,$value) = explode(':',$part,2);
+					list($name, $value) = explode(':', $part, 2);
 					// do NOT set invalid column, as this gives an SQL error ("AND AND" in sql)
-					if (in_array($name, array('org_name','org_unit','adr_one_location')))
+					if (in_array($name, array('org_name', 'org_unit', 'adr_one_location')))
 					{
 						$query['col_filter'][$name] = $value;
 					}
 				}
 			}
-			else if($query['actions'] && !$query['actions']['edit'])
+			else if ($query['actions'] && !$query['actions']['edit'])
 			{
 				// Just switched from org view, update actions
 				$query['actions'] = $this->get_actions($query['col_filter']['tid'], $query['org_view']);
 			}
 			// translate the select order to the really used over all 3 columns
 			$sort = $query['sort'];
-			switch($query['order'])		// "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end
+			switch ($query['order'])		// "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end
 			{							// we don't exclude them, as the total would otherwise depend on the order-criteria
 				case 'org_name':
 					$order = "egw_addressbook.org_name<>''DESC,egw_addressbook.org_name $sort,n_family $sort,n_given $sort";
@@ -1617,8 +1617,8 @@ 
 			}
 			if ($query['searchletter'])	// only show contacts if the order-criteria starts with the given letter
 			{
-				$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created','contact_modified');
-				$query['col_filter'][] = (in_array($query['order'],$no_letter_search) ? 'org_name' : (substr($query['order'],0,1)=='#'?'':'egw_addressbook.').$query['order']).' '.
+				$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created', 'contact_modified');
+				$query['col_filter'][] = (in_array($query['order'], $no_letter_search) ? 'org_name' : (substr($query['order'], 0, 1) == '#' ? '' : 'egw_addressbook.').$query['order']).' '.
 					$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.$GLOBALS['egw']->db->quote(strtolower($query['searchletter']).'%');
 			}
 			$wildcard = '%';
@@ -1632,41 +1632,41 @@ 
 				unset($query['advanced_search']['meth_select']);
 			}
 			//if ($do_email ) $email_only = array('id','owner','tid','n_fn','n_family','n_given','org_name','email','email_home');
-			$rows = parent::search($query['advanced_search'] ? $query['advanced_search'] : $query['search'],$id_only,
-				$order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']);
+			$rows = parent::search($query['advanced_search'] ? $query['advanced_search'] : $query['search'], $id_only,
+				$order, '', $wildcard, false, $op, array((int)$query['start'], (int)$query['num_rows']), $query['col_filter']);
 
 			// do we need to read the custom fields, depends on the column is enabled and customfields exist
 			// $query['csv_export'] allways needs to read ALL cf's
 			$columsel = $this->prefs['nextmatch-addressbook.'.($do_email ? 'email' : 'index').'.rows'];
-			$available_distib_lists=$this->get_lists(Acl::READ);
-			$columselection = $columsel && !$query['csv_export'] ? explode(',',$columsel) : array();
+			$available_distib_lists = $this->get_lists(Acl::READ);
+			$columselection = $columsel && !$query['csv_export'] ? explode(',', $columsel) : array();
 			$ids = $calendar_participants = array();
 			if (!$id_only && $rows)
 			{
-				$show_custom_fields = (!$columselection || in_array('customfields',$columselection) || $query['csv_export']) && $this->customfields;
-				$show_calendar = !$columselection || in_array('calendar_calendar',$columselection);
-				$show_distributionlist = !$columselection || in_array('distrib_lists',$columselection) || count($available_distib_lists);
+				$show_custom_fields = (!$columselection || in_array('customfields', $columselection) || $query['csv_export']) && $this->customfields;
+				$show_calendar = !$columselection || in_array('calendar_calendar', $columselection);
+				$show_distributionlist = !$columselection || in_array('distrib_lists', $columselection) || count($available_distib_lists);
 				if ($show_calendar || $show_custom_fields || $show_distributionlist)
 				{
-					foreach($rows as $val)
+					foreach ($rows as $val)
 					{
 						$ids[] = $val['id'];
 						$calendar_participants[$val['id']] = $val['account_id'] ? $val['account_id'] : 'c'.$val['id'];
 					}
 					if ($show_custom_fields)
 					{
-						foreach($columselection as $col)
+						foreach ($columselection as $col)
 						{
-							if ($col[0] == '#') $selected_cfs[] = substr($col,1);
+							if ($col[0] == '#') $selected_cfs[] = substr($col, 1);
 						}
-						$customfields = $this->read_customfields($ids,$selected_cfs);
+						$customfields = $this->read_customfields($ids, $selected_cfs);
 					}
 					if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($calendar_participants);
 					// distributionlist memership for the entrys
 					//_debug_array($this->get_lists(Acl::EDIT));
 					if ($show_distributionlist && $available_distib_lists)
 					{
-						$distributionlist = $this->read_distributionlist($ids,array_keys($available_distib_lists));
+						$distributionlist = $this->read_distributionlist($ids, array_keys($available_distib_lists));
 					}
 				}
 			}
@@ -1675,20 +1675,20 @@ 
 
 		if ($id_only)
 		{
-			foreach($rows as $n => $row)
+			foreach ($rows as $n => $row)
 			{
 				$rows[$n] = $row['id'];
 			}
-			return $this->total;	// no need to set other fields or $readonlys
+			return $this->total; // no need to set other fields or $readonlys
 		}
 		$order = $query['order'];
 
 		$readonlys = array();
-		foreach($rows as $n => &$row)
+		foreach ($rows as $n => &$row)
 		{
 			$given = $row['n_given'] ? $row['n_given'] : ($row['n_prefix'] ? $row['n_prefix'] : '');
 
-			switch($order)
+			switch ($order)
 			{
 				default:	// postalcode, created, modified, ...
 				case 'org_name':
@@ -1705,38 +1705,38 @@ 
 					break;
 				case 'n_fileas':
 					if (!$row['n_fileas']) $row['n_fileas'] = $this->fileas($row);
-					list($row['line1'],$row['line2']) = explode(': ',$row['n_fileas']);
+					list($row['line1'], $row['line2']) = explode(': ', $row['n_fileas']);
 					break;
 			}
-			if (isset($this->org_views[(string) $query['org_view']]))
+			if (isset($this->org_views[(string)$query['org_view']]))
 			{
 				$row['type'] = 'home';
 				$row['type_label'] = lang('Organisation');
 
-				if ($query['filter'] && !($this->grants[(int)$query['filter']] & Acl::DELETE))
+				if ($query['filter'] && !($this->grants[(int)$query['filter']]&Acl::DELETE))
 				{
 					$row['class'] .= 'rowNoDelete ';
 				}
-				$row['class'] .= 'rowNoEdit ';	// no edit in OrgView
+				$row['class'] .= 'rowNoEdit '; // no edit in OrgView
 				$row['class'] .= 'contact_organisation ';
 			}
 			else
 			{
-				$this->type_icon($row['owner'],$row['private'],$row['tid'],$row['type'],$row['type_label']);
+				$this->type_icon($row['owner'], $row['private'], $row['tid'], $row['type'], $row['type_label']);
 
-				static $tel2show = array('tel_work','tel_cell','tel_home','tel_fax');
+				static $tel2show = array('tel_work', 'tel_cell', 'tel_home', 'tel_fax');
 				static $prefer_marker = null;
 				if (is_null($prefer_marker))
 				{
 					// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
 					$prefer_marker = html_entity_decode(' &#9734;', ENT_NOQUOTES, 'utf-8');
 				}
-				foreach($tel2show as $name)
+				foreach ($tel2show as $name)
 				{
-					$row[$name] .= ' '.($row['tel_prefer'] == $name ? $prefer_marker : '');		// .' ' to NOT remove the field
+					$row[$name] .= ' '.($row['tel_prefer'] == $name ? $prefer_marker : ''); // .' ' to NOT remove the field
 				}
 				// allways show the prefered phone, if not already shown
-				if (!in_array($row['tel_prefer'],$tel2show) && $row[$row['tel_prefer']])
+				if (!in_array($row['tel_prefer'], $tel2show) && $row[$row['tel_prefer']])
 				{
 					$row['tel_prefered'] = $row[$row['tel_prefer']].$prefer_marker;
 				}
@@ -1744,33 +1744,33 @@ 
 				{
 					$row['class'] .= 'rowAccount rowNoDelete ';
 				}
-				elseif (!$this->check_perms(Acl::DELETE,$row) || (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge' && $query['col_filter']['tid'] == self::DELETED_TYPE))
+				elseif (!$this->check_perms(Acl::DELETE, $row) || (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge' && $query['col_filter']['tid'] == self::DELETED_TYPE))
 				{
 					$row['class'] .= 'rowNoDelete ';
 				}
-				if (!$this->check_perms(Acl::EDIT,$row))
+				if (!$this->check_perms(Acl::EDIT, $row))
 				{
 					$row['class'] .= 'rowNoEdit ';
 				}
 				$row['class'] .= 'contact_contact ';
 
-				unset($row['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+				unset($row['jpegphoto']); // unused and messes up json encoding (not utf-8)
 
 				if (isset($customfields[$row['id']]))
 				{
-					foreach($this->customfields as $name => $data)
+					foreach ($this->customfields as $name => $data)
 					{
 						$row['#'.$name] = $customfields[$row['id']]['#'.$name];
 					}
 				}
 				if (isset($distributionlist[$row['id']]))
 				{
-					$row['distrib_lists'] = implode("\n",array_values($distributionlist[$row['id']]));
+					$row['distrib_lists'] = implode("\n", array_values($distributionlist[$row['id']]));
 					//if ($show_distributionlist) $readonlys['distrib_lists'] =true;
 				}
 				if (isset($calendar[$calendar_participants[$row['id']]]))
 				{
-					foreach($calendar[$calendar_participants[$row['id']]] as $name => $data)
+					foreach ($calendar[$calendar_participants[$row['id']]] as $name => $data)
 					{
 						$row[$name] = $data;
 					}
@@ -1778,13 +1778,13 @@ 
 			}
 
 			// hide region for address format 'postcode_city'
-			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']);
-			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']);
+			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname'])) == 'postcode_city') unset($row['adr_one_region']);
+			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname'])) == 'postcode_city') unset($row['adr_two_region']);
 
 			// respect category permissions
-			if(!empty($row['cat_id']))
+			if (!empty($row['cat_id']))
 			{
-				$row['cat_id'] = $this->categories->check_list(Acl::READ,$row['cat_id']);
+				$row['cat_id'] = $this->categories->check_list(Acl::READ, $row['cat_id']);
 			}
 		}
 		$rows['no_distribution_list'] = (bool)$query['filter2'];
@@ -1800,23 +1800,21 @@ 
 		$header = array();
 		if ($query['filter'] !== '' && !isset($this->org_views[$query['org_view']]))
 		{
-			$header[] = ($query['filter'] == '0' ? lang('accounts') :
-				($GLOBALS['egw']->accounts->get_type($query['filter']) == 'g' ?
-					lang('Group %1',$GLOBALS['egw']->accounts->id2name($query['filter'])) :
-					Api\Accounts::username((int)$query['filter']).
-						(substr($query['filter'],-1) == 'p' ? ' ('.lang('private').')' : '')));
+			$header[] = ($query['filter'] == '0' ? lang('accounts') : ($GLOBALS['egw']->accounts->get_type($query['filter']) == 'g' ?
+					lang('Group %1', $GLOBALS['egw']->accounts->id2name($query['filter'])) : Api\Accounts::username((int)$query['filter']).
+						(substr($query['filter'], -1) == 'p' ? ' ('.lang('private').')' : '')));
 		}
 		if ($query['org_view'])
 		{
 			$header[] = $query['org_view_label'];
 			// Make sure option is there
-			if(!array_key_exists($query['org_view'], $this->org_views))
+			if (!array_key_exists($query['org_view'], $this->org_views))
 			{
 				$this->org_views += $this->_get_org_name($query['org_view']);
 				$rows['sel_options']['org_view'] = $this->org_views;
 			}
 		}
-		if($query['advanced_search'])
+		if ($query['advanced_search'])
 		{
 			$header[] = lang('Advanced search');
 		}
@@ -1827,11 +1825,11 @@ 
 		if ($query['searchletter'])
 		{
 			$order = $order == 'n_given' ? lang('first name') : ($order == 'n_family' ? lang('last name') : lang('Organisation'));
-			$header[] = lang("%1 starts with '%2'",$order,$query['searchletter']);
+			$header[] = lang("%1 starts with '%2'", $order, $query['searchletter']);
 		}
 		if ($query['search'] && !$query['advanced_search']) // do not add that, if we have advanced search active
 		{
-			$header[] = lang("Search for '%1'",$query['search']);
+			$header[] = lang("Search for '%1'", $query['search']);
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $header);
 
@@ -1847,7 +1845,7 @@ 
 	 * @param string &$icon icon-name
 	 * @param string &$label translated label
 	 */
-	function type_icon($owner,$private,$tid,&$icon,&$label)
+	function type_icon($owner, $private, $tid, &$icon, &$label)
 	{
 		if (!$owner)
 		{
@@ -1862,7 +1860,7 @@ 
 		elseif ($GLOBALS['egw']->accounts->get_type($owner) == 'g')
 		{
 			$icon = 'group';
-			$label = lang('group %1',$GLOBALS['egw']->accounts->id2name($owner));
+			$label = lang('group %1', $GLOBALS['egw']->accounts->id2name($owner));
 		}
 		else
 		{
@@ -1870,9 +1868,9 @@ 
 			$label = $owner == $this->user ? lang('personal') : Api\Accounts::username($owner);
 		}
 		// show tid icon for tid!='n' AND only if one is defined
-		if ($tid != 'n' && Api\Image::find('addressbook',$this->content_types[$tid]['name']))
+		if ($tid != 'n' && Api\Image::find('addressbook', $this->content_types[$tid]['name']))
 		{
-			$icon = Api\Image::find('addressbook',$this->content_types[$tid]['name']);
+			$icon = Api\Image::find('addressbook', $this->content_types[$tid]['name']);
 		}
 
 		// Legacy - from when icons could be anywhere
@@ -1890,19 +1888,19 @@ 
 	* @param int $_GET['contact_id'] contact_id mainly for popup use
 	* @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
 	*/
-	function edit($content=null)
+	function edit($content = null)
 	{
 		if (is_array($content))
 		{
 			list($button) = @each($content['button']);
 			unset($content['button']);
-			$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
-			$content['owner'] = (string) (int) $content['owner'];
+			$content['private'] = (int)($content['owner'] && substr($content['owner'], -1) == 'p');
+			$content['owner'] = (string)(int)$content['owner'];
 			$content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $content['cat_id_tree'] : $content['cat_id'];
 			if ($this->config['private_cf_tab']) $content = (array)$content['private_cfs'] + $content;
 			unset($content['private_cfs']);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
@@ -1918,7 +1916,7 @@ 
 					}
 					if (is_array($content['upload_photo']) && !empty($content['upload_photo']['tmp_name']) &&
 						$content['upload_photo']['tmp_name'] != 'none' &&
-						($f = fopen($content['upload_photo']['tmp_name'],'r')))
+						($f = fopen($content['upload_photo']['tmp_name'], 'r')))
 					{
 						$content['jpegphoto'] = $this->resize_photo($f);
 						fclose($f);
@@ -1935,12 +1933,12 @@ 
 						$old_org_entry = $this->read($content['id']);
 						$old_fullname = ($old_org_entry['n_fn'] ? $old_org_entry['n_fn'] : parent::fullname($old_org_entry));
 					}
-					if ( $content['n_fn'] != $fullname ||  $fullname != $old_fullname)
+					if ($content['n_fn'] != $fullname || $fullname != $old_fullname)
 					{
 						unset($content['n_fn']);
 					}
 					// Country codes
-					foreach(array('adr_one', 'adr_two') as $c_prefix)
+					foreach (array('adr_one', 'adr_two') as $c_prefix)
 					{
 						if ($content[$c_prefix.'_countrycode'] == '-custom-')
 						{
@@ -1949,7 +1947,7 @@ 
 					}
 					$content['msg'] = '';
 					$this->error = false;
-					foreach((array)$content['pre_save_callbacks'] as $callback)
+					foreach ((array)$content['pre_save_callbacks'] as $callback)
 					{
 						try {
 							if (($success_msg = call_user_func_array($callback, array(&$content))))
@@ -1959,7 +1957,7 @@ 
 						}
 						catch (Exception $ex) {
 							$content['msg'] .= ($content['msg'] ? ', ' : '').$ex->getMessage();
-							$button = 'apply';	// do not close dialog
+							$button = 'apply'; // do not close dialog
 							$this->error = true;
 							break;
 						}
@@ -1972,7 +1970,7 @@ 
 					{
 						$content['msg'] .= ($content['msg'] ? ', ' : '').lang('Contact saved');
 
-						foreach((array)$content['post_save_callbacks'] as $callback)
+						foreach ((array)$content['post_save_callbacks'] as $callback)
 						{
 							try {
 								if (($success_msg = call_user_func_array($callback, array(&$content))))
@@ -1980,58 +1978,58 @@ 
 									$content['msg'] .= ', '.$success_msg;
 								}
 							}
-							catch(Api\Exception\Redirect $r)
+							catch (Api\Exception\Redirect $r)
 							{
 								// catch it to continue execution and rethrow it later
 							}
 							catch (Exception $ex) {
 								$content['msg'] .= ', '.$ex->getMessage();
-								$button = 'apply';	// do not close dialog
+								$button = 'apply'; // do not close dialog
 								$this->error = true;
 								break;
 							}
 						}
 
-						if ($content['change_org'] && $old_org_entry && ($changed = $this->changed_fields($old_org_entry,$content,true)) &&
-							($members = $this->org_similar($old_org_entry['org_name'],$changed)))
+						if ($content['change_org'] && $old_org_entry && ($changed = $this->changed_fields($old_org_entry, $content, true)) &&
+							($members = $this->org_similar($old_org_entry['org_name'], $changed)))
 						{
 							//foreach($changed as $name => $old_value) echo "<p>$name: '$old_value' --> '{$content[$name]}'</p>\n";
-							list($changed_members,$changed_fields,$failed_members) = $this->change_org($old_org_entry['org_name'],$changed,$content,$members);
+							list($changed_members, $changed_fields, $failed_members) = $this->change_org($old_org_entry['org_name'], $changed, $content, $members);
 							if ($changed_members)
 							{
-								$content['msg'] .= ', '.lang('%1 fields in %2 other organisation member(s) changed',$changed_fields,$changed_members);
+								$content['msg'] .= ', '.lang('%1 fields in %2 other organisation member(s) changed', $changed_fields, $changed_members);
 							}
 							if ($failed_members)
 							{
-								$content['msg'] .= ', '.lang('failed to change %1 organisation member(s) (insufficent rights) !!!',$failed_members);
+								$content['msg'] .= ', '.lang('failed to change %1 organisation member(s) (insufficent rights) !!!', $failed_members);
 							}
 						}
 					}
-					elseif($this->error === true)
+					elseif ($this->error === true)
 					{
 						$content['msg'] = lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-								htmlspecialchars(Egw::link('/index.php',array(
+							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+								htmlspecialchars(Egw::link('/index.php', array(
 									'menuaction' => 'addressbook.addressbook_ui.edit',
 									'contact_id' => $content['id'],
-								))).'">','</a>');
-						break;	// dont refresh the list
+								))).'">', '</a>');
+						break; // dont refresh the list
 					}
 					else
 					{
 						$content['msg'] = lang('Error saving the contact !!!').
 							($this->error ? ' '.$this->error : '');
-						$button = 'apply';	// to not leave the dialog
+						$button = 'apply'; // to not leave the dialog
 					}
 					// writing links for new entry, existing ones are handled by the widget itself
 					if ($links && $content['id'])
 					{
-						Link::link('addressbook',$content['id'],$links);
+						Link::link('addressbook', $content['id'], $links);
 					}
 					// Update client side global datastore
 					$response = Api\Json\Response::get();
 					$response->generic('data', array('uid' => 'addressbook::'.$content['id'], 'data' => $content));
-					Framework::refresh_opener($content['msg'], 'addressbook', $content['id'],  $content['id'] ? 'edit' : 'add',
+					Framework::refresh_opener($content['msg'], 'addressbook', $content['id'], $content['id'] ? 'edit' : 'add',
 						null, null, null, $this->error ? 'error' : 'success');
 
 					// re-throw redirect exception, if there's no error
@@ -2053,11 +2051,11 @@ 
 
 				case 'delete':
 					$success = $failed = $action_msg = null;
-					if($this->action('delete',array($content['id']),false,$success,$failed,$action_msg,'',$content['msg']))
+					if ($this->action('delete', array($content['id']), false, $success, $failed, $action_msg, '', $content['msg']))
 					{
 						if ($GLOBALS['egw']->currentapp == 'addressbook')
 						{
-							Framework::refresh_opener(lang('Contact deleted'), 'addressbook', $content['id'], 'delete' );
+							Framework::refresh_opener(lang('Contact deleted'), 'addressbook', $content['id'], 'delete');
 							Framework::window_close();
 						}
 						else
@@ -2082,7 +2080,7 @@ 
 			// new contact --> set some defaults
 			if ($contact_id && is_array($content = $this->read($contact_id)))
 			{
-				$contact_id = $content['id'];	// it could have been: "account:$account_id"
+				$contact_id = $content['id']; // it could have been: "account:$account_id"
 				if (!$this->check_perms(Acl::EDIT, $content))
 				{
 					$view = true;
@@ -2126,52 +2124,52 @@ 
 				{
 					$content['owner'] = (string)$state['filter'];
 				}
-				$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
-				if ($content['owner'] === '' || !($this->grants[$content['owner'] = (string) (int) $content['owner']] & Acl::ADD))
+				$content['private'] = (int)($content['owner'] && substr($content['owner'], -1) == 'p');
+				if ($content['owner'] === '' || !($this->grants[$content['owner'] = (string)(int)$content['owner']]&Acl::ADD))
 				{
 					$content['owner'] = $this->default_addressbook;
 					$content['private'] = (int)$this->default_private;
 
-					if (!($this->grants[$content['owner'] = (string) (int) $content['owner']] & Acl::ADD))
+					if (!($this->grants[$content['owner'] = (string)(int)$content['owner']]&Acl::ADD))
 					{
-						$content['owner'] = (string) $this->user;
+						$content['owner'] = (string)$this->user;
 						$content['private'] = 0;
 					}
 				}
 				$new_type = array_keys($this->content_types);
 				// fetch active type to preset the type, if param typeid is not passed
-				$active_tid = Api\Cache::getSession('addressbook','active_tid');
+				$active_tid = Api\Cache::getSession('addressbook', 'active_tid');
 				if ($active_tid && strtoupper($active_tid) === 'D') unset($active_tid);
-				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid?$active_tid:$new_type[0]);
-				foreach($this->get_contact_columns() as $field)
+				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid ? $active_tid : $new_type[0]);
+				foreach ($this->get_contact_columns() as $field)
 				{
 					if ($_GET['presets'][$field])
 					{
-						if ($field=='email'||$field=='email_home')
+						if ($field == 'email' || $field == 'email_home')
 						{
-							$singleAddress = imap_rfc822_parse_adrlist($_GET['presets'][$field],'');
+							$singleAddress = imap_rfc822_parse_adrlist($_GET['presets'][$field], '');
 							//error_log(__METHOD__.__LINE__.' Address:'.$singleAddress[0]->mailbox."@".$singleAddress[0]->host.", ".$singleAddress[0]->personal);
-							if (!(!is_array($singleAddress) || count($singleAddress)<1))
+							if (!(!is_array($singleAddress) || count($singleAddress) < 1))
 							{
 								$content[$field] = $singleAddress[0]->mailbox."@".$singleAddress[0]->host;
 								if (!empty($singleAddress[0]->personal))
 								{
-									if (strpos($singleAddress[0]->personal,',')===false)
+									if (strpos($singleAddress[0]->personal, ',') === false)
 									{
-										list($P_n_given,$P_n_family,$P_org_name)=explode(' ',$singleAddress[0]->personal,3);
-										if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+										list($P_n_given, $P_n_family, $P_org_name) = explode(' ', $singleAddress[0]->personal, 3);
+										if (strlen(trim($P_n_given)) > 0) $content['n_given'] = trim($P_n_given);
+										if (strlen(trim($P_n_family)) > 0) $content['n_family'] = trim($P_n_family);
+										if (strlen(trim($P_org_name)) > 0) $content['org_name'] = trim($P_org_name);
 									}
 									else
 									{
-										list($P_n_family,$P_other)=explode(',',$singleAddress[0]->personal,2);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_other))>0)
+										list($P_n_family, $P_other) = explode(',', $singleAddress[0]->personal, 2);
+										if (strlen(trim($P_n_family)) > 0) $content['n_family'] = trim($P_n_family);
+										if (strlen(trim($P_other)) > 0)
 										{
-											list($P_n_given,$P_org_name)=explode(',',$P_other,2);
-											if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-											if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+											list($P_n_given, $P_org_name) = explode(',', $P_other, 2);
+											if (strlen(trim($P_n_given)) > 0) $content['n_given'] = trim($P_n_given);
+											if (strlen(trim($P_org_name)) > 0) $content['org_name'] = trim($P_org_name);
 										}
 									}
 								}
@@ -2189,13 +2187,13 @@ 
 				}
 				if (isset($_GET['presets']))
 				{
-					foreach(array('email','email_home','n_family','n_given','org_name') as $field)
+					foreach (array('email', 'email_home', 'n_family', 'n_given', 'org_name') as $field)
 					{
 						if (!empty($content[$field]))
 						{
 							//Set the presets fields in content in order to be able to use them later in client side for checking duplication only on first time load
 							// after save/apply we unset them
-							$content['presets_fields'][]= $field;
+							$content['presets_fields'][] = $field;
 							break;
 						}
 					}
@@ -2207,12 +2205,12 @@ 
 				//_debug_array($content);
 			}
 
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']); // dont allow HTML!
 
-			if($content && $_GET['makecp'])	// copy the contact
+			if ($content && $_GET['makecp'])	// copy the contact
 			{
 				$this->copy_contact($content);
-				$content['msg'] = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('addressbook','entry')));
+				$content['msg'] = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('addressbook', 'entry')));
 				$view = false;
 			}
 			else
@@ -2223,12 +2221,12 @@ 
 			if (!$contact_id && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
 			{
 				$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+				foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// gard against XSS
 					{
-						Link::link('addressbook',$content['link_to']['to_id'],$link_app,$link_id);
+						Link::link('addressbook', $content['link_to']['to_id'], $link_app, $link_id);
 					}
 				}
 			}
@@ -2236,8 +2234,8 @@ 
 		if ($content['id'])
 		{
 			// last and next calendar date
-			list(,$dates) = each($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
-			if(is_array($dates)) $content += $dates;
+			list(,$dates) = each($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']), false));
+			if (is_array($dates)) $content += $dates;
 		}
 
 		// Registry has view_id as contact_id, so set it (custom fields uses it)
@@ -2248,7 +2246,7 @@ 
 
 		// Avoid setting conflicts with private custom fields
 		$content['private_cfs'] = array();
-		foreach(Api\Storage\Customfields::get('addressbook', true) as $name => $cf)
+		foreach (Api\Storage\Customfields::get('addressbook', true) as $name => $cf)
 		{
 			if ($this->config['private_cf_tab'] && $cf['private'] && isset($content['#'.$name]))
 			{
@@ -2265,7 +2263,7 @@ 
 		$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);
 
 		//_debug_array($content);
-		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(Acl::DELETE,$content);
+		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(Acl::DELETE, $content);
 		$readonlys['button[copy]'] = $readonlys['button[edit]'] = $readonlys['button[vcard]'] = true;
 		$readonlys['button[save]'] = $readonlys['button[apply]'] = $view;
 		if ($view)
@@ -2277,19 +2275,18 @@ 
 		$sel_options['fileas_type'] = $this->fileas_options($content);
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('Custom');
 		$sel_options['owner'] = $this->get_addressbooks(Acl::ADD);
-		if ($content['owner']) unset($sel_options['owner'][0]);	// do not offer to switch to accounts, as we do not support moving contacts to accounts
-		if ((string) $content['owner'] !== '')
+		if ($content['owner']) unset($sel_options['owner'][0]); // do not offer to switch to accounts, as we do not support moving contacts to accounts
+		if ((string)$content['owner'] !== '')
 		{
 			if (!isset($sel_options['owner'][(int)$content['owner']]))
 			{
-				$sel_options['owner'][(int)$content['owner']] = !$content['owner'] ? lang('Accounts') :
-					Api\Accounts::username($content['owner']);
+				$sel_options['owner'][(int)$content['owner']] = !$content['owner'] ? lang('Accounts') : Api\Accounts::username($content['owner']);
 			}
-			$readonlys['owner'] = !$content['owner'] || 		// dont allow to move accounts, as this mean deleting the user incl. all content he owns
-				$content['id'] && !$this->check_perms(Acl::DELETE,$content);	// you need delete rights to move an existing contact into an other addressbook
+			$readonlys['owner'] = !$content['owner'] || // dont allow to move accounts, as this mean deleting the user incl. all content he owns
+				$content['id'] && !$this->check_perms(Acl::DELETE, $content); // you need delete rights to move an existing contact into an other addressbook
 		}
 		// set the unsupported fields from the backend to readonly
-		foreach($this->get_fields('unsupported',$content['id'],$content['owner']) as $field)
+		foreach ($this->get_fields('unsupported', $content['id'], $content['owner']) as $field)
 		{
 			$readonlys[$field] = true;
 		}
@@ -2299,7 +2296,7 @@ 
 			$readonlys['__ALL__'] = true;
 			$readonlys['button[cancel]'] = false;
 
-			foreach($this->own_account_acl as $field)
+			foreach ($this->own_account_acl as $field)
 			{
 				$readonlys[$field] = false;
 			}
@@ -2315,9 +2312,9 @@ 
 		if (isset($readonlys['n_fileas'])) $readonlys['fileas_type'] = $readonlys['n_fileas'];
 		// disable not needed tabs
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
-		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts;
+		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'], $content['owner']) == $this->so_accounts;
 		$readonlys['tabs']['custom_private'] = $readonlys['tabs']['custom'] || !$this->config['private_cf_tab'] ? '__ALL__' : false;
-		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
+		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists']; #false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
 		if (!$content['id']) $readonlys['button[delete]'] = !$content['id'];
@@ -2329,7 +2326,7 @@ 
 		{
 			$this->_set_readonlys_for_own_account_acl($readonlys, $content['id']);
 		}
-		for($i = -23; $i<=23; $i++)
+		for ($i = -23; $i <= 23; $i++)
 		{
 			$tz[$i] = ($i > 0 ? '+' : '').$i;
 		}
@@ -2337,11 +2334,11 @@ 
 		$content['tz'] = $content['tz'] ? $content['tz'] : '0';
 		if (count($this->content_types) > 1)
 		{
-			foreach($this->content_types as $type => $data)
+			foreach ($this->content_types as $type => $data)
 			{
 				$sel_options['tid'][$type] = $data['name'];
 			}
-			$content['typegfx'] = Api\Html::image('addressbook',$this->content_types[$content['tid']]['options']['icon'],'',' width="16px" height="16px"');
+			$content['typegfx'] = Api\Html::image('addressbook', $this->content_types[$content['tid']]['options']['icon'], '', ' width="16px" height="16px"');
 		}
 		else
 		{
@@ -2355,10 +2352,10 @@ 
 		);
 
 		// Links for deleted entries
-		if($content['tid'] == self::DELETED_TYPE)
+		if ($content['tid'] == self::DELETED_TYPE)
 		{
 			$content['link_to']['show_deleted'] = true;
-			if(!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge')
+			if (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge')
 			{
 				$readonlys['button[delete]'] = true;
 			}
@@ -2367,33 +2364,33 @@ 
 		// Enable history
 		$this->setup_history($content, $sel_options);
 
-		$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'photo',$content['etag']);
+		$content['photo'] = $this->photo_src($content['id'], $content['jpegphoto'], 'photo', $content['etag']);
 
 		if ($content['private']) $content['owner'] .= 'p';
 
 		// for custom types, check if we have a custom edit template named "addressbook.edit.$type", $type is the name
-		if (in_array($content['tid'], array('n',self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
+		if (in_array($content['tid'], array('n', self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
 		{
 			$this->tmpl->read('addressbook.edit');
 		}
 
 		// allow other apps to add tabs to addressbook edit
 		$preserve = $content;
-		$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+		$content['jpegphoto'] = !empty($content['jpegphoto']); // unused and messes up json encoding (not utf-8)
 		$this->tmpl->setElementAttribute('tabs', 'add_tabs', true);
-		$tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs');
+		$tabs = & $this->tmpl->getElementAttribute('tabs', 'tabs');
 		if (($first_call = !isset($tabs)))
 		{
 			$tabs = array();
 		}
 		//error_log(__LINE__.': '.__METHOD__."() first_call=$first_call");
-		$hook_data = Api\Hooks::process(array('location' => 'addressbook_edit')+$content);
+		$hook_data = Api\Hooks::process(array('location' => 'addressbook_edit') + $content);
 		//error_log(__METHOD__."() hook_data=".array2string($hook_data));
-		foreach($hook_data as $extra_tabs)
+		foreach ($hook_data as $extra_tabs)
 		{
 			if (!$extra_tabs) continue;
 
-			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
+			foreach (isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
 				if ($extra_tab['data'] && is_array($extra_tab['data']))
 				{
@@ -2438,15 +2435,15 @@ 
 	 * @param array &$readonlys
 	 * @param int $id
 	 */
-	function _set_readonlys_for_own_account_acl(&$readonlys,$id)
+	function _set_readonlys_for_own_account_acl(&$readonlys, $id)
 	{
 		// regular fields depending on the backend
-		foreach($this->get_fields('supported',$id,0) as $field)
+		foreach ($this->get_fields('supported', $id, 0) as $field)
 		{
-			if (!$this->own_account_acl || !in_array($field,$this->own_account_acl))
+			if (!$this->own_account_acl || !in_array($field, $this->own_account_acl))
 			{
 				$readonlys[$field] = true;
-				switch($field)
+				switch ($field)
 				{
 					case 'tel_work':
 					case 'tel_cell':
@@ -2462,16 +2459,16 @@ 
 		// custom fields
 		if ($this->customfields)
 		{
-			foreach(array_keys($this->customfields) as $name)
+			foreach (array_keys($this->customfields) as $name)
 			{
-				if (!$this->own_account_acl || !in_array('#'.$name,$this->own_account_acl))
+				if (!$this->own_account_acl || !in_array('#'.$name, $this->own_account_acl))
 				{
 					$readonlys['#'.$name] = true;
 				}
 			}
 		}
 		// links
-		if (!$this->own_account_acl || !in_array('link_to',$this->own_account_acl))
+		if (!$this->own_account_acl || !in_array('link_to', $this->own_account_acl))
 		{
 			$readonlys['link_to'] = true;
 		}
@@ -2489,10 +2486,10 @@ 
 	 * 	'data' => array of id => "full name (addressbook)" pairs
 	 *  'fileas_options'
 	 */
-	public function ajax_check_values($values, $name, $own_id=0)
+	public function ajax_check_values($values, $name, $own_id = 0)
 	{
 		$matches = null;
-		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches)) $name = $matches[1];	// remove exec[ ]
+		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches)) $name = $matches[1]; // remove exec[ ]
 
 		$ret = array('doublicates' => array(), 'msg' => null);
 
@@ -2516,10 +2513,10 @@ 
 
 			// if name, firstname or org changed and at least 2 are specified, check for doublicates
 			if (in_array($name, array('n_given', 'n_family', 'org_name')) &&
-				!empty($values['n_given'])+!empty($values['n_family'])+!empty($values['org_name']) >= 2)
+				!empty($values['n_given']) + !empty($values['n_family']) + !empty($values['org_name']) >= 2)
 			{
 				$filter = array();
-				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)	// use email too, to exclude obvious false positives
+				foreach (array('email', 'n_given', 'n_family', 'org_name') as $n)	// use email too, to exclude obvious false positives
 				{
 					if (!empty($values[$n])) $filter[$n] = $values[$n];
 				}
@@ -2528,7 +2525,7 @@ 
 		}
 		if ($contacts)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				if ($own_id && $contact['id'] == $own_id) continue;
 
@@ -2552,26 +2549,24 @@ 
 	 *
 	 * @param array $content
 	 */
-	function view(array $content=null)
+	function view(array $content = null)
 	{
 		// CRM list comes from content, request, or preference
-		$crm_list = $content['crm_list'] ? $content['crm_list'] :
-			($_GET['crm_list'] ? $_GET['crm_list'] : $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list']);
-		if(!$crm_list || $crm_list == '~edit~') $crm_list = 'infolog';
+		$crm_list = $content['crm_list'] ? $content['crm_list'] : ($_GET['crm_list'] ? $_GET['crm_list'] : $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list']);
+		if (!$crm_list || $crm_list == '~edit~') $crm_list = 'infolog';
 
-		if(is_array($content))
+		if (is_array($content))
 		{
 			list($button) = each($content['button']);
 			switch ($content['toolbar'] ? $content['toolbar'] : $button)
 			{
-				case 'vcard':
-					Egw::redirect_link('/index.php','menuaction=addressbook.uivcard.out&ab_id=' .$content['id']);
+				case 'vcard' : Egw::redirect_link('/index.php', 'menuaction=addressbook.uivcard.out&ab_id='.$content['id']);
 
 				case 'cancel':
-					Egw::redirect_link('/index.php','menuaction=addressbook.addressbook_ui.index&ajax=true');
+					Egw::redirect_link('/index.php', 'menuaction=addressbook.addressbook_ui.index&ajax=true');
 
 				case 'delete':
-					Egw::redirect_link('/index.php',array(
+					Egw::redirect_link('/index.php', array(
 						'menuaction' => 'addressbook.addressbook_ui.index',
 						'msg' => $this->delete($content) ? lang('Contact deleted') : lang('Error deleting the contact !!!'),
 					));
@@ -2589,9 +2584,9 @@ 
 					$num_rows = $this->get_rows($query, $rows, $readonlys, true);
 					//error_log(__METHOD__."() get_rows()=$num_rows rows=".array2string($rows));
 					$contact_id = $rows[0];
-					if(!$contact_id || !is_array($content = $this->read($contact_id)))
+					if (!$contact_id || !is_array($content = $this->read($contact_id)))
 					{
-						Egw::redirect_link('/index.php',array(
+						Egw::redirect_link('/index.php', array(
 							'menuaction' => 'addressbook.addressbook_ui.index',
 							'msg' => $content,
 							'ajax' => 'true'
@@ -2600,14 +2595,14 @@ 
 					$content['index'] = $query['start'];
 
 					// List nextmatch is already there, just update the filter
-					if($contact_id && Api\Json\Request::isJSONRequest())
+					if ($contact_id && Api\Json\Request::isJSONRequest())
 					{
-						switch($crm_list)
+						switch ($crm_list)
 						{
 							case 'infolog':
 							case 'tracker':
 							default:
-								Api\Json\Response::get()->apply('app.addressbook.view_set_list',Array(Array('action'=>'addressbook', 'action_id' => $contact_id)));
+								Api\Json\Response::get()->apply('app.addressbook.view_set_list', Array(Array('action'=>'addressbook', 'action_id' => $contact_id)));
 								break;
 						}
 
@@ -2638,13 +2633,13 @@ 
 				$_GET['index'] = 0;
 			}
 			$contact_id = $_GET['contact_id'] ? $_GET['contact_id'] : ((int)$_GET['account_id'] ? 'account:'.(int)$_GET['account_id'] : 0);
-			if(!$contact_id || !is_array($content = $this->read($contact_id)))
+			if (!$contact_id || !is_array($content = $this->read($contact_id)))
 			{
-				Egw::redirect_link('/index.php',array(
+				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'addressbook.addressbook_ui.index',
 					'msg' => $content,
 					'ajax' => 'true'
-				)+(isset($_GET['search']) ? array('search' => $_GET['search']) : array()));
+				) + (isset($_GET['search']) ? array('search' => $_GET['search']) : array()));
 			}
 			if (isset($_GET['index']))
 			{
@@ -2657,25 +2652,25 @@ 
 				$num_rows = $this->get_rows($query, $rows, $readonlys, true);
 			}
 		}
-		$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+		$content['jpegphoto'] = !empty($content['jpegphoto']); // unused and messes up json encoding (not utf-8)
 
 		// make everything not explicit mentioned readonly
 		$readonlys['__ALL__'] = true;
 		$readonlys['photo'] = $readonlys['button[cancel]'] = $readonlys['button[copy]'] =
 			$readonlys['button[ok]'] = $readonlys['button[more]'] = $readonlys['toolbar'] = false;
 
-		foreach(array_keys($this->contact_fields) as $key)
+		foreach (array_keys($this->contact_fields) as $key)
 		{
-			if (in_array($key,array('tel_home','tel_work','tel_cell','tel_fax')))
+			if (in_array($key, array('tel_home', 'tel_work', 'tel_cell', 'tel_fax')))
 			{
 				$content[$key.'2'] = $content[$key];
 			}
 		}
 
 		// respect category permissions
-		if(!empty($content['cat_id']))
+		if (!empty($content['cat_id']))
 		{
-			$content['cat_id'] = $this->categories->check_list(Acl::READ,$content['cat_id']);
+			$content['cat_id'] = $this->categories->check_list(Acl::READ, $content['cat_id']);
 		}
 		$content['cat_id_tree'] = $content['cat_id'];
 
@@ -2685,12 +2680,12 @@ 
 			'to_id'  => $content['id'],
 		);
 		// Links for deleted entries
-		if($content['tid'] == self::DELETED_TYPE)
+		if ($content['tid'] == self::DELETED_TYPE)
 		{
 			$content['link_to']['show_deleted'] = true;
 		}
-		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(Acl::DELETE,$content);
-		$readonlys['button[edit]'] = !$this->check_perms(Acl::EDIT,$content);
+		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(Acl::DELETE, $content);
+		$readonlys['button[edit]'] = !$this->check_perms(Acl::EDIT, $content);
 
 		// how to display addresses
 		$content['addr_format']  = $this->addr_format_by_country($content['adr_one_countryname']);
@@ -2698,7 +2693,7 @@ 
 
 		$sel_options['fileas_type'][$content['fileas_type']] = $this->fileas($content);
 		$sel_options['owner'] = $this->get_addressbooks();
-		for($i = -23; $i<=23; $i++)
+		for ($i = -23; $i <= 23; $i++)
 		{
 			$tz[$i] = ($i > 0 ? '+' : '').$i;
 		}
@@ -2706,11 +2701,11 @@ 
 		$content['tz'] = $content['tz'] ? $content['tz'] : 0;
 		if (count($this->content_types) > 1)
 		{
-			foreach($this->content_types as $type => $data)
+			foreach ($this->content_types as $type => $data)
 			{
 				$sel_options['tid'][$type] = $data['name'];
 			}
-			$content['typegfx'] = Api\Html::image('addressbook',$this->content_types[$content['tid']]['options']['icon'],'',' width="16px" height="16px"');
+			$content['typegfx'] = Api\Html::image('addressbook', $this->content_types[$content['tid']]['options']['icon'], '', ' width="16px" height="16px"');
 		}
 		else
 		{
@@ -2727,7 +2722,7 @@ 
 		{
 			$content['owner'] .= 'p';
 		}
-		$this->tmpl->set_cell_attribute('change_org','disabled',true);
+		$this->tmpl->set_cell_attribute('change_org', 'disabled', true);
 
 		// Prevent double countries - invalid code blanks it, disabling doesn't work
 		$content['adr_one_countrycode'] = '-';
@@ -2740,14 +2735,14 @@ 
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
 		$readonlys['tabs']['custom'] = !$this->customfields;
 		$readonlys['tabs']['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
-		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
+		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists']; #false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
 
 		// last and next calendar date
-		if (!empty($content['id'])) list(,$dates) = each($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
-		if(is_array($dates)) $content += $dates;
+		if (!empty($content['id'])) list(,$dates) = each($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']), false));
+		if (is_array($dates)) $content += $dates;
 
 		// Disable importexport
 		$GLOBALS['egw_info']['flags']['disable_importexport']['export'] = true;
@@ -2789,7 +2784,7 @@ 
 		{
 			unset($actions['back']);
 		}
-		if (!isset($content['index']) || $content['index'] >= $num_rows-1)
+		if (!isset($content['index']) || $content['index'] >= $num_rows - 1)
 		{
 			unset($actions['next']);
 		}
@@ -2801,7 +2796,7 @@ 
 		// need to load list's app.js now, as exec calls header before other app can include it
 		Framework::includeJS('/'.$crm_list.'/js/app.js');
 
-		$this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array(
+		$this->tmpl->exec('addressbook.addressbook_ui.view', $content, $sel_options, $readonlys, array(
 			'id' => $content['id'],
 			'index' => $content['index'],
 			'crm_list' => $crm_list
@@ -2809,12 +2804,12 @@ 
 
 		// Only load this on first time - we're using AJAX, so it stays there through submits.
 		// Sending it again (via ajax) will break the addressbook.view etemplate2
-		if($contact_id)
+		if ($contact_id)
 		{
 			Api\Hooks::single(array(
 				'location' => 'addressbook_view',
 				'ab_id'    => $content['id']
-			),$crm_list);
+			), $crm_list);
 		}
 	}
 
@@ -2826,30 +2821,30 @@ 
 	 */
 	function email2link($email)
 	{
-		if (strpos($email,'@') == false) return '';
+		if (strpos($email, '@') == false) return '';
 
-		if($GLOBALS['egw_info']['user']['apps']['mail'])
+		if ($GLOBALS['egw_info']['user']['apps']['mail'])
 		{
 			return array(
 				'menuaction' => 'mail.mail_compose.compose',
 				'send_to'    => base64_encode($email)
 			);
 		}
-		if($GLOBALS['egw_info']['user']['apps']['felamimail'])
+		if ($GLOBALS['egw_info']['user']['apps']['felamimail'])
 		{
 			return array(
 				'menuaction' => 'felamimail.uicompose.compose',
 				'send_to'    => base64_encode($email)
 			);
 		}
-		if($GLOBALS['egw_info']['user']['apps']['email'])
+		if ($GLOBALS['egw_info']['user']['apps']['email'])
 		{
 			return array(
 				'menuaction' => 'email.uicompose.compose',
 				'to' => $email,
 			);
 		}
-		return 'mailto:' . $email;
+		return 'mailto:'.$email;
 	}
 
 	/**
@@ -2858,9 +2853,9 @@ 
 	 * @param array $_content
 	 * @return string
 	 */
-	function search($_content=array())
+	function search($_content = array())
 	{
-		if(!empty($_content))
+		if (!empty($_content))
 		{
 
 			$_content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $_content['cat_id_tree'] : $_content['cat_id'];
@@ -2875,10 +2870,10 @@ 
 			}
 			else
 			{
-				$query['advanced_search'] = array_intersect_key($_content,array_flip(array_merge($this->get_contact_columns(),array('operator','meth_select'))));
+				$query['advanced_search'] = array_intersect_key($_content, array_flip(array_merge($this->get_contact_columns(), array('operator', 'meth_select'))));
 				foreach ($query['advanced_search'] as $key => $value)
 				{
-					if(!$value) unset($query['advanced_search'][$key]);
+					if (!$value) unset($query['advanced_search'][$key]);
 				}
 				// Skip n_fn, it causes problems in sql
 				unset($query['advanced_search']['n_fn']);
@@ -2894,7 +2889,7 @@ 
 			$response->call("app.addressbook.adv_search", array('advanced_search' => $_content['button']['search'] ? $query['advanced_search'] : ''));
 			if ($_content['button']['cancelsearch'])
 			{
-				Framework::window_close ();
+				Framework::window_close();
 
 				// No need to reload popup
 				return;
@@ -2911,7 +2906,7 @@ 
 		// Avoid ID conflict with tree & selectboxes
 		$content['cat_id_tree'] = $content['cat_id'];
 
-		for($i = -23; $i<=23; $i++)
+		for ($i = -23; $i <= 23; $i++)
 		{
 			$tz[$i] = ($i > 0 ? '+' : '').$i;
 		}
@@ -2920,8 +2915,8 @@ 
 		//foreach($this->content_types as $type => $data) $sel_options['tid'][$type] = $data['name'];
 
 		// configure search options
-		$sel_options['owner'] = $this->get_addressbooks(Acl::READ,lang('all'));
-		$sel_options['operator'] =  array(
+		$sel_options['owner'] = $this->get_addressbooks(Acl::READ, lang('all'));
+		$sel_options['operator'] = array(
 			'AND' => 'AND',
 			'OR' => 'OR',
 		);
@@ -2931,12 +2926,12 @@ 
 		);
 		if ($this->customfields)
 		{
-			foreach($this->customfields as $name => $data)
+			foreach ($this->customfields as $name => $data)
 			{
 				if (substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
 				{
 					if (!isset($content['#'.$name])) $content['#'.$name] = '';
-					if(!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
+					if (!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
 				}
 				// Make them not required, otherwise you can't search
 				$this->tmpl->setElementAttribute('#'.$name, 'needed', FALSE);
@@ -2962,8 +2957,8 @@ 
 
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
 
-		$this->tmpl->set_cell_attribute('change_org','disabled',true);
-		return $this->tmpl->exec('addressbook.addressbook_ui.search',$content,$sel_options,$readonlys,array(),2);
+		$this->tmpl->set_cell_attribute('change_org', 'disabled', true);
+		return $this->tmpl->exec('addressbook.addressbook_ui.search', $content, $sel_options, $readonlys, array(), 2);
 	}
 
 	/**
@@ -2972,16 +2967,15 @@ 
 	function photo()
 	{
 		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');
 		}
 		if (!($contact = $this->read($contact_id)) || !$contact['jpegphoto'])
 		{
-			Egw::redirect(Api\Image::find('addressbook','photo'));
+			Egw::redirect(Api\Image::find('addressbook', 'photo'));
 		}
 		// use an etag over the image mapp
 		$etag = '"'.$contact['id'].':'.$contact['etag'].'"';
@@ -2993,7 +2987,7 @@ 
 			// different url with different etag parameter will force a reload
 			if (isset($_GET['etag']))
 			{
-				Api\Session::cache_control(30*86400);	// cache for 30 days
+				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)
@@ -3045,15 +3039,15 @@ 
 		echo $GLOBALS['egw']->framework->navbar();
 
 		// check if user has admin rights AND if a valid fileas type is given (Security)
-		if (!$this->is_admin() || $_GET['type'] != '' && !in_array($_GET['type'],$this->fileas_types))
+		if (!$this->is_admin() || $_GET['type'] != '' && !in_array($_GET['type'], $this->fileas_types))
 		{
 			echo '<h1>'.lang('Permission denied !!!')."</h1>\n";
 		}
 		else
 		{
 			$errors = null;
-			$updated = parent::set_all_fileas($_GET['type'],(boolean)$_GET['all'],$errors,true);	// true = ignore Acl
-			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).',$updated,$errors)."</b></p>\n";
+			$updated = parent::set_all_fileas($_GET['type'], (boolean)$_GET['all'], $errors, true); // true = ignore Acl
+			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).', $updated, $errors)."</b></p>\n";
 		}
 		echo $GLOBALS['egw']->framework->footer();
 	}
@@ -3077,8 +3071,8 @@ 
 		else
 		{
 			$errors = null;
-			$updated = parent::set_all_cleanup($errors,true);	// true = ignore Acl
-			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).',$updated,$errors)."</b></p>\n";
+			$updated = parent::set_all_cleanup($errors, true); // true = ignore Acl
+			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).', $updated, $errors)."</b></p>\n";
 		}
 		echo $GLOBALS['egw']->framework->footer();
 	}
@@ -3091,7 +3085,7 @@ 
 		if ($this->contact_repository == 'ldap' || !$content['id'] ||
 			$this->account_repository == 'ldap' && $content['account_id'])
 		{
-			return;	// no history for ldap as history table only allows integer id's
+			return; // no history for ldap as history table only allows integer id's
 		}
 		$content['history'] = array(
 			'id'	=>	$content['id'],
@@ -3106,7 +3100,7 @@ 
 			),
 		);
 
-		foreach($this->content_types as $id => $settings)
+		foreach ($this->content_types as $id => $settings)
 		{
 			$content['history']['status-widgets']['tid'][$id] = $settings['name'];
 		}

Braces +351 added lines, -91 removed lines

@@ -92,7 +92,10 @@ 
 		);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','addressbook')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit','addressbook'))
+		{
+			Api\Hooks::read(true);
+		}
 
 		$this->config =& $GLOBALS['egw_info']['server'];
 
@@ -131,15 +134,21 @@ 
 		{
 			$do_email = $_content['do_email'];
 
-			if (isset($_content['nm']['rows']['delete']))	// handle a single delete like delete with the checkboxes
+			if (isset($_content['nm']['rows']['delete']))
+			{
+				// handle a single delete like delete with the checkboxes
 			{
 				list($id) = @each($_content['nm']['rows']['delete']);
+			}
 				$_content['nm']['action'] = 'delete';
 				$_content['nm']['selected'] = array($id);
 			}
-			if (isset($_content['nm']['rows']['document']))	// handle insert in default document button like an action
+			if (isset($_content['nm']['rows']['document']))
+			{
+				// handle insert in default document button like an action
 			{
 				list($id) = @each($_content['nm']['rows']['document']);
+			}
 				$_content['nm']['action'] = 'document';
 				$_content['nm']['selected'] = array($id);
 			}
@@ -149,10 +158,13 @@ 
 				{
 					$msg = lang('You need to select some contacts first');
 				}
-				elseif ($_content['nm']['action'] == 'view_org')	// org-view via context menu
+				elseif ($_content['nm']['action'] == 'view_org')
+				{
+					// org-view via context menu
 				{
 					$_content['nm']['org_view'] = array_shift($_content['nm']['selected']);
 				}
+				}
 				else
 				{
 					$success = $failed = $action_msg = null;
@@ -175,10 +187,13 @@ 
 				list($org) = each($_content['nm']['rows']['infolog']);
 				return $this->infolog_org_view($org);
 			}
-			if ($_content['nm']['rows']['view'])	// show all contacts of an organisation
+			if ($_content['nm']['rows']['view'])
+			{
+				// show all contacts of an organisation
 			{
 				list($org_view) = each($_content['nm']['rows']['view']);
 			}
+			}
 			else
 			{
 				$org_view = $_content['nm']['org_view'];
@@ -271,10 +286,14 @@ 
 		}
 
 		// Search parameter passed in
-		if ($_GET['search']) {
+		if ($_GET['search'])
+		{
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection;
+		if (isset($typeselection))
+		{
+			$content['nm']['col_filter']['tid'] = $typeselection;
+		}
 		// save the tid for use in creating new addressbook entrys via UI. Current tid is to be used as type of new entrys
 		//error_log(__METHOD__.__LINE__.' '.$content['nm']['col_filter']['tid']);
 		Api\Cache::setSession('addressbook','active_tid',$content['nm']['col_filter']['tid']);
@@ -312,7 +331,10 @@ 
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('No country selected');
 
 		// if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export
-		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit'];
+		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit'])
+		{
+			$content['nm']['export_limit']=$this->config['contact_export_limit'];
+		}
 
 		// dont show tid-selection if we have only one content_type
 		// be a bit more sophisticated about it
@@ -322,7 +344,10 @@ 
 			//_debug_array(array('Typefilter:'=> $content['nm']['col_filter']['tid'],'Available Types:'=>$availabletypes,'action:'=>'remove invalid filter'));
 			unset($content['nm']['col_filter']['tid']);
 		}
-		if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0];
+		if (!isset($content['nm']['col_filter']['tid']))
+		{
+			$content['nm']['col_filter']['tid'] = $availabletypes[0];
+		}
 		if (count($this->content_types) > 1)
 		{
 			foreach($this->content_types as $tid => $data)
@@ -421,7 +446,10 @@ 
 		$crm_apps = array('infolog','tracker');
 		foreach($crm_apps as $app)
 		{
-			if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
+			if ($GLOBALS['egw_info']['user']['apps'][$app])
+			{
+				$crm_count++;
+			}
 		}
 		if($crm_count > 1)
 		{
@@ -477,7 +505,10 @@ 
 				),
 			),
 		);
-		if (!$GLOBALS['egw_info']['user']['apps']['preferences']) unset($actions['cats']['children']['cat_edit']);
+		if (!$GLOBALS['egw_info']['user']['apps']['preferences'])
+		{
+			unset($actions['cats']['children']['cat_edit']);
+		}
 		// Submenu for all distributionlist stuff
 		$actions['lists'] = array(
 			'caption' => 'Distribution lists',
@@ -490,7 +521,9 @@ 
 			),
 			'group' => $group,
 		);
-		if (($add_lists = $this->get_lists(Acl::EDIT)))	// do we have distribution lists?, and are we allowed to edit them
+		if (($add_lists = $this->get_lists(Acl::EDIT)))
+		{
+			// do we have distribution lists?, and are we allowed to edit them
 		{
 			$actions['lists']['children'] += array(
 				'to_list' => array(
@@ -526,6 +559,7 @@ 
 					'fieldValue' => '!',	// enable if list != ''
 				),
 			);
+		}
 			if(is_subclass_of('etemplate', 'etemplate_new'))
 			{
 				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
@@ -534,9 +568,13 @@ 
 			}
 		}
 		// move to AB
-		if (($move2addressbooks = $this->get_addressbooks(Acl::ADD)))	// do we have addressbooks, we should
+		if (($move2addressbooks = $this->get_addressbooks(Acl::ADD)))
+		{
+			// do we have addressbooks, we should
 		{
-			unset($move2addressbooks[0]);	// do not offer action to move contact to an account, as we dont support that currrently
+			unset($move2addressbooks[0]);
+		}
+		// do not offer action to move contact to an account, as we dont support that currrently
 			foreach($move2addressbooks as $owner => $label)
 			{
 				$icon = $type_label = null;
@@ -667,7 +705,9 @@ 
 
 			);
 		if (!$this->prefs['preferredMail'])
-			$actions['email']['children']['email_business']['checked'] = true;
+		{
+					$actions['email']['children']['email_business']['checked'] = true;
+		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
@@ -811,11 +851,17 @@ 
 	private function _get_org_name($org)
 	{
 		$org_name = array();
-		if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
+		if (strpos($org,'*AND*')!== false)
+		{
+			$org = str_replace('*AND*','&',$org);
+		}
 		foreach(explode('|||',$org) as $part)
 		{
 			list(,$name) = explode(':',$part,2);
-			if ($name) $org_name[] = $name;
+			if ($name)
+			{
+				$org_name[] = $name;
+			}
 		}
 		$name = implode(': ',$org_name);
 		return $name ? array($org => $name) : array();
@@ -877,9 +923,15 @@ 
 		$org_contacts = array();
 		$query = !$_query ? Api\Cache::getSession('addressbook', 'index') : $_query;
 		$query['num_rows'] = -1;	// all
-		if(!is_array($query['col_filter'])) $query['col_filter'] = array();
+		if(!is_array($query['col_filter']))
+		{
+			$query['col_filter'] = array();
+		}
 
-		if(!is_array($org)) $org = array($org);
+		if(!is_array($org))
+		{
+			$org = array($org);
+		}
 		foreach($org as $org_name)
 		{
 			$query['org_view'] = $org_name;
@@ -908,14 +960,23 @@ 
 		$checked = $readonlys = null;
 		$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
 
-		if (count($checked) > 1)	// use a nicely formatted org-name as title in infolog
+		if (count($checked) > 1)
+		{
+			// use a nicely formatted org-name as title in infolog
 		{
 			$parts = array();
-			if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
+		}
+			if (strpos($org,'*AND*')!== false)
+			{
+				$org = str_replace('*AND*','&',$org);
+			}
 			foreach(explode('|||',$org) as $part)
 			{
 				list(,$part) = explode(':',$part,2);
-				if ($part) $parts[] = $part;
+				if ($part)
+				{
+					$parts[] = $part;
+				}
 			}
 			$org = implode(', ',$parts);
 		}
@@ -1059,10 +1120,16 @@ 
 				unset($query['filter2']);
 				$extra = $readonlys = null;
 				$this->get_rows($query,$extra,$readonlys,true);	// true = only return the id's
-				if ($extra[0]) $org_contacts = array_merge($org_contacts,$extra);
+				if ($extra[0])
+				{
+					$org_contacts = array_merge($org_contacts,$extra);
+				}
 			}
 		}
-		if ($org_contacts) $checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		if ($org_contacts)
+		{
+			$checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		}
 		//_debug_array($checked); exit;
 
 		if (substr($action,0,8) == 'move_to_')
@@ -1079,9 +1146,12 @@ 
 			$document = substr($action,9);
 			$action = 'document';
 		}
-		elseif(substr($action,0,4) == 'cat_')	// cat_add_123 or cat_del_456
+		elseif(substr($action,0,4) == 'cat_')
+		{
+			// cat_add_123 or cat_del_456
 		{
 			$cat_id = (int)substr($action, 8);
+		}
 			$action = substr($action,0,7);
 		}
 		// Security: stop non-admins to export more then the configured number of contacts
@@ -1128,7 +1198,10 @@ 
 				return false;
 
 			case 'document':
-				if (!$document) $document = $this->prefs['default_document'];
+				if (!$document)
+				{
+					$document = $this->prefs['default_document'];
+				}
 				$document_merge = new Api\Contacts\Merge();
 				$msg = $document_merge->download($document, $checked, '', $this->prefs['document_dir']);
 				$failed = count($checked);
@@ -1280,19 +1353,25 @@ 
 					break;
 
 				default:	// move to an other addressbook
-					if (!(int)$action || !($this->grants[(string) (int) $action] & Acl::EDIT))	// might be ADD in the future
+					if (!(int)$action || !($this->grants[(string) (int) $action] & Acl::EDIT))
+					{
+						// might be ADD in the future
 					{
 						return false;
 					}
+					}
 					if (!$checkboxes['move_to_copy'])
 					{
 						$action_msg = lang('moved');
 						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::DELETE,$contact)))
 						{
-							if (!$contact['owner'])		// no (mass-)move of Api\Accounts
+							if (!$contact['owner'])
+							{
+								// no (mass-)move of Api\Accounts
 							{
 								$Ok = false;
 							}
+							}
 							elseif ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action,-1) == 'p'))
 							{
 								$contact['owner'] = (int) $action;
@@ -1381,9 +1460,12 @@ 
 		$do_email = $query['do_email'];
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
 
-		if (!$id_only && !$query['csv_export'])	// do NOT store state for csv_export or querying id's (no regular view)
+		if (!$id_only && !$query['csv_export'])
+		{
+			// do NOT store state for csv_export or querying id's (no regular view)
 		{
 			$store_query = $query;
+		}
 			// Do not store these
 			foreach(array('options-cat_id','actions','action_links','placeholder_actions') as $key)
 			{
@@ -1396,14 +1478,25 @@ 
 		{
 			$old_state = Api\Cache::getSession('addressbook', $what);
 		}
-		if (!isset($this->org_views[(string) $query['org_view']]) || strpos($query['org_view'],':') === false)   // we dont have an org view, unset the according col_filters
+		if (!isset($this->org_views[(string) $query['org_view']]) || strpos($query['org_view'],':') === false)
+		{
+			// we dont have an org view, unset the according col_filters
 		{
 			if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
-			if (isset($query['col_filter']['adr_one_locality'])) unset($query['col_filter']['adr_one_locality']);
-			if (isset($query['col_filter']['org_unit'])) unset($query['col_filter']['org_unit']);
+		}
+			if (isset($query['col_filter']['adr_one_locality']))
+			{
+				unset($query['col_filter']['adr_one_locality']);
+			}
+			if (isset($query['col_filter']['org_unit']))
+			{
+				unset($query['col_filter']['org_unit']);
+			}
 		}
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view, reset the advanced search
+		if (isset($this->org_views[(string) $query['org_view']]))
+		{
+			// we have an org view, reset the advanced search
 		{
 			//_debug_array(array('Search'=>$query['search'],
 			//	'AdvancedSearch'=>$query['advanced_search']));
@@ -1411,10 +1504,14 @@ 
 			//unset($query['advanced_search']);
 			if(!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
 		}
-		elseif(!$query['search'] && array_key_exists('advanced_search',$old_state))	// eg. paging in an advanced search
+		}
+		elseif(!$query['search'] && array_key_exists('advanced_search',$old_state))
+		{
+			// eg. paging in an advanced search
 		{
 			$query['advanced_search'] = $old_state['advanced_search'];
 		}
+		}
 		/* this cant work anymore, as Framework::set_onload no longer exists
 		if ($do_email && etemplate::$loop)
 		{	// remove previous addEmail() calls, otherwise they will be run again
@@ -1424,11 +1521,13 @@ 
 		// Make sure old lettersearch filter doesn't stay - current letter filter will be added later
 		foreach($query['col_filter'] as $key => $col_filter)
 		{
-			if(!is_numeric($key)) continue;
+			if(!is_numeric($key))
+			{
+				continue;
+			}
 			if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
 				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/',$col_filter) == 1
-			)
-			{
+			) {
 				unset($query['col_filter'][$key]);
 			}
 		}
@@ -1439,9 +1538,13 @@ 
 			// check if accounts are stored in ldap, which does NOT yet support the org-views
 			if ($this->so_accounts && $query['filter'] === '0' && $query['org_view'])
 			{
-				if ($old_state['filter'] === '0')	// user changed to org_view
+				if ($old_state['filter'] === '0')
+				{
+					// user changed to org_view
 				{
-					$query['filter'] = '';			// --> change filter to all contacts
+					$query['filter'] = '';
+				}
+				// --> change filter to all contacts
 				}
 				else								// user changed to accounts
 				{
@@ -1478,9 +1581,12 @@ 
 		{
 			unset($query['col_filter']['cat_id']);
 		}
-		if ($query['filter'] !== '')	// not all addressbooks
+		if ($query['filter'] !== '')
+		{
+			// not all addressbooks
 		{
 			$query['col_filter']['owner'] = (string) (int) $query['filter'];
+		}
 
 			if ($this->private_addressbook)
 			{
@@ -1492,10 +1598,13 @@ 
 			unset($query['col_filter']['owner']);
 			unset($query['col_filter']['private']);
 		}
-		if ((int)$query['filter2'])	// not no distribution list
+		if ((int)$query['filter2'])
+		{
+			// not no distribution list
 		{
 			$query['col_filter']['list'] = (string) (int) $query['filter2'];
 		}
+		}
 		else
 		{
 			unset($query['col_filter']['list']);
@@ -1507,10 +1616,13 @@ 
 		// all backends allow now at least to use groups as distribution lists
 		$query['no_filter2'] = false;
 
-		if (isset($this->org_views[(string) $query['org_view']]) && !$query['col_filter']['parent_id'])	// we have an org view
+		if (isset($this->org_views[(string) $query['org_view']]) && !$query['col_filter']['parent_id'])
+		{
+			// we have an org view
 		{
 			// Query doesn't like empties
 			unset($query['col_filter']['parent_id']);
+		}
 
 			if($query['actions'] && $query['actions']['open'])
 			{
@@ -1563,9 +1675,12 @@ 
 			}
 			// Query doesn't like parent_id
 			unset($query['col_filter']['parent_id']);
-			if ($query['org_view'])	// view the contacts of one organisation only
+			if ($query['org_view'])
+			{
+				// view the contacts of one organisation only
 			{
 				if (strpos($query['org_view'],'*AND*') !== false) $query['org_view'] = str_replace('*AND*','&',$query['org_view']);
+			}
 				foreach(explode('|||',$query['org_view']) as $part)
 				{
 					list($name,$value) = explode(':',$part,2);
@@ -1584,14 +1699,18 @@ 
 			// translate the select order to the really used over all 3 columns
 			$sort = $query['sort'];
 			switch($query['order'])		// "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end
-			{							// we don't exclude them, as the total would otherwise depend on the order-criteria
+			{
+// we don't exclude them, as the total would otherwise depend on the order-criteria
 				case 'org_name':
 					$order = "egw_addressbook.org_name<>''DESC,egw_addressbook.org_name $sort,n_family $sort,n_given $sort";
 					break;
 				default:
-					if ($query['order'][0] == '#')	// we order by a custom field
+					if ($query['order'][0] == '#')
+					{
+						// we order by a custom field
 					{
 						$order = "{$query['order']} $sort,org_name $sort,n_family $sort,n_given $sort";
+					}
 						break;
 					}
 					$query['order'] = 'n_family';
@@ -1615,9 +1734,12 @@ 
 				case 'contact_id':
 					$order = "egw_addressbook.$query[order] $sort";
 			}
-			if ($query['searchletter'])	// only show contacts if the order-criteria starts with the given letter
+			if ($query['searchletter'])
+			{
+				// only show contacts if the order-criteria starts with the given letter
 			{
 				$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created','contact_modified');
+			}
 				$query['col_filter'][] = (in_array($query['order'],$no_letter_search) ? 'org_name' : (substr($query['order'],0,1)=='#'?'':'egw_addressbook.').$query['order']).' '.
 					$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.$GLOBALS['egw']->db->quote(strtolower($query['searchletter']).'%');
 			}
@@ -1657,11 +1779,17 @@ 
 					{
 						foreach($columselection as $col)
 						{
-							if ($col[0] == '#') $selected_cfs[] = substr($col,1);
+							if ($col[0] == '#')
+							{
+								$selected_cfs[] = substr($col,1);
+							}
 						}
 						$customfields = $this->read_customfields($ids,$selected_cfs);
 					}
-					if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($calendar_participants);
+					if ($show_calendar && !empty($ids))
+					{
+						$calendar = $this->read_calendar($calendar_participants);
+					}
 					// distributionlist memership for the entrys
 					//_debug_array($this->get_lists(Acl::EDIT));
 					if ($show_distributionlist && $available_distib_lists)
@@ -1671,7 +1799,10 @@ 
 				}
 			}
 		}
-		if (!$rows) $rows = array();
+		if (!$rows)
+		{
+			$rows = array();
+		}
 
 		if ($id_only)
 		{
@@ -1704,7 +1835,10 @@ 
 					$row['line2'] = $row['org_name'];
 					break;
 				case 'n_fileas':
-					if (!$row['n_fileas']) $row['n_fileas'] = $this->fileas($row);
+					if (!$row['n_fileas'])
+					{
+						$row['n_fileas'] = $this->fileas($row);
+					}
 					list($row['line1'],$row['line2']) = explode(': ',$row['n_fileas']);
 					break;
 			}
@@ -1778,8 +1912,14 @@ 
 			}
 
 			// hide region for address format 'postcode_city'
-			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']);
-			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']);
+			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city')
+			{
+				unset($row['adr_one_region']);
+			}
+			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city')
+			{
+				unset($row['adr_two_region']);
+			}
 
 			// respect category permissions
 			if(!empty($row['cat_id']))
@@ -1790,7 +1930,10 @@ 
 		$rows['no_distribution_list'] = (bool)$query['filter2'];
 
 		// disable customfields column, if we have no customefield(s)
-		if (!$this->customfields) $rows['no_customfields'] = true;
+		if (!$this->customfields)
+		{
+			$rows['no_customfields'] = true;
+		}
 
 		$rows['order'] = $order;
 		$rows['call_popup'] = $this->config['call_popup'];
@@ -1829,10 +1972,13 @@ 
 			$order = $order == 'n_given' ? lang('first name') : ($order == 'n_family' ? lang('last name') : lang('Organisation'));
 			$header[] = lang("%1 starts with '%2'",$order,$query['searchletter']);
 		}
-		if ($query['search'] && !$query['advanced_search']) // do not add that, if we have advanced search active
+		if ($query['search'] && !$query['advanced_search'])
+		{
+			// do not add that, if we have advanced search active
 		{
 			$header[] = lang("Search for '%1'",$query['search']);
 		}
+		}
 		$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $header);
 
 		return $this->total;
@@ -1899,7 +2045,10 @@ 
 			$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
 			$content['owner'] = (string) (int) $content['owner'];
 			$content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $content['cat_id_tree'] : $content['cat_id'];
-			if ($this->config['private_cf_tab']) $content = (array)$content['private_cfs'] + $content;
+			if ($this->config['private_cf_tab'])
+			{
+				$content = (array)$content['private_cfs'] + $content;
+			}
 			unset($content['private_cfs']);
 
 			switch($button)
@@ -2096,7 +2245,10 @@ 
 				{
 					// arguments containing a comma get quoted by etemplate/js/nextmatch_action.js
 					// leading to error in Api\Db::column_data_implode, if not unquoted
-					if ($org[0] == '"') $org = substr($org, 1, -1);
+					if ($org[0] == '"')
+					{
+						$org = substr($org, 1, -1);
+					}
 					$content = $this->read_org($org);
 				}
 				elseif ($state['org_view'] && !isset($this->org_views[$state['org_view']]))
@@ -2116,7 +2268,10 @@ 
 						$content['adr_two_countryname'] =
 							$GLOBALS['egw']->country->get_full_name($GLOBALS['egw_info']['user']['preferences']['common']['country']);
 					}
-					if ($this->prefs['fileas_default']) $content['fileas_type'] = $this->prefs['fileas_default'];
+					if ($this->prefs['fileas_default'])
+					{
+						$content['fileas_type'] = $this->prefs['fileas_default'];
+					}
 				}
 				if (isset($_GET['owner']) && $_GET['owner'] !== '')
 				{
@@ -2141,7 +2296,10 @@ 
 				$new_type = array_keys($this->content_types);
 				// fetch active type to preset the type, if param typeid is not passed
 				$active_tid = Api\Cache::getSession('addressbook','active_tid');
-				if ($active_tid && strtoupper($active_tid) === 'D') unset($active_tid);
+				if ($active_tid && strtoupper($active_tid) === 'D')
+				{
+					unset($active_tid);
+				}
 				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid?$active_tid:$new_type[0]);
 				foreach($this->get_contact_columns() as $field)
 				{
@@ -2159,19 +2317,37 @@ 
 									if (strpos($singleAddress[0]->personal,',')===false)
 									{
 										list($P_n_given,$P_n_family,$P_org_name)=explode(' ',$singleAddress[0]->personal,3);
-										if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+										if (strlen(trim($P_n_given))>0)
+										{
+											$content['n_given'] = trim($P_n_given);
+										}
+										if (strlen(trim($P_n_family))>0)
+										{
+											$content['n_family'] = trim($P_n_family);
+										}
+										if (strlen(trim($P_org_name))>0)
+										{
+											$content['org_name'] = trim($P_org_name);
+										}
 									}
 									else
 									{
 										list($P_n_family,$P_other)=explode(',',$singleAddress[0]->personal,2);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
+										if (strlen(trim($P_n_family))>0)
+										{
+											$content['n_family'] = trim($P_n_family);
+										}
 										if (strlen(trim($P_other))>0)
 										{
 											list($P_n_given,$P_org_name)=explode(',',$P_other,2);
-											if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-											if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+											if (strlen(trim($P_n_given))>0)
+											{
+												$content['n_given'] = trim($P_n_given);
+											}
+											if (strlen(trim($P_org_name))>0)
+											{
+												$content['org_name'] = trim($P_org_name);
+											}
 										}
 									}
 								}
@@ -2199,7 +2375,10 @@ 
 							break;
 						}
 					}
-					if (empty($content['n_fn'])) $content['n_fn'] = $this->fullname($content);
+					if (empty($content['n_fn']))
+					{
+						$content['n_fn'] = $this->fullname($content);
+					}
 				}
 				$content['creator'] = $this->user;
 				$content['created'] = $this->now_su;
@@ -2207,17 +2386,27 @@ 
 				//_debug_array($content);
 			}
 
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg'])
+			{
+				$content['msg'] = strip_tags($_GET['msg']);
+			}
+			// dont allow HTML!
 
-			if($content && $_GET['makecp'])	// copy the contact
+			if($content && $_GET['makecp'])
+			{
+				// copy the contact
 			{
 				$this->copy_contact($content);
+			}
 				$content['msg'] = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('addressbook','entry')));
 				$view = false;
 			}
 			else
 			{
-				if (is_numeric($contact_id)) $content['link_to']['to_id'] = $contact_id;
+				if (is_numeric($contact_id))
+				{
+					$content['link_to']['to_id'] = $contact_id;
+				}
 			}
 			// automatic link new entries to entries specified in the url
 			if (!$contact_id && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
@@ -2226,10 +2415,13 @@ 
 				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+					{
+						// gard against XSS
 					{
 						Link::link('addressbook',$content['link_to']['to_id'],$link_app,$link_id);
 					}
+					}
 				}
 			}
 		}
@@ -2237,7 +2429,10 @@ 
 		{
 			// last and next calendar date
 			list(,$dates) = each($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
-			if(is_array($dates)) $content += $dates;
+			if(is_array($dates))
+			{
+				$content += $dates;
+			}
 		}
 
 		// Registry has view_id as contact_id, so set it (custom fields uses it)
@@ -2277,7 +2472,11 @@ 
 		$sel_options['fileas_type'] = $this->fileas_options($content);
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('Custom');
 		$sel_options['owner'] = $this->get_addressbooks(Acl::ADD);
-		if ($content['owner']) unset($sel_options['owner'][0]);	// do not offer to switch to accounts, as we do not support moving contacts to accounts
+		if ($content['owner'])
+		{
+			unset($sel_options['owner'][0]);
+		}
+		// do not offer to switch to accounts, as we do not support moving contacts to accounts
 		if ((string) $content['owner'] !== '')
 		{
 			if (!isset($sel_options['owner'][(int)$content['owner']]))
@@ -2312,7 +2511,10 @@ 
 				));
 			}
 		}
-		if (isset($readonlys['n_fileas'])) $readonlys['fileas_type'] = $readonlys['n_fileas'];
+		if (isset($readonlys['n_fileas']))
+		{
+			$readonlys['fileas_type'] = $readonlys['n_fileas'];
+		}
 		// disable not needed tabs
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
 		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts;
@@ -2320,8 +2522,14 @@ 
 		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
-		if (!$content['id']) $readonlys['button[delete]'] = !$content['id'];
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if (!$content['id'])
+		{
+			$readonlys['button[delete]'] = !$content['id'];
+		}
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 		$readonlys['change_org'] = empty($content['org_name']) || $view;
 
 		// for editing the own account (by a non-admin), enable only the fields allowed via the "own_account_acl"
@@ -2369,7 +2577,10 @@ 
 
 		$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'photo',$content['etag']);
 
-		if ($content['private']) $content['owner'] .= 'p';
+		if ($content['private'])
+		{
+			$content['owner'] .= 'p';
+		}
 
 		// for custom types, check if we have a custom edit template named "addressbook.edit.$type", $type is the name
 		if (in_array($content['tid'], array('n',self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
@@ -2391,7 +2602,10 @@ 
 		//error_log(__METHOD__."() hook_data=".array2string($hook_data));
 		foreach($hook_data as $extra_tabs)
 		{
-			if (!$extra_tabs) continue;
+			if (!$extra_tabs)
+			{
+				continue;
+			}
 
 			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
@@ -2408,7 +2622,10 @@ 
 					$readonlys = array_merge($readonlys, $extra_tab['readonlys']);
 				}
 				// we must NOT add tabs and callbacks more then once!
-				if (!$first_call) continue;
+				if (!$first_call)
+				{
+					continue;
+				}
 
 				if (!empty($extra_tab['pre_save_callback']))
 				{
@@ -2492,20 +2709,27 @@ 
 	public function ajax_check_values($values, $name, $own_id=0)
 	{
 		$matches = null;
-		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches)) $name = $matches[1];	// remove exec[ ]
+		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches))
+		{
+			$name = $matches[1];
+		}
+		// remove exec[ ]
 
 		$ret = array('doublicates' => array(), 'msg' => null);
 
 		// if email changed, check for doublicates
 		if (in_array($name, array('email', 'email_home')))
 		{
-			if (preg_match(Etemplate\Widget\Url::EMAIL_PREG, $values[$name]))	// only search for real email addresses, to not return to many contacts
+			if (preg_match(Etemplate\Widget\Url::EMAIL_PREG, $values[$name]))
+			{
+				// only search for real email addresses, to not return to many contacts
 			{
 				$contacts = parent::search(array(
 					'email' => $values[$name],
 					'email_home' => $values[$name],
 				), false, '', '', '', false, 'OR');
 			}
+			}
 		}
 		else
 		{
@@ -2519,10 +2743,13 @@ 
 				!empty($values['n_given'])+!empty($values['n_family'])+!empty($values['org_name']) >= 2)
 			{
 				$filter = array();
-				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)	// use email too, to exclude obvious false positives
+				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)
+				{
+					// use email too, to exclude obvious false positives
 				{
 					if (!empty($values[$n])) $filter[$n] = $values[$n];
 				}
+				}
 				$contacts = parent::search('', false, '', '', '', false, 'AND', false, $filter);
 			}
 		}
@@ -2530,7 +2757,10 @@ 
 		{
 			foreach($contacts as $contact)
 			{
-				if ($own_id && $contact['id'] == $own_id) continue;
+				if ($own_id && $contact['id'] == $own_id)
+				{
+					continue;
+				}
 
 				$ret['doublicates'][$contact['id']] = $this->fileas($contact).' ('.
 					(!$contact['owner'] ? lang('Accounts') : ($contact['owner'] == $this->user ?
@@ -2557,7 +2787,10 @@ 
 		// CRM list comes from content, request, or preference
 		$crm_list = $content['crm_list'] ? $content['crm_list'] :
 			($_GET['crm_list'] ? $_GET['crm_list'] : $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list']);
-		if(!$crm_list || $crm_list == '~edit~') $crm_list = 'infolog';
+		if(!$crm_list || $crm_list == '~edit~')
+		{
+			$crm_list = 'infolog';
+		}
 
 		if(is_array($content))
 		{
@@ -2580,7 +2813,10 @@ 
 					$inc = 1;
 					// fall through
 				case 'back':
-					if (!isset($inc)) $inc = -1;
+					if (!isset($inc))
+					{
+						$inc = -1;
+					}
 					// get next/previous contact in selection
 					$query = Api\Cache::getSession('addressbook', 'index');
 					$query['start'] = $content['index'] + $inc;
@@ -2743,11 +2979,20 @@ 
 		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 
 		// last and next calendar date
-		if (!empty($content['id'])) list(,$dates) = each($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
-		if(is_array($dates)) $content += $dates;
+		if (!empty($content['id']))
+		{
+			list(,$dates) = each($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
+		}
+		if(is_array($dates))
+		{
+			$content += $dates;
+		}
 
 		// Disable importexport
 		$GLOBALS['egw_info']['flags']['disable_importexport']['export'] = true;
@@ -2826,7 +3071,10 @@ 
 	 */
 	function email2link($email)
 	{
-		if (strpos($email,'@') == false) return '';
+		if (strpos($email,'@') == false)
+		{
+			return '';
+		}
 
 		if($GLOBALS['egw_info']['user']['apps']['mail'])
 		{
@@ -2878,7 +3126,10 @@ 
 				$query['advanced_search'] = array_intersect_key($_content,array_flip(array_merge($this->get_contact_columns(),array('operator','meth_select'))));
 				foreach ($query['advanced_search'] as $key => $value)
 				{
-					if(!$value) unset($query['advanced_search'][$key]);
+					if(!$value)
+					{
+						unset($query['advanced_search'][$key]);
+					}
 				}
 				// Skip n_fn, it causes problems in sql
 				unset($query['advanced_search']['n_fn']);
@@ -2935,8 +3186,14 @@ 
 			{
 				if (substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
 				{
-					if (!isset($content['#'.$name])) $content['#'.$name] = '';
-					if(!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
+					if (!isset($content['#'.$name]))
+					{
+						$content['#'.$name] = '';
+					}
+					if(!isset($data['values']['']))
+					{
+						$sel_options['#'.$name][''] = lang('Select one');
+					}
 				}
 				// Make them not required, otherwise you can't search
 				$this->tmpl->setElementAttribute('#'.$name, 'needed', FALSE);
@@ -2960,7 +3217,10 @@ 
 		$content['no_tid'] = true;
 		$content['showsearchbuttons'] = true; // enable search operation and search buttons| they're disabled by default
 
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 
 		$this->tmpl->set_cell_attribute('change_org','disabled',true);
 		return $this->tmpl->exec('addressbook.addressbook_ui.search',$content,$sel_options,$readonlys,array(),2);