EGroupware / egroupware

addressbook/inc/class.addressbook_import_contacts_csv.inc.php

Indentation +26 added lines, -26 removed lines

@@ -381,38 +381,38 @@
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 }

Doc Comments +2 added lines, -5 removed lines

@@ -53,8 +53,7 @@ 
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		parent::import($_stream, $_definition);
@@ -67,9 +66,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition &$_definition ) {
 

Spacing +66 added lines, -66 removed lines

@@ -15,14 +15,14 @@ 
 /**
  * class import_csv for addressbook
  */
-class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
+class addressbook_import_contacts_csv extends importexport_basic_import_csv {
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists', 'equal' );
+	protected static $conditions = array('exists', 'equal');
 
 	/**
 	 * @var addressbook_bo
@@ -56,10 +56,10 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import($_stream, importexport_definition $_definition) {
 		parent::import($_stream, $_definition);
 
-		if($_definition->plugin_options['empty_addressbook'])
+		if ($_definition->plugin_options['empty_addressbook'])
 		{
 			$this->empty_addressbook($this->user, $this->ids);
 		}
@@ -71,7 +71,7 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition &$_definition ) {
+	public function init(importexport_definition &$_definition) {
 
 		// fetch the addressbook bo
 		$this->bocontacts = new addressbook_bo();
@@ -82,13 +82,13 @@ 
 		$this->lookups = array(
 			'tid' => array('n'=>'contact')
 		);
-		foreach($this->bocontacts->content_types as $tid => $data)
+		foreach ($this->bocontacts->content_types as $tid => $data)
 		{
 			$this->lookups['tid'][$tid] = $data['name'];
 		}
 
 		// Try and set a default type, for use if file does not specify
-		if(!$this->lookups['tid'][Api\Contacts\Storage::DELETED_TYPE] && count($this->lookups['tid']) == 1 ||
+		if (!$this->lookups['tid'][Api\Contacts\Storage::DELETED_TYPE] && count($this->lookups['tid']) == 1 ||
 			$this->lookups['tid'][Api\Contacts\Storage::DELETED_TYPE] && count($this->lookups['tid']) == 2)
 		{
 			reset($this->lookups['tid']);
@@ -97,21 +97,21 @@ 
 
 
 		// set contact owner
-		$contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
+		$contact_owner = isset($_definition->plugin_options['contact_owner']) ?
 			$_definition->plugin_options['contact_owner'] : $this->user;
 
 		// Check to make sure target addressbook is valid
-		if(!in_array($contact_owner, array_keys($this->bocontacts->get_addressbooks(Api\Acl::ADD))))
+		if (!in_array($contact_owner, array_keys($this->bocontacts->get_addressbooks(Api\Acl::ADD))))
 		{
 			$this->warnings[0] = lang("Unable to import into %1, using %2",
-				$contact_owner . ' ('.Api\Accounts::username($record->owner) . ')',
+				$contact_owner.' ('.Api\Accounts::username($record->owner).')',
 				Api\Accounts::username($this->user)
 			);
 			$contact_owner = 'personal';
 		}
 
 		// Import into importer's personal addressbook
-		if($contact_owner == 'personal')
+		if ($contact_owner == 'personal')
 		{
 			$contact_owner = $this->user;
 		}
@@ -132,11 +132,11 @@ 
 	{
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
-			if(!is_numeric($record->owner)) {
+		if ($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
+			if (!is_numeric($record->owner)) {
 				// Automatically handle text owner without explicit translation
 				$new_owner = importexport_helper_functions::account_name2id($record->owner);
-				if($new_owner == '') {
+				if ($new_owner == '') {
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Unable to convert "%1" to account ID.  Using plugin setting (%2) for owner.',
 						$record->owner,
@@ -152,7 +152,7 @@ 
 		}
 
 		// Check that owner (addressbook) is allowed
-		if(!array_key_exists($record->owner, $this->bocontacts->get_addressbooks()))
+		if (!array_key_exists($record->owner, $this->bocontacts->get_addressbooks()))
 		{
 			$this->errors[$import_csv->get_current_position()] = lang("Unable to import into %1, using %2",
 				Api\Accounts::username($record->owner),
@@ -163,18 +163,18 @@ 
 
 		// Do not allow owner == 0 (accounts) without an account_id
 		// It causes the contact to be filed as an account, and can't delete
-		if(!$record->owner && !$record->account_id)
+		if (!$record->owner && !$record->account_id)
 		{
 			$record->owner = $GLOBALS['egw_info']['user']['account_id'];
 		}
 
 		// Do not import into non-existing type, warn and change
-		if(!$record->tid || !$this->lookups['tid'][$record->tid])
+		if (!$record->tid || !$this->lookups['tid'][$record->tid])
 		{
 			// Avoid lots of warnings about type (2 types are contact and deleted)
-			if($record->tid && !$this->type_warned[$record->tid] && !$this->lookups['tid'][$record->tid] )
+			if ($record->tid && !$this->type_warned[$record->tid] && !$this->lookups['tid'][$record->tid])
 			{
-				$this->warnings[$import_csv->get_current_position()] = lang('Unknown type %1, imported as %2',$record->tid,lang($this->lookups['tid']['n']));
+				$this->warnings[$import_csv->get_current_position()] = lang('Unknown type %1, imported as %2', $record->tid, lang($this->lookups['tid']['n']));
 				$this->type_warned[$record->tid] = true;
 			}
 			$record->tid = $this->default_type;
@@ -183,45 +183,45 @@ 
 		// Also handle categories in their own field
 		$record_array = $record->get_record_array();
 		$more_categories = array();
-		foreach($this->definition->plugin_options['field_mapping'] as $field_name) {
-			if(!array_key_exists($field_name, $record_array) ||
-				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
+		foreach ($this->definition->plugin_options['field_mapping'] as $field_name) {
+			if (!array_key_exists($field_name, $record_array) ||
+				substr($field_name, 0, 3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
 			list(, $cat_id) = explode('-', $field_name);
-			if(is_numeric($record->$field_name) && $record->$field_name != 1) {
+			if (is_numeric($record->$field_name) && $record->$field_name != 1) {
 				// Column has a single category ID
 				$more_categories[] = $record->$field_name;
-			} elseif($record->$field_name == '1' ||
+			} elseif ($record->$field_name == '1' ||
 				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes')))) {
 				// Each category got its own column.  '1' is the database value, lang('yes') is the human value
 				$more_categories[] = $cat_id;
 			} else {
 				// Text categories
-				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',',$record->$field_name), $cat_id));
+				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',', $record->$field_name), $cat_id));
 			}
 		}
-		if(count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		if (count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',', $record->cat_id), $more_categories);
 
 		// Private set but missing causes hidden entries
-		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
+		if (array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
 
 		// Format birthday as backend requires - converter should give timestamp
-		if($record->bday && is_numeric($record->bday))
+		if ($record->bday && is_numeric($record->bday))
 		{
 			$time = new Api\DateTime($record->bday);
 			$record->bday = $time->format('Y-m-d');
 		}
 
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ($this->definition->plugin_options['conditions']) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$contacts = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
-						if($record_array[$condition['string']]) {
-							$searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
+						if ($record_array[$condition['string']]) {
+							$searchcondition = array($condition['string'] => $record_array[$condition['string']]);
 							// if we use account_id for the condition, we need to set the owner for filtering, as this
 							// enables Api\Contacts\Storage to decide what backend is to be used
-							if ($condition['string']=='account_id') $searchcondition['owner']=0;
+							if ($condition['string'] == 'account_id') $searchcondition['owner'] = 0;
 							$contacts = $this->bocontacts->search(
 								//array( $condition['string'] => $record[$condition['string']],),
 								'',
@@ -230,37 +230,37 @@ 
 								$searchcondition
 							);
 						}
-						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) {
+						if (is_array($contacts) && count(array_keys($contacts)) >= 1) {
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$contacts as $contact ) {
+							foreach ((array)$contacts as $contact) {
 								$record->id = $contact['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-									if ( !is_array( $record_array['cat_id'] ) ) $record->cat_id = explode( ',', $record->cat_id );
-									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $contact['cat_id'] ) ) );
+								if ($this->definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($contact['cat_id'])) $contact['cat_id'] = explode(',', $contact['cat_id']);
+									if (!is_array($record_array['cat_id'])) $record->cat_id = explode(',', $record->cat_id);
+									$record->cat_id = implode(',', array_unique(array_merge($record->cat_id, $contact['cat_id'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 					case 'equal':
 						// Match on field
 						$result = $this->equal($record, $condition);
-						if($result)
+						if ($result)
 						{
 							// Apply true action to any matching records found
 							$action = $condition['true'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						else
 						{
 							// Apply false action if no matching records found
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -272,7 +272,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		return $success;
 	}
@@ -284,11 +284,11 @@ 
 	 * @param importexport_iface_egw_record $record contact data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action($_action, importexport_iface_egw_record &$record, $record_num = 0) {
 		$_data = $record->get_record_array();
 
 		// Make sure picture is loaded/updated
-		if($_data['jpegphoto'])
+		if ($_data['jpegphoto'])
 		{
 			$_data['photo_unchanged'] = false;
 		}
@@ -297,15 +297,15 @@ 
 			case 'none' :
 				return true;
 			case 'delete':
-				if($_data['id'])
+				if ($_data['id'])
 				{
-					if ( $this->dry_run ) {
+					if ($this->dry_run) {
 						//print_r($_data);
 						$this->results[$_action]++;
 						return true;
 					}
 					$result = $this->bocontacts->delete($_data);
-					if($result && $result === true)
+					if ($result && $result === true)
 					{
 						$this->results[$_action]++;
 					}
@@ -320,14 +320,14 @@ 
 				// Only update if there are changes
 				$old = $this->bocontacts->read($_data['id']);
 				// if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes.
-				foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-					if (strlen(trim($_data[$c_prefix.'countryname']))==2)
+				foreach (array('adr_one_', 'adr_two_') as $c_prefix) {
+					if (strlen(trim($_data[$c_prefix.'countryname'])) == 2)
 						$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), true);
 				}
 				// Don't change a user account into a contact
-				if($old['owner'] == 0) {
+				if ($old['owner'] == 0) {
 					unset($_data['owner']);
-				} elseif(!$this->definition->plugin_options['change_owner']) {
+				} elseif (!$this->definition->plugin_options['change_owner']) {
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -337,7 +337,7 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if (count($changed) == 0) {
 					return true;
 				} else {
 					//error_log(__METHOD__.__LINE__.array2string($changed).' Old:'.$old['adr_one_countryname'].' ('.$old['adr_one_countrycode'].') New:'.$_data['adr_one_countryname'].' ('.$_data['adr_one_countryname'].')');
@@ -348,22 +348,22 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Addressbook backend doesn't like inserting with ID specified, it screws up the owner & etag
 					unset($_data['id']);
 				}
-				if(!isset($_data['org_name'])) {
+				if (!isset($_data['org_name'])) {
 					// org_name is a trigger to update n_fileas
 					$_data['org_name'] = '';
 				}
 
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bocontacts->save( $_data, $this->is_admin);
-					if(!$result) {
+					$result = $this->bocontacts->save($_data, $this->is_admin);
+					if (!$result) {
 						$this->errors[$record_num] = $this->bocontacts->error;
 					} else {
 						$this->ids[] = $result;
@@ -374,7 +374,7 @@ 
 					return $result;
 				}
 			default:
-				throw new Api\Exception('Unsupported action: '. $_action);
+				throw new Api\Exception('Unsupported action: '.$_action);
 
 		}
 	}
@@ -394,15 +394,15 @@ 
 
 		$delete = array_diff($contacts, $ids);
 
-		foreach($delete as $id)
+		foreach ($delete as $id)
 		{
-			if($this->dry_run || $this->bocontacts->delete($id))
+			if ($this->dry_run || $this->bocontacts->delete($id))
 			{
 				$this->results['deleted']++;
 			}
 			else
 			{
-				$this->warnings[] = lang('Unable to delete') . ': ' . Api\Link::title('addressbook', $id);
+				$this->warnings[] = lang('Unable to delete').': '.Api\Link::title('addressbook', $id);
 			}
 		}
 	}
@@ -446,7 +446,7 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl(importexport_definition &$definition=null)
+	public function get_options_etpl(importexport_definition &$definition = null)
 	{
 		// lets do it!
 	}

Braces +126 added lines, -51 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for addressbook
  */
-class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
+class addressbook_import_contacts_csv extends importexport_basic_import_csv
+{
 
 	/**
 	 * conditions for actions
@@ -56,7 +57,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		parent::import($_stream, $_definition);
 
 		if($_definition->plugin_options['empty_addressbook'])
@@ -71,7 +73,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition &$_definition ) {
+	public function init(importexport_definition &$_definition )
+	{
 
 		// fetch the addressbook bo
 		$this->bocontacts = new addressbook_bo();
@@ -132,22 +135,29 @@ 
 	{
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
-			if(!is_numeric($record->owner)) {
+		if($this->definition->plugin_options['owner_from_csv'] && $record->owner)
+		{
+			if(!is_numeric($record->owner))
+			{
 				// Automatically handle text owner without explicit translation
 				$new_owner = importexport_helper_functions::account_name2id($record->owner);
-				if($new_owner == '') {
+				if($new_owner == '')
+				{
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Unable to convert "%1" to account ID.  Using plugin setting (%2) for owner.',
 						$record->owner,
 						Api\Accounts::username($this->user)
 					);
 					$record->owner = $this->user;
-				} else {
+				}
+				else
+				{
 					$record->owner = $new_owner;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$record->owner = $this->user;
 		}
 
@@ -183,26 +193,41 @@ 
 		// Also handle categories in their own field
 		$record_array = $record->get_record_array();
 		$more_categories = array();
-		foreach($this->definition->plugin_options['field_mapping'] as $field_name) {
+		foreach($this->definition->plugin_options['field_mapping'] as $field_name)
+		{
 			if(!array_key_exists($field_name, $record_array) ||
-				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
+				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id')
+			{
+				continue;
+			}
 			list(, $cat_id) = explode('-', $field_name);
-			if(is_numeric($record->$field_name) && $record->$field_name != 1) {
+			if(is_numeric($record->$field_name) && $record->$field_name != 1)
+			{
 				// Column has a single category ID
 				$more_categories[] = $record->$field_name;
-			} elseif($record->$field_name == '1' ||
-				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes')))) {
+			}
+			elseif($record->$field_name == '1' ||
+				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes'))))
+			{
 				// Each category got its own column.  '1' is the database value, lang('yes') is the human value
 				$more_categories[] = $cat_id;
-			} else {
+			}
+			else
+			{
 				// Text categories
 				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',',$record->$field_name), $cat_id));
 			}
 		}
-		if(count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		if(count($more_categories) > 0)
+		{
+			$record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		}
 
 		// Private set but missing causes hidden entries
-		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
+		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == ''))
+		{
+			unset($record->private);
+		}
 
 		// Format birthday as backend requires - converter should give timestamp
 		if($record->bday && is_numeric($record->bday))
@@ -211,17 +236,24 @@ 
 			$record->bday = $time->format('Y-m-d');
 		}
 
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ( $this->definition->plugin_options['conditions'] )
+		{
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$contacts = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record_array[$condition['string']]) {
+						if($record_array[$condition['string']])
+						{
 							$searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
 							// if we use account_id for the condition, we need to set the owner for filtering, as this
 							// enables Api\Contacts\Storage to decide what backend is to be used
-							if ($condition['string']=='account_id') $searchcondition['owner']=0;
+							if ($condition['string']=='account_id')
+							{
+								$searchcondition['owner']=0;
+							}
 							$contacts = $this->bocontacts->search(
 								//array( $condition['string'] => $record[$condition['string']],),
 								'',
@@ -230,19 +262,30 @@ 
 								$searchcondition
 							);
 						}
-						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) {
+						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 )
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$contacts as $contact ) {
+							foreach ( (array)$contacts as $contact )
+							{
 								$record->id = $contact['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-									if ( !is_array( $record_array['cat_id'] ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $this->definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $contact['cat_id'] ) )
+									{
+										$contact['cat_id'] = explode( ',', $contact['cat_id'] );
+									}
+									if ( !is_array( $record_array['cat_id'] ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $contact['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -268,9 +311,14 @@ 
 					default :
 						die('condition / action not supported!!!');
 				}
-				if ($action['stop']) break;
+				if ($action['stop'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -284,7 +332,8 @@ 
 	 * @param importexport_iface_egw_record $record contact data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
 
 		// Make sure picture is loaded/updated
@@ -293,13 +342,15 @@ 
 			$_data['photo_unchanged'] = false;
 		}
 
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'delete':
 				if($_data['id'])
 				{
-					if ( $this->dry_run ) {
+					if ( $this->dry_run )
+					{
 						//print_r($_data);
 						$this->results[$_action]++;
 						return true;
@@ -320,14 +371,20 @@ 
 				// Only update if there are changes
 				$old = $this->bocontacts->read($_data['id']);
 				// if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes.
-				foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
+				foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+				{
 					if (strlen(trim($_data[$c_prefix.'countryname']))==2)
-						$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), true);
+					{
+											$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), true);
+					}
 				}
 				// Don't change a user account into a contact
-				if($old['owner'] == 0) {
+				if($old['owner'] == 0)
+				{
 					unset($_data['owner']);
-				} elseif(!$this->definition->plugin_options['change_owner']) {
+				}
+				elseif(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -337,9 +394,12 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if(count($changed) == 0)
+				{
 					return true;
-				} else {
+				}
+				else
+				{
 					//error_log(__METHOD__.__LINE__.array2string($changed).' Old:'.$old['adr_one_countryname'].' ('.$old['adr_one_countrycode'].') New:'.$_data['adr_one_countryname'].' ('.$_data['adr_one_countryname'].')');
 				}
 
@@ -348,24 +408,32 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Addressbook backend doesn't like inserting with ID specified, it screws up the owner & etag
 					unset($_data['id']);
 				}
-				if(!isset($_data['org_name'])) {
+				if(!isset($_data['org_name']))
+				{
 					// org_name is a trigger to update n_fileas
 					$_data['org_name'] = '';
 				}
 
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bocontacts->save( $_data, $this->is_admin);
-					if(!$result) {
+					if(!$result)
+					{
 						$this->errors[$record_num] = $this->bocontacts->error;
-					} else {
+					}
+					else
+					{
 						$this->ids[] = $result;
 						$this->results[$_action]++;
 						// This does nothing (yet?) but update the identifier
@@ -412,7 +480,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV import');
 	}
 
@@ -421,7 +490,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports contacts into your Addressbook from a CSV File. CSV means 'Comma Separated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -430,7 +500,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -456,7 +527,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -468,7 +540,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -480,7 +553,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -492,7 +566,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 }

addressbook/inc/class.addressbook_vcal.inc.php

Indentation +44 added lines, -44 removed lines

@@ -90,20 +90,20 @@ 
 	 */
 	var $clientProperties;
 	/**
-	* Set Logging
-	*
-	* @var string
-	* off = false;
-	*/
+	 * Set Logging
+	 *
+	 * @var string
+	 * off = false;
+	 */
 	var $log = false;
 	var $logfile="/tmp/log-vcard";
 	/**
-	* Constructor
-	*
-	* @param string $contact_app			the current application
-	* @param string	$_contentType			the content type (version)
-	* @param array $_clientProperties		client properties
-	*/
+	 * Constructor
+	 *
+	 * @param string $contact_app			the current application
+	 * @param string	$_contentType			the content type (version)
+	 * @param array $_clientProperties		client properties
+	 */
 	function __construct($contact_app='addressbook', $_contentType='text/x-vcard', &$_clientProperties = array())
 	{
 		parent::__construct($contact_app);
@@ -126,15 +126,15 @@ 
 		$this->supportedFields = $this->databaseFields;
 	}
 	/**
-	* import a vard into addressbook
-	*
-	* @param string	$_vcard		the vcard
-	* @param int/string	$_abID =null		the internal addressbook id or !$_abID for a new enty
-	* @param boolean $merge =false	merge data with existing entry
-	* @param string $charset  The encoding charset for $text. Defaults to
-    *                         utf-8 for new format, iso-8859-1 for old format.
-	* @return int contact id
-	*/
+	 * import a vard into addressbook
+	 *
+	 * @param string	$_vcard		the vcard
+	 * @param int/string	$_abID =null		the internal addressbook id or !$_abID for a new enty
+	 * @param boolean $merge =false	merge data with existing entry
+	 * @param string $charset  The encoding charset for $text. Defaults to
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 * @return int contact id
+	 */
 	function addVCard($_vcard, $_abID=null, $merge=false, $charset=null)
 	{
 		if (!($contact = $this->vcardtoegw($_vcard, $charset))) return false;
@@ -174,17 +174,17 @@ 
 			$contact['id'] = $_abID;
 		}
 		else
-    	{
-    		if (is_array($contact['cat_id']))
+		{
+			if (is_array($contact['cat_id']))
 			{
 				$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));
 			}
-    	}
-    	if (isset($contact['owner']) && $contact['owner'] != $this->user)
-    	{
-    		$contact['private'] = 0;	// foreign contacts are never private!
-    	}
-    	if ($this->log)
+		}
+		if (isset($contact['owner']) && $contact['owner'] != $this->user)
+		{
+			$contact['private'] = 0;	// foreign contacts are never private!
+		}
+		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
 				array2string($contact)."\n",3,$this->logfile);
