EGroupware / egroupware

addressbook/inc/class.addressbook_favorite_portlet.inc.php

Spacing +17 added lines, -17 removed lines

@@ -30,13 +30,13 @@ 
 		$context['appname'] = 'addressbook';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$ui = new addressbook_ui();
 
 		$this->context['template'] = 'addressbook.index.rows';
 		$this->context['sel_options'] = array();
-		foreach($ui->content_types as $tid => $data)
+		foreach ($ui->content_types as $tid => $data)
 		{
 			$this->context['sel_options']['tid'][$tid] = $data['name'];
 		}
@@ -49,11 +49,11 @@ 
 		);
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 		$ui = new addressbook_ui();
-		$this->context['sel_options']['filter'] = $this->context['sel_options']['owner'] = $ui->get_addressbooks(Acl::READ,lang('All'));
-		$this->context['sel_options']['filter2'] = $ui->get_lists(Acl::READ,array('' => lang('none')));
+		$this->context['sel_options']['filter'] = $this->context['sel_options']['owner'] = $ui->get_addressbooks(Acl::READ, lang('All'));
+		$this->context['sel_options']['filter2'] = $ui->get_lists(Acl::READ, array('' => lang('none')));
 		$this->nm_settings['actions'] = $ui->get_actions($this->nm_settings['col_filter']['tid'], $this->nm_settings['org_view']);
 
 		parent::exec($id, $etemplate);
@@ -96,27 +96,27 @@ 
 			{
 				// Some processing to add values in for links and cats
 				$success = $failed = $action_msg = $msg = null;
-				if ($ui->action($values['nm']['action'],$values['nm']['selected'],$values['nm']['select_all'],
-						$success,$failed,$action_msg,$values['do_email'] ? 'email' : 'index',$msg,$values['nm']['checkboxes']))
+				if ($ui->action($values['nm']['action'], $values['nm']['selected'], $values['nm']['select_all'],
+						$success, $failed, $action_msg, $values['do_email'] ? 'email' : 'index', $msg, $values['nm']['checkboxes']))
 				{
-					$msg .= lang('%1 contact(s) %2',$success,$action_msg);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($values['nm']['selected'] as &$id)
+					$msg .= lang('%1 contact(s) %2', $success, $action_msg);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($values['nm']['selected'] as &$id)
 					{
 						$id = 'addressbook::'.$id;
 					}
 					// Directly request an update - this will get addressbook tab too
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($values['nm']['selected']));
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($values['nm']['selected']));
 				}
