EGroupware / egroupware

addressbook/inc/class.addressbook_ui.inc.php

Indentation +8 added lines, -8 removed lines

@@ -1885,12 +1885,12 @@ 
 	}
 
 	/**
-	* Edit a contact
-	*
-	* @param array $content=null submitted content
-	* @param int $_GET['contact_id'] contact_id mainly for popup use
-	* @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
-	*/
+	 * Edit a contact
+	 *
+	 * @param array $content=null submitted content
+	 * @param int $_GET['contact_id'] contact_id mainly for popup use
+	 * @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
+	 */
 	function edit($content=null)
 	{
 		if (is_array($content))
@@ -3069,8 +3069,8 @@ 
 	}
 
 	/**
-	* Set up history log widget
-	*/
+	 * Set up history log widget
+	 */
 	protected function setup_history(&$content, &$sel_options)
 	{
 		if ($this->contact_repository == 'ldap' || !$content['id'] ||

Doc Comments +9 added lines, -13 removed lines

@@ -112,9 +112,8 @@ 
 	/**
 	 * List contacts of an addressbook
 	 *
-	 * @param array $content=null submitted content
-	 * @param string $msg=null	message to show
-	 * @param boolean $do_email=false do an email-selection popup or the regular index-page
+	 * @param array $content submitted content
+	 * @param boolean $do_email do an email-selection popup or the regular index-page
 	 */
 	function index($content=null,$msg=null,$do_email=false)
 	{
@@ -353,8 +352,8 @@ 
 	/**
 	 * Get actions / context menu items
 	 *
-	 * @param string $tid_filter=null
-	 * @param string $org_view=null
+	 * @param string $tid_filter
+	 * @param string $org_view
 	 * @return array see nextmatch_widget::get_actions()
 	 */
 	public function get_actions($tid_filter=null, $org_view=null)
@@ -762,8 +761,7 @@ 
 	/**
 	 * Email address-selection popup
 	 *
-	 * @param array $content=null submitted content
-	 * @param string $msg=null	message to show
+	 * @param array $content submitted content
 	 */
 	function emailpopup($content=null,$msg=null)
 	{
@@ -952,7 +950,7 @@ 
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 contacts 'deleted'
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
-	 * @return boolean true if all actions succeded, false otherwise
+	 * @return null|boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg, $checkboxes = NULL)
 	{
@@ -1303,7 +1301,7 @@ 
 	 * @param array &$query
 	 * @param array &$rows returned rows/cups
 	 * @param array &$readonlys eg. to disable buttons based on acl
-	 * @param boolean $id_only=false if true only return (via $rows) an array of contact-ids, dont save state to session
+	 * @param boolean $id_only if true only return (via $rows) an array of contact-ids, dont save state to session
 	 * @return int total number of contacts matching the selection
 	 */
 	function get_rows(&$query,&$rows,&$readonlys,$id_only=false)
@@ -1798,9 +1796,7 @@ 
 	/**
 	* Edit a contact
 	*
-	* @param array $content=null submitted content
-	* @param int $_GET['contact_id'] contact_id mainly for popup use
-	* @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
+	* @param array $content submitted content
 	*/
 	function edit($content=null)
 	{
@@ -2375,7 +2371,7 @@ 
 	 *
 	 * @param array $values contact values from form
 	 * @param string $name name of changed value, eg. "email"
-	 * @param int $own_id=0 own contact id, to not check against it
+	 * @param int $own_id own contact id, to not check against it
 	 * @return array with keys 'msg' => "EMail address exists, do you want to open contact?" (or null if not existing)
 	 * 	'data' => array of id => "full name (addressbook)" pairs
 	 *  'fileas_options'

Spacing +438 added lines, -445 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @param string $contact_app
 	 */
-	function __construct($contact_app='addressbook')
+	function __construct($contact_app = 'addressbook')
 	{
 		parent::__construct($contact_app);
 
@@ -84,23 +84,23 @@ 
 		);
 
 		// make sure the hook for export_limit is registered
-		if (!$GLOBALS['egw']->hooks->hook_exists('export_limit','addressbook')) $GLOBALS['egw']->hooks->register_single_app_hook('addressbook','export_limit');
+		if (!$GLOBALS['egw']->hooks->hook_exists('export_limit', 'addressbook')) $GLOBALS['egw']->hooks->register_single_app_hook('addressbook', 'export_limit');
 
-		$this->config =& $GLOBALS['egw_info']['server'];
+		$this->config = & $GLOBALS['egw_info']['server'];
 
 		// check if a contact specific export limit is set, if yes use it also for etemplate's csv export
-		$this->config['export_limit'] = $this->config['contact_export_limit'] = bo_merge::getExportLimit($app='addressbook');
+		$this->config['export_limit'] = $this->config['contact_export_limit'] = bo_merge::getExportLimit($app = 'addressbook');
 
 		if ($this->config['copy_fields'] && ($fields = is_array($this->config['copy_fields']) ?
 			$this->config['copy_fields'] : unserialize($this->config['copy_fields'])))
 		{
 			// Set country code if country name is selected
-			$supported_fields = $this->get_fields('supported',null,0);
-			if(in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname',$fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $fields))
 			{
 				$fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $fields))
 			{
 				$fields[] = 'adr_two_countrycode';
 			}
@@ -116,7 +116,7 @@ 
 	 * @param string $msg=null	message to show
 	 * @param boolean $do_email=false do an email-selection popup or the regular index-page
 	 */
-	function index($content=null,$msg=null,$do_email=false)
+	function index($content = null, $msg = null, $do_email = false)
 	{
 		//echo "<p>uicontacts::index(".print_r($content,true).",'$msg')</p>\n";
 		if (($re_submit = is_array($content)))
@@ -147,16 +147,16 @@ 
 				}
 				else
 				{
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,$content['do_email'] ? 'email' : 'index',$msg,$content['nm']['checkboxes']))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, $content['do_email'] ? 'email' : 'index', $msg, $content['nm']['checkboxes']))
 					{
-						$msg .= lang('%1 contact(s) %2',$success,$action_msg);
+						$msg .= lang('%1 contact(s) %2', $success, $action_msg);
 						egw_framework::message($msg);
 					}
-					elseif(is_null($msg))
+					elseif (is_null($msg))
 					{
-						$msg .= lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-						egw_framework::message($msg,'error');
+						$msg .= lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+						egw_framework::message($msg, 'error');
 					}
 					$msg = '';
 				}
@@ -176,9 +176,9 @@ 
 			}
 			$typeselection = $content['nm']['col_filter']['tid'];
 		}