@@ -193,13 +193,13 @@ 
 	}
 
 	/**
-	* return a vcard
-	*
-	* @param int/string	$_id the id of the contact
-	* @param string $_charset ='UTF-8' encoding of the vcard, default UTF-8
-	* @param boolean $extra_charset_attribute =true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it
-	* @return string containing the vcard
-	*/
+	 * return a vcard
+	 *
+	 * @param int/string	$_id the id of the contact
+	 * @param string $_charset ='UTF-8' encoding of the vcard, default UTF-8
+	 * @param boolean $extra_charset_attribute =true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it
+	 * @return string containing the vcard
+	 */
 	function getVCard($_id,$_charset='UTF-8',$extra_charset_attribute=true)
 	{
 		$vCard = new Horde_Icalendar_Vcard($this->version);
@@ -533,14 +533,14 @@ 
 	}
 
 	/**
-     * Parses a string containing vCard data.
-     *
-     * @param string $_vcard   The data to parse.
-     * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
-     * @return array|boolean   The contact data or false on errors.
-     */
+	 * Parses a string containing vCard data.
+	 *
+	 * @param string $_vcard   The data to parse.
+	 * @param string $charset  The encoding charset for $text. Defaults to
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
+	 * @return array|boolean   The contact data or false on errors.
+	 */
 	function vcardtoegw($_vcard, $charset=null)
 	{
 		// the horde class does the charset conversion. DO NOT CONVERT HERE.
@@ -799,7 +799,7 @@ 
 					}
 					break;
 				case 'TEL;OTHER;VOICE':
-				    if (!in_array('TEL;OTHER', $rowNames)
+					if (!in_array('TEL;OTHER', $rowNames)
 							&& !isset($finalRowNames['TEL;OTHER']))
 					{
 						$finalRowNames['TEL;OTHER'] = $vcardKey;

Braces +38 added lines, -13 removed lines

@@ -137,7 +137,10 @@ 
 	*/
 	function addVCard($_vcard, $_abID=null, $merge=false, $charset=null)
 	{
-		if (!($contact = $this->vcardtoegw($_vcard, $charset))) return false;
+		if (!($contact = $this->vcardtoegw($_vcard, $charset)))
+		{
+			return false;
+		}
 
 		if ($_abID)
 		{
@@ -174,9 +177,9 @@ 
 			$contact['id'] = $_abID;
 		}
 		else
-    	{
+		{
     		if (is_array($contact['cat_id']))
-			{
+    		{
 				$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));
 			}
     	}
@@ -185,7 +188,7 @@ 
     		$contact['private'] = 0;	// foreign contacts are never private!
     	}
     	if ($this->log)
-		{
+    	{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
 				array2string($contact)."\n",3,$this->logfile);
 		}
@@ -331,9 +334,12 @@ 
 						break;
 
 					case 'cat_id':
-						if (!empty($value) && ($values = /*str_replace(',','\\,',*/$this->get_categories($value)))//)
+						if (!empty($value) && ($values = /*str_replace(',','\\,',*/$this->get_categories($value)))
+						{
+							//)
 						{
 							$values = (array) Api\Translation::convert($values, $sysCharSet, $_charset);
+						}
 							$value = implode(',', $values); // just for the CHARSET recognition
 							if (($size > 0) && strlen($value) > $size)
 							{
@@ -386,8 +392,14 @@ 
 						if (isset($this->supportedFields['X-ABSHOWAS']) &&
 							$entry['org_name'] == $entry['n_fileas'] && $entry['fileas_type'] == 'org_name')
 						{
-							if ($vcardField == 'X-ABSHOWAS') $value = 'COMPANY';
-							if ($databaseField == 'n_fn') $value = $entry['org_name'];
+							if ($vcardField == 'X-ABSHOWAS')
+							{
+								$value = 'COMPANY';
+							}
+							if ($databaseField == 'n_fn')
+							{
+								$value = $entry['org_name'];
+							}
 						}
 						//error_log("vcardField='$vcardField', databaseField='$databaseField', this->supportedFields['X-ABSHOWAS']=".array2string($this->supportedFields['X-ABSHOWAS'])." --> value='$value'");
 						// fall-through
@@ -524,12 +536,18 @@ 
 		$this->productManufacturer = strtolower($_productManufacturer);
 		$this->productName = strtolower($_productName);
 
-		if (is_array($_supportedFields)) $this->supportedFields = $_supportedFields;
+		if (is_array($_supportedFields))
+		{
+			$this->supportedFields = $_supportedFields;
+		}
 	}
 
 	function setDatabaseFields($_databaseFields)
 	{
-		if (is_array($_databaseFields)) $this->databaseFields = $_databaseFields;
+		if (is_array($_databaseFields))
+		{
+			$this->databaseFields = $_databaseFields;
+		}
 	}
 
 	/**
@@ -681,7 +699,10 @@ 
 					case 'VOICE':
 					case 'OTHER':
 					case 'CELL':
-						if ($rowName != 'TEL') break;
+						if ($rowName != 'TEL')
+						{
+							break;
+						}
 					case 'WORK':
 					case 'HOME':
 						$rowName .= ';' . $pname;
@@ -801,7 +822,7 @@ 
 				case 'TEL;OTHER;VOICE':
 				    if (!in_array('TEL;OTHER', $rowNames)
 							&& !isset($finalRowNames['TEL;OTHER']))
-					{
+				    {
 						$finalRowNames['TEL;OTHER'] = $vcardKey;
 					}
 					break;
@@ -924,7 +945,10 @@ 
 		{
 			foreach($fields as $field)
 			{
-				if ($field != 'fileas_type') $contact[$field] = null;
+				if ($field != 'fileas_type')
+				{
+					$contact[$field] = null;
+				}
 			}
 		}
 
@@ -982,7 +1006,8 @@ 
 								break;
 
 							case 'uid':
-								if (strlen($value) < $minimum_uid_length) {
+								if (strlen($value) < $minimum_uid_length)
+								{
 									// we don't use it
 									break;
 								}

Spacing +91 added lines, -91 removed lines

@@ -38,20 +38,20 @@ 
 	 * @var array
 	 */
 	var $databaseFields = array( // all entries e.g. for CardDAV
-			'ADR;WORK'			=> array('','adr_one_street2','adr_one_street','adr_one_locality','adr_one_region',
-									'adr_one_postalcode','adr_one_countryname'),
-			'ADR;HOME'			=> array('','adr_two_street2','adr_two_street','adr_two_locality','adr_two_region',
-									'adr_two_postalcode','adr_two_countryname'),
+			'ADR;WORK'			=> array('', 'adr_one_street2', 'adr_one_street', 'adr_one_locality', 'adr_one_region',
+									'adr_one_postalcode', 'adr_one_countryname'),
+			'ADR;HOME'			=> array('', 'adr_two_street2', 'adr_two_street', 'adr_two_locality', 'adr_two_region',
+									'adr_two_postalcode', 'adr_two_countryname'),
 			'BDAY'				=> array('bday'),
 			'CLASS'				=> array('private'),
 			'CATEGORIES'			=> array('cat_id'),
 			'EMAIL;WORK'			=> array('email'),
 			'EMAIL;HOME'			=> array('email_home'),
-			'N'				=> array('n_family','n_given','n_middle',
-									'n_prefix','n_suffix'),
+			'N'				=> array('n_family', 'n_given', 'n_middle',
+									'n_prefix', 'n_suffix'),
 			'FN'				=> array('n_fn'),
 			'NOTE'				=> array('note'),
-			'ORG'				=> array('org_name','org_unit','room'),
+			'ORG'				=> array('org_name', 'org_unit', 'room'),
 			'TEL;CELL;WORK'			=> array('tel_cell'),
 			'TEL;CELL;HOME'			=> array('tel_cell_private'),
 			'TEL;CAR'			=> array('tel_car'),
@@ -98,7 +98,7 @@ 
 	* off = false;
 	*/
 	var $log = false;
-	var $logfile="/tmp/log-vcard";
+	var $logfile = "/tmp/log-vcard";
 	/**
 	* Constructor
 	*
@@ -106,16 +106,16 @@ 
 	* @param string	$_contentType			the content type (version)
 	* @param array $_clientProperties		client properties
 	*/
-	function __construct($contact_app='addressbook', $_contentType='text/x-vcard', &$_clientProperties = array())
+	function __construct($contact_app = 'addressbook', $_contentType = 'text/x-vcard', &$_clientProperties = array())
 	{
 		parent::__construct($contact_app);
 		if ($this->log)
 		{
 			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcard";
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($_contentType)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($_contentType)."\n", 3, $this->logfile);
 		}
-		switch($_contentType)
+		switch ($_contentType)
 		{
 			case 'text/vcard':
 				$this->version = '3.0';
@@ -137,7 +137,7 @@ 
     *                         utf-8 for new format, iso-8859-1 for old format.
 	* @return int contact id
 	*/
-	function addVCard($_vcard, $_abID=null, $merge=false, $charset=null)
+	function addVCard($_vcard, $_abID = null, $merge = false, $charset = null)
 	{
 		if (!($contact = $this->vcardtoegw($_vcard, $charset))) return false;
 
@@ -163,7 +163,7 @@ 
 					}
 					if (is_array($contact['cat_id']))
 					{
-						$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], $_abID));
+						$contact['cat_id'] = implode(',', $this->find_or_add_categories($contact['cat_id'], $_abID));
 					}
 					else
 					{
@@ -179,17 +179,17 @@ 
     	{
     		if (is_array($contact['cat_id']))
 			{
-				$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));
+				$contact['cat_id'] = implode(',', $this->find_or_add_categories($contact['cat_id'], -1));
 			}
     	}
     	if (isset($contact['owner']) && $contact['owner'] != $this->user)
     	{
-    		$contact['private'] = 0;	// foreign contacts are never private!
+    		$contact['private'] = 0; // foreign contacts are never private!
     	}
     	if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($contact)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($contact)."\n", 3, $this->logfile);
 		}
 		return $this->save($contact);
 	}
@@ -202,10 +202,10 @@ 
 	* @param boolean $extra_charset_attribute =true GroupDAV/CalDAV dont need the charset attribute and some clients have problems with it
 	* @return string containing the vcard
 	*/
