EGroupware / egroupware

addressbook/inc/class.addressbook_egw_record.inc.php

Spacing +12 added lines, -12 removed lines

@@ -31,8 +31,8 @@ 
 
 	// Used in conversions
 	static $types = array(
-		'select-account' => array('owner','creator','modifier'),
-		'date-time' => array('modified','created','last_event','next_event'),
+		'select-account' => array('owner', 'creator', 'modifier'),
+		'date-time' => array('modified', 'created', 'last_event', 'next_event'),
 		'date' => array('bday'),
 		'select-cat' => array('cat_id'),
 		'select' => array('tid')
@@ -45,10 +45,10 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
 		$this->bocontacts = new Api\Contacts();
-		if($_identifier) {
+		if ($_identifier) {
 			$this->contact = $this->bocontacts->read($this->identifier);
 		}
 	}
@@ -99,7 +99,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->contact = $_record;
 	}
 
@@ -126,14 +126,14 @@ 
 		$ui->type_icon($this->owner, $this->private, $this->tid, $icon, $label);
 
 		// Specific photo
-		return $this->jpegphoto ? Framework::link('/index.php',$ui->photo_src($this->identifier,$this->jpegphoto)):$icon;
+		return $this->jpegphoto ? Framework::link('/index.php', $ui->photo_src($this->identifier, $this->jpegphoto)) : $icon;
 	}
 	/**
 	 * saves record into backend
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -144,8 +144,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but required by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but required by function signature
 	}
 
 	/**
@@ -155,15 +155,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but required by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but required by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +28 added lines, -14 removed lines

@@ -45,10 +45,12 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
 		$this->bocontacts = new Api\Contacts();
-		if($_identifier) {
+		if($_identifier)
+		{
 			$this->contact = $this->bocontacts->read($this->identifier);
 		}
 	}
@@ -58,7 +60,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->contact[$_attribute_name];
 	}
 
@@ -68,7 +71,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->contact[$_attribute_name] = $data;
 	}
 
@@ -80,7 +84,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->contact;
 	}
 
@@ -89,7 +94,8 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return $this->bocontacts->link_title(empty($this->contact) ? $this->identifier : $this->contact);
 	}
 
@@ -99,7 +105,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->contact = $_record;
 	}
 
@@ -108,7 +115,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier ? $this->identifier : $this->id;
 	}
 
@@ -118,7 +126,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		$ui = new addressbook_ui();
 
 		// Type as default
@@ -133,7 +142,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -144,7 +154,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but required by function signature
 	}
 
@@ -155,7 +166,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but required by function signature
 	}
 
@@ -163,7 +175,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -171,7 +184,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->bocontacts);
 	}
 }

addressbook/inc/class.addressbook_export_contacts_csv.inc.php

Indentation +5 added lines, -5 removed lines

@@ -365,10 +365,10 @@ 
 	}
 
 	/**
-	* Convert some internal data to something with more meaning
-	*
-	* Dates, times, user IDs, category IDs
-	*/
+	 * Convert some internal data to something with more meaning
+	 *
+	 * Dates, times, user IDs, category IDs
+	 */
 	public static function convert(addressbook_egw_record &$record, $options) {
 
 		if ($record->tel_prefer) {
@@ -436,7 +436,7 @@ 
 	 * Adjust automatically generated filter fields
 	 */
 	public function get_filter_fields(Array &$filters)
-    {
+	{
 		unset($filters['last_event']);
 		unset($filters['next_event']);
 		foreach($filters as $field_name => &$settings)

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

@@ -435,7 +435,7 @@
 	/**
 	 * Adjust automatically generated filter fields
 	 */
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
     {
 		unset($filters['last_event']);
 		unset($filters['next_event']);

Spacing +83 added lines, -83 removed lines

@@ -23,13 +23,13 @@ 
 	 * Constants used for exploding categories & multi-selectboxes into seperate fields
 	 */
 	const NO_EXPLODE = False;
-	const MAIN_CATS = 'main_cats';	// Only the top-level categories get their own field
-	const EACH_CAT = 'each_cat';	// Every category gets its own field
-	const EXPLODE = 'explode';	// For [custom] multi-selects, each option gets its own field
+	const MAIN_CATS = 'main_cats'; // Only the top-level categories get their own field
+	const EACH_CAT = 'each_cat'; // Every category gets its own field
+	const EXPLODE = 'explode'; // For [custom] multi-selects, each option gets its own field
 
 	public function __construct()
 	{
-		$this->ui= new addressbook_ui();
+		$this->ui = new addressbook_ui();
 		$this->get_selects();
 	}
 
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 
 		$options = $_definition->plugin_options;
 		$this->export_object = $export_object = new importexport_export_csv($_stream, (array)$options);
@@ -47,9 +47,9 @@ 
 
 		// Addressbook defines its own export imits
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
-		$export_limit = Api\Storage\Merge::getExportLimit($app='addressbook');
+		$export_limit = Api\Storage\Merge::getExportLimit($app = 'addressbook');
 		if (!$limit_exception) $export_object->export_limit = $export_limit; // we may not need that after all
-		if($export_limit == 'no' && !$limit_exception) {
+		if ($export_limit == 'no' && !$limit_exception) {
 			return;
 		}
 
@@ -60,18 +60,18 @@ 
 		if ($options['selection'] == 'search') {
 			// uicontacts selection with checkbox 'use_all'
 			$query = Api\Cache::getSession('addressbook', 'index');
-			$query['num_rows'] = -1;	// all
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
+			$query['num_rows'] = -1; // all
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
 			$query['order'] = 'contact_id';
-			if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!array_key_exists('filter', $query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
 			$readonlys = null;
-			$this->ui->get_rows($query,$selection,$readonlys, true);	// only return the ids
+			$this->ui->get_rows($query, $selection, $readonlys, true); // only return the ids
 		}
-		elseif ( $options['selection'] == 'all' ) {
+		elseif ($options['selection'] == 'all') {
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1') {
 				$col_filter['account_id'] = null;
 			}
-			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$col_filter);
+			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '', '', false, 'AND', false, $col_filter);
 			//$uicontacts->get_rows($query,$selection,$readonlys,true);
 		}
 		elseif ($options['selection'] == 'filter')
@@ -80,90 +80,90 @@ 
 			$query = array();
 
 			// Handle ranges
-			foreach($filter as $field => $value)
+			foreach ($filter as $field => $value)
 			{
-				if($field == 'cat_id')
+				if ($field == 'cat_id')
 				{
-					$query['col_filter'][$field] = implode(',',$value);
+					$query['col_filter'][$field] = implode(',', $value);
 					continue;
 				}
 
 				// Birthdays in addressbook are formatted Y-m-d
-				if($field == 'bday')
+				if ($field == 'bday')
 				{
-					if($value['from'])
+					if ($value['from'])
 					{
-						$query['col_filter'][] = "contact_bday >= " . $GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['from']));
+						$query['col_filter'][] = "contact_bday >= ".$GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['from']));
 					}
-					if($value['to'])
+					if ($value['to'])
 					{
-						$query['col_filter'][] = "contact_bday <= " . $GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['to']));
+						$query['col_filter'][] = "contact_bday <= ".$GLOBALS['egw']->db->quote(date('Y-m-d', (int)$value['to']));
 					}
 					continue;
 				}
 				// Custom fields & listed exceptions are not filtered with contact_ prefix
