EGroupware / egroupware

infolog/inc/class.infolog_hooks.inc.php

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

@@ -108,7 +108,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site configuration' => Egw::link('/index.php',array(
 					'menuaction' => 'infolog.infolog_ui.admin' )),
 				'Global Categories'  => Egw::link('/index.php',array(

Spacing +42 added lines, -42 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	static function not_enum_group_acls($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 		$config = config::read('infolog');
 
 		return $config['group_owners'];
@@ -37,14 +37,14 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 		// register our not_enum_group_acls hook, if not already registered
 		// can be removed after next infolog version update after 1.6
 		if ($GLOBALS['egw']->hooks->single('not_enum_group_acls', 'infolog') === false)
 		{
 			$setup_info = array();
 			include(EGW_INCLUDE_ROOT.'/infolog/setup/setup.inc.php');
-			$GLOBALS['egw']->hooks->register_hooks('infolog',$setup_info['infolog']['hooks']);
+			$GLOBALS['egw']->hooks->register_hooks('infolog', $setup_info['infolog']['hooks']);
 			unset($setup_info);
 		}
 
@@ -69,7 +69,7 @@ 
 			'add_id'     => 'action_id',
 			'add_popup'  => '750x550',
 			'file_access'=> 'infolog.infolog_bo.file_access',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'edit'       => array(
 				'menuaction' => 'infolog.infolog_ui.edit',
 			),
@@ -96,38 +96,38 @@ 
 			display_sidebox($appname, lang('Favorites'), egw_framework::favorite_list($appname));
 
 			$file = array(
-				'infolog list' => egw::link('/index.php',array(
+				'infolog list' => egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_ui.index',
 					'ajax' => 'true')),
 				array(
-					'text' => lang('Add %1',lang(egw_link::get_registry($appname, 'entry'))),
+					'text' => lang('Add %1', lang(egw_link::get_registry($appname, 'entry'))),
 					'no_lang' => true,
 					'link' => "javascript:app.infolog.add_link_sidemenu();"
 				),
-				'Placeholders' => egw::link('/index.php','menuaction=infolog.infolog_merge.show_replacements')
+				'Placeholders' => egw::link('/index.php', 'menuaction=infolog.infolog_merge.show_replacements')
 			);
-			display_sidebox($appname,$GLOBALS['egw_info']['apps']['infolog']['title'].' '.lang('Menu'),$file);
+			display_sidebox($appname, $GLOBALS['egw_info']['apps']['infolog']['title'].' '.lang('Menu'), $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site configuration' => egw::link('/index.php',array(
+				'Site configuration' => egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_ui.admin' )),
-				'Global Categories'  => egw::link('/index.php',array(
+				'Global Categories'  => egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_categories.index',
 					'appname'    => $appname,
 					'global_cats'=> True)),
-				'Custom fields, typ and status' => egw::link('/index.php',array(
+				'Custom fields, typ and status' => egw::link('/index.php', array(
 					'menuaction' => 'infolog.infolog_customfields.index')),
 			);
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -140,19 +140,19 @@ 
 	static function settings()
 	{
 		/* Setup some values to fill the array of this app's settings below */
-		$info = new infolog_bo();	// need some labels from
+		$info = new infolog_bo(); // need some labels from
 		$filters = $show_home = array();
 		$show_home[] = lang("DON'T show InfoLog");
 		$filters['none'] = $info->filters[''];
-		foreach($info->filters as $key => $label)
+		foreach ($info->filters as $key => $label)
 		{
 			$show_home[$key] = $filters[$key] = lang($label);
 		}
 
 		// migrage old filter-pref 1,2 to the filter one 'own-open-today'
-		if (isset($GLOBALS['type']) && in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'],array('1','2')))
+		if (isset($GLOBALS['type']) && in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'], array('1', '2')))
 		{
-			$GLOBALS['egw']->preferences->add('infolog','homeShowEvents','own-open-today',$GLOBALS['type']);
+			$GLOBALS['egw']->preferences->add('infolog', 'homeShowEvents', 'own-open-today', $GLOBALS['type']);
 			$GLOBALS['egw']->preferences->save_repository();
 		}
 		$show_links = array(
@@ -229,7 +229,7 @@ 
 				'help'   => 'Should the Infolog list show a unique numerical Id, which can be used eg. as ticket Id.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> '1',	// Yes
+				'default'=> '1', // Yes
 			),
 			'listNoSubs' => array(
 				'type'   => 'select',
@@ -243,7 +243,7 @@ 
 				'help'   => 'Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the Subs via there parent.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> '0',	// Allways show them
+				'default'=> '0', // Allways show them
 			),
 			'show_links' => array(
 				'type'   => 'select',
@@ -263,7 +263,7 @@ 
 				'help'   => 'Should the Infolog list show the percent done only for status ongoing or two separate icons.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'default'=> 1,	// Yes
+				'default'=> 1, // Yes
 			),
 			'limit_des_lines' => array(
 				'type'   => 'input',
@@ -292,7 +292,7 @@ 
 			'help'   => 'Do you want a notification, if items you created get updated?',
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '1',	// Yes
+			'default'=> '1', // Yes
 		);
 		$settings['notify_assigned'] = array(
 			'type'   => 'select',
@@ -306,7 +306,7 @@ 
 			),
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '1',	// Yes
+			'default'=> '1', // Yes
 		);
 
 		// to add options for more then 3 days back or in advance, you need to update soinfolog::users_with_open_entries()!
@@ -315,8 +315,8 @@ 
 			'-1d' => lang('one day after'),
 			'0d'  => lang('same day'),
 			'1d'  => lang('one day in advance'),
-			'2d'  => lang('%1 days in advance',2),
-			'3d'  => lang('%1 days in advance',3),
+			'2d'  => lang('%1 days in advance', 2),
+			'3d'  => lang('%1 days in advance', 3),
 		);
 		$settings['notify_due_delegated'] = array(
 			'type'   => 'select',
@@ -326,7 +326,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 		$settings['notify_due_responsible'] = array(
 			'type'   => 'select',
@@ -336,7 +336,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0d',	// Same day
+			'default'=> '0d', // Same day
 		);
 		$settings['notify_start_delegated'] = array(
 			'type'   => 'select',
@@ -346,7 +346,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 		$settings['notify_start_responsible'] = array(
 			'type'   => 'select',
@@ -356,7 +356,7 @@ 
 			'values' => $options,
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0d',	// Same day
+			'default'=> '0d', // Same day
 		);
 
 		// receive notification for items owned by groups you are part of
@@ -367,7 +367,7 @@ 
 			'help'   => 'Do you want a notification if items owned by groups you are part of get updated ?',
 			'xmlrpc' => True,
 			'admin'  => False,
-			'default'=> '0',	// No
+			'default'=> '0', // No
 		);
 
 		$settings[] = array(
@@ -386,8 +386,8 @@ 
 				'size'   => 60,
 				'label'  => 'Default document to insert entries',
 				'name'   => 'default_document',
-				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('infolog')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','info_subject').' '.
+				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('infolog')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'info_subject').' '.
 					lang('The following document-types are supported:').'*.rtf, *.txt',
 				'run_lang' => false,
 				'xmlrpc' => True,
@@ -398,8 +398,8 @@ 
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert entries',
 				'name'   => 'document_dir',
-				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('infolog')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','info_subject').' '.
+				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.', lang('infolog')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'info_subject').' '.
 					lang('The following document-types are supported:').'*.rtf, *.txt',
 				'run_lang' => false,
 				'xmlrpc' => True,
@@ -488,12 +488,12 @@ 
 	 */
 	private static function all_cats()
 	{
-		$categories = new categories('','infolog');
+		$categories = new categories('', 'infolog');
 		$accountId = $GLOBALS['egw_info']['user']['account_id'];
 
-		foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat)
+		foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true) as $cat)
 		{
-			$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 			if ($cat['app_name'] == 'phpgw' || $cat['owner'] == '-1')
 			{
@@ -501,13 +501,13 @@ 
 			}
 			elseif ($cat['owner'] != $accountId)
 			{
-				$s .= '<' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
+				$s .= '<'.$GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname').'>';
 			}
 			elseif ($cat['access'] == 'private')
 			{
 				$s .= ' ♥';
 			}
-			$sel_options[$cat['id']] = $s;	// 0.9.14 only
+			$sel_options[$cat['id']] = $s; // 0.9.14 only
 		}
 		return $sel_options;
 	}
@@ -528,7 +528,7 @@ 
 
 			if (!$async->read('infolog-async-notification'))
 			{
-				$async->set_timer(array('hour' => 2),'infolog-async-notification','infolog.infolog_bo.async_notification',null);
+				$async->set_timer(array('hour' => 2), 'infolog-async-notification', 'infolog.infolog_bo.async_notification', null);
 			}
 		}
 	}
@@ -541,7 +541,7 @@ 
 	 */
 	public static function acl_rights($params)
 	{
-		unset($params);	// not used, but default function signature for hooks
+		unset($params); // not used, but default function signature for hooks
 		return array(
 			acl::READ    => 'read',
 			acl::ADD     => 'add',
@@ -559,7 +559,7 @@ 
 	 */
 	public static function categories($location)
 	{
-		unset($location);	// not used, but part of hook signature
+		unset($location); // not used, but part of hook signature
 		return true;
 	}
 	
@@ -570,7 +570,7 @@ 
 	 */
 	public static function mail_import($args)
 	{
-		return array (
+		return array(
 			'menuaction' => 'infolog.infolog_ui.mail_import',
 			'popup' => egw_link::get_registry('infolog', 'edit_popup')
 		);

preferences/inc/class.preferences_hooks.inc.php

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

@@ -464,7 +464,7 @@
 	{
 		unset($args);	// unused, but required by function signature
 		$appname = 'preferences';
-		$file = Array(
+		$file = array(
 			'Site configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
 		);
 		display_section($appname, $file);

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
 		);
 
 		$account_display = array(
-			'firstname' => lang('Firstname'). ' '.lang('Lastname'),
+			'firstname' => lang('Firstname').' '.lang('Lastname'),
 			'lastname'  => lang('Lastname').', '.lang('Firstname'),
 			'username'  => lang('username'),
 			'firstall'  => lang('Firstname').' '.lang('Lastname').' ['.lang('username').']',
@@ -91,7 +91,7 @@ 
 		{
 			$lang = setup::get_lang();
 			if (empty($lang)) $lang = 'en';
-			list(,$country) = explode('-',$lang);
+			list(,$country) = explode('-', $lang);
 			if (empty($country)) $country = $lang;
 		}
 		// check for old rte_font_size pref including px and split it in size and unit
@@ -99,7 +99,7 @@ 
 			substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px')
 		{
 			$prefs = $GLOBALS['egw']->preferences;
-			foreach(array('user','default','forced') as $type)
+			foreach (array('user', 'default', 'forced') as $type)
 			{
 				if (substr($prefs->{$type}['common']['rte_font_size'], -2) == 'px')
 				{
@@ -126,7 +126,7 @@ 
 				'size'  => 3,
 				'xmlrpc' => True,
 				'admin'  => False,
-				'forced' => 20,	// hidden as not used in eTemplate2
+				'forced' => 20, // hidden as not used in eTemplate2
 			),
 			'template_set' => array(
 				'type'   => 'select',
@@ -152,7 +152,7 @@ 
 				'type'   => 'select',
 				'label'  => 'Audio effect',
 				'name'   => 'audio_effect',
-				'values' => array('0'=>lang('Disable'),'1'=>lang('Enable')),
+				'values' => array('0'=>lang('Disable'), '1'=>lang('Enable')),
 				'help'   => 'Audio effect enables|disables sound effects used in the theme',
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -273,7 +273,7 @@ 
 				'type'   => 'multiselect',
 				'label'  => 'Permanent time zone selection',
 				'name'   => 'tz_selection',
-				'values' => $tzs ? call_user_func_array('array_merge',$tzs) : null,	// only flat arrays supported
+				'values' => $tzs ? call_user_func_array('array_merge', $tzs) : null, // only flat arrays supported
 				'help'   => 'Please select timezones, you want to be able to quickly switch between. Switch is NOT shown, if less then two are selected.',
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -404,7 +404,7 @@ 
 				'type'   => 'select',
 				'label'  => 'Features of the editor',
 				'name'   => 'rte_features',
-				'values' => array('simple'=>'simple','extended'=>'regular','advanced'=>'everything'),
+				'values' => array('simple'=>'simple', 'extended'=>'regular', 'advanced'=>'everything'),
 				'help'   => 'How many toolbar buttons are available',
 				'admin'  => false,
 				'default'=> 'extended'
@@ -425,7 +425,7 @@ 
 	{
 		$account_id = (int)$data['account_id'];
 
-		if($account_id > 0)	// user
+		if ($account_id > 0)	// user
 		{
 			$GLOBALS['egw']->preferences->delete_user($account_id);
 		}
@@ -457,10 +457,10 @@ 
 	 */
 	static function admin($args)
 	{
-		unset($args);	// unused, but required by function signature
+		unset($args); // unused, but required by function signature
 		$appname = 'preferences';
 		$file = Array(
-			'Site configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+			'Site configuration' => egw::link('/index.php', 'menuaction=admin.uiconfig.index&appname='.$appname),
 		);
 		display_section($appname, $file);
 	}

Braces +24 added lines, -6 removed lines

@@ -87,12 +87,21 @@ 
 			'all'       => '['.lang('username').'] '.lang('Lastname').','.lang('Firstname'),
 		);
 
-		if ($hook_data['setup'])	// called via setup
+		if ($hook_data['setup'])
+		{
+			// called via setup
 		{
 			$lang = setup::get_lang();
-			if (empty($lang)) $lang = 'en';
+		}
+			if (empty($lang))
+			{
+				$lang = 'en';
+			}
 			list(,$country) = explode('-',$lang);
-			if (empty($country)) $country = $lang;
+			if (empty($country))
+			{
+				$country = $lang;
+			}
 		}
 		// check for old rte_font_size pref including px and split it in size and unit
 		if (!isset($GLOBALS['egw_setup']) &&
@@ -411,7 +420,10 @@ 
 			),
 		);
 		// disable thumbnails, if no size configured by admin
-		if (!$GLOBALS['egw_info']['server']['link_list_thumbnail']) unset($settings['link_list_thumbnail']);
+		if (!$GLOBALS['egw_info']['server']['link_list_thumbnail'])
+		{
+			unset($settings['link_list_thumbnail']);
+		}
 
 		return $settings;
 	}
@@ -425,14 +437,20 @@ 
 	{
 		$account_id = (int)$data['account_id'];
 
-		if($account_id > 0)	// user
+		if($account_id > 0)
+		{
+			// user
 		{
 			$GLOBALS['egw']->preferences->delete_user($account_id);
 		}
-		elseif ($account_id < 0)	// group
+		}
+		elseif ($account_id < 0)
+		{
+			// group
 		{
 			$GLOBALS['egw']->preferences->delete_group($account_id);
 		}
+		}
 	}
 
 	/**

home/inc/class.home_weather_portlet.inc.php

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

@@ -34,7 +34,7 @@ 
 	/**
 	 * Context for this portlet
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 
@@ -130,7 +130,7 @@ 
 	 * @see http://openweathermap.org/api
 	 * @param array $query
 	 */
-	public function get_weather(Array $query, $api_url = '')
+	public function get_weather(array $query, $api_url = '')
 	{
 		static $debug = false;
 		if(!$api_url)

Spacing +40 added lines, -40 removed lines

@@ -34,7 +34,7 @@ 
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
 		// City not set for new widgets created via context menu
-		if(!$context['city'] || $context['height'] < 2)
+		if (!$context['city'] || $context['height'] < 2)
 		{
 			// Set initial size to 3x2, default is too small
 			$context['width'] = 3;
@@ -46,10 +46,10 @@ 
 		$this->context = $context;
 	}
 
-	public function exec($id = null, etemplate_new &$etemplate = null)
+	public function exec($id = null, etemplate_new&$etemplate = null)
 	{
 		// Allow to submit directly back here
-		if(is_array($id) && $id['id'])
+		if (is_array($id) && $id['id'])
 		{
 			$id = $id['id'];
 		}
@@ -65,13 +65,13 @@ 
 			'cnt'	=> 10
 		);
 
-		if($this->context['city'])
+		if ($this->context['city'])
 		{
 			$content += $this->get_weather($request);
 		}
 
 		// Adjust data to match portlet size
-		if($this->context['height'] <= 2 && $this->context['width'] <= 3)
+		if ($this->context['height'] <= 2 && $this->context['width'] <= 3)
 		{
 			// Too small for the other days
 			unset($content['list']);
@@ -82,16 +82,16 @@ 
 			unset($content['current']);
 		}
 		// Even too small for current high/low
-		if($this->context['width'] < 3)
+		if ($this->context['width'] < 3)
 		{
 			$content['current']['no_current_temp'] = true;
 		}
 		
 
 		// Direct to full forecast page
-		$content['attribution'] ='http://openweathermap.org/city/'.$content['city_id'];
+		$content['attribution'] = 'http://openweathermap.org/city/'.$content['city_id'];
 		
-		$etemplate->exec('home.home_weather_portlet.exec',$content,array(),array('__ALL__'=>true),array('id' =>$id));
+		$etemplate->exec('home.home_weather_portlet.exec', $content, array(), array('__ALL__'=>true), array('id' =>$id));
 	}
 
 	/**
@@ -103,28 +103,28 @@ 
 	public function get_weather(Array $query, $api_url = '')
 	{
 		static $debug = true;
-		if(!$api_url)
+		if (!$api_url)
 		{
-			$api_url = self::API_URL . '/weather?';
+			$api_url = self::API_URL.'/weather?';
 		}
-		if(self::API_KEY)
+		if (self::API_KEY)
 		{
 			$query['APPID'] = self::API_KEY;
 		}
 		$data = egw_cache::getTree('home', json_encode($query), function($query) use(&$clear_cache) {
 			$debug = true;
-			if($debug) error_log('Fetching fresh data from ' . static::API_URL);
+			if ($debug) error_log('Fetching fresh data from '.static::API_URL);
 
-			$url = static::API_URL.'forecast/daily?'. http_build_query($query);
+			$url = static::API_URL.'forecast/daily?'.http_build_query($query);
 			$forecast = file_get_contents($url);
-			if($debug) error_log(__METHOD__ . ' forecast: ' . $weather);
-			if($forecast === FALSE)
+			if ($debug) error_log(__METHOD__.' forecast: '.$weather);
+			if ($forecast === FALSE)
 
-			$url = static::API_URL.'weather?'. http_build_query($query);
+			$url = static::API_URL.'weather?'.http_build_query($query);
 			$current = file_get_contents($url) || array();
-			if($debug) error_log(__METHOD__ . ' current: ' . $current);
+			if ($debug) error_log(__METHOD__.' current: '.$current);
 
-			return array_merge(array('current' => json_decode($current,true)), json_decode($forecast,true));
+			return array_merge(array('current' => json_decode($current, true)), json_decode($forecast, true));
 		}, array($query), self::CACHE_TIME);
 
 		// Some sample data, if you need to test
@@ -132,22 +132,22 @@ 
 		//$weather = '{"coord":{"lon":-114.05,"lat":53.23},"sys":{"message":0.3098,"country":"Canada","sunrise":1420559329,"sunset":1420587344},"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03n"}],"base":"cmc stations","main":{"temp":-21.414,"temp_min":-21.414,"temp_max":-21.414,"pressure":947.79,"sea_level":1050.73,"grnd_level":947.79,"humidity":69},"wind":{"speed":3,"deg":273.5},"clouds":{"all":32},"dt":1420502430,"id":0,"name":"Thorsby","cod":200}';
 		//$weather = '{"cod":"200","message":0.1743,"city":{"id":"5978233","name":"Thorsby","coord":{"lon":-114.051,"lat":53.2285},"country":"Canada","population":0},"cnt":6,"list":[{"dt":1420743600,"temp":{"day":-17.49,"min":-27.86,"max":-16.38,"night":-27.86,"eve":-19.91,"morn":-16.77},"pressure":966.21,"humidity":66,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":6.91,"deg":312,"clouds":0,"snow":0.02},{"dt":1420830000,"temp":{"day":-24.86,"min":-29.71,"max":-17.98,"night":-18.31,"eve":-18.32,"morn":-29.51},"pressure":948.46,"humidity":54,"weather":[{"id":801,"main":"Clouds","description":"few clouds","icon":"02d"}],"speed":3.21,"deg":166,"clouds":20},{"dt":1420916400,"temp":{"day":-18.51,"min":-25.57,"max":-17.86,"night":-23.83,"eve":-23.91,"morn":-19.28},"pressure":947.22,"humidity":74,"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"speed":1.97,"deg":314,"clouds":48},{"dt":1421002800,"temp":{"day":-26.69,"min":-29.86,"max":-20.19,"night":-21.82,"eve":-24.66,"morn":-28.85},"pressure":951.93,"humidity":22,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"02d"}],"speed":1.36,"deg":196,"clouds":8},{"dt":1421089200,"temp":{"day":0.9,"min":-8.24,"max":0.9,"night":-4.99,"eve":-0.21,"morn":-8.24},"pressure":929.31,"humidity":0,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":6.01,"deg":302,"clouds":5,"snow":0},{"dt":1421175600,"temp":{"day":-1.53,"min":-6.7,"max":2.23,"night":-3.65,"eve":2.23,"morn":-6.7},"pressure":934.51,"humidity":0,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":3.9,"deg":201,"clouds":78}]}';
 
-		if($debug)
+		if ($debug)
 		{
-			error_log(__METHOD__ .' weather info:');
-			foreach($data as $key => $val)
+			error_log(__METHOD__.' weather info:');
+			foreach ($data as $key => $val)
 			{
-				error_log($key . ': ' .array2string($data[$key]));
+				error_log($key.': '.array2string($data[$key]));
 			}
 		}
-		if(is_string($data['message']))
+		if (is_string($data['message']))
 		{
 			$desc = $this->get_description();
-			egw_framework::message($desc['displayName'] . ': ' . $desc['title'] . "\n".$data['message'], 'warning');
+			egw_framework::message($desc['displayName'].': '.$desc['title']."\n".$data['message'], 'warning');
 			return array();
 		}
 
-		if(array_key_exists('city', $data))
+		if (array_key_exists('city', $data))
 		{
 			$data['city_id'] = $data['city']['id'];
 		}
@@ -155,23 +155,23 @@ 
 		{
 			$data['city_id'] = $data['id'];
 		}
-		if($data['list'])
+		if ($data['list'])
 		{
-			$massage =& $data['list'];
+			$massage = & $data['list'];
 			
-			for($i = 0; $i <  min(count($massage), $this->context['width']); $i++)
+			for ($i = 0; $i < min(count($massage), $this->context['width']); $i++)
 			{
-				$forecast =& $massage[$i];
-				$forecast['day'] = egw_time::to($forecast['dt'],'l');
+				$forecast = & $massage[$i];
+				$forecast['day'] = egw_time::to($forecast['dt'], 'l');
 				self::format_forecast($forecast);
 			}
 			// Chop data to fit into portlet
-			for($i; $i < count($massage); $i++)
+			for ($i; $i < count($massage); $i++)
 			{
 				unset($massage[$i]);
 			}
 		}
-		if($data['current'])
+		if ($data['current'])
 		{
 			// Current weather
 			$data['current']['temp'] = $data['current']['main'];
@@ -181,7 +181,7 @@ 
 
 		if ($data['list'])
 		{
-			$data['current']['temp'] = array_merge($data['current']['temp'],$data['list'][0]['temp']);
+			$data['current']['temp'] = array_merge($data['current']['temp'], $data['list'][0]['temp']);
 		}
 		return $data;
 	}
@@ -191,22 +191,22 @@ 
 	 */
 	protected static function format_forecast(&$data)
 	{
-		$weather =& $data['weather'] ? $data['weather'] : $data;
-		$temp =& $data['temp'] ? $data['temp'] : $data;
+		$weather = & $data['weather'] ? $data['weather'] : $data;
+		$temp = & $data['temp'] ? $data['temp'] : $data;
 
 		// Full URL for icon
-		if(is_array($weather))
+		if (is_array($weather))
 		{
-			foreach($weather as &$w)
+			foreach ($weather as &$w)
 			{
-				$w['icon'] = static::ICON_URL . $w['icon'].'.png';
+				$w['icon'] = static::ICON_URL.$w['icon'].'.png';
 			}
 		}
 
 		// Round
-		foreach(array('temp','temp_min','temp_max','min','max') as $temp_name)
+		foreach (array('temp', 'temp_min', 'temp_max', 'min', 'max') as $temp_name)
 		{
-			if(array_key_exists($temp_name, $temp))
+			if (array_key_exists($temp_name, $temp))
 			{
 				$temp[$temp_name] = ''.round($temp[$temp_name]);
 			}

Braces +17 added lines, -5 removed lines

@@ -111,18 +111,30 @@
 		{
 			$query['APPID'] = self::API_KEY;
 		}
-		$data = egw_cache::getTree('home', json_encode($query), function($query) use(&$clear_cache) {
+		$data = egw_cache::getTree('home', json_encode($query), function($query) use(&$clear_cache)
+		{
 			$debug = true;
-			if($debug) error_log('Fetching fresh data from ' . static::API_URL);
+			if($debug)
+			{
+				error_log('Fetching fresh data from ' . static::API_URL);
+			}
 
 			$url = static::API_URL.'forecast/daily?'. http_build_query($query);
 			$forecast = file_get_contents($url);
-			if($debug) error_log(__METHOD__ . ' forecast: ' . $weather);
+			if($debug)
+			{
+				error_log(__METHOD__ . ' forecast: ' . $weather);
+			}
 			if($forecast === FALSE)
-
+			{
+			
 			$url = static::API_URL.'weather?'. http_build_query($query);
+			}
 			$current = file_get_contents($url) || array();
-			if($debug) error_log(__METHOD__ . ' current: ' . $current);
+			if($debug)
+			{
+				error_log(__METHOD__ . ' current: ' . $current);
+			}
 
 			return array_merge(array('current' => json_decode($current,true)), json_decode($forecast,true));
 		}, array($query), self::CACHE_TIME);

addressbook/inc/class.addressbook_activesync.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -114,10 +114,10 @@ 
 	 *
 	 * Takes addessbook-abs and addressbook-all-in-one preference into account.
 	 *
-	 * @param int $account=null account_id of addressbook or null to get array of all addressbooks
-	 * @param boolean $return_all_in_one=true if false and all-in-one pref is set, return all selected abs
+	 * @param int $account account_id of addressbook or null to get array of all addressbooks
+	 * @param boolean $return_all_in_one if false and all-in-one pref is set, return all selected abs
 	 * 	if true only the all-in-one ab is returned (with id of personal ab)
-	 * @param booelan $ab_prefix=false prefix personal, private and accounts addressbook with lang('Addressbook').' '
+	 * @param booelan $ab_prefix 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)
@@ -270,7 +270,7 @@ 
 	 *
 	 * @todo if AB supports an extra private addressbook and AS prefs want an all-in-one AB, the private AB is always included, even if not selected in the prefs
 	 * @param string $id folder id
-	 * @param int $cutoffdate=null
+	 * @param int $cutoffdate
 	 * @return array
   	 */
 	function GetMessageList($id, $cutoffdate=NULL)
@@ -319,7 +319,7 @@ 
 	 * @param string $id
 	 * @param int $truncsize
 	 * @param int $bodypreference
-	 * @param bool $mimesupport
+	 * @param integer $mimesupport
 	 * @return $messageobject|boolean false on error
 	 */
 	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)

Indentation +6 added lines, -6 removed lines

@@ -272,7 +272,7 @@ 
 	 * @param string $id folder id
 	 * @param int $cutoffdate=null
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
 		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
@@ -368,10 +368,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;
 
@@ -683,7 +683,7 @@ 
 	 *
 	 *
 	 * @DESC The $flags parameter must contains the poommailflag Object
- 	 */
+	 */
 	function ChangeMessageFlag($folderid, $id, $flags)
 	{
 		return false;

Spacing +48 added lines, -49 removed lines

@@ -68,7 +68,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',
@@ -120,7 +120,7 @@ 
 	 * @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;
 
@@ -134,13 +134,13 @@ 
 			}
 			else
 			{
-				translation::add_app('addressbook');	// we need the addressbook translations
+				translation::add_app('addressbook'); // we need the addressbook translations
 
 				if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
 
 				// error_log(print_r($this->addressbook->get_addressbooks(EGW_ACL_READ),true));
 				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
-				$pref_abs = (string)$pref_abs !== '' ? explode(',',$pref_abs) : array();
+				$pref_abs = (string)$pref_abs !== '' ? explode(',', $pref_abs) : array();
 
 				foreach ($this->addressbook->get_addressbooks() as $account_id => $label)
 				{
@@ -148,18 +148,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;
@@ -177,7 +176,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',
 			);
@@ -273,18 +272,18 @@ 
 	 * @param int $cutoffdate=null
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL)
+	function GetMessageList($id, $cutoffdate = NULL)
 	{
 		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
 
-		$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)
 			{
@@ -300,10 +299,10 @@ 
 		}
 
 		$messagelist = array();
-		if (($contacts =& $this->addressbook->search($criteria,'contact_id,contact_etag',$order_by='',$extra_cols='',$wildcard='',
-			$empty=false,$op='AND',$start=false,$filter)))
+		if (($contacts = & $this->addressbook->search($criteria, 'contact_id,contact_etag', $order_by = '', $extra_cols = '', $wildcard = '',
+			$empty = false, $op = 'AND', $start = false, $filter)))
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$messagelist[] = $this->StatMessage($id, $contact);
 			}
@@ -322,11 +321,11 @@ 
 	 * @param bool $mimesupport
 	 * @return $messageobject|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	public function GetMessage($folderid, $id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
 		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
 
-		debugLog (__METHOD__."('$folderid', $id, truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
+		debugLog(__METHOD__."('$folderid', $id, truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
 		$this->backend->splitID($folderid, $type, $account);
 		if ($type != 'addressbook' || !($contact = $this->addressbook->read($id)))
 		{
@@ -335,9 +334,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)
 			{
@@ -350,11 +349,11 @@ 
 					}
 					else
 					{
-						if (strlen ($contact[$attr]) > 0)
+						if (strlen($contact[$attr]) > 0)
 						{
 							debugLog("airsyncbasebody!");
 							$message->airsyncbasebody = new SyncAirSyncBaseBody();
-							$message->airsyncbasenativebodytype=1;
+							$message->airsyncbasenativebodytype = 1;
 							$this->backend->note2messagenote($contact[$attr], $bodypreference, $message->airsyncbasebody);
 						}
 					}
@@ -377,14 +376,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[] = 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':
@@ -403,7 +402,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
@@ -518,10 +517,10 @@ 
 		if ($account == 0)	// as a precausion, we currently do NOT allow to change accounts
 		{
 			debugLog(__METHOD__." Changing of accounts denied!");
-			return false;			//no changing of accounts
+			return false; //no changing of accounts
 		}
 		$contact = array();
-		if (empty($id) && ($this->addressbook->grants[$account] & EGW_ACL_EDIT) || ($contact = $this->addressbook->read($id)) && $this->addressbook->check_perms(EGW_ACL_EDIT, $contact))
+		if (empty($id) && ($this->addressbook->grants[$account]&EGW_ACL_EDIT) || ($contact = $this->addressbook->read($id)) && $this->addressbook->check_perms(EGW_ACL_EDIT, $contact))
 		{
 			// remove all fields supported by AS, leaving all unsupported fields unchanged
 			$contact = array_diff_key($contact, array_flip(self::$mapping));
@@ -534,7 +533,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':
@@ -544,20 +543,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;
@@ -569,7 +568,7 @@ 
 						}
 						else
 						{
-							debugLog(__METHOD__. " Warning : php-imap not available");
+							debugLog(__METHOD__." Warning : php-imap not available");
 							$contact[$attr] = $message->$key;
 						}
 						break;
@@ -596,9 +595,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'];
 			}
@@ -710,18 +709,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'];
 					}
@@ -734,7 +733,7 @@ 
 		}
 		$ctag = $this->addressbook->get_ctag($owner);
 
-		$changes = array();	// no change
+		$changes = array(); // no change
 		$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)
@@ -762,20 +761,20 @@ 
 		$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 = array();
-		if (($contacts =& $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR', $range)))
+		if (($contacts = & $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR', $range)))
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 			  	$item['username'] = $contact['n_family'];
 				$item['fullname'] = $contact['n_fn'];
 				if (!trim($item['fullname'])) $item['fullname'] = $item['username'];
-				$item['emailaddress'] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'] ;
+				$item['emailaddress'] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'];
 				$item['nameid'] = $searchquery;
 				$item['phone'] = (string)$contact['tel_work'];
 				$item['homephone'] = (string)$contact['tel_home'];
@@ -810,14 +809,14 @@ 
 			$addressbooks = $addressbook_bo->get_addressbooks(EGW_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

@@ -136,7 +136,10 @@ 
 			{
 				translation::add_app('addressbook');	// we need the addressbook translations
 
-				if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new addressbook_bo();
+				}
 
 				// error_log(print_r($this->addressbook->get_addressbooks(EGW_ACL_READ),true));
 				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
@@ -275,7 +278,10 @@ 
   	 */
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new addressbook_bo();
+		}
 
 		$this->backend->splitID($id,$type,$user);
 		$filter = array('owner' => $user);
@@ -324,7 +330,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new addressbook_bo();
+		}
 
 		debugLog (__METHOD__."('$folderid', $id, truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
 		$this->backend->splitID($folderid, $type, $account);
@@ -362,7 +371,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)
@@ -408,7 +420,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));
@@ -429,9 +444,15 @@ 
 	 */
 	public function StatMessage($folderid, $contact)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new addressbook_bo();
+		}
 
-		if (!is_array($contact)) $contact = $this->addressbook->read($contact);
+		if (!is_array($contact))
+		{
+			$contact = $this->addressbook->read($contact);
+		}
 
 		if (!$contact)
 		{
@@ -499,7 +520,10 @@ 
 	 */
 	public function ChangeMessage($folderid, $id, $message)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new addressbook_bo();
+		}
 
 		$this->backend->splitID($folderid, $type, $account);
 		$is_private = false;
@@ -510,14 +534,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 accounts
+		if ($account == 0)
+		{
+			// as a precausion, we currently do NOT allow to change accounts
 		{
 			debugLog(__METHOD__." Changing of accounts denied!");
+		}
 			return false;			//no changing of accounts
 		}
 		$contact = array();
@@ -580,7 +610,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;
@@ -589,7 +622,10 @@ 
 			}
 			// for all-in-one addressbook, account is meaningless and wrong!
 			// addressbook_bo::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;
@@ -602,7 +638,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));
@@ -654,7 +693,10 @@ 
 	 */
 	public function DeleteMessage($folderid, $id)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new addressbook_bo();
+		}
 
 		$ret = $this->addressbook->delete($id);
 		debugLog(__METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -702,9 +744,15 @@ 
 	{
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'addressbook') return false;
+		if ($type != 'addressbook')
+		{
+			return false;
+		}
 
-		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new addressbook_bo();
+		}
 
 		// handle all-in-one addressbook
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
@@ -755,7 +803,10 @@ 
 	 */
 	function getSearchResultsGAL($searchquery)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new addressbook_bo();
+		}
 		//error_log(__METHOD__.'('.array2string($searchquery).')');
 
 		// only return items in given range, eg. "0-50"
@@ -774,7 +825,10 @@ 
 			{
 			  	$item['username'] = $contact['n_family'];
 				$item['fullname'] = $contact['n_fn'];
-				if (!trim($item['fullname'])) $item['fullname'] = $item['username'];
+				if (!trim($item['fullname']))
+				{
+					$item['fullname'] = $item['username'];
+				}
 				$item['emailaddress'] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'] ;
 				$item['nameid'] = $searchquery;
 				$item['phone'] = (string)$contact['tel_work'];
@@ -785,7 +839,10 @@ 
 				$item['title'] = $contact['title'];
 
 			  	//do not return users without email
-				if (!trim($item['emailaddress'])) continue;
+				if (!trim($item['emailaddress']))
+				{
+					continue;
+				}
 
 				$items[] = $item;
 			}

addressbook/inc/class.addressbook_ads.inc.php

Doc Comments +1 added lines, -4 removed lines

@@ -74,8 +74,7 @@ 
 	/**
 	 * constructor of the class
 	 *
-	 * @param array $ldap_config=null default use from $GLOBALS['egw_info']['server']
-	 * @param resource $ds=null ldap connection to use
+	 * @param array $ldap_config default use from $GLOBALS['egw_info']['server']
 	 */
 	function __construct(array $ldap_config=null, $ds=null)
 	{
@@ -130,7 +129,6 @@ 
 	/**
 	 * connect to LDAP server
 	 *
-	 * @param boolean $admin=false true (re-)connect with admin not user credentials, eg. to modify accounts
 	 */
 	function connect($admin=false)
 	{
@@ -204,7 +202,6 @@ 
 	/**
 	 * Remove attributes we are not allowed to update
 	 *
-	 * @param array $attributes
 	 */
 	function sanitize_update(array &$ldapContact)
 	{

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * while it uses select-account for owner in historylog (containing all users).
 	 *
 	 * @param string $cname
-	*/
+	 */
 	public function beforeSendToClient($cname)
 	{
 		$form_name = self::form_name($cname, $this->id);

Spacing +15 added lines, -16 removed lines

@@ -30,8 +30,8 @@ 
 	 * minimum: $this->columns_to_search = array('n_family','n_given','org_name','email');
 	 */
 	var $search_attributes = array(
-		'n_family','n_middle','n_given','org_name','org_unit',
-		'adr_one_location','note','email','samaccountname',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_location', 'note', 'email', 'samaccountname',
 	);
 
 	/**
@@ -45,7 +45,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $dn_attribute='cn';
+	var $dn_attribute = 'cn';
 
 	/**
 	 * Do NOT attempt to change DN (dn-attribute can NOT be part of schemas used in addressbook!)
@@ -77,9 +77,9 @@ 
 	 * @param array $ldap_config=null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds=null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	function __construct(array $ldap_config = null, $ds = null)
 	{
-		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -87,7 +87,7 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 
 		$this->accounts_ads = $GLOBALS['egw']->accounts->backend;
@@ -112,15 +112,15 @@ 
 			'account_id'	=> 'objectsid',
 			'id'            => 'objectguid',
 			'uid'			=> 'objectguid',
-			'n_fn'          => 'displayname',	// leave CN used in DN untouched
-			'accountexpires', 'useraccountcontrol',	// needed to exclude deactivated or expired accounts
+			'n_fn'          => 'displayname', // leave CN used in DN untouched
+			'accountexpires', 'useraccountcontrol', // needed to exclude deactivated or expired accounts
 		));
 		unset($this->schema2egw['user']['n_fileas']);
 		unset($this->schema2egw['inetorgperson']);
 
-		foreach($this->schema2egw as $schema => $attributes)
+		foreach ($this->schema2egw as $schema => $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -132,7 +132,7 @@ 
 	 *
 	 * @param boolean $admin=false true (re-)connect with admin not user credentials, eg. to modify accounts
 	 */
-	function connect($admin=false)
+	function connect($admin = false)
 	{
 		$this->ds = $this->accounts_ads->ldap_connection();
 	}
@@ -165,15 +165,14 @@ 
 	function read($contact_id)
 	{
 		if (is_array($contact_id) && isset($contact_id['account_id']) ||
-			!is_array($contact_id) && substr($contact_id,0,8) == 'account:')
+			!is_array($contact_id) && substr($contact_id, 0, 8) == 'account:')
 		{
-			$account_id = (int)(is_array($contact_id) ? $contact_id['account_id'] : substr($contact_id,8));
+			$account_id = (int)(is_array($contact_id) ? $contact_id['account_id'] : substr($contact_id, 8));
 			$contact_id = $GLOBALS['egw']->accounts->id2name($account_id, 'person_id');
 		}
-		$contact_id = !is_array($contact_id) ? $contact_id :
-			(isset ($contact_id['id']) ? $contact_id['id'] : $contact_id['uid']);
+		$contact_id = !is_array($contact_id) ? $contact_id : (isset ($contact_id['id']) ? $contact_id['id'] : $contact_id['uid']);
 
-		$rows = $this->_searchLDAP($this->allContactsDN, $filter=$this->id_filter($contact_id), $this->all_attributes, ADDRESSBOOK_ALL);
+		$rows = $this->_searchLDAP($this->allContactsDN, $filter = $this->id_filter($contact_id), $this->all_attributes, ADDRESSBOOK_ALL);
 		//error_log(__METHOD__."('$contact_id') _searchLDAP($this->allContactsDN, '$filter',...)=".array2string($rows));
 		return $rows ? $rows[0] : false;
 	}

Braces +8 added lines, -2 removed lines

@@ -193,10 +193,16 @@
 		$contact['id'] = $contact['uid'] = $this->accounts_ads->objectguid2str($data['objectguid']);
 
 		// ignore system accounts
-		if ($contact['account_id'] < accounts_ads::MIN_ACCOUNT_ID) return false;
+		if ($contact['account_id'] < accounts_ads::MIN_ACCOUNT_ID)
+		{
+			return false;
+		}
 
 		// ignore deactivated or expired accounts
-		if (!$this->accounts_ads->user_active($data)) return false;
+		if (!$this->accounts_ads->user_active($data))
+		{
+			return false;
+		}
 
 		$this->_inetorgperson2egw($contact, $data, 'displayname');
 	}

addressbook/inc/class.addressbook_bo.inc.php

Doc Comments +16 added lines, -33 removed lines

@@ -158,8 +158,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param string $contact_app='addressbook' used for acl->get_grants()
-	 * @param egw_db $db=null
 	 */
 	function __construct($contact_app='addressbook',egw_db $db=null)
 	{
@@ -329,10 +327,8 @@ 
 	/**
 	 * Get the availible addressbooks of the user
 	 *
-	 * @param int $required=EGW_ACL_READ required rights on the addressbook or multiple rights or'ed together,
-	 * 	to return only addressbooks fullfilling all the given rights
 	 * @param string $extra_label first label if given (already translated)
-	 * @param int $user=null account_id or null for current user
+	 * @param integer $required
 	 * @return array with owner => label pairs
 	 */
 	function get_addressbooks($required=EGW_ACL_READ,$extra_label=null,$user=null)
@@ -402,8 +398,6 @@ 
 	 * calculate the file_as string from the contact and the file_as type
 	 *
 	 * @param array $contact
-	 * @param string $type=null file_as type, default null to read it from the contact, unknown/not set type default to the first one
-	 * @param boolean $update=false If true, reads the old record for any not set fields
 	 * @return string
 	 */
 	function fileas($contact,$type=null, $isUpdate=false)
@@ -459,7 +453,6 @@ 
 	 * determine the file_as type from the file_as string and the contact
 	 *
 	 * @param array $contact
-	 * @param string $type=null file_as type, default null to read it from the contact, unknown/not set type default to the first one
 	 * @return string
 	 */
 	function fileas_type($contact,$file_as=null)
@@ -482,7 +475,6 @@ 
 	/**
 	 * get selectbox options for the customfields
 	 *
-	 * @param array $field=null
 	 * @return array with options:
 	 */
 	public static function cf_options()
@@ -498,7 +490,7 @@ 
 	/**
 	 * get selectbox options for the fileas types with translated labels, or real content
 	 *
-	 * @param array $contact=null real content to use, default none
+	 * @param array $contact real content to use, default none
 	 * @return array with options: fileas type => label pairs
 	 */
 	function fileas_options($contact=null)
@@ -532,7 +524,6 @@ 
 	 * If $all all fileas fields will be set, if !$all only empty ones
 	 *
 	 * @param string $fileas_type '' or type of $this->fileas_types
-	 * @param int $all=false update all contacts or only ones with empty values
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated, false for wrong fileas type
 	 */
@@ -596,7 +587,7 @@ 
 	 * remove unneeded carriage returns or set empty fields to NULL
 	 *
 	 * @param int &$errors=null on return number of errors
-	 * @return int|boolean number of contacts updated
+	 * @return integer number of contacts updated
 	 */
 	function set_all_cleanup(&$errors=null,$ignore_acl=false)
 	{
@@ -744,9 +735,7 @@ 
 	/**
 	 * src for photo: returns array with linkparams if jpeg exists or the $default image-name if not
 	 * @param int $id contact_id
-	 * @param boolean $jpeg=false jpeg exists or not
 	 * @param string $default='' image-name to use if !$jpeg, eg. 'template'
-	 * @param string $etag=null etag to set in url to allow caching with Expires header
 	 * @return string/array
 	 */
 	function photo_src($id,$jpeg,$default='',$etag=null)
@@ -788,8 +777,8 @@ 
 	* deletes contact in db
 	*
 	* @param mixed &$contact contact array with key id or (array of) id(s)
-	* @param boolean $deny_account_delete=true if true never allow to delete accounts
-	* @param int $check_etag=null
+	* @param boolean $deny_account_delete if true never allow to delete accounts
+	* @param int $check_etag
 	* @return boolean|int true on success or false on failiure, 0 if etag does not match
 	*/
 	function delete($contact,$deny_account_delete=true,$check_etag=null)
@@ -847,7 +836,7 @@ 
 	* saves contact to db
 	*
 	* @param array &$contact contact array from etemplate::exec
-	* @param boolean $ignore_acl=false should the acl be checked or not
+	* @param boolean $ignore_acl should the acl be checked or not
 	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
 	*/
 	function save(&$contact,$ignore_acl=false)
@@ -1028,7 +1017,7 @@ 
 	 * Resizes photo to 60*80 pixel and returns it
 	 *
 	 * @param string|FILE $photo string with image or open filedescribtor
-	 * @param int $dst_w=240 max width to resize to
+	 * @param int $dst_w max width to resize to
 	 * @return string with resized jpeg photo, null on error
 	 */
 	public static function resize_photo($photo,$dst_w=240)
@@ -1121,9 +1110,8 @@ 
 	 *
 	 * @param int $needed necessary ACL right: EGW_ACL_{READ|EDIT|DELETE}
 	 * @param mixed $contact contact as array or the contact-id
-	 * @param boolean $deny_account_delete=false if true never allow to delete accounts
-	 * @param int $user=null for which user to check, default current user
-	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
+	 * @param boolean $deny_account_delete if true never allow to delete accounts
+	 * @return null|boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
 	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
 	{
@@ -1177,9 +1165,8 @@ 
 	 *
 	 * @param int|array $id id of entry or entry array
 	 * @param int $check EGW_ACL_READ for read and EGW_ACL_EDIT for write or delete access
-	 * @param string $rel_path=null currently not used in InfoLog
-	 * @param int $user=null for which user to check, default current user
-	 * @return boolean true if access is granted or false otherwise
+	 * @param string $rel_path currently not used in InfoLog
+	 * @return null|boolean true if access is granted or false otherwise
 	 */
 	function file_access($id,$check,$rel_path=null,$user=null)
 	{
@@ -1333,7 +1320,7 @@ 
 	 *
 	 * @param array $from original/old version of the contact
 	 * @param array $to changed/new version of the contact
-	 * @param boolean $onld_org_fields=true check and return only org_fields, default true
+	 * @param boolean $only_org_fields check and return only org_fields, default true
 	 * @return array with field-name => value from $from
 	 */
 	function changed_fields($from,$to,$only_org_fields=true)
@@ -1368,7 +1355,7 @@ 
 	 * @param string $org_name
 	 * @param array $from original/old version of the contact
 	 * @param array $to changed/new version of the contact
-	 * @param array $members=null org-members to change, default null --> function queries them itself
+	 * @param array $members org-members to change, default null --> function queries them itself
 	 * @return array/boolean (changed-members,changed-fields,failed-members) or false if no org_fields changed or no (other) members matching that fields
 	 */
 	function change_org($org_name,$from,$to,$members=null)
@@ -1599,7 +1586,7 @@ 
 	 * Read the next and last event of given contacts
 	 *
 	 * @param array $ids contact_id's
-	 * @param boolean $extra_title=true if true, use a short date only title and put the full title as extra_title (tooltip)
+	 * @param boolean $extra_title if true, use a short date only title and put the full title as extra_title (tooltip)
 	 * @return array
 	 */
 	function read_calendar($ids,$extra_title=true)
@@ -1867,7 +1854,6 @@ 
 	 *
 	 * @param int $list
 	 * @param int $required
-	 * @param int $owner=null
 	 * @return boolean
 	 */
 	function check_list($list,$required,$owner=null)
@@ -1885,7 +1871,6 @@ 
 	 *
 	 * @param string|array $keys list-name or array with column-name => value pairs to specify the list
 	 * @param int $owner user- or group-id
-	 * @param array $contacts=array() contacts to add (only for not yet existing lists!)
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
@@ -1909,7 +1894,7 @@ 
 	 *
 	 * @param int|array $contact contact_id(s)
 	 * @param int $list list-id
-	 * @param array $existing=null array of existing contact-id(s) of list, to not reread it, eg. array()
+	 * @param array $existing array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
 	function add2list($contact,$list,array $existing=null)
@@ -2051,7 +2036,7 @@ 
 	 * currently used for vcard import
 	 *
 	 * @param array $catname_list names of the categories which should be found or added
-	 * @param int $contact_id=null match against existing contact and expand the returned category ids
+	 * @param int $contact_id match against existing contact and expand the returned category ids
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
@@ -2151,7 +2136,6 @@ 
 	 * Try to find a matching db entry
 	 *
 	 * @param array $contact   the contact data we try to find
-	 * @param boolean $relax=false if asked to relax, we only match against some key fields
 	 * @return array od matching contact_ids
 	 */
 	function find_contact($contact, $relax=false)
@@ -2386,7 +2370,6 @@ 
 	 * We have to include deleted entries, as otherwise the ctag will not change if an entry gets deleted!
 	 * (Only works if tracking of deleted entries / history is switched on!)
 	 *
-	 * @param int|array $owner=null 0=accounts, null=all addressbooks or integer account_id of user or group
 	 * @return string
 	 */
 	public function get_ctag($owner=null)

Indentation +29 added lines, -29 removed lines

@@ -140,19 +140,19 @@ 
 	var $categories;
 
 	/**
-	* Tracking changes
-	*
-	* @var addressbook_tracking
-	*/
+	 * Tracking changes
+	 *
+	 * @var addressbook_tracking
+	 */
 	protected $tracking;
 
 	/**
-	* Keep deleted addresses, or really delete them
-	* Set in Admin -> Addressbook -> Site Configuration
-	* ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
- 	*
-	* @var string
- 	*/
+	 * Keep deleted addresses, or really delete them
+	 * Set in Admin -> Addressbook -> Site Configuration
+	 * ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
+	 *
+	 * @var string
+	 */
 	protected $delete_history = '';
 
 	/**
@@ -785,13 +785,13 @@ 
 	}
 
 	/**
-	* deletes contact in db
-	*
-	* @param mixed &$contact contact array with key id or (array of) id(s)
-	* @param boolean $deny_account_delete=true if true never allow to delete accounts
-	* @param int $check_etag=null
-	* @return boolean|int true on success or false on failiure, 0 if etag does not match
-	*/
+	 * deletes contact in db
+	 *
+	 * @param mixed &$contact contact array with key id or (array of) id(s)
+	 * @param boolean $deny_account_delete=true if true never allow to delete accounts
+	 * @param int $check_etag=null
+	 * @return boolean|int true on success or false on failiure, 0 if etag does not match
+	 */
 	function delete($contact,$deny_account_delete=true,$check_etag=null)
 	{
 		if (is_array($contact) && isset($contact['id']))
@@ -844,12 +844,12 @@ 
 	}
 
 	/**
-	* saves contact to db
-	*
-	* @param array &$contact contact array from etemplate::exec
-	* @param boolean $ignore_acl=false should the acl be checked or not
-	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
-	*/
+	 * saves contact to db
+	 *
+	 * @param array &$contact contact array from etemplate::exec
+	 * @param boolean $ignore_acl=false should the acl be checked or not
+	 * @return int/string/boolean id on success, false on failure, the error-message is in $this->error
+	 */
 	function save(&$contact,$ignore_acl=false)
 	{
 		// remember if we add or update a entry
@@ -1070,12 +1070,12 @@ 
 	}
 
 	/**
-	* reads contacts matched by key and puts all cols in the data array
-	*
-	* @param int|string $contact_id
-	* @param boolean $ignore_acl =false true: no acl check
-	* @return array|boolean array with contact data, null if not found or false on no view perms
-	*/
+	 * reads contacts matched by key and puts all cols in the data array
+	 *
+	 * @param int|string $contact_id
+	 * @param boolean $ignore_acl =false true: no acl check
+	 * @return array|boolean array with contact data, null if not found or false on no view perms
+	 */
 	function read($contact_id, $ignore_acl=false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl

Spacing +247 added lines, -247 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @var array $timestamps timestamps
 	 */
-	var $timestamps = array('modified','created');
+	var $timestamps = array('modified', 'created');
 
 	/**
 	 * @var array $fileas_types
@@ -161,28 +161,28 @@ 
 	 * @param string $contact_app='addressbook' used for acl->get_grants()
 	 * @param egw_db $db=null
 	 */
-	function __construct($contact_app='addressbook',egw_db $db=null)
+	function __construct($contact_app = 'addressbook', egw_db $db = null)
 	{
-		parent::__construct($contact_app,$db);
+		parent::__construct($contact_app, $db);
 		if ($this->log)
 		{
 			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir'].'/log-addressbook_bo';
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3 ,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3, $this->logfile);
 		}
 
-		$this->now_su = egw_time::to('now','ts');
+		$this->now_su = egw_time::to('now', 'ts');
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['addressbook'];
 		// get the default addressbook from the users prefs
 		$this->default_addressbook = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] ?
 			(int)$GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] : $this->user;
-		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'],-1) == 'p';
+		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'], -1) == 'p';
 		if ($this->default_addressbook > 0 && $this->default_addressbook != $this->user &&
 			($this->default_private ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->forced['addressbook']['add_default'] ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->default['addressbook']['add_default']))
 		{
-			$this->default_addressbook = $this->user;	// admin set a default or forced pref for personal addressbook
+			$this->default_addressbook = $this->user; // admin set a default or forced pref for personal addressbook
 		}
 		$this->private_addressbook = self::private_addressbook($this->contact_repository == 'sql', $this->prefs);
 
@@ -287,27 +287,27 @@ 
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
 		if (!is_array($this->own_account_acl)) $this->own_account_acl = unserialize($this->own_account_acl);
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
-		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
+		if ($this->own_account_acl && in_array('n_fn', $this->own_account_acl))
 		{
-			$this->own_account_acl = array_merge($this->own_account_acl,array('n_prefix','n_given','n_middle','n_family','n_suffix'));
+			$this->own_account_acl = array_merge($this->own_account_acl, array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix'));
 		}
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
-			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
+			$this->org_fields = $GLOBALS['egw_info']['server']['org_fileds_to_update'];
 			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
 
 			// Set country code if country name is selected
-			$supported_fields = $this->get_fields('supported',null,0);
-			if(in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname',$this->org_fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$this->org_fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_two_countrycode';
 			}
 		}
-		$this->categories = new categories($this->user,'addressbook');
+		$this->categories = new categories($this->user, 'addressbook');
 
 		$this->delete_history = $GLOBALS['egw_info']['server']['history'];
 	}
@@ -321,7 +321,7 @@ 
 	 * @param array $prefs addressbook preferences
 	 * @return boolean
 	 */
-	public static function private_addressbook($contact_repository, array $prefs=null)
+	public static function private_addressbook($contact_repository, array $prefs = null)
 	{
 		return $contact_repository == 'sql' && $prefs['private_addressbook'];
 	}
@@ -335,7 +335,7 @@ 
 	 * @param int $user=null account_id or null for current user
 	 * @return array with owner => label pairs
 	 */
-	function get_addressbooks($required=EGW_ACL_READ,$extra_label=null,$user=null)
+	function get_addressbooks($required = EGW_ACL_READ, $extra_label = null, $user = null)
 	{
 		//echo "uicontacts::get_addressbooks($required,$include_all) grants="; _debug_array($this->grants);
 
@@ -356,11 +356,11 @@ 
 		if ($extra_label) $addressbooks[''] = $extra_label;
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if (($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
+			if (($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 			{
-				$to_sort[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
+				$to_sort[$uid] = lang('Group %1', $GLOBALS['egw']->accounts->id2name($uid));
 			}
 		}
 		if ($to_sort)
@@ -368,19 +368,19 @@ 
 			asort($to_sort);
 			$addressbooks += $to_sort;
 		}
-		if ($required != EGW_ACL_ADD &&	// do NOT allow to set accounts as default addressbook (AB can add accounts)
+		if ($required != EGW_ACL_ADD && // do NOT allow to set accounts as default addressbook (AB can add accounts)
 			!$preferences['addressbook']['hide_accounts'] && (
-				($grants[0] & $required) == $required ||
+				($grants[0]&$required) == $required ||
 				$preferences['common']['account_selection'] == 'groupmembers' &&
-				$this->account_repository != 'ldap' && ($required & EGW_ACL_READ)))
+				$this->account_repository != 'ldap' && ($required&EGW_ACL_READ)))
 		{
 			$addressbooks[0] = lang('Accounts');
 		}
 		// add all other user addressbooks the user has the necessary rights too
 		$to_sort = array();
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if ($uid != $user && ($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
+			if ($uid != $user && ($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
 			{
 				$to_sort[$uid] = common::grab_owner_name($uid);
 			}
@@ -406,22 +406,22 @@ 
 	 * @param boolean $update=false If true, reads the old record for any not set fields
 	 * @return string
 	 */
-	function fileas($contact,$type=null, $isUpdate=false)
+	function fileas($contact, $type = null, $isUpdate = false)
 	{
 		if (is_null($type)) $type = $contact['fileas_type'];
 		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type, 'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
 
-		if($isUpdate)
+		if ($isUpdate)
 		{
-			$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality','bday');
+			$fileas_fields = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix', 'n_fn', 'org_name', 'org_unit', 'adr_one_locality', 'bday');
 			$old = null;
-			foreach($fileas_fields as $field)
+			foreach ($fileas_fields as $field)
 			{
-				if(!isset($contact[$field]))
+				if (!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if (is_null($old)) $old = $this->read($contact['id']);
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -429,8 +429,8 @@ 
 		}
 
 		// removing empty delimiters, caused by empty contact fields
-		$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),
-			array(': ',': ',': ',', ',': ',''),
+		$fileas = str_replace(array(', , : ', ', : ', ': , ', ', , ', ': : ', ' ()'),
+			array(': ', ': ', ': ', ', ', ': ', ''),
 			strtr($type, array(
 				'n_prefix' => $contact['n_prefix'],
 				'n_given'  => $contact['n_given'],
@@ -444,13 +444,13 @@ 
 				'bday'     => (int)$contact['bday'] ? egw_time::to($contact['bday'], true) : $contact['bday'],
 			)));
 
-		while ($fileas[0] == ':' ||  $fileas[0] == ',')
+		while ($fileas[0] == ':' || $fileas[0] == ',')
 		{
-			$fileas = substr($fileas,2);
+			$fileas = substr($fileas, 2);
 		}
-		while (substr($fileas,-2) == ': ' || substr($fileas,-2) == ', ')
+		while (substr($fileas, -2) == ': ' || substr($fileas, -2) == ', ')
 		{
-			$fileas = substr($fileas,0,-2);
+			$fileas = substr($fileas, 0, -2);
 		}
 		return $fileas;
 	}
@@ -462,15 +462,15 @@ 
 	 * @param string $type=null file_as type, default null to read it from the contact, unknown/not set type default to the first one
 	 * @return string
 	 */
-	function fileas_type($contact,$file_as=null)
+	function fileas_type($contact, $file_as = null)
 	{
 		if (is_null($file_as)) $file_as = $contact['n_fileas'];
 
 		if ($file_as)
 		{
-			foreach($this->fileas_types as $type)
+			foreach ($this->fileas_types as $type)
 			{
-				if ($this->fileas($contact,$type) == $file_as)
+				if ($this->fileas($contact, $type) == $file_as)
 				{
 					return $type;
 				}
@@ -487,10 +487,10 @@ 
 	 */
 	public static function cf_options()
 	{
-		$cf_fields = config::get_customfields('addressbook',TRUE);
-		foreach ($cf_fields as $key => $value )
+		$cf_fields = config::get_customfields('addressbook', TRUE);
+		foreach ($cf_fields as $key => $value)
 		{
-			$options[$key]= $value['label'];
+			$options[$key] = $value['label'];
 		}
 		return $options;
 	}
@@ -501,7 +501,7 @@ 
 	 * @param array $contact=null real content to use, default none
 	 * @return array with options: fileas type => label pairs
 	 */
-	function fileas_options($contact=null)
+	function fileas_options($contact = null)
 	{
 		$labels = array(
 			'n_prefix' => lang('prefix'),
@@ -515,13 +515,13 @@ 
 			'adr_one_locality' => lang('city'),
 			'bday'     => lang('Birthday'),
 		);
-		foreach($labels as $name => $label)
+		foreach ($labels as $name => $label)
 		{
 			if ($contact[$name]) $labels[$name] = $contact[$name];
 		}
-		foreach($this->fileas_types as $fileas_type)
+		foreach ($this->fileas_types as $fileas_type)
 		{
-			$options[$fileas_type] = $this->fileas($labels,$fileas_type);
+			$options[$fileas_type] = $this->fileas($labels, $fileas_type);
 		}
 		return $options;
 	}
@@ -536,7 +536,7 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated, false for wrong fileas type
 	 */
-	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
+	function set_all_fileas($fileas_type, $all = false, &$errors = null, $ignore_acl = false)
 	{
 		if ($fileas_type != '' && !in_array($fileas_type, $this->fileas_types))
 		{
@@ -544,17 +544,17 @@ 
 		}
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
+		for ($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
 			'n_fileas IS NULL',
 			"n_fileas=''",
 			'n_fn IS NULL',
 			"n_fn=''",
-		),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$old_fn     = $contact['n_fn'];
 				$old_fileas = $contact['n_fileas'];
@@ -562,20 +562,20 @@ 
 				// only update fileas if type is given AND (all should be updated or n_fileas is empty)
 				if ($fileas_type && ($all || empty($contact['n_fileas'])))
 				{
-					$contact['n_fileas'] = $this->fileas($contact,$fileas_type);
+					$contact['n_fileas'] = $this->fileas($contact, $fileas_type);
 				}
 				if ($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])
 				{
 					//echo "<p>('$old_fileas' != '{$contact['n_fileas']}' || '$old_fn' != '{$contact['n_fn']}')=".array2string($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])."</p>\n";
 					// only specify/write updated fields plus "keys"
-					$contact = array_intersect_key($contact,array(
+					$contact = array_intersect_key($contact, array(
 						'id' => true,
 						'owner' => true,
 						'private' => true,
 						'account_id' => true,
 						'uid' => true,
-					)+($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array())+($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
-					if ($this->save($contact,$ignore_acl))
+					) + ($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array()) + ($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
+					if ($this->save($contact, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -598,11 +598,11 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated
 	 */
-	function set_all_cleanup(&$errors=null,$ignore_acl=false)
+	function set_all_cleanup(&$errors = null, $ignore_acl = false)
 	{
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 
 		// fields that must not be touched
@@ -624,14 +624,14 @@ 
 		);
 
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search(array(),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		for ($n = $updated = $errors = 0; ($contacts = parent::search(array(), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$fields_to_update = array();
-				foreach($contact as $field_name => $field_value)
+				foreach ($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if ($fields_exclude[$field_name] === true) continue; // dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -641,9 +641,9 @@ 
 							$fields_to_update[$field_name] = $field_value = trim($field_value);
 						}
 						// check if field contains a carriage return - exclude notes
-						if ($field_name != 'note' && strpos($field_value,"\x0D\x0A") !== false)
+						if ($field_name != 'note' && strpos($field_value, "\x0D\x0A") !== false)
 						{
-							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A"," ",$field_value);;
+							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A", " ", $field_value); ;
 						}
 					}
 					// check if a field contains an empty string
@@ -653,13 +653,13 @@ 
 					}
 					// check for valid birthday date
 					if ($field_name == 'bday' && $field_value != null &&
-						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/',$field_value))
+						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/', $field_value))
 					{
 						$fields_to_update[$field_name] = $field_value = null;
 					}
 				}
 
-				if(count($fields_to_update) > 0)
+				if (count($fields_to_update) > 0)
 				{
 					$contact_to_save = array(
 						'id' => $contact['id'],
@@ -668,7 +668,7 @@ 
 						'account_id' => $contact['account_id'],
 						'uid' => $contact['uid']) + $fields_to_update;
 
-					if ($this->save($contact_to_save,$ignore_acl))
+					if ($this->save($contact_to_save, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -693,14 +693,14 @@ 
 		if (empty($contact['n_family']) && empty($contact['n_given'])) {
 			$cpart = array('org_name');
 		} else {
-			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
+			$cpart = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix');
 		}
 		$parts = array();
-		foreach($cpart as $n)
+		foreach ($cpart as $n)
 		{
 			if ($contact[$n]) $parts[] = $contact[$n];
 		}
-		return implode(' ',$parts);
+		return implode(' ', $parts);
 	}
 
 	/**
@@ -714,7 +714,7 @@ 
 	 *
 	 * @return array updated data
 	 */
-	function db2data($data, $date_format='ts')
+	function db2data($data, $date_format = 'ts')
 	{
 		static $fb_url = false;
 
@@ -726,7 +726,7 @@ 
 				$data[$name] = egw_time::server2user($data[$name], $date_format);
 			}
 		}
-		$data['photo'] = $this->photo_src($data['id'],$data['jpegphoto'],'',$data['etag']);
+		$data['photo'] = $this->photo_src($data['id'], $data['jpegphoto'], '', $data['etag']);
 
 		// set freebusy_uri for accounts
 		if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
@@ -749,13 +749,13 @@ 
 	 * @param string $etag=null etag to set in url to allow caching with Expires header
 	 * @return string/array
 	 */
-	function photo_src($id,$jpeg,$default='',$etag=null)
+	function photo_src($id, $jpeg, $default = '', $etag = null)
 	{
 		//error_log(__METHOD__."($id, ..., etag=$etag) ".  function_backtrace());
 		return $jpeg ? array(
 			'menuaction' => 'addressbook.addressbook_ui.photo',
 			'contact_id' => $id,
-		)+(isset($etag) ? array(
+		) + (isset($etag) ? array(
 			'etag'       => $etag,
 		) : array()) : $default;
 	}
@@ -771,7 +771,7 @@ 
 	 *
 	 * @return array upated data
 	 */
-	function data2db($data, $date_format='ts')
+	function data2db($data, $date_format = 'ts')
 	{
 		// convert timestamps from user-time to server-time in the db
 		foreach ($this->timestamps as $name)
@@ -792,7 +792,7 @@ 
 	* @param int $check_etag=null
 	* @return boolean|int true on success or false on failiure, 0 if etag does not match
 	*/
-	function delete($contact,$deny_account_delete=true,$check_etag=null)
+	function delete($contact, $deny_account_delete = true, $check_etag = null)
 	{
 		if (is_array($contact) && isset($contact['id']))
 		{
@@ -802,12 +802,12 @@ 
 		{
 			$contact = array($contact);
 		}
-		foreach($contact as $c)
+		foreach ($contact as $c)
 		{
 			$id = is_array($c) ? $c['id'] : $c;
 
 			$ok = false;
-			if ($this->check_perms(EGW_ACL_DELETE,$c,$deny_account_delete))
+			if ($this->check_perms(EGW_ACL_DELETE, $c, $deny_account_delete))
 			{
 				if (!($old = $this->read($id))) return false;
 				// check if we only mark contacts as deleted, or really delete them
@@ -818,12 +818,12 @@ 
 					$delete = $old;
 					$delete['tid'] = addressbook_so::DELETED_TYPE;
 					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
-					egw_link::unlink(0,'addressbook',$id,'','','',true);
+					if (($ok = $this->save($delete))) $ok = true; // we have to return true or false
+					egw_link::unlink(0, 'addressbook', $id, '', '', '', true);
 				}
-				elseif (($ok = parent::delete($id,$check_etag)))
+				elseif (($ok = parent::delete($id, $check_etag)))
 				{
-					egw_link::unlink(0,'addressbook',$id);
+					egw_link::unlink(0, 'addressbook', $id);
 				}
 
 				// Don't notify of final purge
@@ -850,7 +850,7 @@ 
 	* @param boolean $ignore_acl=false should the acl be checked or not
 	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
 	*/
-	function save(&$contact,$ignore_acl=false)
+	function save(&$contact, $ignore_acl = false)
 	{
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
@@ -859,11 +859,11 @@ 
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
-					if(!isset($contact['owner']))
+					if (!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
 					}
-					if(!isset($contact['private']))
+					if (!isset($contact['private']))
 					{
 						$contact['private'] = $old['private'];
 					}
@@ -895,7 +895,7 @@ 
 		{
 			$contact['private'] = 0;
 		}
-		if(!$ignore_acl && !$this->check_perms($isUpdate ? EGW_ACL_EDIT : EGW_ACL_ADD,$contact))
+		if (!$ignore_acl && !$this->check_perms($isUpdate ? EGW_ACL_EDIT : EGW_ACL_ADD, $contact))
 		{
 			$this->error = 'access denied';
 			return false;
@@ -908,15 +908,15 @@ 
 		// convert categories
 		if (is_array($contact['cat_id']))
 		{
-			$contact['cat_id'] = implode(',',$contact['cat_id']);
+			$contact['cat_id'] = implode(',', $contact['cat_id']);
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
+		foreach (array('adr_one_', 'adr_two_') as $c_prefix) {
+			if ($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = $GLOBALS['egw']->country->country_code($contact[$c_prefix.'countryname']))
 			{
-				if(strlen($code) == 2)
+				if (strlen($code) == 2)
 				{
 					$contact[$c_prefix.'countrycode'] = $code;
 				}
@@ -925,7 +925,7 @@ 
 					$contact[$c_prefix.'countrycode'] = null;
 				}
 			}
-			if($contact[$c_prefix.'countrycode'] != null)
+			if ($contact[$c_prefix.'countrycode'] != null)
 			{
 				$contact[$c_prefix.'countryname'] = null;
 			}
@@ -950,9 +950,9 @@ 
 		// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
 		if (!$ignore_acl && !$contact['owner'] && !($this->is_admin($contact) || $this->allow_account_edit()))
 		{
-			foreach($contact as $field => $value)
+			foreach ($contact as $field => $value)
 			{
-				if (!in_array($field,$this->own_account_acl) && !in_array($field,array('id','owner','account_id','modified','modifier')))
+				if (!in_array($field, $this->own_account_acl) && !in_array($field, array('id', 'owner', 'account_id', 'modified', 'modifier')))
 				{
 					// user is not allowed to change that
 					if ($old)
@@ -973,17 +973,17 @@ 
 		{
 			if (isset($to_write['owner']) && !empty($to_write['owner']))
 			{
-				error_log(__METHOD__.__LINE__." Trying to change account to owner:". $to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
+				error_log(__METHOD__.__LINE__." Trying to change account to owner:".$to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
 				unset($to_write['owner']);
 			}
 		}
 		// we dont update the content-history, if we run inside setup (admin-account-creation)
-		if(!($this->error = parent::save($to_write)) && is_object($GLOBALS['egw']->contenthistory))
+		if (!($this->error = parent::save($to_write)) && is_object($GLOBALS['egw']->contenthistory))
 		{
 			$contact['id'] = $to_write['id'];
 			$contact['uid'] = $to_write['uid'];
 			$contact['etag'] = $to_write['etag'];
-			$GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $contact['id'],$isUpdate ? 'modify' : 'add', time());
+			$GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $contact['id'], $isUpdate ? 'modify' : 'add', time());
 
 			// if contact is an account and account-relevant data got updated, handle it like account got updated
 			if ($contact['account_id'] && $isUpdate &&
@@ -993,27 +993,27 @@ 
 				$GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']);
 				// call edit-accout hook, to let other apps know about changed account (names or email)
 				$GLOBALS['hook_values'] = $GLOBALS['egw']->accounts->read($contact['account_id']);
-				$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
+				$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'] + array(
 					'location' => 'editaccount',
-				),False,True);	// called for every app now, not only enabled ones)
+				), False, True); // called for every app now, not only enabled ones)
 			}
 			// notify interested apps about changes in the account-contact data
 			if (!$to_write['owner'] && $to_write['account_id'] && $isUpdate)
 			{
 				$to_write['location'] = 'editaccountcontact';
-				$GLOBALS['egw']->hooks->process($to_write,False,True);	// called for every app now, not only enabled ones));
+				$GLOBALS['egw']->hooks->process($to_write, False, True); // called for every app now, not only enabled ones));
 			}
 			// Notify linked apps about changes in the contact data
-			egw_link::notify_update('addressbook',  $contact['id'], $contact);
+			egw_link::notify_update('addressbook', $contact['id'], $contact);
 
 			// Check for restore of deleted contact, restore held links
-			if($old && $old['tid'] == addressbook_so::DELETED_TYPE && $contact['tid'] != addressbook_so::DELETED_TYPE)
+			if ($old && $old['tid'] == addressbook_so::DELETED_TYPE && $contact['tid'] != addressbook_so::DELETED_TYPE)
 			{
 				egw_link::restore('addressbook', $contact['id']);
 			}
 
 			// Record change history for sql - doesn't work for LDAP accounts
-			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
+			if (!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == addressbook_so::DELETED_TYPE || $contact['tid'] == addressbook_so::DELETED_TYPE);
 				if (!isset($this->tracking)) $this->tracking = new addressbook_tracking($this);
@@ -1031,7 +1031,7 @@ 
 	 * @param int $dst_w=240 max width to resize to
 	 * @return string with resized jpeg photo, null on error
 	 */
-	public static function resize_photo($photo,$dst_w=240)
+	public static function resize_photo($photo, $dst_w = 240)
 	{
 		if (is_resource($photo))
 		{
@@ -1047,15 +1047,15 @@ 
 		//error_log(__METHOD__."() got image $src_w * $src_h, is_jpeg=".array2string(substr($photo,0,2) === "\377\330"));
 
 		// if $photo is to width or not a jpeg image --> resize it
-		if ($src_w > $dst_w || cut_bytes($photo,0,2) !== "\377\330")
+		if ($src_w > $dst_w || cut_bytes($photo, 0, 2) !== "\377\330")
 		{
 			//error_log(__METHOD__."(,dst_w=$dst_w) src_w=$src_w, cut_bytes(photo,0,2)=".array2string(cut_bytes($photo,0,2)).' --> resizing');
 			// scale the image to a width of 60 and a height according to the proportion of the source image
-			$resized = imagecreatetruecolor($dst_w,$dst_h = round($src_h * $dst_w / $src_w));
-			imagecopyresized($resized,$image,0,0,0,0,$dst_w,$dst_h,$src_w,$src_h);
+			$resized = imagecreatetruecolor($dst_w, $dst_h = round($src_h * $dst_w / $src_w));
+			imagecopyresized($resized, $image, 0, 0, 0, 0, $dst_w, $dst_h, $src_w, $src_h);
 
 			ob_start();
-			imagejpeg($resized,null,90);
+			imagejpeg($resized, null, 90);
 			$photo = ob_get_contents();
 			ob_end_clean();
 
@@ -1076,7 +1076,7 @@ 
 	* @param boolean $ignore_acl =false true: no acl check
 	* @return array|boolean array with contact data, null if not found or false on no view perms
 	*/
-	function read($contact_id, $ignore_acl=false)
+	function read($contact_id, $ignore_acl = false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl
 		if ($ignore_acl && is_a($this->somain, 'addressbook_sql'))
@@ -1086,11 +1086,11 @@ 
 		}
 		if (!($data = parent::read($contact_id)))
 		{
-			$data = null;	// not found
+			$data = null; // not found
 		}
-		elseif (!$ignore_acl && !$this->check_perms(EGW_ACL_READ,$data))
+		elseif (!$ignore_acl && !$this->check_perms(EGW_ACL_READ, $data))
 		{
-			$data = false;	// no view perms
+			$data = false; // no view perms
 		}
 		else
 		{
@@ -1098,10 +1098,10 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if ($data['adr_one_countrycode'] != null) {
 				$data['adr_one_countryname'] = $GLOBALS['egw']->country->get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if ($data['adr_two_countrycode'] != null) {
 				$data['adr_two_countryname'] = $GLOBALS['egw']->country->get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1125,7 +1125,7 @@ 
 	 * @param int $user=null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
-	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
+	function check_perms($needed, $contact, $deny_account_delete = false, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1136,7 +1136,7 @@ 
 		else
 		{
 			$grants = $this->get_grants($user);
-			$memberships =  $GLOBALS['egw']->accounts->memberships($user,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		}
 
 		if ((!is_array($contact) || !isset($contact['owner'])) &&
@@ -1161,12 +1161,12 @@ 
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']))
 		{
-			$access = !!array_intersect($memberships,$GLOBALS['egw']->accounts->memberships($contact['account_id'],true));
+			$access = !!array_intersect($memberships, $GLOBALS['egw']->accounts->memberships($contact['account_id'], true));
 		}
 		else
 		{
-			$access = ($grants[$owner] & $needed) &&
-				(!$contact['private'] || ($grants[$owner] & EGW_ACL_PRIVATE) || in_array($owner,$memberships));
+			$access = ($grants[$owner]&$needed) &&
+				(!$contact['private'] || ($grants[$owner]&EGW_ACL_PRIVATE) || in_array($owner, $memberships));
 		}
 		//error_log(__METHOD__."($needed,$contact[id],$deny_account_delete,$user) returning ".array2string($access));
 		return $access;
@@ -1181,9 +1181,9 @@ 
 	 * @param int $user=null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		return $this->check_perms($check,$id,false,$user);
+		return $this->check_perms($check, $id, false, $user);
 	}
 
 	/**
@@ -1195,18 +1195,18 @@ 
 	function read_org($org_id)
 	{
 		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (strpos($org_id, '*AND*') !== false) $org_id = str_replace('*AND*', '&', $org_id);
 		$org = array();
-		foreach(explode('|||',$org_id) as $part)
+		foreach (explode('|||', $org_id) as $part)
 		{
-			list($name,$value) = explode(':',$part,2);
+			list($name, $value) = explode(':', $part, 2);
 			$org[$name] = $value;
 		}
-		$csvs = array('cat_id');	// fields with comma-separated-values
+		$csvs = array('cat_id'); // fields with comma-separated-values
 
 		// split regular fields and custom fields
 		$custom_fields = $regular_fields = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if ($name[0] != '#')
 			{
@@ -1214,9 +1214,9 @@ 
 			}
 			else
 			{
-				$custom_fields[] = $name = substr($name,1);
+				$custom_fields[] = $name = substr($name, 1);
 				$regular_fields['id'] = 'id';
-				if (substr($this->customfields[$name]['type'],0,6)=='select' && $this->customfields[$name]['rows'] ||	// multiselection
+				if (substr($this->customfields[$name]['type'], 0, 6) == 'select' && $this->customfields[$name]['rows'] || // multiselection
 					$this->customfields[$name]['type'] == 'radio')
 				{
 					$csvs[] = '#'.$name;
@@ -1224,24 +1224,24 @@ 
 			}
 		}
 		// read the regular fields
-		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
+		$contacts = parent::search('', $regular_fields, '', '', '', false, 'AND', false, $org);
 		if (!$contacts) return false;
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
-			if (($cfs = $this->read_customfields($ids,$custom_fields)))
+			if (($cfs = $this->read_customfields($ids, $custom_fields)))
 			{
 				foreach ($contacts as &$contact)
 				{
 					$id = $contact['id'];
 					if (isset($cfs[$id]))
 					{
-						foreach($cfs[$id] as $name => $value)
+						foreach ($cfs[$id] as $name => $value)
 						{
 							$contact['#'.$name] = $value;
 						}
@@ -1253,34 +1253,34 @@ 
 
 		// create a statistic about the commonness of each fields values
 		$fields = array();
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$fields[$name][$value]++;
 				}
 				else
 				{
 					// for comma separated fields, we have to use each single value
-					foreach(explode(',',$value) as $val)
+					foreach (explode(',', $value) as $val)
 					{
 						$fields[$name][$val]++;
 					}
 				}
 			}
 		}
-		foreach($fields as $name => $values)
+		foreach ($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name, $this->org_fields)) continue;
 
-			arsort($values,SORT_NUMERIC);
-			list($value,$num) = each($values);
+			arsort($values, SORT_NUMERIC);
+			list($value, $num) = each($values);
 			//echo "<p>$name: '$value' $num/".count($contacts)."=".($num / (double) count($contacts))." >= $this->org_common_factor = ".($num / (double) count($contacts) >= $this->org_common_factor ? 'true' : 'false')."</p>\n";
-			if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+			if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$org[$name] = $value;
 				}
@@ -1289,12 +1289,12 @@ 
 					$org[$name] = array();
 					foreach ($values as $value => $num)
 					{
-						if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+						if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 						{
 							$org[$name][] = $value;
 						}
 					}
-					$org[$name] = implode(',',$org[$name]);
+					$org[$name] = implode(',', $org[$name]);
 				}
 			}
 		}
@@ -1308,10 +1308,10 @@ 
 	 * @param array $fields field-name => value pairs
 	 * @return array with contacts
 	 */
-	function org_similar($org_name,$fields)
+	function org_similar($org_name, $fields)
 	{
 		$criteria = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if (isset($fields[$name]))
 			{
@@ -1325,7 +1325,7 @@ 
 				}
 			}
 		}
-		return parent::search($criteria,false,'n_family,n_given','','',false,'OR',false,array('org_name'=>$org_name));
+		return parent::search($criteria, false, 'n_family,n_given', '', '', false, 'OR', false, array('org_name'=>$org_name));
 	}
 
 	/**
@@ -1336,10 +1336,10 @@ 
 	 * @param boolean $onld_org_fields=true check and return only org_fields, default true
 	 * @return array with field-name => value from $from
 	 */
-	function changed_fields($from,$to,$only_org_fields=true)
+	function changed_fields($from, $to, $only_org_fields = true)
 	{
 		// we only care about countryname, if contrycode is empty
-		foreach(array(
+		foreach (array(
 			'adr_one_countryname' => 'adr_one_countrycode',
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
@@ -1348,13 +1348,13 @@ 
 			if (!empty($to[$code])) $to[$name] = '';
 		}
 		$changed = array();
-		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
+		foreach ($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name, array('modified', 'modifier')))	// never count these
 			{
 				continue;
 			}
-			if ((string) $from[$name] != (string) $to[$name])
+			if ((string)$from[$name] != (string)$to[$name])
 			{
 				$changed[$name] = $from[$name];
 			}
@@ -1371,35 +1371,35 @@ 
 	 * @param array $members=null org-members to change, default null --> function queries them itself
 	 * @return array/boolean (changed-members,changed-fields,failed-members) or false if no org_fields changed or no (other) members matching that fields
 	 */
-	function change_org($org_name,$from,$to,$members=null)
+	function change_org($org_name, $from, $to, $members = null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from, $to, true))) return false;
 
 		if (is_null($members) || !is_array($members))
 		{
-			$members = $this->org_similar($org_name,$changed);
+			$members = $this->org_similar($org_name, $changed);
 		}
 		if (!$members) return false;
 
 		$ids = array();
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			$ids[] = $member['id'];
 		}
 		$customfields = $this->read_customfields($ids);
 
 		$changed_members = $changed_fields = $failed_members = 0;
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			if (isset($customfields[$member['id']]))
 			{
-				foreach($this->customfields as $name => $data)
+				foreach ($this->customfields as $name => $data)
 				{
 					$member['#'.$name] = $customfields[$member['id']][$name];
 				}
 			}
 			$fields = 0;
-			foreach($changed as $name => $value)
+			foreach ($changed as $name => $value)
 			{
 				if ((string)$value == (string)$member[$name])
 				{
@@ -1410,7 +1410,7 @@ 
 			}
 			if ($fields)
 			{
-				if (!$this->check_perms(EGW_ACL_EDIT,$member) || !$this->save($member))
+				if (!$this->check_perms(EGW_ACL_EDIT, $member) || !$this->save($member))
 				{
 					++$failed_members;
 				}
@@ -1421,7 +1421,7 @@ 
 				}
 			}
 		}
-		return array($changed_members,$changed_fields,$failed_members);
+		return array($changed_members, $changed_fields, $failed_members);
 	}
 
 	/**
@@ -1448,12 +1448,12 @@ 
 			if ($contact['n_fileas']) return $contact['n_fileas'];
 			$type = null;
 		}
-		$title =  $this->fileas($contact,$type);
+		$title = $this->fileas($contact, $type);
 		if ($this->prefs['link_title_cf'] && $contact['#'.$this->prefs['link_title_cf']])
 		{
-			$title .= ' ' . $contact['#'.$this->prefs['link_title_cf']];
+			$title .= ' '.$contact['#'.$this->prefs['link_title_cf']];
 		}
-		return $title ;
+		return $title;
 	}
 
 	/**
@@ -1467,21 +1467,21 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($contacts =& $this->search(array('contact_id' => $ids),false)))
+		if (($contacts = & $this->search(array('contact_id' => $ids), false)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-			   	$titles[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+			   	$titles[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 			}
 		}
 		// we assume all not returned contacts are not readable for the user (as we report all deleted contacts to egw_link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -1508,23 +1508,23 @@ 
 		{
 			$criteria = is_array($pattern) ? $pattern['search'] : $pattern;
 		}
-		if($options['start'] || $options['num_rows'])
+		if ($options['start'] || $options['num_rows'])
 		{
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
-		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
+		if (($contacts = & parent::search($criteria, false, 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', $limit, $filter)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-				$result[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+				$result[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 				// make sure to return a correctly quoted rfc822 address, if requested
 				if ($options['type'] === 'email')
 				{
@@ -1565,7 +1565,7 @@ 
 		// let link query know, to append email to list
 		$options['type'] = 'email';
 
-		return $this->link_query($pattern,$options);
+		return $this->link_query($pattern, $options);
 	}
 
 	/**
@@ -1579,7 +1579,7 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach(!is_array($ids) ? array($ids) : $ids as $id)
+		foreach (!is_array($ids) ? array($ids) : $ids as $id)
 		{
 			if (!($contact = $this->read($id))) continue;
 
@@ -1602,12 +1602,12 @@ 
 	 * @param boolean $extra_title=true if true, use a short date only title and put the full title as extra_title (tooltip)
 	 * @return array
 	 */
-	function read_calendar($ids,$extra_title=true)
+	function read_calendar($ids, $extra_title = true)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
 
 		$uids = array();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (is_numeric($id)) $uids[] = 'c'.$id;
 		}
@@ -1622,15 +1622,15 @@ 
 
 		//_debug_array($events);
 		$calendars = array();
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				if ($uid[0] != 'c' || ($status == 'R' && !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected']))
 				{
 					continue;
 				}
-				$id = (int)substr($uid,1);
+				$id = (int)substr($uid, 1);
 
 				if ($event['start'] < $this->now_su)	// past event --> check for last event
 				{
@@ -1642,13 +1642,13 @@ 
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
 							'extra_args' => array(
-								'date' => date('Ymd',$event['start']),
+								'date' => date('Ymd', $event['start']),
 							),
 						);
 						if ($extra_title)
 						{
 							$link['extra_title'] = $link['title'];
-							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],$event['start']);
+							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $event['start']);
 						}
 						$calendars[$id]['last_link'] = $link;
 					}
@@ -1663,13 +1663,13 @@ 
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
 							'extra_args' => array(
-								'date' => date('Ymd',$event['start']),
+								'date' => date('Ymd', $event['start']),
 							),
 						);
 						if ($extra_title)
 						{
 							$link['extra_title'] = $link['title'];
-							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],$event['start']);
+							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $event['start']);
 						}
 						$calendars[$id]['next_link'] = $link;
 					}
@@ -1698,7 +1698,7 @@ 
 	{
 		// get all cats if you want to drop sub cats
 		$drop_subs = ($data['drop_subs'] && !$data['modify_subs']);
-		if($drop_subs)
+		if ($drop_subs)
 		{
 			$cats = new categories('', 'addressbook');
 			$cat_ids = $cats->return_all_children($data['cat_id']);
@@ -1709,14 +1709,14 @@ 
 		}
 
 		// Get addresses that use the category
-		@set_time_limit( 0 );
-		foreach($cat_ids as $cat_id)
+		@set_time_limit(0);
+		foreach ($cat_ids as $cat_id)
 		{
 			if (($ids = $this->search(array('cat_id' => $cat_id), false)))
 			{
-				foreach($ids as &$info)
+				foreach ($ids as &$info)
 				{
-					$info['cat_id'] = implode(',',array_diff(explode(',',$info['cat_id']), $cat_ids));
+					$info['cat_id'] = implode(',', array_diff(explode(',', $info['cat_id']), $cat_ids));
 					$this->save($info);
 				}
 			}
@@ -1735,7 +1735,7 @@ 
 	{
 		// just force a new registration of the addressbook hooks
 		include(EGW_INCLUDE_ROOT.'/addressbook/setup/setup.inc.php');
-		$GLOBALS['egw']->hooks->register_hooks('addressbook',$setup_info['addressbook']['hooks']);
+		$GLOBALS['egw']->hooks->register_hooks('addressbook', $setup_info['addressbook']['hooks']);
 	}
 
 	/**
@@ -1753,14 +1753,14 @@ 
 		$account = null;
 		$custom_fields = config::get_customfields('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach (parent::search(array('id'=>$ids), false) as $contact)	// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
-					return false;	// we dont deal with two accounts!
+					return false; // we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
@@ -1768,7 +1768,7 @@ 
 			// Add in custom fields
 			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
 
-			$pos = array_search($contact['id'],$ids);
+			$pos = array_search($contact['id'], $ids);
 			$contacts[$pos] = $contact;
 		}
 		if (!is_null($account))	// we found an account, so we merge the contacts into it
@@ -1781,38 +1781,38 @@ 
 			$target = $contacts[0];
 			unset($contacts[0]);
 		}
-		if (!$this->check_perms(EGW_ACL_EDIT,$target))
+		if (!$this->check_perms(EGW_ACL_EDIT, $target))
 		{
 			echo $this->error = 'No edit permission for the target contact!';
 			return 0;
 		}
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
 				if (!$value) continue;
 
-				switch($name)
+				switch ($name)
 				{
 					case 'id':
 					case 'tid':
 					case 'owner':
 					case 'private':
 					case 'etag';
-						break;	// ignored
+						break; // ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
-						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
+						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',', $target['cat_id']) : array();
+						$target['cat_id'] = array_unique(array_merge($target['cat_id'], is_array($value) ? $value : explode(',', $value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if ($name[0] == '#') {
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
-								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
+							if ($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
+								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',', $target[$name]) : array();
+								$target[$name] = implode(',', array_unique(array_merge($target[$name], is_array($value) ? $value : explode(',', $value))));
 							}
 						}
 						if (!$target[$name]) $target[$name] = $value;
@@ -1823,29 +1823,29 @@ 
 		if (!$this->save($target)) return 0;
 
 		$success = 1;
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			if (!$this->check_perms(EGW_ACL_DELETE,$contact))
+			if (!$this->check_perms(EGW_ACL_DELETE, $contact))
 			{
 				continue;
 			}
-			foreach(egw_link::get_links('addressbook',$contact['id']) as $data)
+			foreach (egw_link::get_links('addressbook', $contact['id']) as $data)
 			{
 				//_debug_array(array('function'=>__METHOD__,'line'=>__LINE__,'app'=>'addressbook','id'=>$contact['id'],'data:'=>$data,'target'=>$target['id']));
 				// info_from and info_link_id (main link)
-				$newlinkID = egw_link::link('addressbook',$target['id'],$data['app'],$data['id'],$data['remark'],$target['owner']);
+				$newlinkID = egw_link::link('addressbook', $target['id'], $data['app'], $data['id'], $data['remark'], $target['owner']);
 				//_debug_array(array('newLinkID'=>$newlinkID));
 				if ($newlinkID)
 				{
 					// update egw_infolog set info_link_id=$newlinkID where info_id=$data['id'] and info_link_id=$data['link_id']
-					if ($data['app']=='infolog')
+					if ($data['app'] == 'infolog')
 					{
-						$this->db->update('egw_infolog',array(
+						$this->db->update('egw_infolog', array(
 								'info_link_id' => $newlinkID
-							),array(
+							), array(
 								'info_id' => $data['id'],
 								'info_link_id' => $data['link_id']
-							),__LINE__,__FILE__,'infolog');
+							), __LINE__, __FILE__, 'infolog');
 					}
 					unset($newlinkID);
 				}
@@ -1870,14 +1870,14 @@ 
 	 * @param int $owner=null
 	 * @return boolean
 	 */
-	function check_list($list,$required,$owner=null)
+	function check_list($list, $required, $owner = null)
 	{
 		if ($list && ($list_data = $this->read_list($list)))
 		{
 			$owner = $list_data['list_owner'];
 		}
 		//error_log(__METHOD__."($list, $required, $owner) grants[$owner]=".$this->grants[$owner]." returning ".array2string(!!($this->grants[$owner] & $required)));
-		return !!($this->grants[$owner] & $required);
+		return !!($this->grants[$owner]&$required);
 	}
 
 	/**
@@ -1889,16 +1889,16 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
-		if (!$this->check_list(null,EGW_ACL_ADD|EGW_ACL_EDIT,$owner)) return false;
+		if (!$this->check_list(null, EGW_ACL_ADD|EGW_ACL_EDIT, $owner)) return false;
 
 		try {
-			$ret = parent::add_list($keys,$owner,$contacts,$data);
+			$ret = parent::add_list($keys, $owner, $contacts, $data);
 			if ($ret) unset(self::$list_cache[$ret]);
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
-		catch(egw_exception_db_invalid_sql $e) {
+		catch (egw_exception_db_invalid_sql $e) {
 			return false;
 		}
 		return $ret;
@@ -1912,13 +1912,13 @@ 
 	 * @param array $existing=null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
-		if (!$this->check_list($list,EGW_ACL_EDIT)) return false;
+		if (!$this->check_list($list, EGW_ACL_EDIT)) return false;
 
 		unset(self::$list_cache[$list]);
 
-		return parent::add2list($contact,$list,$existing);
+		return parent::add2list($contact, $list, $existing);
 	}
 
 	/**
@@ -1928,9 +1928,9 @@ 
 	 * @param int $list list-id
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
-		if ($list && !$this->check_list($list,EGW_ACL_EDIT)) return false;
+		if ($list && !$this->check_list($list, EGW_ACL_EDIT)) return false;
 
 		if ($list)
 		{
@@ -1941,7 +1941,7 @@ 
 			self::$list_cache = array();
 		}
 
-		return parent::remove_from_list($contact,$list);
+		return parent::remove_from_list($contact, $list);
 	}
 
 	/**
@@ -1952,9 +1952,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->check_list($list,EGW_ACL_DELETE)) return false;
+		if (!$this->check_list($list, EGW_ACL_DELETE)) return false;
 
-		foreach((array)$list as $l)
+		foreach ((array)$list as $l)
 		{
 			unset(self::$list_cache[$l]);
 		}
@@ -1990,7 +1990,7 @@ 
 	{
 		$code = $GLOBALS['egw']->country->country_code($country);
 
-		switch($code)
+		switch ($code)
 		{
 			case 'AU':
 			case 'CA':
@@ -2055,12 +2055,12 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $contact_id=null)
+	function find_or_add_categories($catname_list, $contact_id = null)
 	{
 		if ($contact_id && $contact_id > 0 && ($old_contact = $this->read($contact_id)))
 		{
 			// preserve categories without users read access
-			$old_categories = explode(',',$old_contact['cat_id']);
+			$old_categories = explode(',', $old_contact['cat_id']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -2114,15 +2114,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new categories($this->user,'addressbook');
+			$this->categories = new categories($this->user, 'addressbook');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(EGW_ACL_READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -2154,14 +2154,14 @@ 
 	 * @param boolean $relax=false if asked to relax, we only match against some key fields
 	 * @return array od matching contact_ids
 	 */
-	function find_contact($contact, $relax=false)
+	function find_contact($contact, $relax = false)
 	{
 		$empty_addr_one = $empty_addr_two = true;
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX': 'EXACT') . ')[ContactData]:'
+				. '('.($relax ? 'RELAX' : 'EXACT').')[ContactData]:'
 				. array2string($contact)
 				. "\n", 3, $this->logfile);
 		}
@@ -2172,7 +2172,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactID]: ' . $contact['id']
+					. '()[ContactID]: '.$contact['id']
 					. "\n", 3, $this->logfile);
 			}
 			// We only do a simple consistency check
@@ -2190,11 +2190,11 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactUID]: ' . $contact['uid']
+					. '()[ContactUID]: '.$contact['uid']
 					. "\n", 3, $this->logfile);
 			}
 			// Try the given UID first
-			$criteria = array ('contact_uid' => $contact['uid']);
+			$criteria = array('contact_uid' => $contact['uid']);
 			if (($foundContacts = parent::search($criteria)))
 			{
 				foreach ($foundContacts as $egwContact)
@@ -2279,7 +2279,7 @@ 
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 				. '()[Addressbook FIND Step 1]: '
-				. 'CRITERIA = ' . array2string($criteria)
+				. 'CRITERIA = '.array2string($criteria)
 				. "\n", 3, $this->logfile);
 		}
 
@@ -2308,7 +2308,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 2]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 
@@ -2332,7 +2332,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[Addressbook FIND Step 3]: '
-						. 'CRITERIA = ' . array2string($criteria)
+						. 'CRITERIA = '.array2string($criteria)
 						. "\n", 3, $this->logfile);
 				}
 
@@ -2358,7 +2358,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 4]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 			if (($foundContacts = parent::search($criteria, true, '', '', '', true)))
@@ -2372,7 +2372,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]: ' . array2string($matchingContacts)
+				. '()[FOUND]: '.array2string($matchingContacts)
 				. "\n", 3, $this->logfile);
 		}
 		return $matchingContacts;
@@ -2389,9 +2389,9 @@ 
 	 * @param int|array $owner=null 0=accounts, null=all addressbooks or integer account_id of user or group
 	 * @return string
 	 */
-	public function get_ctag($owner=null)
+	public function get_ctag($owner = null)
 	{
-		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
+		$filter = array('tid' => null); // tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
 		if (!is_null($owner)) $filter['owner'] = $owner;
 
@@ -2400,11 +2400,11 @@ 
 		{
 			$filter['account_id'] = null;
 		}
-		$result = $this->search(array(),'contact_modified','contact_modified DESC','','',false,'AND',array(0,1),$filter);
+		$result = $this->search(array(), 'contact_modified', 'contact_modified DESC', '', '', false, 'AND', array(0, 1), $filter);
 
 		if (!$result || !isset($result[0]['modified']))
 		{
-			$ctag = 'empty';	// ctag for empty addressbook
+			$ctag = 'empty'; // ctag for empty addressbook
 		}
 		else
 		{

Braces +259 added lines, -68 removed lines

@@ -285,7 +285,10 @@ 
 		);
 		//_debug_array($this->contact_fields);
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
-		if (!is_array($this->own_account_acl)) $this->own_account_acl = unserialize($this->own_account_acl);
+		if (!is_array($this->own_account_acl))
+		{
+			$this->own_account_acl = unserialize($this->own_account_acl);
+		}
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
 		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
 		{
@@ -294,7 +297,10 @@ 
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
 			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
-			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
+			if (!is_array($this->org_fields))
+			{
+				$this->org_fields = unserialize($this->org_fields);
+			}
 
 			// Set country code if country name is selected
 			$supported_fields = $this->get_fields('supported',null,0);
@@ -353,7 +359,10 @@ 
 		}
 
 		$addressbooks = $to_sort = array();
-		if ($extra_label) $addressbooks[''] = $extra_label;
+		if ($extra_label)
+		{
+			$addressbooks[''] = $extra_label;
+		}
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
 		foreach($grants as $uid => $rights)
@@ -408,10 +417,19 @@ 
 	 */
 	function fileas($contact,$type=null, $isUpdate=false)
 	{
-		if (is_null($type)) $type = $contact['fileas_type'];
-		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		if (is_null($type))
+		{
+			$type = $contact['fileas_type'];
+		}
+		if (!$type)
+		{
+			$type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		}
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type,'n_fn') !== false)
+		{
+			$contact['n_fn'] = $this->fullname($contact);
+		}
 
 		if($isUpdate)
 		{
@@ -421,7 +439,10 @@ 
 			{
 				if(!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if(is_null($old))
+					{
+						$old = $this->read($contact['id']);
+					}
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -464,7 +485,10 @@ 
 	 */
 	function fileas_type($contact,$file_as=null)
 	{
-		if (is_null($file_as)) $file_as = $contact['n_fileas'];
+		if (is_null($file_as))
+		{
+			$file_as = $contact['n_fileas'];
+		}
 
 		if ($file_as)
 		{
@@ -517,7 +541,10 @@ 
 		);
 		foreach($labels as $name => $label)
 		{
-			if ($contact[$name]) $labels[$name] = $contact[$name];
+			if ($contact[$name])
+			{
+				$labels[$name] = $contact[$name];
+			}
 		}
 		foreach($this->fileas_types as $fileas_type)
 		{
@@ -631,7 +658,11 @@ 
 				$fields_to_update = array();
 				foreach($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if($fields_exclude[$field_name] === true)
+					{
+						continue;
+					}
+					// dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -690,15 +721,21 @@ 
 	 */
 	function fullname($contact)
 	{
-		if (empty($contact['n_family']) && empty($contact['n_given'])) {
+		if (empty($contact['n_family']) && empty($contact['n_given']))
+		{
 			$cpart = array('org_name');
-		} else {
+		}
+		else
+		{
 			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
 		}
 		$parts = array();
 		foreach($cpart as $n)
 		{
-			if ($contact[$n]) $parts[] = $contact[$n];
+			if ($contact[$n])
+			{
+				$parts[] = $contact[$n];
+			}
 		}
 		return implode(' ',$parts);
 	}
@@ -809,7 +846,10 @@ 
 			$ok = false;
 			if ($this->check_perms(EGW_ACL_DELETE,$c,$deny_account_delete))
 			{
-				if (!($old = $this->read($id))) return false;
+				if (!($old = $this->read($id)))
+				{
+					return false;
+				}
 				// check if we only mark contacts as deleted, or really delete them
 				// already marked as deleted item and accounts are always really deleted
 				// we cant mark accounts as deleted, as no such thing exists for accounts!
@@ -817,8 +857,15 @@ 
 				{
 					$delete = $old;
 					$delete['tid'] = addressbook_so::DELETED_TYPE;
-					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
+					if ($check_etag)
+					{
+						$delete['etag'] = $check_etag;
+					}
+					if (($ok = $this->save($delete)))
+					{
+						$ok = true;
+					}
+					// we have to return true or false
 					egw_link::unlink(0,'addressbook',$id,'','','',true);
 				}
 				elseif (($ok = parent::delete($id,$check_etag)))
@@ -830,7 +877,10 @@ 
 				if ($ok && $old['tid'] != addressbook_so::DELETED_TYPE)
 				{
 					$GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $id, 'delete', time());
-					if (!isset($this->tracking)) $this->tracking = new addressbook_tracking($this);
+					if (!isset($this->tracking))
+					{
+						$this->tracking = new addressbook_tracking($this);
+					}
 					$this->tracking->track(array('id' => $id), array('id' => $id), null, true);
 				}
 			}
@@ -855,13 +905,16 @@ 
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
 		{
-			if (!isset($contact['owner']) || !isset($contact['private']))	// owner/private not set on update, eg. SyncML
+			if (!isset($contact['owner']) || !isset($contact['private']))
+			{
+				// owner/private not set on update, eg. SyncML
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
 					if(!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
+			}
 					}
 					if(!isset($contact['private']))
 					{
@@ -877,18 +930,33 @@ 
 		else
 		{
 			// if no owner/addressbook set use the setting of the add_default prefs (if set, otherwise the users personal addressbook)
-			if (!isset($contact['owner'])) $contact['owner'] = $this->default_addressbook;
-			if (!isset($contact['private'])) $contact['private'] = (int)$this->default_private;
+			if (!isset($contact['owner']))
+			{
+				$contact['owner'] = $this->default_addressbook;
+			}
+			if (!isset($contact['private']))
+			{
+				$contact['private'] = (int)$this->default_private;
+			}
 			// do NOT allow to create new accounts via addressbook, they are broken without an account_id
 			if (!$contact['owner'] && empty($contact['account_id']))
 			{
 				$contact['owner'] = $this->default_addressbook ? $this->default_addressbook : $this->user;
 			}
 			// allow admins to import contacts with creator / created date set
-			if (!$contact['creator'] || !$this->is_admin($contact)) $contact['creator'] = $this->user;
-			if (!$contact['created'] || !$this->is_admin($contact)) $contact['created'] = $this->now_su;
+			if (!$contact['creator'] || !$this->is_admin($contact))
+			{
+				$contact['creator'] = $this->user;
+			}
+			if (!$contact['created'] || !$this->is_admin($contact))
+			{
+				$contact['created'] = $this->now_su;
+			}
 
-			if (!$contact['tid']) $contact['tid'] = 'n';
+			if (!$contact['tid'])
+			{
+				$contact['tid'] = 'n';
+			}
 		}
 		// ensure accounts and group addressbooks are never private!
 		if ($contact['owner'] <= 0)
@@ -912,7 +980,8 @@ 
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
+		foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+		{
 			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = $GLOBALS['egw']->country->country_code($contact[$c_prefix.'countryname']))
 			{
@@ -939,7 +1008,10 @@ 
 		{
 			$contact['n_fn'] = $this->fullname($contact);
 		}
-		if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact, null, false);
+		if (isset($contact['org_name']))
+		{
+			$contact['n_fileas'] = $this->fileas($contact, null, false);
+		}
 
 		// Get old record for tracking changes
 		if (!isset($old) && $isUpdate)
@@ -1016,7 +1088,10 @@ 
 			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == addressbook_so::DELETED_TYPE || $contact['tid'] == addressbook_so::DELETED_TYPE);
-				if (!isset($this->tracking)) $this->tracking = new addressbook_tracking($this);
+				if (!isset($this->tracking))
+				{
+					$this->tracking = new addressbook_tracking($this);
+				}
 				$this->tracking->track($to_write, $old ? $old : null, null, $deleted);
 			}
 		}
@@ -1098,10 +1173,12 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if($data['adr_one_countrycode'] != null)
+			{
 				$data['adr_one_countryname'] = $GLOBALS['egw']->country->get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if($data['adr_two_countrycode'] != null)
+			{
 				$data['adr_two_countryname'] = $GLOBALS['egw']->country->get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1127,7 +1204,10 @@ 
 	 */
 	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1194,8 +1274,14 @@ 
 	 */
 	function read_org($org_id)
 	{
-		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (!$org_id)
+		{
+			return false;
+		}
+		if (strpos($org_id,'*AND*')!== false)
+		{
+			$org_id = str_replace('*AND*','&',$org_id);
+		}
 		$org = array();
 		foreach(explode('|||',$org_id) as $part)
 		{
@@ -1225,7 +1311,10 @@ 
 		}
 		// read the regular fields
 		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
-		if (!$contacts) return false;
+		if (!$contacts)
+		{
+			return false;
+		}
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
@@ -1273,7 +1362,10 @@ 
 		}
 		foreach($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name,$this->org_fields))
+			{
+				continue;
+			}
 
 			arsort($values,SORT_NUMERIC);
 			list($value,$num) = each($values);
@@ -1344,16 +1436,25 @@ 
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
 		{
-			if (!empty($from[$code])) $from[$name] = '';
-			if (!empty($to[$code])) $to[$name] = '';
+			if (!empty($from[$code]))
+			{
+				$from[$name] = '';
+			}
+			if (!empty($to[$code]))
+			{
+				$to[$name] = '';
+			}
 		}
 		$changed = array();
 		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name,array('modified','modifier')))
+			{
+				// never count these
 			{
 				continue;
 			}
+			}
 			if ((string) $from[$name] != (string) $to[$name])
 			{
 				$changed[$name] = $from[$name];
@@ -1373,13 +1474,19 @@ 
 	 */
 	function change_org($org_name,$from,$to,$members=null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from,$to,true)))
+		{
+			return false;
+		}
 
 		if (is_null($members) || !is_array($members))
 		{
 			$members = $this->org_similar($org_name,$changed);
 		}
-		if (!$members) return false;
+		if (!$members)
+		{
+			return false;
+		}
 
 		$ids = array();
 		foreach($members as $member)
@@ -1445,7 +1552,10 @@ 
 		$type = $this->prefs['link_title'];
 		if (!$type || $type === 'n_fileas')
 		{
-			if ($contact['n_fileas']) return $contact['n_fileas'];
+			if ($contact['n_fileas'])
+			{
+				return $contact['n_fileas'];
+			}
 			$type = null;
 		}
 		$title =  $this->fileas($contact,$type);
@@ -1513,7 +1623,10 @@ 
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
-		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
+		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+		{
+			$filter['account_id'] = null;
+		}
 		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
 		{
 			$ids = array();
@@ -1576,12 +1689,18 @@ 
 	 */
 	function calendar_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach(!is_array($ids) ? array($ids) : $ids as $id)
 		{
-			if (!($contact = $this->read($id))) continue;
+			if (!($contact = $this->read($id)))
+			{
+				continue;
+			}
 
 			$data[] = array(
 				'res_id' => $id,
@@ -1604,21 +1723,33 @@ 
 	 */
 	function read_calendar($ids,$extra_title=true)
 	{
-		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
+		if (!$GLOBALS['egw_info']['user']['apps']['calendar'])
+		{
+			return array();
+		}
 
 		$uids = array();
 		foreach($ids as $id)
 		{
-			if (is_numeric($id)) $uids[] = 'c'.$id;
+			if (is_numeric($id))
+			{
+				$uids[] = 'c'.$id;
+			}
+		}
+		if (!$uids)
+		{
+			return array();
 		}
-		if (!$uids) return array();
 
 		$bocal = new calendar_bo();
 		$events = $bocal->search(array(
 			'users' => $uids,
 			'enum_recuring' => true,
 		));
-		if (!$events) return array();
+		if (!$events)
+		{
+			return array();
+		}
 
 		//_debug_array($events);
 		$calendars = array();
@@ -1632,11 +1763,14 @@ 
 				}
 				$id = (int)substr($uid,1);
 
-				if ($event['start'] < $this->now_su)	// past event --> check for last event
+				if ($event['start'] < $this->now_su)
+				{
+					// past event --> check for last event
 				{
 					if (!isset($calendars[$id]['last_event']) || $event['start'] > $calendars[$id]['last_event'])
 					{
 						$calendars[$id]['last_event'] = $event['start'];
+				}
 						$link = array(
 							'id' => $event['id'],
 							'app' => 'calendar',
@@ -1753,27 +1887,36 @@ 
 		$account = null;
 		$custom_fields = config::get_customfields('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach(parent::search(array('id'=>$ids),false) as $contact)
+		{
+			// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
+		}
 					return false;	// we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
 			}
 			// Add in custom fields
-			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			if (is_array($custom_field_list[$contact['id']]))
+			{
+				$contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			}
 
 			$pos = array_search($contact['id'],$ids);
 			$contacts[$pos] = $contact;
 		}
-		if (!is_null($account))	// we found an account, so we merge the contacts into it
+		if (!is_null($account))
+		{
+			// we found an account, so we merge the contacts into it
 		{
 			$target = $account;
+		}
 			unset($account);
 		}
 		else					// we found no account, so we merge all but the first into the first
@@ -1790,7 +1933,10 @@ 
 		{
 			foreach($contact as $name => $value)
 			{
-				if (!$value) continue;
+				if (!$value)
+				{
+					continue;
+				}
 
 				switch($name)
 				{
@@ -1802,25 +1948,39 @@ 
 						break;	// ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						if (!is_array($target['cat_id']))
+						{
+							$target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						}
 						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if($name[0] == '#')
+						{
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1)
+							{
+								if (!is_array($target[$name]))
+								{
+									$target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+								}
 								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
 							}
 						}
-						if (!$target[$name]) $target[$name] = $value;
+						if (!$target[$name])
+						{
+							$target[$name] = $value;
+						}
 						break;
 				}
 			}
 		}
-		if (!$this->save($target)) return 0;
+		if (!$this->save($target))
+		{
+			return 0;
+		}
 
 		$success = 1;
 		foreach($contacts as $contact)
@@ -1850,7 +2010,10 @@ 
 					unset($newlinkID);
 				}
 			}
-			if ($this->delete($contact['id'])) $success++;
+			if ($this->delete($contact['id']))
+			{
+				$success++;
+			}
 		}
 		return $success;
 	}
@@ -1891,11 +2054,17 @@ 
 	 */
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
-		if (!$this->check_list(null,EGW_ACL_ADD|EGW_ACL_EDIT,$owner)) return false;
+		if (!$this->check_list(null,EGW_ACL_ADD|EGW_ACL_EDIT,$owner))
+		{
+			return false;
+		}
 
 		try {
 			$ret = parent::add_list($keys,$owner,$contacts,$data);
-			if ($ret) unset(self::$list_cache[$ret]);
+			if ($ret)
+			{
+				unset(self::$list_cache[$ret]);
+			}
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
 		catch(egw_exception_db_invalid_sql $e) {
@@ -1914,7 +2083,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!$this->check_list($list,EGW_ACL_EDIT)) return false;
+		if (!$this->check_list($list,EGW_ACL_EDIT))
+		{
+			return false;
+		}
 
 		unset(self::$list_cache[$list]);
 
@@ -1930,7 +2102,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if ($list && !$this->check_list($list,EGW_ACL_EDIT)) return false;
+		if ($list && !$this->check_list($list,EGW_ACL_EDIT))
+		{
+			return false;
+		}
 
 		if ($list)
 		{
@@ -1952,7 +2127,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->check_list($list,EGW_ACL_DELETE)) return false;
+		if (!$this->check_list($list,EGW_ACL_DELETE))
+		{
+			return false;
+		}
 
 		foreach((array)$list as $l)
 		{
@@ -1970,7 +2148,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (isset(self::$list_cache[$list])) return self::$list_cache[$list];
+		if (isset(self::$list_cache[$list]))
+		{
+			return self::$list_cache[$list];
+		}
 
 		return self::$list_cache[$list] = parent::read_list($list);
 	}
@@ -2228,7 +2409,10 @@ 
 
 		foreach ($columns_to_search as $field)
 		{
-			if ($relax && in_array($field, $tolerance_fields)) continue;
+			if ($relax && in_array($field, $tolerance_fields))
+			{
+				continue;
+			}
 
 			if (empty($contact[$field]))
 			{
@@ -2293,7 +2477,10 @@ 
 		}
 
 		// No need for more searches for relaxed matching
-		if ($relax || count($matchingContacts)) return $matchingContacts;
+		if ($relax || count($matchingContacts))
+		{
+			return $matchingContacts;
+		}
 
 
 		if (!$empty_addr_one && $empty_addr_two)
@@ -2346,7 +2533,8 @@ 
 			}
 		}
 		elseif (!$empty_addr_one && !$empty_addr_two)
-		{ // try again after address swap
+		{
+// try again after address swap
 
 			foreach ($addr_one_fields as $key => $field)
 			{
@@ -2393,7 +2581,10 @@ 
 	{
 		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
-		if (!is_null($owner)) $filter['owner'] = $owner;
+		if (!is_null($owner))
+		{
+			$filter['owner'] = $owner;
+		}
 
 		// should we hide the accounts addressbook
 		if (!$owner && $GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])

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

@@ -1500,7 +1500,7 @@ 
 	 * @param array $options Array of options for the search
 	 * @return array with id - title pairs of the matching entries
 	 */
-	function link_query($pattern, Array &$options = array())
+	function link_query($pattern, array &$options = array())
 	{
 		$result = $criteria = array();
 		$limit = false;
@@ -1553,7 +1553,7 @@ 
 	 * @param array $options
 	 * @return Ambigous <multitype:, string, multitype:Ambigous <multitype:, string> string >
 	 */
-	function link_query_email($pattern, Array &$options = array())
+	function link_query_email($pattern, array &$options = array())
 	{
 		if (isset($options['filter']) && !is_array($options['filter']))
 		{

addressbook/inc/class.addressbook_groupdav.inc.php

Doc Comments +7 added lines, -14 removed lines

@@ -104,8 +104,7 @@ 
 	 * @param array &$options
 	 * @param array &$files
 	 * @param int $user account_id
-	 * @param string $id=''
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function propfind($path,&$options,&$files,$user,$id='')
 	{
@@ -186,7 +185,6 @@ 
 	 *
 	 * @param string $path
 	 * @param array& $filter
-	 * @param array|boolean $start=false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true)
@@ -535,8 +533,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -559,9 +556,8 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id of owner, default null
-	 * @param string $prefix=null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @param string $prefix user prefix from path (eg. /ralf from /ralf/addressbook)
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
@@ -828,10 +824,8 @@ 
 	 * </D:supported-report-set>
 	 * @link http://www.mail-archive.com/calendarserver-users@lists.macosforge.org/msg01156.html
 	 *
-	 * @param array $props=array() regular props by the groupdav handler
 	 * @param string $displayname
-	 * @param string $base_uri=null base url of handler
-	 * @param int $user=null account_id of owner of collection
+	 * @param string $base_uri base url of handler
 	 * @return array
 	 */
 	public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null)
@@ -944,7 +938,6 @@ 
 	 * the same UID and/or carddav_name as not deleted contacts and would block access to valid entries
 	 *
 	 * @param string|int $id
-	 * @param string $path=null
 	 * @return array|boolean array with entry, false if no read rights, null if $id does not exist
 	 */
 	function read($id, $path=null)
@@ -1013,7 +1006,7 @@ 
 	 *
 	 * @param int $acl EGW_ACL_READ, EGW_ACL_EDIT or EGW_ACL_DELETE
 	 * @param array|int $contact contact-array or id
-	 * @return boolean null if entry does not exist, false if no access, true if access permitted
+	 * @return null|boolean null if entry does not exist, false if no access, true if access permitted
 	 */
 	function check_access($acl,$contact)
 	{
@@ -1042,7 +1035,7 @@ 
 	/**
 	 * Return calendars/addressbooks shared from other users with the current one
 	 *
-	 * @param boolean $ignore_all_in_one=false if true, return selected addressbooks and not array() for all-in-one
+	 * @param boolean $ignore_all_in_one if true, return selected addressbooks and not array() for all-in-one
 	 * @return array account_id => account_lid pairs
 	 */
 	function get_shared($ignore_all_in_one=false)

Spacing +121 added lines, -122 removed lines

@@ -75,7 +75,7 @@ 
 		// LDAP does NOT have a carddav_name attribute --> stick with id mapped to LDAP attribute uid
 		if (version_compare($GLOBALS['egw_info']['apps']['phpgwapi']['version'], '1.9.007', '<') ||
 			$this->bo->contact_repository != 'sql' ||
-			$this->bo->account_repository != 'sql' && strpos($_SERVER['REQUEST_URI'].'/','/addressbook-accounts/') !== false)
+			$this->bo->account_repository != 'sql' && strpos($_SERVER['REQUEST_URI'].'/', '/addressbook-accounts/') !== false)
 		{
 			groupdav_handler::$path_extension = '.vcf';
 		}
@@ -87,11 +87,11 @@ 
 		if ($this->debug) error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
 
 		$this->home_set_pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		$this->home_set_pref = $this->home_set_pref ? explode(',',$this->home_set_pref) : array();
+		$this->home_set_pref = $this->home_set_pref ? explode(',', $this->home_set_pref) : array();
 
 		// silently switch "Sync all into one" preference on for OS X addressbook, as it only supports one AB
 		// this restores behavior before Lion (10.7), where AB synced all ABs contained in addressbook-home-set
-		if (substr(self::get_agent(),0,9) == 'cfnetwork' && !in_array('O',$this->home_set_pref))
+		if (substr(self::get_agent(), 0, 9) == 'cfnetwork' && !in_array('O', $this->home_set_pref))
 		{
 			$this->home_set_pref[] = 'O';
 		}
@@ -107,13 +107,13 @@ 
 	 * @param string $id=''
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		$filter = array();
 		// If "Sync selected addressbooks into one" is set
-		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O',$this->home_set_pref))
+		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O', $this->home_set_pref))
 		{
-			$filter['owner'] = array_keys($this->get_shared(true));	// true: ignore all-in-one pref
+			$filter['owner'] = array_keys($this->get_shared(true)); // true: ignore all-in-one pref
 			$filter['owner'][] = $user;
 		}
 		// show addressbook of a single user?
@@ -125,11 +125,11 @@ 
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
 
 		// process REPORT filters or multiget href's
-		if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id, $nresults))
+		if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options, $filter, $id, $nresults))
 		{
 			return false;
 		}
-		if ($id) $path = dirname($path).'/';	// carddav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // carddav_name get's added anyway in the callback
 
 		if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
 
@@ -137,7 +137,7 @@ 
 		if (!($filter['address_data'] = $options['props'] == 'all' &&
 			$options['root']['ns'] == groupdav::CARDDAV) && is_array($options['props']))
 		{
-			foreach($options['props'] as $prop)
+			foreach ($options['props'] as $prop)
 			{
 				if ($prop['name'] == 'address-data')
 				{
@@ -156,7 +156,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'contact_modified ASC';	// return oldest modifications first
+			$filter['order'] = 'contact_modified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 		}
 
@@ -170,13 +170,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new groupdav_propfind_iterator($this,$path,$filter,$files['files']);
+			$files['files'] = new groupdav_propfind_iterator($this, $path, $filter, $files['files']);
 		}
 		return true;
 	}
@@ -189,7 +189,7 @@ 
 	 * @param array|boolean $start=false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true)
+	function &propfind_callback($path, array &$filter, $start = false, $report_not_found_multiget_ids = true)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($filter).", ".array2string($start).", $report_not_found_multiget_ids)");
 		$starttime = microtime(true);
@@ -217,18 +217,18 @@ 
 		if (isset($filter[self::$path_attr]))
 		{
 			if (!is_array($filter[self::$path_attr])) $filter[self::$path_attr] = (array)$filter[self::$path_attr];
-			$requested_multiget_ids =& $filter[self::$path_attr];
+			$requested_multiget_ids = & $filter[self::$path_attr];
 		}
 
 		$files = array();
 		// we query etag and modified, as LDAP does not have the strong sql etag
-		$cols = array('id','uid','etag','modified','n_fn');
-		if (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr;
+		$cols = array('id', 'uid', 'etag', 'modified', 'n_fn');
+		if (!in_array(self::$path_attr, $cols)) $cols[] = self::$path_attr;
 		// we need tid for sync-collection report
 		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols)) $cols[] = 'tid';
-		if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter)))
+		if (($contacts = & $this->bo->search(array(), $cols, $order, '', '', False, 'AND', $start, $filter)))
 		{
-			foreach($contacts as &$contact)
+			foreach ($contacts as &$contact)
 			{
 				// remove contact from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($contact[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -248,9 +248,9 @@ 
 				);
 				if ($address_data)
 				{
-					$content = $handler->getVCard($contact['id'],$this->charset,false);
+					$content = $handler->getVCard($contact['id'], $this->charset, false);
 					$props['getcontentlength'] = bytes($content);
-					$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'address-data',$content,true);
+					$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'address-data', $content, true);
 				}
 				$files[] = $this->add_resource($path, $contact, $props);
 			}
@@ -281,10 +281,10 @@ 
 				}
 			}
 			// add groups after contacts, but only if enabled and NOT for '/addressbook/' (!isset($filter['owner'])
-			if (in_array('D',$this->home_set_pref) && (string)$filter['owner'] !== '0')
+			if (in_array('D', $this->home_set_pref) && (string)$filter['owner'] !== '0')
 			{
 				$where = array(
-					'list_owner' => isset($filter['owner'])?$filter['owner']:array_keys($this->bo->grants)
+					'list_owner' => isset($filter['owner']) ? $filter['owner'] : array_keys($this->bo->grants)
 				);
 				// add sync-token to support sync-collection report
 				if ($sync_collection_report)
@@ -297,20 +297,20 @@ 
 					$where['list_'.self::$path_attr] = $filter[self::$path_attr];
 				}
 				//error_log(__METHOD__."() filter=".array2string($filter).", do_groups=".in_array('D',$this->home_set_pref).", where=".array2string($where));
-				if (($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))	// limit to contacts in same AB!
+				if (($lists = $this->bo->read_lists($where, 'contact_uid', $where['list_owner'])))	// limit to contacts in same AB!
 				{
-					foreach($lists as $list)
+					foreach ($lists as $list)
 					{
 						$list[self::$path_attr] = $list['list_carddav_name'];
 						$etag = $list['list_id'].':'.$list['list_etag'];
 						// for all-in-one addressbook, add selected ABs to etag
 						if (isset($filter['owner']) && is_array($filter['owner']))
 						{
-							$etag .= ':'.implode('-',$filter['owner']);
+							$etag .= ':'.implode('-', $filter['owner']);
 						}
 						$props = array(
 							'getcontenttype' => HTTP_WebDAV_Server::mkprop('getcontenttype', 'text/vcard'),
-							'getlastmodified' => egw_time::to($list['list_modified'],'ts'),
+							'getlastmodified' => egw_time::to($list['list_modified'], 'ts'),
 							'displayname' => $list['list_name'],
 							'getetag' => '"'.$etag.'"',
 						);
@@ -318,7 +318,7 @@ 
 						{
 							$content = $handler->getGroupVCard($list);
 							$props['getcontentlength'] = bytes($content);
-							$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'address-data',$content,true);
+							$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'address-data', $content, true);
 						}
 						$files[] = $this->add_resource($path, $list, $props);
 
@@ -328,7 +328,7 @@ 
 							unset($requested_multiget_ids[$k]);
 						}
 
-						if ($sync_collection_report && $this->sync_collection_token < ($ts=$GLOBALS['egw']->db->from_timestamp($list['list_modified'])))
+						if ($sync_collection_report && $this->sync_collection_token < ($ts = $GLOBALS['egw']->db->from_timestamp($list['list_modified'])))
 						{
 							$this->sync_collection_token = $ts;
 						}
@@ -338,7 +338,7 @@ 
 			// report not found multiget urls
 			if ($report_not_found_multiget_ids && $requested_multiget_ids)
 			{
-				foreach($requested_multiget_ids as $id)
+				foreach ($requested_multiget_ids as $id)
 				{
 					$files[] = array('path' => $path.$id.self::$path_extension);
 				}
@@ -358,7 +358,7 @@ 
 	 * @param int &$nresult on return limit for number or results or unchanged/null
 	 * @return boolean true if filter could be processed
 	 */
-	function _report_filters($options,&$filters,$id, &$nresults)
+	function _report_filters($options, &$filters, $id, &$nresults)
 	{
 		if ($options['filters'])
 		{
@@ -382,17 +382,17 @@ 
 				$options['filters']['attrs']['test'] : 'anyof';
 			$prop_filters = array();
 
-			foreach($options['filters'] as $n => $filter)
+			foreach ($options['filters'] as $n => $filter)
 			{
-				if (!is_int($n)) continue;	// eg. attributes of filter xml element
+				if (!is_int($n)) continue; // eg. attributes of filter xml element
 
-				switch((string)$filter['name'])
+				switch ((string)$filter['name'])
 				{
 					case 'param-filter':
 						$this->groupdav->log(__METHOD__."(...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'prop-filter':	// can be multiple prop-filter, see example
-						if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						if ($matches) $prop_filters[] = implode($prop_test == 'allof' ? ' AND ' : ' OR ', $matches);
 						$matches = array();
 						$prop_filter = strtoupper($filter['attrs']['name']);
 						$prop_test = isset($filter['attrs']['test']) ? $filter['attrs']['test'] : 'anyof';
@@ -405,11 +405,11 @@ 
 						if (!isset($this->filter_prop2cal[$prop_filter]))	// eg. not existing NICKNAME in EGroupware
 						{
 							if ($this->debug || $prop_filter != 'NICKNAME') error_log(__METHOD__."(...) text-match: $prop_filter {$filter['attrs']['match-type']} '{$filter['data']}' unknown property '$prop_filter' --> ignored");
-							$column = false;	// to ignore following data too
+							$column = false; // to ignore following data too
 						}
 						else
 						{
-							switch($filter['attrs']['collation'])	// todo: which other collations allowed, we are allways unicode
+							switch ($filter['attrs']['collation'])	// todo: which other collations allowed, we are allways unicode
 							{
 								case 'i;unicode-casemap':
 								default:
@@ -429,20 +429,20 @@ 
 							if ($column)	// false for properties not known to EGroupware
 							{
 								$value = str_replace(array('%', '_'), array('\\%', '\\_'), $filter['data']);
-								switch($match_type)
+								switch ($match_type)
 								{
 									case 'equals':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote($value);
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote($value);
 										break;
 									default:
 									case 'contains':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote('%'.$value.'%');
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote('%'.$value.'%');
 										break;
 									case 'starts-with':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote($value.'%');
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote($value.'%');
 										break;
 									case 'ends-with':
-										$sql_filter = $column . $comp . $GLOBALS['egw']->db->quote('%'.$value);
+										$sql_filter = $column.$comp.$GLOBALS['egw']->db->quote('%'.$value);
 										break;
 								}
 								$matches[] = ($negate_condition ? 'NOT ' : '').$sql_filter;
@@ -458,10 +458,10 @@ 
 						break;
 				}
 			}
-			if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			if ($matches) $prop_filters[] = implode($prop_test == 'allof' ? ' AND ' : ' OR ', $matches);
 			if ($prop_filters)
 			{
-				$filters[] = $filter = '(('.implode($filter_test=='allof'?') AND (':') OR (', $prop_filters).'))';
+				$filters[] = $filter = '(('.implode($filter_test == 'allof' ? ') AND (' : ') OR (', $prop_filters).'))';
 				if ($this->debug) error_log(__METHOD__."($path,...) sql-filter: $filter");
 			}
 		}
@@ -471,9 +471,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -482,7 +482,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -490,7 +490,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$filters[] = 'contact_modified>'.(int)$sync_token;
-						$filters['tid'] = null;	// to return deleted entries too
+						$filters['tid'] = null; // to return deleted entries too
 					}
 					break;
 				case 'sync-level':
@@ -508,23 +508,23 @@ 
 		if ($options['root']['name'] == 'addressbook-multiget')
 		{
 			$ids = array();
-			foreach($options['other'] as $option)
+			foreach ($options['other'] as $option)
 			{
 				if ($option['name'] == 'href')
 				{
-					$parts = explode('/',$option['data']);
+					$parts = explode('/', $option['data']);
 					if (($id = urldecode(array_pop($parts))))
 					{
-						$ids[] = groupdav_handler::$path_extension ? basename($id,groupdav_handler::$path_extension) : $id;
+						$ids[] = groupdav_handler::$path_extension ? basename($id, groupdav_handler::$path_extension) : $id;
 					}
 				}
 			}
 			if ($ids) $filters[self::$path_attr] = $ids;
-			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',', $ids));
 		}
 		elseif ($id)
 		{
-			$filters[self::$path_attr] = groupdav_handler::$path_extension ? basename($id,groupdav_handler::$path_extension) : $id;
+			$filters[self::$path_attr] = groupdav_handler::$path_extension ? basename($id, groupdav_handler::$path_extension) : $id;
 		}
 		//error_log(__METHOD__."() options[other]=".array2string($options['other'])." --> filters=".array2string($filters));
 		return true;
@@ -538,15 +538,14 @@ 
 	 * @param int $user=null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		if (!is_array($contact = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($contact = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $contact;
 		}
 		$handler = self::_get_handler();
-		$options['data'] = $contact['list_id'] ? $handler->getGroupVCard($contact) :
-			$handler->getVCard($contact['id'],$this->charset,false);
+		$options['data'] = $contact['list_id'] ? $handler->getGroupVCard($contact) : $handler->getVCard($contact['id'], $this->charset, false);
 		// e.g. Evolution does not understand 'text/vcard'
 		$options['mimetype'] = 'text/x-vcard; charset='.$this->charset;
 		header('Content-Encoding: identity');
@@ -563,11 +562,11 @@ 
 	 * @param string $prefix=null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).",$id,$user)");
 
-		$oldContact = $this->_common_get_put_delete('PUT',$options,$id);
+		$oldContact = $this->_common_get_put_delete('PUT', $options, $id);
 		if (!is_null($oldContact) && !is_array($oldContact))
 		{
 			if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
@@ -592,7 +591,7 @@ 
 					switch (strtolower($key))
 					{
 						case 'charset':
-							$charset = strtoupper(substr($value,1,-1));
+							$charset = strtoupper(substr($value, 1, -1));
 					}
 				}
 			}
@@ -619,7 +618,7 @@ 
 
 		if (!$is_group && is_array($contact['cat_id']))
 		{
-			$contact['cat_id'] = implode(',',$this->bo->find_or_add_categories($contact['cat_id'], $contactId));
+			$contact['cat_id'] = implode(',', $this->bo->find_or_add_categories($contact['cat_id'], $contactId));
 		}
 		elseif ($contactId > 0)
 		{
@@ -643,12 +642,12 @@ 
 			$contact['carddav_name'] = $id;
 
 			// only set owner, if user is explicitly specified in URL (check via prefix, NOT for /addressbook/) or sync-all-in-one!)
-			if ($prefix && !in_array('O',$this->home_set_pref) && $user)
+			if ($prefix && !in_array('O', $this->home_set_pref) && $user)
 			{
 				$contact['owner'] = $user;
 			}
 			// check if default addressbook is synced and not accounts, if not use (always synced) personal addressbook
-			elseif(!$this->bo->default_addressbook || !in_array($this->bo->default_addressbook,$this->home_set_pref))
+			elseif (!$this->bo->default_addressbook || !in_array($this->bo->default_addressbook, $this->home_set_pref))
 			{
 				$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
@@ -659,7 +658,7 @@ 
 			}
 			// check if user has add rights for addressbook
 			// done here again, as _common_get_put_delete knows nothing about default addressbooks...
-			if (!($this->bo->grants[$contact['owner']] & EGW_ACL_ADD))
+			if (!($this->bo->grants[$contact['owner']]&EGW_ACL_ADD))
 			{
 				if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
 				return '403 Forbidden';
@@ -676,7 +675,7 @@ 
 				$this->check_return_representation($options, $id, $user);
 				return '412 Precondition Failed';
 			}
-			return '403 Forbidden';	// happens when writing new entries in AB's without ADD rights
+			return '403 Forbidden'; // happens when writing new entries in AB's without ADD rights
 		}
 
 		if (empty($contact['etag']) || empty($contact['cardav_name']))
@@ -709,16 +708,16 @@ 
 	 * @param array|false $oldContact
 	 * @return int|boolean $list_id or false on error
 	 */
-	function save_group(array &$contact, $oldContact=null)
+	function save_group(array &$contact, $oldContact = null)
 	{
 		$data = array('list_name' => $contact['n_fn']);
 		if (!isset($contact['owner'])) $contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
-		foreach(array('id','carddav_name','uid','owner') as $name)
+		foreach (array('id', 'carddav_name', 'uid', 'owner') as $name)
 		{
 			$data['list_'.$name] = $contact[$name];
 		}
 		//error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') data='.array2string($data));
-		if (($list_id=$this->bo->add_list(array('list_'.self::$path_attr => $contact[self::$path_attr]),
+		if (($list_id = $this->bo->add_list(array('list_'.self::$path_attr => $contact[self::$path_attr]),
 			$contact['owner'], null, $data)))
 		{
 			// update members given in $contact['##X-ADDRESSBOOKSERVER-MEMBER']
@@ -731,12 +730,12 @@ 
 			{
 				$new_members = array($new_members);
 			}
-			foreach($new_members as &$uid) $uid = substr($uid,9);	// cut off "urn:uuid:" prefix
+			foreach ($new_members as &$uid) $uid = substr($uid, 9); // cut off "urn:uuid:" prefix
 
 			if ($oldContact)
 			{
-				$to_add = array_diff($new_members,$oldContact['members']);
-				$to_delete = array_diff($oldContact['members'],$new_members);
+				$to_add = array_diff($new_members, $oldContact['members']);
+				$to_delete = array_diff($oldContact['members'], $new_members);
 			}
 			else
 			{
@@ -747,9 +746,9 @@ 
 			{
 				$to_add_ids = $to_delete_ids = array();
 				$filter = array('uid' => $to_delete ? array_merge($to_add, $to_delete) : $to_add);
-				if (($contacts =& $this->bo->search(array(), array('id', 'uid'),'','','',False,'AND',false,$filter)))
+				if (($contacts = & $this->bo->search(array(), array('id', 'uid'), '', '', '', False, 'AND', false, $filter)))
 				{
-					foreach($contacts as $c)
+					foreach ($contacts as $c)
 					{
 						if ($to_delete && in_array($c['uid'], $to_delete))
 						{
@@ -779,9 +778,9 @@ 
 	 * @param int $user
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
-		static $ctags = array();	// a little per request caching, in case ctag and sync-token is both requested
+		static $ctags = array(); // a little per request caching, in case ctag and sync-token is both requested
 		if (isset($ctags[$path])) return $ctags[$path];
 
 		$user_in = $user;
@@ -789,9 +788,9 @@ 
 		if (is_null($user) || $user === '' || $path == '/addressbook/') $user = null;
 
 		// If "Sync selected addressbooks into one" is set --> ctag need to take selected AB's into account too
-		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O',$this->home_set_pref))
+		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O', $this->home_set_pref))
 		{
-			$user = array_merge((array)$user,array_keys($this->get_shared(true)));	// true: ignore all-in-one pref
+			$user = array_merge((array)$user, array_keys($this->get_shared(true))); // true: ignore all-in-one pref
 
 			// include accounts ctag, if accounts stored different from contacts (eg.in LDAP or ADS)
 			if ($this->bo->so_accounts && in_array('0', $user))
@@ -802,7 +801,7 @@ 
 		$ctag = $this->bo->get_ctag($user);
 
 		// include lists-ctag, if enabled
-		if (in_array('D',$this->home_set_pref))
+		if (in_array('D', $this->home_set_pref))
 		{
 			$lists_ctag = $this->bo->lists_ctag($user);
 		}
@@ -834,32 +833,32 @@ 
 	 * @param int $user=null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null)
+	public function extra_properties(array $props = array(), $displayname, $base_uri = null, $user = null)
 	{
 		if (!isset($props['addressbook-description']))
 		{
 			// default addressbook description: can be overwritten via PROPPATCH, in which case it's already set
-			$props['addressbook-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-description',$props['displayname']);
+			$props['addressbook-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'addressbook-description', $props['displayname']);
 		}
 		// setting an max image size, so iOS scales the images before transmitting them
 		// we currently scale down to width of 240px, which tests shown to be ~20k
-		$props['max-image-size'] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'max-image-size',24*1024);
+		$props['max-image-size'] = HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'max-image-size', 24 * 1024);
 
 		// supported reports (required property for CardDAV)
 		$props['supported-report-set'] = array(
-			'addressbook-query' => HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-query',''))))),
-			'addressbook-multiget' => HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-multiget',''))))),
+			'addressbook-query' => HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'addressbook-query', ''))))),
+			'addressbook-multiget' => HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV, 'addressbook-multiget', ''))))),
 		);
 		// only advertice rfc 6578 sync-collection report, if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		if ($GLOBALS['egw_info']['server']['history'])
 		{
-			$props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop('sync-collection', '')))));
 		}
 		return $props;
 	}
@@ -871,7 +870,7 @@ 
 	 */
 	private function _get_handler()
 	{
-		$handler = new addressbook_vcal('addressbook','text/vcard');
+		$handler = new addressbook_vcal('addressbook', 'text/vcard');
 		$supportedFields = $handler->supportedFields;
 		// Apple iOS or OS X addressbook
 		if ($this->agent == 'cfnetwork' || $this->agent == 'dataaccess')
@@ -884,10 +883,10 @@ 
 			unset($supportedFields['TEL;CELL;WORK']);
 			$supportedFields['TEL;IPHONE'] = array('tel_cell_private');
 			unset($supportedFields['TEL;CELL;HOME']);
-			$databaseFields['X-ABSHOWAS'] = $supportedFields['X-ABSHOWAS'] = array('fileas_type');	// Horde vCard class uses uppercase prop-names!
+			$databaseFields['X-ABSHOWAS'] = $supportedFields['X-ABSHOWAS'] = array('fileas_type'); // Horde vCard class uses uppercase prop-names!
 
 			// Apple Addressbook pre Lion (OS X 10.7) messes up CLASS and CATEGORIES (Lion cant set them but leaves them alone)
-			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'],$matches) && $matches[1] < 520 ||
+			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] < 520 ||
 				// iOS 5.1.1 does not display CLASS or CATEGORY, but wrongly escapes multiple, comma-separated categories
 				// and appends CLASS: PUBLIC to an empty NOTE: field --> leaving them out for iOS
 				$this->agent == 'dataaccess')
@@ -897,7 +896,7 @@ 
 				unset($supportedFields['CATEGORIES']);
 				unset($databaseFields['CATEGORIES']);
 			}
-			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'],$matches) && $matches[1] < 520)
+			if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] < 520)
 			{
 				// gd cant parse or resize images stored from snow leopard addressbook: gd-jpeg:
 				// - JPEG library reports unrecoverable error
@@ -909,7 +908,7 @@ 
 			}
 			$handler->setDatabaseFields($databaseFields);
 		}
-		$handler->setSupportedFields('GroupDAV',$this->agent,$supportedFields);
+		$handler->setSupportedFields('GroupDAV', $this->agent, $supportedFields);
 		return $handler;
 	}
 
@@ -920,9 +919,9 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
-		if (!is_array($contact = $this->_common_get_put_delete('DELETE',$options,$id)))
+		if (!is_array($contact = $this->_common_get_put_delete('DELETE', $options, $id)))
 		{
 			return $contact;
 		}
@@ -930,7 +929,7 @@ 
 		{
 			$ok = $this->bo->delete_list($contact['list_id']) !== false;
 		}
-		elseif (($ok = $this->bo->delete($contact['id'],self::etag2value($this->http_if_match))) === 0)
+		elseif (($ok = $this->bo->delete($contact['id'], self::etag2value($this->http_if_match))) === 0)
 		{
 			return '412 Precondition Failed';
 		}
@@ -947,7 +946,7 @@ 
 	 * @param string $path=null
 	 * @return array|boolean array with entry, false if no read rights, null if $id does not exist
 	 */
-	function read($id, $path=null)
+	function read($id, $path = null)
 	{
 		static $non_deleted_tids;
 		if (is_null($non_deleted_tids))
@@ -959,7 +958,7 @@ 
 		$contact = $this->bo->read(array(self::$path_attr => $id, 'tid' => $non_deleted_tids));
 
 		// if contact not found and accounts stored NOT like contacts, try reading it without path-extension as id
-		if (is_null($contact) && $this->bo->so_accounts && ($c = $this->bo->read($test=basename($id, '.vcf'))))
+		if (is_null($contact) && $this->bo->so_accounts && ($c = $this->bo->read($test = basename($id, '.vcf'))))
 		{
 			$contact = $c;
 		}
@@ -968,9 +967,9 @@ 
 		// bo->read_list(..., true) limits returned uid to same owner's addressbook, as iOS and OS X addressbooks
 		// only understands/shows that and if return more, save_lists would delete the others ones on update!
 		$limit_in_ab = true;
-		list(,$account_lid,$app) = explode('/',$path);	// eg. /<username>/addressbook/<id>
+		list(,$account_lid, $app) = explode('/', $path); // eg. /<username>/addressbook/<id>
 		// /<username>/addressbook/ with home_set_prefs containing 'O'=all-in-one contains selected ab's
-		if($account_lid == $GLOBALS['egw_info']['user']['account_lid'] && $app == 'addressbook' && in_array('O',$this->home_set_pref))
+		if ($account_lid == $GLOBALS['egw_info']['user']['account_lid'] && $app == 'addressbook' && in_array('O', $this->home_set_pref))
 		{
 			$limit_in_ab = array_keys($this->get_shared(true));
 			$limit_in_ab[] = $GLOBALS['egw_info']['user']['account_id'];
@@ -981,28 +980,28 @@ 
 		{
 			$limit_in_ab = array_keys($this->bo->grants);
 		}*/
-		if (!$contact && ($contact = $this->bo->read_lists(array('list_'.self::$path_attr => $id),'contact_uid',$limit_in_ab)))
+		if (!$contact && ($contact = $this->bo->read_lists(array('list_'.self::$path_attr => $id), 'contact_uid', $limit_in_ab)))
 		{
 			$contact = array_shift($contact);
 			$contact['n_fn'] = $contact['n_family'] = $contact['list_name'];
-			foreach(array('owner','id','carddav_name','modified','modifier','created','creator','etag','uid') as $name)
+			foreach (array('owner', 'id', 'carddav_name', 'modified', 'modifier', 'created', 'creator', 'etag', 'uid') as $name)
 			{
 				$contact[$name] = $contact['list_'.$name];
 			}
 			// if NOT limited to containing AB ($limit_in_ab === true), add that limit to etag
 			if ($limit_in_ab !== true)
 			{
-				$contact['etag'] .= ':'.implode('-',$limit_in_ab);
+				$contact['etag'] .= ':'.implode('-', $limit_in_ab);
 			}
 		}
-		elseif($contact === array())	// not found from read_lists()
+		elseif ($contact === array())	// not found from read_lists()
 		{
 			$contact = null;
 		}
 
 		if ($contact && $contact['tid'] == addressbook_so::DELETED_TYPE)
 		{
-			$contact = null;	// handle deleted events, as not existing (404 Not Found)
+			$contact = null; // handle deleted events, as not existing (404 Not Found)
 		}
 		if ($this->debug > 1) error_log(__METHOD__."('$id') returning ".array2string($contact));
 		return $contact;
@@ -1015,9 +1014,9 @@ 
 	 * @param array|int $contact contact-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$contact)
+	function check_access($acl, $contact)
 	{
-		return $this->bo->check_perms($acl, $contact, true);	// true = deny to delete accounts
+		return $this->bo->check_perms($acl, $contact, true); // true = deny to delete accounts
 	}
 
 	/**
@@ -1045,15 +1044,15 @@ 
 	 * @param boolean $ignore_all_in_one=false if true, return selected addressbooks and not array() for all-in-one
 	 * @return array account_id => account_lid pairs
 	 */
-	function get_shared($ignore_all_in_one=false)
+	function get_shared($ignore_all_in_one = false)
 	{
 		$shared = array();
 
 		// if "Sync all selected addressbook into one" is set --> no (additional) shared addressbooks
-		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref)) return array();
+		if (!$ignore_all_in_one && in_array('O', $this->home_set_pref)) return array();
 
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 			'U' => '0',
 		) as $sym => $id)
@@ -1063,11 +1062,11 @@ 
 				$this->home_set_pref[$key] = $id;
 			}
 		}