-	function getVCard($_id,$_charset='UTF-8',$extra_charset_attribute=true)
+	function getVCard($_id, $_charset = 'UTF-8', $extra_charset_attribute = true)
 	{
 		$vCard = new Horde_Icalendar_Vcard($this->version);
-		$vCard->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Addressbook '.$GLOBALS['egw_info']['apps']['api']['version'].'//'.
+		$vCard->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Addressbook '.$GLOBALS['egw_info']['apps']['api']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 
 		$sysCharSet = Api\Translation::charset();
@@ -239,7 +239,7 @@ 
 				if (!$oval && ($this->version == '3.0'))
 				{
 					// declare OPTION as TYPE=OPTION
-					$options['TYPE'][] = $oname ;
+					$options['TYPE'][] = $oname;
 				}
 				else
 				{
@@ -259,9 +259,9 @@ 
 				$noTruncate = $this->clientProperties[$vcardField]['NoTruncate'];
 				if ($this->log && $size > 0)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-						"() $vcardField Size: $size, NoTruncate: " .
-						($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+						"() $vcardField Size: $size, NoTruncate: ".
+						($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 				}
 				//Horde::logMessage("vCalAddressbook $vcardField Size: $size, NoTruncate: " .
 				//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -283,7 +283,7 @@ 
 				switch ($databaseField)
 				{
 					case 'modified':
-						$value = gmdate("Y-m-d\TH:i:s\Z",Api\DateTime::user2server($value));
+						$value = gmdate("Y-m-d\TH:i:s\Z", Api\DateTime::user2server($value));
 						$hasdata++;
 						break;
 
@@ -297,21 +297,21 @@ 
 						{
 							if ($size == 8)
 							{
-								$value = str_replace('-','',$value);
+								$value = str_replace('-', '', $value);
 							}
 							elseif (isset($options['TYPE']) && (
 								$options['TYPE'] == 'BASIC'))
 							{
 								unset($options['TYPE']);
 								// used by old SyncML implementations
-								$value = str_replace('-','',$value).'T000000Z';
+								$value = str_replace('-', '', $value).'T000000Z';
 							}
 							$hasdata++;
 						}
 						break;
 
 					case 'jpegphoto':
-						if (empty($value) && ($entry['files'] & Api\Contacts::FILES_BIT_PHOTO))
+						if (empty($value) && ($entry['files']&Api\Contacts::FILES_BIT_PHOTO))
 						{
 							$value = file_get_contents(Api\Link::vfs_path('addressbook', $entry['id'], Api\Contacts::FILES_PHOTO));
 						}
@@ -351,7 +351,7 @@ 
 					case 'cat_id':
 						if (!empty($value) && ($values = /*str_replace(',','\\,',*/$this->get_categories($value)))//)
 						{
-							$values = (array) Api\Translation::convert($values, $sysCharSet, $_charset);
+							$values = (array)Api\Translation::convert($values, $sysCharSet, $_charset);
 							$value = implode(',', $values); // just for the CHARSET recognition
 							if (($size > 0) && strlen($value) > $size)
 							{
@@ -361,8 +361,8 @@ 
 								{
 									if ($this->log)
 									{
-										error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-										"() $vcardField omitted due to maximum size $size\n",3,$this->logfile);
+										error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+										"() $vcardField omitted due to maximum size $size\n", 3, $this->logfile);
 									}
 									// Horde::logMessage("vCalAddressbook $vcardField omitted due to maximum size $size",
 									//		__FILE__, __LINE__, PEAR_LOG_WARNING);
@@ -411,14 +411,14 @@ 
 						// fall-through
 
 					default:
-						if (($size > 0) && strlen(implode(',', $values) . $value) > $size)
+						if (($size > 0) && strlen(implode(',', $values).$value) > $size)
 						{
 							if ($noTruncate)
 							{
 								if ($this->log)
 								{
-									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-										"() $vcardField omitted due to maximum size $size\n",3,$this->logfile);
+									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+										"() $vcardField omitted due to maximum size $size\n", 3, $this->logfile);
 								}
 								// Horde::logMessage("vCalAddressbook $vcardField omitted due to maximum size $size",
 								//		__FILE__, __LINE__, PEAR_LOG_WARNING);
@@ -437,14 +437,14 @@ 
 							}
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $vcardField truncated to maximum size $size\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $vcardField truncated to maximum size $size\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalAddressbook $vcardField truncated to maximum size $size",
 							//		__FILE__, __LINE__, PEAR_LOG_INFO);
 						}
 						if (!empty($value) // required field
-							|| in_array($vcardField,array('FN','ORG','N'))
+							|| in_array($vcardField, array('FN', 'ORG', 'N'))
 							|| ($size >= 0 && !$noTruncate))
 						{
 							$value = Api\Translation::convert(trim($value), $sysCharSet, $_charset);
@@ -509,15 +509,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"() '$this->productManufacturer','$this->productName'\n",3,$this->logfile);
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($result)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productManufacturer','$this->productName'\n", 3, $this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($result)."\n", 3, $this->logfile);
 		}
 		return $result;
 	}
 
-	function search($_vcard, $contentID=null, $relax=false, $charset=null)
+	function search($_vcard, $contentID = null, $relax = false, $charset = null)
 	{
 		$result = array();
 
@@ -525,7 +525,7 @@ 
 		{
 			if (is_array($contact['category']))
 			{
-					$contact['category'] = implode(',',$this->find_or_add_categories($contact['category'],
+					$contact['category'] = implode(',', $this->find_or_add_categories($contact['category'],
 						$contentID ? $contentID : -1));
 			}
 			if ($contentID)
@@ -537,7 +537,7 @@ 
 		return $result;
 	}
 
-	function setSupportedFields($_productManufacturer='file', $_productName='', $_supportedFields = null)
+	function setSupportedFields($_productManufacturer = 'file', $_productName = '', $_supportedFields = null)
 	{
 		$this->productManufacturer = strtolower($_productManufacturer);
 		$this->productName = strtolower($_productName);
@@ -559,18 +559,18 @@ 
      *
      * @return array|boolean   The contact data or false on errors.
      */
-	function vcardtoegw($_vcard, $charset=null)
+	function vcardtoegw($_vcard, $charset = null)
 	{
 		// the horde class does the charset conversion. DO NOT CONVERT HERE.
 		// be as flexible as possible
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($_vcard)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($_vcard)."\n", 3, $this->logfile);
 		}
 
-		if(!($_vcard instanceof Horde_Icalendar))
+		if (!($_vcard instanceof Horde_Icalendar))
 		{
 			$container = false;
 			$vCard = Horde_Icalendar::newComponent('vcard', $container);
@@ -611,10 +611,10 @@ 
 		$pref_tel = false;
 
 		$rowNames = array();
-		foreach($vcardValues as $key => $vcardRow)
+		foreach ($vcardValues as $key => $vcardRow)
 		{
-			$rowName  = strtoupper($vcardRow['name']);
-			if ($vcardRow['value'] == ''  && implode('', $vcardRow['values']) == '')
+			$rowName = strtoupper($vcardRow['name']);
+			if ($vcardRow['value'] == '' && implode('', $vcardRow['values']) == '')
 			{
 				unset($vcardRow);
 				continue;
@@ -689,7 +689,7 @@ 
 				switch ($pname)
 				{
 					case 'PREF':
-						if (substr($rowName,0,3) == 'TEL' && !$pref_tel)
+						if (substr($rowName, 0, 3) == 'TEL' && !$pref_tel)
 						{
 							$pref_tel = $key;
 						}
@@ -702,7 +702,7 @@ 
 						if ($rowName != 'TEL') break;
 					case 'WORK':
 					case 'HOME':
-						$rowName .= ';' . $pname;
+						$rowName .= ';'.$pname;
 						break;
 					case 'CAR':
 					case 'X-CUSTOMLABEL-CAR':
@@ -722,7 +722,7 @@ 
 						if (strpos($pname, 'X-FUNAMBOL-') === 0)
 						{
 							// Propriatary Funambol extension will be ignored
-							$rowName .= ';' . $pname;
+							$rowName .= ';'.$pname;
 						}
 						break;
 				}
@@ -730,39 +730,39 @@ 
 
 			if ($rowName == 'EMAIL')
 			{
-				$rowName .= ';X-egw-Ref' . $email++;
+				$rowName .= ';X-egw-Ref'.$email++;
 			}
 
 			if (($rowName == 'TEL;CELL') ||
 					($rowName == 'TEL;CELL;VOICE'))
 			{
-				$rowName = 'TEL;CELL;X-egw-Ref' . $cell++;
+				$rowName = 'TEL;CELL;X-egw-Ref'.$cell++;
 			}
 
 			if (($rowName == 'TEL') ||
 					($rowName == 'TEL;VOICE'))
 			{
-				$rowName = 'TEL;X-egw-Ref' . $tel++;
+				$rowName = 'TEL;X-egw-Ref'.$tel++;
 			}
 
 			if ($rowName == 'URL')
 			{
-				$rowName = 'URL;X-egw-Ref' . $url++;
+				$rowName = 'URL;X-egw-Ref'.$url++;
 			}
 
 			// current algorithm cant cope with multiple attributes of same name
 			// --> cumulate them in values, so they can be used later (works only for values, not for parameters!)
 			if (($k = array_search($rowName, $rowNames)) != false)
 			{
-				$vcardValues[$k]['values'] = array_merge($vcardValues[$k]['values'],$vcardValues[$key]['values']);
+				$vcardValues[$k]['values'] = array_merge($vcardValues[$k]['values'], $vcardValues[$key]['values']);
 			}
 			$rowNames[$key] = $rowName;
 		}
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($rowNames)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($rowNames)."\n", 3, $this->logfile);
 		}
 
 		// All rowNames of the vCard are now concatenated with their qualifiers.
@@ -932,15 +932,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($finalRowNames)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($finalRowNames)."\n", 3, $this->logfile);
 		}
 
 		$contact = array();
 		// to be able to delete fields, we have to set all supported fields to at least null
-		foreach($this->supportedFields as $fields)
+		foreach ($this->supportedFields as $fields)
 		{
-			foreach($fields as $field)
+			foreach ($fields as $field)
 			{
 				if ($field != 'fileas_type') $contact[$field] = null;
 			}
@@ -963,16 +963,16 @@ 
 						{
 							$contact['tel_prefer'] = $fieldName;
 						}
-						switch($fieldName)
+						switch ($fieldName)
 						{
 							case 'bday':
-								$contact[$fieldName] = $vcardValues[$vcardKey]['value']['year'] .
-									'-' . $vcardValues[$vcardKey]['value']['month'] .
-									'-' . $vcardValues[$vcardKey]['value']['mday'];
+								$contact[$fieldName] = $vcardValues[$vcardKey]['value']['year'].
+									'-'.$vcardValues[$vcardKey]['value']['month'].
+									'-'.$vcardValues[$vcardKey]['value']['mday'];
 								break;
 
 							case 'private':
-								$contact[$fieldName] = (int) ( strtoupper($value) == 'PRIVATE');
+								$contact[$fieldName] = (int)(strtoupper($value) == 'PRIVATE');
 								break;
 
 							case 'cat_id':
@@ -981,7 +981,7 @@ 
 
 							case 'jpegphoto':
 								$contact[$fieldName] = $vcardValues[$vcardKey]['value'];
-								if(in_array($vcardValues[$vcardKey]['params']['ENCODING'],array('b','B','BASE64')))
+								if (in_array($vcardValues[$vcardKey]['params']['ENCODING'], array('b', 'B', 'BASE64')))
 								{
 									$contact[$fieldName] = base64_decode($contact[$fieldName]);
 								}
@@ -989,7 +989,7 @@ 
 
 							case 'pubkey':
 								$content = $vcardValues[$vcardKey]['value'];
-								if(in_array($vcardValues[$vcardKey]['params']['ENCODING'],array('b','B','BASE64')))
+								if (in_array($vcardValues[$vcardKey]['params']['ENCODING'], array('b', 'B', 'BASE64')))
 								{
 									$content = base64_decode($content);
 								}
@@ -1025,7 +1025,7 @@ 
 				}
 			}
 			// add unsupported attributes as with '##' prefix
-			elseif(($attribute = $vcardValues[$vcardKey]) && !in_array($attribute['name'],array('PRODID','REV')))
+			elseif (($attribute = $vcardValues[$vcardKey]) && !in_array($attribute['name'], array('PRODID', 'REV')))
 			{
 				// for attributes with multiple values in multiple lines, merge the values
 				if (isset($contact['##'.$attribute['name']]))
@@ -1044,10 +1044,10 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__	.
-				"() '$this->productManufacturer','$this->productName'\n",3,$this->logfile);
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($contact)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productManufacturer','$this->productName'\n", 3, $this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($contact)."\n", 3, $this->logfile);
 		}
 		return $contact;
 	}
@@ -1058,14 +1058,14 @@ 
 	 * @param array $ids contact-ids
 	 * @param string $file filename or null for download
 	 */
-	function export($ids, $file=null)
+	function export($ids, $file = null)
 	{
 		if (!$file)
 		{
-			$filename = count($ids) == 1 ? Link::title('addressbook',$ids[0]): 'egw_addressbook_'.date('Y-m-d');
-			Api\Header\Content::type(($filename ? $filename : 'addressbook').'.vcf','text/x-vcard');
+			$filename = count($ids) == 1 ? Link::title('addressbook', $ids[0]) : 'egw_addressbook_'.date('Y-m-d');
+			Api\Header\Content::type(($filename ? $filename : 'addressbook').'.vcf', 'text/x-vcard');
 		}
-		if (!($fp = fopen($file ? $file : 'php://output','w')))
+		if (!($fp = fopen($file ? $file : 'php://output', 'w')))
 		{
 			return false;
 		}
@@ -1079,7 +1079,7 @@ 
 		}
 		foreach ($ids as $id)
 		{
-			fwrite($fp,$this->getVCard($id, $charset));
+			fwrite($fp, $this->getVCard($id, $charset));
 		}
 		fclose($fp);
 
@@ -1097,22 +1097,22 @@ 
 	 * @param string $version ='3.0' vcard version
 	 * @return string containing the vcard
 	 */
-	function getGroupVCard(array $list,$version='3.0')
+	function getGroupVCard(array $list, $version = '3.0')
 	{
 		$vCard = new Horde_Icalendar_Vcard($version);
-		$vCard->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Addressbook '.$GLOBALS['egw_info']['apps']['api']['version'].'//'.
+		$vCard->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Addressbook '.$GLOBALS['egw_info']['apps']['api']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 
-		$vCard->setAttribute('N',$list['list_name'],array(),true,array($list['list_name'],'','','',''));
-		$vCard->setAttribute('FN',$list['list_name']);
+		$vCard->setAttribute('N', $list['list_name'], array(), true, array($list['list_name'], '', '', '', ''));
+		$vCard->setAttribute('FN', $list['list_name']);
 
-		$vCard->setAttribute('X-ADDRESSBOOKSERVER-KIND','group');
-		foreach($list['members'] as $uid)
+		$vCard->setAttribute('X-ADDRESSBOOKSERVER-KIND', 'group');
+		foreach ($list['members'] as $uid)
 		{
-			$vCard->setAttribute('X-ADDRESSBOOKSERVER-MEMBER','urn:uuid:'.$uid);
+			$vCard->setAttribute('X-ADDRESSBOOKSERVER-MEMBER', 'urn:uuid:'.$uid);
 		}
-		$vCard->setAttribute('REV',Api\DateTime::to($list['list_modified'],'Y-m-d\TH:i:s\Z'));
-		$vCard->setAttribute('UID',$list['list_uid']);
+		$vCard->setAttribute('REV', Api\DateTime::to($list['list_modified'], 'Y-m-d\TH:i:s\Z'));
+		$vCard->setAttribute('UID', $list['list_uid']);
 
 		return $vCard->exportvCalendar();
 	}

addressbook/inc/class.addressbook_zpush.inc.php

Indentation +25 added lines, -25 removed lines

@@ -277,7 +277,7 @@ 
 	 * @param string $id folder id
 	 * @param int $cutoffdate =null
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
 		unset($cutoffdate);	// not used, but required by function signature
@@ -378,10 +378,10 @@ 
 				case 'bday':	// zpush seems to use a timestamp in utc (at least vcard backend does)
 					if (!empty($contact[$attr]))
 					{
-            			$tz = date_default_timezone_get();
-            			date_default_timezone_set('UTC');
-            			$message->birthday = strtotime($contact[$attr]);
-            			date_default_timezone_set($tz);
+						$tz = date_default_timezone_get();
+						date_default_timezone_set('UTC');
+						$message->birthday = strtotime($contact[$attr]);
+						date_default_timezone_set($tz);
 					}
 					break;
 
@@ -634,7 +634,7 @@ 
 	 * @param $folderid of the current folder
 	 * @param $id of the message
 	 * @param $newfolderid
-     * @param ContentParameters   $contentParameters
+	 * @param ContentParameters   $contentParameters
 	 *
 	 * @return $newid as a string | boolean false on error
 	 *
@@ -662,7 +662,7 @@ 
 	 *
 	 * @param $folderid
 	 * @param $id
-     * @param ContentParameters   $contentParameters
+	 * @param ContentParameters   $contentParameters
 	 *
 	 * @return boolean true on success, false on error, diffbackend does NOT use the returnvalue
 	 *
@@ -681,23 +681,23 @@ 
 		return $ret;
 	}
 
-    /**
-     * Changes the 'read' flag of a message on disk. The $flags
-     * parameter can only be '1' (read) or '0' (unread). After a call to
-     * SetReadFlag(), GetMessageList() should return the message with the
-     * new 'flags' but should not modify the 'mod' parameter. If you do
-     * change 'mod', simply setting the message to 'read' on the mobile will trigger
-     * a full resync of the item from the server.
-     *
-     * @param string              $folderid            id of the folder
-     * @param string              $id                  id of the message
-     * @param int                 $flags               read flag of the message
-     * @param ContentParameters   $contentParameters
-     *
-     * @access public
-     * @return boolean                      status of the operation
-     * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
-     */
+	/**
+	 * Changes the 'read' flag of a message on disk. The $flags
+	 * parameter can only be '1' (read) or '0' (unread). After a call to
+	 * SetReadFlag(), GetMessageList() should return the message with the
+	 * new 'flags' but should not modify the 'mod' parameter. If you do
+	 * change 'mod', simply setting the message to 'read' on the mobile will trigger
+	 * a full resync of the item from the server.
+	 *
+	 * @param string              $folderid            id of the folder
+	 * @param string              $id                  id of the message
+	 * @param int                 $flags               read flag of the message
+	 * @param ContentParameters   $contentParameters
+	 *
+	 * @access public
+	 * @return boolean                      status of the operation
+	 * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
+	 */
 	function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
 		unset($folderid, $id, $flags, $contentParameters);
@@ -713,7 +713,7 @@ 
 	 *
 	 *
 	 * @DESC The $flags parameter must contains the poommailflag Object