-		elseif($_GET['add_list'])
+		elseif ($_GET['add_list'])
 		{
-			$list = $this->add_list($_GET['add_list'],$_GET['owner']?$_GET['owner']:$this->user);
+			$list = $this->add_list($_GET['add_list'], $_GET['owner'] ? $_GET['owner'] : $this->user);
 			if ($list === true)
 			{
 				$msg = lang('List already exists!');
@@ -197,31 +197,31 @@ 
 		);
 		$to = $content['nm']['to'];
 		$content = array();
-		if($msg || $_GET['msg'])
+		if ($msg || $_GET['msg'])
 		{
 			egw_framework::message($msg ? $msg : $_GET['msg']);
 		}
 
-		$content['nm'] = egw_session::appsession($do_email ? 'email' : 'index','addressbook');
+		$content['nm'] = egw_session::appsession($do_email ? 'email' : 'index', 'addressbook');
 		if (!is_array($content['nm']))
 		{
 			$content['nm'] = array(
-				'get_rows'       =>	'addressbook.addressbook_ui.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-				'bottom_too'     => false,		// I  show the nextmatch-line (arrows, filters, search, ...) again after the rows
-				'never_hide'     => True,		// I  never hide the nextmatch-line if less then maxmatch entrie
-				'start'          =>	0,			// IO position in list
-				'cat_id'         =>	'',			// IO category, if not 'no_cat' => True
-				'search'         =>	'',			// IO search pattern
-				'order'          =>	'n_family',	// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'ASC',		// IO direction of the sort: 'ASC' or 'DESC'
-				'col_filter'     =>	array(),	// IO array of column-name value pairs (optional for the filterheaders)
-				'filter_label'   =>	lang('Addressbook'),	// I  label for filter    (optional)
-				'filter'         =>	'',	// =All	// IO filter, if not 'no_filter' => True
-				'filter_no_lang' => True,		// I  set no_lang for filter (=dont translate the options)
-				'no_filter2'     => True,		// I  disable the 2. filter (params are the same as for filter)
-				'filter2_label'  =>	lang('Distribution lists'),			// IO filter2, if not 'no_filter2' => True
-				'filter2'        =>	'',			// IO filter2, if not 'no_filter2' => True
-				'filter2_no_lang'=> True,		// I  set no_lang for filter2 (=dont translate the options)
+				'get_rows'       =>	'addressbook.addressbook_ui.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+				'bottom_too'     => false, // I  show the nextmatch-line (arrows, filters, search, ...) again after the rows
+				'never_hide'     => True, // I  never hide the nextmatch-line if less then maxmatch entrie
+				'start'          =>	0, // IO position in list
+				'cat_id'         =>	'', // IO category, if not 'no_cat' => True
+				'search'         =>	'', // IO search pattern
+				'order'          =>	'n_family', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
+				'col_filter'     =>	array(), // IO array of column-name value pairs (optional for the filterheaders)
+				'filter_label'   =>	lang('Addressbook'), // I  label for filter    (optional)
+				'filter'         =>	'', // =All	// IO filter, if not 'no_filter' => True
+				'filter_no_lang' => True, // I  set no_lang for filter (=dont translate the options)
+				'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+				'filter2_label'  =>	lang('Distribution lists'), // IO filter2, if not 'no_filter2' => True
+				'filter2'        =>	'', // IO filter2, if not 'no_filter2' => True
+				'filter2_no_lang'=> True, // I  set no_lang for filter2 (=dont translate the options)
 				'lettersearch'   => true,
 				'do_email'       => $do_email ? 1 : 0,
 				// using a positiv list now, as we constantly adding new columns in addressbook, but not removing them from default
@@ -231,7 +231,7 @@ 
 				/* old negative list
 				'default_cols'   => '!cat_id,contact_created_contact_modified,distribution_list,contact_id,owner,room',*/
 				'filter2_onchange' => "app.addressbook.filter2_onchange();",
-				'manual'         => $do_email ? ' ' : false,	// space for the manual icon
+				'manual'         => $do_email ? ' ' : false, // space for the manual icon
 				//'actions'        => $this->get_actions(),		// set on each request, as it depends on some filters
 				'row_id'         => 'id',
 				'row_modified'   => 'modified',
@@ -246,13 +246,13 @@ 
 			// use the state of the last session stored in the user prefs
 			if (($state = @unserialize($this->prefs[$do_email ? 'email_state' : 'index_state'])))
 			{
-				$content['nm'] = array_merge($content['nm'],$state);
+				$content['nm'] = array_merge($content['nm'], $state);
 			}
 		}
 		$sel_options['cat_id'] = array('' => lang('all'), '0' => lang('None'));
 
 		// Edit and delete list actions depends on permissions
-		if($this->get_lists(EGW_ACL_EDIT))
+		if ($this->get_lists(EGW_ACL_EDIT))
 		{
 			$content['nm']['placeholder_actions'][] = 'rename_list';
 			$content['nm']['placeholder_actions'][] = 'delete_list';
@@ -265,11 +265,11 @@ 
 		if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection;
 		// save the tid for use in creating new addressbook entrys via UI. Current tid is to be used as type of new entrys
 		//error_log(__METHOD__.__LINE__.' '.$content['nm']['col_filter']['tid']);
-		egw_cache::setSession('addressbook','active_tid',$content['nm']['col_filter']['tid']);
+		egw_cache::setSession('addressbook', 'active_tid', $content['nm']['col_filter']['tid']);
 		if ($this->lists_available())
 		{
-			$sel_options['filter2'] = $this->get_lists(EGW_ACL_READ,array('' => lang('none')));
-			$sel_options['filter2']['add'] = lang('Add a new list').'...';	// put it at the end
+			$sel_options['filter2'] = $this->get_lists(EGW_ACL_READ, array('' => lang('none')));
+			$sel_options['filter2']['add'] = lang('Add a new list').'...'; // put it at the end
 		}
 		if ($do_email)
 		{
@@ -287,11 +287,11 @@ 
 			$content['nm']['header_left'] = 'addressbook.email.left';
 		}
 		// Organisation stuff is not (yet) availible with ldap
-		elseif($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
+		elseif ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
 		{
 			$content['nm']['header_left'] = 'addressbook.index.left';
 		}
-		$sel_options['filter'] = $sel_options['owner'] = $this->get_addressbooks(EGW_ACL_READ,lang('All'));
+		$sel_options['filter'] = $sel_options['owner'] = $this->get_addressbooks(EGW_ACL_READ, lang('All'));
 		$sel_options['to'] = array(
 			'to'  => 'To',
 			'cc'  => 'Cc',
@@ -300,13 +300,13 @@ 
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('No country selected');
 
 		// if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export
-		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit'];
+		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit'] = $this->config['contact_export_limit'];
 
 		// dont show tid-selection if we have only one content_type
 		// be a bit more sophisticated about it
 		$content['nm']['header_right'] = 'addressbook.index.right_add';
 		$availabletypes = array_keys($this->content_types);
-		if ($content['nm']['col_filter']['tid'] && !in_array($content['nm']['col_filter']['tid'],$availabletypes))
+		if ($content['nm']['col_filter']['tid'] && !in_array($content['nm']['col_filter']['tid'], $availabletypes))
 		{
 			//_debug_array(array('Typefilter:'=> $content['nm']['col_filter']['tid'],'Available Types:'=>$availabletypes,'action:'=>'remove invalid filter'));
 			unset($content['nm']['col_filter']['tid']);
@@ -314,7 +314,7 @@ 
 		if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0];
 		if (count($this->content_types) > 1)
 		{
-			foreach($this->content_types as $tid => $data)
+			foreach ($this->content_types as $tid => $data)
 			{
 				$sel_options['tid'][$tid] = $data['name'];
 			}
@@ -332,22 +332,22 @@ 
 
 		$content['nm']['actions'] = $this->get_actions($content['nm']['col_filter']['tid'], $content['nm']['org_view']);
 
-		if (!isset($sel_options['org_view'][(string) $content['nm']['org_view']]))
+		if (!isset($sel_options['org_view'][(string)$content['nm']['org_view']]))
 		{
 			$sel_options['org_view'] += $this->_get_org_name((string)$content['nm']['org_view']);
 		}
 		// unset the filters regarding organisations, when there is no organisation selected
-		if (empty($sel_options['org_view'][(string) $content['nm']['org_view']]) || stripos($org_view,":") === false )
+		if (empty($sel_options['org_view'][(string)$content['nm']['org_view']]) || stripos($org_view, ":") === false)
 		{
 			unset($content['nm']['col_filter']['org_name']);
 			unset($content['nm']['col_filter']['org_unit']);
 			unset($content['nm']['col_filter']['adr_one_locality']);
 		}
-		$content['nm']['org_view_label'] = $sel_options['org_view'][(string) $content['nm']['org_view']];
+		$content['nm']['org_view_label'] = $sel_options['org_view'][(string)$content['nm']['org_view']];
 
 		$this->tmpl->read($do_email ? 'addressbook.email' : 'addressbook.index');
 		return $this->tmpl->exec($do_email ? 'addressbook.addressbook_ui.emailpopup' : 'addressbook.addressbook_ui.index',
-			$content,$sel_options,$readonlys,$preserv,$do_email ? 2 : 0);
+			$content, $sel_options, $readonlys, $preserv, $do_email ? 2 : 0);
 	}
 
 	/**
@@ -357,17 +357,17 @@ 
 	 * @param string $org_view=null
 	 * @return array see nextmatch_widget::get_actions()
 	 */
-	public function get_actions($tid_filter=null, $org_view=null)
+	public function get_actions($tid_filter = null, $org_view = null)
 	{
 		// we have no org view (view of one org has context menu like regular "add contacts" view, as it shows contacts
-		if (!isset($this->org_views[(string) $org_view]))
+		if (!isset($this->org_views[(string)$org_view]))
 		{
 			$actions = array(
 				'view' => array(
 					'caption' => 'CRM-View',
 					'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] != '~edit~',
 					'allowOnMultiple' => false,
-					'group' => $group=1,
+					'group' => $group = 1,
 					'onExecute' => 'javaScript:app.addressbook.view',
 					// Children added below
 					'children' => array()
@@ -402,14 +402,14 @@ 
 			);
 			// CRM view options
 			$crm_count = 0;
-			$crm_apps = array('infolog','tracker');
-			foreach($crm_apps as $app)
+			$crm_apps = array('infolog', 'tracker');
+			foreach ($crm_apps as $app)
 			{
 				if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
 			}
-			if($crm_count > 1)
+			if ($crm_count > 1)
 			{
-				foreach($crm_apps as $app)
+				foreach ($crm_apps as $app)
 				{
 					$actions['view']['children']["view-$app"] = array(
 						'caption' => $app,
@@ -425,7 +425,7 @@ 
 					'caption' => 'View',
 					'default' => true,
 					'allowOnMultiple' => false,
-					'group' => $group=1,
+					'group' => $group = 1,
 				),
 				'add' => array(
 					'caption' => 'Add',
@@ -437,23 +437,23 @@ 
 			);
 		}
 
-		++$group;	// other AB related stuff group: lists, AB's, categories
+		++$group; // other AB related stuff group: lists, AB's, categories
 		// categories submenu
 		$actions['cat'] = array(
 			'caption' => 'Categories',
 			'group' => $group,
 			'children' => array(
 				'cat_add' => nextmatch_widget::category_action(
-					'addressbook',$group,'Add category', 'cat_add_',
-					true, 0,nextmatch_widget::DEFAULT_MAX_MENU_LENGTH,false
-				)+array(
+					'addressbook', $group, 'Add category', 'cat_add_',
+					true, 0, nextmatch_widget::DEFAULT_MAX_MENU_LENGTH, false
+				) + array(
 					'icon' => 'foldertree_nolines_plus',
 					'disableClass' => 'rowNoEdit',
 				),
 				'cat_del' => nextmatch_widget::category_action(
-					'addressbook',$group,'Delete category', 'cat_del_',
-					true, 0,nextmatch_widget::DEFAULT_MAX_MENU_LENGTH,false
-				)+array(
+					'addressbook', $group, 'Delete category', 'cat_del_',
+					true, 0, nextmatch_widget::DEFAULT_MAX_MENU_LENGTH, false
+				) + array(
 					'icon' => 'foldertree_nolines_minus',
 					'disableClass' => 'rowNoEdit',
 				),
@@ -480,7 +480,7 @@ 
 					'children' => $add_lists,
 					'prefix' => 'to_list_',
 					'icon' => 'foldertree_nolines_plus',
-					'enabled' => ($add_lists?true:false), // if there are editable lists, allow to add a contact to one of them,
+					'enabled' => ($add_lists ? true : false), // if there are editable lists, allow to add a contact to one of them,
 					//'disableClass' => 'rowNoEdit',	  // wether you are allowed to edit the contact or not, as you alter a list, not the contact
 				),
 				'remove_from_list' => array(
@@ -489,14 +489,14 @@ 
 					'icon' => 'foldertree_nolines_minus',
 					'enabled' => 'javaScript:app.addressbook.nm_compare_field',
 					'fieldId' => 'exec[nm][filter2]',
-					'fieldValue' => '!',	// enable if list != ''
+					'fieldValue' => '!', // enable if list != ''
 				),
 				'rename_list' => array(
 					'caption' => 'Rename selected distribution list',
 					'icon' => 'edit',
 					'enabled' => 'javaScript:app.addressbook.nm_compare_field',
 					'fieldId' => 'exec[nm][filter2]',
-					'fieldValue' => '!',	// enable if list != ''
+					'fieldValue' => '!', // enable if list != ''
 					'onExecute' => 'javaScript:app.addressbook.rename_list'
 				),
 				'delete_list' => array(
@@ -505,10 +505,10 @@ 
 					'icon' => 'delete',
 					'enabled' => 'javaScript:app.addressbook.nm_compare_field',
 					'fieldId' => 'exec[nm][filter2]',
-					'fieldValue' => '!',	// enable if list != ''
+					'fieldValue' => '!', // enable if list != ''
 				),
 			);
-			if(is_subclass_of('etemplate', 'etemplate_new'))
+			if (is_subclass_of('etemplate', 'etemplate_new'))
 			{
 				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
 				$actions['lists']['children']['rename_list']['fieldId'] = 'filter2';
@@ -518,17 +518,17 @@ 
 		// move to AB
 		if (($move2addressbooks = $this->get_addressbooks(EGW_ACL_ADD)))	// do we have addressbooks, we should
 		{
-			unset($move2addressbooks[0]);	// do not offer action to move contact to an account, as we dont support that currrently
-			foreach($move2addressbooks as $owner => $label)
+			unset($move2addressbooks[0]); // do not offer action to move contact to an account, as we dont support that currrently
+			foreach ($move2addressbooks as $owner => $label)
 			{
-				$this->type_icon((int)$owner, substr($owner,-1) == 'p', 'n', $icon, $type_label);
+				$this->type_icon((int)$owner, substr($owner, -1) == 'p', 'n', $icon, $type_label);
 				$move2addressbooks[$owner] = array(
 					'icon' => $icon,
 					'caption' => $label,
 				);
 			}
 			// copy checkbox
-			$move2addressbooks= array(
+			$move2addressbooks = array(
 				'copy' =>array(
 					'id' => 'move_to_copy',
 					'caption' => 'Copy instead of move',
@@ -550,7 +550,7 @@ 
 			'group' => $group,
 		);
 
-		++$group;	// integration with other apps: infolog, calendar, filemanager
+		++$group; // integration with other apps: infolog, calendar, filemanager
 		if ($GLOBALS['egw_info']['user']['apps']['infolog'])
 		{
 			$actions['infolog_app'] = array(
@@ -569,7 +569,7 @@ 
 						'icon' => 'new',
 						'url' => 'menuaction=infolog.infolog_ui.edit&type=task&action=addressbook&action_id=$id',
 						'popup' => egw_link::get_registry('infolog', 'add_popup'),
-						'onExecute' => 'javaScript:app.addressbook.add_task',	// call server for org-view only
+						'onExecute' => 'javaScript:app.addressbook.add_task', // call server for org-view only
 					),
 				)
 			);
@@ -586,7 +586,7 @@ 
 						'icon' => 'view',
 						'url' => 'menuaction=calendar.calendar_uiforms.edit&participants=c$id',
 						'onExecute' => 'javaScript:app.addressbook.view_calendar',
-						'targetapp' => 'calendar',	// open in calendar tab,
+						'targetapp' => 'calendar', // open in calendar tab,
 						'hideOnDisabled' => true,
 					),
 					'calendar_add' => array(
@@ -653,12 +653,12 @@ 
 				'allowOnMultiple' => false,
 				'group' => $group,
 				// disable for for org-views, as it needs contact-ids
-				'enabled' => !isset($this->org_views[(string) $org_view]),
+				'enabled' => !isset($this->org_views[(string)$org_view]),
 			);
 		}
 		// check if user is an admin or the export is not generally turned off (contact_export_limit is non-numerical, eg. no)
 		$exception = bo_merge::is_export_limit_excepted();
-		if ((isset($GLOBALS['egw_info']['user']['apps']['admin']) || $exception)  || !$this->config['contact_export_limit'] || (int)$this->config['contact_export_limit'])
+		if ((isset($GLOBALS['egw_info']['user']['apps']['admin']) || $exception) || !$this->config['contact_export_limit'] || (int)$this->config['contact_export_limit'])
 		{
 			$actions['export'] = array(
 				'caption' => 'Export',
@@ -673,7 +673,7 @@ 
 					),
 					'vcard'  => array(
 						'caption' => 'Export as VCard',
-						'postSubmit' => true,	// download needs post submit (not Ajax) to work
+						'postSubmit' => true, // download needs post submit (not Ajax) to work
 						'icon' => egw_vfs::mime_icon('text/vcard'),
 					),
 				),
@@ -684,7 +684,7 @@ 
 			$this->prefs['document_dir'], $group, 'Insert in document', 'document_',
 			$this->prefs['default_document'], $this->config['contact_export_limit']
 		);
-		if (isset($GLOBALS['egw_info']['apps']['stylite']) && ($GLOBALS['egw_info']['user']['apps']['felamimail']||$GLOBALS['egw_info']['user']['apps']['mail']))
+		if (isset($GLOBALS['egw_info']['apps']['stylite']) && ($GLOBALS['egw_info']['user']['apps']['felamimail'] || $GLOBALS['egw_info']['user']['apps']['mail']))
 		{
 			$actions['mail'] = array(
 				'caption' => lang('Mail VCard'),
@@ -704,7 +704,7 @@ 
 				'disableClass' => 'rowNoDelete',
 			);
 		}
-		if ($this->grants[0] & EGW_ACL_DELETE)
+		if ($this->grants[0]&EGW_ACL_DELETE)
 		{
 			$actions['delete_account'] = array(
 				'caption' => 'Delete',
@@ -717,7 +717,7 @@ 
 			);
 			$actions['delete']['hideOnDisabled'] = true;
 		}
-		if($tid_filter == 'D')
+		if ($tid_filter == 'D')
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',
@@ -726,7 +726,7 @@ 
 				'disableClass' => 'rowNoEdit',
 			);
 		}
-		if (isset($actions['export']['children']['csv']) && !importexport_helper_functions::has_definitions('addressbook','export')) unset($actions['export']['children']['csv']);
+		if (isset($actions['export']['children']['csv']) && !importexport_helper_functions::has_definitions('addressbook', 'export')) unset($actions['export']['children']['csv']);
 
 		//echo "<p>".__METHOD__."($do_email, $tid_filter, $org_view)</p>\n"; _debug_array($actions);
 
@@ -749,13 +749,13 @@ 
 	private function _get_org_name($org)
 	{
 		$org_name = array();
-		if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
-		foreach(explode('|||',$org) as $part)
+		if (strpos($org, '*AND*') !== false) $org = str_replace('*AND*', '&', $org);
+		foreach (explode('|||', $org) as $part)
 		{
-			list(,$name) = explode(':',$part,2);
+			list(,$name) = explode(':', $part, 2);
 			if ($name) $org_name[] = $name;
 		}
-		$org_name = implode(': ',$org_name);
+		$org_name = implode(': ', $org_name);
 		return $org_name ? array($org => $org_name) : array();
 	}
 
@@ -765,12 +765,12 @@ 
 	 * @param array $content=null submitted content
 	 * @param string $msg=null	message to show
 	 */
-	function emailpopup($content=null,$msg=null)
+	function emailpopup($content = null, $msg = null)
 	{
-		if (strpos($GLOBALS['egw_info']['flags']['java_script'],'addEmail') === false)
+		if (strpos($GLOBALS['egw_info']['flags']['java_script'], 'addEmail') === false)
 		{
 			$handler = 'opener.addEmail(to,email)';
-			$GLOBALS['egw_info']['flags']['java_script'].= "
+			$GLOBALS['egw_info']['flags']['java_script'] .= "
 <script>
 window.egw_LAB.wait(function() {
 	window.focus();
@@ -800,7 +800,7 @@ 
 </script>
 ";
 		}
-		return $this->index($content,$msg,true);
+		return $this->index($content, $msg, true);
 	}
 
 	/**
@@ -813,21 +813,21 @@ 
 	public function ajax_organisation_contacts($org, $query = null)
 	{
 		$org_contacts = array();
-		$query = $query == null ? egw_session::appsession('index','addressbook') : $query;
-		$query['num_rows'] = -1;	// all
-		if(!is_array($query['col_filter'])) $query['col_filter'] = array();
+		$query = $query == null ? egw_session::appsession('index', 'addressbook') : $query;
+		$query['num_rows'] = -1; // all
+		if (!is_array($query['col_filter'])) $query['col_filter'] = array();
 
-		if(!is_array($org)) $org = array($org);
-		foreach($org as $org_name)
+		if (!is_array($org)) $org = array($org);
+		foreach ($org as $org_name)
 		{
 			error_log("Org: $org_name");
 			$query['org_view'] = $org_name;
 			$checked = array();
-			$count = $this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
-			error_log("Count: $count " . array2string($checked));
-			if($checked[0])
+			$count = $this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
+			error_log("Count: $count ".array2string($checked));
+			if ($checked[0])
 			{
-				$org_contacts = array_merge($org_contacts,$checked);
+				$org_contacts = array_merge($org_contacts, $checked);
 			}
 		}
 		egw_json_response::get()->data(array_unique($org_contacts));
@@ -840,40 +840,40 @@ 
 	 */
 	function infolog_org_view($org)
 	{
-		$query = egw_session::appsession('index','addressbook');
-		$query['num_rows'] = -1;	// all
+		$query = egw_session::appsession('index', 'addressbook');
+		$query['num_rows'] = -1; // all
 		$query['org_view'] = $org;
 		$query['searchletter'] = '';
-		$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+		$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
 
 		if (count($checked) > 1)	// use a nicely formatted org-name as title in infolog
 		{
 			$parts = array();
-			if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
-			foreach(explode('|||',$org) as $part)
+			if (strpos($org, '*AND*') !== false) $org = str_replace('*AND*', '&', $org);
+			foreach (explode('|||', $org) as $part)
 			{
-				list(,$part) = explode(':',$part,2);
+				list(,$part) = explode(':', $part, 2);
 				if ($part) $parts[] = $part;
 			}
-			$org = implode(', ',$parts);
+			$org = implode(', ', $parts);
 		}
 		else
 		{
-			$org = '';	// use infolog default of link-title
+			$org = ''; // use infolog default of link-title
 		}
-		egw::redirect_link('/index.php',array(
+		egw::redirect_link('/index.php', array(
 			'menuaction' => 'infolog.infolog_ui.index',
 			'action' => 'addressbook',
-			'action_id' => implode(',',$checked),
+			'action_id' => implode(',', $checked),
 			'action_title' => $org,
-		),'infolog');
+		), 'infolog');
 	}
 
 	function ajax_add_whole_list($list, $email_type = 'email')
 	{
-		$query = egw_session::appsession('email','addressbook');
+		$query = egw_session::appsession('email', 'addressbook');
 		$query['filter2'] = (int)$list;
-		$this->action($email_type,array(),true,$success,$failed,$action_msg,$query,$msg);
+		$this->action($email_type, array(), true, $success, $failed, $action_msg, $query, $msg);
 
 		$response = egw_json_response::get();
 
@@ -882,8 +882,7 @@ 
 		// close window only if no errors AND something added
 		if ($failed || !$success)
 		{
-			if (!$msg) $msg = $failed ? lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed) :
-				lang('%1 contact(s) %2',$success,$action_msg);
+			if (!$msg) $msg = $failed ? lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed) : lang('%1 contact(s) %2', $success, $action_msg);
 
 			$response->addScript("alert('".addslashes($msg)."')");
 			// reset the filter
@@ -891,7 +890,7 @@ 
 		}
 		else
 		{
-			if (!$msg) $msg = lang('%1 contact(s) %2',$success,$action_msg);
+			if (!$msg) $msg = lang('%1 contact(s) %2', $success, $action_msg);
 			$response->addScript("alert('".addslashes($msg)."')");
 			$response->addScript('egw(window).close();');
 		}
@@ -912,27 +911,27 @@ 
 		$owner = $owner ? $owner : $GLOBALS['egw_info']['user']['account_id'];
 
 		// Check for valid list & permissions
-		if(!(int)$list_id && !$this->check_list(null,EGW_ACL_ADD|EGW_ACL_EDIT,$owner))
+		if (!(int)$list_id && !$this->check_list(null, EGW_ACL_ADD|EGW_ACL_EDIT, $owner))
 		{
-			egw_json_response::get()->apply('egw.message', array(  lang('List creation failed, no rights!'),'error'));
+			egw_json_response::get()->apply('egw.message', array(lang('List creation failed, no rights!'), 'error'));
 			return;
 		}
 		if ((int)$list_id && !$this->check_list((int)$list_id, EGW_ACL_EDIT, $owner))
 		{
-			egw_json_response::get()->apply('egw.message', array(  lang('Insufficent rights to edit this list!'),'error'));
+			egw_json_response::get()->apply('egw.message', array(lang('Insufficent rights to edit this list!'), 'error'));
 			return;
 		}
 
 		$list = array('list_owner' => $owner);
 
 		// Rename
-		if($list_id)
+		if ($list_id)
 		{
 			$list = $this->read_list((int)$list_id);
 		}
 		$list['list_name'] = $new_name;
 
-		$new_id = $this->add_list(array('list_id' => (int)$list_id), $list['list_owner'],array(),$list);
+		$new_id = $this->add_list(array('list_id' => (int)$list_id), $list['list_owner'], array(), $list);
 
 		egw_json_response::get()->apply('egw.message', array(
 			$new_id == $list_id ? lang('Distribution list renamed') : lang('List created'),
@@ -954,86 +953,86 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg, $checkboxes = NULL)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg, $checkboxes = NULL)
 	{
 		//echo "<p>uicontacts::action('$action',".print_r($checked,true).','.(int)$use_all.",...)</p>\n";
 		$success = $failed = 0;
-		if ($use_all || in_array($action,array('remove_from_list','delete_list')))
+		if ($use_all || in_array($action, array('remove_from_list', 'delete_list')))
 		{
 			// get the whole selection
-			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'addressbook');
+			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name, 'addressbook');
 
 			if ($use_all)
 			{
-				@set_time_limit(0);			// switch off the execution time limit, as it's for big selections to small
-				$query['num_rows'] = -1;	// all
-				$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+				@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+				$query['num_rows'] = -1; // all
+				$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
 			}
 		}
 		// replace org_name:* id's with all id's of that org
 		$org_contacts = array();
-		foreach((array)$checked as $n => $id)
+		foreach ((array)$checked as $n => $id)
 		{
-			if (substr($id,0,9) == 'org_name:')
+			if (substr($id, 0, 9) == 'org_name:')
 			{
 				if (count($checked) == 1 && !count($org_contacts) && $action == 'infolog')
 				{
-					return $this->infolog_org_view($id);	// uses the org-name, instead of 'selected contacts'
+					return $this->infolog_org_view($id); // uses the org-name, instead of 'selected contacts'
 				}
 				unset($checked[$n]);
-				$query = egw_session::appsession($session_name,'addressbook');
-				$query['num_rows'] = -1;	// all
+				$query = egw_session::appsession($session_name, 'addressbook');
+				$query['num_rows'] = -1; // all
 				$query['org_view'] = $id;
 				unset($query['filter2']);
-				$this->get_rows($query,$extra,$readonlys,true);	// true = only return the id's
-				if ($extra[0]) $org_contacts = array_merge($org_contacts,$extra);
+				$this->get_rows($query, $extra, $readonlys, true); // true = only return the id's
+				if ($extra[0]) $org_contacts = array_merge($org_contacts, $extra);
 			}
 		}
-		if ($org_contacts) $checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		if ($org_contacts) $checked = array_unique($checked ? array_merge($checked, $org_contacts) : $org_contacts);
 		//_debug_array($checked); exit;
 
-		if (substr($action,0,8) == 'move_to_')
+		if (substr($action, 0, 8) == 'move_to_')
 		{
-			$action = (int)substr($action,8).(substr($action,-1) == 'p' ? 'p' : '');
+			$action = (int)substr($action, 8).(substr($action, -1) == 'p' ? 'p' : '');
 		}
-		elseif (substr($action,0,8) == 'to_list_')
+		elseif (substr($action, 0, 8) == 'to_list_')
 		{
-			$to_list = (int)substr($action,8);
+			$to_list = (int)substr($action, 8);
 			$action = 'to_list';
 		}
-		elseif (substr($action,0,9) == 'document_')
+		elseif (substr($action, 0, 9) == 'document_')
 		{
-			$document = substr($action,9);
+			$document = substr($action, 9);
 			$action = 'document';
 		}
-		elseif(substr($action,0,4) == 'cat_')	// cat_add_123 or cat_del_456
+		elseif (substr($action, 0, 4) == 'cat_')	// cat_add_123 or cat_del_456
 		{
 			$cat_id = (int)substr($action, 8);
-			$action = substr($action,0,7);
+			$action = substr($action, 0, 7);
 		}
 		// Security: stop non-admins to export more then the configured number of contacts
-		if (in_array($action,array('csv','vcard')) && $this->config['contact_export_limit'] && !bo_merge::is_export_limit_excepted() &&
+		if (in_array($action, array('csv', 'vcard')) && $this->config['contact_export_limit'] && !bo_merge::is_export_limit_excepted() &&
 			(!is_numeric($this->config['contact_export_limit']) || count($checked) > $this->config['contact_export_limit']))
 		{
 			$action_msg = lang('exported');
 			$failed = count($checked);
 			return false;
 		}
-		switch($action)
+		switch ($action)
 		{
 			case 'vcard':
 				$action_msg = lang('exported');
-				$vcard = new addressbook_vcal('addressbook','text/vcard');
+				$vcard = new addressbook_vcal('addressbook', 'text/vcard');
 				$vcard->export($checked);
 				// does not return!
 				$Ok = false;
 				break;
 
 			case 'merge':
-				$success = $this->merge($checked,$error_msg);
+				$success = $this->merge($checked, $error_msg);
 				$failed = count($checked) - (int)$success;
 				$action_msg = lang('merged');
-				$checked = array();	// to not start the single actions
+				$checked = array(); // to not start the single actions
 				break;
 
 			case 'delete_list':
@@ -1041,7 +1040,7 @@ 
 				{
 					$msg = lang('You need to select a distribution list');
 				}
-				elseif($this->delete_list($query['filter2']) === false)
+				elseif ($this->delete_list($query['filter2']) === false)
 				{
 					$msg = lang('Insufficent rights to delete this list!');
 				}
@@ -1049,7 +1048,7 @@ 
 				{
 					$msg = lang('Distribution list deleted');
 					unset($query['filter2']);
-					egw_session::appsession($session_name,'addressbook',$query);
+					egw_session::appsession($session_name, 'addressbook', $query);
 				}
 				return false;
 
@@ -1061,54 +1060,54 @@ 
 				return false;
 
 			case 'infolog_add':
-				list($width,$height) = explode('x',egw_link::get_registry('infolog', 'add_popup'));
+				list($width, $height) = explode('x', egw_link::get_registry('infolog', 'add_popup'));
 				egw_framework::set_onload(
-					"egw_openWindowCentered2('".egw::link('/index.php',array(
+					"egw_openWindowCentered2('".egw::link('/index.php', array(
 						'menuaction' => 'infolog.infolog_ui.edit',
 						'type' => 'task',
 						'action' => 'addressbook',
-						'action_id' => implode(',',$checked),
+						'action_id' => implode(',', $checked),
 					))."','_blank',$width,$height);");
-				$msg = '';	// no message, as we send none in javascript too and users sees opening popup
+				$msg = ''; // no message, as we send none in javascript too and users sees opening popup
 				return false;
 
 			case 'calendar_add':	// add appointment for org-views, other views are handled directly in javascript
-				list($width,$height) = explode('x',egw_link::get_registry('calendar', 'add_popup'));
+				list($width, $height) = explode('x', egw_link::get_registry('calendar', 'add_popup'));
 				egw_framework::set_onload(
-					"egw_openWindowCentered2('".egw::link('/index.php',array(
+					"egw_openWindowCentered2('".egw::link('/index.php', array(
 						'menuaction' => 'calendar.calendar_uiforms.edit',
-						'participants' => 'c'.implode(',c',$checked),
+						'participants' => 'c'.implode(',c', $checked),
 					))."','_blank',$width,$height);");
-				$msg = '';	// no message, as we send none in javascript too and users sees opening popup
+				$msg = ''; // no message, as we send none in javascript too and users sees opening popup
 				return false;
 
 			case 'calendar_view':	// show calendar for org-views, although all views are handled directly in javascript
-				list($width,$height) = explode('x',egw_link::get_registry('calendar', 'add_popup'));
-				egw::redirect_link('/index.php',array(
+				list($width, $height) = explode('x', egw_link::get_registry('calendar', 'add_popup'));
+				egw::redirect_link('/index.php', array(
 					'menuaction' => 'calendar.calendar_uiviews.index',
-					'owner' => 'c'.implode(',c',$checked),
+					'owner' => 'c'.implode(',c', $checked),
 				));
 		}
-		foreach($checked as $id)
+		foreach ($checked as $id)
 		{
-			switch($action)
+			switch ($action)
 			{
 				case 'cat_add':
 				case 'cat_del':
-					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_EDIT,$contact)))
+					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_EDIT, $contact)))
 					{
 						$action_msg = $action == 'cat_add' ? lang('categorie added') : lang('categorie delete');
-						$cat_ids = $contact['cat_id'] ? explode(',', $contact['cat_id']) : array();   //existing categories
+						$cat_ids = $contact['cat_id'] ? explode(',', $contact['cat_id']) : array(); //existing categories
 						if ($action == 'cat_add')
 						{
 							$cat_ids[] = $cat_id;
 							$cat_ids = array_unique($cat_ids);
 						}
-						elseif ((($key = array_search($cat_id,$cat_ids))) !== false)
+						elseif ((($key = array_search($cat_id, $cat_ids))) !== false)
 						{
 							unset($cat_ids[$key]);
 						}
-						$cat_ids = $cat_ids ? implode(',',$cat_ids) : null;
+						$cat_ids = $cat_ids ? implode(',', $cat_ids) : null;
 						if ($cat_ids !== $contact['cat_id'])
 						{
 							$contact['cat_id'] = $cat_ids;
@@ -1119,10 +1118,10 @@ 
 
 				case 'delete':
 					$action_msg = lang('deleted');
-					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_DELETE,$contact)))
+					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_DELETE, $contact)))
 					{
-						if ($contact['owner'] ||	// regular contact or
-							empty($contact['account_id']) ||	// accounts without account_id
+						if ($contact['owner'] || // regular contact or
+							empty($contact['account_id']) || // accounts without account_id
 							// already deleted account (should no longer happen, but needed to allow for cleanup)
 							$contact['tid'] == addressbook_so::DELETED_TYPE)
 						{
@@ -1131,7 +1130,7 @@ 
 						// delete single account --> redirect to admin
 						elseif (count($checked) == 1 && $contact['account_id'])
 						{
-							egw::redirect_link('/index.php',array(
+							egw::redirect_link('/index.php', array(
 								'menuaction' => 'admin.admin_account.delete',
 								'account_id' => $contact['account_id'],
 							));
@@ -1157,13 +1156,13 @@ 
 				case 'email_home':
 					$action == 'email' ? $action_fallback = 'email_home' : $action_fallback = 'email';
 					$action_msg = lang('added');
-					if($contact = $this->read($id))
+					if ($contact = $this->read($id))
 					{
-						if(strpos($contact[$action],'@') !== false)
+						if (strpos($contact[$action], '@') !== false)
 						{
 							$email = $contact[$action];
 						}
-						elseif(strpos($contact[$action_fallback],'@') !== false)
+						elseif (strpos($contact[$action_fallback], '@') !== false)
 						{
 							$email = $contact[$action_fallback];
 						}
@@ -1171,9 +1170,9 @@ 
 						{
 							$Ok = $email = false;
 						}
-						if($email)
+						if ($email)
 						{
-							$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
+							$contact['n_fn'] = str_replace(array(',', '@'), ' ', $contact['n_fn']);
 							egw_framework::set_onload("addEmail('".addslashes(
 								$contact['n_fn'] ? $contact['n_fn'].' <'.trim($email).'>' : trim($email))."');");
 							//error_log(__METHOD__.__LINE__."addEmail('".addslashes(
@@ -1192,7 +1191,7 @@ 
 					}
 					else
 					{
-						$Ok = $this->remove_from_list($id,$query['filter2']) !== false;
+						$Ok = $this->remove_from_list($id, $query['filter2']) !== false;
 					}
 					break;
 
@@ -1205,28 +1204,28 @@ 
 					}
 					else
 					{
-						$Ok = $this->add2list($id,$to_list) !== false;
+						$Ok = $this->add2list($id, $to_list) !== false;
 					}
 					break;
 
 				default:	// move to an other addressbook
-					if (!(int)$action || !($this->grants[(string) (int) $action] & EGW_ACL_EDIT))	// might be ADD in the future
+					if (!(int)$action || !($this->grants[(string)(int)$action]&EGW_ACL_EDIT))	// might be ADD in the future
 					{
 						return false;
 					}
 					if (!$checkboxes['move_to_copy'])
 					{
 						$action_msg = lang('moved');
-						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_DELETE,$contact)))
+						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_DELETE, $contact)))
 						{
 							if (!$contact['owner'])		// no (mass-)move of accounts
 							{
 								$Ok = false;
 							}
-							elseif ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action,-1) == 'p'))
+							elseif ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action, -1) == 'p'))
 							{
-								$contact['owner'] = (int) $action;
-								$contact['private'] = (int)(substr($action,-1) == 'p');
+								$contact['owner'] = (int)$action;
+								$contact['private'] = (int)(substr($action, -1) == 'p');
 								$Ok = $this->save($contact);
 							}
 						}