-		foreach($this->bo->get_addressbooks(EGW_ACL_READ) as $id => $label)
+		foreach ($this->bo->get_addressbooks(EGW_ACL_READ) as $id => $label)
 		{
 			if (($id || !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) &&
-				$GLOBALS['egw_info']['user']['account_id'] != $id &&	// no current user and no accounts, if disabled in ab prefs
-				(in_array('A',$this->home_set_pref) || in_array((string)$id,$this->home_set_pref)) &&
+				$GLOBALS['egw_info']['user']['account_id'] != $id && // no current user and no accounts, if disabled in ab prefs
+				(in_array('A', $this->home_set_pref) || in_array((string)$id, $this->home_set_pref)) &&
 				is_numeric($id) && ($owner = $id ? $this->accounts->id2name($id) : 'accounts'))
 			{
 				$shared[$id] = 'addressbook-'.$owner;
@@ -1087,14 +1086,14 @@ 
 	public static function groupdav_root_props(array $data)
 	{
 		$data['props']['addressbook-home-set'] = groupdav::mkprop(groupdav::CARDDAV, 'addressbook-home-set', array(
-			groupdav::mkprop('href',$data['caldav']->base_uri.'/'.$GLOBALS['egw_info']['user']['account_lid'].'/')));
+			groupdav::mkprop('href', $data['caldav']->base_uri.'/'.$GLOBALS['egw_info']['user']['account_lid'].'/')));
 
 		$data['props']['principal-address'] = groupdav::mkprop(groupdav::CARDDAV, 'principal-address',
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] ? '' : array(
-				groupdav::mkprop('href',$data['caldav']->base_uri.'/addressbook-accounts/'.$GLOBALS['egw_info']['user']['person_id'].'.vcf')));
+				groupdav::mkprop('href', $data['caldav']->base_uri.'/addressbook-accounts/'.$GLOBALS['egw_info']['user']['person_id'].'.vcf')));
 
 		$data['props']['directory-gateway'] = groupdav::mkprop(groupdav::CARDDAV, 'directory-gateway', array(
-			groupdav::mkprop('href',$data['caldav']->base_uri.'/addressbook/')));
+			groupdav::mkprop('href', $data['caldav']->base_uri.'/addressbook/')));
 	}
 
 	/**
@@ -1117,8 +1116,8 @@ 
 			$user = $hook_data['account_id'];
 			$addressbook_bo = new addressbook_bo();
 			$addressbooks += $addressbook_bo->get_addressbooks(EGW_ACL_READ, null, $user);
-			if ($user > 0)  unset($addressbooks[$user]);	// allways synced
-			unset($addressbooks[$user.'p']);// ignore (optional) private addressbook for now
+			if ($user > 0)  unset($addressbooks[$user]); // allways synced
+			unset($addressbooks[$user.'p']); // ignore (optional) private addressbook for now
 		}
 
 		// allow to force no other addressbooks
@@ -1145,9 +1144,9 @@ 
 			'label'  => 'Addressbooks to sync in addition to personal addressbook',
 			'name'   => 'addressbook-home-set',
 			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likely not be supported!').
-				'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CardDAV "addressbook-home-set"').
-				'<br/>'.lang('Select "%1", if your client does not support multiple addressbooks.',lang('Sync all selected into one')).
-				'<br/>'.lang('Select "%1", if your client support groups, eg. OS X or iOS addressbook.',lang('Distribution lists as groups')),
+				'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CardDAV "addressbook-home-set"').
+				'<br/>'.lang('Select "%1", if your client does not support multiple addressbooks.', lang('Sync all selected into one')).
+				'<br/>'.lang('Select "%1", if your client support groups, eg. OS X or iOS addressbook.', lang('Distribution lists as groups')),
 			'values' => $addressbooks,
 			'xmlrpc' => True,
 			'admin'  => False,

Braces +168 added lines, -41 removed lines

@@ -84,7 +84,10 @@ 
 			groupdav_handler::$path_attr = 'carddav_name';
 			groupdav_handler::$path_extension = '';
 		}
-		if ($this->debug) error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
+		}
 
 		$this->home_set_pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
 		$this->home_set_pref = $this->home_set_pref ? explode(',',$this->home_set_pref) : array();
@@ -122,16 +125,26 @@ 
 			$filter['owner'] = $user;
 		}
 		// should we hide the accounts addressbook
-		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
+		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+		{
+			$filter['account_id'] = null;
+		}
 
 		// process REPORT filters or multiget href's
 		if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id, $nresults))
 		{
 			return false;
 		}
-		if ($id) $path = dirname($path).'/';	// carddav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// carddav_name get's added anyway in the callback
 
-		if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
+		}
 
 		// check if we have to return the full contact data or just the etag's
 		if (!($filter['address_data'] = $options['props'] == 'all' &&
@@ -216,16 +229,25 @@ 
 
 		if (isset($filter[self::$path_attr]))
 		{
-			if (!is_array($filter[self::$path_attr])) $filter[self::$path_attr] = (array)$filter[self::$path_attr];
+			if (!is_array($filter[self::$path_attr]))
+			{
+				$filter[self::$path_attr] = (array)$filter[self::$path_attr];
+			}
 			$requested_multiget_ids =& $filter[self::$path_attr];
 		}
 
 		$files = array();
 		// we query etag and modified, as LDAP does not have the strong sql etag
 		$cols = array('id','uid','etag','modified','n_fn');
-		if (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr;
+		if (!in_array(self::$path_attr,$cols))
+		{
+			$cols[] = self::$path_attr;
+		}
 		// we need tid for sync-collection report
-		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols)) $cols[] = 'tid';
+		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols))
+		{
+			$cols[] = 'tid';
+		}
 		if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter)))
 		{
 			foreach($contacts as &$contact)
@@ -269,7 +291,10 @@ 
 			{
 				$accounts_filter = $filter_in;
 				$accounts_filter['owner'] = '0';
-				if ($sync_collection_report) $token_was = $this->sync_collection_token;
+				if ($sync_collection_report)
+				{
+					$token_was = $this->sync_collection_token;
+				}
 				groupdav_handler::$path_attr = 'id';
 				groupdav_handler::$path_extension = '.vcf';
 				$files = array_merge($files, $this->propfind_callback($path, $accounts_filter, false, false));
@@ -292,16 +317,22 @@ 
 					list(,$sync_token) = explode('>', $filter[0]);
 					$where[] = 'list_modified>FROM_UNIXTIME('.(int)$sync_token.')';
 				}
-				if (isset($filter[self::$path_attr]))	// multiget report?
+				if (isset($filter[self::$path_attr]))
+				{
+					// multiget report?
 				{
 					$where['list_'.self::$path_attr] = $filter[self::$path_attr];
 				}
+				}
 				//error_log(__METHOD__."() filter=".array2string($filter).", do_groups=".in_array('D',$this->home_set_pref).", where=".array2string($where));
-				if (($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))	// limit to contacts in same AB!
+				if (($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))
+				{
+					// limit to contacts in same AB!
 				{
 					foreach($lists as $list)
 					{
 						$list[self::$path_attr] = $list['list_carddav_name'];
+				}
 						$etag = $list['list_id'].':'.$list['list_etag'];
 						// for all-in-one addressbook, add selected ABs to etag
 						if (isset($filter['owner']) && is_array($filter['owner']))
@@ -345,7 +376,10 @@ 
 			}
 		}
 
-		if ($this->debug) error_log(__METHOD__."($path,".array2string($filter).','.array2string($start).") took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path,".array2string($filter).','.array2string($start).") took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		}
 		return $files;
 	}
 
@@ -384,7 +418,11 @@ 
 
 			foreach($options['filters'] as $n => $filter)
 			{
-				if (!is_int($n)) continue;	// eg. attributes of filter xml element
+				if (!is_int($n))
+				{
+					continue;
+				}
+				// eg. attributes of filter xml element
 
 				switch((string)$filter['name'])
 				{
@@ -392,19 +430,28 @@ 
 						$this->groupdav->log(__METHOD__."(...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'prop-filter':	// can be multiple prop-filter, see example
-						if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						if ($matches)
+						{
+							$prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						}
 						$matches = array();
 						$prop_filter = strtoupper($filter['attrs']['name']);
 						$prop_test = isset($filter['attrs']['test']) ? $filter['attrs']['test'] : 'anyof';
-						if ($this->debug > 1) error_log(__METHOD__."(...) prop-filter='$prop_filter', test='$prop_test'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."(...) prop-filter='$prop_filter', test='$prop_test'");
+						}
 						break;
 					case 'is-not-defined':
 						$matches[] = '('.$column."='' OR ".$column.' IS NULL)';
 						break;
 					case 'text-match':	// prop-filter can have multiple text-match, see example
-						if (!isset($this->filter_prop2cal[$prop_filter]))	// eg. not existing NICKNAME in EGroupware
+						if (!isset($this->filter_prop2cal[$prop_filter]))
+						{
+							// eg. not existing NICKNAME in EGroupware
 						{
 							if ($this->debug || $prop_filter != 'NICKNAME') error_log(__METHOD__."(...) text-match: $prop_filter {$filter['attrs']['match-type']} '{$filter['data']}' unknown property '$prop_filter' --> ignored");
+						}
 							$column = false;	// to ignore following data too
 						}
 						else
@@ -417,8 +464,14 @@ 
 									break;
 							}
 							$column = $this->filter_prop2cal[strtoupper($prop_filter)];
-							if (strpos($column, '_') === false) $column = 'contact_'.$column;
-							if (!isset($filters['order'])) $filters['order'] = $column;
+							if (strpos($column, '_') === false)
+							{
+								$column = 'contact_'.$column;
+							}
+							if (!isset($filters['order']))
+							{
+								$filters['order'] = $column;
+							}
 							$match_type = $filter['attrs']['match-type'];
 							$negate_condition = isset($filter['attrs']['negate-condition']) && $filter['attrs']['negate-condition'] == 'yes';
 						}
@@ -426,9 +479,12 @@ 
 					case '':	// data of text-match element
 						if (isset($filter['data']) && isset($column))
 						{
-							if ($column)	// false for properties not known to EGroupware
+							if ($column)
+							{
+								// false for properties not known to EGroupware
 							{
 								$value = str_replace(array('%', '_'), array('\\%', '\\_'), $filter['data']);
+							}
 								switch($match_type)
 								{
 									case 'equals':
@@ -447,7 +503,10 @@ 
 								}
 								$matches[] = ($negate_condition ? 'NOT ' : '').$sql_filter;
 
-								if ($this->debug > 1) error_log(__METHOD__."(...) text-match: $prop_filter $match_type' '{$filter['data']}'");
+								if ($this->debug > 1)
+								{
+									error_log(__METHOD__."(...) text-match: $prop_filter $match_type' '{$filter['data']}'");
+								}
 							}
 							unset($column);
 							break;
@@ -458,11 +517,17 @@ 
 						break;
 				}
 			}
-			if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			if ($matches)
+			{
+				$prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			}
 			if ($prop_filters)
 			{
 				$filters[] = $filter = '(('.implode($filter_test=='allof'?') AND (':') OR (', $prop_filters).'))';
-				if ($this->debug) error_log(__METHOD__."($path,...) sql-filter: $filter");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($path,...) sql-filter: $filter");
+				}
 			}
 		}
 		// parse limit from $options['other']
@@ -519,8 +584,14 @@ 
 					}
 				}
 			}
-			if ($ids) $filters[self::$path_attr] = $ids;
-			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			if ($ids)
+			{
+				$filters[self::$path_attr] = $ids;
+			}
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			}
 		}
 		elseif ($id)
 		{
@@ -565,12 +636,18 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).",$id,$user)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).",$id,$user)");
+		}
 
 		$oldContact = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($oldContact) && !is_array($oldContact))
 		{
-			if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
+			}
 			return $oldContact;
 		}
 
@@ -661,15 +738,24 @@ 
 			// done here again, as _common_get_put_delete knows nothing about default addressbooks...
 			if (!($this->bo->grants[$contact['owner']] & EGW_ACL_ADD))
 			{
-				if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
+				}
 				return '403 Forbidden';
 			}
 		}
-		if ($this->http_if_match) $contact['etag'] = self::etag2value($this->http_if_match);
+		if ($this->http_if_match)
+		{
+			$contact['etag'] = self::etag2value($this->http_if_match);
+		}
 
 		if (!($save_ok = $is_group ? $this->save_group($contact, $oldContact) : $this->bo->save($contact)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
+			}
 			if ($save_ok === 0)
 			{
 				// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
@@ -698,7 +784,10 @@ 
 		// send evtl. necessary respose headers: Location, etag, ...
 		$this->put_response_headers($contact, $options['path'], $retval, self::$path_attr != 'id');
 
-		if ($this->debug > 1) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($retval));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($retval));
+		}
 		return $retval;
 	}
 
@@ -712,7 +801,10 @@ 
 	function save_group(array &$contact, $oldContact=null)
 	{
 		$data = array('list_name' => $contact['n_fn']);
-		if (!isset($contact['owner'])) $contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($contact['owner']))
+		{
+			$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		foreach(array('id','carddav_name','uid','owner') as $name)
 		{
 			$data['list_'.$name] = $contact[$name];
@@ -731,7 +823,11 @@ 
 			{
 				$new_members = array($new_members);
 			}
-			foreach($new_members as &$uid) $uid = substr($uid,9);	// cut off "urn:uuid:" prefix
+			foreach($new_members as &$uid)
+			{
+				$uid = substr($uid,9);
+			}
+			// cut off "urn:uuid:" prefix
 
 			if ($oldContact)
 			{
@@ -762,13 +858,22 @@ 
 					}
 				}
 				//error_log('to_add_ids='.array2string($to_add_ids).', to_delete_ids='.array2string($to_delete_ids));
-				if ($to_add_ids) $this->bo->add2list($to_add_ids, $list_id, array());
-				if ($to_delete_ids) $this->bo->remove_from_list($to_delete_ids, $list_id);
+				if ($to_add_ids)
+				{
+					$this->bo->add2list($to_add_ids, $list_id, array());
+				}
+				if ($to_delete_ids)
+				{
+					$this->bo->remove_from_list($to_delete_ids, $list_id);
+				}
 			}
 			// reread as update of list-members updates etag and modified
 	 		$contact = $this->bo->read_list($list_id);
 		}
-		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') on return contact='.array2string($data).' returning '.array2string($list_id));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') on return contact='.array2string($data).' returning '.array2string($list_id));
+		}
  		return $list_id;
 	}
 
@@ -782,11 +887,17 @@ 
 	public function getctag($path,$user)
 	{
 		static $ctags = array();	// a little per request caching, in case ctag and sync-token is both requested
-		if (isset($ctags[$path])) return $ctags[$path];
+		if (isset($ctags[$path]))
+		{
+			return $ctags[$path];
+		}
 
 		$user_in = $user;
 		// not showing addressbook of a single user?
-		if (is_null($user) || $user === '' || $path == '/addressbook/') $user = null;
+		if (is_null($user) || $user === '' || $path == '/addressbook/')
+		{
+			$user = null;
+		}
 
 		// If "Sync selected addressbooks into one" is set --> ctag need to take selected AB's into account too
 		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O',$this->home_set_pref))
@@ -995,16 +1106,22 @@ 
 				$contact['etag'] .= ':'.implode('-',$limit_in_ab);
 			}
 		}
-		elseif($contact === array())	// not found from read_lists()
+		elseif($contact === array())
+		{
+			// not found from read_lists()
 		{
 			$contact = null;
 		}
+		}
 
 		if ($contact && $contact['tid'] == addressbook_so::DELETED_TYPE)
 		{
 			$contact = null;	// handle deleted events, as not existing (404 Not Found)
 		}
-		if ($this->debug > 1) error_log(__METHOD__."('$id') returning ".array2string($contact));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."('$id') returning ".array2string($contact));
+		}
 		return $contact;
 	}
 
@@ -1034,7 +1151,10 @@ 
 		// remove add and delete grants for accounts (for admins too)
 		// as accounts can not be created as contacts, they eg. need further data
 		// and admins might not recognice they delete an account incl. its data
-		if (isset($grants[0])) $grants[0] &= ~(EGW_ACL_ADD|EGW_ACL_DELETE);
+		if (isset($grants[0]))
+		{
+			$grants[0] &= ~(EGW_ACL_ADD|EGW_ACL_DELETE);
+		}
 
 		return $grants;
 	}
@@ -1050,7 +1170,10 @@ 
 		$shared = array();
 
 		// if "Sync all selected addressbook into one" is set --> no (additional) shared addressbooks
-		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref)) return array();
+		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref))
+		{
+			return array();
+		}
 
 		// replace symbolic id's with real nummeric id's
 		foreach(array(
@@ -1117,7 +1240,11 @@ 
 			$user = $hook_data['account_id'];
 			$addressbook_bo = new addressbook_bo();
 			$addressbooks += $addressbook_bo->get_addressbooks(EGW_ACL_READ, null, $user);
-			if ($user > 0)  unset($addressbooks[$user]);	// allways synced
+			if ($user > 0)
+			{
+				unset($addressbooks[$user]);
+			}
+			// allways synced
 			unset($addressbooks[$user.'p']);// ignore (optional) private addressbook for now
 		}
 

addressbook/inc/class.addressbook_ldap.inc.php

Doc Comments +3 added lines, -4 removed lines

@@ -425,7 +425,6 @@ 
 	/**
 	 * Remove attributes we are not allowed to update
 	 *
-	 * @param array $attributes
 	 */
 	function sanitize_update(array &$ldapContact)
 	{
@@ -703,14 +702,14 @@ 
 	 *
 	 * '*' and '?' are replaced with sql-wildcards '%' and '_'
 	 *
-	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
+	 * @param boolean $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
 	 * @param boolean|string $only_keys =true True returns only keys, False returns all cols. comma seperated list of keys to return
 	 * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard ='' appended befor and after each criteria
 	 * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
-	 * @param mixed $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
+	 * @param boolean $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
 	 * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!

Indentation +17 added lines, -17 removed lines

@@ -41,33 +41,33 @@ 
 	var $contacts_id='id';
 
 	/**
-	* @var string $accountName holds the accountname of the current user
-	*/
+	 * @var string $accountName holds the accountname of the current user
+	 */
 	var $accountName;
 
 	/**
-	* @var object $ldapServerInfo holds the information about the current used ldap server
-	*/
+	 * @var object $ldapServerInfo holds the information about the current used ldap server
+	 */
 	var $ldapServerInfo;
 
 	/**
-	* @var int $ldapLimit how many rows to fetch from ldap server
-	*/
+	 * @var int $ldapLimit how many rows to fetch from ldap server
+	 */
 	var $ldapLimit = 2000;
 
 	/**
-	* @var string $personalContactsDN holds the base DN for the personal addressbooks
-	*/
+	 * @var string $personalContactsDN holds the base DN for the personal addressbooks
+	 */
 	var $personalContactsDN;
 
 	/**
-	* @var string $sharedContactsDN holds the base DN for the shared addressbooks
-	*/
+	 * @var string $sharedContactsDN holds the base DN for the shared addressbooks
+	 */
 	var $sharedContactsDN;
 
 	/**
-	* @var string $accountContactsDN holds the base DN for accounts addressbook
-	*/
+	 * @var string $accountContactsDN holds the base DN for accounts addressbook
+	 */
 	var $accountContactsDN;
 
 	/**
@@ -77,8 +77,8 @@ 
 	var $accountsFilter = '(objectclass=posixaccount)';
 
 	/**
-	* @var string $allContactsDN holds the base DN of all addressbook
-	*/
+	 * @var string $allContactsDN holds the base DN of all addressbook
+	 */
 	var $allContactsDN;
 
 	/**
@@ -96,8 +96,8 @@ 
 	var $never_change_dn = false;
 
 	/**
-	* @var int $total holds the total count of found rows
-	*/
+	 * @var int $total holds the total count of found rows
+	 */
 	var $total;
 
 	/**
@@ -403,7 +403,7 @@ 
 	 *
 	 * @param string|array $contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($contact_id)
 	{
 		if (is_array($contact_id) && isset($contact_id['account_id']) ||

Spacing +188 added lines, -190 removed lines

@@ -11,10 +11,10 @@ 
  * @version $Id$
  */
 
-define('ADDRESSBOOK_ALL',0);
-define('ADDRESSBOOK_ACCOUNTS',1);
-define('ADDRESSBOOK_PERSONAL',2);
-define('ADDRESSBOOK_GROUP',3);
+define('ADDRESSBOOK_ALL', 0);
+define('ADDRESSBOOK_ACCOUNTS', 1);
+define('ADDRESSBOOK_PERSONAL', 2);
+define('ADDRESSBOOK_GROUP', 3);
 
 /**
  * LDAP Backend for contacts, compatible with vars and parameters of eTemplate's so_sql.
@@ -32,7 +32,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $contacts_id='id';
+	var $contacts_id = 'id';
 
 	/**
 	* @var string $accountName holds the accountname of the current user
@@ -80,7 +80,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $dn_attribute='uid';
+	var $dn_attribute = 'uid';
 
 	/**
 	 * Do NOT attempt to change DN (dn-attribute can NOT be part of schemas used in addressbook!)
@@ -107,9 +107,9 @@ 
 	 * minimum: $this->columns_to_search = array('n_family','n_given','org_name','email');
 	 */
 	var $search_attributes = array(
-		'n_family','n_middle','n_given','org_name','org_unit',
-		'adr_one_location','adr_two_location','note',
-		'email','mozillasecondemail','uidnumber',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_location', 'adr_two_location', 'note',
+		'email', 'mozillasecondemail', 'uidnumber',
 	);
 
 	/**
@@ -165,8 +165,8 @@ 
 		#postOfficeBox
 		'mozillaabpersonalpha' => array(
 			'adr_one_street2'	=> 'mozillaworkstreet2',
-			'adr_one_countryname'	=> 'c',	// 2 letter country code
-			'adr_one_countrycode'	=> 'c',	// 2 letter country code
+			'adr_one_countryname'	=> 'c', // 2 letter country code
+			'adr_one_countrycode'	=> 'c', // 2 letter country code
 			'adr_two_street'	=> 'mozillahomestreet',
 			'adr_two_street2'	=> 'mozillahomestreet2',
 			'adr_two_locality'	=> 'mozillahomelocalityname',
@@ -180,8 +180,8 @@ 
 		// similar to the newer mozillaAbPerson, but uses mozillaPostalAddress2 instead of mozillaStreet2
 		'mozillaorgperson' => array(
 			'adr_one_street2'	=> 'mozillapostaladdress2',
-			'adr_one_countrycode'	=> 'c',	// 2 letter country code
-			'adr_one_countryname'	=> 'co',	// human readable country name, must be after 'c' to take precedence on read!
+			'adr_one_countrycode'	=> 'c', // 2 letter country code
+			'adr_one_countryname'	=> 'co', // human readable country name, must be after 'c' to take precedence on read!
 			'adr_two_street'	=> 'mozillahomestreet',
 			'adr_two_street2'	=> 'mozillahomepostaladdress2',
 			'adr_two_locality'	=> 'mozillahomelocalityname',
@@ -207,7 +207,7 @@ 
 			'note'			=> 'note',
 			'tel_car'		=> 'carphone',
 			'tel_prefer'	=> 'primaryphone',
-			'cat_id'		=> 'category',	// special handling in _egw2evolutionperson method
+			'cat_id'		=> 'category', // special handling in _egw2evolutionperson method
 			'role'			=> 'businessrole',
 			'tel_assistent'	=> 'assistantphone',
 			'assistent'		=> 'assistantname',
@@ -216,7 +216,7 @@ 
 			'freebusy_uri'	=> 'freeBusyuri',
 			'calendar_uri'	=> 'calendaruri',
 			'tel_other'		=> 'otherphone',
-			'tel_cell_private' => 'callbackphone',	// not the best choice, but better then nothing
+			'tel_cell_private' => 'callbackphone', // not the best choice, but better then nothing
 		),
 		// additional schema can be added here, including special functions
 
@@ -264,10 +264,10 @@ 
 	 * @param array $ldap_config =null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds =null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	function __construct(array $ldap_config = null, $ds = null)
 	{
 		//$this->db_data_cols 	= $this->stock_contact_fields + $this->non_contact_fields;
-		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -275,12 +275,12 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 		$this->accountContactsDN	= $this->ldap_config['ldap_context'];
-		$this->allContactsDN		= $this->ldap_config['ldap_contact_context'];
-		$this->personalContactsDN	= 'ou=personal,ou=contacts,'. $this->allContactsDN;
-		$this->sharedContactsDN		= 'ou=shared,ou=contacts,'. $this->allContactsDN;
+		$this->allContactsDN = $this->ldap_config['ldap_contact_context'];
+		$this->personalContactsDN = 'ou=personal,ou=contacts,'.$this->allContactsDN;
+		$this->sharedContactsDN		= 'ou=shared,ou=contacts,'.$this->allContactsDN;
 
 		if ($ds)
 		{
@@ -292,9 +292,9 @@ 
 		}
 		$this->ldapServerInfo = $GLOBALS['egw']->ldap->getLDAPServerInfo($this->ldap_config['ldap_contact_host']);
 
-		foreach($this->schema2egw as $attributes)
+		foreach ($this->schema2egw as $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -324,7 +324,7 @@ 
 			$this->ds = $ldap->ldapConnect();
 		}
 		// if ldap is NOT the contact repository, we only do accounts and need to use the account-data
-		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'],-4) != 'ldap')	// not (ldap or sql-ldap)
+		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'], -4) != 'ldap')	// not (ldap or sql-ldap)
 		{
 			$this->ldap_config['ldap_contact_host'] = $this->ldap_config['ldap_host'];
 			$this->allContactsDN = $this->ldap_config['ldap_context'];
@@ -348,17 +348,17 @@ 
 	function supported_fields()
 	{
 		$fields = array(
-			'id','tid','owner',
-			'n_middle','n_prefix','n_suffix',	// stored in the cn
-			'created','modified',				// automatic timestamps
-			'creator','modifier',				// automatic for non accounts
-			'private',							// true for personal addressbooks, false otherwise
+			'id', 'tid', 'owner',
+			'n_middle', 'n_prefix', 'n_suffix', // stored in the cn
+			'created', 'modified', // automatic timestamps
+			'creator', 'modifier', // automatic for non accounts
+			'private', // true for personal addressbooks, false otherwise
 		);
-		foreach($this->schema2egw as $objectclass => $mapping)
+		foreach ($this->schema2egw as $objectclass => $mapping)
 		{
-			if($this->ldapServerInfo->supportsObjectClass($objectclass))
+			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
-				$fields = array_merge($fields,array_keys($mapping));
+				$fields = array_merge($fields, array_keys($mapping));
 			}
 		}
 		return array_values(array_unique($fields));
@@ -388,7 +388,7 @@ 
 			return $this->id_filter(is_array($ids) ? array_shift($ids) : $ids);
 		}
 		$filter = array();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			$filter[] = $this->id_filter($id);
 		}
@@ -404,9 +404,9 @@ 
 	function read($contact_id)
 	{
 		if (is_array($contact_id) && isset($contact_id['account_id']) ||
-			!is_array($contact_id) && substr($contact_id,0,8) == 'account:')
+			!is_array($contact_id) && substr($contact_id, 0, 8) == 'account:')
 		{
-			$filter = 'uidNumber='.(int)(is_array($contact_id) ? $contact_id['account_id'] : substr($contact_id,8));
+			$filter = 'uidNumber='.(int)(is_array($contact_id) ? $contact_id['account_id'] : substr($contact_id, 8));
 		}
 		else
 		{
@@ -429,7 +429,7 @@ 
 		// never allow to change the uidNumber (account_id) on update, as it could be misused by eg. xmlrpc or syncml
 		unset($ldapContact['uidnumber']);
 
-		unset($ldapContact['entryuuid']);	// not allowed to modify that, no need either
+		unset($ldapContact['entryuuid']); // not allowed to modify that, no need either
 
 		unset($ldapContact['objectClass']);
 	}
@@ -440,28 +440,28 @@ 
 	 * @param array $keys if given $keys are copied to data before saveing => allows a save as
 	 * @return int 0 on success and errno != 0 else
 	 */
-	function save($keys=null)
+	function save($keys = null)
 	{
 		//error_log(__METHOD__."(".array2string($keys).") this->data=".array2string($this->data));
-		if(is_array($keys))
+		if (is_array($keys))
 		{
-			$this->data = is_array($this->data) ? array_merge($this->data,$keys) : $keys;
+			$this->data = is_array($this->data) ? array_merge($this->data, $keys) : $keys;
 		}
 
-		$data =& $this->data;
+		$data = & $this->data;
 		$isUpdate = false;
 		$ldapContact = array();
 
 		// generate addressbook dn
-		if((int)$data['owner'])
+		if ((int)$data['owner'])
 		{
 			// group address book
-			if(!($cn = strtolower($GLOBALS['egw']->accounts->id2name((int)$data['owner']))))
+			if (!($cn = strtolower($GLOBALS['egw']->accounts->id2name((int)$data['owner']))))
 			{
 				error_log('Unknown owner');
 				return true;
 			}
-			$baseDN = 'cn='. $cn .','.($data['owner'] < 0 ? $this->sharedContactsDN : $this->personalContactsDN);
+			$baseDN = 'cn='.$cn.','.($data['owner'] < 0 ? $this->sharedContactsDN : $this->personalContactsDN);
 		}
 		// only an admin or the user itself is allowed to change the data of an account
 		elseif ($data['account_id'] && ($GLOBALS['egw_info']['user']['apps']['admin'] ||
@@ -469,7 +469,7 @@ 
 		{
 			// account
 			$baseDN = $this->accountContactsDN;
-			$cn	= false;
+			$cn = false;
 			// we need an admin connection
 			$this->connect(true);
 
@@ -482,7 +482,7 @@ 
 		else
 		{
 			error_log("Permission denied, to write: data[owner]=$data[owner], data[account_id]=$data[account_id], account_id=".$GLOBALS['egw_info']['user']['account_id']);
-			return lang('Permission denied !!!');	// only admin or the user itself is allowd to write accounts!
+			return lang('Permission denied !!!'); // only admin or the user itself is allowd to write accounts!
 		}
 		// check if $baseDN exists. If not create it
 		if (($err = $this->_check_create_dn($baseDN)))
@@ -491,55 +491,54 @@ 
 		}
 		// check the existing objectclasses of an entry, none = array() for new ones
 		$oldObjectclasses = array();
-		$attributes = array('dn','cn','objectClass',$this->dn_attribute,'mail');
+		$attributes = array('dn', 'cn', 'objectClass', $this->dn_attribute, 'mail');
 
 		$contactUID	= $this->data[$this->contacts_id];
 		if (!empty($contactUID) &&
-			($result = ldap_search($this->ds, $base=$this->allContactsDN, $this->id_filter($contactUID), $attributes)) &&
+			($result = ldap_search($this->ds, $base = $this->allContactsDN, $this->id_filter($contactUID), $attributes)) &&
 			($oldContactInfo = ldap_get_entries($this->ds, $result)) && $oldContactInfo['count'])
 		{
 			unset($oldContactInfo[0]['objectclass']['count']);
-			foreach($oldContactInfo[0]['objectclass'] as $objectclass)
+			foreach ($oldContactInfo[0]['objectclass'] as $objectclass)
 			{
-				$oldObjectclasses[]	= strtolower($objectclass);
+				$oldObjectclasses[] = strtolower($objectclass);
 			}
 		   	$isUpdate = true;
 		}
 
-		if(empty($contactUID))
+		if (empty($contactUID))
 		{
 			$ldapContact[$this->dn_attribute] = $this->data[$this->contacts_id] = $contactUID = md5($GLOBALS['egw']->common->randomstring(15));
 		}
 		//error_log(__METHOD__."() contactUID='$contactUID', isUpdate=".array2string($isUpdate).", oldContactInfo=".array2string($oldContactInfo));
 		// add for all supported objectclasses the objectclass and it's attributes
-		foreach($this->schema2egw as $objectclass => $mapping)
+		foreach ($this->schema2egw as $objectclass => $mapping)
 		{
-			if(!$this->ldapServerInfo->supportsObjectClass($objectclass)) continue;
+			if (!$this->ldapServerInfo->supportsObjectClass($objectclass)) continue;
 
-			if($objectclass != 'posixaccount' && !in_array($objectclass, $oldObjectclasses))
+			if ($objectclass != 'posixaccount' && !in_array($objectclass, $oldObjectclasses))
 			{
 				$ldapContact['objectClass'][] = $objectclass;
 			}
 			if (isset($this->required_subs[$objectclass]))
 			{
-				foreach($this->required_subs[$objectclass] as $sub)
+				foreach ($this->required_subs[$objectclass] as $sub)
 				{
-					if(!in_array($sub, $oldObjectclasses))
+					if (!in_array($sub, $oldObjectclasses))
 					{
 						$ldapContact['objectClass'][] = $sub;
 					}
 				}
 			}
-			foreach($mapping as $egwFieldName => $ldapFieldName)
+			foreach ($mapping as $egwFieldName => $ldapFieldName)
 			{
 				if (is_int($egwFieldName)) continue;
-				if(!empty($data[$egwFieldName]))
+				if (!empty($data[$egwFieldName]))
 				{
 					// dont convert the (binary) jpegPhoto!
-					$ldapContact[$ldapFieldName] = $ldapFieldName == 'jpegphoto' ? $data[$egwFieldName] :
-						translation::convert(trim($data[$egwFieldName]),$this->charset,'utf-8');
+					$ldapContact[$ldapFieldName] = $ldapFieldName == 'jpegphoto' ? $data[$egwFieldName] : translation::convert(trim($data[$egwFieldName]), $this->charset, 'utf-8');
 				}
-				elseif($isUpdate && isset($data[$egwFieldName]))
+				elseif ($isUpdate && isset($data[$egwFieldName]))
 				{
 					$ldapContact[$ldapFieldName] = array();
 				}
@@ -547,9 +546,9 @@ 
 			}
 			// handling of special attributes, like cat_id in evolutionPerson
 			$egw2objectclass = '_egw2'.$objectclass;
-			if (method_exists($this,$egw2objectclass))
+			if (method_exists($this, $egw2objectclass))
 			{
-				$this->$egw2objectclass($ldapContact,$data,$isUpdate);
+				$this->$egw2objectclass($ldapContact, $data, $isUpdate);
 			}
 		}
 		if ($isUpdate)
@@ -567,11 +566,11 @@ 
 			$needRecreation = false;
 
 			// add missing objectclasses
-			if($ldapContact['objectClass'] && ($missing=array_diff($ldapContact['objectClass'],$oldObjectclasses)))
+			if ($ldapContact['objectClass'] && ($missing = array_diff($ldapContact['objectClass'], $oldObjectclasses)))
 			{
 				if (!@ldap_mod_add($this->ds, $dn, array('objectClass' => $ldapContact['objectClass'])))
 				{
-					if(in_array(ldap_errno($this->ds),array(69,20)))
+					if (in_array(ldap_errno($this->ds), array(69, 20)))
 					{
 						// need to modify structural objectclass
 						$needRecreation = true;
@@ -580,15 +579,15 @@ 
 					else
 					{
 						//echo "<p>ldap_mod_add($this->ds,'$dn',array(objectClass =>".print_r($ldapContact['objectClass'],true)."))</p>\n";
-						error_log(__METHOD__.'() '.__LINE__.' update of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')');
+						error_log(__METHOD__.'() '.__LINE__.' update of '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).')');
 						return $this->_error(__LINE__);
 					}
 				}
 			}
 
 			// check if we need to rename the DN or need to recreate the contact
-			$newRDN = $this->dn_attribute.'='. $ldapContact[$this->dn_attribute];
-			$newDN = $newRDN .','. $baseDN;
+			$newRDN = $this->dn_attribute.'='.$ldapContact[$this->dn_attribute];
+			$newDN = $newRDN.','.$baseDN;
 			if ($needRecreation)
 			{
 				$result = ldap_read($this->ds, $dn, 'objectclass=*');
@@ -599,20 +598,20 @@ 
 				$newContact = $oldContact;
 				$newContact[$this->dn_attribute] = $ldapContact[$this->dn_attribute];
 
-				if(is_array($ldapContact['objectClass']) && count($ldapContact['objectClass']) > 0)
+				if (is_array($ldapContact['objectClass']) && count($ldapContact['objectClass']) > 0)
 				{
-					$newContact['objectclass'] = array_unique(array_map('strtolower',	// objectclasses my have different case
+					$newContact['objectclass'] = array_unique(array_map('strtolower', // objectclasses my have different case
 						array_merge($newContact['objectclass'], $ldapContact['objectClass'])));
 				}
 
-				if(!ldap_delete($this->ds, $dn))
+				if (!ldap_delete($this->ds, $dn))
 				{
-					error_log(__METHOD__.'() '.__LINE__.' delete of old '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')');
+					error_log(__METHOD__.'() '.__LINE__.' delete of old '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).')');
 					return $this->_error(__LINE__);
 				}
-				if(!@ldap_add($this->ds, $newDN, $newContact))
+				if (!@ldap_add($this->ds, $newDN, $newContact))
 				{
-					error_log(__METHOD__.'() '.__LINE__.' re-create contact as '. $newDN .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .') newContact='.array2string($newContact));
+					error_log(__METHOD__.'() '.__LINE__.' re-create contact as '.$newDN.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).') newContact='.array2string($newContact));
 					// if adding with new objectclass or dn fails, re-add deleted contact
 					@ldap_add($this->ds, $dn, $oldContact);
 					return $this->_error(__LINE__);
@@ -641,22 +640,22 @@ 
 
 			if (!@ldap_modify($this->ds, $dn, $ldapContact))
 			{
-				error_log(__METHOD__.'() '.__LINE__.' update of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .') ldapContact='.array2string($ldapContact));
+				error_log(__METHOD__.'() '.__LINE__.' update of '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).') ldapContact='.array2string($ldapContact));
 				return $this->_error(__LINE__);
 			}
 		}
 		else
 		{
-			$dn = $this->dn_attribute.'='. $ldapContact[$this->dn_attribute] .','. $baseDN;
-			unset($ldapContact['entryuuid']);	// trying to write it, gives an error
+			$dn = $this->dn_attribute.'='.$ldapContact[$this->dn_attribute].','.$baseDN;
+			unset($ldapContact['entryuuid']); // trying to write it, gives an error
 
 			if (!@ldap_add($this->ds, $dn, $ldapContact))
 			{
-				error_log(__METHOD__.'() '.__LINE__.' add of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .') ldapContact='.array2string($ldapContact));
+				error_log(__METHOD__.'() '.__LINE__.' add of '.$dn.' failed errorcode: '.ldap_errno($this->ds).' ('.ldap_error($this->ds).') ldapContact='.array2string($ldapContact));
 				return $this->_error(__LINE__);
 			}
 		}
-		return 0;	// Ok, no error
+		return 0; // Ok, no error
 	}
 
 	/**
@@ -665,28 +664,28 @@ 
 	 * @param array $keys if given array with col => value pairs to characterise the rows to delete
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null)
+	function delete($keys = null)
 	{
 		// single entry
-		if($keys[$this->contacts_id]) $keys = array( 0 => $keys);
+		if ($keys[$this->contacts_id]) $keys = array(0 => $keys);
 
-		if(!is_array($keys))
+		if (!is_array($keys))
 		{
-			$keys = array( $keys);
+			$keys = array($keys);
 		}
 
 		$ret = 0;
 
 		$attributes = array('dn');
 
-		foreach($keys as $entry)
+		foreach ($keys as $entry)
 		{
 			$entry = ldap::quote(is_array($entry) ? $entry['id'] : $entry);
-			if(($result = ldap_search($this->ds, $this->allContactsDN,
+			if (($result = ldap_search($this->ds, $this->allContactsDN,
 				"(|(entryUUID=$entry)(uid=$entry))", $attributes)))
 			{
 				$contactInfo = ldap_get_entries($this->ds, $result);
-				if(@ldap_delete($this->ds, $contactInfo[0]['dn']))
+				if (@ldap_delete($this->ds, $contactInfo[0]['dn']))
 				{
 					$ret++;
 				}
@@ -714,10 +713,10 @@ 
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
 	 * @return array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__."(".array2string($criteria).", ".array2string($only_keys).", '$order_by', ".array2string($extra_cols).", '$wildcard', '$empty', '$op', ".array2string($start).", ".array2string($filter).")");
-		unset($only_keys, $extra_cols, $empty, $join, $need_full_no_count);	// not used, but required by function signature
+		unset($only_keys, $extra_cols, $empty, $join, $need_full_no_count); // not used, but required by function signature
 
 		if (is_array($filter['owner']))
 		{
@@ -739,7 +738,7 @@ 
 			'created' => 'createtimestamp',
 			'modified' => 'modifytimestamp',
 		);
-		foreach($filter as $key => $value)
+		foreach ($filter as $key => $value)
 		{
 			$matches = null;
 			if (is_int($key) && preg_match('/^(contact_)?(modified|created)([<=>]+)([0-9]+)$/', $value, $matches))
@@ -755,11 +754,11 @@ 
 			}
 		}
 
-		if((int)$filter['owner'])
+		if ((int)$filter['owner'])
 		{
 			if (!($accountName = $GLOBALS['egw']->accounts->id2name($filter['owner']))) return false;
 
-			$searchDN = 'cn='. ldap::quote(strtolower($accountName)) .',';
+			$searchDN = 'cn='.ldap::quote(strtolower($accountName)).',';
 
 			if ($filter['owner'] < 0)
 			{
@@ -783,7 +782,7 @@ 
 			$addressbookType = ADDRESSBOOK_ACCOUNTS;
 		}
 		// create the search filter
-		switch($addressbookType)
+		switch ($addressbookType)
 		{
 			case ADDRESSBOOK_ACCOUNTS:
 				$objectFilter = $this->accountsFilter;
@@ -798,28 +797,28 @@ 
 		// shadowExpire>= does NOT work, as shadow schema only specifies integerMatch and not integerOrderingMatch :-(
 
 		$searchFilter = '';
-		if(is_array($criteria) && count($criteria) > 0)
+		if (is_array($criteria) && count($criteria) > 0)
 		{
 			$wildcard = $wildcard === '%' ? '*' : '';
 			$searchFilter = '';
-			foreach($criteria as $egwSearchKey => $searchValue)
+			foreach ($criteria as $egwSearchKey => $searchValue)
 			{
-				if (in_array($egwSearchKey, array('id','contact_id')))
+				if (in_array($egwSearchKey, array('id', 'contact_id')))
 				{
 					$searchFilter .= $this->ids_filter($searchValue);
 					continue;
 				}
-				foreach($this->schema2egw as $mapping)
+				foreach ($this->schema2egw as $mapping)
 				{
-					if(($ldapSearchKey = $mapping[$egwSearchKey]))
+					if (($ldapSearchKey = $mapping[$egwSearchKey]))
 					{
-						$searchString = translation::convert($searchValue,$this->charset,'utf-8');
+						$searchString = translation::convert($searchValue, $this->charset, 'utf-8');
 						$searchFilter .= '('.$ldapSearchKey.'='.$wildcard.ldap::quote($searchString).$wildcard.')';
 						break;
 					}
 				}
 			}
-			if($op == 'AND')
+			if ($op == 'AND')
 			{
 				$searchFilter = "(&$searchFilter)";
 			}
@@ -838,9 +837,9 @@ 
 		// only return certain owners --> unset not matching ones
 		if ($owner_filter)
 		{
-			foreach($rows as $k => $row)
+			foreach ($rows as $k => $row)
 			{
-				if (!in_array($row['owner'],$owner_filter))
+				if (!in_array($row['owner'], $owner_filter))
 				{
 					unset($rows[$k]);
 					--$this->total;
@@ -851,36 +850,36 @@ 
 		{
 			$order = array();
 			$sort = 'ASC';
-			foreach(explode(',',$order_by) as $o)
+			foreach (explode(',', $order_by) as $o)
 			{
-				if (substr($o,0,8) == 'contact_') $o = substr($o,8);
-				if (substr($o,-4) == ' ASC')
+				if (substr($o, 0, 8) == 'contact_') $o = substr($o, 8);
+				if (substr($o, -4) == ' ASC')
 				{
 					$sort = 'ASC';
-					$order[] = substr($o,0,-4);
+					$order[] = substr($o, 0, -4);
 				}
-				elseif (substr($o,-5) == ' DESC')
+				elseif (substr($o, -5) == ' DESC')
 				{
 					$sort = 'DESC';
-					$order[] = substr($o,0,-5);
+					$order[] = substr($o, 0, -5);
 				}
 				elseif ($o)
 				{
 					$order[] = $o;
 				}
 			}
-			$rows = ExecMethod2('phpgwapi.arrayfunctions.arfsort',$rows,$order,$sort);
+			$rows = ExecMethod2('phpgwapi.arrayfunctions.arfsort', $rows, $order, $sort);
 		}
 		// if requested ($start !== false) return only limited resultset
 		if (is_array($start))
 		{
-			list($start,$offset) = $start;
+			list($start, $offset) = $start;
 		}
-		if(is_numeric($start) && is_numeric($offset) && $offset >= 0)
+		if (is_numeric($start) && is_numeric($offset) && $offset >= 0)
 		{
 			return array_slice($rows, $start, $offset);
 		}
-		elseif(is_numeric($start))
+		elseif (is_numeric($start))
 		{
 			return array_slice($rows, $start, $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']);
 		}
@@ -898,11 +897,11 @@ 
 		if (!is_array($filter)) return '';
 
 		$filters = '';
-		foreach($filter as $key => $value)
+		foreach ($filter as $key => $value)
 		{
 			if ($key != 'cat_id' && $key != 'account_id' && !$value) continue;
 
-			switch((string) $key)
+			switch ((string)$key)
 			{
 				case 'owner':	// already handled
 				case 'tid':		// ignored
@@ -925,7 +924,7 @@ 
 					{
 						$filters .= '(!(category=*))';
 					}
-					elseif((int)$value)
+					elseif ((int)$value)
 					{
 						if (!is_object($GLOBALS['egw']->categories))
 						{
@@ -933,10 +932,10 @@ 
 						}
 						$cats = $GLOBALS['egw']->categories->return_all_children((int)$value);
 						if (count($cats) > 1) $filters .= '(|';
-						foreach($cats as $cat)
+						foreach ($cats as $cat)
 						{
 							$catName = translation::convert(
-								$GLOBALS['egw']->categories->id2name($cat),$this->charset,'utf-8');
+								$GLOBALS['egw']->categories->id2name($cat), $this->charset, 'utf-8');
 							$filters .= '(category='.ldap::quote($catName).')';
 						}
 						if (count($cats) > 1) $filters .= ')';
@@ -945,7 +944,7 @@ 
 
 				case 'carddav_name':
 					if (!is_array($value)) $value = array($value);
-					foreach($value as &$v)
+					foreach ($value as &$v)
 					{
 						$v = basename($v, '.vcf');
 					}
@@ -959,28 +958,27 @@ 
 					$matches = null;
 					if (!is_int($key))
 					{
-						foreach($this->schema2egw as $mapping)
+						foreach ($this->schema2egw as $mapping)
 						{
 							if (isset($mapping[$key]))
 							{
 								// todo: value = "!''"
-								$filters .= '('.$mapping[$key].'='.($value === "!''" ? '*' :
-									ldap::quote(translation::convert($value,$this->charset,'utf-8'))).')';
+								$filters .= '('.$mapping[$key].'='.($value === "!''" ? '*' : ldap::quote(translation::convert($value, $this->charset, 'utf-8'))).')';
 								break;
 							}
 						}
 					}
 					// filter for letter-search
-					elseif (preg_match("/^([^ ]+) ".preg_quote($GLOBALS['egw']->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE])." '(.*)%'$/",$value,$matches))
+					elseif (preg_match("/^([^ ]+) ".preg_quote($GLOBALS['egw']->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE])." '(.*)%'$/", $value, $matches))
 					{
-						list(,$name,$value) = $matches;
-						if (strpos($name,'.') !== false) list(,$name) = explode('.',$name);
-						foreach($this->schema2egw as $mapping)
+						list(,$name, $value) = $matches;
+						if (strpos($name, '.') !== false) list(,$name) = explode('.', $name);
+						foreach ($this->schema2egw as $mapping)
 						{
 							if (isset($mapping[$name]))
 							{
 								$filters .= '('.$mapping[$name].'='.ldap::quote(
-									translation::convert($value,$this->charset,'utf-8')).'*)';
+									translation::convert($value, $this->charset, 'utf-8')).'*)';
 								break;
 							}
 						}
@@ -1004,7 +1002,7 @@ 
 	 * @param array $_skipPlugins =null schema-plugins to skip
 	 * @return array/boolean with eGW contacts or false on error
 	 */
-	function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype, array $_skipPlugins=null)
+	function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype, array $_skipPlugins = null)
 	{
 		$this->total = 0;
 
@@ -1017,7 +1015,7 @@ 
 
 		//error_log(__METHOD__."('$_ldapContext', '$_filter', ".array2string($_attributes).", $_addressbooktype)");
 
-		if($_addressbooktype == ADDRESSBOOK_ALL || $_ldapContext == $this->allContactsDN)
+		if ($_addressbooktype == ADDRESSBOOK_ALL || $_ldapContext == $this->allContactsDN)
 		{
 			$result = ldap_search($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit);
 		}
@@ -1025,36 +1023,36 @@ 
 		{
 			$result = @ldap_list($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit);
 		}
-		if(!$result || !$entries = ldap_get_entries($this->ds, $result)) return array();
+		if (!$result || !$entries = ldap_get_entries($this->ds, $result)) return array();
 		//error_log(__METHOD__."('$_ldapContext', '$_filter', ".array2string($_attributes).", $_addressbooktype) result of $entries[count]");
 
 		$this->total = $entries['count'];
-		foreach($entries as $i => $entry)
+		foreach ($entries as $i => $entry)
 		{
-			if (!is_int($i)) continue;	// eg. count
+			if (!is_int($i)) continue; // eg. count
 
 			$contact = array(
 				'id'  => $entry['uid'][0] ? $entry['uid'][0] : $entry['entryuuid'][0],
-				'tid' => 'n',	// the type id for the addressbook
+				'tid' => 'n', // the type id for the addressbook
 			);
-			foreach($entry['objectclass'] as $ii => $objectclass)
+			foreach ($entry['objectclass'] as $ii => $objectclass)
 			{
 				$objectclass = strtolower($objectclass);
 				if (!is_int($ii) || !isset($this->schema2egw[$objectclass]))
 				{
-					continue;	// eg. count or unsupported objectclass
+					continue; // eg. count or unsupported objectclass
 				}
-				foreach($this->schema2egw[$objectclass] as $egwFieldName => $ldapFieldName)
+				foreach ($this->schema2egw[$objectclass] as $egwFieldName => $ldapFieldName)
 				{
-					if(!empty($entry[$ldapFieldName][0]) && !is_int($egwFieldName) && !isset($contact[$egwFieldName]))
+					if (!empty($entry[$ldapFieldName][0]) && !is_int($egwFieldName) && !isset($contact[$egwFieldName]))
 					{
-						$contact[$egwFieldName] = translation::convert($entry[$ldapFieldName][0],'utf-8');
+						$contact[$egwFieldName] = translation::convert($entry[$ldapFieldName][0], 'utf-8');
 					}
 				}
 				$objectclass2egw = '_'.$objectclass.'2egw';
-				if (!in_array($objectclass2egw, (array)$_skipPlugins) &&method_exists($this,$objectclass2egw))
+				if (!in_array($objectclass2egw, (array)$_skipPlugins) && method_exists($this, $objectclass2egw))
 				{
-					if (($ret=$this->$objectclass2egw($contact,$entry)) === false)
+					if (($ret = $this->$objectclass2egw($contact, $entry)) === false)
 					{
 						--$this->total;
 						continue 2;
@@ -1064,20 +1062,20 @@ 
 			// read binary jpegphoto only for one result == call by read
 			if ($this->total == 1 && isset($entry['jpegphoto'][0]))
 			{
-				$bin = ldap_get_values_len($this->ds,ldap_first_entry($this->ds,$result),'jpegphoto');
+				$bin = ldap_get_values_len($this->ds, ldap_first_entry($this->ds, $result), 'jpegphoto');
 				$contact['jpegphoto'] = $bin[0];
 			}
 			$matches = null;
-			if(preg_match('/cn=([^,]+),'.preg_quote($this->personalContactsDN,'/').'$/i',$entry['dn'],$matches))
+			if (preg_match('/cn=([^,]+),'.preg_quote($this->personalContactsDN, '/').'$/i', $entry['dn'], $matches))
 			{
 				// personal addressbook
-				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1],'account_lid','u');
+				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'u');
 				$contact['private'] = 0;
 			}
-			elseif(preg_match('/cn=([^,]+),'.preg_quote($this->sharedContactsDN,'/').'$/i',$entry['dn'],$matches))
+			elseif (preg_match('/cn=([^,]+),'.preg_quote($this->sharedContactsDN, '/').'$/i', $entry['dn'], $matches))
 			{
 				// group addressbook
-				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1],'account_lid','g');
+				$contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g');
 				$contact['private'] = 0;
 			}
 			else
@@ -1086,12 +1084,12 @@ 
 				$contact['owner'] = 0;
 				$contact['private'] = 0;
 			}