- 	 */
+	 */
 	function ChangeMessageFlag($folderid, $id, $flags)
 	{
 		unset($folderid, $id, $flags);

Spacing +59 added lines, -60 removed lines

@@ -71,7 +71,7 @@ 
 		'homestreet'	=>	'adr_two_street',
 		'homefaxnumber'	=> 'tel_fax_home',
 		'homephonenumber'	=>	'tel_home',
-		'jobtitle'	=>	'title',	// unfortunatly outlook only has title & jobtitle, while EGw has 'n_prefix', 'title' & 'role',
+		'jobtitle'	=>	'title', // unfortunatly outlook only has title & jobtitle, while EGw has 'n_prefix', 'title' & 'role',
 		'lastname'	=> 'n_family',
 		'middlename'	=> 'n_middle',
 		'mobilephonenumber'	=> 'tel_cell',
@@ -123,9 +123,9 @@ 
 	 * @param booelan $ab_prefix =false prefix personal, private and accounts addressbook with lang('Addressbook').' '
 	 * @return string|array addressbook name of array with int account_id => label pairs
 	 */
-	private function get_addressbooks($account=null,$return_all_in_one=true, $ab_prefix=false)
+	private function get_addressbooks($account = null, $return_all_in_one = true, $ab_prefix = false)
 	{
-		static $abs=null;
+		static $abs = null;
 
 		if (!isset($abs) || !$return_all_in_one)
 		{
@@ -137,13 +137,13 @@ 
 			}
 			else
 			{
-				Api\Translation::add_app('addressbook');	// we need the addressbook translations
+				Api\Translation::add_app('addressbook'); // we need the addressbook translations
 
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 				// error_log(print_r($this->addressbook->get_addressbooks(Acl::READ),true));
 				$pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
-				$pref_abs = (string)$pref !== '' ? explode(',',$pref) : array();
+				$pref_abs = (string)$pref !== '' ? explode(',', $pref) : array();
 
 				foreach ($this->addressbook->get_addressbooks() as $account_id => $label)
 				{
@@ -151,18 +151,17 @@ 
 					{
 						$account_id = self::PRIVATE_AB;
 					}
-					if ($account_id && in_array($account_id,$pref_abs) || in_array('A',$pref_abs) ||
-						$account_id == 0 && in_array('U',$pref_abs) ||
-						$account_id == $GLOBALS['egw_info']['user']['account_id'] ||	// allways sync pers. AB
-						$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$pref_abs))
+					if ($account_id && in_array($account_id, $pref_abs) || in_array('A', $pref_abs) ||
+						$account_id == 0 && in_array('U', $pref_abs) ||
+						$account_id == $GLOBALS['egw_info']['user']['account_id'] || // allways sync pers. AB
+						$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G', $pref_abs))
 					{
 						$abs[$account_id] = $label;
 					}
 				}
 			}
 		}
-		$ret = is_null($account) ? $abs :
-			($ab_prefix && (!$account || (int)$account == (int)$GLOBALS['egw_info']['user']['account_id']) ?
+		$ret = is_null($account) ? $abs : ($ab_prefix && (!$account || (int)$account == (int)$GLOBALS['egw_info']['user']['account_id']) ?
 				lang('Addressbook').' ' : '').$abs[$account];
 		//error_log(__METHOD__."($account, $return_all_in_one, $ab_prefix) returning ".array2string($ret));
 		return $ret;
@@ -180,7 +179,7 @@ 
 		foreach ($this->get_addressbooks() as $account => $label)
 		{
 			$folderlist[] = array(
-				'id'	=>	$this->backend->createID('addressbook',$account),
+				'id'	=>	$this->backend->createID('addressbook', $account),
 				'mod'	=>	$label,
 				'parent'=>	'0',
 			);
@@ -278,20 +277,20 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL)
+	function GetMessageList($id, $cutoffdate = NULL)
 	{
-		unset($cutoffdate);	// not used, but required by function signature
+		unset($cutoffdate); // not used, but required by function signature
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 		$filter = array('owner' => $user);
 
 		// handle all-in-one addressbook
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
 			$user == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			$filter['owner'] = array_keys($this->get_addressbooks(null,false));	// false = return all selected abs
+			$filter['owner'] = array_keys($this->get_addressbooks(null, false)); // false = return all selected abs
 			// translate AS private AB ID to EGroupware one
 			if (($key = array_search(self::PRIVATE_AB, $filter['owner'])) !== false)
 			{
@@ -308,10 +307,10 @@ 
 
 		$messagelist = array();
 		$criteria = null;
-		if (($contacts =& $this->addressbook->search($criteria, 'contact_id,contact_etag', '', '', '',
-			false, 'AND', false,$filter)))
+		if (($contacts = & $this->addressbook->search($criteria, 'contact_id,contact_etag', '', '', '',
+			false, 'AND', false, $filter)))
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$messagelist[] = $this->StatMessage($id, $contact);
 			}
@@ -348,9 +347,9 @@ 
 		}
 		$emailname = isset($contact['n_given']) ? $contact['n_given'].' ' : '';
 		$emailname .= isset($contact['n_middle']) ? $contact['n_middle'].' ' : '';
-		$emailname .= isset($contact['n_family']) ? $contact['n_family']: '';
+		$emailname .= isset($contact['n_family']) ? $contact['n_family'] : '';
 		$message = new SyncContact();
-		foreach(self::$mapping as $key => $attr)
+		foreach (self::$mapping as $key => $attr)
 		{
 			switch ($attr)
 			{
@@ -363,7 +362,7 @@ 
 					}
 					else
 					{
-						if (strlen ($contact[$attr]) > 0)
+						if (strlen($contact[$attr]) > 0)
 						{
 							$message->asbody = new SyncBaseBody();
 							$this->backend->note2messagenote($contact[$attr], $bodypreference, $message->asbody);
@@ -372,7 +371,7 @@ 
 					break;
 
 				case 'jpegphoto':
-					if (empty($contact[$attr]) && ($contact['files'] & Api\Contacts::FILES_BIT_PHOTO))
+					if (empty($contact[$attr]) && ($contact['files']&Api\Contacts::FILES_BIT_PHOTO))
 					{
 						$contact[$attr] = file_get_contents(Api\Link::vfs_path('addressbook', $contact['id'], Api\Contacts::FILES_PHOTO));
 					}
@@ -391,14 +390,14 @@ 
 
 				case 'cat_id':
 					$message->$key = array();
-					foreach($contact[$attr] ? explode(',',$contact[$attr]) : array() as $cat_id)
+					foreach ($contact[$attr] ? explode(',', $contact[$attr]) : array() as $cat_id)
 					{
 						$message->categories[] = Api\Categories::id2name($cat_id);
 					}
 					// for all addressbooks in one, add addressbook name itself as category
 					if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 					{
-						$message->categories[] = $this->get_addressbooks($contact['owner'].($contact['private']?'p':''), false, true);
+						$message->categories[] = $this->get_addressbooks($contact['owner'].($contact['private'] ? 'p' : ''), false, true);
 					}
 					break;
 				// HTC Desire needs at least one telefon number, otherwise sync of contact fails without error,
@@ -410,7 +409,7 @@ 
 				case 'n_fileas':
 					if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-force-fileas'])
 					{
-						$message->$key = $this->addressbook->fileas($contact,$GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-force-fileas']);
+						$message->$key = $this->addressbook->fileas($contact, $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-force-fileas']);
 						break;
 					}
 					// fall through
@@ -436,7 +435,7 @@ 
 	 */
 	public function StatMessage($folderid, $contact)
 	{
-		unset($folderid);	// not used (contact_id is global), but required by function signaure
+		unset($folderid); // not used (contact_id is global), but required by function signaure
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		if (!is_array($contact)) $contact = $this->addressbook->read($contact);
@@ -471,7 +470,7 @@ 
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
-		unset($id, $oldid, $displayname, $type);	// not used, but required by function signature
+		unset($id, $oldid, $displayname, $type); // not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." not implemented");
 	}
 
@@ -510,7 +509,7 @@ 
 	 */
 	public function ChangeMessage($folderid, $id, $message, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		$type = $account = null;
@@ -531,10 +530,10 @@ 
 		if ($account == 0)	// as a precausion, we currently do NOT allow to change Api\Accounts
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Changing of Api\Accounts denied!");
-			return false;			//no changing of Api\Accounts
+			return false; //no changing of Api\Accounts
 		}
 		$contact = array();
-		if (empty($id) && ($this->addressbook->grants[$account] & Acl::EDIT) || ($contact = $this->addressbook->read($id)) && $this->addressbook->check_perms(Acl::EDIT, $contact))
+		if (empty($id) && ($this->addressbook->grants[$account]&Acl::EDIT) || ($contact = $this->addressbook->read($id)) && $this->addressbook->check_perms(Acl::EDIT, $contact))
 		{
 			// remove all fields supported by AS, leaving all unsupported fields unchanged
 			$contact = array_diff_key($contact, array_flip(self::$mapping));
@@ -547,7 +546,7 @@ 
 						break;
 
 					case 'bday':	// zpush uses timestamp in servertime
-						$contact[$attr] = $message->$key ? date('Y-m-d',$message->$key) : null;
+						$contact[$attr] = $message->$key ? date('Y-m-d', $message->$key) : null;
 						break;
 
 					case 'jpegphoto':
@@ -557,20 +556,20 @@ 
 					case 'cat_id':
 						// for existing entries in all-in-one addressbook, remove addressbook name as category
 						if ($contact && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
-							($k=array_search($this->get_addressbooks($contact['owner'].($contact['private']?'p':''), false, true),$message->$key)))
+							($k = array_search($this->get_addressbooks($contact['owner'].($contact['private'] ? 'p' : ''), false, true), $message->$key)))
 						{
 							unset($message->categories[$k]);
 						}
 						if (is_array($message->$key))
 						{
-							$contact[$attr] = implode(',', array_filter($this->addressbook->find_or_add_categories($message->$key, $id),'strlen'));
+							$contact[$attr] = implode(',', array_filter($this->addressbook->find_or_add_categories($message->$key, $id), 'strlen'));
 						}
 						break;
 					case 'email':
 					case 'email_home':
-						if (function_exists ('imap_rfc822_parse_adrlist'))
+						if (function_exists('imap_rfc822_parse_adrlist'))
 						{
-							$email_array = array_shift(imap_rfc822_parse_adrlist($message->$key,""));
+							$email_array = array_shift(imap_rfc822_parse_adrlist($message->$key, ""));
 							if (!empty($email_array->mailbox) && $email_array->mailbox != 'INVALID_ADDRESS' && !empty($email_array->host))
 							{
 								$contact[$attr] = $email_array->mailbox.'@'.$email_array->host;
@@ -582,7 +581,7 @@ 
 						}
 						else
 						{
-							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__. " Warning : php-imap not available");
+							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Warning : php-imap not available");
 							$contact[$attr] = $message->$key;
 						}
 						break;
@@ -609,9 +608,9 @@ 
 				$contact['private'] = (int)$is_private;
 			}
 			// if default addressbook for new contacts is NOT synced --> use personal addressbook
-			elseif($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] &&
+			elseif ($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] &&
 				!in_array($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'],
-					array_keys($this->get_addressbooks(null,false))))
+					array_keys($this->get_addressbooks(null, false))))
 			{
 				$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
@@ -643,7 +642,7 @@ 
 	 */
 	public function MoveMessage($folderid, $id, $newfolderid, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id, $newfolderid) NOT allowed for an all-in-one addressbook --> returning false");
@@ -670,7 +669,7 @@ 
 	 */
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		$ret = $this->addressbook->delete($id);
@@ -739,18 +738,18 @@ 
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
 			$owner == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			if (strpos($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'],'A') !== false)
+			if (strpos($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'], 'A') !== false)
 			{
-				$owner = null;	// all AB's
+				$owner = null; // all AB's
 			}
 			else
 			{
-				$owner = array_keys($this->get_addressbooks(null,false));	// false = return all selected abs
+				$owner = array_keys($this->get_addressbooks(null, false)); // false = return all selected abs
 				// translate AS private AB ID to current user
 				if (($key = array_search(self::PRIVATE_AB, $owner)) !== false)
 				{
 					unset($owner[$key]);
-					if (!in_array($GLOBALS['egw_info']['user']['account_id'],$owner))
+					if (!in_array($GLOBALS['egw_info']['user']['account_id'], $owner))
 					{
 						$owner[] = $GLOBALS['egw_info']['user']['account_id'];
 					}
@@ -763,7 +762,7 @@ 
 		}
 		$ctag = $this->addressbook->get_ctag($owner);
 
-		$changes = array();	// no change
+		$changes = array(); // no change
 		//$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)
@@ -791,32 +790,32 @@ 
 		$range = false;
 		if (isset($searchquery['range']) && preg_match('/^\d+-\d+$/', $searchquery['range']))
 		{
-			list($start,$end) = explode('-', $searchquery['range']);
-			$range = array($start, $end-$start+1);	// array(start, num_entries)
+			list($start, $end) = explode('-', $searchquery['range']);
+			$range = array($start, $end - $start + 1); // array(start, num_entries)
 		}
 		//error_log(__METHOD__.'('.array2string($searchquery).') range='.array2string($range));
 
 		$items = $filter = array();
 		$filter['cols_to_search'] = array('n_fn', 'n_family', 'n_given',
-						'room','org_name', 'title', 'role', 'tel_work', 'tel_home', 'tel_cell',
+						'room', 'org_name', 'title', 'role', 'tel_work', 'tel_home', 'tel_cell',
 						'email', 'email_home');
-		if (($contacts =& $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR', $range, $filter)))
+		if (($contacts = & $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR', $range, $filter)))
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				//$item[SYNC_GAL_ALIAS] = $contact['contact_id'];
-			  	$item[SYNC_GAL_LASTNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
+			  	$item[SYNC_GAL_LASTNAME] = $contact['n_family'] ? $contact['n_family'] : $contact['org_name'];
 			  	$item[SYNC_GAL_FIRSTNAME] = $contact['n_given'];
 				$item[SYNC_GAL_DISPLAYNAME] = $contact['n_fn'];
-				if (!trim($item[SYNC_GAL_DISPLAYNAME])) $item[SYNC_GAL_DISPLAYNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
-				$item[SYNC_GAL_EMAILADDRESS] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'] ;
+				if (!trim($item[SYNC_GAL_DISPLAYNAME])) $item[SYNC_GAL_DISPLAYNAME] = $contact['n_family'] ? $contact['n_family'] : $contact['org_name'];
+				$item[SYNC_GAL_EMAILADDRESS] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'];
 				//$item['nameid'] = $searchquery;
 				$item[SYNC_GAL_PHONE] = (string)$contact['tel_work'];
 				$item[SYNC_GAL_HOMEPHONE] = (string)$contact['tel_home'];
 				$item[SYNC_GAL_MOBILEPHONE] = (string)$contact['tel_cell'];
 				$item[SYNC_GAL_COMPANY] = (string)$contact['org_name'];
 				$item[SYNC_GAL_OFFICE] = $contact['room'];
-				$item[SYNC_GAL_TITLE ] = $contact['title'];
+				$item[SYNC_GAL_TITLE] = $contact['title'];
 
 			  	//do not return users without email
 				if (!trim($item[SYNC_GAL_EMAILADDRESS])) continue;
@@ -824,8 +823,8 @@ 
 				$items[] = $item;
 			}
 		}
-		$items['searchtotal']=count($items);
-		$items['range']=$searchquery['range'];
+		$items['searchtotal'] = count($items);
+		$items['range'] = $searchquery['range'];
 		return $items;
 	}
 
@@ -846,14 +845,14 @@ 
 			$addressbooks = $addressbook_bo->get_addressbooks(Acl::READ, null, $user);
 			if ($user > 0)
 			{
-				unset($addressbooks[$user]);	// personal addressbook is allways synced
+				unset($addressbooks[$user]); // personal addressbook is allways synced
 				if (isset($addressbooks[$user.'p']))
 				{
 					$addressbooks[self::PRIVATE_AB] = lang('Private');
 				}
 			}
-			unset($addressbooks[$user.'p']);// private addressbook uses ID self::PRIVATE_AB
-			$fileas_options = array('0' => lang('use addressbooks "own sorting" attribute'))+$addressbook_bo->fileas_options();
+			unset($addressbooks[$user.'p']); // private addressbook uses ID self::PRIVATE_AB
+			$fileas_options = array('0' => lang('use addressbooks "own sorting" attribute')) + $addressbook_bo->fileas_options();
 		}
 		$addressbooks += array(
 			'G'	=> lang('Primary Group'),

Braces +76 added lines, -19 removed lines

@@ -139,7 +139,10 @@ 
 			{
 				Api\Translation::add_app('addressbook');	// we need the addressbook translations
 
-				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new Api\Contacts();
+				}
 
 				// error_log(print_r($this->addressbook->get_addressbooks(Acl::READ),true));
 				$pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
@@ -281,7 +284,10 @@ 
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
 		unset($cutoffdate);	// not used, but required by function signature
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		$type = $user = null;
 		$this->backend->splitID($id,$type,$user);
@@ -332,7 +338,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $contentparameters)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		//$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		//$mimesupport = $contentparameters->GetMimeSupport();
@@ -376,7 +385,10 @@ 
 					{
 						$contact[$attr] = file_get_contents(Api\Link::vfs_path('addressbook', $contact['id'], Api\Contacts::FILES_PHOTO));
 					}
-					if (!empty($contact[$attr])) $message->$key = base64_encode($contact[$attr]);
+					if (!empty($contact[$attr]))
+					{
+						$message->$key = base64_encode($contact[$attr]);
+					}
 					break;
 
 				case 'bday':	// zpush seems to use a timestamp in utc (at least vcard backend does)
@@ -415,7 +427,10 @@ 
 					}
 					// fall through
 				default:
-					if (!empty($contact[$attr])) $message->$key = $contact[$attr];
+					if (!empty($contact[$attr]))
+					{
+						$message->$key = $contact[$attr];
+					}
 			}
 		}
 		//error_log(__METHOD__."(folder='$folderid',$id,...) returning ".array2string($message));
@@ -437,9 +452,15 @@ 
 	public function StatMessage($folderid, $contact)
 	{
 		unset($folderid);	// not used (contact_id is global), but required by function signaure
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
-		if (!is_array($contact)) $contact = $this->addressbook->read($contact);
+		if (!is_array($contact))
+		{
+			$contact = $this->addressbook->read($contact);
+		}
 
 		if (!$contact)
 		{
@@ -511,7 +532,10 @@ 
 	public function ChangeMessage($folderid, $id, $message, $contentParameters)
 	{
 		unset($contentParameters);	// not used, but required by function signature
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		$type = $account = null;
 		$this->backend->splitID($folderid, $type, $account);
@@ -523,14 +547,20 @@ 
 
 		}
 		// error_log(__METHOD__. " Id " .$id. " Account ". $account . " FolderID " . $folderid);
-		if ($type != 'addressbook') // || !($contact = $this->addressbook->read($id)))
+		if ($type != 'addressbook')
+		{
+			// || !($contact = $this->addressbook->read($id)))
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Folder wrong or contact not existing");
+		}
 			return false;
 		}
-		if ($account == 0)	// as a precausion, we currently do NOT allow to change Api\Accounts
+		if ($account == 0)
+		{
+			// as a precausion, we currently do NOT allow to change Api\Accounts
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Changing of Api\Accounts denied!");
+		}
 			return false;			//no changing of Api\Accounts
 		}
 		$contact = array();
@@ -593,7 +623,10 @@ 
 						}
 						break;
 					case 'title':	// as ol jobtitle mapping changed in egw from role to title, do NOT overwrite title with value of role
-						if ($id && $message->$key == $contact['role']) break;
+						if ($id && $message->$key == $contact['role'])
+						{
+							break;
+						}
 						// fall throught
 					default:
 						$contact[$attr] = $message->$key;
@@ -602,7 +635,10 @@ 
 			}
 			// for all-in-one addressbook, account is meaningless and wrong!
 			// Api\Contacts::save() keeps the owner or sets an appropriate one if none given
-			if (!isset($contact['private'])) $contact['private'] = (int)$is_private;
+			if (!isset($contact['private']))
+			{
+				$contact['private'] = (int)$is_private;
+			}
 			if (!$GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 			{
 				$contact['owner'] = $account;
@@ -615,7 +651,10 @@ 
 			{
 				$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
-			if (!empty($id)) $contact['id'] = $id;
+			if (!empty($id))
+			{
+				$contact['id'] = $id;
+			}
 			$this->addressbook->fixup_contact($contact);
 			$newid = $this->addressbook->save($contact);
 			//error_log(__METHOD__."($folderid,$id) contact=".array2string($contact)." returning ".array2string($newid));
@@ -671,7 +710,10 @@ 
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
 		unset($contentParameters);	// not used, but required by function signature
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		$ret = $this->addressbook->delete($id);
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -731,9 +773,15 @@ 
 		$type = $owner = null;
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'addressbook') return false;
+		if ($type != 'addressbook')
+		{
+			return false;
+		}
 
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		// handle all-in-one addressbook
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
@@ -784,7 +832,10 @@ 
 	 */
 	function getSearchResultsGAL($searchquery)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 		//error_log(__METHOD__.'('.array2string($searchquery).')');
 
 		// only return items in given range, eg. "0-50"
@@ -808,7 +859,10 @@ 
 			  	$item[SYNC_GAL_LASTNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
 			  	$item[SYNC_GAL_FIRSTNAME] = $contact['n_given'];
 				$item[SYNC_GAL_DISPLAYNAME] = $contact['n_fn'];
-				if (!trim($item[SYNC_GAL_DISPLAYNAME])) $item[SYNC_GAL_DISPLAYNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
+				if (!trim($item[SYNC_GAL_DISPLAYNAME]))
+				{
+					$item[SYNC_GAL_DISPLAYNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
+				}
 				$item[SYNC_GAL_EMAILADDRESS] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'] ;
 				//$item['nameid'] = $searchquery;
 				$item[SYNC_GAL_PHONE] = (string)$contact['tel_work'];
@@ -819,7 +873,10 @@ 
 				$item[SYNC_GAL_TITLE ] = $contact['title'];
 
 			  	//do not return users without email
-				if (!trim($item[SYNC_GAL_EMAILADDRESS])) continue;
+				if (!trim($item[SYNC_GAL_EMAILADDRESS]))
+				{
+					continue;
+				}
 
 				$items[] = $item;
 			}

addressbook/inc/class.addressbook_ui.inc.php

Indentation +8 added lines, -8 removed lines

@@ -1885,12 +1885,12 @@ 
 	}
 
 	/**
-	* Edit a contact
-	*
-	* @param array $content=null submitted content
-	* @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']
-	*/
+	 * Edit a contact
+	 *
+	 * @param array $content=null submitted content
+	 * @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)
 	{
 		if (is_array($content))
@@ -3069,8 +3069,8 @@ 
 	}
 
 	/**
-	* Set up history log widget
-	*/
+	 * Set up history log widget
+	 */
 	protected function setup_history(&$content, &$sel_options)
 	{
 		if ($this->contact_repository == 'ldap' || !$content['id'] ||

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

@@ -2594,7 +2594,7 @@
 							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;
 						}
 

Doc Comments +5 added lines, -3 removed lines

@@ -1127,6 +1127,8 @@ 
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 contacts 'deleted'
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param null|integer $success
+	 * @param null|integer $failed
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg, $checkboxes = NULL)
@@ -1433,6 +1435,8 @@ 
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 contacts 'deleted'
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param integer $success
+	 * @param integer $failed
 	 *
 	 * @return array List of contact IDs in the provided groups
 	 */
@@ -1985,9 +1989,7 @@ 
 	/**
 	* Edit a contact
 	*
-	* @param array $content=null submitted content
-	* @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']
+	* @param array $content submitted content
 	*/
 	function edit($content=null)
 	{

Braces +318 added lines, -83 removed lines

@@ -93,7 +93,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'];
 
@@ -132,15 +135,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);
 			}
@@ -177,10 +186,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($grouped_view) = each($_content['nm']['rows']['view']);
 			}
+			}
 			else
 			{
 				$grouped_view = $_content['nm']['grouped_view'];
@@ -274,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']);
@@ -315,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'];
+		}
 
 		// Merge to email dialog needs the infolog types
 		$infolog = new infolog_bo();
@@ -329,7 +348,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)
@@ -426,7 +448,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)
 		{
@@ -494,7 +519,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',
@@ -507,7 +535,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(
@@ -543,6 +573,7 @@ 
 					'fieldValue' => '!',	// enable if list != ''
 				),
 			);
+		}
 			if(is_subclass_of('etemplate', 'etemplate_new'))
 			{
 				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
@@ -551,9 +582,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;
@@ -695,7 +730,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'])
 		{
@@ -843,11 +880,17 @@ 
 	protected function _get_grouped_name($view_id)
 	{
 		$group_name = array();
-		if (strpos($view_id,'*AND*')!== false) $view_id = str_replace('*AND*','&',$view_id);
+		if (strpos($view_id,'*AND*')!== false)
+		{
+			$view_id = str_replace('*AND*','&',$view_id);
+		}
 		foreach(explode('|||',$view_id) as $part)
 		{
 			list(,$name) = explode(':',$part,2);
-			if ($name) $group_name[] = $name;
+			if ($name)
+			{
+				$group_name[] = $name;
+			}
 		}
 		$name = implode(': ',$group_name);
 		return $name ? array($view_id => $name) : array();
@@ -993,9 +1036,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['grouped_view'] = $org_name;
@@ -1024,14 +1073,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);
 		}
@@ -1160,7 +1218,10 @@ 
 		}
 		// replace org_name:* id's with all id's of that org
 		$grouped_contacts = $this->find_grouped_ids($action, $checked, $use_all, $success,$failed,$action_msg,$session_name, $msg);
-		if ($grouped_contacts) $checked = array_unique($checked ? array_merge($checked,$grouped_contacts) : $grouped_contacts);
+		if ($grouped_contacts)
+		{
+			$checked = array_unique($checked ? array_merge($checked,$grouped_contacts) : $grouped_contacts);
+		}
 		//_debug_array($checked); exit;
 
 		if (substr($action,0,8) == 'move_to_')
@@ -1177,9 +1238,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
@@ -1226,7 +1290,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);
@@ -1378,19 +1445,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;
@@ -1533,9 +1606,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)
 			{
@@ -1557,21 +1633,29 @@ 
 		if (isset($this->grouped_views[(string) $query['grouped_view']]))
 		{
 			// we have a grouped view, reset the 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'];
 		}
+		}
 
 		// 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]%').'$/i',$col_filter) == 1