-				elseif(is_null($msg))
+				elseif (is_null($msg))
 				{
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
-				elseif($msg)
+				elseif ($msg)
 				{
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
 				unset($values['nm']['action']);
 				unset($values['nm']['select_all']);

Doc Comments -2 removed lines

@@ -86,8 +86,6 @@
 	 * Here we need to handle any incoming data.  Setup is done in the constructor,
 	 * output is handled by parent.
 	 *
-	 * @param type $id
-	 * @param Etemplate $etemplate
 	 */
 	public static function process($content = array())
 	{

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

@@ -49,7 +49,7 @@
 	 *
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 

addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php

Spacing +16 added lines, -16 removed lines

@@ -31,11 +31,11 @@ 
 		$bocontacts = new Api\Contacts();
 		$this->mapping_fields = $bocontacts->contact_fields;
 
-		$categories = new Api\Categories('','addressbook');
+		$categories = new Api\Categories('', 'addressbook');
 		$cat_list = array();
-		foreach((array)$categories->return_sorted_array(0,False,'','','',true,0,true) as $cat)
+		foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true, 0, true) as $cat)
 		{
-			$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 			if (Api\Categories::is_global($cat))
 			{
@@ -46,14 +46,14 @@ 
 				'title' => $cat['description'],
 			);
 		}
-		if(count($cat_list) > 0) {
+		if (count($cat_list) > 0) {
 			$this->mapping_fields[lang('Categories')] = $cat_list;
 		}
 
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach ($bocontacts->customfields as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
-		unset($this->mapping_fields['jpegphoto']);        // can't cvs import that
+		unset($this->mapping_fields['jpegphoto']); // can't cvs import that
 
 		// Add in special handled fields
 		$this->mapping_fields[lang('Special')] = addressbook_import_contacts_csv::$special_fields;
@@ -75,18 +75,18 @@ 
 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($content['field_mapping'][0] == lang('Categories')) {
+		if ($content['field_mapping'][0] == lang('Categories')) {
 			unset($content['field_mapping'][0]);
 		}
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" . lang('Contact ID cannot be changed by import');
+		$content['msg'] .= "\n*".lang('Contact ID cannot be changed by import');
 
 		return $result;
 	}
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		if ($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content, true));
 		unset($content['no_owner_map']);
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -94,13 +94,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_step60($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step60
@@ -108,19 +108,19 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if (!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['change_owner']) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
 			$bocontacts = new Api\Contacts();
 			$sel_options['contact_owner'] = array('personal' => lang("Importer's personal")) + $bocontacts->get_addressbooks(Acl::ADD);
-			if(!in_array('owner', $content['field_mapping'])) {
+			if (!in_array('owner', $content['field_mapping'])) {
 				$content['no_owner_map'] = true;
 			}
 

Braces +18 added lines, -8 removed lines

@@ -46,11 +46,13 @@ 
 				'title' => $cat['description'],
 			);
 		}
-		if(count($cat_list) > 0) {
+		if(count($cat_list) > 0)
+		{
 			$this->mapping_fields[lang('Categories')] = $cat_list;
 		}
 
-		foreach($bocontacts->customfields as $name => $data) {
+		foreach($bocontacts->customfields as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 		unset($this->mapping_fields['jpegphoto']);        // can't cvs import that
@@ -75,7 +77,8 @@ 
 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($content['field_mapping'][0] == lang('Categories')) {
+		if($content['field_mapping'][0] == lang('Categories'))
+		{
 			unset($content['field_mapping'][0]);
 		}
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
@@ -86,7 +89,10 @@ 
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log('addressbook.importexport.addressbook_csv_import::wizard_step60->$content '.print_r($content,true));
+		}
 		unset($content['no_owner_map']);
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -108,19 +114,23 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['contact_owner']) && $content['plugin_options'])
+			{
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options'])
+			{
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options'])
+			{
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
 			$bocontacts = new Api\Contacts();
 			$sel_options['contact_owner'] = array('personal' => lang("Importer's personal")) + $bocontacts->get_addressbooks(Acl::ADD);
-			if(!in_array('owner', $content['field_mapping'])) {
+			if(!in_array('owner', $content['field_mapping']))
+			{
 				$content['no_owner_map'] = true;
 			}
 

addressbook/inc/class.addressbook_wizard_import_vcard.inc.php

Spacing +15 added lines, -15 removed lines

@@ -28,20 +28,20 @@ 
 
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step40->$content '.print_r($content, true));
 		// return from step40
 		if ($content['step'] == 'wizard_step40')
 		{
 			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_step60($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -49,20 +49,20 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step40'];
 			$content['step'] = 'wizard_step40';
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
-			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
+			$sel_options['charset'] = Api\Translation::get_installed_charsets() +
 				array(
 					'user'  => lang('User preference'),
 				);
 
 			// Add in extra allowed charsets
 			$config = Api\Config::read('importexport');
-			$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-			if($extra_charsets)
+			$extra_charsets = array_intersect(explode(',', $config['import_charsets']), mb_list_encodings());
+			if ($extra_charsets)
 			{
-				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets, $extra_charsets));
 			}
 
 			$preserv = $content;
@@ -73,7 +73,7 @@ 
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.print_r($content,true));
+		if ($this->debug) error_log(__METHOD__.print_r($content, true));
 
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -81,13 +81,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_step60($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step60
@@ -95,10 +95,10 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['change_owner']) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 

Braces +14 added lines, -5 removed lines

@@ -28,7 +28,10 @@ 
 
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		}
 		// return from step40
 		if ($content['step'] == 'wizard_step40')
 		{
@@ -49,7 +52,8 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step40'];
 			$content['step'] = 'wizard_step40';
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
 			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
@@ -73,7 +77,10 @@ 
 
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(__METHOD__.print_r($content,true));
+		}
 
 		// return from step60
 		if ($content['step'] == 'wizard_step60')
@@ -95,10 +102,12 @@ 
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['contact_owner']) && $content['plugin_options'])
+			{
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options'])
+			{
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 

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)

Spacing +84 added lines, -84 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']) {
 				$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['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();
 		}
@@ -369,26 +369,26 @@ 
 	*
 	* 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) {
 			$field = $record->tel_prefer;
 			$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',

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;

Braces +164 added lines, -67 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']) {
+		elseif ( $options['selection'] == 'all' )
+		{
+			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+			{
 				$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';
 	}
 
@@ -351,14 +422,16 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'		=> 'importexport.export_csv_selectors',
 		);
@@ -369,9 +442,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;
 		}
@@ -380,33 +455,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);
+				}
 			}
 		}
 	}