-			foreach(array(
+			foreach (array(
 				'createtimestamp' => 'created',
 				'modifytimestamp' => 'modified',
 			) as $ldapFieldName => $egwFieldName)
 			{
-				if(!empty($entry[$ldapFieldName][0]))
+				if (!empty($entry[$ldapFieldName][0]))
 				{
 					$contact[$egwFieldName] = $this->_ldap2ts($entry[$ldapFieldName][0]);
 				}
@@ -1110,8 +1108,8 @@ 
 	 */
 	static function _ldap2ts($date)
 	{
-		return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2),
-			substr($date,4,2),substr($date,6,2),substr($date,0,4));
+		return gmmktime(substr($date, 8, 2), substr($date, 10, 2), substr($date, 12, 2),
+			substr($date, 4, 2), substr($date, 6, 2), substr($date, 0, 4));
 	}
 
 	/**
@@ -1134,22 +1132,22 @@ 
 	function _check_create_dn($baseDN)
 	{
 		// check if $baseDN exists. If not create new one
-		if(@ldap_read($this->ds, $baseDN, 'objectclass=*'))
+		if (@ldap_read($this->ds, $baseDN, 'objectclass=*'))
 		{
 			return false;
 		}
 		//error_log(__METHOD__."('$baseDN') !ldap_read({$this->ds}, '$baseDN', 'objectclass=*') ldap_errno()=".ldap_errno($this->ds).', ldap_error()='.ldap_error($this->ds).get_class($this));
-		if(ldap_errno($this->ds) != 32 || substr($baseDN,0,3) != 'cn=')
+		if (ldap_errno($this->ds) != 32 || substr($baseDN, 0, 3) != 'cn=')
 		{
 			error_log(__METHOD__."('$baseDN') baseDN does NOT exist and we cant/wont create it! ldap_errno()=".ldap_errno($this->ds).', ldap_error()='.ldap_error($this->ds));
-			return $this->_error(__LINE__);	// baseDN does NOT exist and we cant/wont create it
+			return $this->_error(__LINE__); // baseDN does NOT exist and we cant/wont create it
 		}
 		// create a admin connection to add the needed DN
 		$adminLDAP = new ldap;
 		$adminDS = $adminLDAP->ldapConnect();
 
-		list(,$ou) = explode(',',$baseDN);
-		foreach(array(
+		list(,$ou) = explode(',', $baseDN);
+		foreach (array(
 			'ou=contacts,'.$this->allContactsDN,
 			$ou.',ou=contacts,'.$this->allContactsDN,
 			$baseDN,
@@ -1158,16 +1156,16 @@ 
 			if (!@ldap_read($this->ds, $dn, 'objectclass=*') && ldap_errno($this->ds) == 32)
 			{
 				// entry does not exist, lets try to create it
-				list($top) = explode(',',$dn);
-				list($var,$val) = explode('=',$top);
+				list($top) = explode(',', $dn);
+				list($var, $val) = explode('=', $top);
 				$data = array(
 					'objectClass' => $var == 'cn' ? 'organizationalRole' : 'organizationalUnit',
 					$var => $val,
 				);
-				if(!@ldap_add($adminDS, $dn, $data))
+				if (!@ldap_add($adminDS, $dn, $data))
 				{
 					//echo "<p>ldap_add($adminDS,'$dn',".print_r($data,true).")</p>\n";
-					$err = lang("Can't create dn %1",$dn).': '.$this->_error(__LINE__,$adminDS);
+					$err = lang("Can't create dn %1", $dn).': '.$this->_error(__LINE__, $adminDS);
 					$adminLDAP->ldapDisconnect();
 					return $err;
 				}
@@ -1184,7 +1182,7 @@ 
 	 * @param int $line
 	 * @return string
 	 */
-	function _error($line,$ds=null)
+	function _error($line, $ds = null)
 	{
 		return ldap_error($ds ? $ds : $this->ds).': '.__CLASS__.': '.$line;
 	}
@@ -1199,27 +1197,27 @@ 
 	 * @param array $data eGW contact data
 	 * @param boolean $isUpdate
 	 */
-	function _egw2evolutionperson(&$ldapContact,$data,$isUpdate)
+	function _egw2evolutionperson(&$ldapContact, $data, $isUpdate)
 	{
-		if(!empty($data['cat_id']))
+		if (!empty($data['cat_id']))
 		{
 			$ldapContact['category'] = array();
-			foreach(is_array($data['cat_id']) ? $data['cat_id'] : explode(',',$data['cat_id'])  as $cat)
+			foreach (is_array($data['cat_id']) ? $data['cat_id'] : explode(',', $data['cat_id'])  as $cat)
 			{
 				$ldapContact['category'][] = translation::convert(
-					ExecMethod('phpgwapi.categories.id2name',$cat),$this->charset,'utf-8');
+					ExecMethod('phpgwapi.categories.id2name', $cat), $this->charset, 'utf-8');
 			}
 		}
-		foreach(array(
-			'postaladdress' => $data['adr_one_street'] .'$'. $data['adr_one_locality'] .', '. $data['adr_one_region'] .'$'. $data['adr_one_postalcode'] .'$$'. $data['adr_one_countryname'],
-			'homepostaladdress' => $data['adr_two_street'] .'$'. $data['adr_two_locality'] .', '. $data['adr_two_region'] .'$'. $data['adr_two_postalcode'] .'$$'. $data['adr_two_countryname'],
+		foreach (array(
+			'postaladdress' => $data['adr_one_street'].'$'.$data['adr_one_locality'].', '.$data['adr_one_region'].'$'.$data['adr_one_postalcode'].'$$'.$data['adr_one_countryname'],
+			'homepostaladdress' => $data['adr_two_street'].'$'.$data['adr_two_locality'].', '.$data['adr_two_region'].'$'.$data['adr_two_postalcode'].'$$'.$data['adr_two_countryname'],
 		) as $attr => $value)
 		{
-			if($value != '$, $$$')
+			if ($value != '$, $$$')
 			{
-				$ldapContact[$attr] = translation::convert($value,$this->charset,'utf-8');
+				$ldapContact[$attr] = translation::convert($value, $this->charset, 'utf-8');
 			}
-			elseif($isUpdate)
+			elseif ($isUpdate)
 			{
 				$ldapContact[$attr] = array();
 			}
@@ -1229,7 +1227,7 @@ 
 		{
 			$ldapContact['primaryphone'] = $data[$data['tel_prefer']];
 		}
-		elseif($isUpdate)
+		elseif ($isUpdate)
 		{
 			$ldapContact['primaryphone'] = array();
 		}
@@ -1244,23 +1242,23 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _evolutionperson2egw(&$contact,$data)
+	function _evolutionperson2egw(&$contact, $data)
 	{
 		if ($data['category'] && is_array($data['category']))
 		{
 			$contact['cat_id'] = array();
-			foreach($data['category'] as $iii => $cat)
+			foreach ($data['category'] as $iii => $cat)
 			{
 				if (!is_int($iii)) continue;
 
-				$contact['cat_id'][] = ExecMethod('phpgwapi.categories.name2id',$cat);
+				$contact['cat_id'][] = ExecMethod('phpgwapi.categories.name2id', $cat);
 			}
-			if ($contact['cat_id']) $contact['cat_id'] = implode(',',$contact['cat_id']);
+			if ($contact['cat_id']) $contact['cat_id'] = implode(',', $contact['cat_id']);
 		}
 		if ($data['primaryphone'])
 		{
-			unset($contact['tel_prefer']);	// to not find itself
-			$contact['tel_prefer'] = array_search($data['primaryphone'][0],$contact);
+			unset($contact['tel_prefer']); // to not find itself
+			$contact['tel_prefer'] = array_search($data['primaryphone'][0], $contact);
 		}
 	}
 
@@ -1273,10 +1271,10 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _inetorgperson2egw(&$contact, $data, $cn='cn')
+	function _inetorgperson2egw(&$contact, $data, $cn = 'cn')
 	{
 		$matches = null;
-		if(empty($data['givenname'][0]))
+		if (empty($data['givenname'][0]))
 		{
 			$parts = explode($data['sn'][0], $data[$cn][0]);
 			$contact['n_prefix'] = trim($parts[0]);
@@ -1284,8 +1282,8 @@ 
 		}
 		// iOS addressbook either use "givenname surname" or "surname givenname" depending on contact preference display-order
 		// in full name, so we need to check for both when trying to parse prefix, middle name and suffix form full name
-		elseif (preg_match($preg='/^(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*) *'.preg_quote($data['sn'][0], '/').' *(.*)$/', $data[$cn][0], $matches) ||
-			preg_match($preg='/^(.*) *'.preg_quote($data['sn'][0], '/').'[, ]*(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*)$/', $data[$cn][0], $matches))
+		elseif (preg_match($preg = '/^(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*) *'.preg_quote($data['sn'][0], '/').' *(.*)$/', $data[$cn][0], $matches) ||
+			preg_match($preg = '/^(.*) *'.preg_quote($data['sn'][0], '/').'[, ]*(.*) *'.preg_quote($data['givenname'][0], '/').' *(.*)$/', $data[$cn][0], $matches))
 		{
 			list(,$contact['n_prefix'], $contact['n_middle'], $contact['n_suffix']) = $matches;
 			//error_log(__METHOD__."() preg_match('$preg', '{$data[$cn][0]}') = ".array2string($matches));
@@ -1306,11 +1304,11 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _posixaccount2egw(&$contact,$data)
+	function _posixaccount2egw(&$contact, $data)
 	{
-		unset($contact);	// not used, but required by function signature
-		static $shadowExpireNow=null;
-		if (!isset($shadowExpireNow)) $shadowExpireNow = floor((time()-date('Z'))/86400);
+		unset($contact); // not used, but required by function signature
+		static $shadowExpireNow = null;
+		if (!isset($shadowExpireNow)) $shadowExpireNow = floor((time() - date('Z')) / 86400);
 
 		// exclude expired or deactivated accounts
 		if (isset($data['shadowexpire']) && $data['shadowexpire'][0] <= $shadowExpireNow)
@@ -1328,11 +1326,11 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _mozillaabpersonalpha2egw(&$contact,$data)
+	function _mozillaabpersonalpha2egw(&$contact, $data)
 	{
 		if ($data['c'])
 		{
-			$contact['adr_one_countryname'] = ExecMethod('phpgwapi.country.get_full_name',$data['c'][0]);
+			$contact['adr_one_countryname'] = ExecMethod('phpgwapi.country.get_full_name', $data['c'][0]);
 		}
 	}
 
@@ -1346,7 +1344,7 @@ 
 	 * @param array $data eGW contact data
 	 * @param boolean $isUpdate
 	 */
-	function _egw2mozillaabpersonalpha(&$ldapContact,$data,$isUpdate)
+	function _egw2mozillaabpersonalpha(&$ldapContact, $data, $isUpdate)
 	{
 		if ($data['adr_one_countrycode'])
 		{
@@ -1354,7 +1352,7 @@ 
 		}
 		elseif ($data['adr_one_countryname'])
 		{
-			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']);
+			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code', $data['adr_one_countryname']);
 			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
 			{
 				$ldapContact['c'] = array(); // should return error...
@@ -1375,9 +1373,9 @@ 
 	 * @param array &$contact already copied fields according to the mapping
 	 * @param array $data eGW contact data
 	 */
-	function _mozillaorgperson2egw(&$contact,$data)
+	function _mozillaorgperson2egw(&$contact, $data)
 	{
-		unset($contact, $data);	// not used, but required by function signature
+		unset($contact, $data); // not used, but required by function signature
 		// no special handling necessary, as it supports two distinct attributes: c, cn
 	}
 
@@ -1391,7 +1389,7 @@ 
 	 * @param array $data eGW contact data
 	 * @param boolean $isUpdate
 	 */
-	function _egw2mozillaorgperson(&$ldapContact,$data,$isUpdate)
+	function _egw2mozillaorgperson(&$ldapContact, $data, $isUpdate)
 	{
 		if ($data['adr_one_countrycode'])
 		{
@@ -1400,7 +1398,7 @@ 
 		}
 		elseif ($data['adr_one_countryname'])
 		{
-			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']);
+			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code', $data['adr_one_countryname']);
 			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
 			{
 				$ldapContact['c'] = array(); // should return error...
@@ -1419,7 +1417,7 @@ 
 	 * @param int $account_id account-id of the old owner
 	 * @param int $new_owner account-id of the new owner
 	 */
-	function change_owner($account_id,$new_owner)
+	function change_owner($account_id, $new_owner)
 	{
 		error_log("so_ldap::change_owner($account_id,$new_owner) not yet implemented");
 	}

Braces +89 added lines, -23 removed lines

@@ -327,9 +327,12 @@ 
 			$this->ds = Api\Ldap::factory();
 		}
 		// if ldap is NOT the contact repository, we only do accounts and need to use the account-data
-		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'],-4) != 'ldap')	// not (ldap or sql-ldap)
+		elseif (substr($GLOBALS['egw_info']['server']['contact_repository'],-4) != 'ldap')
+		{
+			// not (ldap or sql-ldap)
 		{
 			$this->ldap_config['ldap_contact_host'] = $this->ldap_config['ldap_host'];
+		}
 			$this->allContactsDN = $this->ldap_config['ldap_context'];
 			$this->ds = Api\Ldap::factory();
 		}
@@ -413,7 +416,10 @@ 
 		}
 		else
 		{
-			if (is_array($contact_id)) $contact_id = isset ($contact_id['id']) ? $contact_id['id'] : $contact_id['uid'];
+			if (is_array($contact_id))
+			{
+				$contact_id = isset ($contact_id['id']) ? $contact_id['id'] : $contact_id['uid'];
+			}
 			$filter = $this->id_filter($contact_id);
 		}
 		$rows = $this->_searchLDAP($this->allContactsDN,
@@ -517,7 +523,10 @@ 
 		// add for all supported objectclasses the objectclass and it's attributes
 		foreach($this->schema2egw as $objectclass => $mapping)
 		{
-			if(!$this->ldapServerInfo->supportsObjectClass($objectclass)) continue;
+			if(!$this->ldapServerInfo->supportsObjectClass($objectclass))
+			{
+				continue;
+			}
 
 			if($objectclass != 'posixaccount' && !in_array($objectclass, $oldObjectclasses))
 			{
@@ -535,7 +544,10 @@ 
 			}
 			foreach($mapping as $egwFieldName => $ldapFieldName)
 			{
-				if (is_int($egwFieldName)) continue;
+				if (is_int($egwFieldName))
+				{
+					continue;
+				}
 				if(!empty($data[$egwFieldName]))
 				{
 					// dont convert the (binary) jpegPhoto!
@@ -671,7 +683,10 @@ 
 	function delete($keys=null)
 	{
 		// single entry
-		if($keys[$this->contacts_id]) $keys = array( 0 => $keys);
+		if($keys[$this->contacts_id])
+		{
+			$keys = array( 0 => $keys);
+		}
 
 		if(!is_array($keys))
 		{
@@ -760,7 +775,10 @@ 
 
 		if((int)$filter['owner'])
 		{
-			if (!($accountName = $GLOBALS['egw']->accounts->id2name($filter['owner']))) return false;
+			if (!($accountName = $GLOBALS['egw']->accounts->id2name($filter['owner'])))
+			{
+				return false;
+			}
 
 			$searchDN = 'cn='. Api\Ldap::quote(strtolower($accountName)) .',';
 
@@ -856,7 +874,10 @@ 
 			$sort = 'ASC';
 			foreach(explode(',',$order_by) as $o)
 			{
-				if (substr($o,0,8) == 'contact_') $o = substr($o,8);
+				if (substr($o,0,8) == 'contact_')
+				{
+					$o = substr($o,8);
+				}
 				if (substr($o,-4) == ' ASC')
 				{
 					$sort = 'ASC';
@@ -898,12 +919,18 @@ 
 	 */
 	function _colFilter($filter)
 	{
-		if (!is_array($filter)) return '';
+		if (!is_array($filter))
+		{
+			return '';
+		}
 
 		$filters = '';
 		foreach($filter as $key => $value)
 		{
-			if ($key != 'cat_id' && $key != 'account_id' && !$value) continue;
+			if ($key != 'cat_id' && $key != 'account_id' && !$value)
+			{
+				continue;
+			}
 
 			switch((string) $key)
 			{
@@ -935,19 +962,28 @@ 
 							$GLOBALS['egw']->categories = new Api\Categories();
 						}
 						$cats = $GLOBALS['egw']->categories->return_all_children((int)$value);
-						if (count($cats) > 1) $filters .= '(|';
+						if (count($cats) > 1)
+						{
+							$filters .= '(|';
+						}
 						foreach($cats as $cat)
 						{
 							$catName = Api\Translation::convert(
 								$GLOBALS['egw']->categories->id2name($cat),$this->charset,'utf-8');
 							$filters .= '(category='.Api\Ldap::quote($catName).')';
 						}
-						if (count($cats) > 1) $filters .= ')';
+						if (count($cats) > 1)
+						{
+							$filters .= ')';
+						}
 					}
 					break;
 
 				case 'carddav_name':
-					if (!is_array($value)) $value = array($value);
+					if (!is_array($value))
+					{
+						$value = array($value);
+					}
 					foreach($value as &$v)
 					{
 						$v = basename($v, '.vcf');
@@ -977,7 +1013,10 @@ 
 					elseif (preg_match("/^([^ ]+) ".preg_quote($GLOBALS['egw']->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE])." '(.*)%'$/",$value,$matches))
 					{
 						list(,$name,$value) = $matches;
-						if (strpos($name,'.') !== false) list(,$name) = explode('.',$name);
+						if (strpos($name,'.') !== false)
+						{
+							list(,$name) = explode('.',$name);
+						}
 						foreach($this->schema2egw as $mapping)
 						{
 							if (isset($mapping[$name]))
@@ -1028,13 +1067,20 @@ 
 		{
 			$result = @ldap_list($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit);
 		}
-		if(!$result || !$entries = ldap_get_entries($this->ds, $result)) return array();
+		if(!$result || !$entries = ldap_get_entries($this->ds, $result))
+		{
+			return array();
+		}
 		//error_log(__METHOD__."('$_ldapContext', '$_filter', ".array2string($_attributes).", $_addressbooktype) result of $entries[count]");
 
 		$this->total = $entries['count'];
 		foreach($entries as $i => $entry)
 		{
-			if (!is_int($i)) continue;	// eg. count
+			if (!is_int($i))
+			{
+				continue;
+			}
+			// eg. count
 
 			$contact = array(
 				'id'  => $entry['uid'][0] ? $entry['uid'][0] : $entry['entryuuid'][0],
@@ -1254,11 +1300,17 @@ 
 			$contact['cat_id'] = array();
 			foreach($data['category'] as $iii => $cat)
 			{
-				if (!is_int($iii)) continue;
+				if (!is_int($iii))
+				{
+					continue;
+				}
 
 				$contact['cat_id'][] = $GLOBALS['egw']->categories->name2id($cat);
 			}
-			if ($contact['cat_id']) $contact['cat_id'] = implode(',',$contact['cat_id']);
+			if ($contact['cat_id'])
+			{
+				$contact['cat_id'] = implode(',',$contact['cat_id']);
+			}
 		}
 		if ($data['primaryphone'])
 		{
@@ -1313,7 +1365,10 @@ 
 	{
 		unset($contact);	// not used, but required by function signature
 		static $shadowExpireNow=null;
-		if (!isset($shadowExpireNow)) $shadowExpireNow = floor((time()-date('Z'))/86400);
+		if (!isset($shadowExpireNow))
+		{
+			$shadowExpireNow = floor((time()-date('Z'))/86400);
+		}
 
 		// exclude expired or deactivated accounts
 		if (isset($data['shadowexpire']) && $data['shadowexpire'][0] <= $shadowExpireNow)
@@ -1358,9 +1413,13 @@ 
 		elseif ($data['adr_one_countryname'])
 		{
 			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']);
-			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
+			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)
+			{
+				// Bad countryname when "custom" selected!
 			{
-				$ldapContact['c'] = array(); // should return error...
+				$ldapContact['c'] = array();
+			}
+			// should return error...
 			}
 		}
 		elseif ($isUpdate)
@@ -1399,14 +1458,21 @@ 
 		if ($data['adr_one_countrycode'])
 		{
 			$ldapContact['c'] = $data['adr_one_countrycode'];
-			if ($isUpdate) $ldapContact['co'] = array();
+			if ($isUpdate)
+			{
+				$ldapContact['co'] = array();
+			}
 		}
 		elseif ($data['adr_one_countryname'])
 		{
 			$ldapContact['c'] = ExecMethod('phpgwapi.country.country_code',$data['adr_one_countryname']);
-			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)	// Bad countryname when "custom" selected!
+			if ($ldapContact['c'] && strlen($ldapContact['c']) > 2)
 			{
-				$ldapContact['c'] = array(); // should return error...
+				// Bad countryname when "custom" selected!
+			{
+				$ldapContact['c'] = array();
+			}
+			// should return error...
 			}
 		}
 		elseif ($isUpdate)

addressbook/inc/class.addressbook_sif.inc.php

Doc Comments -3 removed lines

@@ -196,9 +196,6 @@
 	* import a vard into addressbook
 	*
 	* @return int contact id
-	* @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
 	*/
 	function addSIF($_sifdata, $_abID=null, $merge=false)
 	{

Indentation +15 added lines, -15 removed lines

@@ -193,13 +193,13 @@ 
 	}
 
 	/**
-	* import a vard into addressbook
-	*
-	* @return int contact id
-	* @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
-	*/
+	 * import a vard into addressbook
+	 *
+	 * @return int contact id
+	 * @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
+	 */
 	function addSIF($_sifdata, $_abID=null, $merge=false)
 	{
 		if (!$contact = $this->siftoegw($_sifdata))
@@ -242,21 +242,21 @@ 
 			$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));
 			}
-    	}
+		}
 		return $this->save($contact);
 	}
 
 	/**
-	* return a sifc
-	*
-	* @param int	$_id		the id of the contact
-	* @return string containing the vcard
-	*/
+	 * return a sifc
+	 *
+	 * @param int	$_id		the id of the contact
+	 * @return string containing the vcard
+	 */
 	function getSIF($_id)
 	{
 		$sysCharSet	= $GLOBALS['egw']->translation->charset();

Spacing +8 added lines, -8 removed lines

@@ -157,7 +157,7 @@ 
 					break;
 
 				case 'private':
-					$finalContact[$key] = (int) ($value > 0);	// eGW private is 0 (public) or 1 (private), SIF seems to use 0 and 2
+					$finalContact[$key] = (int)($value > 0); // eGW private is 0 (public) or 1 (private), SIF seems to use 0 and 2
 					break;
 
 				default:
@@ -177,7 +177,7 @@ 
 	 * @param string $_sifdata
 	 * @return array of matching contact-ids
 	 */
-	function search($_sifdata, $contentID=null, $relax=false)
+	function search($_sifdata, $contentID = null, $relax = false)
 	{
 	  	$result = array();
 
@@ -200,7 +200,7 @@ 
 	* @param int/string	$_abID=null		the internal addressbook id or !$_abID for a new enty
 	* @param boolean $merge=false	merge data with existing entry
 	*/
-	function addSIF($_sifdata, $_abID=null, $merge=false)
+	function addSIF($_sifdata, $_abID = null, $merge = false)
 	{
 		if (!$contact = $this->siftoegw($_sifdata))
 		{
@@ -229,7 +229,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
 					{
@@ -245,7 +245,7 @@ 
     	{
     		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));
 			}
     	}
 		return $this->save($contact);
@@ -259,14 +259,14 @@ 
 	*/
 	function getSIF($_id)
 	{
-		$sysCharSet	= $GLOBALS['egw']->translation->charset();
+		$sysCharSet = $GLOBALS['egw']->translation->charset();
 
 		$fields = array_unique(array_values($this->sifMapping));
 		sort($fields);
 
 		if (!($entry = $this->read($_id))) return false;
 
-		$sifContact = self::xml_decl . "\n<contact>" . self::SIF_decl;
+		$sifContact = self::xml_decl."\n<contact>".self::SIF_decl;
 
 		#error_log(print_r($entry,true));
 
@@ -285,7 +285,7 @@ 
 			switch ($sifField)
 			{
 				case 'Sensitivity':
-					$value = 2 * $value;	// eGW private is 0 (public) or 1 (private)
+					$value = 2 * $value; // eGW private is 0 (public) or 1 (private)
 					$sifContact .= "<$sifField>$value</$sifField>";
 					break;
 

Braces +17 added lines, -7 removed lines

@@ -146,7 +146,8 @@ 
 		{
 			$value = preg_replace('/<\!\[CDATA\[(.+)\]\]>/Usim', '$1', $value);
 			$value = $GLOBALS['egw']->translation->convert($value, 'utf-8');
-			switch ($key) {
+			switch ($key)
+			{
 				case 'cat_id':
 					if (!empty($value))
 					{
@@ -242,9 +243,9 @@ 
 			$contact['id'] = $_abID;
 		}
 		else
-    	{
+		{
     		if (is_array($contact['cat_id']))
-			{
+    		{
 				$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));
 			}
     	}
@@ -264,7 +265,10 @@ 
 		$fields = array_unique(array_values($this->sifMapping));
 		sort($fields);
 
-		if (!($entry = $this->read($_id))) return false;
+		if (!($entry = $this->read($_id)))
+		{
+			return false;
+		}
 
 		$sifContact = self::xml_decl . "\n<contact>" . self::SIF_decl;
 
@@ -275,7 +279,10 @@ 
 
 		foreach ($this->sifMapping as $sifField => $egwField)
 		{
-			if (empty($egwField)) continue;
+			if (empty($egwField))
+			{
+				continue;
+			}
 
 			#error_log("$sifField => $egwField");
 			#error_log('VALUE1: '.$entry[0][$egwField]);
@@ -295,10 +302,13 @@ 
 					break;
 
 				case 'Categories':
-					if (!empty($value)) {
+					if (!empty($value))
+					{
 						$value = implode(", ", $this->get_categories($value));
 						$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
-					} else {
+					}
+					else
+					{
 						break;
 					}