-			)
-			{
+			) {
 				unset($query['col_filter'][$key]);
 			}
 		}
@@ -1582,9 +1666,13 @@ 
 			// check if accounts are stored in ldap, which does NOT yet support the org-views
 			if ($this->so_accounts && $query['filter'] === '0' && $query['grouped_view'])
 			{
-				if ($old_state['filter'] === '0')	// user changed to org_view
+				if ($old_state['filter'] === '0')
 				{
-					$query['filter'] = '';			// --> change filter to all contacts
+					// user changed to org_view
+				{
+					$query['filter'] = '';
+				}
+				// --> change filter to all contacts
 				}
 				else								// user changed to accounts
 				{
@@ -1621,9 +1709,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)
 			{
@@ -1635,10 +1726,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']);
@@ -1679,9 +1773,12 @@ 
 			}
 			// Query doesn't like parent_id
 			unset($query['col_filter']['parent_id']);
-			if ($query['grouped_view'])	// view the contacts of one organisation only
+			if ($query['grouped_view'])
+			{
+				// view the contacts of one organisation only
 			{
 				if (strpos($query['grouped_view'],'*AND*') !== false) $query['grouped_view'] = str_replace('*AND*','&',$query['grouped_view']);
+			}
 				$fields = explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
 				foreach(explode('|||',$query['grouped_view']) as $part)
 				{
@@ -1704,14 +1801,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';
@@ -1735,9 +1836,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($query['searchletter'].'%');
 			}
@@ -1777,13 +1881,19 @@ 
 					{
 						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);
 					}
 					// TODO: we need to find out where the csv_export query has been used and try to clean up
 					// this columnselection condition statements.
-					if ($columselection && $show_calendar && !empty($ids)) $calendar = $this->read_calendar($calendar_participants);
+					if ($columselection && $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)
@@ -1793,7 +1903,10 @@ 
 				}
 			}
 		}
-		if (!$rows) $rows = array();
+		if (!$rows)
+		{
+			$rows = array();
+		}
 
 		if ($id_only)
 		{
@@ -1826,7 +1939,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;
 			}
@@ -1905,8 +2021,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']))
@@ -1965,10 +2087,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;
@@ -2035,7 +2160,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)
@@ -2226,7 +2354,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['grouped_view'] && !isset($this->grouped_views[$state['grouped_view']]))
@@ -2246,7 +2377,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'] !== '')
 				{
@@ -2271,7 +2405,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)
 				{
@@ -2289,19 +2426,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);
+											}
 										}
 									}
 								}
@@ -2329,7 +2484,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;
@@ -2337,17 +2495,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']))
@@ -2356,10 +2524,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);
 					}
+					}
 				}
 			}
 		}
@@ -2367,7 +2538,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)
@@ -2403,7 +2577,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']]))
@@ -2444,7 +2622,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;
@@ -2452,8 +2633,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"
@@ -2501,7 +2688,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']))
@@ -2524,7 +2714,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)
 			{
@@ -2541,7 +2734,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']))
 				{
@@ -2632,13 +2828,16 @@ 
 		// if email changed, check for doublicates
 		if (in_array($name, array('email', 'email_home')) && in_array('contact_'.$name, $fields))
 		{
-			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
 		{
@@ -2659,10 +2858,13 @@ 
 			if (in_array($name,$fields) && $specified_count >= 2)
 			{
 				$filter = array();
-				foreach($fields as $n)	// use email too, to exclude obvious false positives
+				foreach($fields 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);
 			}
 		}
@@ -2670,7 +2872,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 ?
@@ -2697,7 +2902,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))
 		{
@@ -2720,7 +2928,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;
@@ -2883,11 +3094,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;
@@ -2966,7 +3186,10 @@ 
 	 */
 	function email2link($email)
 	{
-		if (strpos($email,'@') == false) return '';
+		if (strpos($email,'@') == false)
+		{
+			return '';
+		}
 
 		if($GLOBALS['egw_info']['user']['apps']['mail'])
 		{
@@ -3018,7 +3241,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']);
@@ -3075,8 +3301,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);
@@ -3100,7 +3332,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);

Spacing +437 added lines, -443 removed lines

@@ -79,7 +79,7 @@ 
 	 *
 	 * @param string $contact_app
 	 */
-	function __construct($contact_app='addressbook')
+	function __construct($contact_app = 'addressbook')
 	{
 		parent::__construct($contact_app);
 
@@ -93,23 +93,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';
 			}
@@ -125,7 +125,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)))
@@ -158,16 +158,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 = '';
 				}
@@ -187,9 +187,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!');
@@ -208,7 +208,7 @@ 
 		);
 		$to = $_content['nm']['to'];
 		$content = array();
-		if($msg || $_GET['msg'])
+		if ($msg || $_GET['msg'])
 		{
 			Framework::message($msg ? $msg : $_GET['msg']);
 		}
@@ -217,23 +217,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
@@ -244,7 +244,7 @@ 
 				'default_cols'   => '!cat_id,contact_created_contact_modified,distribution_list,contact_id,owner,room',*/
 				'filter2_onchange' => "return app.addressbook.filter2_onchange();",
 				'filter2_tags'	=> true,
-				'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',
@@ -260,14 +260,14 @@ 
 			// 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'));
 
 		$content['nm']['placeholder_actions'] = array('add');
 		// 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';
@@ -280,11 +280,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)
 		{
@@ -302,7 +302,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';
 		}
@@ -315,7 +315,7 @@ 
 		$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'];
 
 		// Merge to email dialog needs the infolog types
 		$infolog = new infolog_bo();
@@ -324,7 +324,7 @@ 
 		// 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']);
@@ -332,7 +332,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'];
 			}
@@ -350,20 +350,20 @@ 
 
 		$content['nm']['actions'] = $this->get_actions($content['nm']['col_filter']['tid']);
 
-		if (!isset($sel_options['grouped_view'][(string) $content['nm']['grouped_view']]))
+		if (!isset($sel_options['grouped_view'][(string)$content['nm']['grouped_view']]))
 		{
 			$sel_options['grouped_view'] += $this->_get_grouped_name((string)$content['nm']['grouped_view']);
 		}
 		// unset the filters regarding grouped views, when there is no group selected
-		if (empty($sel_options['grouped_view'][(string) $content['nm']['grouped_view']]) || stripos($grouped_view,":") === false )
+		if (empty($sel_options['grouped_view'][(string)$content['nm']['grouped_view']]) || stripos($grouped_view, ":") === false)
 		{
 			$this->unset_grouped_filters($content['nm']);
 		}
-		$content['nm']['grouped_view_label'] = $sel_options['grouped_view'][(string) $content['nm']['grouped_view']];
+		$content['nm']['grouped_view_label'] = $sel_options['grouped_view'][(string)$content['nm']['grouped_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);
 	}
 
 	/**
@@ -372,7 +372,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(
@@ -380,7 +380,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',
 				'enableClass' => 'contact_contact',
 				'hideOnDisabled' => true,
@@ -423,14 +423,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,
@@ -445,7 +445,7 @@ 
 				'caption' => 'View',
 				'default' => true,
 				'allowOnMultiple' => false,
-				'group' => $group=1,
+				'group' => $group = 1,
 				'enableClass' => 'contact_organisation',
 				'hideOnDisabled' => true
 			),
@@ -466,29 +466,29 @@ 
 				'caption' => 'View',
 				'default' => true,
 				'allowOnMultiple' => false,
-				'group' => $group=1,
+				'group' => $group = 1,
 				'enableClass' => 'contact_duplicate',
 				'hideOnDisabled' => true
 			)
 		);
 
-		++$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',
 				),
@@ -515,7 +515,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(
@@ -524,14 +524,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(
@@ -540,10 +540,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';
@@ -553,18 +553,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',
@@ -597,7 +597,7 @@ 
 			'hideOnDisabled'	=> 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(
@@ -618,7 +618,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
@@ -636,7 +636,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(
@@ -716,7 +716,7 @@ 
 			'icon' => 'map',
 			'group' => ++$group,
 			'enableClass' => 'contact_contact',
-			'children' => array (
+			'children' => array(
 				'private' => array(
 					'caption' => 'Private Address',
 					'enabled' => 'javaScript:app.addressbook.geoLocation_enabled',
@@ -733,7 +733,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',
@@ -749,7 +749,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'),
 					),
 				),
@@ -761,7 +761,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'),
@@ -784,7 +784,7 @@ 
 				'disableClass' => 'rowNoDelete',
 			);
 		}
-		if ($this->grants[0] & Acl::DELETE)
+		if ($this->grants[0]&Acl::DELETE)
 		{
 			$actions['delete_account'] = array(
 				'caption' => 'Delete',
@@ -797,7 +797,7 @@ 
 			);
 			$actions['delete']['hideOnDisabled'] = true;
 		}
-		if($tid_filter == 'D')
+		if ($tid_filter == 'D')
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',
@@ -808,7 +808,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']);
 		}
@@ -843,13 +843,13 @@ 
 	protected function _get_grouped_name($view_id)
 	{
 		$group_name = array();
-		if (strpos($view_id,'*AND*')!== false) $view_id = str_replace('*AND*','&',$view_id);
-		foreach(explode('|||',$view_id) as $part)
+		if (strpos($view_id, '*AND*') !== false) $view_id = str_replace('*AND*', '&', $view_id);
+		foreach (explode('|||', $view_id) as $part)
 		{
-			list(,$name) = explode(':',$part,2);
+			list(,$name) = explode(':', $part, 2);
 			if ($name) $group_name[] = $name;
 		}
-		$name = implode(': ',$group_name);
+		$name = implode(': ', $group_name);
 		return $name ? array($view_id => $name) : array();
 	}
 
@@ -863,7 +863,7 @@ 
 		unset($query['col_filter']['org_name']);
 		unset($query['col_filter']['org_unit']);
 		unset($query['col_filter']['adr_one_locality']);
-		foreach(array_keys(static::$duplicate_fields) as $field)
+		foreach (array_keys(static::$duplicate_fields) as $field)
 		{
 			unset($query['col_filter'][$field]);
 		}
@@ -881,7 +881,7 @@ 
 		// 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']);
@@ -909,10 +909,10 @@ 
 				}
 				$query['org_view'] = $query['grouped_view'];
 				// switch the distribution list selection off for ldap
-				if($this->contact_repository != 'sql')
+				if ($this->contact_repository != 'sql')
 				{
 					$query['no_filter2'] = true;
-					unset($query['col_filter']['list']);	// does not work here
+					unset($query['col_filter']['list']); // does not work here
 				}
 				else
 				{
@@ -920,8 +920,8 @@ 
 				}
 				break;
 			case 'addressbook.index.duplicate_rows':
-				$query['no_filter2'] = true;			// switch the distribution list selection off
-				unset($query['col_filter']['list']);	// does not work for duplicates
+				$query['no_filter2'] = true; // switch the distribution list selection off
+				unset($query['col_filter']['list']); // does not work for duplicates
 				$rows = parent::duplicates($query);
 				break;
 		}
@@ -943,12 +943,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();
@@ -978,7 +978,7 @@ 
 </script>
 ";
 		}
-		return $this->index($content,$msg,true);
+		return $this->index($content, $msg, true);
 	}
 
 	/**
@@ -992,19 +992,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['grouped_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));
@@ -1018,33 +1018,33 @@ 
 	function infolog_org_view($org)
 	{
 		$query = Api\Cache::getSession('addressbook', 'index');
-		$query['num_rows'] = -1;	// all
+		$query['num_rows'] = -1; // all
 		$query['grouped_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');
 	}
 
 	/**
@@ -1069,31 +1069,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'),
@@ -1108,7 +1108,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);
@@ -1125,7 +1125,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);
 	}
 
@@ -1141,60 +1141,60 @@ 
 	 * @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
-		$grouped_contacts = $this->find_grouped_ids($action, $checked, $use_all, $success,$failed,$action_msg,$session_name, $msg);
-		if ($grouped_contacts) $checked = array_unique($checked ? array_merge($checked,$grouped_contacts) : $grouped_contacts);
+		$grouped_contacts = $this->find_grouped_ids($action, $checked, $use_all, $success, $failed, $action_msg, $session_name, $msg);
+		if ($grouped_contacts) $checked = array_unique($checked ? array_merge($checked, $grouped_contacts) : $grouped_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;
@@ -1202,10 +1202,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':
@@ -1213,7 +1213,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!');
 				}
@@ -1233,49 +1233,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;
@@ -1286,10 +1286,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)
 						{
@@ -1298,7 +1298,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'],
 							));
@@ -1360,7 +1360,7 @@ 
 					}
 					else
 					{
-						$Ok = $this->remove_from_list($id,$query['filter2']) !== false;
+						$Ok = $this->remove_from_list($id, $query['filter2']) !== false;
 					}
 					break;
 
@@ -1373,28 +1373,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);
 							}
 						}
@@ -1402,14 +1402,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))
 								{
@@ -1448,38 +1448,38 @@ 
 	 *
 	 * @return array List of contact IDs in the provided groups
 	 */
-	protected function find_grouped_ids($action,&$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	protected function find_grouped_ids($action, &$checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		unset($use_all);
 		$grouped_contacts = array();
-		foreach((array)$checked as $n => $id)
+		foreach ((array)$checked as $n => $id)
 		{
-			if (substr($id,0,9) == 'org_name:' || substr($id, 0,10) == 'duplicate:')
+			if (substr($id, 0, 9) == 'org_name:' || substr($id, 0, 10) == 'duplicate:')
 			{
 				if (count($checked) == 1 && !count($grouped_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['grouped_view'] = $id;
 				unset($query['filter2']);
 				$extra = $readonlys = null;
-				$this->get_rows($query,$extra,$readonlys,true);	// true = only return the id's
+				$this->get_rows($query, $extra, $readonlys, true); // true = only return the id's
 
 				// Merge them here, so we only merge the ones that are duplicates,
 				// not merge all selected together
-				if($action == 'merge_duplicates')
+				if ($action == 'merge_duplicates')
 				{
 					$loop_success = $loop_fail = 0;
-					$this->action('merge', $extra, false, $loop_success, $loop_fail, $action_msg,$session_name,$msg);
+					$this->action('merge', $extra, false, $loop_success, $loop_fail, $action_msg, $session_name, $msg);
 					$success += $loop_success;
 					$failed += $loop_fail;
 				}
 				if ($extra[0])
 				{
-					$grouped_contacts = array_merge($grouped_contacts,$extra);
+					$grouped_contacts = array_merge($grouped_contacts, $extra);
 				}
 			}
 		}
@@ -1495,22 +1495,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;
 		}
@@ -1528,7 +1528,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');
@@ -1537,7 +1537,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]);
 			}
@@ -1548,28 +1548,28 @@ 
 		{
 			$old_state = Api\Cache::getSession('addressbook', $what);
 		}
-		if (!isset($this->grouped_views[(string) $query['grouped_view']]) || strpos($query['grouped_view'],':') === false)
+		if (!isset($this->grouped_views[(string)$query['grouped_view']]) || strpos($query['grouped_view'], ':') === false)
 		{
 			// we don't have a grouped view, unset the according col_filters
 			$this->unset_grouped_filters($query);
 		}
 
-		if (isset($this->grouped_views[(string) $query['grouped_view']]))
+		if (isset($this->grouped_views[(string)$query['grouped_view']]))
 		{
 			// we have a grouped view, reset the 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'];
 		}
 
 		// 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]%').'$/i',$col_filter) == 1
+			if (!is_numeric($key)) continue;
+			if (preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
+				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/i', $col_filter) == 1
 			)
 			{
 				unset($query['col_filter'][$key]);
@@ -1584,16 +1584,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['grouped_view'] = '';		// --> change to regular contacts view
+					$query['grouped_view'] = ''; // --> change to regular contacts view
 				}
 			}
 			if ($query['grouped_view'] && isset($this->grouped_views[$old_state['grouped_view']]) && !isset($this->grouped_views[$query['grouped_view']]))
 			{
-				$query['searchletter'] = '';		// reset lettersearch if viewing the contacts of one group (org or duplicates)
+				$query['searchletter'] = ''; // reset lettersearch if viewing the contacts of one group (org or duplicates)
 			}
 			// save the state of the index in the user prefs
 			$state = serialize(array(
@@ -1606,9 +1606,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);
@@ -1623,11 +1623,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
@@ -1637,7 +1637,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
 		{
@@ -1656,7 +1656,7 @@ 
 		$query['no_filter2'] = false;
 
 		// Grouped view
-		if (isset($this->grouped_views[(string) $query['grouped_view']]) && !$query['col_filter']['parent_id'])
+		if (isset($this->grouped_views[(string)$query['grouped_view']]) && !$query['col_filter']['parent_id'])
 		{
 			$query['grouped_view_label'] = '';
 			$rows = $this->get_grouped_rows($query);
@@ -1671,7 +1671,7 @@ 
 			{
 				$query['template'] = $do_email ? 'addressbook.email.rows' : 'addressbook.index.rows';
 			}
-			if($query['col_filter']['parent_id'])
+			if ($query['col_filter']['parent_id'])
 			{
 				$query['grouped_view'] = $query['col_filter']['parent_id'];
 				$query['template'] = strpos($query['grouped_view'], 'duplicate') === 0 ?
@@ -1681,11 +1681,11 @@ 
 			unset($query['col_filter']['parent_id']);
 			if ($query['grouped_view'])	// view the contacts of one organisation only
 			{
-				if (strpos($query['grouped_view'],'*AND*') !== false) $query['grouped_view'] = str_replace('*AND*','&',$query['grouped_view']);
-				$fields = explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
-				foreach(explode('|||',$query['grouped_view']) as $part)
+				if (strpos($query['grouped_view'], '*AND*') !== false) $query['grouped_view'] = str_replace('*AND*', '&', $query['grouped_view']);
+				$fields = explode(',', $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
+				foreach (explode('|||', $query['grouped_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 (static::$duplicate_fields[$name] && $value && (
 							strpos($query['grouped_view'], 'duplicate:') === 0 && in_array($name, $fields) ||
@@ -1696,14 +1696,14 @@ 
 					}
 				}
 			}
-			else if($query['actions'] && !$query['actions']['edit'])
+			else if ($query['actions'] && !$query['actions']['edit'])
 			{
 				// Just switched from grouped view, update actions
 				$query['actions'] = $this->get_actions($query['col_filter']['tid']);
 			}
 			// 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";
@@ -1737,8 +1737,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($query['searchletter'].'%');
 			}
 			$wildcard = '%';
@@ -1752,34 +1752,34 @@ 
 				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 = (in_array('customfields',$columselection)) && $this->customfields;
-				$show_calendar = $this->config['disable_event_column'] != 'True' && in_array('calendar_calendar',$columselection);
-				$show_distributionlist = in_array('distrib_lists',$columselection) || count($available_distib_lists);
+				$show_custom_fields = (in_array('customfields', $columselection)) && $this->customfields;
+				$show_calendar = $this->config['disable_event_column'] != 'True' && in_array('calendar_calendar', $columselection);
+				$show_distributionlist = 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);
 					}
 					// TODO: we need to find out where the csv_export query has been used and try to clean up
 					// this columnselection condition statements.
@@ -1788,7 +1788,7 @@ 
 					//_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));
 					}
 				}
 			}