@@ -1234,14 +1233,14 @@ 
 					else
 					{
 						$action_msg = lang('copied');
-						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_READ,$contact)))
+						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_READ, $contact)))
 						{
-							if ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action,-1) == 'p'))
+							if ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action, -1) == 'p'))
 							{
-								$this->copy_contact($contact, false);	// do NOT use self::$copy_fields, copy everything but uid etc.
+								$this->copy_contact($contact, false); // do NOT use self::$copy_fields, copy everything but uid etc.
 								$links = $contact['link_to']['to_id'];
-								$contact['owner'] = (int) $action;
-								$contact['private'] = (int)(substr($action,-1) == 'p');
+								$contact['owner'] = (int)$action;
+								$contact['private'] = (int)(substr($action, -1) == 'p');
 								$Ok = $this->save($contact);
 								if ($Ok && is_array($links))
 								{
@@ -1273,22 +1272,22 @@ 
 	 * @param boolean $only_copy_fields =true true: only copy fields configured for copying (eg. no name),
 	 *		false: copy everything, but never to copy fields
 	 */
-	function copy_contact(array &$content, $only_copy_fields=true)
+	function copy_contact(array &$content, $only_copy_fields = true)
 	{
 		$content['link_to']['to_id'] = 0;
-		egw_link::link('addressbook',$content['link_to']['to_id'],'addressbook',$content['id'],
-			lang('Copied by %1, from record #%2.',common::display_fullname('',
-			$GLOBALS['egw_info']['user']['account_firstname'],$GLOBALS['egw_info']['user']['account_lastname']),
+		egw_link::link('addressbook', $content['link_to']['to_id'], 'addressbook', $content['id'],
+			lang('Copied by %1, from record #%2.', common::display_fullname('',
+			$GLOBALS['egw_info']['user']['account_firstname'], $GLOBALS['egw_info']['user']['account_lastname']),
 			$content['id']));
 		// create a new contact with the content of the old
-		foreach(array_keys($content) as $key)
+		foreach (array_keys($content) as $key)
 		{
-			if($only_copy_fields && !in_array($key, self::$copy_fields) || in_array($key, array('id','etag','carddav_name','uid')))
+			if ($only_copy_fields && !in_array($key, self::$copy_fields) || in_array($key, array('id', 'etag', 'carddav_name', 'uid')))
 			{
 				unset($content[$key]);
 			}
 		}
-		if(!isset($content['owner']))
+		if (!isset($content['owner']))
 		{
 			$content['owner'] = $this->default_private ? $this->user.'p' : $this->default_addressbook;
 		}
@@ -1306,7 +1305,7 @@ 
 	 * @param boolean $id_only=false if true only return (via $rows) an array of contact-ids, dont save state to session
 	 * @return int total number of contacts matching the selection
 	 */
-	function get_rows(&$query,&$rows,&$readonlys,$id_only=false)
+	function get_rows(&$query, &$rows, &$readonlys, $id_only = false)
 	{
 		$do_email = $query['do_email'];
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
@@ -1315,46 +1314,46 @@ 
 		{
 			$store_query = $query;
 			// Do not store these
-			foreach(array('options-cat_id','actions') as $key)
+			foreach (array('options-cat_id', 'actions') as $key)
 			{
 				unset($store_query[$key]);
 			}
-			$old_state = egw_session::appsession($what,'addressbook',$store_query);
+			$old_state = egw_session::appsession($what, 'addressbook', $store_query);
 		}
 		else
 		{
-			$old_state = egw_session::appsession($what,'addressbook');
+			$old_state = egw_session::appsession($what, 'addressbook');
 		}
-		if (!isset($this->org_views[(string) $query['org_view']]))   // we dont have an org view, unset the according col_filters
+		if (!isset($this->org_views[(string)$query['org_view']]))   // we dont have an org view, unset the according col_filters
 		{
 			if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
 			if (isset($query['col_filter']['adr_one_locality'])) unset($query['col_filter']['adr_one_locality']);
 			if (isset($query['col_filter']['org_unit'])) unset($query['col_filter']['org_unit']);
 		}
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view, reset the advanced search
+		if (isset($this->org_views[(string)$query['org_view']]))	// we have an org view, reset the advanced search
 		{
 			//_debug_array(array('Search'=>$query['search'],
 			//	'AdvancedSearch'=>$query['advanced_search']));
 			//if (is_array($query['search'])) unset($query['search']);
 			//unset($query['advanced_search']);
-			if(!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
+			if (!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
 		}
-		elseif(!$query['search'] && $old_state['advanced_search'])	// eg. paging in an advanced search
+		elseif (!$query['search'] && $old_state['advanced_search'])	// eg. paging in an advanced search
 		{
 			$query['advanced_search'] = $old_state['advanced_search'];
 		}
 		if ($do_email && etemplate::$loop)
 		{	// remove previous addEmail() calls, otherwise they will be run again
-			egw_framework::set_onload(preg_replace('/addEmail\([^)]+\);/','',egw_framework::set_onload()),true);
+			egw_framework::set_onload(preg_replace('/addEmail\([^)]+\);/', '', egw_framework::set_onload()), true);
 		}
 
 		// Make sure old lettersearch filter doesn't stay - current letter filter will be added later
-		foreach($query['col_filter'] as $key => $col_filter)
+		foreach ($query['col_filter'] as $key => $col_filter)
 		{
-			if(!is_numeric($key)) continue;
-			if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
-				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/i',$col_filter) == 1
+			if (!is_numeric($key)) continue;
+			if (preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
+				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/i', $col_filter) == 1
 			)
 			{
 				unset($query['col_filter'][$key]);
@@ -1369,16 +1368,16 @@ 
 			{
 				if ($old_state['filter'] === '0')	// user changed to org_view
 				{
-					$query['filter'] = '';			// --> change filter to all contacts
+					$query['filter'] = ''; // --> change filter to all contacts
 				}
 				else								// user changed to accounts
 				{
-					$query['org_view'] = '';		// --> change to regular contacts view
+					$query['org_view'] = ''; // --> change to regular contacts view
 				}
 			}
 			if ($query['org_view'] && isset($this->org_views[$old_state['org_view']]) && !isset($this->org_views[$query['org_view']]))
 			{
-				$query['searchletter'] = '';		// reset lettersearch if viewing the contacts of one organisation
+				$query['searchletter'] = ''; // reset lettersearch if viewing the contacts of one organisation
 			}
 			// save the state of the index in the user prefs
 			$state = serialize(array(
@@ -1391,9 +1390,9 @@ 
 			));
 			if ($state != $this->prefs[$what.'_state'] && !$query['csv_export'])
 			{
-				$GLOBALS['egw']->preferences->add('addressbook',$what.'_state',$state);
+				$GLOBALS['egw']->preferences->add('addressbook', $what.'_state', $state);
 				// save prefs, but do NOT invalid the cache (unnecessary)
-				$GLOBALS['egw']->preferences->save_repository(false,'user',false);
+				$GLOBALS['egw']->preferences->save_repository(false, 'user', false);
 			}
 		}
 		unset($old_state);
@@ -1408,11 +1407,11 @@ 
 		}
 		if ($query['filter'] !== '')	// not all addressbooks
 		{
-			$query['col_filter']['owner'] = (string) (int) $query['filter'];
+			$query['col_filter']['owner'] = (string)(int)$query['filter'];
 
 			if ($this->private_addressbook)
 			{
-				$query['col_filter']['private'] = substr($query['filter'],-1) == 'p' ? 1 : 0;
+				$query['col_filter']['private'] = substr($query['filter'], -1) == 'p' ? 1 : 0;
 			}
 		}
 		else
@@ -1422,7 +1421,7 @@ 
 		}
 		if ((int)$query['filter2'])	// not no distribution list
 		{
-			$query['col_filter']['list'] = (string) (int) $query['filter2'];
+			$query['col_filter']['list'] = (string)(int)$query['filter2'];
 		}
 		else
 		{
@@ -1435,15 +1434,15 @@ 
 		// enable/disable distribution lists depending on backend
 		$query['no_filter2'] = !$this->lists_available($query['filter']);
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view
+		if (isset($this->org_views[(string)$query['org_view']]))	// we have an org view
 		{
-			if($query['actions'] && $query['actions']['open'])
+			if ($query['actions'] && $query['actions']['open'])
 			{
 				// Just switched from contact view, update actions
 				$query['actions'] = $this->get_actions($query['col_filter']['tid'], $query['org_view']);
 			}
-			unset($query['col_filter']['list']);	// does not work together
-			$query['no_filter2'] = true;			// switch the distribution list selection off
+			unset($query['col_filter']['list']); // does not work together
+			$query['no_filter2'] = true; // switch the distribution list selection off
 
 			$query['template'] = 'addressbook.index.org_rows';
 
@@ -1483,25 +1482,25 @@ 
 			}
 			if ($query['org_view'])	// view the contacts of one organisation only
 			{
-				if (strpos($query['org_view'],'*AND*') !== false) $query['org_view'] = str_replace('*AND*','&',$query['org_view']);
-				foreach(explode('|||',$query['org_view']) as $part)
+				if (strpos($query['org_view'], '*AND*') !== false) $query['org_view'] = str_replace('*AND*', '&', $query['org_view']);
+				foreach (explode('|||', $query['org_view']) as $part)
 				{
-					list($name,$value) = explode(':',$part,2);
+					list($name, $value) = explode(':', $part, 2);
 					// do NOT set invalid column, as this gives an SQL error ("AND AND" in sql)
-					if (in_array($name, array('org_name','org_unit','adr_one_location')))
+					if (in_array($name, array('org_name', 'org_unit', 'adr_one_location')))
 					{
 						$query['col_filter'][$name] = $value;
 					}
 				}
 			}
-			else if($query['actions'] && !$query['actions']['edit'])
+			else if ($query['actions'] && !$query['actions']['edit'])
 			{
 				// Just switched from org view, update actions
 				$query['actions'] = $this->get_actions($query['col_filter']['tid'], $query['org_view']);
 			}
 			// translate the select order to the really used over all 3 columns
 			$sort = $query['sort'];
-			switch($query['order'])		// "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end
+			switch ($query['order'])		// "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end
 			{							// we don't exclude them, as the total would otherwise depend on the order-criteria
 				case 'org_name':
 					$order = "egw_addressbook.org_name<>''DESC,egw_addressbook.org_name $sort,n_family $sort,n_given $sort";
@@ -1535,8 +1534,8 @@ 
 			}
 			if ($query['searchletter'])	// only show contacts if the order-criteria starts with the given letter
 			{
-				$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created','contact_modified');
-				$query['col_filter'][] = (in_array($query['order'],$no_letter_search) ? 'org_name' : (substr($query['order'],0,1)=='#'?'':'egw_addressbook.').$query['order']).' '.
+				$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created', 'contact_modified');
+				$query['col_filter'][] = (in_array($query['order'], $no_letter_search) ? 'org_name' : (substr($query['order'], 0, 1) == '#' ? '' : 'egw_addressbook.').$query['order']).' '.
 					$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.$GLOBALS['egw']->db->quote(strtolower($query['searchletter']).'%');
 			}
 			$wildcard = '%';
@@ -1550,39 +1549,39 @@ 
 				unset($query['advanced_search']['meth_select']);
 			}
 			//if ($do_email ) $email_only = array('id','owner','tid','n_fn','n_family','n_given','org_name','email','email_home');
-			$rows = parent::search($query['advanced_search'] ? $query['advanced_search'] : $query['search'],$id_only,
-				$order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']);
+			$rows = parent::search($query['advanced_search'] ? $query['advanced_search'] : $query['search'], $id_only,
+				$order, '', $wildcard, false, $op, array((int)$query['start'], (int)$query['num_rows']), $query['col_filter']);
 
 			// do we need to read the custom fields, depends on the column is enabled and customfields exist
 			// $query['csv_export'] allways needs to read ALL cf's
 			$columselection = $this->prefs['nextmatch-addressbook.'.($do_email ? 'email' : 'index').'.rows'];
-			$available_distib_lists=$this->get_lists(EGW_ACL_READ);
-			$columselection = $columselection && !$query['csv_export'] ? explode(',',$columselection) : array();
+			$available_distib_lists = $this->get_lists(EGW_ACL_READ);
+			$columselection = $columselection && !$query['csv_export'] ? explode(',', $columselection) : array();
 			if (!$id_only && $rows)
 			{
-				$show_custom_fields = (!$columselection || in_array('customfields',$columselection) || $query['csv_export']) && $this->customfields;
-				$show_calendar = !$columselection || in_array('calendar_calendar',$columselection);
-				$show_distributionlist = !$columselection || in_array('distrib_lists',$columselection) || count($available_distib_lists);
+				$show_custom_fields = (!$columselection || in_array('customfields', $columselection) || $query['csv_export']) && $this->customfields;
+				$show_calendar = !$columselection || in_array('calendar_calendar', $columselection);
+				$show_distributionlist = !$columselection || in_array('distrib_lists', $columselection) || count($available_distib_lists);
 				if ($show_calendar || $show_custom_fields || $show_distributionlist)
 				{
-					foreach($rows as $val)
+					foreach ($rows as $val)
 					{
 						$ids[] = $val['id'];
 					}
 					if ($show_custom_fields)
 					{
-						foreach($columselection as $col)
+						foreach ($columselection as $col)
 						{
-							if ($col[0] == '#') $selected_cfs[] = substr($col,1);
+							if ($col[0] == '#') $selected_cfs[] = substr($col, 1);
 						}
-						$customfields = $this->read_customfields($ids,$selected_cfs);
+						$customfields = $this->read_customfields($ids, $selected_cfs);
 					}
 					if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($ids);
 					// distributionlist memership for the entrys
 					//_debug_array($this->get_lists(EGW_ACL_EDIT));
 					if ($show_distributionlist && $available_distib_lists)
 					{
-						$distributionlist = $this->read_distributionlist($ids,array_keys($available_distib_lists));
+						$distributionlist = $this->read_distributionlist($ids, array_keys($available_distib_lists));
 					}
 				}
 			}
@@ -1591,20 +1590,20 @@ 
 
 		if ($id_only)
 		{
-			foreach($rows as $n => $row)
+			foreach ($rows as $n => $row)
 			{
 				$rows[$n] = $row['id'];
 			}
-			return $this->total;	// no need to set other fields or $readonlys
+			return $this->total; // no need to set other fields or $readonlys
 		}
 		$order = $query['order'];
 
 		$readonlys = array();
-		foreach($rows as $n => &$row)
+		foreach ($rows as $n => &$row)
 		{
 			$given = $row['n_given'] ? $row['n_given'] : ($row['n_prefix'] ? $row['n_prefix'] : '');
 
-			switch($order)
+			switch ($order)
 			{
 				default:	// postalcode, created, modified, ...
 				case 'org_name':
@@ -1621,37 +1620,37 @@ 
 					break;
 				case 'n_fileas':
 					if (!$row['n_fileas']) $row['n_fileas'] = $this->fileas($row);
-					list($row['line1'],$row['line2']) = explode(': ',$row['n_fileas']);
+					list($row['line1'], $row['line2']) = explode(': ', $row['n_fileas']);
 					break;
 			}
-			if (isset($this->org_views[(string) $query['org_view']]))
+			if (isset($this->org_views[(string)$query['org_view']]))
 			{
 				$row['type'] = 'home';
 				$row['type_label'] = lang('Organisation');
 
-				if ($query['filter'] && !($this->grants[(int)$query['filter']] & EGW_ACL_DELETE))
+				if ($query['filter'] && !($this->grants[(int)$query['filter']]&EGW_ACL_DELETE))
 				{
 					$row['class'] .= 'rowNoDelete ';
 				}
-				$row['class'] .= 'rowNoEdit ';	// no edit in OrgView
+				$row['class'] .= 'rowNoEdit '; // no edit in OrgView
 			}
 			else
 			{
-				$this->type_icon($row['owner'],$row['private'],$row['tid'],$row['type'],$row['type_label']);
+				$this->type_icon($row['owner'], $row['private'], $row['tid'], $row['type'], $row['type_label']);
 
-				static $tel2show = array('tel_work','tel_cell','tel_home','tel_fax');
+				static $tel2show = array('tel_work', 'tel_cell', 'tel_home', 'tel_fax');
 				static $prefer_marker;
 				if (is_null($prefer_marker))
 				{
 					// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
 					$prefer_marker = html_entity_decode(' &#9829;', ENT_NOQUOTES, 'utf-8');
 				}
-				foreach($tel2show as $name)
+				foreach ($tel2show as $name)
 				{
-					$row[$name] .= ' '.($row['tel_prefer'] == $name ? $prefer_marker : '');		// .' ' to NOT remove the field
+					$row[$name] .= ' '.($row['tel_prefer'] == $name ? $prefer_marker : ''); // .' ' to NOT remove the field
 				}
 				// allways show the prefered phone, if not already shown
-				if (!in_array($row['tel_prefer'],$tel2show) && $row[$row['tel_prefer']])
+				if (!in_array($row['tel_prefer'], $tel2show) && $row[$row['tel_prefer']])
 				{
 					$row['tel_prefered'] = $row[$row['tel_prefer']].$prefer_marker;
 				}
@@ -1659,32 +1658,32 @@ 
 				{
 					$row['class'] .= 'rowAccount rowNoDelete ';
 				}
-				elseif (!$this->check_perms(EGW_ACL_DELETE,$row) || (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge' && $query['col_filter']['tid'] == addressbook_so::DELETED_TYPE))
+				elseif (!$this->check_perms(EGW_ACL_DELETE, $row) || (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge' && $query['col_filter']['tid'] == addressbook_so::DELETED_TYPE))
 				{
 					$row['class'] .= 'rowNoDelete ';
 				}
-				if (!$this->check_perms(EGW_ACL_EDIT,$row))
+				if (!$this->check_perms(EGW_ACL_EDIT, $row))
 				{
 					$row['class'] .= 'rowNoEdit ';
 				}
 
-				unset($row['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+				unset($row['jpegphoto']); // unused and messes up json encoding (not utf-8)
 
 				if (isset($customfields[$row['id']]))
 				{
-					foreach($this->customfields as $name => $data)
+					foreach ($this->customfields as $name => $data)
 					{
 						$row['#'.$name] = $customfields[$row['id']]['#'.$name];
 					}
 				}
 				if (isset($distributionlist[$row['id']]))
 				{
-					$row['distrib_lists'] = implode("\n",array_values($distributionlist[$row['id']]));
+					$row['distrib_lists'] = implode("\n", array_values($distributionlist[$row['id']]));
 					//if ($show_distributionlist) $readonlys['distrib_lists'] =true;
 				}
 				if (isset($calendar[$row['id']]))
 				{
-					foreach($calendar[$row['id']] as $name => $data)
+					foreach ($calendar[$row['id']] as $name => $data)
 					{
 						$row[$name] = $data;
 					}
@@ -1692,13 +1691,13 @@ 
 			}
 
 			// hide region for address format 'postcode_city'
-			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']);
-			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']);
+			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname'])) == 'postcode_city') unset($row['adr_one_region']);
+			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname'])) == 'postcode_city') unset($row['adr_two_region']);
 
 			// respect category permissions
-			if(!empty($row['cat_id']))
+			if (!empty($row['cat_id']))
 			{
-				$row['cat_id'] = $this->categories->check_list(EGW_ACL_READ,$row['cat_id']);
+				$row['cat_id'] = $this->categories->check_list(EGW_ACL_READ, $row['cat_id']);
 			}
 		}
 		$readonlys['no_distrib_lists'] = (bool)$show_distributionlist;
@@ -1714,23 +1713,21 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('addressbook');
 		if ($query['filter'] !== '' && !isset($this->org_views[$query['org_view']]))
 		{
-			$GLOBALS['egw_info']['flags']['app_header'] .= ' '.($query['filter'] == '0' ? lang('accounts') :
-				($GLOBALS['egw']->accounts->get_type($query['filter']) == 'g' ?
-					lang('Group %1',$GLOBALS['egw']->accounts->id2name($query['filter'])) :
-					common::grab_owner_name((int)$query['filter']).
-						(substr($query['filter'],-1) == 'p' ? ' ('.lang('private').')' : '')));
+			$GLOBALS['egw_info']['flags']['app_header'] .= ' '.($query['filter'] == '0' ? lang('accounts') : ($GLOBALS['egw']->accounts->get_type($query['filter']) == 'g' ?
+					lang('Group %1', $GLOBALS['egw']->accounts->id2name($query['filter'])) : common::grab_owner_name((int)$query['filter']).
+						(substr($query['filter'], -1) == 'p' ? ' ('.lang('private').')' : '')));
 		}
 		if ($query['org_view'])
 		{
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$query['org_view_label'];
 			// Make sure option is there
-			if(!array_key_exists($query['org_view'], $this->org_views))
+			if (!array_key_exists($query['org_view'], $this->org_views))
 			{
 				$this->org_views += $this->_get_org_name($query['org_view']);
 				$rows['sel_options']['org_view'] = $this->org_views;
 			}
 		}
-		if($query['advanced_search'])
+		if ($query['advanced_search'])
 		{
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Advanced search');
 		}
@@ -1741,11 +1738,11 @@ 
 		if ($query['searchletter'])
 		{
 			$order = $order == 'n_given' ? lang('first name') : ($order == 'n_family' ? lang('last name') : lang('Organisation'));
-			$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("%1 starts with '%2'",$order,$query['searchletter']);
+			$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("%1 starts with '%2'", $order, $query['searchletter']);
 		}
 		if ($query['search'] && !$query['advanced_search']) // do not add that, if we have advanced search active
 		{
-			$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("Search for '%1'",$query['search']);
+			$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("Search for '%1'", $query['search']);
 		}
 		return $this->total;
 	}
@@ -1759,7 +1756,7 @@ 
 	 * @param string &$icon icon-name
 	 * @param string &$label translated label
 	 */
-	function type_icon($owner,$private,$tid,&$icon,&$label)
+	function type_icon($owner, $private, $tid, &$icon, &$label)
 	{
 		if (!$owner)
 		{
@@ -1774,7 +1771,7 @@ 
 		elseif ($GLOBALS['egw']->accounts->get_type($owner) == 'g')
 		{
 			$icon = 'group';
-			$label = lang('group %1',$GLOBALS['egw']->accounts->id2name($owner));
+			$label = lang('group %1', $GLOBALS['egw']->accounts->id2name($owner));
 		}
 		else
 		{
@@ -1782,9 +1779,9 @@ 
 			$label = $owner == $this->user ? lang('personal') : common::grab_owner_name($owner);
 		}
 		// show tid icon for tid!='n' AND only if one is defined
-		if ($tid != 'n' && common::image('addressbook',$this->content_types[$tid]['name']))
+		if ($tid != 'n' && common::image('addressbook', $this->content_types[$tid]['name']))
 		{
-			$icon = common::image('addressbook',$this->content_types[$tid]['name']);
+			$icon = common::image('addressbook', $this->content_types[$tid]['name']);
 		}
 
 		// Legacy - from when icons could be anywhere
@@ -1802,19 +1799,19 @@ 
 	* @param int $_GET['contact_id'] contact_id mainly for popup use
 	* @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
 	*/
-	function edit($content=null)
+	function edit($content = null)
 	{
 		if (is_array($content))
 		{
 			list($button) = @each($content['button']);
 			unset($content['button']);
-			$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
-			$content['owner'] = (string) (int) $content['owner'];
+			$content['private'] = (int)($content['owner'] && substr($content['owner'], -1) == 'p');
+			$content['owner'] = (string)(int)$content['owner'];
 			$content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $content['cat_id_tree'] : $content['cat_id'];
 			if ($this->config['private_cf_tab']) $content = (array)$content['private_cfs'] + $content;
 			unset($content['private_cfs']);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
@@ -1830,7 +1827,7 @@ 
 					}
 					if (is_array($content['upload_photo']) && !empty($content['upload_photo']['tmp_name']) &&
 						$content['upload_photo']['tmp_name'] != 'none' &&
-						($f = fopen($content['upload_photo']['tmp_name'],'r')))
+						($f = fopen($content['upload_photo']['tmp_name'], 'r')))
 					{
 						$content['jpegphoto'] = $this->resize_photo($f);
 						fclose($f);
@@ -1847,12 +1844,12 @@ 
 						$old_org_entry = $this->read($content['id']);
 						$old_fullname = ($old_org_entry['n_fn'] ? $old_org_entry['n_fn'] : parent::fullname($old_org_entry));
 					}
-					if ( $content['n_fn'] != $fullname ||  $fullname != $old_fullname)
+					if ($content['n_fn'] != $fullname || $fullname != $old_fullname)
 					{
 						unset($content['n_fn']);
 					}
 					// Country codes
-					foreach(array('adr_one', 'adr_two') as $c_prefix)
+					foreach (array('adr_one', 'adr_two') as $c_prefix)
 					{
 						if ($content[$c_prefix.'_countrycode'] == '-custom-')
 						{
@@ -1861,7 +1858,7 @@ 
 					}
 					$content['msg'] = '';
 					$this->error = false;
-					foreach((array)$content['pre_save_callbacks'] as $callback)
+					foreach ((array)$content['pre_save_callbacks'] as $callback)
 					{
 						try {
 							if (($success_msg = call_user_func_array($callback, array(&$content))))
@@ -1871,7 +1868,7 @@ 
 						}
 						catch (Exception $ex) {
 							$content['msg'] .= ($content['msg'] ? ', ' : '').$ex->getMessage();
-							$button = 'apply';	// do not close dialog
+							$button = 'apply'; // do not close dialog
 							$this->error = true;
 							break;
 						}
@@ -1884,7 +1881,7 @@ 
 					{
 						$content['msg'] .= ($content['msg'] ? ', ' : '').lang('Contact saved');
 
-						foreach((array)$content['post_save_callbacks'] as $callback)
+						foreach ((array)$content['post_save_callbacks'] as $callback)
 						{
 							try {
 								if (($success_msg = call_user_func_array($callback, array(&$content))))
@@ -1892,55 +1889,55 @@ 
 									$content['msg'] .= ', '.$success_msg;
 								}
 							}
-							catch(egw_exception_redirect $r)
+							catch (egw_exception_redirect $r)
 							{
 								// catch it to continue execution and rethrow it later
 							}
 							catch (Exception $ex) {
 								$content['msg'] .= ', '.$ex->getMessage();
-								$button = 'apply';	// do not close dialog
+								$button = 'apply'; // do not close dialog
 								$this->error = true;
 								break;
 							}
 						}
 
-						if ($content['change_org'] && $old_org_entry && ($changed = $this->changed_fields($old_org_entry,$content,true)) &&
-							($members = $this->org_similar($old_org_entry['org_name'],$changed)))
+						if ($content['change_org'] && $old_org_entry && ($changed = $this->changed_fields($old_org_entry, $content, true)) &&
+							($members = $this->org_similar($old_org_entry['org_name'], $changed)))
 						{
 							//foreach($changed as $name => $old_value) echo "<p>$name: '$old_value' --> '{$content[$name]}'</p>\n";
-							list($changed_members,$changed_fields,$failed_members) = $this->change_org($old_org_entry['org_name'],$changed,$content,$members);
+							list($changed_members, $changed_fields, $failed_members) = $this->change_org($old_org_entry['org_name'], $changed, $content, $members);
 							if ($changed_members)
 							{
-								$content['msg'] .= ', '.lang('%1 fields in %2 other organisation member(s) changed',$changed_fields,$changed_members);
+								$content['msg'] .= ', '.lang('%1 fields in %2 other organisation member(s) changed', $changed_fields, $changed_members);
 							}
 							if ($failed_members)
 							{
-								$content['msg'] .= ', '.lang('failed to change %1 organisation member(s) (insufficent rights) !!!',$failed_members);
+								$content['msg'] .= ', '.lang('failed to change %1 organisation member(s) (insufficent rights) !!!', $failed_members);
 							}
 						}
 					}
-					elseif($this->error === true)
+					elseif ($this->error === true)
 					{
 						$content['msg'] = lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-								htmlspecialchars(egw::link('/index.php',array(
+							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+								htmlspecialchars(egw::link('/index.php', array(
 									'menuaction' => 'addressbook.addressbook_ui.edit',
 									'contact_id' => $content['id'],
-								))).'">','</a>');
-						break;	// dont refresh the list
+								))).'">', '</a>');
+						break; // dont refresh the list
 					}
 					else
 					{
 						$content['msg'] = lang('Error saving the contact !!!').
 							($this->error ? ' '.$this->error : '');
-						$button = 'apply';	// to not leave the dialog
+						$button = 'apply'; // to not leave the dialog
 					}
 					// writing links for new entry, existing ones are handled by the widget itself
 					if ($links && $content['id'])
 					{
-						egw_link::link('addressbook',$content['id'],$links);
+						egw_link::link('addressbook', $content['id'], $links);
 					}
-					egw_framework::refresh_opener($content['msg'], 'addressbook', $content['id'],  $content['id'] ? 'edit' : 'add',
+					egw_framework::refresh_opener($content['msg'], 'addressbook', $content['id'], $content['id'] ? 'edit' : 'add',
 						null, null, null, $this->error ? 'error' : 'success');
 
 					// re-throw redirect exception, if there's no error
@@ -1961,11 +1958,11 @@ 
 					break;
 
 				case 'delete':
-					if($this->action('delete',array($content['id']),false,$success,$failed,$action_msg,'',$content['msg']))
+					if ($this->action('delete', array($content['id']), false, $success, $failed, $action_msg, '', $content['msg']))
 					{
 						if ($GLOBALS['egw']->currentapp == 'addressbook')
 						{
-							egw_framework::refresh_opener(lang('Contact deleted'), 'addressbook', $content['id'], 'delete' );
+							egw_framework::refresh_opener(lang('Contact deleted'), 'addressbook', $content['id'], 'delete');
 							egw_framework::window_close();
 						}
 						else
@@ -1990,7 +1987,7 @@ 
 			// new contact --> set some defaults
 			if ($contact_id && is_array($content = $this->read($contact_id)))
 			{
-				$contact_id = $content['id'];	// it could have been: "account:$account_id"
+				$contact_id = $content['id']; // it could have been: "account:$account_id"
 				if (!$this->check_perms(EGW_ACL_EDIT, $content))
 				{
 					$view = true;
@@ -1998,7 +1995,7 @@ 
 			}
 			else // not found
 			{
-				$state = egw_session::appsession('index','addressbook');
+				$state = egw_session::appsession('index', 'addressbook');
 				// check if we create the new contact in an existing org
 				if (($org = $_GET['org']))
 				{
@@ -2034,52 +2031,52 @@ 
 				{
 					$content['owner'] = (string)$state['filter'];
 				}
-				$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
-				if ($content['owner'] === '' || !($this->grants[$content['owner'] = (string) (int) $content['owner']] & EGW_ACL_ADD))
+				$content['private'] = (int)($content['owner'] && substr($content['owner'], -1) == 'p');
+				if ($content['owner'] === '' || !($this->grants[$content['owner'] = (string)(int)$content['owner']]&EGW_ACL_ADD))
 				{
 					$content['owner'] = $this->default_addressbook;
 					$content['private'] = (int)$this->default_private;
 
-					if (!($this->grants[$content['owner'] = (string) (int) $content['owner']] & EGW_ACL_ADD))
+					if (!($this->grants[$content['owner'] = (string)(int)$content['owner']]&EGW_ACL_ADD))
 					{
-						$content['owner'] = (string) $this->user;
+						$content['owner'] = (string)$this->user;
 						$content['private'] = 0;
 					}
 				}
 				$new_type = array_keys($this->content_types);
 				// fetch active type to preset the type, if param typeid is not passed
-				$active_tid = egw_cache::getSession('addressbook','active_tid');
+				$active_tid = egw_cache::getSession('addressbook', 'active_tid');
 				if ($active_tid && strtoupper($active_tid) === 'D') unset($active_tid);
-				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid?$active_tid:$new_type[0]);
-				foreach($this->get_contact_columns() as $field)
+				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid ? $active_tid : $new_type[0]);
+				foreach ($this->get_contact_columns() as $field)
 				{
 					if ($_GET['presets'][$field])
 					{
-						if ($field=='email'||$field=='email_home')
+						if ($field == 'email' || $field == 'email_home')
 						{
-							$singleAddress = imap_rfc822_parse_adrlist($_GET['presets'][$field],'');
+							$singleAddress = imap_rfc822_parse_adrlist($_GET['presets'][$field], '');
 							//error_log(__METHOD__.__LINE__.' Address:'.$singleAddress[0]->mailbox."@".$singleAddress[0]->host.", ".$singleAddress[0]->personal);
-							if (!(!is_array($singleAddress) || count($singleAddress)<1))
+							if (!(!is_array($singleAddress) || count($singleAddress) < 1))
 							{
 								$content[$field] = $singleAddress[0]->mailbox."@".$singleAddress[0]->host;
 								if (!empty($singleAddress[0]->personal))
 								{
-									if (strpos($singleAddress[0]->personal,',')===false)
+									if (strpos($singleAddress[0]->personal, ',') === false)
 									{
-										list($P_n_given,$P_n_family,$P_org_name)=explode(' ',$singleAddress[0]->personal,3);
-										if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+										list($P_n_given, $P_n_family, $P_org_name) = explode(' ', $singleAddress[0]->personal, 3);
+										if (strlen(trim($P_n_given)) > 0) $content['n_given'] = trim($P_n_given);
+										if (strlen(trim($P_n_family)) > 0) $content['n_family'] = trim($P_n_family);
+										if (strlen(trim($P_org_name)) > 0) $content['org_name'] = trim($P_org_name);
 									}
 									else
 									{
-										list($P_n_family,$P_other)=explode(',',$singleAddress[0]->personal,2);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_other))>0)
+										list($P_n_family, $P_other) = explode(',', $singleAddress[0]->personal, 2);
+										if (strlen(trim($P_n_family)) > 0) $content['n_family'] = trim($P_n_family);
+										if (strlen(trim($P_other)) > 0)
 										{
-											list($P_n_given,$P_org_name)=explode(',',$P_other,2);
-											if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-											if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+											list($P_n_given, $P_org_name) = explode(',', $P_other, 2);
+											if (strlen(trim($P_n_given)) > 0) $content['n_given'] = trim($P_n_given);
+											if (strlen(trim($P_org_name)) > 0) $content['org_name'] = trim($P_org_name);
 										}
 									}
 								}
@@ -2097,13 +2094,13 @@ 
 				}
 				if (isset($_GET['presets']))
 				{
-					foreach(array('email','email_home','n_family','n_given','org_name') as $field)
+					foreach (array('email', 'email_home', 'n_family', 'n_given', 'org_name') as $field)
 					{
 						if (!empty($content[$field]))
 						{
 							//Set the presets fields in content in order to be able to use them later in client side for checking duplication only on first time load
 							// after save/apply we unset them
-							$content['presets_fields'][]= $field;
+							$content['presets_fields'][] = $field;
 							break;
 						}
 					}
@@ -2115,9 +2112,9 @@ 
 				//_debug_array($content);
 			}
 
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']); // dont allow HTML!
 
-			if($content && $_GET['makecp'])	// copy the contact
+			if ($content && $_GET['makecp'])	// copy the contact
 			{
 				$this->copy_contact($content);
 				$content['msg'] = lang('Contact copied');
@@ -2131,12 +2128,12 @@ 
 			if (!$contact_id && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
 			{
 				$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+				foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// gard against XSS
 					{
-						egw_link::link('addressbook',$content['link_to']['to_id'],$link_app,$link_id);
+						egw_link::link('addressbook', $content['link_to']['to_id'], $link_app, $link_id);
 					}
 				}
 			}
@@ -2144,8 +2141,8 @@ 
 		if ($content['id'])
 		{
 			// last and next calendar date
-			list(,$dates) = each($this->read_calendar(array($content['id']),false));
-			if(is_array($dates)) $content += $dates;
+			list(,$dates) = each($this->read_calendar(array($content['id']), false));
+			if (is_array($dates)) $content += $dates;
 		}
 		// Avoid ID conflict with tree & selectboxes
 		$content['cat_id_tree'] = $content['cat_id'];
@@ -2154,7 +2151,7 @@ 
 		if ($this->config['private_cf_tab'])
 		{
 			$content['private_cfs'] = array();
-			foreach(config::get_customfields('addressbook', true) as $name => $cf)
+			foreach (config::get_customfields('addressbook', true) as $name => $cf)
 			{
 				if ($cf['private'] && isset($content['#'.$name]))
 				{
@@ -2167,7 +2164,7 @@ 
 		$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);
 
 		//_debug_array($content);
-		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(EGW_ACL_DELETE,$content);
+		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(EGW_ACL_DELETE, $content);
 		$readonlys['button[copy]'] = $readonlys['button[edit]'] = $readonlys['button[vcard]'] = true;
 		$readonlys['button[save]'] = $readonlys['button[apply]'] = $view;
 		if ($view)
@@ -2179,19 +2176,18 @@ 
 		$sel_options['fileas_type'] = $this->fileas_options($content);
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('Custom');
 		$sel_options['owner'] = $this->get_addressbooks(EGW_ACL_ADD);
-		if ($content['owner']) unset($sel_options['owner'][0]);	// do not offer to switch to accounts, as we do not support moving contacts to accounts
-		if ((string) $content['owner'] !== '')
+		if ($content['owner']) unset($sel_options['owner'][0]); // do not offer to switch to accounts, as we do not support moving contacts to accounts
+		if ((string)$content['owner'] !== '')
 		{
 			if (!isset($sel_options['owner'][(int)$content['owner']]))
 			{
-				$sel_options['owner'][(int)$content['owner']] = !$content['owner'] ? lang('Accounts') :
-					common::grab_owner_name($content['owner']);
+				$sel_options['owner'][(int)$content['owner']] = !$content['owner'] ? lang('Accounts') : common::grab_owner_name($content['owner']);
 			}
-			$readonlys['owner'] = !$content['owner'] || 		// dont allow to move accounts, as this mean deleting the user incl. all content he owns
-				$content['id'] && !$this->check_perms(EGW_ACL_DELETE,$content);	// you need delete rights to move an existing contact into an other addressbook
+			$readonlys['owner'] = !$content['owner'] || // dont allow to move accounts, as this mean deleting the user incl. all content he owns
+				$content['id'] && !$this->check_perms(EGW_ACL_DELETE, $content); // you need delete rights to move an existing contact into an other addressbook
 		}
 		// set the unsupported fields from the backend to readonly
-		foreach($this->get_fields('unsupported',$content['id'],$content['owner']) as $field)
+		foreach ($this->get_fields('unsupported', $content['id'], $content['owner']) as $field)
 		{
 			$readonlys[$field] = true;
 		}
@@ -2201,7 +2197,7 @@ 
 			$readonlys['__ALL__'] = true;
 			$readonlys['button[cancel]'] = false;
 
-			foreach($this->own_account_acl as $field)
+			foreach ($this->own_account_acl as $field)
 			{
 				$readonlys[$field] = false;
 			}
@@ -2209,9 +2205,9 @@ 
 		if (isset($readonlys['n_fileas'])) $readonlys['fileas_type'] = $readonlys['n_fileas'];
 		// disable not needed tabs
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
-		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts;
+		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'], $content['owner']) == $this->so_accounts;
 		$readonlys['tabs']['custom_private'] = $readonlys['tabs']['custom'] || !$this->config['private_cf_tab'];
-		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
+		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists']; #false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
 		if (!$content['id']) $readonlys['button[delete]'] = !$content['id'];
@@ -2221,18 +2217,18 @@ 
 		// for editing the own account (by a non-admin), enable only the fields allowed via the "own_account_acl"
 		if (!$content['owner'] && !$this->check_perms(EGW_ACL_EDIT, $content))
 		{
-			$this->_set_readonlys_for_own_account_acl($readonlys,$id);
+			$this->_set_readonlys_for_own_account_acl($readonlys, $id);
 		}
-		for($i = -23; $i<=23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
+		for ($i = -23; $i <= 23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
 		$sel_options['tz'] = $tz;
 		$content['tz'] = $content['tz'] ? $content['tz'] : '0';
 		if (count($this->content_types) > 1)
 		{
-			foreach($this->content_types as $type => $data)
+			foreach ($this->content_types as $type => $data)
 			{
 				$sel_options['tid'][$type] = $data['name'];
 			}
-			$content['typegfx'] = html::image('addressbook',$this->content_types[$content['tid']]['options']['icon'],'',' width="16px" height="16px"');
+			$content['typegfx'] = html::image('addressbook', $this->content_types[$content['tid']]['options']['icon'], '', ' width="16px" height="16px"');
 		}
 		else
 		{
@@ -2246,10 +2242,10 @@ 
 		);
 
 		// Links for deleted entries
-		if($content['tid'] == addressbook_so::DELETED_TYPE)
+		if ($content['tid'] == addressbook_so::DELETED_TYPE)
 		{
 			$content['link_to']['show_deleted'] = true;
-			if(!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge')
+			if (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge')
 			{
 				$readonlys['button[delete]'] = true;
 			}
@@ -2258,33 +2254,33 @@ 
 		// Enable history
 		$this->setup_history($content, $sel_options);
 
-		$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'photo',$content['etag']);
+		$content['photo'] = $this->photo_src($content['id'], $content['jpegphoto'], 'photo', $content['etag']);
 
 		if ($content['private']) $content['owner'] .= 'p';
 
 		// for custom types, check if we have a custom edit template named "addressbook.edit.$type", $type is the name
-		if (in_array($content['tid'], array('n',self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
+		if (in_array($content['tid'], array('n', self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
 		{
 			$this->tmpl->read('addressbook.edit');
 		}
 
 		// allow other apps to add tabs to addressbook edit
 		$preserve = $content;
-		$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+		$content['jpegphoto'] = !empty($content['jpegphoto']); // unused and messes up json encoding (not utf-8)
 		$this->tmpl->setElementAttribute('tabs', 'add_tabs', true);
-		$tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs');
+		$tabs = & $this->tmpl->getElementAttribute('tabs', 'tabs');
 		if (($first_call = !isset($tabs)))
 		{
 			$tabs = array();
 		}
 		//error_log(__LINE__.': '.__METHOD__."() first_call=$first_call");
-		$hook_data = $GLOBALS['egw']->hooks->process(array('location' => 'addressbook_edit')+$content);
+		$hook_data = $GLOBALS['egw']->hooks->process(array('location' => 'addressbook_edit') + $content);
 		//error_log(__METHOD__."() hook_data=".array2string($hook_data));
-		foreach($hook_data as $extra_tabs)
+		foreach ($hook_data as $extra_tabs)
 		{
 			if (!$extra_tabs) continue;
 
-			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
+			foreach (isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
 				if ($extra_tab['data'] && is_array($extra_tab['data']))
 				{
@@ -2329,15 +2325,15 @@ 
 	 * @param array &$readonlys
 	 * @param int $id
 	 */
-	function _set_readonlys_for_own_account_acl(&$readonlys,$id)
+	function _set_readonlys_for_own_account_acl(&$readonlys, $id)
 	{
 		// regular fields depending on the backend
-		foreach($this->get_fields('supported',$id,0) as $field)
+		foreach ($this->get_fields('supported', $id, 0) as $field)
 		{
-			if (!$this->own_account_acl || !in_array($field,$this->own_account_acl))
+			if (!$this->own_account_acl || !in_array($field, $this->own_account_acl))
 			{
 				$readonlys[$field] = true;
-				switch($field)
+				switch ($field)
 				{
 					case 'tel_work':
 					case 'tel_cell':
@@ -2353,16 +2349,16 @@ 
 		// custom fields
 		if ($this->customfields)
 		{
-			foreach($this->customfields as $name => $data)
+			foreach ($this->customfields as $name => $data)
 			{
-				if (!$this->own_account_acl || !in_array('#'.$name,$this->own_account_acl))
+				if (!$this->own_account_acl || !in_array('#'.$name, $this->own_account_acl))
 				{
 					$readonlys['#'.$name] = true;
 				}
 			}
 		}
 		// links
-		if (!$this->own_account_acl || !in_array('link_to',$this->own_account_acl))
+		if (!$this->own_account_acl || !in_array('link_to', $this->own_account_acl))
 		{
 			$readonlys['link_to'] = true;
 		}
@@ -2380,9 +2376,9 @@ 
 	 * 	'data' => array of id => "full name (addressbook)" pairs
 	 *  'fileas_options'
 	 */
-	public function ajax_check_values($values, $name, $own_id=0)
+	public function ajax_check_values($values, $name, $own_id = 0)
 	{
-		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches)) $name = $matches[1];	// remove exec[ ]
+		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches)) $name = $matches[1]; // remove exec[ ]
 
 		$ret = array('doublicates' => array(), 'msg' => null);
 
@@ -2394,7 +2390,7 @@ 
 				$contacts = parent::search(array(
 					'email' => $values[$name],
 					'email_home' => $values[$name],
-				),$only_keys=false, $order_by='', $extra_cols='', $wildcard='', $empty=False, $op='OR');
+				), $only_keys = false, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'OR');
 			}
 		}
 		else
@@ -2406,20 +2402,20 @@ 
 
 			// if name, firstname or org changed and at least 2 are specified, check for doublicates
 			if (in_array($name, array('n_given', 'n_family', 'org_name')) &&
-				!empty($values['n_given'])+!empty($values['n_family'])+!empty($values['org_name']) >= 2)
+				!empty($values['n_given']) + !empty($values['n_family']) + !empty($values['org_name']) >= 2)
 			{
 				$filter = array();
-				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)	// use email too, to exclude obvious false positives
+				foreach (array('email', 'n_given', 'n_family', 'org_name') as $n)	// use email too, to exclude obvious false positives
 				{
 					if (!empty($values[$n])) $filter[$n] = $values[$n];
 				}
-				$contacts = parent::search($criteria='', $only_keys=false, $order_by='', $extra_cols='', $wildcard='',
-					$empty=False, $op='AND', $start=false, $filter);
+				$contacts = parent::search($criteria = '', $only_keys = false, $order_by = '', $extra_cols = '', $wildcard = '',
+					$empty = False, $op = 'AND', $start = false, $filter);
 			}
 		}
 		if ($contacts)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				if ($own_id && $contact['id'] == $own_id) continue;
 
@@ -2443,26 +2439,24 @@ 
 	 *
 	 * @param array $content
 	 */
-	function view(array $content=null)
+	function view(array $content = null)
 	{
 		// CRM list comes from content, request, or preference
-		$crm_list = $content['crm_list'] ? $content['crm_list'] :
-			($_GET['crm_list'] ? $_GET['crm_list'] : $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list']);
-		if(!$crm_list || $crm_list == '~edit~') $crm_list = 'infolog';
+		$crm_list = $content['crm_list'] ? $content['crm_list'] : ($_GET['crm_list'] ? $_GET['crm_list'] : $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list']);
+		if (!$crm_list || $crm_list == '~edit~') $crm_list = 'infolog';
 
-		if(is_array($content))
+		if (is_array($content))
 		{
 			list($button) = each($content['button']);
 			switch ($content['toolbar'] ? $content['toolbar'] : $button)
 			{
-				case 'vcard':
-					egw::redirect_link('/index.php','menuaction=addressbook.uivcard.out&ab_id=' .$content['id']);
+				case 'vcard' : egw::redirect_link('/index.php', 'menuaction=addressbook.uivcard.out&ab_id='.$content['id']);
 
 				case 'cancel':
-					egw::redirect_link('/index.php','menuaction=addressbook.addressbook_ui.index&ajax=true');
+					egw::redirect_link('/index.php', 'menuaction=addressbook.addressbook_ui.index&ajax=true');
 
 				case 'delete':
-					egw::redirect_link('/index.php',array(
+					egw::redirect_link('/index.php', array(
 						'menuaction' => 'addressbook.addressbook_ui.index',
 						'msg' => $this->delete($content) ? lang('Contact deleted') : lang('Error deleting the contact !!!'),
 					));
@@ -2480,9 +2474,9 @@ 
 					$num_rows = $this->get_rows($query, $rows, $readonlys, true);
 					//error_log(__METHOD__."() get_rows()=$num_rows rows=".array2string($rows));
 					$contact_id = $rows[0];
-					if(!$contact_id || !is_array($content = $this->read($contact_id)))
+					if (!$contact_id || !is_array($content = $this->read($contact_id)))
 					{
-						egw::redirect_link('/index.php',array(
+						egw::redirect_link('/index.php', array(
 							'menuaction' => 'addressbook.addressbook_ui.index',
 							'msg' => $content,
 							'ajax' => 'true'
@@ -2491,14 +2485,14 @@ 
 					$content['index'] = $query['start'];
 
 					// List nextmatch is already there, just update the filter
-					if($contact_id && egw_json_request::isJSONRequest())
+					if ($contact_id && egw_json_request::isJSONRequest())
 					{
-						switch($crm_list)
+						switch ($crm_list)
 						{
 							case 'infolog':
 							case 'tracker':
 							default:
-								egw_json_response::get()->apply('app.addressbook.view_set_list',Array(Array('action'=>'addressbook', 'action_id' => $contact_id)));
+								egw_json_response::get()->apply('app.addressbook.view_set_list', Array(Array('action'=>'addressbook', 'action_id' => $contact_id)));
 								break;
 						}
 
@@ -2529,13 +2523,13 @@ 
 				$_GET['index'] = 0;
 			}
 			$contact_id = $_GET['contact_id'] ? $_GET['contact_id'] : ((int)$_GET['account_id'] ? 'account:'.(int)$_GET['account_id'] : 0);
-			if(!$contact_id || !is_array($content = $this->read($contact_id)))
+			if (!$contact_id || !is_array($content = $this->read($contact_id)))
 			{
-				egw::redirect_link('/index.php',array(
+				egw::redirect_link('/index.php', array(
 					'menuaction' => 'addressbook.addressbook_ui.index',
 					'msg' => $content,
 					'ajax' => 'true'
-				)+(isset($_GET['search']) ? array('search' => $_GET['search']) : array()));
+				) + (isset($_GET['search']) ? array('search' => $_GET['search']) : array()));
 			}
 			if (isset($_GET['index']))
 			{
@@ -2548,25 +2542,25 @@ 
 				$num_rows = $this->get_rows($query, $rows, $readonlys, true);
 			}
 		}
-		$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
+		$content['jpegphoto'] = !empty($content['jpegphoto']); // unused and messes up json encoding (not utf-8)
 
 		// make everything not explicit mentioned readonly
 		$readonlys['__ALL__'] = true;
 		$readonlys['photo'] = $readonlys['button[cancel]'] = $readonlys['button[copy]'] =
 			$readonlys['button[ok]'] = $readonlys['button[more]'] = $readonlys['toolbar'] = false;
 
-		foreach(array_keys($this->contact_fields) as $key)
+		foreach (array_keys($this->contact_fields) as $key)
 		{
-			if (in_array($key,array('tel_home','tel_work','tel_cell','tel_fax')))
+			if (in_array($key, array('tel_home', 'tel_work', 'tel_cell', 'tel_fax')))
 			{
 				$content[$key.'2'] = $content[$key];
 			}
 		}
 
 		// respect category permissions
-		if(!empty($content['cat_id']))
+		if (!empty($content['cat_id']))
 		{
-			$content['cat_id'] = $this->categories->check_list(EGW_ACL_READ,$content['cat_id']);
+			$content['cat_id'] = $this->categories->check_list(EGW_ACL_READ, $content['cat_id']);
 		}
 		$content['cat_id_tree'] = $content['cat_id'];
 
@@ -2576,12 +2570,12 @@ 
 			'to_id'  => $content['id'],
 		);
 		// Links for deleted entries
-		if($content['tid'] == addressbook_so::DELETED_TYPE)
+		if ($content['tid'] == addressbook_so::DELETED_TYPE)
 		{
 			$content['link_to']['show_deleted'] = true;
 		}
-		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(EGW_ACL_DELETE,$content);
-		$readonlys['button[edit]'] = !$this->check_perms(EGW_ACL_EDIT,$content);
+		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(EGW_ACL_DELETE, $content);
+		$readonlys['button[edit]'] = !$this->check_perms(EGW_ACL_EDIT, $content);
 
 		// how to display addresses
 		$content['addr_format']  = $this->addr_format_by_country($content['adr_one_countryname']);
@@ -2589,16 +2583,16 @@ 
 
 		$sel_options['fileas_type'][$content['fileas_type']] = $this->fileas($content);
 		$sel_options['owner'] = $this->get_addressbooks();
-		for($i = -23; $i<=23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
+		for ($i = -23; $i <= 23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
 		$sel_options['tz'] = $tz;
 		$content['tz'] = $content['tz'] ? $content['tz'] : 0;
 		if (count($this->content_types) > 1)
 		{
-			foreach($this->content_types as $type => $data)
+			foreach ($this->content_types as $type => $data)
 			{
 				$sel_options['tid'][$type] = $data['name'];
 			}
-			$content['typegfx'] = html::image('addressbook',$this->content_types[$content['tid']]['options']['icon'],'',' width="16px" height="16px"');
+			$content['typegfx'] = html::image('addressbook', $this->content_types[$content['tid']]['options']['icon'], '', ' width="16px" height="16px"');
 		}
 		else
 		{
@@ -2615,7 +2609,7 @@ 
 		{
 			$content['owner'] .= 'p';
 		}
-		$this->tmpl->set_cell_attribute('change_org','disabled',true);
+		$this->tmpl->set_cell_attribute('change_org', 'disabled', true);
 
 		// Prevent double countries - invalid code blanks it, disabling doesn't work
 		$content['adr_one_countrycode'] = '-';
@@ -2628,14 +2622,14 @@ 
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
 		$readonlys['tabs']['custom'] = !$this->customfields;
 		$readonlys['tabs']['custom_private'] = !$this->customfields || !$this->config['private_cf_tab'];
-		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
+		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists']; #false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
 
 		// last and next calendar date
-		if (!empty($content['id'])) list(,$dates) = each($this->read_calendar(array($content['id']),false));
-		if(is_array($dates)) $content += $dates;
+		if (!empty($content['id'])) list(,$dates) = each($this->read_calendar(array($content['id']), false));
+		if (is_array($dates)) $content += $dates;
 
 		// Disable importexport
 		$GLOBALS['egw_info']['flags']['disable_importexport']['export'] = true;
@@ -2677,7 +2671,7 @@ 
 		{
 			unset($actions['back']);
 		}
-		if (!isset($content['index']) || $content['index'] >= $num_rows-1)
+		if (!isset($content['index']) || $content['index'] >= $num_rows - 1)
 		{
 			unset($actions['next']);
 		}
@@ -2689,7 +2683,7 @@ 
 		// need to load list's app.js now, as exec calls header before other app can include it
 		egw_framework::validate_file('/'.$crm_list.'/js/app.js');
 
-		$this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array(
+		$this->tmpl->exec('addressbook.addressbook_ui.view', $content, $sel_options, $readonlys, array(
 			'id' => $content['id'],
 			'index' => $content['index'],
 			'crm_list' => $crm_list
@@ -2697,12 +2691,12 @@ 
 
 		// Only load this on first time - we're using AJAX, so it stays there through submits.
 		// Sending it again (via ajax) will break the addressbook.view etemplate2
-		if($contact_id)
+		if ($contact_id)
 		{
 			$GLOBALS['egw']->hooks->single(array(
 				'location' => 'addressbook_view',
 				'ab_id'    => $content['id']
-			),$crm_list);
+			), $crm_list);
 		}
 	}
 
@@ -2714,30 +2708,30 @@ 
 	 */
 	function email2link($email)
 	{
-		if (strpos($email,'@') == false) return '';
+		if (strpos($email, '@') == false) return '';
 
-		if($GLOBALS['egw_info']['user']['apps']['mail'])
+		if ($GLOBALS['egw_info']['user']['apps']['mail'])
 		{
 			return array(
 				'menuaction' => 'mail.mail_compose.compose',
 				'send_to'    => base64_encode($email)
 			);
 		}
-		if($GLOBALS['egw_info']['user']['apps']['felamimail'])
+		if ($GLOBALS['egw_info']['user']['apps']['felamimail'])
 		{
 			return array(
 				'menuaction' => 'felamimail.uicompose.compose',
 				'send_to'    => base64_encode($email)
 			);
 		}
-		if($GLOBALS['egw_info']['user']['apps']['email'])
+		if ($GLOBALS['egw_info']['user']['apps']['email'])
 		{
 			return array(
 				'menuaction' => 'email.uicompose.compose',
 				'to' => $email,
 			);
 		}
-		return 'mailto:' . $email;
+		return 'mailto:'.$email;
 	}
 
 	/**
@@ -2746,16 +2740,16 @@ 
 	 * @param array $_content
 	 * @return string
 	 */
-	function search($_content=array())
+	function search($_content = array())
 	{
-		if(!empty($_content))
+		if (!empty($_content))
 		{
 
 			$_content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $_content['cat_id_tree'] : $_content['cat_id'];
 
 			$response = egw_json_response::get();
 
-			$query = egw_session::appsession('index','addressbook');
+			$query = egw_session::appsession('index', 'addressbook');
 
 			if ($_content['button']['cancelsearch'])
 			{
@@ -2763,26 +2757,26 @@ 
 			}
 			else
 			{
-				$query['advanced_search'] = array_intersect_key($_content,array_flip(array_merge($this->get_contact_columns(),array('operator','meth_select'))));
+				$query['advanced_search'] = array_intersect_key($_content, array_flip(array_merge($this->get_contact_columns(), array('operator', 'meth_select'))));
 				foreach ($query['advanced_search'] as $key => $value)
 				{
-					if(!$value) unset($query['advanced_search'][$key]);
+					if (!$value) unset($query['advanced_search'][$key]);
 				}
 				// Skip n_fn, it causes problems in sql
 				unset($query['advanced_search']['n_fn']);
 			}
 			$query['search'] = '';
 			// store the index state in the session
-			egw_session::appsession('index','addressbook',$query);
+			egw_session::appsession('index', 'addressbook', $query);
 
 			// store the advanced search in the session to call it again
-			egw_session::appsession('advanced_search','addressbook',$query['advanced_search']);
+			egw_session::appsession('advanced_search', 'addressbook', $query['advanced_search']);
 
 			// Update client / nextmatch with filters, or clear
 			$response->call("app.addressbook.adv_search", array('advanced_search' => $_content['button']['search'] ? $query['advanced_search'] : ''));
 			if ($_content['button']['cancelsearch'])
 			{
-				egw_framework::window_close (); //$response->addScript('this.close();');
+				egw_framework::window_close(); //$response->addScript('this.close();');
 
 				// No need to reload popup
 				return;
@@ -2793,19 +2787,19 @@ 
 
 		// initialize etemplate arrays
 		$sel_options = $readonlys = array();
-		$content = egw_session::appsession('advanced_search','addressbook');
+		$content = egw_session::appsession('advanced_search', 'addressbook');
 		$content['n_fn'] = $this->fullname($content);
 		// Avoid ID conflict with tree & selectboxes
 		$content['cat_id_tree'] = $content['cat_id'];
 
-		for($i = -23; $i<=23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
+		for ($i = -23; $i <= 23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
 		$sel_options['tz'] = $tz + array('' => lang('doesn\'t matter'));
 		$sel_options['tid'][] = lang('all');
 		//foreach($this->content_types as $type => $data) $sel_options['tid'][$type] = $data['name'];
 
 		// configure search options
-		$sel_options['owner'] = $this->get_addressbooks(EGW_ACL_READ,lang('all'));
-		$sel_options['operator'] =  array(
+		$sel_options['owner'] = $this->get_addressbooks(EGW_ACL_READ, lang('all'));
+		$sel_options['operator'] = array(
 			'AND' => 'AND',
 			'OR' => 'OR',
 		);
@@ -2815,12 +2809,12 @@ 
 		);
 		if ($this->customfields)
 		{
-			foreach($this->customfields as $name => $data)
+			foreach ($this->customfields as $name => $data)
 			{
 				if (substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
 				{
 					if (!isset($content['#'.$name])) $content['#'.$name] = '';
-					if(!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
+					if (!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
 				}
 			}
 		}
@@ -2845,8 +2839,8 @@ 
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
 
 		$this->tmpl->read('addressbook.edit');
-		$this->tmpl->set_cell_attribute('change_org','disabled',true);
-		return $this->tmpl->exec('addressbook.addressbook_ui.search',$content,$sel_options,$readonlys,array(),2);
+		$this->tmpl->set_cell_attribute('change_org', 'disabled', true);
+		return $this->tmpl->exec('addressbook.addressbook_ui.search', $content, $sel_options, $readonlys, array(), 2);
 	}
 
 	/**
@@ -2855,16 +2849,15 @@ 
 	function photo()
 	{
 		ob_start();
-		$contact_id = isset($_GET['contact_id']) ? $_GET['contact_id'] :
-			(isset($_GET['account_id']) ? 'account:'.$_GET['account_id'] : 0);
+		$contact_id = isset($_GET['contact_id']) ? $_GET['contact_id'] : (isset($_GET['account_id']) ? 'account:'.$_GET['account_id'] : 0);
 
-		if (substr($contact_id,0,8) == 'account:')
+		if (substr($contact_id, 0, 8) == 'account:')
 		{
-			$contact_id = $GLOBALS['egw']->accounts->id2name(substr($contact_id,8),'person_id');
+			$contact_id = $GLOBALS['egw']->accounts->id2name(substr($contact_id, 8), 'person_id');
 		}
 		if (!($contact = $this->read($contact_id)) || !$contact['jpegphoto'])
 		{
-			egw::redirect(common::image('addressbook','photo'));
+			egw::redirect(common::image('addressbook', 'photo'));
 		}
 		// use an etag over the image mapp
 		$etag = '"'.$contact['id'].':'.$contact['etag'].'"';
@@ -2876,7 +2869,7 @@ 
 			// different url with different etag parameter will force a reload
 			if (isset($_GET['etag']))
 			{
-				egw_session::cache_control(30*86400);	// cache for 30 days
+				egw_session::cache_control(30 * 86400); // cache for 30 days
 			}
 			// if servers send a If-None-Match header, response with 304 Not Modified, if etag matches
 			if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag)
@@ -2928,14 +2921,14 @@ 
 		parse_navbar();
 
 		// check if user has admin rights AND if a valid fileas type is given (Security)
-		if (!$this->is_admin() || $_GET['type'] != '' && !in_array($_GET['type'],$this->fileas_types))
+		if (!$this->is_admin() || $_GET['type'] != '' && !in_array($_GET['type'], $this->fileas_types))
 		{
 			echo '<h1>'.lang('Permission denied !!!')."</h1>\n";
 		}
 		else
 		{
-			$updated = parent::set_all_fileas($_GET['type'],(boolean)$_GET['all'],$errors,true);	// true = ignore acl
-			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).',$updated,$errors)."</b></p>\n";
+			$updated = parent::set_all_fileas($_GET['type'], (boolean)$_GET['all'], $errors, true); // true = ignore acl
+			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).', $updated, $errors)."</b></p>\n";
 		}
 		common::egw_footer();
 	}
@@ -2958,8 +2951,8 @@ 
 		}
 		else
 		{
-			$updated = parent::set_all_cleanup($errors,true);	// true = ignore acl
-			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).',$updated,$errors)."</b></p>\n";
+			$updated = parent::set_all_cleanup($errors, true); // true = ignore acl
+			echo '<p style="margin-top: 20px;"><b>'.lang('%1 contacts updated (%2 errors).', $updated, $errors)."</b></p>\n";
 		}
 		common::egw_footer();
 	}
@@ -2972,7 +2965,7 @@ 
 		if ($this->contact_repository == 'ldap' || !$content['id'] ||
 			$this->account_repository == 'ldap' && $content['account_id'])
 		{
-			return;	// no history for ldap as history table only allows integer id's
+			return; // no history for ldap as history table only allows integer id's
 		}
 		$content['history'] = array(
 			'id'	=>	$content['id'],
@@ -2987,7 +2980,7 @@ 
 			),
 		);
 
-		foreach($this->content_types as $id => $settings)
+		foreach ($this->content_types as $id => $settings)
 		{
 			$content['history']['status-widgets']['tid'][$id] = $settings['name'];
 		}

Braces +381 added lines, -99 removed lines

@@ -84,7 +84,10 @@ 
 		);
 
 		// make sure the hook for export_limit is registered
-		if (!$GLOBALS['egw']->hooks->hook_exists('export_limit','addressbook')) $GLOBALS['egw']->hooks->register_single_app_hook('addressbook','export_limit');
+		if (!$GLOBALS['egw']->hooks->hook_exists('export_limit','addressbook'))
+		{
+			$GLOBALS['egw']->hooks->register_single_app_hook('addressbook','export_limit');
+		}
 
 		$this->config =& $GLOBALS['egw_info']['server'];
 
@@ -123,15 +126,21 @@ 
 		{
 			$do_email = $content['do_email'];
 
-			if (isset($content['nm']['rows']['delete']))	// handle a single delete like delete with the checkboxes
+			if (isset($content['nm']['rows']['delete']))
+			{
+				// handle a single delete like delete with the checkboxes
 			{
 				list($id) = @each($content['nm']['rows']['delete']);
+			}
 				$content['nm']['action'] = 'delete';
 				$content['nm']['selected'] = array($id);
 			}
-			if (isset($content['nm']['rows']['document']))	// handle insert in default document button like an action
+			if (isset($content['nm']['rows']['document']))
+			{
+				// handle insert in default document button like an action
 			{
 				list($id) = @each($content['nm']['rows']['document']);
+			}
 				$content['nm']['action'] = 'document';
 				$content['nm']['selected'] = array($id);
 			}
@@ -141,10 +150,13 @@ 
 				{
 					$msg = lang('You need to select some contacts first');
 				}
-				elseif ($content['nm']['action'] == 'view')	// org-view via context menu
+				elseif ($content['nm']['action'] == 'view')
+				{
+					// org-view via context menu
 				{
 					$content['nm']['org_view'] = array_shift($content['nm']['selected']);
 				}
+				}
 				else
 				{
 					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
@@ -166,10 +178,13 @@ 
 				list($org) = each($content['nm']['rows']['infolog']);
 				return $this->infolog_org_view($org);
 			}
-			if ($content['nm']['rows']['view'])	// show all contacts of an organisation
+			if ($content['nm']['rows']['view'])
+			{
+				// show all contacts of an organisation
 			{
 				list($org_view) = each($content['nm']['rows']['view']);
 			}
+			}
 			else
 			{
 				$org_view = $content['nm']['org_view'];
@@ -259,10 +274,14 @@ 
 		}
 
 		// Search parameter passed in
-		if ($_GET['search']) {
+		if ($_GET['search'])
+		{
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection;
+		if (isset($typeselection))
+		{
+			$content['nm']['col_filter']['tid'] = $typeselection;
+		}
 		// save the tid for use in creating new addressbook entrys via UI. Current tid is to be used as type of new entrys
 		//error_log(__METHOD__.__LINE__.' '.$content['nm']['col_filter']['tid']);
 		egw_cache::setSession('addressbook','active_tid',$content['nm']['col_filter']['tid']);
@@ -300,7 +319,10 @@ 
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('No country selected');
 
 		// if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export
-		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit'];
+		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit'])
+		{
+			$content['nm']['export_limit']=$this->config['contact_export_limit'];
+		}
 
 		// dont show tid-selection if we have only one content_type
 		// be a bit more sophisticated about it
@@ -311,7 +333,10 @@ 
 			//_debug_array(array('Typefilter:'=> $content['nm']['col_filter']['tid'],'Available Types:'=>$availabletypes,'action:'=>'remove invalid filter'));
 			unset($content['nm']['col_filter']['tid']);
 		}
-		if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0];
+		if (!isset($content['nm']['col_filter']['tid']))
+		{
+			$content['nm']['col_filter']['tid'] = $availabletypes[0];
+		}
 		if (count($this->content_types) > 1)
 		{
 			foreach($this->content_types as $tid => $data)
@@ -405,7 +430,10 @@ 
 			$crm_apps = array('infolog','tracker');
 			foreach($crm_apps as $app)
 			{
-				if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
+				if ($GLOBALS['egw_info']['user']['apps'][$app])
+				{
+					$crm_count++;
+				}
 			}
 			if($crm_count > 1)
 			{
@@ -459,7 +487,10 @@ 
 				),
 			),
 		);
-		if (!$GLOBALS['egw_info']['user']['apps']['preferences']) unset($actions['cats']['children']['cat_edit']);
+		if (!$GLOBALS['egw_info']['user']['apps']['preferences'])
+		{
+			unset($actions['cats']['children']['cat_edit']);
+		}
 		// Submenu for all distributionlist stuff
 		$actions['lists'] = array(
 			'caption' => 'Distribution lists',
@@ -472,7 +503,9 @@ 
 			),
 			'group' => $group,
 		);
-		if (($add_lists = $this->get_lists(EGW_ACL_EDIT)))	// do we have distribution lists?, and are we allowed to edit them
+		if (($add_lists = $this->get_lists(EGW_ACL_EDIT)))
+		{
+			// do we have distribution lists?, and are we allowed to edit them
 		{
 			$actions['lists']['children'] += array(
 				'to_list' => array(
@@ -508,6 +541,7 @@ 
 					'fieldValue' => '!',	// enable if list != ''
 				),
 			);
+		}
 			if(is_subclass_of('etemplate', 'etemplate_new'))
 			{
 				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
@@ -516,9 +550,13 @@ 
 			}
 		}
 		// move to AB
-		if (($move2addressbooks = $this->get_addressbooks(EGW_ACL_ADD)))	// do we have addressbooks, we should
+		if (($move2addressbooks = $this->get_addressbooks(EGW_ACL_ADD)))
+		{
+			// do we have addressbooks, we should
 		{
-			unset($move2addressbooks[0]);	// do not offer action to move contact to an account, as we dont support that currrently
+			unset($move2addressbooks[0]);
+		}
+		// do not offer action to move contact to an account, as we dont support that currrently
 			foreach($move2addressbooks as $owner => $label)
 			{
 				$this->type_icon((int)$owner, substr($owner,-1) == 'p', 'n', $icon, $type_label);
@@ -642,7 +680,9 @@ 
 
 			);
 		if (!$this->prefs['preferredMail'])
-			$actions['email']['children']['email_business']['checked'] = true;
+		{
+					$actions['email']['children']['email_business']['checked'] = true;
+		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
@@ -726,7 +766,10 @@ 
 				'disableClass' => 'rowNoEdit',
 			);
 		}
-		if (isset($actions['export']['children']['csv']) && !importexport_helper_functions::has_definitions('addressbook','export')) unset($actions['export']['children']['csv']);
+		if (isset($actions['export']['children']['csv']) && !importexport_helper_functions::has_definitions('addressbook','export'))
+		{
+			unset($actions['export']['children']['csv']);
+		}
 
 		//echo "<p>".__METHOD__."($do_email, $tid_filter, $org_view)</p>\n"; _debug_array($actions);
 
@@ -749,11 +792,17 @@ 
 	private function _get_org_name($org)
 	{
 		$org_name = array();
-		if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
+		if (strpos($org,'*AND*')!== false)
+		{
+			$org = str_replace('*AND*','&',$org);
+		}
 		foreach(explode('|||',$org) as $part)
 		{
 			list(,$name) = explode(':',$part,2);
-			if ($name) $org_name[] = $name;
+			if ($name)
+			{
+				$org_name[] = $name;
+			}
 		}
 		$org_name = implode(': ',$org_name);
 		return $org_name ? array($org => $org_name) : array();
@@ -815,9 +864,15 @@ 
 		$org_contacts = array();
 		$query = $query == null ? egw_session::appsession('index','addressbook') : $query;
 		$query['num_rows'] = -1;	// all
-		if(!is_array($query['col_filter'])) $query['col_filter'] = array();
+		if(!is_array($query['col_filter']))
+		{
+			$query['col_filter'] = array();
+		}
 
-		if(!is_array($org)) $org = array($org);
+		if(!is_array($org))
+		{
+			$org = array($org);
+		}
 		foreach($org as $org_name)
 		{
 			error_log("Org: $org_name");
@@ -846,14 +901,23 @@ 
 		$query['searchletter'] = '';
 		$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
 
-		if (count($checked) > 1)	// use a nicely formatted org-name as title in infolog
+		if (count($checked) > 1)
+		{
+			// use a nicely formatted org-name as title in infolog
 		{
 			$parts = array();
-			if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
+		}
+			if (strpos($org,'*AND*')!== false)
+			{
+				$org = str_replace('*AND*','&',$org);
+			}
 			foreach(explode('|||',$org) as $part)
 			{
 				list(,$part) = explode(':',$part,2);
-				if ($part) $parts[] = $part;
+				if ($part)
+				{
+					$parts[] = $part;
+				}
 			}
 			$org = implode(', ',$parts);
 		}
@@ -877,13 +941,19 @@ 
 
 		$response = egw_json_response::get();
 
-		if ($success) $response->addScript(egw_framework::set_onload(''));
+		if ($success)
+		{
+			$response->addScript(egw_framework::set_onload(''));
+		}
 
 		// close window only if no errors AND something added
 		if ($failed || !$success)
 		{
-			if (!$msg) $msg = $failed ? lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed) :
+			if (!$msg)
+			{
+				$msg = $failed ? lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed) :
 				lang('%1 contact(s) %2',$success,$action_msg);
+			}
 
 			$response->addScript("alert('".addslashes($msg)."')");
 			// reset the filter
@@ -891,7 +961,10 @@ 
 		}
 		else
 		{
-			if (!$msg) $msg = lang('%1 contact(s) %2',$success,$action_msg);
+			if (!$msg)
+			{
+				$msg = lang('%1 contact(s) %2',$success,$action_msg);
+			}
 			$response->addScript("alert('".addslashes($msg)."')");
 			$response->addScript('egw(window).close();');
 		}
@@ -986,10 +1059,16 @@ 
 				$query['org_view'] = $id;
 				unset($query['filter2']);
 				$this->get_rows($query,$extra,$readonlys,true);	// true = only return the id's
-				if ($extra[0]) $org_contacts = array_merge($org_contacts,$extra);
+				if ($extra[0])
+				{
+					$org_contacts = array_merge($org_contacts,$extra);
+				}
 			}
 		}
-		if ($org_contacts) $checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		if ($org_contacts)
+		{
+			$checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		}
 		//_debug_array($checked); exit;
 
 		if (substr($action,0,8) == 'move_to_')
@@ -1006,9 +1085,12 @@ 
 			$document = substr($action,9);
 			$action = 'document';
 		}
-		elseif(substr($action,0,4) == 'cat_')	// cat_add_123 or cat_del_456
+		elseif(substr($action,0,4) == 'cat_')
+		{
+			// cat_add_123 or cat_del_456
 		{
 			$cat_id = (int)substr($action, 8);
+		}
 			$action = substr($action,0,7);
 		}
 		// Security: stop non-admins to export more then the configured number of contacts
@@ -1054,7 +1136,10 @@ 
 				return false;
 
 			case 'document':
-				if (!$document) $document = $this->prefs['default_document'];
+				if (!$document)
+				{
+					$document = $this->prefs['default_document'];
+				}
 				$document_merge = new addressbook_merge();
 				$msg = $document_merge->download($document, $checked, '', $this->prefs['document_dir']);
 				$failed = count($checked);
@@ -1210,19 +1295,25 @@ 
 					break;
 
 				default:	// move to an other addressbook
-					if (!(int)$action || !($this->grants[(string) (int) $action] & EGW_ACL_EDIT))	// might be ADD in the future
+					if (!(int)$action || !($this->grants[(string) (int) $action] & EGW_ACL_EDIT))
+					{
+						// might be ADD in the future
 					{
 						return false;
 					}
+					}
 					if (!$checkboxes['move_to_copy'])
 					{
 						$action_msg = lang('moved');
 						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(EGW_ACL_DELETE,$contact)))
 						{
-							if (!$contact['owner'])		// no (mass-)move of accounts
+							if (!$contact['owner'])
+							{
+								// no (mass-)move of accounts
 							{
 								$Ok = false;
 							}
+							}
 							elseif ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action,-1) == 'p'))
 							{
 								$contact['owner'] = (int) $action;
@@ -1311,9 +1402,12 @@ 
 		$do_email = $query['do_email'];
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
 
-		if (!$id_only && !$query['csv_export'])	// do NOT store state for csv_export or querying id's (no regular view)
+		if (!$id_only && !$query['csv_export'])
+		{
+			// do NOT store state for csv_export or querying id's (no regular view)
 		{
 			$store_query = $query;
+		}
 			// Do not store these
 			foreach(array('options-cat_id','actions') as $key)
 			{
@@ -1325,14 +1419,25 @@ 
 		{
 			$old_state = egw_session::appsession($what,'addressbook');
 		}
-		if (!isset($this->org_views[(string) $query['org_view']]))   // we dont have an org view, unset the according col_filters
+		if (!isset($this->org_views[(string) $query['org_view']]))
+		{
+			// we dont have an org view, unset the according col_filters
 		{
 			if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
-			if (isset($query['col_filter']['adr_one_locality'])) unset($query['col_filter']['adr_one_locality']);
-			if (isset($query['col_filter']['org_unit'])) unset($query['col_filter']['org_unit']);
+		}
+			if (isset($query['col_filter']['adr_one_locality']))
+			{
+				unset($query['col_filter']['adr_one_locality']);
+			}
+			if (isset($query['col_filter']['org_unit']))
+			{
+				unset($query['col_filter']['org_unit']);
+			}
 		}
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view, reset the advanced search
+		if (isset($this->org_views[(string) $query['org_view']]))
+		{
+			// we have an org view, reset the advanced search
 		{
 			//_debug_array(array('Search'=>$query['search'],
 			//	'AdvancedSearch'=>$query['advanced_search']));
@@ -1340,23 +1445,30 @@ 
 			//unset($query['advanced_search']);
 			if(!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
 		}
-		elseif(!$query['search'] && $old_state['advanced_search'])	// eg. paging in an advanced search
+		}
+		elseif(!$query['search'] && $old_state['advanced_search'])
+		{
+			// eg. paging in an advanced search
 		{
 			$query['advanced_search'] = $old_state['advanced_search'];
 		}
+		}
 		if ($do_email && etemplate::$loop)
-		{	// remove previous addEmail() calls, otherwise they will be run again
+		{
+// remove previous addEmail() calls, otherwise they will be run again
 			egw_framework::set_onload(preg_replace('/addEmail\([^)]+\);/','',egw_framework::set_onload()),true);
 		}
 
 		// Make sure old lettersearch filter doesn't stay - current letter filter will be added later
 		foreach($query['col_filter'] as $key => $col_filter)
 		{
-			if(!is_numeric($key)) continue;
+			if(!is_numeric($key))
+			{
+				continue;
+			}
 			if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
 				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/i',$col_filter) == 1
-			)
-			{
+			) {
 				unset($query['col_filter'][$key]);
 			}
 		}
@@ -1367,9 +1479,13 @@ 
 			// check if accounts are stored in ldap, which does NOT yet support the org-views
 			if ($this->so_accounts && $query['filter'] === '0' && $query['org_view'])
 			{
-				if ($old_state['filter'] === '0')	// user changed to org_view
+				if ($old_state['filter'] === '0')
+				{
+					// user changed to org_view
 				{
-					$query['filter'] = '';			// --> change filter to all contacts
+					$query['filter'] = '';
+				}
+				// --> change filter to all contacts
 				}
 				else								// user changed to accounts
 				{
@@ -1406,9 +1522,12 @@ 
 		{
 			unset($query['col_filter']['cat_id']);
 		}
-		if ($query['filter'] !== '')	// not all addressbooks
+		if ($query['filter'] !== '')
+		{
+			// not all addressbooks
 		{
 			$query['col_filter']['owner'] = (string) (int) $query['filter'];
+		}
 
 			if ($this->private_addressbook)
 			{
@@ -1420,10 +1539,13 @@ 
 			unset($query['col_filter']['owner']);
 			unset($query['col_filter']['private']);
 		}
-		if ((int)$query['filter2'])	// not no distribution list
+		if ((int)$query['filter2'])
+		{
+			// not no distribution list
 		{
 			$query['col_filter']['list'] = (string) (int) $query['filter2'];
 		}
+		}
 		else
 		{
 			unset($query['col_filter']['list']);
@@ -1435,12 +1557,15 @@ 
 		// enable/disable distribution lists depending on backend
 		$query['no_filter2'] = !$this->lists_available($query['filter']);
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view
+		if (isset($this->org_views[(string) $query['org_view']]))
+		{
+			// we have an org view
 		{
 			if($query['actions'] && $query['actions']['open'])
 			{
 				// Just switched from contact view, update actions
 				$query['actions'] = $this->get_actions($query['col_filter']['tid'], $query['org_view']);
+		}
 			}
 			unset($query['col_filter']['list']);	// does not work together
 			$query['no_filter2'] = true;			// switch the distribution list selection off
@@ -1481,9 +1606,12 @@ 
 			{
 				$query['template'] = $do_email ? 'addressbook.email.rows' : 'addressbook.index.rows';
 			}
-			if ($query['org_view'])	// view the contacts of one organisation only
+			if ($query['org_view'])
+			{
+				// view the contacts of one organisation only
 			{
 				if (strpos($query['org_view'],'*AND*') !== false) $query['org_view'] = str_replace('*AND*','&',$query['org_view']);
+			}
 				foreach(explode('|||',$query['org_view']) as $part)
 				{
 					list($name,$value) = explode(':',$part,2);
@@ -1502,14 +1630,18 @@ 
 			// translate the select order to the really used over all 3 columns
 			$sort = $query['sort'];
 			switch($query['order'])		// "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end
-			{							// we don't exclude them, as the total would otherwise depend on the order-criteria
+			{
+// we don't exclude them, as the total would otherwise depend on the order-criteria
 				case 'org_name':
 					$order = "egw_addressbook.org_name<>''DESC,egw_addressbook.org_name $sort,n_family $sort,n_given $sort";
 					break;
 				default:
-					if ($query['order'][0] == '#')	// we order by a custom field
+					if ($query['order'][0] == '#')
+					{
+						// we order by a custom field
 					{
 						$order = "{$query['order']} $sort,org_name $sort,n_family $sort,n_given $sort";
+					}
 						break;
 					}
 					$query['order'] = 'n_family';
@@ -1533,9 +1665,12 @@ 
 				case 'contact_id':
 					$order = "egw_addressbook.$query[order] $sort";
 			}
-			if ($query['searchletter'])	// only show contacts if the order-criteria starts with the given letter
+			if ($query['searchletter'])
+			{
+				// only show contacts if the order-criteria starts with the given letter
 			{
 				$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created','contact_modified');
+			}
 				$query['col_filter'][] = (in_array($query['order'],$no_letter_search) ? 'org_name' : (substr($query['order'],0,1)=='#'?'':'egw_addressbook.').$query['order']).' '.
 					$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.$GLOBALS['egw']->db->quote(strtolower($query['searchletter']).'%');
 			}
@@ -1573,11 +1708,17 @@ 
 					{
 						foreach($columselection as $col)
 						{
-							if ($col[0] == '#') $selected_cfs[] = substr($col,1);
+							if ($col[0] == '#')
+							{
+								$selected_cfs[] = substr($col,1);
+							}
 						}
 						$customfields = $this->read_customfields($ids,$selected_cfs);
 					}
-					if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($ids);
+					if ($show_calendar && !empty($ids))
+					{
+						$calendar = $this->read_calendar($ids);
+					}
 					// distributionlist memership for the entrys
 					//_debug_array($this->get_lists(EGW_ACL_EDIT));
 					if ($show_distributionlist && $available_distib_lists)
@@ -1587,7 +1728,10 @@ 
 				}
 			}
 		}
-		if (!$rows) $rows = array();
+		if (!$rows)
+		{
+			$rows = array();
+		}
 
 		if ($id_only)
 		{
@@ -1620,7 +1764,10 @@ 
 					$row['line2'] = $row['org_name'];
 					break;
 				case 'n_fileas':
-					if (!$row['n_fileas']) $row['n_fileas'] = $this->fileas($row);
+					if (!$row['n_fileas'])
+					{
+						$row['n_fileas'] = $this->fileas($row);
+					}
 					list($row['line1'],$row['line2']) = explode(': ',$row['n_fileas']);
 					break;
 			}
@@ -1692,8 +1839,14 @@ 
 			}
 
 			// hide region for address format 'postcode_city'
-			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']);
-			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']);
+			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city')
+			{
+				unset($row['adr_one_region']);
+			}
+			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city')
+			{
+				unset($row['adr_two_region']);
+			}
 
 			// respect category permissions
 			if(!empty($row['cat_id']))
@@ -1704,7 +1857,10 @@ 
 		$readonlys['no_distrib_lists'] = (bool)$show_distributionlist;
 
 		// disable customfields column, if we have no customefield(s)
-		if (!$this->customfields) $rows['no_customfields'] = true;
+		if (!$this->customfields)
+		{
+			$rows['no_customfields'] = true;
+		}
 
 		$rows['order'] = $order;
 		$rows['call_popup'] = $this->config['call_popup'];
@@ -1743,10 +1899,13 @@ 
 			$order = $order == 'n_given' ? lang('first name') : ($order == 'n_family' ? lang('last name') : lang('Organisation'));
 			$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("%1 starts with '%2'",$order,$query['searchletter']);
 		}
-		if ($query['search'] && !$query['advanced_search']) // do not add that, if we have advanced search active
+		if ($query['search'] && !$query['advanced_search'])
+		{
+			// do not add that, if we have advanced search active
 		{
 			$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang("Search for '%1'",$query['search']);
 		}
+		}
 		return $this->total;
 	}
 
@@ -1811,7 +1970,10 @@ 
 			$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
 			$content['owner'] = (string) (int) $content['owner'];
 			$content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $content['cat_id_tree'] : $content['cat_id'];
-			if ($this->config['private_cf_tab']) $content = (array)$content['private_cfs'] + $content;
+			if ($this->config['private_cf_tab'])
+			{
+				$content = (array)$content['private_cfs'] + $content;
+			}
 			unset($content['private_cfs']);
 
 			switch($button)
@@ -2004,7 +2166,10 @@ 
 				{
 					// arguments containing a comma get quoted by etemplate/js/nextmatch_action.js
 					// leading to error in egw_db::column_data_implode, if not unquoted
-					if ($org[0] == '"') $org = substr($org, 1, -1);
+					if ($org[0] == '"')
+					{
+						$org = substr($org, 1, -1);
+					}
 					$content = $this->read_org($org);
 				}
 				elseif ($state['org_view'] && !isset($this->org_views[$state['org_view']]))
@@ -2024,7 +2189,10 @@ 
 						$content['adr_two_countryname'] =
 							$GLOBALS['egw']->country->get_full_name($GLOBALS['egw_info']['user']['preferences']['common']['country']);
 					}
-					if ($this->prefs['fileas_default']) $content['fileas_type'] = $this->prefs['fileas_default'];
+					if ($this->prefs['fileas_default'])
+					{
+						$content['fileas_type'] = $this->prefs['fileas_default'];
+					}
 				}
 				if (isset($_GET['owner']) && $_GET['owner'] !== '')
 				{
@@ -2049,7 +2217,10 @@ 
 				$new_type = array_keys($this->content_types);
 				// fetch active type to preset the type, if param typeid is not passed
 				$active_tid = egw_cache::getSession('addressbook','active_tid');
-				if ($active_tid && strtoupper($active_tid) === 'D') unset($active_tid);
+				if ($active_tid && strtoupper($active_tid) === 'D')
+				{
+					unset($active_tid);
+				}
 				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid?$active_tid:$new_type[0]);
 				foreach($this->get_contact_columns() as $field)
 				{
@@ -2067,19 +2238,37 @@ 
 									if (strpos($singleAddress[0]->personal,',')===false)
 									{
 										list($P_n_given,$P_n_family,$P_org_name)=explode(' ',$singleAddress[0]->personal,3);
-										if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+										if (strlen(trim($P_n_given))>0)
+										{
+											$content['n_given'] = trim($P_n_given);
+										}
+										if (strlen(trim($P_n_family))>0)
+										{
+											$content['n_family'] = trim($P_n_family);
+										}
+										if (strlen(trim($P_org_name))>0)
+										{
+											$content['org_name'] = trim($P_org_name);
+										}
 									}
 									else
 									{
 										list($P_n_family,$P_other)=explode(',',$singleAddress[0]->personal,2);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
+										if (strlen(trim($P_n_family))>0)
+										{
+											$content['n_family'] = trim($P_n_family);
+										}
 										if (strlen(trim($P_other))>0)
 										{
 											list($P_n_given,$P_org_name)=explode(',',$P_other,2);
-											if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-											if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+											if (strlen(trim($P_n_given))>0)
+											{
+												$content['n_given'] = trim($P_n_given);
+											}
+											if (strlen(trim($P_org_name))>0)
+											{
+												$content['org_name'] = trim($P_org_name);
+											}
 										}
 									}
 								}
@@ -2107,7 +2296,10 @@ 
 							break;
 						}
 					}
-					if (empty($content['n_fn'])) $content['n_fn'] = $this->fullname($content);
+					if (empty($content['n_fn']))
+					{
+						$content['n_fn'] = $this->fullname($content);
+					}
 				}
 				$content['creator'] = $this->user;
 				$content['created'] = $this->now_su;
@@ -2115,17 +2307,27 @@ 
 				//_debug_array($content);
 			}
 
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg'])
+			{
+				$content['msg'] = strip_tags($_GET['msg']);
+			}
+			// dont allow HTML!
 
-			if($content && $_GET['makecp'])	// copy the contact
+			if($content && $_GET['makecp'])
+			{
+				// copy the contact
 			{
 				$this->copy_contact($content);
+			}
 				$content['msg'] = lang('Contact copied');
 				$view = false;
 			}
 			else
 			{
-				if (is_numeric($contact_id)) $content['link_to']['to_id'] = $contact_id;
+				if (is_numeric($contact_id))
+				{
+					$content['link_to']['to_id'] = $contact_id;
+				}
 			}
 			// automatic link new entries to entries specified in the url
 			if (!$contact_id && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
@@ -2134,10 +2336,13 @@ 
 				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+					{
+						// gard against XSS
 					{
 						egw_link::link('addressbook',$content['link_to']['to_id'],$link_app,$link_id);
 					}
+					}
 				}
 			}
 		}
@@ -2145,7 +2350,10 @@ 
 		{
 			// last and next calendar date
 			list(,$dates) = each($this->read_calendar(array($content['id']),false));
-			if(is_array($dates)) $content += $dates;
+			if(is_array($dates))
+			{
+				$content += $dates;
+			}
 		}
 		// Avoid ID conflict with tree & selectboxes
 		$content['cat_id_tree'] = $content['cat_id'];
@@ -2179,7 +2387,11 @@ 
 		$sel_options['fileas_type'] = $this->fileas_options($content);
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('Custom');
 		$sel_options['owner'] = $this->get_addressbooks(EGW_ACL_ADD);
-		if ($content['owner']) unset($sel_options['owner'][0]);	// do not offer to switch to accounts, as we do not support moving contacts to accounts
+		if ($content['owner'])
+		{
+			unset($sel_options['owner'][0]);
+		}
+		// do not offer to switch to accounts, as we do not support moving contacts to accounts
 		if ((string) $content['owner'] !== '')
 		{
 			if (!isset($sel_options['owner'][(int)$content['owner']]))
@@ -2206,7 +2418,10 @@ 
 				$readonlys[$field] = false;
 			}
 		}
-		if (isset($readonlys['n_fileas'])) $readonlys['fileas_type'] = $readonlys['n_fileas'];
+		if (isset($readonlys['n_fileas']))
+		{
+			$readonlys['fileas_type'] = $readonlys['n_fileas'];
+		}
 		// disable not needed tabs
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
 		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts;
@@ -2214,8 +2429,14 @@ 
 		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
-		if (!$content['id']) $readonlys['button[delete]'] = !$content['id'];
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if (!$content['id'])
+		{
+			$readonlys['button[delete]'] = !$content['id'];
+		}
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 		$readonlys['change_org'] = empty($content['org_name']) || $view;
 
 		// for editing the own account (by a non-admin), enable only the fields allowed via the "own_account_acl"
@@ -2223,7 +2444,10 @@ 
 		{
 			$this->_set_readonlys_for_own_account_acl($readonlys,$id);
 		}
-		for($i = -23; $i<=23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
+		for($i = -23; $i<=23; $i++)
+		{
+			$tz[$i] = ($i > 0 ? '+' : '').$i;
+		}
 		$sel_options['tz'] = $tz;
 		$content['tz'] = $content['tz'] ? $content['tz'] : '0';
 		if (count($this->content_types) > 1)
@@ -2260,7 +2484,10 @@ 
 
 		$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'photo',$content['etag']);
 
-		if ($content['private']) $content['owner'] .= 'p';
+		if ($content['private'])
+		{
+			$content['owner'] .= 'p';
+		}
 
 		// for custom types, check if we have a custom edit template named "addressbook.edit.$type", $type is the name
 		if (in_array($content['tid'], array('n',self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
@@ -2282,7 +2509,10 @@ 
 		//error_log(__METHOD__."() hook_data=".array2string($hook_data));
 		foreach($hook_data as $extra_tabs)
 		{
-			if (!$extra_tabs) continue;
+			if (!$extra_tabs)
+			{
+				continue;
+			}
 
 			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
@@ -2299,7 +2529,10 @@ 
 					$readonlys = array_merge($readonlys, $extra_tab['readonlys']);
 				}
 				// we must NOT add tabs and callbacks more then once!
-				if (!$first_call) continue;
+				if (!$first_call)
+				{
+					continue;
+				}
 
 				if (!empty($extra_tab['pre_save_callback']))
 				{
@@ -2382,20 +2615,27 @@ 
 	 */
 	public function ajax_check_values($values, $name, $own_id=0)
 	{
-		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches)) $name = $matches[1];	// remove exec[ ]
+		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches))
+		{
+			$name = $matches[1];
+		}
+		// remove exec[ ]
 
 		$ret = array('doublicates' => array(), 'msg' => null);
 
 		// if email changed, check for doublicates
 		if (in_array($name, array('email', 'email_home')))
 		{
-			if (preg_match('/^'.url_widget::EMAIL_PREG.'$/i', $values[$name]))	// only search for real email addresses, to not return to many contacts
+			if (preg_match('/^'.url_widget::EMAIL_PREG.'$/i', $values[$name]))
+			{
+				// only search for real email addresses, to not return to many contacts
 			{
 				$contacts = parent::search(array(
 					'email' => $values[$name],
 					'email_home' => $values[$name],
 				),$only_keys=false, $order_by='', $extra_cols='', $wildcard='', $empty=False, $op='OR');
 			}
+			}
 		}
 		else
 		{
@@ -2409,10 +2649,13 @@ 
 				!empty($values['n_given'])+!empty($values['n_family'])+!empty($values['org_name']) >= 2)
 			{
 				$filter = array();
-				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)	// use email too, to exclude obvious false positives
+				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)
+				{
+					// use email too, to exclude obvious false positives
 				{
 					if (!empty($values[$n])) $filter[$n] = $values[$n];
 				}
+				}
 				$contacts = parent::search($criteria='', $only_keys=false, $order_by='', $extra_cols='', $wildcard='',
 					$empty=False, $op='AND', $start=false, $filter);
 			}
@@ -2421,7 +2664,10 @@ 
 		{
 			foreach($contacts as $contact)
 			{
-				if ($own_id && $contact['id'] == $own_id) continue;
+				if ($own_id && $contact['id'] == $own_id)
+				{
+					continue;
+				}
 
 				$ret['doublicates'][$contact['id']] = $this->fileas($contact).' ('.
 					(!$contact['owner'] ? lang('Accounts') : ($contact['owner'] == $this->user ?
@@ -2448,7 +2694,10 @@ 
 		// CRM list comes from content, request, or preference
 		$crm_list = $content['crm_list'] ? $content['crm_list'] :
 			($_GET['crm_list'] ? $_GET['crm_list'] : $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list']);
-		if(!$crm_list || $crm_list == '~edit~') $crm_list = 'infolog';
+		if(!$crm_list || $crm_list == '~edit~')
+		{
+			$crm_list = 'infolog';
+		}
 
 		if(is_array($content))
 		{
@@ -2471,7 +2720,10 @@ 
 					$inc = 1;
 					// fall through
 				case 'back':
-					if (!isset($inc)) $inc = -1;
+					if (!isset($inc))
+					{
+						$inc = -1;
+					}
 					// get next/previous contact in selection
 					$query = egw_session::appsession('index', 'addressbook');
 					$query['start'] = $content['index'] + $inc;
@@ -2589,7 +2841,10 @@ 
 
 		$sel_options['fileas_type'][$content['fileas_type']] = $this->fileas($content);
 		$sel_options['owner'] = $this->get_addressbooks();
-		for($i = -23; $i<=23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
+		for($i = -23; $i<=23; $i++)
+		{
+			$tz[$i] = ($i > 0 ? '+' : '').$i;
+		}
 		$sel_options['tz'] = $tz;
 		$content['tz'] = $content['tz'] ? $content['tz'] : 0;
 		if (count($this->content_types) > 1)
@@ -2631,11 +2886,20 @@ 
 		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 
 		// last and next calendar date
-		if (!empty($content['id'])) list(,$dates) = each($this->read_calendar(array($content['id']),false));
-		if(is_array($dates)) $content += $dates;
+		if (!empty($content['id']))
+		{
+			list(,$dates) = each($this->read_calendar(array($content['id']),false));
+		}
+		if(is_array($dates))
+		{
+			$content += $dates;
+		}
 
 		// Disable importexport
 		$GLOBALS['egw_info']['flags']['disable_importexport']['export'] = true;
@@ -2714,7 +2978,10 @@ 
 	 */
 	function email2link($email)
 	{
-		if (strpos($email,'@') == false) return '';
+		if (strpos($email,'@') == false)
+		{
+			return '';
+		}
 
 		if($GLOBALS['egw_info']['user']['apps']['mail'])
 		{
@@ -2766,7 +3033,10 @@ 
 				$query['advanced_search'] = array_intersect_key($_content,array_flip(array_merge($this->get_contact_columns(),array('operator','meth_select'))));
 				foreach ($query['advanced_search'] as $key => $value)
 				{
-					if(!$value) unset($query['advanced_search'][$key]);
+					if(!$value)
+					{
+						unset($query['advanced_search'][$key]);
+					}
 				}
 				// Skip n_fn, it causes problems in sql
 				unset($query['advanced_search']['n_fn']);
@@ -2798,7 +3068,10 @@ 
 		// Avoid ID conflict with tree & selectboxes
 		$content['cat_id_tree'] = $content['cat_id'];
 
-		for($i = -23; $i<=23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;
+		for($i = -23; $i<=23; $i++)
+		{
+			$tz[$i] = ($i > 0 ? '+' : '').$i;
+		}
 		$sel_options['tz'] = $tz + array('' => lang('doesn\'t matter'));
 		$sel_options['tid'][] = lang('all');
 		//foreach($this->content_types as $type => $data) $sel_options['tid'][$type] = $data['name'];
@@ -2819,8 +3092,14 @@ 
 			{
 				if (substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
 				{
-					if (!isset($content['#'.$name])) $content['#'.$name] = '';
-					if(!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
+					if (!isset($content['#'.$name]))
+					{
+						$content['#'.$name] = '';
+					}
+					if(!isset($data['values']['']))
+					{
+						$sel_options['#'.$name][''] = lang('Select one');
+					}
 				}
 			}
 		}
@@ -2842,7 +3121,10 @@ 
 		$content['no_tid'] = true;
 		$content['showsearchbuttons'] = true; // enable search operation and search buttons| they're disabled by default
 
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 
 		$this->tmpl->read('addressbook.edit');
 		$this->tmpl->set_cell_attribute('change_org','disabled',true);

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

@@ -2498,7 +2498,7 @@
 							case 'infolog':
 							case 'tracker':
 							default:
-								egw_json_response::get()->apply('app.addressbook.view_set_list',Array(Array('action'=>'addressbook', 'action_id' => $contact_id)));
+								egw_json_response::get()->apply('app.addressbook.view_set_list',array(array('action'=>'addressbook', 'action_id' => $contact_id)));
 								break;
 						}
 

login.php

Indentation +1 added lines, -1 removed lines

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

Braces +10 added lines, -3 removed lines

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

Doc Comments +3 added lines

@@ -122,6 +122,9 @@
 	   exit;
 	}
 
+	/**
+	 * @return string
+	 */
 	function check_logoutcode($code)
 	{
 		switch($code)

Spacing +85 added lines, -85 removed lines

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

index.php

Indentation +2 added lines, -2 removed lines

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

Spacing +25 added lines, -25 removed lines

@@ -20,13 +20,13 @@ 
 }
 
 // forward for not existing or empty header to setup
-if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
+if (!file_exists('header.inc.php') || !filesize('header.inc.php'))
 {
 	Header('Location: setup/index.php');
 	exit;
 }
 
-if(isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
+if (isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
 {
 	$hasupdates = True;
 }
@@ -34,10 +34,10 @@ 
 /*
 	This is the menuaction driver for the multi-layered design
 */
-if(isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/',$_GET['menuaction']))
+if (isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/', $_GET['menuaction']))
 {
-	list($app,$class,$method) = explode('.',$_GET['menuaction']);
-	if(! $app || ! $class || ! $method)
+	list($app, $class, $method) = explode('.', $_GET['menuaction']);
+	if (!$app || !$class || !$method)
 	{
 		$invalid_data = True;
 	}
@@ -48,7 +48,7 @@ 
 	$invalid_data = True;
 }
 //error_log(__METHOD__."$app,$class,$method");
-if($app == 'phpgwapi')
+if ($app == 'phpgwapi')
 {
 	$app = 'home';
 	$api_requested = True;
@@ -64,14 +64,14 @@ 
 include('./header.inc.php');
 // check if users are supposed to change their password every x sdays, then check if password is of old age or the devil-admin reset the users password
 // and forced the user to change his password on next login.
-auth::check_password_age($app,$class,$method);
+auth::check_password_age($app, $class, $method);
 
 // user changed timezone
 if (isset($_GET['tz']))
 {
-	egw_time::setUserPrefs($_GET['tz']);	// throws exception, if tz is invalid
+	egw_time::setUserPrefs($_GET['tz']); // throws exception, if tz is invalid
 
-	$GLOBALS['egw']->preferences->add('common','tz',$_GET['tz']);
+	$GLOBALS['egw']->preferences->add('common', 'tz', $_GET['tz']);
 	$GLOBALS['egw']->preferences->save_repository();
 
 	if (($referer = common::get_referer()))
@@ -82,30 +82,30 @@ 
 
 // 	Check if we are using windows or normal webpage
 $windowed = false;
-$tpl_info = EGW_SERVER_ROOT . '/phpgwapi/templates/' . basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
+$tpl_info = EGW_SERVER_ROOT.'/phpgwapi/templates/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
 if (!file_exists($tpl_info))
 {
-	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
+	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
 }
-if(@file_exists($tpl_info))
+if (@file_exists($tpl_info))
 {
 	include_once($tpl_info);
-	if($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
+	if ($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
 	{
 		$windowed = true;
 	}
 }
 
 
-if($app == 'home' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile))
+if ($app == 'home' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile))
 {
 	if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice')
 	{
 		$GLOBALS['egw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['egw_info']['server']['force_default_app'];
 	}
-	if($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
+	if ($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
 	{
-		egw::redirect(egw_framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']),$GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
+		egw::redirect(egw_framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']), $GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
 	}
 	else
 	{
@@ -113,7 +113,7 @@ 
 	}
 }
 
-if($windowed && $_GET['cd'] == 'yes')
+if ($windowed && $_GET['cd'] == 'yes')
 {
 	$GLOBALS['egw_info']['flags'] = array(
 		'noheader'   => False,
@@ -125,13 +125,13 @@ 
 }
 else
 {
-	if($api_requested)
+	if ($api_requested)
 	{
 		$app = 'phpgwapi';
 	}
 
 	$obj = CreateObject($app.'.'.$class);
-	if((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
+	if ((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
 	{
 		$obj->$method();
 		unset($app);
@@ -142,9 +142,9 @@ 
 	}
 	else
 	{
-		if(!$app || !$class || !$method || $invalid_data)
+		if (!$app || !$class || !$method || $invalid_data)
 		{
-			if(@is_object($GLOBALS['egw']->log))
+			if (@is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
 					'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
@@ -155,9 +155,9 @@ 
 			}
 		}
 
-		if(!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
+		if (!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
 		{
-			if(@is_object($GLOBALS['egw']->log))
+			if (@is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
 					'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
@@ -167,7 +167,7 @@ 
 				));
 			}
 		}
-		if(@is_object($GLOBALS['egw']->log))
+		if (@is_object($GLOBALS['egw']->log))
 		{
 			$GLOBALS['egw']->log->commit();
 		}
@@ -175,7 +175,7 @@ 
 		$GLOBALS['egw']->redirect_link('/home/index.php');
 	}
 
-	if(!isset($GLOBALS['egw_info']['nofooter']))
+	if (!isset($GLOBALS['egw_info']['nofooter']))
 	{
 		common::egw_footer();
 	}

infolog/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -14,16 +14,16 @@
 $setup_info['infolog']['name']      = 'infolog';
 $setup_info['infolog']['version']   = '16.1';
 $setup_info['infolog']['app_order'] = 5;
-$setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra');
+$setup_info['infolog']['tables']    = array('egw_infolog', 'egw_infolog_extra');
 $setup_info['infolog']['enable']    = 1;
-$setup_info['infolog']['index']    = 'infolog.infolog_ui.index&ajax=true';
+$setup_info['infolog']['index'] = 'infolog.infolog_ui.index&ajax=true';
 
 $setup_info['infolog']['author'] =
 $setup_info['infolog']['maintainer'] = array(
 	'name'  => 'Ralf Becker',
 	'email' => 'ralfbecker@outdoor-training.de'
 );
-$setup_info['infolog']['license']  = 'GPL';
+$setup_info['infolog']['license'] = 'GPL';
 $setup_info['infolog']['description'] =
 	'<p><b>CRM</b> (customer-relation-management) type app using Addressbook providing
 	Todo List, Notes and Phonelog. <b>InfoLog</b> is orininaly based on eGroupWare\'s

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

@@ -47,11 +47,11 @@
 /* Dependencies for this app to work */
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('14.1')
+	'versions' => array('14.1')
 );
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('14.1')
+	'versions' => array('14.1')
 );
 
 

infolog/setup/tables_current.inc.php

Spacing +39 added lines, -39 removed lines

@@ -14,53 +14,53 @@
 $phpgw_baseline = array(
 	'egw_infolog' => array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False,'comment' => 'id of the infolog-entry'),
-			'info_type' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => 'task','comment' => 'infolog-type e.g. task, phone, email or note'),
-			'info_from' => array('type' => 'varchar','precision' => '255','comment' => 'text of the primary link'),
-			'info_addr' => array('type' => 'varchar','precision' => '255','comment' => 'textfield for phone-number or email of the primary contact'),
-			'info_subject' => array('type' => 'varchar','precision' => '255','comment' => 'title of the infolog-entry'),
-			'info_des' => array('type' => 'text','comment' => 'desciption of the infolog-entry'),
-			'info_owner' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False,'comment' => 'owner of the entry, can be account or group'),
-			'info_responsible' => array('type' => 'ascii','meta' => 'account-commasep','precision' => '255','nullable' => False,'default' => '0','comment' => 'responsible users or groups (multiple)'),
-			'info_access' => array('type' => 'ascii','precision' => '10','default' => 'public','comment' => 'public or privat'),
-			'info_cat' => array('type' => 'int','meta' => 'category','precision' => '4','nullable' => False,'default' => '0','comment' => 'category id'),
-			'info_datemodified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'timestamp of the last mofification'),
-			'info_startdate' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0','comment' => 'timestamp of the startdate'),
-			'info_enddate' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0','comment' => 'timestamp of the enddate'),
-			'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'id of the parent infolog'),
-			'info_planned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'pm-field: planned time'),
-			'info_replanned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'pm-field: replanned time'),
-			'info_used_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'pm-field: used time'),
-			'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done','comment' => 'status e.g. ongoing, done ...'),
-			'info_confirm' => array('type' => 'ascii','precision' => '10','default' => 'not'),
-			'info_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'default' => '0','comment' => 'account id of the last modifier'),
-			'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'id of the primary link'),
-			'info_priority' => array('type' => 'int','precision' => '2','default' => '1','comment' => '0=Low, 1=Normal, 2=High, 3=Urgent'),
-			'pl_id' => array('type' => 'int','precision' => '4','comment' => 'pm-field: id of the pricelist'),
-			'info_price' => array('type' => 'float','precision' => '8','comment' => 'pm-field: price-field'),
-			'info_percent' => array('type' => 'int','meta' => 'percent','precision' => '2','default' => '0','comment' => 'percentage of completion'),
-			'info_datecompleted' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of completion'),
-			'info_location' => array('type' => 'varchar','precision' => '255','comment' => 'textfield location'),
-			'info_custom_from' => array('type' => 'int','precision' => '1','comment' => 'tick-box to show infolog_from'),
-			'info_uid' => array('type' => 'ascii','precision' => '128','comment' => 'unique id of the infolog-entry'),
-			'info_cc' => array('type' => 'varchar','precision' => '255','comment' => 'textfield for email-adress to be notified via email of changes'),
-			'caldav_name' => array('type' => 'ascii','precision' => '128','comment' => 'name part of CalDAV URL, if specified by client'),
-			'info_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag, not yet used'),
-			'info_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of the creation date'),
-			'info_creator' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id of the creator')
+			'info_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'id of the infolog-entry'),
+			'info_type' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False, 'default' => 'task', 'comment' => 'infolog-type e.g. task, phone, email or note'),
+			'info_from' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'text of the primary link'),
+			'info_addr' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'textfield for phone-number or email of the primary contact'),
+			'info_subject' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'title of the infolog-entry'),
+			'info_des' => array('type' => 'text', 'comment' => 'desciption of the infolog-entry'),
+			'info_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False, 'comment' => 'owner of the entry, can be account or group'),
+			'info_responsible' => array('type' => 'ascii', 'meta' => 'account-commasep', 'precision' => '255', 'nullable' => False, 'default' => '0', 'comment' => 'responsible users or groups (multiple)'),
+			'info_access' => array('type' => 'ascii', 'precision' => '10', 'default' => 'public', 'comment' => 'public or privat'),
+			'info_cat' => array('type' => 'int', 'meta' => 'category', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'category id'),
+			'info_datemodified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'timestamp of the last mofification'),
+			'info_startdate' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'timestamp of the startdate'),
+			'info_enddate' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'timestamp of the enddate'),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'id of the parent infolog'),
+			'info_planned_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'pm-field: planned time'),
+			'info_replanned_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'pm-field: replanned time'),
+			'info_used_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'pm-field: used time'),
+			'info_status' => array('type' => 'varchar', 'precision' => '40', 'default' => 'done', 'comment' => 'status e.g. ongoing, done ...'),
+			'info_confirm' => array('type' => 'ascii', 'precision' => '10', 'default' => 'not'),
+			'info_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'account id of the last modifier'),
+			'info_link_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'id of the primary link'),
+			'info_priority' => array('type' => 'int', 'precision' => '2', 'default' => '1', 'comment' => '0=Low, 1=Normal, 2=High, 3=Urgent'),
+			'pl_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'pm-field: id of the pricelist'),
+			'info_price' => array('type' => 'float', 'precision' => '8', 'comment' => 'pm-field: price-field'),
+			'info_percent' => array('type' => 'int', 'meta' => 'percent', 'precision' => '2', 'default' => '0', 'comment' => 'percentage of completion'),
+			'info_datecompleted' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of completion'),
+			'info_location' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'textfield location'),
+			'info_custom_from' => array('type' => 'int', 'precision' => '1', 'comment' => 'tick-box to show infolog_from'),
+			'info_uid' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'unique id of the infolog-entry'),
+			'info_cc' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'textfield for email-adress to be notified via email of changes'),
+			'caldav_name' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'name part of CalDAV URL, if specified by client'),
+			'info_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag, not yet used'),
+			'info_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of the creation date'),
+			'info_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'account id of the creator')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
-		'ix' => array('caldav_name',array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
+		'ix' => array('caldav_name', array('info_owner', 'info_responsible', 'info_status', 'info_startdate'), array('info_id_parent', 'info_owner', 'info_responsible', 'info_status', 'info_startdate')),
 		'uc' => array()
 	),
 	'egw_infolog_extra' => array(
 		'fd' => array(
-			'info_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '64','nullable' => False),
-			'info_extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False)
+			'info_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '64', 'nullable' => False),
+			'info_extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'nullable' => False)
 		),
-		'pk' => array('info_id','info_extra_name'),
+		'pk' => array('info_id', 'info_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()

infolog/setup/tables_update.inc.php

Spacing +209 added lines, -209 removed lines

@@ -13,8 +13,8 @@ 
 
 function infolog_upgrade0_9_11()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog','info_datecreated','info_datemodified');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_event_id',array(
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog', 'info_datecreated', 'info_datemodified');
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_event_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0',
@@ -27,16 +27,16 @@ 
 
 function infolog_upgrade0_9_15_001()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_links',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_links', array(
 		'fd' => array(
-			'link_id' => array('type' => 'auto','nullable' => False),
-			'link_app1' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id1' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_app2' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id2' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_remark' => array('type' => 'varchar','precision' => '50','nullable' => True),
-			'link_lastmod' => array('type' => 'int','precision' => '4','nullable' => False),
-			'link_owner' => array('type' => 'int','precision' => '4','nullable' => False)
+			'link_id' => array('type' => 'auto', 'nullable' => False),
+			'link_app1' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id1' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_app2' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id2' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_remark' => array('type' => 'varchar', 'precision' => '50', 'nullable' => True),
+			'link_lastmod' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'link_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False)
 		),
 		'pk' => array('link_id'),
 		'fk' => array(),
@@ -62,90 +62,90 @@ 
 	//echo "<p>copying calendar-links: $insert.$select</p>\n";
 	$GLOBALS['egw_setup']->oProc->query($insert.$select3);
 
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '255','default' => 'task','nullable' => False),
-			'info_proj_id' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_from' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_addr' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_subject' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_des' => array('type' => 'text','nullable' => True),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_access' => array('type' => 'varchar','precision' => '10','nullable' => True,'default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_enddate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_id_parent' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_pri' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_status' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'not'),
-			'info_event_id' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False)
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '255', 'default' => 'task', 'nullable' => False),
+			'info_proj_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_from' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_des' => array('type' => 'text', 'nullable' => True),
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'nullable' => True, 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_pri' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_status' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'not'),
+			'info_event_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False)
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'info_addr_id');
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	), 'info_addr_id');
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '255','default' => 'task','nullable' => False),
-			'info_from' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_addr' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_subject' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_des' => array('type' => 'text','nullable' => True),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_access' => array('type' => 'varchar','precision' => '10','nullable' => True,'default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_enddate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_id_parent' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_pri' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_status' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'not'),
-			'info_event_id' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False)
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '255', 'default' => 'task', 'nullable' => False),
+			'info_from' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_des' => array('type' => 'text', 'nullable' => True),
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'nullable' => True, 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_pri' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_status' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'not'),
+			'info_event_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False)
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'info_proj_id');
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	), 'info_proj_id');
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '255','default' => 'task','nullable' => False),
-			'info_from' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_addr' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_subject' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_des' => array('type' => 'text','nullable' => True),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_access' => array('type' => 'varchar','precision' => '10','nullable' => True,'default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_enddate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_id_parent' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_pri' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_status' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'not')
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '255', 'default' => 'task', 'nullable' => False),
+			'info_from' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_des' => array('type' => 'text', 'nullable' => True),
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'nullable' => True, 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_pri' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_status' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'not')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'info_event_id');
+	), 'info_event_id');
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '0.9.15.003';
 }
@@ -153,37 +153,37 @@ 
 
 function infolog_upgrade0_9_15_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_type', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => False,
 		'default' => 'task'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_pri',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_pri', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => True,
 		'default' => 'normal'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_status', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => True,
 		'default' => 'done'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_confirm',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_confirm', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => True,
 		'default' => 'not'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_modifier', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_link_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_link_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -198,7 +198,7 @@ 
 		$links[$GLOBALS['egw_setup']->oProc->f(1)] = $GLOBALS['egw_setup']->oProc->f(0);
 	}
 	reset($links);
-	while (list($info_id,$link_id) = each($links))
+	while (list($info_id, $link_id) = each($links))
 	{
 		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_infolog SET info_link_id=$link_id WHERE info_id=$info_id");
 	}
@@ -211,9 +211,9 @@ 
 {
 	// this update correctes wrong escapes of ' and " in the past
 	//
-	$db2 = $GLOBALS['egw_setup']->db;	// we need a 2. result-set
+	$db2 = $GLOBALS['egw_setup']->db; // we need a 2. result-set
 
-	$to_correct = array('info_from','info_subject','info_des');
+	$to_correct = array('info_from', 'info_subject', 'info_des');
 	foreach ($to_correct as $col)
 	{
 		$GLOBALS['egw_setup']->oProc->query("SELECT info_id,$col FROM phpgw_infolog WHERE $col LIKE '%\\'%' OR $col LIKE '%\"%'");
@@ -230,13 +230,13 @@ 
 
 function infolog_upgrade0_9_15_005()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_infolog_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_infolog_extra', array(
 		'fd' => array(
-			'info_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_extra_name' => array('type' => 'varchar','precision' => '32','nullable' => False),
-			'info_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'info_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_extra_name' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False),
+			'info_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('info_id','info_extra_name'),
+		'pk' => array('info_id', 'info_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -249,20 +249,20 @@ 
 // the following series of updates add some indices, to speedup the selects
 function infolog_upgrade0_9_15_006()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_links',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_links', array(
 		'fd' => array(
-			'link_id' => array('type' => 'auto','nullable' => False),
-			'link_app1' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id1' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_app2' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id2' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_remark' => array('type' => 'varchar','precision' => '50'),
-			'link_lastmod' => array('type' => 'int','precision' => '4','nullable' => False),
-			'link_owner' => array('type' => 'int','precision' => '4','nullable' => False)
+			'link_id' => array('type' => 'auto', 'nullable' => False),
+			'link_app1' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id1' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_app2' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id2' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_remark' => array('type' => 'varchar', 'precision' => '50'),
+			'link_lastmod' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'link_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False)
 		),
 		'pk' => array('link_id'),
 		'fk' => array(),
-		'ix' => array(array('link_app1','link_id1','link_lastmod'),array('link_app2','link_id2','link_lastmod')),
+		'ix' => array(array('link_app1', 'link_id1', 'link_lastmod'), array('link_app2', 'link_id2', 'link_lastmod')),
 		'uc' => array()
 	));
 
@@ -272,33 +272,33 @@ 
 
 function infolog_upgrade0_9_15_007()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_infolog',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '10','nullable' => False,'default' => 'task'),
-			'info_from' => array('type' => 'varchar','precision' => '64'),
-			'info_addr' => array('type' => 'varchar','precision' => '64'),
-			'info_subject' => array('type' => 'varchar','precision' => '64'),
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '10', 'nullable' => False, 'default' => 'task'),
+			'info_from' => array('type' => 'varchar', 'precision' => '64'),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64'),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64'),
 			'info_des' => array('type' => 'text'),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_access' => array('type' => 'varchar','precision' => '10','default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_enddate' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_pri' => array('type' => 'varchar','precision' => '10','default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_status' => array('type' => 'varchar','precision' => '10','default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'),
-			'info_modifier' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0')
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_pri' => array('type' => 'varchar', 'precision' => '10', 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_status' => array('type' => 'varchar', 'precision' => '10', 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '10', 'default' => 'not'),
+			'info_modifier' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_link_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
-		'ix' => array(array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
+		'ix' => array(array('info_owner', 'info_responsible', 'info_status', 'info_startdate'), array('info_id_parent', 'info_owner', 'info_responsible', 'info_status', 'info_startdate')),
 		'uc' => array()
 	));
 
@@ -310,8 +310,8 @@ 
 function infolog_upgrade0_9_15_008()
 {
 	// update the sequenzes for refreshed tables (postgres only)
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_infolog','info_id');
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_links','link_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_infolog', 'info_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_links', 'link_id');
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.0.0';
 }
@@ -320,25 +320,25 @@ 
 function infolog_upgrade1_0_0()
 {
 	// longer columns to cope with multibyte charsets
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_type', array(
 		'type' => 'varchar',
 		'precision' => '40',
 		'nullable' => False,
 		'default' => 'task'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_from',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_from', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_addr',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_addr', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_subject',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_subject', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_status', array(
 		'type' => 'varchar',
 		'precision' => '40',
 		'default' => 'done'
@@ -350,21 +350,21 @@ 
 
 function infolog_upgrade1_0_0_001()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog','info_time','info_planned_time');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog','info_bill_cat','info_used_time');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog', 'info_time', 'info_planned_time');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog', 'info_bill_cat', 'info_used_time');
 	// timestamps have to be 8byte ints
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_datemodified',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_datemodified', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_startdate',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_startdate', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_enddate',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_enddate', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -372,49 +372,49 @@ 
 	));
 
 	// setting numerical priority 3=urgent, 2=high, 1=normal, 0=
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_priority',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_priority', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_infolog SET info_priority=(CASE WHEN info_pri='urgent' THEN 3 WHEN info_pri='high' THEN 2 WHEN info_pri='low' THEN 0 ELSE 1 END)",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_infolog SET info_priority=(CASE WHEN info_pri='urgent' THEN 3 WHEN info_pri='high' THEN 2 WHEN info_pri='low' THEN 0 ELSE 1 END)", __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => 'task'),
-			'info_from' => array('type' => 'varchar','precision' => '255'),
-			'info_addr' => array('type' => 'varchar','precision' => '255'),
-			'info_subject' => array('type' => 'varchar','precision' => '255'),
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False, 'default' => 'task'),
+			'info_from' => array('type' => 'varchar', 'precision' => '255'),
+			'info_addr' => array('type' => 'varchar', 'precision' => '255'),
+			'info_subject' => array('type' => 'varchar', 'precision' => '255'),
 			'info_des' => array('type' => 'text'),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_access' => array('type' => 'varchar','precision' => '10','default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_datemodified' => array('type' => 'int','precision' => '8','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'info_enddate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_planned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_used_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'),
-			'info_modifier' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_priority' => array('type' => 'int','precision' => '2','default' => '1')
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_datemodified' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'info_enddate' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_planned_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_used_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_status' => array('type' => 'varchar', 'precision' => '40', 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '10', 'default' => 'not'),
+			'info_modifier' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_link_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_priority' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
-		'ix' => array(array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
+		'ix' => array(array('info_owner', 'info_responsible', 'info_status', 'info_startdate'), array('info_id_parent', 'info_owner', 'info_responsible', 'info_status', 'info_startdate')),
 		'uc' => array()
-	),'info_pri');
+	), 'info_pri');
 
-	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog','egw_infolog');
-	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog_extra','egw_infolog_extra');
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog', 'egw_infolog');
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog_extra', 'egw_infolog_extra');
 	// only rename links table, if it has not been moved into the API and therefor been already renamed by the API update
 	if ($GLOBALS['egw_setup']->oProc->GetTableDefinition('phpgw_links'))
 	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_links','egw_links');
+		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_links', 'egw_links');
 	}
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.0.1.001';
@@ -423,7 +423,7 @@ 
 
 function infolog_upgrade1_0_1_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_responsible',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_responsible', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -442,12 +442,12 @@ 
 
 function infolog_upgrade1_2()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','pl_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'pl_id', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_price',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_price', array(
 		'type' => 'float',
 		'precision' => '8'
 	));
@@ -458,38 +458,38 @@ 
 
 function infolog_upgrade1_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_percent',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_percent', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_datecompleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_datecompleted', array(
 		'type' => 'int',
 		'precision' => '8'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_location',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_location', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
 
 	// all not explicit named stati have the default percent 0
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=10 WHERE info_status='ongoing'",__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=50 WHERE info_status='will-call'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=10 WHERE info_status='ongoing'", __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=50 WHERE info_status='will-call'", __LINE__, __FILE__);
 
-	for($p = 0; $p <= 90; $p += 10)
+	for ($p = 0; $p <= 90; $p += 10)
 	{
 		$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=$p,info_status='".(!$p ? 'not-started' : 'ongoing').
-			"' WHERE info_status = '$p%'",__LINE__,__FILE__);
+			"' WHERE info_status = '$p%'", __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_datecompleted=info_datemodified,info_percent=100 WHERE info_status IN ('done','billed','100%')",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_datecompleted=info_datemodified,info_percent=100 WHERE info_status IN ('done','billed','100%')", __LINE__, __FILE__);
 
 	// remove the percentages from the custom stati, if they exist
-	$config =& CreateObject('phpgwapi.config','infolog');
+	$config = & CreateObject('phpgwapi.config', 'infolog');
 	$config->read_repository();
 	if (is_array($config->config_data['status']['task']))
 	{
 		$config->config_data['status']['task'] = array_diff($config->config_data['status']['task'],
-			array('0%','10%','20%','30%','40%','50%','60%','70%','80%','90%','100%'));
+			array('0%', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'));
 		$config->save_repository();
 	}
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.2.002';
@@ -499,11 +499,11 @@ 
 function infolog_upgrade1_2_002()
 {
 	// change the phone-status: call --> not-started, will-call --> ongoing to be able to sync them
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='not-started' WHERE info_status='call'",__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='ongoing' WHERE info_status='will-call'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='not-started' WHERE info_status='call'", __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='ongoing' WHERE info_status='will-call'", __LINE__, __FILE__);
 
 	// remove the call and will-call from the custom stati, if they exist
-	$config =& CreateObject('phpgwapi.config','infolog');
+	$config = & CreateObject('phpgwapi.config', 'infolog');
 	$config->read_repository();
 	if (is_array($config->config_data['status']['phone']))
 	{
@@ -519,7 +519,7 @@ 
 function infolog_upgrade1_2_003()
 {
 	// fix wrong info_responsible='' --> '0'
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_responsible='0' WHERE info_responsible=''",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_responsible='0' WHERE info_responsible=''", __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.2.004';
 }
@@ -528,7 +528,7 @@ 
 function infolog_upgrade1_2_004()
 {
 	// column to save if from contains a custom text
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_custom_from',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_custom_from', array(
 		'type' => 'int',
 		'precision' => '1',
 	));
@@ -545,13 +545,13 @@ 
 
 function infolog_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_uid',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_uid', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->db->query("SELECT config_value FROM egw_config WHERE config_app='phpgwapi' AND config_name='install_id'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query("SELECT config_value FROM egw_config WHERE config_app='phpgwapi' AND config_name='install_id'", __LINE__, __FILE__);
 	$install_id = $GLOBALS['egw_setup']->db->next_record() ? $GLOBALS['egw_setup']->db->f(0) : md5(time());
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET info_uid='.$GLOBALS['egw_setup']->db->concat("'infolog-'",'info_id',"'-$install_id'"),__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET info_uid='.$GLOBALS['egw_setup']->db->concat("'infolog-'", 'info_id', "'-$install_id'"), __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.001';
 }
@@ -564,17 +564,17 @@ 
  */
 function infolog_upgrade1_5_001()
 {
-	foreach($GLOBALS['egw_setup']->db->select('egw_infolog','info_id,info_link_id,org_name,adr_one_locality,n_family,n_given',array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_infolog', 'info_id,info_link_id,org_name,adr_one_locality,n_family,n_given', array(
 		'info_from' => '',
 		'info_link_id > 0',
-	),__LINE__,__FILE__,false,'','infolog',0,
+	), __LINE__, __FILE__, false, '', 'infolog', 0,
 	" JOIN egw_links ON info_link_id=link_id AND link_app2='addressbook'".
 	" JOIN egw_addressbook ON contact_id=link_id2") as $row)
 	{
 		$from = ($row['org_name'] ? $row['org_name'].', '.$row['adr_one_locality'].': ' : '').
 			$row['n_family'].($row['n_given'] ? ', '.$row['n_given'] : '');
-		$GLOBALS['egw_setup']->db->update('egw_infolog',array('info_from' => $from),
-			array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
+		$GLOBALS['egw_setup']->db->update('egw_infolog', array('info_from' => $from),
+			array('info_id' => $row['info_id']), __LINE__, __FILE__, 'infolog');
 	}
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.002';
 }
@@ -587,12 +587,12 @@ 
  */
 function infolog_upgrade1_5_002()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra','info_extra_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra', 'info_extra_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra','info_extra_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra', 'info_extra_value', array(
 		'type' => 'text',
 		'nullable' => False
 	));
@@ -608,7 +608,7 @@ 
  */
 function infolog_upgrade1_5_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_replanned_time',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_replanned_time', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -637,7 +637,7 @@ 
 
 function infolog_upgrade1_8()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_cc',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_cc', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
@@ -651,29 +651,29 @@ 
  */
 function infolog_upgrade1_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'name part of CalDAV URL, if specified by client'
 	));
 	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET caldav_name='.
 		$GLOBALS['egw_setup']->db->concat(
-			$GLOBALS['egw_setup']->db->to_varchar('info_id'),"'.ics'"),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->to_varchar('info_id'), "'.ics'"), __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_infolog','caldav_name');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_infolog', 'caldav_name');
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_etag',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0',
 		'comment' => 'etag, not yet used'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_created', array(
 		'type' => 'int',
 		'precision' => '8',
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 	));
@@ -688,18 +688,18 @@ 
 function infolog_upgrade1_9_002()
 {
 	$ids = array();
-	foreach($GLOBALS['egw_setup']->db->query('SELECT sub.info_id
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT sub.info_id
 FROM egw_infolog sub
 JOIN egw_infolog parent ON sub.info_id_parent=parent.info_id
-WHERE parent.caldav_name=sub.caldav_name',__LINE__,__FILE__) as $row)
+WHERE parent.caldav_name=sub.caldav_name',__LINE__, __FILE__) as $row)
 	{
 		$ids[] = $row['info_id'];
 	}
 	if ($ids)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET caldav_name='.
-			$GLOBALS['egw_setup']->db->concat('info_id',"'.ics'").
-			' WHERE info_id IN ('.implode(',',$ids).')',__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->concat('info_id', "'.ics'").
+			' WHERE info_id IN ('.implode(',', $ids).')', __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.9.003';
 }
@@ -707,7 +707,7 @@ 
 
 function infolog_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '200',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -752,7 +752,7 @@ 
 }
 function infolog_upgrade14_2()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_responsible',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_responsible', array(
 		'type' => 'ascii',
 		'meta' => 'account-commasep',
 		'precision' => '255',
@@ -760,23 +760,23 @@ 
 		'default' => '0',
 		'comment' => 'responsible users or groups (multiple)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_access',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_access', array(
 		'type' => 'ascii',
 		'precision' => '10',
 		'default' => 'public',
 		'comment' => 'public or privat'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_confirm',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_confirm', array(
 		'type' => 'ascii',
 		'precision' => '10',
 		'default' => 'not'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_uid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'unique id of the infolog-entry'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'caldav_name', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -788,7 +788,7 @@ 
 
 function infolog_upgrade14_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra','info_extra_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra', 'info_extra_value', array(
 		'type' => 'varchar',
 		'meta' => 'cfvalue',
 		'precision' => '16384',

infolog/inc/class.infolog_import_ical.inc.php

Spacing +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
  * import ical for infolog
  * Not a lot of options for this, just uses the ical class
  */
-class infolog_import_ical implements importexport_iface_import_plugin  {
+class infolog_import_ical implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'conditions',		/* => array containing condition arrays:
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -79,19 +79,19 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import($_stream, importexport_definition $_definition) {
 
 		$this->definition = $_definition;
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		$success = 0;
 
 		// Failures
 		$this->errors = array();
 
-		@set_time_limit(0);     // try switching execution time limit off
+		@set_time_limit(0); // try switching execution time limit off
 
 		$infolog_ical = new infolog_ical();
 		if (!$infolog_ical->importVTODO(stream_get_contents($_stream)))

Doc Comments +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(

Indentation +29 added lines, -29 removed lines

@@ -71,9 +71,9 @@ 
 	protected $errors = array();
 
 	/**
-         * List of actions, and how many times that action was taken
-         */
-        protected $results = array();
+	 * List of actions, and how many times that action was taken
+	 */
+		protected $results = array();
 
 	/**
 	 * imports entries according to given definition object.
@@ -163,39 +163,39 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 } // end of iface_export_plugin
 ?>

Braces +20 added lines, -10 removed lines

@@ -16,7 +16,8 @@ 
  * import ical for infolog
  * Not a lot of options for this, just uses the ical class
  */
-class infolog_import_ical implements importexport_iface_import_plugin  {
+class infolog_import_ical implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'conditions',		/* => array containing condition arrays:
@@ -81,7 +82,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 
 		$this->definition = $_definition;
 
@@ -115,7 +117,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog iCal import');
 	}
 
@@ -124,7 +127,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports TODOs into Infolog from an iCal File.");
 	}
 
@@ -133,7 +137,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
@@ -149,7 +154,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -158,7 +164,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -170,7 +177,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -182,7 +190,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -194,7 +203,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 } // end of iface_export_plugin

infolog/inc/class.infolog_egw_record.inc.php

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@
 	// Used in conversions
 	static $types = array(
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
-                'select-cat' => array('info_cat'),
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
+				'select-cat' => array('info_cat'),
+				'select-account' => array('info_owner','info_responsible','info_modifier'),
+				'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
 		'links' => array('info_link_id'),
-        );
+		);
 
 	/**
 	 * constructor

Spacing +10 added lines, -10 removed lines

@@ -26,8 +26,8 @@ 
 	static $types = array(
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
                 'select-cat' => array('info_cat'),
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
+                'select-account' => array('info_owner', 'info_responsible', 'info_modifier'),
+                'date-time' => array('info_startdate', 'info_enddate', 'info_datecompleted', 'info_datemodified', 'info_created'),
 		'links' => array('info_link_id'),
         );
 
@@ -37,10 +37,10 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
-		if(self::$bo == null) self::$bo = new infolog_bo();
-		if($_identifier) {
+		if (self::$bo == null) self::$bo = new infolog_bo();
+		if ($_identifier) {
 			$rec = self::$bo->read($this->identifier);
 			if (is_array($rec)) $this->set_record($rec);
 		}
@@ -95,7 +95,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->record = $_record;
 	}
 
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 
 	}
 
@@ -143,7 +143,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy($_dst_identifier) {
 
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move($_dst_identifier) {
 
 	}
 
@@ -162,7 +162,7 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +38 added lines, -17 removed lines

@@ -37,12 +37,20 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
-		if(self::$bo == null) self::$bo = new infolog_bo();
-		if($_identifier) {
+		if(self::$bo == null)
+		{
+			self::$bo = new infolog_bo();
+		}
+		if($_identifier)
+		{
 			$rec = self::$bo->read($this->identifier);
-			if (is_array($rec)) $this->set_record($rec);
+			if (is_array($rec))
+			{
+				$this->set_record($rec);
+			}
 		}
 	}
 
@@ -51,7 +59,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->record[$_attribute_name];
 	}
 
@@ -61,7 +70,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->record[$_attribute_name] = $data;
 	}
 
@@ -73,7 +83,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->record;
 	}
 
@@ -82,8 +93,10 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
-		if (empty($this->record)) {
+	public function get_title()
+	{
+		if (empty($this->record))
+		{
 			$this->get_record();
 		}
 		return self::$bo->link_title($this->record);
@@ -95,7 +108,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->record = $_record;
 	}
 
@@ -104,7 +118,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -114,7 +129,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		$icon = 'infolog/navbar';
 		$ui = new infolog_ui();
 		if (!($icon = $ui->icons['type'][$this->info_type]))
@@ -133,7 +149,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 
 	}
 
@@ -143,7 +160,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 
 	}
 
@@ -154,7 +172,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 
 	}
 
@@ -162,7 +181,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -170,7 +190,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 	}
 
 } // end of egw_addressbook_record

infolog/inc/class.infolog_export_csv.inc.php

Indentation +4 added lines, -4 removed lines

@@ -259,10 +259,10 @@
 	}
 
 	/**
-	* Convert some internal data to something with more meaning
-	*
-	* This is for something specific to Infolog, in addition to the normal conversions.
-	*/
+	 * Convert some internal data to something with more meaning
+	 *
+	 * This is for something specific to Infolog, in addition to the normal conversions.
+	 */
 	public static function convert(infolog_egw_record &$record) {
 		// Stub, for now
 	}

Doc Comments +1 added lines, -1 removed lines

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

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

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

Spacing +42 added lines, -42 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -39,45 +39,45 @@ 
 		$this->export_object->set_mapping($options['mapping']);
 
 		$ids = array();
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'search':
-				$query = array_merge((array)$GLOBALS['egw']->session->appsession('session_data','infolog'), $query);
+				$query = array_merge((array)$GLOBALS['egw']->session->appsession('session_data', 'infolog'), $query);
 				// Fall through
 			case 'filter':
 			case 'all':
 				// do we need to query the cf's
 				$query['custom_fields'] = false;
-				foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
-					if($field[0] == '#') {
+				foreach ($options['mapping'] + (array)$_definition->filter as $field => $map) {
+					if ($field[0] == '#') {
 						$query['custom_fields'] = true;
 						$query['selectcols'] .= ",$field";
 
-						if($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field,1)]['type']])
+						if ($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field, 1)]['type']])
 						{
-							$cf_links[$field] = $this->bo->customfields[substr($field,1)]['type'];
+							$cf_links[$field] = $this->bo->customfields[substr($field, 1)]['type'];
 						}
 					}
 				}
-				if($options['selection'] == 'filter')
+				if ($options['selection'] == 'filter')
 				{
 					$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);
 					$query['col_filter'] = $_definition->filter;
 
 					// Backend expects a string
-					if($query['col_filter']['info_responsible'])
+					if ($query['col_filter']['info_responsible'])
 					{
-						$query['col_filter']['info_responsible'] = implode(',',$query['col_filter']['info_responsible']);
+						$query['col_filter']['info_responsible'] = implode(',', $query['col_filter']['info_responsible']);
 					}
 
 					// Handle ranges
-					foreach($query['col_filter'] as $field => $value)
+					foreach ($query['col_filter'] as $field => $value)
 					{
-						if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+						if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 						// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-						if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-						if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+						if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+						if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 						unset($query['col_filter'][$field]);
 					}
 				}
@@ -89,11 +89,11 @@ 
 
 					// Pre-load any cfs that are links
 					$cf_preload = array();
-					foreach($cf_links as $field => $app) {
-						foreach($selection as &$row) {
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+					foreach ($cf_links as $field => $app) {
+						foreach ($selection as &$row) {
+							if ($row[$field]) $cf_preload[$app][] = $row[$field];
 						}
-						if($cf_preload[$app]){
+						if ($cf_preload[$app]) {
 							 $selects[$field] = egw_link::titles($app, $cf_preload[$app]);
 							//error_log('Preload ' . $field . '['.$app . ']: ' . implode(',',$cf_preload[$app]));
 						}
@@ -101,12 +101,12 @@ 
 
 					$this->export_records($this->export_object, $options, $selection, $ids);
 					$query['start'] += $query['num_rows'];
-				} while($query['start'] < $query['total']);
+				} while ($query['start'] < $query['total']);
 
 				return $this->export_object;
 				break;
 			default:
-				$ids = $selection = explode(',',$options['selection']);
+				$ids = $selection = explode(',', $options['selection']);
 				$this->export_records($this->export_object, $options, $selection, $ids);
 				break;
 		}
@@ -116,33 +116,33 @@ 
 	protected function export_records(&$export_object, $options, &$selection, $ids = array())
 	{
 		// Pre-load links all at once
-		if($ids && $options['mapping']['info_link_id'])
+		if ($ids && $options['mapping']['info_link_id'])
 		{
 			$links = egw_link::get_links_multiple('infolog', $ids, true, '!'.egw_link::VFS_APPNAME);
-			foreach($links as $id => $link) {
-				if(!is_array($selection[$id])) break;
+			foreach ($links as $id => $link) {
+				if (!is_array($selection[$id])) break;
 				$selection[$id]['info_link_id'] = $link;
-				if($options['convert']) $selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				if ($options['convert']) $selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
 			}
 		}
 		// If exporting PM fields, pre-load them all at once
-		if($ids && ($options['mapping']['pm_id'] || $options['mapping']['project']))
+		if ($ids && ($options['mapping']['pm_id'] || $options['mapping']['project']))
 		{
 			$projects = egw_link::get_links_multiple('infolog', $ids, true, 'projectmanager');
-			foreach($projects as $id => $links)
+			foreach ($projects as $id => $links)
 			{
-				if(!is_array($selection[$id])) break;
+				if (!is_array($selection[$id])) break;
 				$selection[$id]['pm_id'] = current($links);
 				$selection[$id]['project'] = egw_link::title('projectmanager', $selection[$id]['pm_id']);
-				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',$selection[$id]['pm_id']);
+				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist', $selection[$id]['pm_id']);
 			}
 		}
 
 		foreach ($selection as $_identifier) {
-			if(!is_array($_identifier)) {
+			if (!is_array($_identifier)) {
 				$record = new infolog_egw_record($_identifier);
-				if($link = $links[$record->info_id]) $record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
-				if($project = $projects[$record->info_id])
+				if ($link = $links[$record->info_id]) $record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				if ($project = $projects[$record->info_id])
 				{
 					$record->pm_id = current($project);
 					$record->project = egw_link::title('projectmanager', $record->pm_id);
@@ -152,20 +152,20 @@ 
 				$record->set_record($_identifier);
 			}
 			// Some conversion
-			if($options['convert']) {
+			if ($options['convert']) {
 				$this->selects['info_status'] = $this->bo->get_status($record->info_type);
 				importexport_export_csv::convert($record, infolog_egw_record::$types, 'infolog', $this->selects);
 				$this->convert($record);
 
 				// Force 0 times to ''
-				foreach(array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
+				foreach (array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
 				{
-					if($record->$field == 0) $record->$field = '';
+					if ($record->$field == 0) $record->$field = '';
 				}
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
 			}
 			$export_object->export_record($record);
@@ -210,7 +210,7 @@ 
 	 */
 	public function get_filename()
 	{
-		if(is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
+		if (is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
 		{
 			return $this->export_object->record->get_title();
 		}
@@ -240,18 +240,18 @@ 
 	{
 		$this->selects['info_type'] = $this->bo->enums['type'];
 		$this->selects['info_priority'] = $this->bo->enums['priority'];
-		$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',false);
+		$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist', false);
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
 	public function get_filter_fields(Array &$filters)
 	{
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 			
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
-			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
+			if (strpos($field_name, '#') === 0 && strpos($settings['type'], 'date') === 0) unset($filters[$field_name]);
 		}
 	}
 
@@ -260,7 +260,7 @@ 
 	*
 	* This is for something specific to Infolog, in addition to the normal conversions.
 	*/
-	public static function convert(infolog_egw_record &$record) {
+	public static function convert(infolog_egw_record&$record) {
 		// Stub, for now
 	}
 }

Braces +94 added lines, -34 removed lines

@@ -14,10 +14,12 @@ 
 /**
  * export plugin of infolog
  */
-class infolog_export_csv implements importexport_iface_export_plugin {
+class infolog_export_csv implements importexport_iface_export_plugin
+{
 
 
-	public function __construct() {
+	public function __construct()
+	{
 		translation::add_app('infolog');
 		$this->bo = new infolog_bo();
 		$this->get_selects();
@@ -28,7 +30,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -48,8 +51,10 @@ 
 			case 'all':
 				// do we need to query the cf's
 				$query['custom_fields'] = false;
-				foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
-					if($field[0] == '#') {
+				foreach($options['mapping'] + (array)$_definition->filter as $field => $map)
+				{
+					if($field[0] == '#')
+					{
 						$query['custom_fields'] = true;
 						$query['selectcols'] .= ",$field";
 
@@ -73,11 +78,20 @@ 
 					// Handle ranges
 					foreach($query['col_filter'] as $field => $value)
 					{
-						if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+						if(!is_array($value) || (!$value['from'] && !$value['to']))
+						{
+							continue;
+						}
 
 						// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-						if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-						if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+						if($value['from'])
+						{
+							$query['col_filter'][] = "$field >= " . (int)$value['from'];
+						}
+						if($value['to'])
+						{
+							$query['col_filter'][] = "$field <= " . (int)$value['to'];
+						}
 						unset($query['col_filter'][$field]);
 					}
 				}
@@ -89,11 +103,17 @@ 
 
 					// Pre-load any cfs that are links
 					$cf_preload = array();
-					foreach($cf_links as $field => $app) {
-						foreach($selection as &$row) {
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+					foreach($cf_links as $field => $app)
+					{
+						foreach($selection as &$row)
+						{
+							if($row[$field])
+							{
+								$cf_preload[$app][] = $row[$field];
+							}
 						}
-						if($cf_preload[$app]){
+						if($cf_preload[$app])
+						{
 							 $selects[$field] = egw_link::titles($app, $cf_preload[$app]);
 							//error_log('Preload ' . $field . '['.$app . ']: ' . implode(',',$cf_preload[$app]));
 						}
@@ -119,10 +139,17 @@ 
 		if($ids && $options['mapping']['info_link_id'])
 		{
 			$links = egw_link::get_links_multiple('infolog', $ids, true, '!'.egw_link::VFS_APPNAME);
-			foreach($links as $id => $link) {
-				if(!is_array($selection[$id])) break;
+			foreach($links as $id => $link)
+			{
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['info_link_id'] = $link;
-				if($options['convert']) $selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				if($options['convert'])
+				{
+					$selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				}
 			}
 		}
 		// If exporting PM fields, pre-load them all at once
@@ -131,28 +158,39 @@ 
 			$projects = egw_link::get_links_multiple('infolog', $ids, true, 'projectmanager');
 			foreach($projects as $id => $links)
 			{
-				if(!is_array($selection[$id])) break;
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['pm_id'] = current($links);
 				$selection[$id]['project'] = egw_link::title('projectmanager', $selection[$id]['pm_id']);
 				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',$selection[$id]['pm_id']);
 			}
 		}
 
-		foreach ($selection as $_identifier) {
-			if(!is_array($_identifier)) {
+		foreach ($selection as $_identifier)
+		{
+			if(!is_array($_identifier))
+			{
 				$record = new infolog_egw_record($_identifier);
-				if($link = $links[$record->info_id]) $record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				if($link = $links[$record->info_id])
+				{
+					$record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				}
 				if($project = $projects[$record->info_id])
 				{
 					$record->pm_id = current($project);
 					$record->project = egw_link::title('projectmanager', $record->pm_id);
 				}
-			} else {
+			}
+			else
+			{
 				$record = new infolog_egw_record();
 				$record->set_record($_identifier);
 			}
 			// Some conversion
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				$this->selects['info_status'] = $this->bo->get_status($record->info_type);
 				importexport_export_csv::convert($record, infolog_egw_record::$types, 'infolog', $this->selects);
 				$this->convert($record);
@@ -160,12 +198,21 @@ 
 				// Force 0 times to ''
 				foreach(array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
 				{
-					if($record->$field == 0) $record->$field = '';
+					if($record->$field == 0)
+					{
+						$record->$field = '';
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
 			}
 			$export_object->export_record($record);
@@ -178,7 +225,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog CSV export');
 	}
 
@@ -187,7 +235,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports Infolog entries into a CSV File.");
 	}
 
@@ -196,11 +245,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -223,14 +274,16 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'infolog.export_csv_selectors',
 		);
@@ -248,10 +301,16 @@ 
 	{
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 			
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
-			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
+			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0)
+			{
+				unset($filters[$field_name]);
+			}
 		}
 	}
 
@@ -260,7 +319,8 @@ 
 	*
 	* This is for something specific to Infolog, in addition to the normal conversions.
 	*/
-	public static function convert(infolog_egw_record &$record) {
+	public static function convert(infolog_egw_record &$record)
+	{
 		// Stub, for now
 	}
 }