@@ -436,12 +530,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',

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

@@ -247,7 +247,7 @@
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		foreach($filters as $field_name => &$settings)
 		{

addressbook/inc/class.addressbook_bo.inc.php

Spacing +9 added lines, -10 removed lines

@@ -40,7 +40,7 @@ 
 		if (!is_array($recipients)) $recipients = array($recipients);
 
 		$criteria = $result = array();
-		foreach($recipients as &$recipient)
+		foreach ($recipients as &$recipient)
 		{
 			if (is_numeric($recipient))
 			{
@@ -51,7 +51,7 @@ 
 				$criteria['contact_email'][] = $recipient = strtolower($recipient);
 			}
 		}
-		foreach($this->search($criteria, array('account_id', 'contact_email', 'contact_pubkey'), '', '', '', false, 'OR', false,
+		foreach ($this->search($criteria, array('account_id', 'contact_email', 'contact_pubkey'), '', '', '', false, 'OR', false,
 			"contact_pubkey LIKE '%-----BEGIN PGP PUBLIC KEY BLOCK-----%'") as $contact)
 		{
 			$matches = null;
@@ -83,9 +83,9 @@ 
 	 * @param int|string|array $recipients (array of) email addresses or numeric account-ids
 	 * @param array $result =array()
 	 */
-	public static function get_pgp_keyserver($recipients, array $result=array())
+	public static function get_pgp_keyserver($recipients, array $result = array())
 	{
-		foreach($recipients as $recipient)
+		foreach ($recipients as $recipient)
 		{
 			$id = $recipient;
 			if (is_numeric($recipient))
@@ -137,7 +137,7 @@ 
 	 * @param boolean $allow_user_updates =null for admins, set config to allow regular users to store their pgp key
 	 * @return int number of pgp keys stored
 	 */
-	public function ajax_set_pgp_keys($keys, $allow_user_updates=null)
+	public function ajax_set_pgp_keys($keys, $allow_user_updates = null)
 	{
 		if (isset($allow_user_updates) && isset($GLOBALS['egw_info']['user']['apps']['admin']))
 		{
@@ -158,7 +158,7 @@ 
 			}
 		}
 		$criteria = array();
-		foreach($keys as $recipient => $key)
+		foreach ($keys as $recipient => $key)
 		{
 			if (!preg_match(self::$pgp_key_regexp, $key)) continue;
 
@@ -174,7 +174,7 @@ 
 		if (!$criteria) return 0;
 
 		$updated = 0;
-		foreach($this->search($criteria, false, '', '', '', false, 'OR') as $contact)
+		foreach ($this->search($criteria, false, '', '', '', false, 'OR') as $contact)
 		{
 			if ($contact['account_id'] && isset($keys[$contact['account_id']]))
 			{
@@ -199,8 +199,7 @@ 
 		}
 		if ($criteria == array('egw.addressbook.account_id' => array((int)$GLOBALS['egw_info']['user']['account_id'])))
 		{
-			$message = !$updated ? lang('Permissiong denied! Ask your administrator to allow regular uses to update their public keys.') :
-				lang('Your new public key has been stored in accounts addressbook.');
+			$message = !$updated ? lang('Permissiong denied! Ask your administrator to allow regular uses to update their public keys.') : lang('Your new public key has been stored in accounts addressbook.');
 		}
 		else
 		{
@@ -227,7 +226,7 @@ 
 	public static function set_pgp_keyserver($keys)
 	{
 		$added = 0;
-		foreach($keys as $email => $cert)
+		foreach ($keys as $email => $cert)
 		{
 			if (is_numeric($email))
 			{

Braces +24 added lines, -6 removed lines

@@ -35,9 +35,15 @@ 
 	 */
 	public function get_pgp_keys($recipients)
 	{
-		if (!$recipients) return array();
+		if (!$recipients)
+		{
+			return array();
+		}
 
-		if (!is_array($recipients)) $recipients = array($recipients);
+		if (!is_array($recipients))
+		{
+			$recipients = array($recipients);
+		}
 
 		$criteria = $result = array();
 		foreach($recipients as &$recipient)
@@ -116,9 +122,15 @@ 
 	 */
 	public function ajax_get_pgp_keys($recipients)
 	{
-		if (!$recipients) return array();
+		if (!$recipients)
+		{
+			return array();
+		}
 
-		if (!is_array($recipients)) $recipients = array($recipients);
+		if (!is_array($recipients))
+		{
+			$recipients = array($recipients);
+		}
 
 		$result = $this->get_pgp_keys($recipients);
 
@@ -160,7 +172,10 @@ 
 		$criteria = array();
 		foreach($keys as $recipient => $key)
 		{
-			if (!preg_match(self::$pgp_key_regexp, $key)) continue;
+			if (!preg_match(self::$pgp_key_regexp, $key))
+			{
+				continue;
+			}
 
 			if (is_numeric($recipient))
 			{
@@ -171,7 +186,10 @@ 
 				$criteria['contact_email'][] = $recipient;
 			}
 		}
-		if (!$criteria) return 0;
+		if (!$criteria)
+		{
+			return 0;
+		}
 
 		$updated = 0;
 		foreach($this->search($criteria, false, '', '', '', false, 'OR') as $contact)

addressbook/inc/class.addressbook_vcal.inc.php

Indentation +44 added lines, -44 removed lines

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

Spacing +89 added lines, -89 removed lines

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

Braces +38 added lines, -13 removed lines

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

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,13 +137,13 @@ 
 			}
 			else
 			{
-				Api\Translation::add_app('addressbook');	// we need the addressbook translations
+				Api\Translation::add_app('addressbook'); // we need the addressbook translations
 
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 				// error_log(print_r($this->addressbook->get_addressbooks(Acl::READ),true));
 				$pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
-				$pref_abs = (string)$pref !== '' ? explode(',',$pref) : array();
+				$pref_abs = (string)$pref !== '' ? explode(',', $pref) : array();
 
 				foreach ($this->addressbook->get_addressbooks() as $account_id => $label)
 				{
@@ -151,18 +151,17 @@ 
 					{
 						$account_id = self::PRIVATE_AB;
 					}
-					if ($account_id && in_array($account_id,$pref_abs) || in_array('A',$pref_abs) ||
-						$account_id == 0 && in_array('U',$pref_abs) ||
-						$account_id == $GLOBALS['egw_info']['user']['account_id'] ||	// allways sync pers. AB
-						$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$pref_abs))
+					if ($account_id && in_array($account_id, $pref_abs) || in_array('A', $pref_abs) ||
+						$account_id == 0 && in_array('U', $pref_abs) ||
+						$account_id == $GLOBALS['egw_info']['user']['account_id'] || // allways sync pers. AB
+						$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G', $pref_abs))
 					{
 						$abs[$account_id] = $label;
 					}
 				}
 			}
 		}
-		$ret = is_null($account) ? $abs :
-			($ab_prefix && (!$account || (int)$account == (int)$GLOBALS['egw_info']['user']['account_id']) ?
+		$ret = is_null($account) ? $abs : ($ab_prefix && (!$account || (int)$account == (int)$GLOBALS['egw_info']['user']['account_id']) ?
 				lang('Addressbook').' ' : '').$abs[$account];
 		//error_log(__METHOD__."($account, $return_all_in_one, $ab_prefix) returning ".array2string($ret));
 		return $ret;
@@ -180,7 +179,7 @@ 
 		foreach ($this->get_addressbooks() as $account => $label)
 		{
 			$folderlist[] = array(
-				'id'	=>	$this->backend->createID('addressbook',$account),
+				'id'	=>	$this->backend->createID('addressbook', $account),
 				'mod'	=>	$label,
 				'parent'=>	'0',
 			);
@@ -278,20 +277,20 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL)
+	function GetMessageList($id, $cutoffdate = NULL)
 	{
-		unset($cutoffdate);	// not used, but required by function signature
+		unset($cutoffdate); // not used, but required by function signature
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 		$filter = array('owner' => $user);
 
 		// handle all-in-one addressbook
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
 			$user == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			$filter['owner'] = array_keys($this->get_addressbooks(null,false));	// false = return all selected abs
+			$filter['owner'] = array_keys($this->get_addressbooks(null, false)); // false = return all selected abs
 			// translate AS private AB ID to EGroupware one
 			if (($key = array_search(self::PRIVATE_AB, $filter['owner'])) !== false)
 			{
@@ -308,10 +307,10 @@ 
 
 		$messagelist = array();
 		$criteria = null;
-		if (($contacts =& $this->addressbook->search($criteria, 'contact_id,contact_etag', '', '', '',
-			false, 'AND', false,$filter)))
+		if (($contacts = & $this->addressbook->search($criteria, 'contact_id,contact_etag', '', '', '',
+			false, 'AND', false, $filter)))
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$messagelist[] = $this->StatMessage($id, $contact);
 			}
@@ -348,9 +347,9 @@ 
 		}
 		$emailname = isset($contact['n_given']) ? $contact['n_given'].' ' : '';
 		$emailname .= isset($contact['n_middle']) ? $contact['n_middle'].' ' : '';
-		$emailname .= isset($contact['n_family']) ? $contact['n_family']: '';
+		$emailname .= isset($contact['n_family']) ? $contact['n_family'] : '';
 		$message = new SyncContact();
-		foreach(self::$mapping as $key => $attr)
+		foreach (self::$mapping as $key => $attr)
 		{
 			switch ($attr)
 			{
@@ -363,7 +362,7 @@ 
 					}
 					else
 					{
-						if (strlen ($contact[$attr]) > 0)
+						if (strlen($contact[$attr]) > 0)
 						{
 							$message->asbody = new SyncBaseBody();
 							$this->backend->note2messagenote($contact[$attr], $bodypreference, $message->asbody);
@@ -387,14 +386,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;
 				case 'email':
@@ -413,7 +412,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
@@ -439,7 +438,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);
@@ -474,7 +473,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
 		debugLog(__METHOD__." not implemented");
 	}
 
@@ -513,7 +512,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;
@@ -534,10 +533,10 @@ 
 		if ($account == 0)	// as a precausion, we currently do NOT allow to change Api\Accounts
 		{
 			debugLog(__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));
@@ -550,7 +549,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':
@@ -560,20 +559,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;
@@ -585,7 +584,7 @@ 
 						}
 						else
 						{
-							debugLog(__METHOD__. " Warning : php-imap not available");
+							debugLog(__METHOD__." Warning : php-imap not available");
 							$contact[$attr] = $message->$key;
 						}
 						break;
@@ -612,9 +611,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'];
 			}
@@ -646,7 +645,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'])
 		{
 			debugLog(__METHOD__."('$folderid', $id, $newfolderid) NOT allowed for an all-in-one addressbook --> returning false");
@@ -673,7 +672,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);
@@ -742,18 +741,18 @@ 
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
 			$owner == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			if (strpos($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'],'A') !== false)
+			if (strpos($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'], 'A') !== false)
 			{
-				$owner = null;	// all AB's
+				$owner = null; // all AB's
 			}
 			else
 			{
-				$owner = array_keys($this->get_addressbooks(null,false));	// false = return all selected abs
+				$owner = array_keys($this->get_addressbooks(null, false)); // false = return all selected abs
 				// translate AS private AB ID to current user
 				if (($key = array_search(self::PRIVATE_AB, $owner)) !== false)
 				{
 					unset($owner[$key]);
-					if (!in_array($GLOBALS['egw_info']['user']['account_id'],$owner))
+					if (!in_array($GLOBALS['egw_info']['user']['account_id'], $owner))
 					{
 						$owner[] = $GLOBALS['egw_info']['user']['account_id'];
 					}
@@ -766,7 +765,7 @@ 
 		}
 		$ctag = $this->addressbook->get_ctag($owner);
 
-		$changes = array();	// no change
+		$changes = array(); // no change
 		//$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)
@@ -794,32 +793,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;
@@ -827,8 +826,8 @@ 
 				$items[] = $item;
 			}
 		}
-		$items['searchtotal']=count($items);
-		$items['range']=$searchquery['range'];
+		$items['searchtotal'] = count($items);
+		$items['range'] = $searchquery['range'];
 		return $items;
 	}
 
@@ -849,14 +848,14 @@ 
 			$addressbooks = $addressbook_bo->get_addressbooks(Acl::READ, null, $user);
 			if ($user > 0)
 			{
-				unset($addressbooks[$user]);	// personal addressbook is allways synced
+				unset($addressbooks[$user]); // personal addressbook is allways synced
 				if (isset($addressbooks[$user.'p']))
 				{
 					$addressbooks[self::PRIVATE_AB] = lang('Private');
 				}
 			}
-			unset($addressbooks[$user.'p']);// private addressbook uses ID self::PRIVATE_AB
-			$fileas_options = array('0' => lang('use addressbooks "own sorting" attribute'))+$addressbook_bo->fileas_options();
+			unset($addressbooks[$user.'p']); // private addressbook uses ID self::PRIVATE_AB
+			$fileas_options = array('0' => lang('use addressbooks "own sorting" attribute')) + $addressbook_bo->fileas_options();
 		}
 		$addressbooks += array(
 			'G'	=> lang('Primary Group'),

Braces +76 added lines, -19 removed lines

@@ -139,7 +139,10 @@ 
 			{
 				Api\Translation::add_app('addressbook');	// we need the addressbook translations
 
-				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new Api\Contacts();
+				}
 
 				// error_log(print_r($this->addressbook->get_addressbooks(Acl::READ),true));
 				$pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
@@ -281,7 +284,10 @@ 
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
 		unset($cutoffdate);	// not used, but required by function signature
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		$type = $user = null;
 		$this->backend->splitID($id,$type,$user);
@@ -332,7 +338,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $contentparameters)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		//$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		//$mimesupport = $contentparameters->GetMimeSupport();
@@ -372,7 +381,10 @@ 
 					break;
 
 				case 'jpegphoto':
-					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)
@@ -418,7 +430,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));
@@ -440,9 +455,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)
 		{
@@ -514,7 +535,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);
@@ -526,14 +550,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)))
 		{
 			debugLog(__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
 		{
 			debugLog(__METHOD__." Changing of Api\Accounts denied!");
+		}
 			return false;			//no changing of Api\Accounts
 		}
 		$contact = array();
@@ -596,7 +626,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;
@@ -605,7 +638,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;
@@ -618,7 +654,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));
@@ -674,7 +713,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);
 		debugLog(__METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -734,9 +776,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'] &&
@@ -787,7 +835,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"
@@ -811,7 +862,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'];
@@ -822,7 +876,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_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');