@@ -1797,20 +1797,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':
@@ -1827,43 +1827,43 @@ 
 					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->grouped_views[(string) $query['grouped_view']]))
+			if (isset($this->grouped_views[(string)$query['grouped_view']]))
 			{
 				$row['type'] = 'home';
 				$row['type_label'] = $query['grouped_view'] == 'duplicate' ? lang('Duplicates') : 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'] .= $query['grouped_view'] == 'duplicates' ? 'contact_duplicate' : '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;
 				}
 				// Show nice name as status text
-				if($row['tel_prefer'])
+				if ($row['tel_prefer'])
 				{
 					$row['tel_prefer_label'] = $this->contact_fields[$row['tel_prefer']];
 				}
@@ -1871,33 +1871,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;
 					}
@@ -1905,13 +1905,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'];
@@ -1923,7 +1923,7 @@ 
 		}
 
 		// Disable next/last date if so configured
-		if($this->config['disable_event_column'] == 'True')
+		if ($this->config['disable_event_column'] == 'True')
 		{
 			$rows['no_event_column'] = true;
 		}
@@ -1936,23 +1936,21 @@ 
 		$header = array();
 		if ($query['filter'] !== '' && !isset($this->grouped_views[$query['grouped_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['grouped_view'])
 		{
 			$header[] = $query['grouped_view_label'];
 			// Make sure option is there
-			if(!array_key_exists($query['grouped_view'], $this->grouped_views))
+			if (!array_key_exists($query['grouped_view'], $this->grouped_views))
 			{
 				$this->grouped_views += $this->_get_grouped_name($query['grouped_view']);
 				$rows['sel_options']['grouped_view'] = $this->grouped_views;
 			}
 		}
-		if($query['advanced_search'])
+		if ($query['advanced_search'])
 		{
 			$header[] = lang('Advanced search');
 		}
@@ -1963,11 +1961,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);
 
@@ -1983,7 +1981,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)
 		{
@@ -1998,7 +1996,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
 		{
@@ -2006,9 +2004,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
@@ -2026,19 +2024,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':
@@ -2050,7 +2048,7 @@ 
 					// photo might be changed by ajax_upload_photo
 					if (!array_key_exists('jpegphoto', $content))
 					{
-						$content['photo_unchanged'] = true;	// hint no need to store photo
+						$content['photo_unchanged'] = true; // hint no need to store photo
 					}
 					$links = false;
 					if (!$content['id'] && is_array($content['link_to']['to_id']))
@@ -2063,12 +2061,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-')
 						{
@@ -2077,7 +2075,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))))
@@ -2087,7 +2085,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;
 						}
@@ -2102,7 +2100,7 @@ 
 
 						unset($content['jpegphoto'], $content['photo_unchanged']);
 
-						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))))
@@ -2110,58 +2108,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
@@ -2183,11 +2181,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
@@ -2212,7 +2210,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;
@@ -2256,52 +2254,52 @@ 
 				{
 					$content['owner'] = (string)($state['filter'] == 0 ? '' : $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);
 										}
 									}
 								}
@@ -2319,13 +2317,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;
 						}
 					}
@@ -2337,12 +2335,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
@@ -2353,12 +2351,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);
 					}
 				}
 			}
@@ -2366,8 +2364,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)
@@ -2378,7 +2376,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]))
 			{
@@ -2391,7 +2389,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)
@@ -2403,19 +2401,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;
 		}
@@ -2425,7 +2422,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;
 			}
@@ -2447,9 +2444,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'];
-		$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'];
@@ -2461,7 +2458,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;
 		}
@@ -2469,11 +2466,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
 		{
@@ -2487,10 +2484,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;
 			}
@@ -2499,33 +2496,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;
-		unset($preserve['jpegphoto'], $content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+		unset($preserve['jpegphoto'], $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']))
 				{
@@ -2570,15 +2567,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':
@@ -2594,16 +2591,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;
 		}
@@ -2621,10 +2618,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;
-		$fields = explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
+		$fields = explode(',', $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
 
 		$ret = array('doublicates' => array(), 'msg' => null);
 
@@ -2648,17 +2645,17 @@ 
 
 			// if name, firstname or org changed and enough are specified, check for doublicates
 			$specified_count = 0;
-			foreach($fields as $field)
+			foreach ($fields as $field)
 			{
-				if($values[trim($field)])
+				if ($values[trim($field)])
 				{
 					$specified_count++;
 				}
 			}
-			if (in_array($name,$fields) && $specified_count >= 2)
+			if (in_array($name, $fields) && $specified_count >= 2)
 			{
 				$filter = array();
-				foreach($fields as $n)	// use email too, to exclude obvious false positives
+				foreach ($fields as $n)	// use email too, to exclude obvious false positives
 				{
 					if (!empty($values[$n])) $filter[$n] = $values[$n];
 				}
@@ -2667,7 +2664,7 @@ 
 		}
 		if ($contacts)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				if ($own_id && $contact['id'] == $own_id) continue;
 
@@ -2691,26 +2688,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 !!!'),
 					));
@@ -2728,9 +2723,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'
@@ -2739,14 +2734,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;
 						}
 
@@ -2777,13 +2772,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']))
 			{
@@ -2796,25 +2791,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'];
 
@@ -2824,12 +2819,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']);
@@ -2837,7 +2832,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;
 		}
@@ -2845,11 +2840,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
 		{
@@ -2866,7 +2861,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'] = '-';
@@ -2879,14 +2874,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;
@@ -2928,7 +2923,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']);
 		}
@@ -2940,7 +2935,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
@@ -2948,12 +2943,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);
 		}
 	}
 
@@ -2965,30 +2960,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;
 	}
 
 	/**
@@ -2997,9 +2992,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'];
@@ -3014,10 +3009,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']);
@@ -3033,7 +3028,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;
@@ -3050,7 +3045,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;
 		}
@@ -3059,8 +3054,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',
 		);
@@ -3070,12 +3065,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);
@@ -3101,8 +3096,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);
 	}
 
 	/**
@@ -3111,12 +3106,12 @@ 
 	 *
 	 * @param type $contact_id
 	 */
-	function ajax_noPhotoExists ($contact_id)
+	function ajax_noPhotoExists($contact_id)
 	{
 		$response = Api\Json\Response::get();
 		$response->data((!($contact = $this->read($contact_id)) ||
-			empty($contact['jpegphoto']) &&	!(($contact['files'] & Api\Contacts::FILES_BIT_PHOTO) &&
-				($size = filesize($url=Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO))))));
+			empty($contact['jpegphoto']) && !(($contact['files']&Api\Contacts::FILES_BIT_PHOTO) &&
+				($size = filesize($url = Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO))))));
 	}
 
 	/**
@@ -3125,13 +3120,13 @@ 
 	 * @param string $etemplate_exec_id to update id, files, etag, ...
 	 * @param file string $file null means to delete
 	 */
-	function ajax_update_photo ($etemplate_exec_id, $file)
+	function ajax_update_photo($etemplate_exec_id, $file)
 	{
 		$et_request = Api\Etemplate\Request::read($etemplate_exec_id);
 		$response = Api\Json\Response::get();
 		if ($file)
 		{
-			$filteredFile = substr($file, strpos($file, ",")+1);
+			$filteredFile = substr($file, strpos($file, ",") + 1);
 			// resize photo if wider then default width of 240pixel (keeping aspect ratio)
 			$decoded = $this->resize_photo(base64_decode($filteredFile));
 		}
@@ -3139,7 +3134,7 @@ 
 		// add photo into current eT2 request
 		$et_request->preserv = array_merge($et_request->preserv, array(
 			'jpegphoto' => is_null($file) ? $file : $decoded,
-			'photo_unchanged' => false,	// hint photo is changed
+			'photo_unchanged' => false, // hint photo is changed
 		));
 	}
 
@@ -3154,14 +3149,14 @@ 
 	public function pubkey_uploaded(array $file, $widget_id, Api\Etemplate\Request $request, Api\Json\Response $response)
 	{
 		//error_log(__METHOD__."(".array2string($file).", ...) widget_id=$widget_id, id=".$request->content['id'].", files=".$request->content['files']);
-		unset($file, $response);	// not used, but required by function signature
-		list(,,$path) = explode(':', $widget_id);
+		unset($file, $response); // not used, but required by function signature
+		list(,, $path) = explode(':', $widget_id);
 		$bit = $path === Api\Contacts::FILES_PGP_PUBKEY ? Api\Contacts::FILES_BIT_PGP_PUBKEY : Api\Contacts::FILES_BIT_SMIME_PUBKEY;
-		if (!($request->content['files'] & $bit) && $this->check_perms(Acl::EDIT, $request->content))
+		if (!($request->content['files']&$bit) && $this->check_perms(Acl::EDIT, $request->content))
 		{
 			$content = $request->content;
 			$content['files'] |= $bit;
-			$content['photo_unchanged'] = true;	// hint no need to store photo
+			$content['photo_unchanged'] = true; // hint no need to store photo
 			if ($this->save($content))
 			{
 				$changed = array_diff_assoc($content, $request->content);
@@ -3179,19 +3174,18 @@ 
 	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)) ||
-			empty($contact['jpegphoto']) &&                           // LDAP/AD (not updated SQL)
-			!(($contact['files'] & Api\Contacts::FILES_BIT_PHOTO) && // new SQL in VFS
-				($size = filesize($url=Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO)))))
+			empty($contact['jpegphoto']) && // LDAP/AD (not updated SQL)
+			!(($contact['files']&Api\Contacts::FILES_BIT_PHOTO) && // new SQL in VFS
+				($size = filesize($url = Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO)))))
 		{
-			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'].'"';
@@ -3203,14 +3197,14 @@ 
 			// 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)
 			{
 				header("HTTP/1.1 304 Not Modified");
 			}
-			elseif(!empty($contact['jpegphoto']))
+			elseif (!empty($contact['jpegphoto']))
 			{
 				header('Content-length: '.bytes($contact['jpegphoto']));
 				echo $contact['jpegphoto'];
@@ -3260,15 +3254,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();
 	}
@@ -3292,8 +3286,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();
 	}
@@ -3306,7 +3300,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'],
@@ -3321,7 +3315,7 @@ 
 			),
 		);
 
-		foreach($this->content_types as $id => $settings)
+		foreach ($this->content_types as $id => $settings)
 		{
 			$content['history']['status-widgets']['tid'][$id] = $settings['name'];
 		}

addressbook/inc/class.addressbook_wizard_export_contacts_csv.inc.php

Indentation +8 added lines, -8 removed lines

@@ -35,8 +35,8 @@ 
 	}
 
 	/**
-	* Overridden to be able to skip the next step
-	*/
+	 * Overridden to be able to skip the next step
+	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv) {
 
 		if ($content['step'] == 'wizard_step40' && array_search('pressed', $content['button']) == 'next') {
@@ -52,10 +52,10 @@ 
 		}
 	}
 
-        /**
-        * Choose how to export multi-selects (includes Api\Categories)
-        */
-        function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
+		/**
+		 * Choose how to export multi-selects (includes Api\Categories)
+		 */
+		function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
 		// return from step50