-				if(strpos($field, '#') !== 0 && !in_array($field, array('tid','owner')))
+				if (strpos($field, '#') !== 0 && !in_array($field, array('tid', 'owner')))
 				{
 					$field = 'contact_'.$field;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+				if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 				unset($query['col_filter'][$field]);
 			}
-			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$query['col_filter']);
+			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '', '', false, 'AND', false, $query['col_filter']);
 		}
 		else
 		{
-			$selection = explode(',',$options['selection']);
+			$selection = explode(',', $options['selection']);
 		}
-		if(!is_array($selection))
+		if (!is_array($selection))
 		{
 			$selection = array();
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 			$selection = array_slice($selection, 0, $export_limit);
 		}
 
-		if($options['explode_multiselects']) {
+		if ($options['explode_multiselects']) {
 			$customfields = Api\Storage\Customfields::get('addressbook');
 			$additional_fields = array();
 			$cat_obj = new Api\Categories('', 'addressbook');
-			foreach($options['explode_multiselects'] as $field => $explode) {
-				switch($explode['explode']) {
+			foreach ($options['explode_multiselects'] as $field => $explode) {
+				switch ($explode['explode']) {
 					case self::MAIN_CATS:
-						$cats = $cat_obj->return_array('mains', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						$cats = $cat_obj->return_array('mains', 0, false, '', 'ASC', '', true);
+						foreach ($cats as $settings) {
 							$additional_fields[$field][$settings['id']] = array(
 								'count' => 0,
 								'label' => $settings['name'],
 								'subs' => array(),
 							);
 							$subs = $cat_obj->return_sorted_array(0, False, '', 'ASC', 'cat_name', True, $settings['id']);
-							foreach($subs as $sub) {
+							foreach ($subs as $sub) {
 								$name = $sub['name'];
 								$path = $sub;
-								while($path['parent'] != $settings['id']) {
+								while ($path['parent'] != $settings['id']) {
 									$path = $cat_obj->read($path['parent']);
-									$name = $path['name'] . '/' . $name;
+									$name = $path['name'].'/'.$name;
 								}
 								$additional_fields[$field][$settings['id']]['subs'][$sub['id']] = $name;
 							}
 						}
 						break;
 					case self::EACH_CAT:
-						$cats = $cat_obj->return_array('all', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						$cats = $cat_obj->return_array('all', 0, false, '', 'ASC', '', true);
+						foreach ($cats as $settings) {
 							$name = $settings['name'];
 							$path = $settings;
-							while($path['level'] != 0) {
+							while ($path['level'] != 0) {
 								$path = $cat_obj->read($path['parent']);
-								$name = $path['name'] . '/' . $name;
+								$name = $path['name'].'/'.$name;
 							}
 							$additional_fields[$field][$settings['id']] = array(
 								'count' => 0,
@@ -174,10 +174,10 @@ 
 					case self::EXPLODE:
 						// Only works for custom fields
 						$index = substr($field, 1);
-						foreach($customfields[$index]['values'] as $key => $value) {
+						foreach ($customfields[$index]['values'] as $key => $value) {
 							$additional_fields[$field][$key] = array(
 								'count' => 0,
-								'label' => $customfields[$index]['label'] . ': ' . $value,
+								'label' => $customfields[$index]['label'].': '.$value,
 							);
 						}
 						break;
@@ -186,29 +186,29 @@ 
 
 			// Check records to see if additional fields are actually used
 			foreach ($selection as $_contact) {
-				if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+				if (is_array($_contact) && array_key_exists('photo', $_contact)) {
 					unset($_contact['photo']);
 				}
-				if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+				if (is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
 					$_contact = $_contact['id'];
 				}
-				if(is_array($_contact) && $_contact['id']) {
+				if (is_array($_contact) && $_contact['id']) {
 					$contact = new addressbook_egw_record();
 					$contact->set_record($_contact);
 				} else {
 					$contact = new addressbook_egw_record($_contact);
 				}
-				foreach($additional_fields as $field => &$values) {
-					if(!$contact->$field) continue;
-					foreach($values as $value => &$settings) {
-						if(!is_array($contact->$field)) {
+				foreach ($additional_fields as $field => &$values) {
+					if (!$contact->$field) continue;
+					foreach ($values as $value => &$settings) {
+						if (!is_array($contact->$field)) {
 							$contact->$field = explode(',', $contact->$field);
 						}
-						if(is_array($contact->$field) && in_array($value, $contact->$field)) {
+						if (is_array($contact->$field) && in_array($value, $contact->$field)) {
 							$settings['count']++;
-						} elseif($contact->$field == $value) {
+						} elseif ($contact->$field == $value) {
 							$settings['count']++;
-						} elseif($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs']))) {
+						} elseif ($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs']))) {
 							$settings['count']++;
 						}
 					}
@@ -220,18 +220,18 @@ 
 			unset($settings);
 
 			// Add additional columns
-			foreach($additional_fields as $field => $additional_values) {
+			foreach ($additional_fields as $field => $additional_values) {
 				// Remove original
 				unset($options['mapping'][$field]);
 				// Add exploded
 				$field_count = 0;
-				foreach($additional_values as $value => $settings) {
-					if($settings['count'] > 0) {
+				foreach ($additional_values as $value => $settings) {
+					if ($settings['count'] > 0) {
 						$field_count += $settings['count'];
 						$options['mapping'][$field.'-'.$value] = $settings['label'];
 					}
 				}
-				if($field_count > 0) {
+				if ($field_count > 0) {
 					// Set some options for converting
 					$options['explode_multiselects'][$field]['values'] = $additional_values;
 				} else {
@@ -244,12 +244,12 @@ 
 		$export_object->set_mapping($options['mapping']);
 
 		// Add in last/next event, if needed
-		if($options['mapping']['last_date'] || $options['mapping']['next_date'])
+		if ($options['mapping']['last_date'] || $options['mapping']['next_date'])
 		{
 			$contact_ids = array();
-			foreach($selection as $_contact)
+			foreach ($selection as $_contact)
 			{
-				if(is_array($_contact) && $_contact['id'])
+				if (is_array($_contact) && $_contact['id'])
 				{
 					$contact_ids[] = $_contact['account_id'] ? $_contact['account_id'] : 'c'.$_contact['id'];
 				}
@@ -264,20 +264,20 @@ 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
 		foreach ($selection as $_contact) {
-			if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+			if (is_array($_contact) && array_key_exists('photo', $_contact)) {
 				unset($_contact['photo']);
 			}
-			if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+			if (is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
 				$_contact = $_contact['id'];
 			}
-			if(is_array($_contact) && $_contact['id']) {
+			if (is_array($_contact) && $_contact['id']) {
 				$contact = new addressbook_egw_record();
 				$contact->set_record($_contact);
 			} else {
 				$contact = new addressbook_egw_record($_contact);
 			}
 
-			if($events && $events[$contact->id])
+			if ($events && $events[$contact->id])
 			{
 				// NB: last_date and next_date are used instead of last_event & next_event
 				// to avoid automatic conversion - we want to export link title, not date-time
@@ -286,12 +286,12 @@ 
 			}
 			// Some conversion
 			$this->convert($contact, $options);
-			if($options['convert']) {
-				importexport_export_csv::convert($contact, addressbook_egw_record::$types, 'addressbook',$this->selects);
+			if ($options['convert']) {
+				importexport_export_csv::convert($contact, addressbook_egw_record::$types, 'addressbook', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($contact->get_record_array() as $key => $value) {
-					if(is_array($value)) $contact->$key = implode(',', $value);
+				foreach ($contact->get_record_array() as $key => $value) {
+					if (is_array($value)) $contact->$key = implode(',', $value);
 				}
 			}
 
@@ -338,7 +338,7 @@ 
 	 */
 	public function get_filename()
 	{
-		if(is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
+		if (is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
 		{
 			return $this->export_object->record->get_title();
 		}
@@ -376,19 +376,19 @@ 
 			$record->tel_prefer = $record->$field;
 		}
 
-		if(!is_array($options['explode_multiselects']))
+		if (!is_array($options['explode_multiselects']))
 		{
 			return;
 		}
-		foreach((array)$options['explode_multiselects'] as $field => $explode_settings) {
-			if(!is_array($record->$field)) $record->$field = explode(',', $record->$field);
-			foreach((array)$explode_settings['values'] as $value => $settings) {
+		foreach ((array)$options['explode_multiselects'] as $field => $explode_settings) {
+			if (!is_array($record->$field)) $record->$field = explode(',', $record->$field);
+			foreach ((array)$explode_settings['values'] as $value => $settings) {
 				$field_name = "$field-$value";
 				$record->$field_name = array();
-				if(is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value) {
-					if($explode_settings['explode'] != self::MAIN_CATS) {
+				if (is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value) {
+					if ($explode_settings['explode'] != self::MAIN_CATS) {
 						$record->$field_name = $options['convert'] ? lang('Yes') : true;
-					} elseif($options['convert']) {
+					} elseif ($options['convert']) {
 						// 3 part assign due to magic get method
 						$record_value = $record->$field_name;
 						$record_value[] = $settings['label'];
@@ -397,16 +397,16 @@ 
 						$record->$field_name = $value;
 					}
 				}
-				if($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs'])))) {
+				if ($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs'])))) {
 					// 3 part assign due to magic get method
 					$record_value = $record->$field_name;
-					if(!is_array($record_value)) $record_value = array($record_value);
-					foreach(array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id) {
+					if (!is_array($record_value)) $record_value = array($record_value);
+					foreach (array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id) {
 						$record_value[] = $options['convert'] ? $settings['subs'][$sub_id] : $sub_id;
 					}
 					$record->$field_name = $record_value;
 				}
-				if(is_array($record->$field_name)) $record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
+				if (is_array($record->$field_name)) $record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
 			}
 		}
 	}
@@ -417,7 +417,7 @@ 
 		$this->selects = array(
 			'tid' => array('n' => 'Contact')
 		);
-		foreach($this->ui->content_types as $tid => $data)
+		foreach ($this->ui->content_types as $tid => $data)
 		{
 			$this->selects['tid'][$tid] = $data['name'];
 		}
@@ -439,9 +439,9 @@ 
     {
 		unset($filters['last_event']);
 		unset($filters['next_event']);
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 		$filters['owner'] = array(
 			'name'		=> 'owner',

Braces +162 added lines, -66 removed lines

@@ -38,7 +38,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 
 		$options = $_definition->plugin_options;
 		$this->export_object = $export_object = new importexport_export_csv($_stream, (array)$options);
@@ -48,8 +49,13 @@ 
 		// Addressbook defines its own export imits
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
 		$export_limit = Api\Storage\Merge::getExportLimit($app='addressbook');
-		if (!$limit_exception) $export_object->export_limit = $export_limit; // we may not need that after all
-		if($export_limit == 'no' && !$limit_exception) {
+		if (!$limit_exception)
+		{
+			$export_object->export_limit = $export_limit;
+		}
+		// we may not need that after all
+		if($export_limit == 'no' && !$limit_exception)
+		{
 			return;
 		}
 
@@ -57,18 +63,24 @@ 
 		$old_app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
-		if ($options['selection'] == 'search') {
+		if ($options['selection'] == 'search')
+		{
 			// uicontacts selection with checkbox 'use_all'
 			$query = Api\Cache::getSession('addressbook', 'index');
 			$query['num_rows'] = -1;	// all
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$query['order'] = 'contact_id';
-			if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			if(!array_key_exists('filter',$query))
+			{
+				$query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 			$readonlys = null;
 			$this->ui->get_rows($query,$selection,$readonlys, true);	// only return the ids
 		}
-		elseif ( $options['selection'] == 'all' ) {
-			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1') {
+		elseif ( $options['selection'] == 'all' )
+		{
+			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1')
+			{
 				$col_filter['account_id'] = null;
 			}
 			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$col_filter);
@@ -107,11 +119,20 @@ 
 					$field = 'contact_'.$field;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if(!is_array($value) || (!$value['from'] && !$value['to']))
+				{
+					continue;
+				}
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if($value['from'])
+				{
+					$query['col_filter'][] = "$field >= " . (int)$value['from'];
+				}
+				if($value['to'])
+				{
+					$query['col_filter'][] = "$field <= " . (int)$value['to'];
+				}
 				unset($query['col_filter'][$field]);
 			}
 			$selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$query['col_filter']);
@@ -126,29 +147,36 @@ 
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+		{
 			$selection = array_slice($selection, 0, $export_limit);
 		}
 
-		if($options['explode_multiselects']) {
+		if($options['explode_multiselects'])
+		{
 			$customfields = Api\Storage\Customfields::get('addressbook');
 			$additional_fields = array();
 			$cat_obj = new Api\Categories('', 'addressbook');
-			foreach($options['explode_multiselects'] as $field => $explode) {
-				switch($explode['explode']) {
+			foreach($options['explode_multiselects'] as $field => $explode)
+			{
+				switch($explode['explode'])
+				{
 					case self::MAIN_CATS:
 						$cats = $cat_obj->return_array('mains', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						foreach($cats as $settings)
+						{
 							$additional_fields[$field][$settings['id']] = array(
 								'count' => 0,
 								'label' => $settings['name'],
 								'subs' => array(),
 							);
 							$subs = $cat_obj->return_sorted_array(0, False, '', 'ASC', 'cat_name', True, $settings['id']);
-							foreach($subs as $sub) {
+							foreach($subs as $sub)
+							{
 								$name = $sub['name'];
 								$path = $sub;
-								while($path['parent'] != $settings['id']) {
+								while($path['parent'] != $settings['id'])
+								{
 									$path = $cat_obj->read($path['parent']);
 									$name = $path['name'] . '/' . $name;
 								}
@@ -158,10 +186,12 @@ 
 						break;
 					case self::EACH_CAT:
 						$cats = $cat_obj->return_array('all', 0, false,'','ASC','',true);
-						foreach($cats as $settings) {
+						foreach($cats as $settings)
+						{
 							$name = $settings['name'];
 							$path = $settings;
-							while($path['level'] != 0) {
+							while($path['level'] != 0)
+							{
 								$path = $cat_obj->read($path['parent']);
 								$name = $path['name'] . '/' . $name;
 							}
@@ -174,7 +204,8 @@ 
 					case self::EXPLODE:
 						// Only works for custom fields
 						$index = substr($field, 1);
-						foreach($customfields[$index]['values'] as $key => $value) {
+						foreach($customfields[$index]['values'] as $key => $value)
+						{
 							$additional_fields[$field][$key] = array(
 								'count' => 0,
 								'label' => $customfields[$index]['label'] . ': ' . $value,
@@ -185,30 +216,47 @@ 
 			}
 
 			// Check records to see if additional fields are actually used
-			foreach ($selection as $_contact) {
-				if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+			foreach ($selection as $_contact)
+			{
+				if(is_array($_contact) && array_key_exists('photo', $_contact))
+				{
 					unset($_contact['photo']);
 				}
-				if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+				if(is_array($_contact) && count($_contact) == 1 && $_contact['id'])
+				{
 					$_contact = $_contact['id'];
 				}
-				if(is_array($_contact) && $_contact['id']) {
+				if(is_array($_contact) && $_contact['id'])
+				{
 					$contact = new addressbook_egw_record();
 					$contact->set_record($_contact);
-				} else {
+				}
+				else
+				{
 					$contact = new addressbook_egw_record($_contact);
 				}
-				foreach($additional_fields as $field => &$values) {
-					if(!$contact->$field) continue;
-					foreach($values as $value => &$settings) {
-						if(!is_array($contact->$field)) {
+				foreach($additional_fields as $field => &$values)
+				{
+					if(!$contact->$field)
+					{
+						continue;
+					}
+					foreach($values as $value => &$settings)
+					{
+						if(!is_array($contact->$field))
+						{
 							$contact->$field = explode(',', $contact->$field);
 						}
-						if(is_array($contact->$field) && in_array($value, $contact->$field)) {
+						if(is_array($contact->$field) && in_array($value, $contact->$field))
+						{
 							$settings['count']++;
-						} elseif($contact->$field == $value) {
+						}
+						elseif($contact->$field == $value)
+						{
 							$settings['count']++;
-						} elseif($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs']))) {
+						}
+						elseif($options['explode_multiselects'][$field]['explode'] == self::MAIN_CATS && array_intersect($contact->$field, array_keys($settings['subs'])))
+						{
 							$settings['count']++;
 						}
 					}
@@ -220,21 +268,27 @@ 
 			unset($settings);
 
 			// Add additional columns
-			foreach($additional_fields as $field => $additional_values) {
+			foreach($additional_fields as $field => $additional_values)
+			{
 				// Remove original
 				unset($options['mapping'][$field]);
 				// Add exploded
 				$field_count = 0;
-				foreach($additional_values as $value => $settings) {
-					if($settings['count'] > 0) {
+				foreach($additional_values as $value => $settings)
+				{
+					if($settings['count'] > 0)
+					{
 						$field_count += $settings['count'];
 						$options['mapping'][$field.'-'.$value] = $settings['label'];
 					}
 				}
-				if($field_count > 0) {
+				if($field_count > 0)
+				{
 					// Set some options for converting
 					$options['explode_multiselects'][$field]['values'] = $additional_values;
-				} else {
+				}
+				else
+				{
 					// Don't need this anymore
 					unset($options['explode_multiselects'][$field]);
 				}
@@ -263,17 +317,23 @@ 
 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
-		foreach ($selection as $_contact) {
-			if(is_array($_contact) && array_key_exists('photo', $_contact)) {
+		foreach ($selection as $_contact)
+		{
+			if(is_array($_contact) && array_key_exists('photo', $_contact))
+			{
 				unset($_contact['photo']);
 			}
-			if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) {
+			if(is_array($_contact) && count($_contact) == 1 && $_contact['id'])
+			{
 				$_contact = $_contact['id'];
 			}
-			if(is_array($_contact) && $_contact['id']) {
+			if(is_array($_contact) && $_contact['id'])
+			{
 				$contact = new addressbook_egw_record();
 				$contact->set_record($_contact);
-			} else {
+			}
+			else
+			{
 				$contact = new addressbook_egw_record($_contact);
 			}
 
@@ -286,12 +346,19 @@ 
 			}
 			// Some conversion
 			$this->convert($contact, $options);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($contact, addressbook_egw_record::$types, 'addressbook',$this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($contact->get_record_array() as $key => $value) {
-					if(is_array($value)) $contact->$key = implode(',', $value);
+				foreach($contact->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$contact->$key = implode(',', $value);
+					}
 				}
 			}
 
@@ -306,7 +373,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV export');
 	}
 
@@ -315,7 +383,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports contacts from your Addressbook into a CSV File.");
 	}
 
@@ -324,11 +393,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -368,7 +439,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'		=> 'importexport.export_csv_selectors',
 		);
@@ -379,9 +451,11 @@ 
 	*
 	* Dates, times, user IDs, category IDs
 	*/
-	public static function convert(addressbook_egw_record &$record, $options) {
+	public static function convert(addressbook_egw_record &$record, $options)
+	{
 
-		if ($record->tel_prefer) {
+		if ($record->tel_prefer)
+		{
 			$field = $record->tel_prefer;
 			$record->tel_prefer = $record->$field;
 		}
@@ -390,33 +464,52 @@ 
 		{
 			return;
 		}
-		foreach((array)$options['explode_multiselects'] as $field => $explode_settings) {
-			if(!is_array($record->$field)) $record->$field = explode(',', $record->$field);
-			foreach((array)$explode_settings['values'] as $value => $settings) {
+		foreach((array)$options['explode_multiselects'] as $field => $explode_settings)
+		{
+			if(!is_array($record->$field))
+			{
+				$record->$field = explode(',', $record->$field);
+			}
+			foreach((array)$explode_settings['values'] as $value => $settings)
+			{
 				$field_name = "$field-$value";
 				$record->$field_name = array();
-				if(is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value) {
-					if($explode_settings['explode'] != self::MAIN_CATS) {
+				if(is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value)
+				{
+					if($explode_settings['explode'] != self::MAIN_CATS)
+					{
 						$record->$field_name = $options['convert'] ? lang('Yes') : true;
-					} elseif($options['convert']) {
+					}
+					elseif($options['convert'])
+					{
 						// 3 part assign due to magic get method
 						$record_value = $record->$field_name;
 						$record_value[] = $settings['label'];
 						$record->$field_name = $record_value;
-					} else {
+					}
+					else
+					{
 						$record->$field_name = $value;
 					}
 				}
-				if($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs'])))) {
+				if($explode_settings['explode'] == self::MAIN_CATS && count(array_intersect($record->$field, array_keys($settings['subs']))))
+				{
 					// 3 part assign due to magic get method
 					$record_value = $record->$field_name;
-					if(!is_array($record_value)) $record_value = array($record_value);
-					foreach(array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id) {
+					if(!is_array($record_value))
+					{
+						$record_value = array($record_value);
+					}
+					foreach(array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id)
+					{
 						$record_value[] = $options['convert'] ? $settings['subs'][$sub_id] : $sub_id;
 					}
 					$record->$field_name = $record_value;
 				}
-				if(is_array($record->$field_name)) $record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
+				if(is_array($record->$field_name))
+				{
+					$record->$field_name = implode(($options['convert'] ? ', ' : ','), $record->$field_name);
+				}
 			}
 		}
 	}
@@ -446,12 +539,15 @@ 
 	 * Adjust automatically generated filter fields
 	 */
 	public function get_filter_fields(Array &$filters)
-    {
+	{
 		unset($filters['last_event']);
 		unset($filters['next_event']);
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 		$filters['owner'] = array(
 			'name'		=> 'owner',

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;
+		}
 }

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;
 		}
@@ -131,11 +131,11 @@ 
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// 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,
@@ -151,7 +151,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),
@@ -162,18 +162,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;
@@ -182,45 +182,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']],),
 								'',
@@ -229,37 +229,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;
 
@@ -271,7 +271,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;
 	}
@@ -283,11 +283,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;
 		}
@@ -296,15 +296,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]++;
 					}
@@ -319,14 +319,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']);
 				}
@@ -336,7 +336,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'].')');
@@ -347,22 +347,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;
@@ -373,7 +373,7 @@ 
 					return $result;
 				}
 			default:
-				throw new Api\Exception('Unsupported action: '. $_action);
+				throw new Api\Exception('Unsupported action: '.$_action);
 
 		}
 	}
@@ -393,15 +393,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);
 			}
 		}
 	}
@@ -445,7 +445,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();
@@ -131,22 +134,29 @@ 
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// 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;
 		}
 
@@ -182,26 +192,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))
@@ -210,17 +235,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']],),
 								'',
@@ -229,19 +261,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() ));
 						}
@@ -267,9 +310,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() );
 		}
@@ -283,7 +331,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
@@ -292,13 +341,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;
@@ -319,14 +370,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']);
 				}
@@ -336,9 +393,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'].')');
 				}
 
@@ -347,24 +407,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
@@ -411,7 +479,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV import');
 	}
 
@@ -420,7 +489,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.");
 	}
 
@@ -429,7 +499,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -455,7 +526,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -467,7 +539,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -479,7 +552,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -491,7 +565,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 }

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 +58 added lines, -59 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,14 +137,14 @@ 
 			}
 			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();
 
 				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
 				if (!is_array($pref_abs))
 				{
-					$pref_abs = $pref_abs ? explode(',',$pref_abs) : [];
+					$pref_abs = $pref_abs ? explode(',', $pref_abs) : [];
 				}
 				foreach ($this->addressbook->get_addressbooks() as $account_id => $label)
 				{
@@ -152,18 +152,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;
@@ -181,7 +180,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',
 			);
@@ -279,20 +278,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)
 			{
@@ -309,10 +308,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);
 			}
@@ -349,9 +348,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)
 			{
@@ -364,7 +363,7 @@ 
 					}
 					else
 					{
-						if (strlen ($contact[$attr]) > 0)
+						if (strlen($contact[$attr]) > 0)
 						{
 							$message->asbody = new SyncBaseBody();
 							$this->backend->note2messagenote($contact[$attr], $bodypreference, $message->asbody);
@@ -373,7 +372,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));
 					}
@@ -392,14 +391,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,
@@ -411,7 +410,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
@@ -437,7 +436,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);
@@ -472,7 +471,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");
 	}
 
@@ -511,7 +510,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;
@@ -532,10 +531,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));
@@ -548,7 +547,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':
@@ -558,20 +557,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;
@@ -583,7 +582,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;
@@ -610,9 +609,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'];
 			}
@@ -644,7 +643,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");
@@ -671,7 +670,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);
@@ -747,16 +746,16 @@ 
 			}
 			if (in_array('A', $prefs_abs))
 			{
-				$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'];
 					}
@@ -769,7 +768,7 @@ 
 		}
 		$ctag = $this->addressbook->get_ctag($owner);
 
-		$changes = array();	// no change
+		$changes = array(); // no change
 		//$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)
@@ -797,32 +796,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;
@@ -830,8 +829,8 @@ 
 				$items[] = $item;
 			}
 		}
-		$items['searchtotal']=count($items);
-		$items['range']=$searchquery['range'];
+		$items['searchtotal'] = count($items);
+		$items['range'] = $searchquery['range'];
 		return $items;
 	}
 
@@ -853,14 +852,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();
+				}
 
 				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
 				if (!is_array($pref_abs))
@@ -282,7 +285,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);
@@ -333,7 +339,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();
@@ -377,7 +386,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)
@@ -416,7 +428,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));
@@ -438,9 +453,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)
 		{
@@ -512,7 +533,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);
@@ -524,14 +548,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();
@@ -594,7 +624,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;
@@ -603,7 +636,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;
@@ -616,7 +652,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));
@@ -672,7 +711,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));
@@ -732,9 +774,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'] &&
@@ -790,7 +838,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"
@@ -814,7 +865,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'];
@@ -825,7 +879,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;
 						}
 

Spacing +431 added lines, -436 removed lines

@@ -78,7 +78,7 @@ 
 	 *
 	 * @param string $contact_app
 	 */
-	function __construct($contact_app='addressbook')
+	function __construct($contact_app = 'addressbook')
 	{
 		parent::__construct($contact_app);
 
@@ -92,23 +92,23 @@ 
 		);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','addressbook')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit', 'addressbook')) Api\Hooks::read(true);
 
-		$this->config =& $GLOBALS['egw_info']['server'];
+		$this->config = & $GLOBALS['egw_info']['server'];
 
 		// check if a contact specific export limit is set, if yes use it also for etemplate's csv export
-		$this->config['export_limit'] = $this->config['contact_export_limit'] = Api\Storage\Merge::getExportLimit($app='addressbook');
+		$this->config['export_limit'] = $this->config['contact_export_limit'] = Api\Storage\Merge::getExportLimit($app = 'addressbook');
 
 		if ($this->config['copy_fields'] && ($fields = is_array($this->config['copy_fields']) ?
 			$this->config['copy_fields'] : unserialize($this->config['copy_fields'])))
 		{
 			// Set country code if country name is selected
-			$supported_fields = $this->get_fields('supported',null,0);
-			if(in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname',$fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $fields))
 			{
 				$fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $fields))
 			{
 				$fields[] = 'adr_two_countrycode';
 			}
@@ -123,7 +123,7 @@ 
 	 * @param array $_content =null submitted content
 	 * @param string $msg =null	message to show
 	 */
-	function index($_content=null,$msg=null)
+	function index($_content = null, $msg = null)
 	{
 		//echo "<p>uicontacts::index(".print_r($_content,true).",'$msg')</p>\n";
 		if (($re_submit = is_array($_content)))
@@ -155,16 +155,16 @@ 
 				else
 				{
 					$success = $failed = $action_msg = null;
-					if ($this->action($_content['nm']['action'],$_content['nm']['selected'],$_content['nm']['select_all'],
-						$success,$failed,$action_msg,'index',$msg,$_content['nm']['checkboxes']))
+					if ($this->action($_content['nm']['action'], $_content['nm']['selected'], $_content['nm']['select_all'],
+						$success, $failed, $action_msg, '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 = '';
 				}
@@ -184,9 +184,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!');
@@ -202,7 +202,7 @@ 
 		}
 		$preserv = array();
 		$content = array();
-		if($msg || $_GET['msg'])
+		if ($msg || $_GET['msg'])
 		{
 			Framework::message($msg ? $msg : $_GET['msg']);
 		}
@@ -211,23 +211,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,
 				// using a positiv list now, as we constantly adding new columns in addressbook, but not removing them from default
 				'default_cols'   => 'type,n_fileas_n_given_n_family_n_family_n_given_org_name_n_family_n_given_n_fileas,'.
@@ -248,14 +248,14 @@ 
 			// use the state of the last session stored in the user prefs
 			if (($state = @unserialize($this->prefs['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';
@@ -268,15 +268,15 @@ 
 		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
 		}
 
 		// Organisation stuff is not (yet) availible with ldap
-		if($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
+		if ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
 		{
 			$content['nm']['header_left'] = 'addressbook.index.left';
 		}
@@ -289,7 +289,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();
@@ -298,7 +298,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']);
@@ -306,7 +306,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'];
 			}
@@ -324,20 +324,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('addressbook.index');
 		return $this->tmpl->exec('addressbook.addressbook_ui.index',
-			$content,$sel_options,array(),$preserv);
+			$content, $sel_options, array(), $preserv);
 	}
 
 	/**
@@ -346,7 +346,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(
@@ -354,7 +354,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,
@@ -397,18 +397,18 @@ 
 		);
 		// 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($GLOBALS['egw_info']['user']['apps']['infolog'])
+		if ($GLOBALS['egw_info']['user']['apps']['infolog'])
 		{
 			array_splice($crm_apps, 1, 0, 'infolog-organisation');
 		}
-		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,
@@ -423,7 +423,7 @@ 
 				'caption' => 'View',
 				'default' => true,
 				'allowOnMultiple' => false,
-				'group' => $group=1,
+				'group' => $group = 1,
 				'enableClass' => 'contact_organisation',
 				'hideOnDisabled' => true
 			),
@@ -444,29 +444,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',
 				),
@@ -493,7 +493,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(
@@ -502,14 +502,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(
@@ -518,10 +518,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';
@@ -531,18 +531,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',
@@ -575,7 +575,7 @@ 
 			'hideOnDisabled'	=> true
 		);
 
-		++$group;	// integration with other apps: infolog, calendar, filemanager, messenger
+		++$group; // integration with other apps: infolog, calendar, filemanager, messenger
 
 		// Integrate Messenger app actions for adding new buddy into roster list
 		if ($GLOBALS['egw_info']['user']['apps']['messenger'])
@@ -616,7 +616,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
@@ -634,7 +634,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(
@@ -714,7 +714,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 ($GLOBALS['egw_info']['user']['apps']['felamimail']||$GLOBALS['egw_info']['user']['apps']['mail'])
+		if ($GLOBALS['egw_info']['user']['apps']['felamimail'] || $GLOBALS['egw_info']['user']['apps']['mail'])
 		{
 			$actions['mail'] = array(
 				'caption' => lang('Mail VCard'),
@@ -785,7 +785,7 @@ 
 				'disableClass' => 'rowNoDelete',
 			);
 		}
-		if ($this->grants[0] & Acl::DELETE)
+		if ($this->grants[0]&Acl::DELETE)
 		{
 			$actions['delete_account'] = array(
 				'caption' => 'Delete',
@@ -798,7 +798,7 @@ 
 			);
 			$actions['delete']['hideOnDisabled'] = true;
 		}
-		if($tid_filter == 'D')
+		if ($tid_filter == 'D')
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',
@@ -809,7 +809,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']);
 		}
@@ -842,13 +842,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();
 	}
 
@@ -862,7 +862,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]);
 		}
@@ -880,7 +880,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']);
@@ -908,10 +908,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
 				{
@@ -919,8 +919,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;
 		}
@@ -947,19 +947,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));
@@ -973,33 +973,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');
 	}
 
 	/**
@@ -1024,31 +1024,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'),
@@ -1063,7 +1063,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);
@@ -1080,7 +1080,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);
 	}
 
@@ -1096,60 +1096,60 @@ 
 	 * @param string/array $session_name 'index' 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;
@@ -1157,10 +1157,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':
@@ -1168,7 +1168,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!');
 				}
@@ -1188,49 +1188,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;
@@ -1241,10 +1241,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)
 						{
@@ -1253,7 +1253,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'],
 							));
@@ -1315,7 +1315,7 @@ 
 					}
 					else
 					{
-						$Ok = $this->remove_from_list($id,$query['filter2']) !== false;
+						$Ok = $this->remove_from_list($id, $query['filter2']) !== false;
 					}
 					break;
 
@@ -1328,28 +1328,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);
 							}
 						}
@@ -1357,14 +1357,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))
 								{
@@ -1403,38 +1403,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);
 				}
 			}
 		}
@@ -1450,22 +1450,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;
 		}
@@ -1483,7 +1483,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)
 	{
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : 'index';
 
@@ -1491,7 +1491,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]);
 			}
@@ -1503,28 +1503,28 @@ 
 			$old_state = Api\Cache::getSession('addressbook', $what);
 		}
 		$GLOBALS['egw']->session->commit_session();
-		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]);
@@ -1539,16 +1539,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(
@@ -1561,9 +1561,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);
@@ -1578,11 +1578,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
@@ -1592,7 +1592,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
 		{
@@ -1611,7 +1611,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);
@@ -1626,7 +1626,7 @@ 
 			{
 				$query['template'] = '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 ?
@@ -1636,11 +1636,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) ||
@@ -1651,14 +1651,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";
@@ -1692,8 +1692,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 = '%';
@@ -1707,22 +1707,22 @@ 
 				unset($query['advanced_search']['meth_select']);
 			}
 
-			$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
 			$columsel = $this->prefs['nextmatch-addressbook.index.rows'];
-			$available_distib_lists=$this->get_lists(Acl::READ);
-			$columselection = $columsel ? explode(',',$columsel) : array();
+			$available_distib_lists = $this->get_lists(Acl::READ);
+			$columselection = $columsel ? explode(',', $columsel) : array();
 			$ids = $calendar_participants = array();
 			if (!$id_only && $rows)
 			{
-				$show_custom_fields = (in_array('customfields',$columselection) || $this->config['index_load_cfs']) && $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->config['index_load_cfs']) && $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'];
@@ -1730,22 +1730,22 @@ 
 					if ($show_custom_fields)
 					{
 						$selected_cfs = array();
-						if(in_array('customfields',$columselection))
+						if (in_array('customfields', $columselection))
 						{
-							foreach($columselection as $col)
+							foreach ($columselection as $col)
 							{
-								if ($col[0] == '#') $selected_cfs[] = substr($col,1);
+								if ($col[0] == '#') $selected_cfs[] = substr($col, 1);
 							}
 						}
 						$selected_cfs = array_unique(array_merge($selected_cfs, (array)$this->config['index_load_cfs']));
-						$customfields = $this->read_customfields($ids,$selected_cfs);
+						$customfields = $this->read_customfields($ids, $selected_cfs);
 					}
 					if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($calendar_participants);
 					// distributionlist memership for the entrys
 					//_debug_array($this->get_lists(Acl::EDIT));
 					if ($show_distributionlist && $available_distib_lists)
 					{
-						$distributionlist = $this->read_distributionlist($ids,array_keys($available_distib_lists));
+						$distributionlist = $this->read_distributionlist($ids, array_keys($available_distib_lists));
 					}
 				}
 			}
@@ -1754,20 +1754,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':
@@ -1784,43 +1784,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']];
 				}
@@ -1828,33 +1828,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;
 					}
@@ -1862,13 +1862,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'];
@@ -1880,7 +1880,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;
 		}
@@ -1893,23 +1893,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');
 		}
@@ -1920,11 +1918,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);
 
@@ -1940,7 +1938,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)
 		{
@@ -1955,7 +1953,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
 		{
@@ -1963,9 +1961,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
@@ -1983,19 +1981,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))
 		{
 			$button = @key($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':
@@ -2007,7 +2005,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']))
@@ -2020,12 +2018,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-')
 						{
@@ -2034,7 +2032,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))))
@@ -2044,7 +2042,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;
 						}
@@ -2059,7 +2057,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))))
@@ -2067,58 +2065,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
@@ -2140,11 +2138,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
@@ -2169,7 +2167,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;
@@ -2213,52 +2211,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);
 										}
 									}
 								}
@@ -2276,13 +2274,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;
 						}
 					}
@@ -2294,12 +2292,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
@@ -2310,12 +2308,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);
 					}
 				}
 			}
@@ -2323,8 +2321,8 @@ 
 		if ($content['id'])
 		{
 			// last and next calendar date
-			$dates = current($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
-			if(is_array($dates)) $content += $dates;
+			$dates = current($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)
@@ -2335,7 +2333,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]))
 			{
@@ -2348,7 +2346,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)
@@ -2360,19 +2358,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;
 		}
@@ -2382,7 +2379,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;
 			}
@@ -2404,9 +2401,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'];
@@ -2418,7 +2415,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;
 		}
@@ -2426,11 +2423,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
 		{
@@ -2444,10 +2441,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;
 			}
@@ -2456,12 +2453,12 @@ 
 		// Enable history
 		$this->setup_history($content, $sel_options);
 
-		$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'',$content['etag']);
+		$content['photo'] = $this->photo_src($content['id'], $content['jpegphoto'], '', $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');
 		}
@@ -2469,21 +2466,21 @@ 
 		// allow other apps to add tabs to addressbook edit
 		$preserve = $content;
 		$preserve['old_owner'] = $content['owner'];
-		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']))
 				{
@@ -2528,15 +2525,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':
@@ -2552,16 +2549,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;
 		}
@@ -2579,9 +2576,9 @@ 
 	 * 	'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)
 	{
-		$fields = explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
+		$fields = explode(',', $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
 		$threshold = (int)$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'];
 
 		$ret = array('doublicates' => array(), 'msg' => null);
@@ -2606,17 +2603,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 >= $threshold)
+			if (in_array($name, $fields) && $specified_count >= $threshold)
 			{
 				$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];
 				}
@@ -2625,7 +2622,7 @@ 
 		}
 		if ($contacts)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				if ($own_id && $contact['id'] == $own_id) continue;
 
@@ -2649,26 +2646,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))
 		{
 			$button = key($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 !!!'),
 					));
@@ -2686,9 +2681,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'
@@ -2697,9 +2692,9 @@ 
 					$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-organisation':
 								$contact_id = $this->get_all_org_contacts($contact_id);
@@ -2707,7 +2702,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;
 						}
 
@@ -2738,13 +2733,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']))
 			{
@@ -2757,25 +2752,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'];
 
@@ -2785,12 +2780,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']);
@@ -2798,7 +2793,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;
 		}
@@ -2806,11 +2801,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
 		{
@@ -2827,7 +2822,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'] = '-';
@@ -2840,14 +2835,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'])) $dates = current($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
-		if(is_array($dates)) $content += $dates;
+		if (!empty($content['id'])) $dates = current($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;
@@ -2890,7 +2885,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']);
 		}
@@ -2902,7 +2897,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
@@ -2910,19 +2905,19 @@ 
 
 		// 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)
 		{
 			// Show for whole organisation, not just selected contact
-			if($crm_list == 'infolog-organisation')
+			if ($crm_list == 'infolog-organisation')
 			{
-				$crm_list = str_replace('-organisation','',$crm_list);
+				$crm_list = str_replace('-organisation', '', $crm_list);
 				$_query = Api\Cache::getSession('addressbook', 'index');
 				$content['id'] = $this->get_all_org_contacts($content['id']);
 			}
 			Api\Hooks::single(array(
 				'location' => 'addressbook_view',
 				'ab_id'    => $content['id']
-			),$crm_list);
+			), $crm_list);
 		}
 	}
 
@@ -2939,18 +2934,18 @@ 
 		$contact = $this->read($contact_id);
 
 		// No org name, early return with just the contact
-		if(!$contact['org_name'])
+		if (!$contact['org_name'])
 		{
 			return array($contact_id);
 		}
 
 		$query['num_rows'] = -1;
 		$query['start'] = 0;
-		if(!array_key_exists('filter', $query))
+		if (!array_key_exists('filter', $query))
 		{
 			$query['filter'] = '';
 		}
-		if(!is_array($query['col_filter']))
+		if (!is_array($query['col_filter']))
 		{
 			$query['col_filter'] = array();
 		}
@@ -2958,7 +2953,7 @@ 
 
 		$org_contacts = array();
 		$readonlys = null;
-		$this->get_rows($query,$org_contacts,$readonlys,true);	// true = only return the id's
+		$this->get_rows($query, $org_contacts, $readonlys, true); // true = only return the id's
 
 		return $org_contacts ? $org_contacts : array($contact_id);
 	}
@@ -2971,30 +2966,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;
 	}
 
 	/**
@@ -3003,9 +2998,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'];
@@ -3020,10 +3015,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']);
@@ -3039,7 +3034,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;
@@ -3056,7 +3051,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;
 		}
@@ -3065,8 +3060,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',
 		);
@@ -3076,12 +3071,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);
@@ -3107,8 +3102,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);
 	}
 
 	/**
@@ -3117,12 +3112,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['photo']) &&	!(($contact['files'] & Api\Contacts::FILES_BIT_PHOTO) &&
-				($size = filesize($url=Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO))))));
+			empty($contact['photo']) && !(($contact['files']&Api\Contacts::FILES_BIT_PHOTO) &&
+				($size = filesize($url = Api\Link::vfs_path('addressbook', $contact_id, Api\Contacts::FILES_PHOTO))))));
 	}
 
 	/**
@@ -3131,13 +3126,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));
 		}
@@ -3145,7 +3140,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
 		));
 	}
 
@@ -3160,14 +3155,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);
@@ -3215,15 +3210,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();
 	}
@@ -3247,8 +3242,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();
 	}
@@ -3261,7 +3256,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'],
@@ -3276,7 +3271,7 @@ 
 			),
 		);
 
-		foreach($this->content_types as $id => $settings)
+		foreach ($this->content_types as $id => $settings)
 		{
 			$content['history']['status-widgets']['tid'][$id] = $settings['name'];
 		}

Braces +318 added lines, -83 removed lines

@@ -92,7 +92,10 @@ 
 		);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','addressbook')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit','addressbook'))
+		{
+			Api\Hooks::read(true);
+		}
 
 		$this->config =& $GLOBALS['egw_info']['server'];
 
@@ -129,15 +132,21 @@ 
 		if (($re_submit = is_array($_content)))
 		{
 
-			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
 			{
 				$id = @key($_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
 			{
 				$id = @key($_content['nm']['rows']['document']);
+			}
 				$_content['nm']['action'] = 'document';
 				$_content['nm']['selected'] = array($id);
 			}
@@ -174,10 +183,13 @@ 
 				$org = key($_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
 			{
 				$grouped_view = key($_content['nm']['rows']['view']);
 			}
+			}
 			else
 			{
 				$grouped_view = $_content['nm']['grouped_view'];
@@ -262,10 +274,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']);
@@ -289,7 +305,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();
@@ -303,7 +322,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)
@@ -400,7 +422,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($GLOBALS['egw_info']['user']['apps']['infolog'])
 		{
@@ -472,7 +497,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',
@@ -485,7 +513,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(
@@ -521,6 +551,7 @@ 
 					'fieldValue' => '!',	// enable if list != ''
 				),
 			);
+		}
 			if(is_subclass_of('etemplate', 'etemplate_new'))
 			{
 				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
@@ -529,9 +560,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;
@@ -693,7 +728,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'])
 		{
@@ -842,11 +879,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();
@@ -948,9 +991,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;
@@ -979,14 +1028,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);
 		}
@@ -1115,7 +1173,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_')
@@ -1132,9 +1193,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
@@ -1181,7 +1245,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);
@@ -1333,19 +1400,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;
@@ -1487,9 +1560,12 @@ 
 	{
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : '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)
 			{
@@ -1512,21 +1588,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]);
 			}
 		}
@@ -1537,9 +1621,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')
+				{
+					// user changed to org_view
 				{
-					$query['filter'] = '';			// --> change filter to all contacts
+					$query['filter'] = '';
+				}
+				// --> change filter to all contacts
 				}
 				else								// user changed to accounts
 				{
@@ -1576,9 +1664,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)
 			{
@@ -1590,10 +1681,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']);
@@ -1634,9 +1728,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)
 				{
@@ -1659,14 +1756,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';
@@ -1690,9 +1791,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'].'%');
 			}
@@ -1734,13 +1838,19 @@ 
 						{
 							foreach($columselection as $col)
 							{
-								if ($col[0] == '#') $selected_cfs[] = substr($col,1);
+								if ($col[0] == '#')
+								{
+									$selected_cfs[] = substr($col,1);
+								}
 							}
 						}
 						$selected_cfs = array_unique(array_merge($selected_cfs, (array)$this->config['index_load_cfs']));
 						$customfields = $this->read_customfields($ids,$selected_cfs);
 					}
-					if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($calendar_participants);
+					if ($show_calendar && !empty($ids))
+					{
+						$calendar = $this->read_calendar($calendar_participants);
+					}
 					// distributionlist memership for the entrys
 					//_debug_array($this->get_lists(Acl::EDIT));
 					if ($show_distributionlist && $available_distib_lists)
@@ -1750,7 +1860,10 @@ 
 				}
 			}
 		}
-		if (!$rows) $rows = array();
+		if (!$rows)
+		{
+			$rows = array();
+		}
 
 		if ($id_only)
 		{
@@ -1783,7 +1896,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;
 			}
@@ -1862,8 +1978,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']))
@@ -1922,10 +2044,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;
@@ -1992,7 +2117,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)
@@ -2183,7 +2311,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']]))
@@ -2203,7 +2334,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'] !== '')
 				{
@@ -2228,7 +2362,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)
 				{
@@ -2246,19 +2383,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);
+											}
 										}
 									}
 								}
@@ -2286,7 +2441,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;
@@ -2294,17 +2452,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 ($contact_id && is_numeric($contact_id)) $content['link_to']['to_id'] = $contact_id;
+				if ($contact_id && 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']))
@@ -2313,10 +2481,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);
 					}
+					}
 				}
 			}
 		}
@@ -2324,7 +2495,10 @@ 
 		{
 			// last and next calendar date
 			$dates = current($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)
@@ -2360,7 +2534,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']]))
@@ -2401,7 +2579,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;
@@ -2409,8 +2590,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"
@@ -2458,7 +2645,10 @@ 
 
 		$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'',$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']))
@@ -2481,7 +2671,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)
 			{
@@ -2498,7 +2691,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']))
 				{
@@ -2589,13 +2785,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
 		{
@@ -2616,10 +2815,13 @@ 
 			if (in_array($name,$fields) && $specified_count >= $threshold)
 			{
 				$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);
 			}
 		}
@@ -2627,7 +2829,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 ?
@@ -2654,7 +2859,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))
 		{
@@ -2677,7 +2885,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;
@@ -2843,11 +3054,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'])) $dates = current($this->read_calendar(array($content['account_id'] ? $content['account_id'] : 'c'.$content['id']),false));
-		if(is_array($dates)) $content += $dates;
+		if (!empty($content['id']))
+		{
+			$dates = current($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;
@@ -2971,7 +3191,10 @@ 
 	 */
 	function email2link($email)
 	{
-		if (strpos($email,'@') == false) return '';
+		if (strpos($email,'@') == false)
+		{
+			return '';
+		}
 
 		if($GLOBALS['egw_info']['user']['apps']['mail'])
 		{
@@ -3023,7 +3246,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']);
@@ -3080,8 +3306,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);
@@ -3105,7 +3337,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);

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

remote.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return Api\Header\Authenticate::autocreate_session_callback($account);
 }
@@ -45,8 +45,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/remote.php/webdav/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
 	)
 );
 
@@ -74,12 +74,12 @@ 
 
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
 // so ownCloud dir contains users home-dir by default
-if (strpos($_SERVER['REQUEST_URI'],'/remote.php/webdav/clientsync') !== false &&
-	($fstab=Vfs::mount()) && !isset($fstab['/clientsync']))
+if (strpos($_SERVER['REQUEST_URI'], '/remote.php/webdav/clientsync') !== false &&
+	($fstab = Vfs::mount()) && !isset($fstab['/clientsync']))
 {
 	$is_root_backup = Vfs::$is_root;
 	Vfs::$is_root = true;
-	$ok = Vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
+	$ok = Vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
 	Vfs::$is_root = $is_root_backup;
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
 }

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();
 	}