@@ -130,8 +130,8 @@ 
 	}
 
 	/**
-	* Get a list of multi-select fields
-	*/
+	 * Get a list of multi-select fields
+	 */
 	protected function get_field_list($content) {
 		$field_list = array();
 

Spacing +17 added lines, -17 removed lines

@@ -22,10 +22,10 @@ 
 		// Field mapping
 		$bocontacts = new Api\Contacts();
 		$this->export_fields = $bocontacts->contact_fields;
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach ($bocontacts->customfields as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
-		unset($this->export_fields['jpegphoto']);        // can't cvs export that
+		unset($this->export_fields['jpegphoto']); // can't cvs export that
 
 		// Add in last/next appointments
 		// NB: last_date and next_date are used instead of last_event & next_event
@@ -42,10 +42,10 @@ 
 		if ($content['step'] == 'wizard_step40' && array_search('pressed', $content['button']) == 'next') {
 			$result = parent::wizard_step40($content, $sel_options, $readonlys, $preserv);
 			$field_list = $this->get_field_list($content);
-			if(count($field_list)) {
+			if (count($field_list)) {
 				return $result;
 			} else {
-				return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],2);
+				return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 2);
 			}
 		} else {
 			return parent::wizard_step40($content, $sel_options, $readonlys, $preserv);
@@ -57,15 +57,15 @@ 
         */
         function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step50->$content '.print_r($content, true));
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
-			if($content['explode_multiselects']) {
+			if ($content['explode_multiselects']) {
 				$explodes = $content['explode_multiselects'];
 				$content['explode_multiselects'] = array();
-				foreach($explodes as $row => $settings) {
-					if($settings['explode'] != addressbook_export_contacts_csv::NO_EXPLODE) {
+				foreach ($explodes as $row => $settings) {
+					if ($settings['explode'] != addressbook_export_contacts_csv::NO_EXPLODE) {
 						$content['explode_multiselects'][$settings['field']] = $settings;
 					}
 				}
@@ -73,13 +73,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step50($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step50($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step50
@@ -93,7 +93,7 @@ 
 			$settings = $content['explode_multiselects'] ? $content['explode_multiselects'] : $content['plugin_options']['explode_multiselects'];
 
 			// Skip this step if no fields applicable
-			if(count($field_list) == 0) {
+			if (count($field_list) == 0) {
 				$content['explode_multiselects'] = array();
 			}
 
@@ -108,13 +108,13 @@ 
 			);
 
 			$row = 1;
-			foreach($field_list as $field => $name) {
+			foreach ($field_list as $field => $name) {
 				$content['explode_multiselects'][$row] = array(
 					'field' =>      $field,
 					'name'  =>      $name,
 					'explode'=>	$settings[$field]
 				);
-				if($field == 'cat_id') {
+				if ($field == 'cat_id') {
 					$sel_options['explode_multiselects'][$row]['explode'] = $cat_options;
 				} else {
 					$sel_options['explode_multiselects'][$row]['explode'] = $multi_options;
@@ -136,14 +136,14 @@ 
 		$field_list = array();
 
 		// Category gets special handling
-		if(in_array('cat_id', array_keys($content['mapping']))) {
+		if (in_array('cat_id', array_keys($content['mapping']))) {
 			$field_list['cat_id'] = $this->export_fields['cat_id'];
 		}
 
 		// Add any multi-select custom fields
 		$custom = Api\Storage\Customfields::get('addressbook');
-		foreach($custom as $name => $c_field) {
-			if($c_field['type'] == 'select' && $c_field['rows'] > 1 && in_array('#'.$name, array_keys($content['mapping']))) {
+		foreach ($custom as $name => $c_field) {
+			if ($c_field['type'] == 'select' && $c_field['rows'] > 1 && in_array('#'.$name, array_keys($content['mapping']))) {
 				$field_list['#'.$name] = $c_field['label'];
 			}
 		}

Braces +44 added lines, -20 removed lines

@@ -13,7 +13,8 @@ 
 
 class addressbook_wizard_export_contacts_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		$this->steps['wizard_step50'] = lang('Choose export options');
@@ -22,7 +23,8 @@ 
 		// Field mapping
 		$bocontacts = new Api\Contacts();
 		$this->export_fields = $bocontacts->contact_fields;
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach($bocontacts->customfields as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 		unset($this->export_fields['jpegphoto']);        // can't cvs export that
@@ -37,17 +39,24 @@ 
 	/**
 	* Overridden to be able to skip the next step
 	*/
-	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv) {
+	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
+	{
 
-		if ($content['step'] == 'wizard_step40' && array_search('pressed', $content['button']) == 'next') {
+		if ($content['step'] == 'wizard_step40' && array_search('pressed', $content['button']) == 'next')
+		{
 			$result = parent::wizard_step40($content, $sel_options, $readonlys, $preserv);
 			$field_list = $this->get_field_list($content);
-			if(count($field_list)) {
+			if(count($field_list))
+			{
 				return $result;
-			} else {
+			}
+			else
+			{
 				return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],2);
 			}
-		} else {
+		}
+		else
+		{
 			return parent::wizard_step40($content, $sel_options, $readonlys, $preserv);
 		}
 	}
@@ -56,16 +65,22 @@ 
         * Choose how to export multi-selects (includes Api\Categories)
         */
         function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
-	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+        {
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		}
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
-			if($content['explode_multiselects']) {
+			if($content['explode_multiselects'])
+			{
 				$explodes = $content['explode_multiselects'];
 				$content['explode_multiselects'] = array();
-				foreach($explodes as $row => $settings) {
-					if($settings['explode'] != addressbook_export_contacts_csv::NO_EXPLODE) {
+				foreach($explodes as $row => $settings)
+				{
+					if($settings['explode'] != addressbook_export_contacts_csv::NO_EXPLODE)
+					{
 						$content['explode_multiselects'][$settings['field']] = $settings;
 					}
 				}
@@ -93,7 +108,8 @@ 
 			$settings = $content['explode_multiselects'] ? $content['explode_multiselects'] : $content['plugin_options']['explode_multiselects'];
 
 			// Skip this step if no fields applicable
-			if(count($field_list) == 0) {
+			if(count($field_list) == 0)
+			{
 				$content['explode_multiselects'] = array();
 			}
 
@@ -108,15 +124,19 @@ 
 			);
 
 			$row = 1;
-			foreach($field_list as $field => $name) {
+			foreach($field_list as $field => $name)
+			{
 				$content['explode_multiselects'][$row] = array(
 					'field' =>      $field,
 					'name'  =>      $name,
 					'explode'=>	$settings[$field]
 				);
-				if($field == 'cat_id') {
+				if($field == 'cat_id')
+				{
 					$sel_options['explode_multiselects'][$row]['explode'] = $cat_options;
-				} else {
+				}
+				else
+				{
 					$sel_options['explode_multiselects'][$row]['explode'] = $multi_options;
 				}
 				$row++;
@@ -132,18 +152,22 @@ 
 	/**
 	* Get a list of multi-select fields
 	*/
-	protected function get_field_list($content) {
+	protected function get_field_list($content)
+	{
 		$field_list = array();
 
 		// Category gets special handling
-		if(in_array('cat_id', array_keys($content['mapping']))) {
+		if(in_array('cat_id', array_keys($content['mapping'])))
+		{
 			$field_list['cat_id'] = $this->export_fields['cat_id'];
 		}
 
 		// Add any multi-select custom fields
 		$custom = Api\Storage\Customfields::get('addressbook');
-		foreach($custom as $name => $c_field) {
-			if($c_field['type'] == 'select' && $c_field['rows'] > 1 && in_array('#'.$name, array_keys($content['mapping']))) {
+		foreach($custom as $name => $c_field)
+		{
+			if($c_field['type'] == 'select' && $c_field['rows'] > 1 && in_array('#'.$name, array_keys($content['mapping'])))
+			{
 				$field_list['#'.$name] = $c_field['label'];
 			}
 		}

addressbook/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,4 +25,4 @@
 	unset($old_state['advanced_search']);
 	Api\Cache::setSession('addressbook', 'index', $old_state);
 }
-Api\Egw::redirect_link('/index.php','menuaction=addressbook.addressbook_ui.index');
+Api\Egw::redirect_link('/index.php', 'menuaction=addressbook.addressbook_ui.index');

login.php

Indentation +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 	// some apache mod_auth_* modules use REMOTE_USER instead of PHP_AUTH_USER, thanks to Sylvain Beucler
 	if ($GLOBALS['egw_info']['server']['auth_type'] == 'http' && !isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['REMOTE_USER']))
 	{
-        	$_SERVER['PHP_AUTH_USER'] = $_SERVER['REMOTE_USER'];
+			$_SERVER['PHP_AUTH_USER'] = $_SERVER['REMOTE_USER'];
 	}
 	if($GLOBALS['egw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
 	{

Braces +10 added lines, -3 removed lines

@@ -365,14 +365,21 @@
 				$extra_vars .= ($extra_vars ? '&' : '').'cd=yes';
 			}
 
-			if(strpos($_SERVER['HTTP_REFERER'], $_SERVER['REQUEST_URI']) === false) {
+			if(strpos($_SERVER['HTTP_REFERER'], $_SERVER['REQUEST_URI']) === false)
+			{
 				// login requuest does not come from login.php
 				// redirect to referer on logout
 				Api\Cache::setSession('login', 'referer', $_SERVER['HTTP_REFERER']);
 			}
 			$strength = ($GLOBALS['egw_info']['server']['force_pwd_strength']?$GLOBALS['egw_info']['server']['force_pwd_strength']:false);
-			if ($strength && $strength>5) $strength =5;
-			if ($strength && $strength<0) $strength = false;
+			if ($strength && $strength>5)
+			{
+				$strength =5;
+			}
+			if ($strength && $strength<0)
+			{
+				$strength = false;
+			}
 			// Check for save passwd
 			if($strength && $GLOBALS['egw_info']['server']['check_save_passwd'] && !$GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences') &&
 				($unsave_msg = $GLOBALS['egw']->auth->crackcheck($passwd, $strength)))

Spacing +84 added lines, -84 removed lines

@@ -15,7 +15,7 @@ 
 use EGroupware\Api\Framework;
 use EGroupware\Api\Egw;
 
-$submit = False;			// set to some initial value
+$submit = False; // set to some initial value
 
 $GLOBALS['egw_info'] = array('flags' => array(
 	'disable_Template_class'  => True,
@@ -23,10 +23,10 @@ 
 	'currentapp'              => 'login',
 ));
 
-if(file_exists('./header.inc.php'))
+if (file_exists('./header.inc.php'))
 {
 	include('./header.inc.php');
-	if(!function_exists('CreateObject'))
+	if (!function_exists('CreateObject'))
 	{
 		Header('Location: setup/index.php');
 		exit;
@@ -42,17 +42,17 @@ 
  * Destroy any existing anonymous session.
  * Copied from logout.php. Maybe make it a common function?
  */
-if(isset($GLOBALS['sitemgr_info']) && $GLOBALS['egw_info']['user']['userid'] == $GLOBALS['sitemgr_info']['anonymous_user'])
+if (isset($GLOBALS['sitemgr_info']) && $GLOBALS['egw_info']['user']['userid'] == $GLOBALS['sitemgr_info']['anonymous_user'])
 {
-	if($GLOBALS['egw']->session->verify())
+	if ($GLOBALS['egw']->session->verify())
 	{
 		Api\Hooks::process('logout');
-		$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'],$GLOBALS['kp3']);
+		$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'], $GLOBALS['kp3']);
 	}
 }
 
 // CAS :
-if($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
+if ($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
 {
 	ob_end_clean();
 
@@ -60,32 +60,32 @@ 
 
 	//phpCAS::setDebug('/var/log/log_phpcas.php');
 
-	if($GLOBALS['egw_info']['server']['cas_authentication_mode'] == 'Proxy')
+	if ($GLOBALS['egw_info']['server']['cas_authentication_mode'] == 'Proxy')
 	{
 		phpCAS::proxy(CAS_VERSION_2_0,
 			$GLOBALS['egw_info']['server']['cas_server_host_name'],
-			(int) $GLOBALS['egw_info']['server']['cas_server_port'],
-			$GLOBALS['egw_info']['server']['cas_server_uri'] );
+			(int)$GLOBALS['egw_info']['server']['cas_server_port'],
+			$GLOBALS['egw_info']['server']['cas_server_uri']);
 	}
 	else
 	{
 		phpCAS::client(CAS_VERSION_2_0,
 			$GLOBALS['egw_info']['server']['cas_server_host_name'],
-			(int) $GLOBALS['egw_info']['server']['cas_server_port'],
-			$GLOBALS['egw_info']['server']['cas_server_uri'] );
+			(int)$GLOBALS['egw_info']['server']['cas_server_port'],
+			$GLOBALS['egw_info']['server']['cas_server_uri']);
 	}
 
-	if($GLOBALS['egw_info']['server']['cas_ssl_validation'] == 'PEMCertificate')
+	if ($GLOBALS['egw_info']['server']['cas_ssl_validation'] == 'PEMCertificate')
 	{
 		// Set the certificate of the CAS server (PEM Certificate)
 		phpCAS::setCasServerCert($GLOBALS['egw_info']['server']['cas_cert']);
 	}
-	elseif($GLOBALS['egw_info']['server']['cas_ssl_validation'] == 'CACertificate')
+	elseif ($GLOBALS['egw_info']['server']['cas_ssl_validation'] == 'CACertificate')
 	{
 		// Set the CA certificate of the CAS server
 		phpCAS::setCasServerCACert($GLOBALS['egw_info']['server']['cas_cert']);
 	}
-	elseif($GLOBALS['egw_info']['server']['cas_ssl_validation'] == 'No')
+	elseif ($GLOBALS['egw_info']['server']['cas_ssl_validation'] == 'No')
 	{
 		// no SSL validation for the CAS server
 		phpCAS::setNoCasServerValidation();
@@ -96,11 +96,11 @@ 
 	ob_start();
 
 	$login = phpCAS::getUser();
-	$password = phpCAS::retrievePT("imap://".$GLOBALS['egw_info']['server']['mail_server'],$err_code,$output);
-	$GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($login,$password,'text');
+	$password = phpCAS::retrievePT("imap://".$GLOBALS['egw_info']['server']['mail_server'], $err_code, $output);
+	$GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($login, $password, 'text');
 
 	/* set auth_cookie */
-	$GLOBALS['egw']->redirect_link($forward,$extra_vars);
+	$GLOBALS['egw']->redirect_link($forward, $extra_vars);
 }
 else
 {
@@ -125,7 +125,7 @@ 
 	$GLOBALS['egw']->framework = Framework::factory();
 
 	// This is used for system downtime, to prevent new logins.
-	if($GLOBALS['egw_info']['server']['deny_all_logins'])
+	if ($GLOBALS['egw_info']['server']['deny_all_logins'])
 	{
 	   echo $GLOBALS['egw']->framework->denylogin_screen();
 	   exit;
@@ -138,7 +138,7 @@ 
 	{
         	$_SERVER['PHP_AUTH_USER'] = $_SERVER['REMOTE_USER'];
 	}
-	if($GLOBALS['egw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
+	if ($GLOBALS['egw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
 	{
 		$submit = True;
 		$login  = $_SERVER['PHP_AUTH_USER'];
@@ -150,11 +150,11 @@ 
 		$passwd = get_magic_quotes_gpc() ? stripslashes($_POST['passwd']) : $_POST['passwd'];
 		$passwd_type = $_POST['passwd_type'];
 
-		if($GLOBALS['egw_info']['server']['allow_cookie_auth'])
+		if ($GLOBALS['egw_info']['server']['allow_cookie_auth'])
 		{
-			$eGW_remember = explode('::::',get_magic_quotes_gpc() ? stripslashes($_COOKIE['eGW_remember']) : $_COOKIE['eGW_remember']);
+			$eGW_remember = explode('::::', get_magic_quotes_gpc() ? stripslashes($_COOKIE['eGW_remember']) : $_COOKIE['eGW_remember']);
 
-			if($eGW_remember[0] && $eGW_remember[1] && $eGW_remember[2])
+			if ($eGW_remember[0] && $eGW_remember[1] && $eGW_remember[2])
 			{
 				$_SERVER['PHP_AUTH_USER'] = $login = $eGW_remember[0];
 				$_SERVER['PHP_AUTH_PW'] = $passwd = $eGW_remember[1];
@@ -162,10 +162,10 @@ 
 				$submit = True;
 			}
 		}
-		if(!$passwd && ($GLOBALS['egw_info']['server']['auto_anon_login']) && !$_GET['cd'])
+		if (!$passwd && ($GLOBALS['egw_info']['server']['auto_anon_login']) && !$_GET['cd'])
 		{
 			$_SERVER['PHP_AUTH_USER'] = $login = 'anonymous';
-			$_SERVER['PHP_AUTH_PW'] =  $passwd = 'anonymous';
+			$_SERVER['PHP_AUTH_PW'] = $passwd = 'anonymous';
 			$passwd_type = 'text';
 			$submit = True;
 		}
@@ -173,26 +173,26 @@ 
 
 	# Apache + mod_ssl style SSL certificate authentication
 	# Certificate (chain) verification occurs inside mod_ssl
-	if($GLOBALS['egw_info']['server']['auth_type'] == 'sqlssl' && isset($_SERVER['SSL_CLIENT_S_DN']) && !isset($_GET['cd']))
+	if ($GLOBALS['egw_info']['server']['auth_type'] == 'sqlssl' && isset($_SERVER['SSL_CLIENT_S_DN']) && !isset($_GET['cd']))
 	{
 	   // an X.509 subject looks like:
 	   // CN=john.doe/OU=Department/O=Company/C=xx/Email=john@comapy.tld/L=City/
 	   // the username is deliberately lowercase, to ease LDAP integration
-	   $sslattribs = explode('/',$_SERVER['SSL_CLIENT_S_DN']);
+	   $sslattribs = explode('/', $_SERVER['SSL_CLIENT_S_DN']);
 	   # skip the part in front of the first '/' (nothing)
-	   while(($sslattrib = next($sslattribs)))
+	   while (($sslattrib = next($sslattribs)))
 	   {
-		  list($key,$val) = explode('=',$sslattrib);
+		  list($key, $val) = explode('=', $sslattrib);
 		  $sslattributes[$key] = $val;
 	   }
 
-	   if(isset($sslattributes['Email']))
+	   if (isset($sslattributes['Email']))
 	   {
 		  $submit = True;
 
 		  # login will be set here if the user logged out and uses a different username with
 		  # the same SSL-certificate.
-		  if(!isset($_POST['login'])&&isset($sslattributes['Email']))
+		  if (!isset($_POST['login']) && isset($sslattributes['Email']))
 		  {
 			 $login = $sslattributes['Email'];
 			 # not checked against the database, but delivered to authentication module
@@ -204,13 +204,13 @@ 
 	   unset($sslattributes);
 	}
 
-	if(isset($passwd_type) || $_POST['submitit_x'] || $_POST['submitit_y'] || $submit)
+	if (isset($passwd_type) || $_POST['submitit_x'] || $_POST['submitit_y'] || $submit)
 	{
-		if(getenv('REQUEST_METHOD') != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' &&
+		if (getenv('REQUEST_METHOD') != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' &&
 			!isset($_SERVER['PHP_AUTH_USER']) && !isset($_SERVER['SSL_CLIENT_S_DN']))
 		{
-			$GLOBALS['egw']->session->egw_setcookie('eGW_remember','',0,'/');
-			Egw::redirect_link('/login.php','cd=5');
+			$GLOBALS['egw']->session->egw_setcookie('eGW_remember', '', 0, '/');
+			Egw::redirect_link('/login.php', 'cd=5');
 		}
 		/* cookie enabled check comment out, as it seems to cause a redirect loop under certain conditions and browsers :-(
 		if ($_COOKIE['eGW_cookie_test'] !== 'enabled')
@@ -219,7 +219,7 @@ 
 		}*/
 
 		// don't get login data again when $submit is true
-		if($submit == false)
+		if ($submit == false)
 		{
 			$login = $_POST['login'];
 		}
@@ -227,14 +227,14 @@ 
 		//conference - for strings like vinicius@thyamad.com@default , allows
 		//that user have a login that is his e-mail. (viniciuscb)
 		// remove blanks
-		$login_parts = array_map('trim',explode('@',$login));
-		$login = implode('@',$login_parts);
+		$login_parts = array_map('trim', explode('@', $login));
+		$login = implode('@', $login_parts);
 
 		$got_login = false;
 		if (count($login_parts) > 1)
 		{
 			//Last part of login string, when separated by @, is a domain name
-			if (array_key_exists(array_pop($login_parts),$GLOBALS['egw_domain']))
+			if (array_key_exists(array_pop($login_parts), $GLOBALS['egw_domain']))
 			{
 				$got_login = true;
 			}
@@ -242,17 +242,17 @@ 
 
 		if (!$got_login)
 		{
-			if(isset($_POST['logindomain']))
+			if (isset($_POST['logindomain']))
 			{
-				$login .= '@' . $_POST['logindomain'];
+				$login .= '@'.$_POST['logindomain'];
 			}
-			elseif(!isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]))
+			elseif (!isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]))
 			{
 				$login .= '@'.$GLOBALS['egw_info']['server']['default_domain'];
 			}
 		}
 		$GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($login, $passwd,
-			$passwd_type, false, true, true);	// true = let session fail on forced password change
+			$passwd_type, false, true, true); // true = let session fail on forced password change
 
 		if (!$GLOBALS['sessionid'] && $GLOBALS['egw']->session->cd_reason == Api\Session::CD_FORCE_PASSWORD_CHANGE)
 		{
@@ -264,7 +264,7 @@ 
 				}
 				else
 				{
-					$GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($login,$_POST['new_passwd'],$passwd_type);
+					$GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($login, $_POST['new_passwd'], $passwd_type);
 				}
 			}
 			else
@@ -276,46 +276,46 @@ 
 		{
 			// will show new login-screen incl. new password field below
 		}
-		elseif (!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
+		elseif (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
 		{
-			Api\Session::egw_setcookie('eGW_remember','',0,'/');
-			Egw::redirect_link('/login.php?cd=' . $GLOBALS['egw']->session->cd_reason);
+			Api\Session::egw_setcookie('eGW_remember', '', 0, '/');
+			Egw::redirect_link('/login.php?cd='.$GLOBALS['egw']->session->cd_reason);
 		}
 		else
 		{
 			/* set auth_cookie  */
-			if($GLOBALS['egw_info']['server']['allow_cookie_auth'] && $_POST['remember_me'] && $_POST['passwd'])
+			if ($GLOBALS['egw_info']['server']['allow_cookie_auth'] && $_POST['remember_me'] && $_POST['passwd'])
 			{
 				switch ($_POST['remember_me'])
 				{
 					case '1hour' :
-						$remember_time = time()+60*60;
+						$remember_time = time() + 60 * 60;
 						break;
 					case '1day' :
-						$remember_time = time()+60*60*24;
+						$remember_time = time() + 60 * 60 * 24;
 						break;
 					case '1week' :
-						$remember_time = time()+60*60*24*7;
+						$remember_time = time() + 60 * 60 * 24 * 7;
 						break;
 					case '1month' :
-						$remember_time = time()+60*60*24*30;
+						$remember_time = time() + 60 * 60 * 24 * 30;
 						break;
 					case 'forever' :
 					default:
 						$remember_time = 2147483647;
 						break;
 				}
-				$GLOBALS['egw']->session->egw_setcookie('eGW_remember',implode('::::',array(
+				$GLOBALS['egw']->session->egw_setcookie('eGW_remember', implode('::::', array(
 					'login' => $login,
 					'passwd' => $passwd,
 					'passwd_type' => $passwd_type)),
-					$remember_time,'/');	// make the cookie valid for the whole site (incl. sitemgr) and not only the eGW install-dir
+					$remember_time, '/'); // make the cookie valid for the whole site (incl. sitemgr) and not only the eGW install-dir
 			}
 
-			if ($_POST['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_POST['lang']) &&
+			if ($_POST['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $_POST['lang']) &&
 				$_POST['lang'] != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
 			{
-				$GLOBALS['egw']->preferences->add('common','lang',$_POST['lang'],'session');
+				$GLOBALS['egw']->preferences->add('common', 'lang', $_POST['lang'], 'session');
 			}
 
 			// check if new translations are available
@@ -329,27 +329,27 @@ 
 			}
 			else
 			{
-				list($forward,$extra_vars) = explode('?',$forward,2);
+				list($forward, $extra_vars) = explode('?', $forward, 2);
 				$extra_vars .= ($extra_vars ? '&' : '').'cd=yes';
 			}
 
-			if(strpos($_SERVER['HTTP_REFERER'], $_SERVER['REQUEST_URI']) === false) {
+			if (strpos($_SERVER['HTTP_REFERER'], $_SERVER['REQUEST_URI']) === false) {
 				// login requuest does not come from login.php
 				// redirect to referer on logout
 				Api\Cache::setSession('login', 'referer', $_SERVER['HTTP_REFERER']);
 			}
-			$strength = ($GLOBALS['egw_info']['server']['force_pwd_strength']?$GLOBALS['egw_info']['server']['force_pwd_strength']:false);
-			if ($strength && $strength>5) $strength =5;
-			if ($strength && $strength<0) $strength = false;
+			$strength = ($GLOBALS['egw_info']['server']['force_pwd_strength'] ? $GLOBALS['egw_info']['server']['force_pwd_strength'] : false);
+			if ($strength && $strength > 5) $strength = 5;
+			if ($strength && $strength < 0) $strength = false;
 			// Check for save passwd
-			if($strength && $GLOBALS['egw_info']['server']['check_save_passwd'] && !$GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences') &&
+			if ($strength && $GLOBALS['egw_info']['server']['check_save_passwd'] && !$GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences') &&
 				($unsave_msg = $GLOBALS['egw']->auth->crackcheck($passwd, $strength)))
 			{
-				error_log('login::'.__LINE__.' User '. $login. ' authenticated with an unsave password'.' '.$unsave_msg);
+				error_log('login::'.__LINE__.' User '.$login.' authenticated with an unsave password'.' '.$unsave_msg);
 				$message = lang('eGroupWare checked your password for safetyness. You have to change your password for the following reason:')."\n";
 				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'preferences.uipassword.change',
-					'message' => $message . $unsave_msg,
+					'message' => $message.$unsave_msg,
 					'cd' => 'yes',
 				));
 			}
@@ -357,66 +357,66 @@ 
 			{
 				// commiting the session, before redirecting might fix racecondition in session creation
 				$GLOBALS['egw']->session->commit_session();
-				Egw::redirect_link($forward,$extra_vars);
+				Egw::redirect_link($forward, $extra_vars);
 			}
 		}
 	}
 	// show login screen
-	if(isset($_COOKIE['last_loginid']))
+	if (isset($_COOKIE['last_loginid']))
 	{
 		$prefs = new Api\Preferences($GLOBALS['egw']->accounts->name2id($_COOKIE['last_loginid']));
 
-		if($prefs->account_id)
+		if ($prefs->account_id)
 		{
 			$GLOBALS['egw_info']['user']['preferences'] = $prefs->read_repository();
 		}
 	}
-	if ($_GET['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_GET['lang']))
+	if ($_GET['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $_GET['lang']))
 	{
 		$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $_GET['lang'];
 	}
-	elseif(!isset($_COOKIE['last_loginid']) || !$prefs->account_id)
+	elseif (!isset($_COOKIE['last_loginid']) || !$prefs->account_id)
 	{
 		// If the lastloginid cookies isn't set, we will default to the first language,
 		// the users browser accepts.
-		list($lang) = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
-		if(strlen($lang) > 2)
+		list($lang) = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+		if (strlen($lang) > 2)
 		{
-			$lang = substr($lang,0,2);
+			$lang = substr($lang, 0, 2);
 		}
 		$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $lang;
 	}
 	if ($_COOKIE['eGW_cookie_test'] !== 'enabled')
 	{
-		Api\Session::egw_setcookie('eGW_cookie_test','enabled',0);
+		Api\Session::egw_setcookie('eGW_cookie_test', 'enabled', 0);
 	}
 	#print 'LANG:' . $GLOBALS['egw_info']['user']['preferences']['common']['lang'] . '<br>';
-	Api\Translation::init();	// this will set the language according to the (new) set prefs
+	Api\Translation::init(); // this will set the language according to the (new) set prefs
 	Api\Translation::add_app('login');
 	Api\Translation::add_app('loginscreen');
-	$GLOBALS['loginscreenmessage'] = Api\Translation::translate('loginscreen_message',false,'');
-	if($GLOBALS['loginscreenmessage'] == 'loginscreen_message' || empty($GLOBALS['loginscreenmessage']))
+	$GLOBALS['loginscreenmessage'] = Api\Translation::translate('loginscreen_message', false, '');
+	if ($GLOBALS['loginscreenmessage'] == 'loginscreen_message' || empty($GLOBALS['loginscreenmessage']))
 	{
-		Api\Translation::add_app('loginscreen','en');	// trying the en one
-		$GLOBALS['loginscreenmessage'] = Api\Translation::translate('loginscreen_message',false,'');
+		Api\Translation::add_app('loginscreen', 'en'); // trying the en one
+		$GLOBALS['loginscreenmessage'] = Api\Translation::translate('loginscreen_message', false, '');
 	}
-	if($GLOBALS['loginscreenmessage'] == 'loginscreen_message' || empty($GLOBALS['loginscreenmessage']))
+	if ($GLOBALS['loginscreenmessage'] == 'loginscreen_message' || empty($GLOBALS['loginscreenmessage']))
 	{
 	   // remove the global var since the lang loginscreen message and its fallback (en) is empty or not set
 	   unset($GLOBALS['loginscreenmessage']);
 	}
 
-	foreach($_GET as $name => $value)
+	foreach ($_GET as $name => $value)
 	{
-		if(strpos($name,'phpgw_') !== false)
+		if (strpos($name, 'phpgw_') !== false)
 		{
-			$extra_vars .= '&' . $name . '=' . urlencode($value);
+			$extra_vars .= '&'.$name.'='.urlencode($value);
 		}
 	}
 
-	if($extra_vars)
+	if ($extra_vars)
 	{
-		$extra_vars = '?' . substr($extra_vars,1);
+		$extra_vars = '?'.substr($extra_vars, 1);
 	}
 
 	$GLOBALS['egw']->framework->login_screen($extra_vars, $force_password_change);

index.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 // or an uncoditional redirect to this file or copy groupdav.htaccess to your docroot as .htaccess
 if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND' || $_SERVER['REQUEST_METHOD'] == 'OPTIONS')
 {
-        header('Location: groupdav.php/');
-        exit;
+		header('Location: groupdav.php/');
+		exit;
 }
 
 // forward for not existing or empty header to setup

Spacing +25 added lines, -25 removed lines

@@ -24,13 +24,13 @@ 
 }
 
 // forward for not existing or empty header to setup
-if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
+if (!file_exists('header.inc.php') || !filesize('header.inc.php'))
 {
 	Header('Location: setup/index.php');
 	exit;
 }
 
-if(isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
+if (isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
 {
 	$hasupdates = True;
 }
@@ -38,20 +38,20 @@ 
 /*
 	This is the menuaction driver for the multi-layered design
 */
-if(isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_\\\\]+\.[A-Za-z0-9_]+$/',$_GET['menuaction']))
+if (isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_\\\\]+\.[A-Za-z0-9_]+$/', $_GET['menuaction']))
 {
-	list($app,$class,$method) = explode('.',$_GET['menuaction']);
+	list($app, $class, $method) = explode('.', $_GET['menuaction']);
 
 	// check if autoloadable class belongs to given app
 	if (substr($class, 0, 11) == 'EGroupware\\')
 	{
 		list(,$app_from_class) = explode('\\', strtolower($class));
 	}
-	elseif(strpos($class, '_') !== false)
+	elseif (strpos($class, '_') !== false)
 	{
 		list($app_from_class) = explode('_', $class);
 	}
-	if(!$app || !$class || !$method || isset($app_from_class) &&
+	if (!$app || !$class || !$method || isset($app_from_class) &&
 		isset($GLOBALS['egw_info']['apps'][$app_from_class]) && $app_from_class != $app)
 	{
 		$invalid_data = True;
@@ -63,7 +63,7 @@ 
 	$invalid_data = True;
 }
 //error_log(__METHOD__."$app,$class,$method");
-if($app == 'phpgwapi')
+if ($app == 'phpgwapi')
 {
 	$app = 'api';
 	$api_requested = True;
@@ -81,9 +81,9 @@ 
 // user changed timezone
 if (isset($_GET['tz']))
 {
-	Api\DateTime::setUserPrefs($_GET['tz']);	// throws exception, if tz is invalid
+	Api\DateTime::setUserPrefs($_GET['tz']); // throws exception, if tz is invalid
 
-	$GLOBALS['egw']->preferences->add('common','tz',$_GET['tz']);
+	$GLOBALS['egw']->preferences->add('common', 'tz', $_GET['tz']);
 	$GLOBALS['egw']->preferences->save_repository();
 
 	if (($referer = Api\Header\Referer::get()))
@@ -94,30 +94,30 @@ 
 
 // 	Check if we are using windows or normal webpage
 $windowed = false;
-$tpl_info = EGW_SERVER_ROOT . '/phpgwapi/templates/' . basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
+$tpl_info = EGW_SERVER_ROOT.'/phpgwapi/templates/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
 if (!file_exists($tpl_info))
 {
-	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
+	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
 }
-if(@file_exists($tpl_info))
+if (@file_exists($tpl_info))
 {
 	include_once($tpl_info);
-	if($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
+	if ($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
 	{
 		$windowed = true;
 	}
 }
 
 
-if($app == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
+if ($app == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
 {
 	if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice')
 	{
 		$GLOBALS['egw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['egw_info']['server']['force_default_app'];
 	}
-	if($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
+	if ($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
 	{
-		Egw::redirect(Framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']),$GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
+		Egw::redirect(Framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']), $GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
 	}
 	else
 	{
@@ -125,7 +125,7 @@ 
 	}
 }
 
-if($windowed && $_GET['cd'] == 'yes')
+if ($windowed && $_GET['cd'] == 'yes')
 {
 	$GLOBALS['egw_info']['flags'] = array(
 		'noheader'   => False,
@@ -137,7 +137,7 @@ 
 }
 else
 {
-	if($api_requested)
+	if ($api_requested)
 	{
 		$app = 'phpgwapi';
 	}
@@ -150,7 +150,7 @@ 
 	{
 		$obj = CreateObject($app.'.'.$class);
 	}
-	if((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
+	if ((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
 	{
 		$obj->$method();
 		unset($app);
@@ -161,9 +161,9 @@ 
 	}
 	else
 	{
-		if(!$app || !$class || !$method || $invalid_data)
+		if (!$app || !$class || !$method || $invalid_data)
 		{
-			if(@is_object($GLOBALS['egw']->log))
+			if (@is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
 					'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
@@ -174,9 +174,9 @@ 
 			}
 		}
 
-		if(!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
+		if (!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
 		{
-			if(@is_object($GLOBALS['egw']->log))
+			if (@is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
 					'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
@@ -186,7 +186,7 @@ 
 				));
 			}
 		}
-		if(@is_object($GLOBALS['egw']->log))
+		if (@is_object($GLOBALS['egw']->log))
 		{
 			$GLOBALS['egw']->log->commit();
 		}
@@ -194,7 +194,7 @@ 
 		$GLOBALS['egw']->redirect_link('/home/index.php');
 	}
 
-	if(!isset($GLOBALS['egw_info']['nofooter']))
+	if (!isset($GLOBALS['egw_info']['nofooter']))
 	{
 		echo $GLOBALS['egw']->framework->footer();
 	}

groupdav.php

Spacing +5 added lines, -5 removed lines

@@ -22,10 +22,10 @@ 
 
 // switching off output compression for Lighttpd and HTTPS, as it makes problems with TB Lightning
 if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' &&
-	strpos($_SERVER['SERVER_SOFTWARE'],'lighttpd/1.4') === 0 &&
-	strpos($_SERVER['HTTP_USER_AGENT'],'Lightning') !== false)
+	strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd/1.4') === 0 &&
+	strpos($_SERVER['HTTP_USER_AGENT'], 'Lightning') !== false)
 {
-	ini_set('zlib.output_compression',0);
+	ini_set('zlib.output_compression', 0);
 }
 //error_log("HTTPS='$_SERVER[HTTPS]', SERVER_SOFTWARE='$_SERVER[SERVER_SOFTWARE]', HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]', REQUEST_METHOD='$_SERVER[REQUEST_METHOD]' --> zlib.output_compression=".ini_get('zlib.output_compression'));
 
@@ -35,9 +35,9 @@ 
 	'flags' => array(
 		'noheader'  => True,
 		'currentapp' => 'groupdav',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
 		'autocreate_session_callback' => 'EGroupware\\Api\\Header\\Authenticate::autocreate_session_callback',
-		'auth_realm' => 'EGroupware CalDAV/CardDAV/GroupDAV server',	// cant use groupdav::REALM as autoloading and include path not yet setup!
+		'auth_realm' => 'EGroupware CalDAV/CardDAV/GroupDAV server', // cant use groupdav::REALM as autoloading and include path not yet setup!
 	)
 );
 // if you move this file somewhere else, you need to adapt the path to the header!