EGroupware / egroupware

infolog/inc/class.infolog_import_infologs_csv.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -108,8 +108,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(
@@ -527,6 +526,7 @@ 
 	 *
 	 * This is a copy of what's in importexport_basic_import_csv, and can go
 	 * away if this is changed to extend it
+	 * @param integer $record_num
 	 */
 	protected function link_by_cf($record_num, $app, $fieldname, $_value)
 	{

Indentation +26 added lines, -26 removed lines

@@ -74,10 +74,10 @@ 
 	private $boinfolog;
 
 	/**
-	* For figuring out if a record has changed
-	*
-	* @var infolog_tracking::
-	*/
+	 * For figuring out if a record has changed
+	 *
+	 * @var infolog_tracking::
+	 */
 	protected $tracking;
 
 	/**
@@ -101,7 +101,7 @@ 
 	protected $errors = array();
 
 	/**
- 	* List of actions, and how many times that action was taken
+	 * List of actions, and how many times that action was taken
 	 */
 	protected $results = array();
 
@@ -466,37 +466,37 @@ 
 	}
 
 	/**
-	* 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
-	*       )
-	*/
+	 * 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
-	*       )
-	*/
+	 * 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
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results() {
 		return $this->results;
 	}

Spacing +78 added lines, -78 removed lines

@@ -16,19 +16,19 @@ 
 /**
  * class import_csv for infolog
  */
-class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
+class infolog_import_infologs_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'contact_owner', 	// int
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'contact_owner', // int
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -54,14 +54,14 @@ 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert', 'delete', );
+	protected static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -111,8 +111,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -122,7 +122,7 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// 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;
 
 		// fetch the infolog bo
 		$this->boinfolog = new infolog_bo();
@@ -143,9 +143,9 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -170,18 +170,18 @@ 
 		$this->errors = array();
 		$this->warnings = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 			$lookups = $_lookups;
 
 			// Early detection of type, to load appropriate statuses
-			foreach(array($lookups['info_type'], array_map('strtolower',array_map('lang',$lookups['info_type']))) as $types)
+			foreach (array($lookups['info_type'], array_map('strtolower', array_map('lang', $lookups['info_type']))) as $types)
 			{
-				if($record['info_type'] && $key = array_search(strtolower($record['info_type']),$types))
+				if ($record['info_type'] && $key = array_search(strtolower($record['info_type']), $types))
 				{
 					$lookups['info_status'] = $this->boinfolog->status[$key];
 					break;
@@ -189,34 +189,34 @@ 
 			}
 
 			$result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if ($result) $this->warnings[$import_csv->get_current_position()] = $result;
 
 			// Make sure type is valid
-			if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
+			if (!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
 			{
 				// Check for translated type
-				$un_trans = Api\Translation::get_message_id($record['info_type'],'infolog');
-				if($record['info_type'] && $this->boinfolog->enums['type'][$un_trans])
+				$un_trans = Api\Translation::get_message_id($record['info_type'], 'infolog');
+				if ($record['info_type'] && $this->boinfolog->enums['type'][$un_trans])
 				{
 					$record['info_type'] = $un_trans;
 				}
 				else
 				{
-					$this->errors[$import_csv->get_current_position()] .= ($this->errors[$import_csv->get_current_position()] ? "\n":'').
+					$this->errors[$import_csv->get_current_position()] .= ($this->errors[$import_csv->get_current_position()] ? "\n" : '').
 						lang('Unknown type: %1', $record['info_type']);
 				}
 			}
 
 			// Set default status for type, if not specified
-			if(!$record['info_status'] && $record['info_type'])
+			if (!$record['info_status'] && $record['info_type'])
 			{
 				$record['info_status'] = $this->boinfolog->status['defaults'][$record['info_type']];
 			}
 
 			// Set owner, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'])
+			if ($_definition->plugin_options['owner_from_csv'])
 			{
-				if(!is_numeric($record['info_owner']))
+				if (!is_numeric($record['info_owner']))
 				{
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
@@ -233,51 +233,51 @@ 
 			if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
 			// Responsible has to be an array
-			$record['info_responsible'] = $record['info_responsible'] ? explode(',',$record['info_responsible']) : 0;
+			$record['info_responsible'] = $record['info_responsible'] ? explode(',', $record['info_responsible']) : 0;
 
 			// Special values
 			if ($record['addressbook'] && !is_numeric($record['addressbook']))
 			{
-				list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']);
-				$record['addressbook'] = importexport_basic_import_csv::addr_id($lastname,$firstname,$org_name);
+				list($lastname, $firstname, $org_name) = explode(',', $record['addressbook']);
+				$record['addressbook'] = importexport_basic_import_csv::addr_id($lastname, $firstname, $org_name);
 			}
 			if ($record['projectmanager'] && !is_numeric($record['projectmanager']))
 			{
 				$record['projectmanager'] = self::project_id($record['projectmanager']);
 			}
 
-			if ( $_definition->plugin_options['conditions'] )
+			if ($_definition->plugin_options['conditions'])
 			{
-				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				foreach ($_definition->plugin_options['conditions'] as $condition)
 				{
 					$results = array();
-					switch ( $condition['type'] )
+					switch ($condition['type'])
 					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
-								$query['col_filter'] = array( $condition['string'] => $record[$condition['string']],);
+							if ($record[$condition['string']]) {
+								$query['col_filter'] = array($condition['string'] => $record[$condition['string']],);
 								// Needed to query custom fields
-								if($condition['string'][0] == '#') $query['custom_fields'] = true;
+								if ($condition['string'][0] == '#') $query['custom_fields'] = true;
 								$results = $this->boinfolog->search($query);
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+							if (is_array($results) && count(array_keys($results)) >= 1) {
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $contact ) {
+								foreach ((array)$results as $contact) {
 									$record['info_id'] = $contact['info_id'];
 									$record['info_owner'] = $contact['info_owner'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
-										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $contact['cat_id'] ) ) );
+									if ($_definition->plugin_options['update_cats'] == 'add') {
+										if (!is_array($contact['cat_id'])) $contact['cat_id'] = explode(',', $contact['cat_id']);
+										if (!is_array($record['cat_id'])) $record['cat_id'] = explode(',', $record['cat_id']);
+										$record['cat_id'] = implode(',', array_unique(array_merge($record['cat_id'], $contact['cat_id'])));
 									}
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -292,14 +292,14 @@ 
 			else
 			{
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
-			if($this->warnings[$import_csv->get_current_position()]) {
-				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
+			if ($success) $count++;
+			if ($this->warnings[$import_csv->get_current_position()]) {
+				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n".array2string($record);
 			}
-			if($this->errors[$import_csv->get_current_position()]) {
-				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
+			if ($this->errors[$import_csv->get_current_position()]) {
+				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n".array2string($record);
 			}
 		}
 		return $count;
@@ -312,7 +312,7 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action($_action, $_data, $record_num = 0) {
 		$result = true;
 		switch ($_action) {
 			case 'none' :
@@ -321,7 +321,7 @@ 
 				// Only update if there are changes
 				$old = $this->boinfolog->read($_data['info_id']);
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -329,19 +329,19 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if (count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
 					break;
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 
 					// Check for link during dry run
-					if($_data['link_custom'])
+					if ($_data['link_custom'])
 					{
-						list($app, $app_id2) = explode(':', $_data['link_custom'],2);
+						list($app, $app_id2) = explode(':', $_data['link_custom'], 2);
 						$app_id = $this->link_by_cf($record_num, $app, $field, $app_id2);
 					}
 
@@ -349,12 +349,12 @@ 
 					break;
 				} else {
 					$result = $this->boinfolog->write(
-						$_data, true, 2,true, 	// 2 = dont touch modification date
+						$_data, true, 2, true, // 2 = dont touch modification date
 						$this->definition->plugin_options['no_notification']
 					);
-					if(!$result)
+					if (!$result)
 					{
-						if($result === false)
+						if ($result === false)
 						{
 							$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 								$GLOBALS['egw']->accounts->id2name($_data['info_owner']),
@@ -377,17 +377,17 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if (!is_numeric($result)) {
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(array_keys(self::$special_fields) as $field) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
-				list($app, $app_id) = explode(':', $_data[$field],2);
+		foreach (array_keys(self::$special_fields) as $field) {
+			if (!$_data[$field]) continue;
+			if (strpos($field, 'link') === 0) {
+				list($app, $app_id) = explode(':', $_data[$field], 2);
 
 				// Linking to another entry based on matching custom fields
-				if($field == 'link_custom')
+				if ($field == 'link_custom')
 				{
 					$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 				}
@@ -398,14 +398,14 @@ 
 			if ($app && $app_id) {
 				$id = $_data['info_id'] ? $_data['info_id'] : (int)$result;
 				//echo "<p>linking infolog:$id with $app:$app_id</p>\n";
-				$link_id = Link::link('infolog',$id,$app,$app_id);
+				$link_id = Link::link('infolog', $id, $app, $app_id);
 				if ($link_id && !$info_link_id)
 				{
 					$to_write = array(
 						'info_id'      => $id,
 						'info_link_id' => $link_id,
 					);
-					$this->boinfolog->write($to_write,False,false,true,true);	// last true = no notifications, as no real change
+					$this->boinfolog->write($to_write, False, false, true, true); // last true = no notifications, as no real change
 					$info_link_id = $link_id;
 				}
 			}
@@ -505,7 +505,7 @@ 
 	// Extra conversion functions - must be static
 	public static function project_id($num_or_title)
 	{
-		static $boprojects=null;
+		static $boprojects = null;
 
 		if (!$num_or_title) return false;
 
@@ -532,18 +532,18 @@ 
 	{
 		$app_id = false;
 
-		list($custom_field, $value) = explode(':',$_value);
+		list($custom_field, $value) = explode(':', $_value);
 		// Find matching entry
-		if($app && $custom_field && $value)
+		if ($app && $custom_field && $value)
 		{
 			$cfs = Api\Storage\Customfields::get($app);
 			// Error if no custom fields, probably something wrong in definition
-			if(!$cfs[$custom_field])
+			if (!$cfs[$custom_field])
 			{
 				// Check for users specifing label instead of name
-				foreach($cfs as $name => $settings)
+				foreach ($cfs as $name => $settings)
 				{
-					if(strtolower($settings['label']) == strtolower($custom_field))
+					if (strtolower($settings['label']) == strtolower($custom_field))
 					{
 						$custom_field = $name;
 						break;
@@ -552,23 +552,23 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if (!$cfs[$custom_field] && !$cfs[substr($custom_field, 1)]) {
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if ($custom_field[0] != '#') $custom_field = '#'.$custom_field;
 
 			// Search
-			if(Link::get_registry($app, 'query'))
+			if (Link::get_registry($app, 'query'))
 			{
-				$options = array('filter' => array("$custom_field = " . $GLOBALS['egw']->db->quote($value)));
+				$options = array('filter' => array("$custom_field = ".$GLOBALS['egw']->db->quote($value)));
 				$result = Link::query($app, '', $options);
 
 				// Only one allowed
-				if(count($result) != 1)
+				if (count($result) != 1)
 				{
-					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '') .
+					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '').
 						lang('Unable to link to %3 by custom field "%1": "%4".  %2 matches.',
 						$custom_field, count($result), lang($app), $options['filter'][0]
 					);

Braces +112 added lines, -43 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * class import_csv for infolog
  */
-class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
+class infolog_import_infologs_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -111,7 +112,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -143,9 +145,12 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -170,11 +175,15 @@ 
 		$this->errors = array();
 		$this->warnings = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 			$lookups = $_lookups;
 
@@ -189,7 +198,10 @@ 
 			}
 
 			$result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if($result)
+			{
+				$this->warnings[$import_csv->get_current_position()] = $result;
+			}
 
 			// Make sure type is valid
 			if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
@@ -230,7 +242,10 @@ 
 			{
 				$record['info_owner'] = $_definition->plugin_options['record_owner'];
 			}
-			if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!isset($record['info_owner']))
+			{
+				$record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 
 			// Responsible has to be an array
 			$record['info_responsible'] = $record['info_responsible'] ? explode(',',$record['info_responsible']) : 0;
@@ -255,27 +270,42 @@ 
 					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
+							if($record[$condition['string']])
+							{
 								$query['col_filter'] = array( $condition['string'] => $record[$condition['string']],);
 								// Needed to query custom fields
-								if($condition['string'][0] == '#') $query['custom_fields'] = true;
+								if($condition['string'][0] == '#')
+								{
+									$query['custom_fields'] = true;
+								}
 								$results = $this->boinfolog->search($query);
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+							if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+							{
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $contact ) {
+								foreach ( (array)$results as $contact )
+								{
 									$record['info_id'] = $contact['info_id'];
 									$record['info_owner'] = $contact['info_owner'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
+									if ( $_definition->plugin_options['update_cats'] == 'add' )
+									{
+										if ( !is_array( $contact['cat_id'] ) )
+										{
+											$contact['cat_id'] = explode( ',', $contact['cat_id'] );
+										}
+										if ( !is_array( $record['cat_id'] ) )
+										{
+											$record['cat_id'] = explode( ',', $record['cat_id'] );
+										}
 										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $contact['cat_id'] ) ) );
 									}
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 							}
@@ -286,7 +316,10 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
 			}
 			else
@@ -294,11 +327,16 @@ 
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
-			if($this->warnings[$import_csv->get_current_position()]) {
+			if($success)
+			{
+				$count++;
+			}
+			if($this->warnings[$import_csv->get_current_position()])
+			{
 				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
 			}
-			if($this->errors[$import_csv->get_current_position()]) {
+			if($this->errors[$import_csv->get_current_position()])
+			{
 				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
 			}
 		}
@@ -312,16 +350,19 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action ( $_action, $_data, $record_num = 0 )
+	{
 		$result = true;
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
 				// Only update if there are changes
 				$old = $this->boinfolog->read($_data['info_id']);
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -329,13 +370,15 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp'])
+				{
 					break;
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 
 					// Check for link during dry run
@@ -347,7 +390,9 @@ 
 
 					$this->results[$_action]++;
 					break;
-				} else {
+				}
+				else
+				{
 					$result = $this->boinfolog->write(
 						$_data, true, 2,true, 	// 2 = dont touch modification date
 						$this->definition->plugin_options['no_notification']
@@ -377,13 +422,19 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if(!is_numeric($result))
+		{
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(array_keys(self::$special_fields) as $field) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
+		foreach(array_keys(self::$special_fields) as $field)
+		{
+			if(!$_data[$field])
+			{
+				continue;
+			}
+			if(strpos($field, 'link') === 0)
+			{
 				list($app, $app_id) = explode(':', $_data[$field],2);
 
 				// Linking to another entry based on matching custom fields
@@ -391,11 +442,14 @@ 
 				{
 					$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 				}
-			} else {
+			}
+			else
+			{
 				$app = $field;
 				$app_id = $_data[$field];
 			}
-			if ($app && $app_id) {
+			if ($app && $app_id)
+			{
 				$id = $_data['info_id'] ? $_data['info_id'] : (int)$result;
 				//echo "<p>linking infolog:$id with $app:$app_id</p>\n";
 				$link_id = Link::link('infolog',$id,$app,$app_id);
@@ -418,7 +472,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog CSV import');
 	}
 
@@ -427,7 +482,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports entries into the infolog from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -436,7 +492,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -452,7 +509,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -461,7 +519,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -473,7 +532,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -485,7 +545,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -497,7 +558,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 	// end of iface_export_plugin
@@ -507,7 +569,10 @@ 
 	{
 		static $boprojects=null;
 
-		if (!$num_or_title) return false;
+		if (!$num_or_title)
+		{
+			return false;
+		}
 
 		if (!is_object($boprojects))
 		{
@@ -552,12 +617,16 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)])
+			{
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if($custom_field[0] != '#')
+			{
+				$custom_field = '#' . $custom_field;
+			}
 
 			// Search
 			if(Link::get_registry($app, 'query'))

infolog/inc/class.infolog_so.inc.php

Doc Comments +1 added lines, -14 removed lines

@@ -85,6 +85,7 @@ 
 	 * Check if user is responsible for an entry: he or one of his memberships is in responsible
 	 *
 	 * @param array $info infolog entry as array
+	 * @param integer $user
 	 * @return boolean
 	 */
 	function is_responsible($info,$user=null)
@@ -476,8 +477,6 @@ 
 	 * changes or deletes entries with a spezified owner (for hook_delete_account)
 	 *
 	 * @param array $args hook arguments
-	 * @param int $args['account_id'] account to delete
-	 * @param int $args['new_owner']=0 new owner
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
@@ -659,19 +658,7 @@ 
 	/**
 	 * searches InfoLog for a certain pattern in $query
 	 *
-	 * @param string $query[order] column-name to sort after
-	 * @param string $query[sort] sort-order DESC or ASC
-	 * @param string $query[filter] string with combination of acl-, date- and status-filters, eg. 'own-open-today' or ''
-	 * @param int $query[cat_id] category to use or 0 or unset
-	 * @param string $query[search] pattern to search, search is done in info_from, info_subject and info_des
-	 * @param string $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
 	 * @param int &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
-	 * @param array $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
-	 * @param boolean $query[subs] return subs or not, if unset the user preference is used
-	 * @param int $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs
-	 * @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned
-	 * @param string $query[append]=null get's appended to sql query, eg. for GROUP BY
-	 * @param boolean $query['custom_fields']=false query custom-fields too, default not
 	 * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
 	 */
 	function search(&$query)

Indentation +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
 					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+								 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{

Spacing +159 added lines, -160 removed lines

@@ -71,7 +71,7 @@ 
 	 * @param array $grants =array()
 	 * @return soinfolog
 	 */
-	function __construct( $grants=array() )
+	function __construct($grants = array())
 	{
 		$this->db     = clone($GLOBALS['egw']->db);
 		$this->db->set_app('infolog');
@@ -87,18 +87,18 @@ 
 	 * @param array $info infolog entry as array
 	 * @return boolean
 	 */
-	function is_responsible($info,$user=null)
+	function is_responsible($info, $user = null)
 	{
 		if (!$user) $user = $this->user;
 
 		static $um_cache = array();
-		if ($user == $this->user) $user_and_memberships =& $um_cache[$user];
+		if ($user == $this->user) $user_and_memberships = & $um_cache[$user];
 		if (!isset($user_and_memberships))
 		{
-			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user,true);
+			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$user_and_memberships[] = $user;
 		}
-		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'],$user_and_memberships);
+		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'], $user_and_memberships);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @param int $user =null user to check, default (null) $this->user
 	 * @return boolean True if access is granted else False
 	 */
-	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
+	function check_access($info, $required_rights, $implicit_edit = false, array $grants = null, $user = null)
 	{
 		if (is_null($grants)) $grants = $this->grants;
 		if (!$user) $user = $this->user;
@@ -123,7 +123,7 @@ 
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int)$info != $this->data['info_id'])      	// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
@@ -139,12 +139,12 @@ 
 			return False;
 		}
 		$owner = $info['info_owner'];
-		$access_ok = $owner == $user ||	// user has all rights
+		$access_ok = $owner == $user || // user has all rights
 			// ACL only on public entrys || $owner granted _PRIVATE
-			(!!($grants[$owner] & $required_rights) ||
-				$this->is_responsible($info,$user) &&	// implicite rights for responsible user(s) and his memberships
+			(!!($grants[$owner]&$required_rights) ||
+				$this->is_responsible($info, $user) && // implicite rights for responsible user(s) and his memberships
 				($required_rights == Acl::READ || $required_rights == Acl::ADD || $implicit_edit && $required_rights == Acl::EDIT)) &&
-			($info['info_access'] == 'public' || !!($this->grants[$user] & Acl::PRIVAT));
+			($info['info_access'] == 'public' || !!($this->grants[$user]&Acl::PRIVAT));
 
 		// error_log(__METHOD__."($info[info_id],$required_rights,$implicit_edit,".array2string($grants).",$user) returning ".array2string($access_ok));
 		return $access_ok;
@@ -163,23 +163,22 @@ 
 		if (!$users) return '0';
 
 		$responsible = array();
-		foreach((array)$users as $user)
+		foreach ((array)$users as $user)
 		{
-			$responsible = array_merge($responsible,(array)
-				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user,true) :
-					$GLOBALS['egw']->accounts->members($user,true)));
+			$responsible = array_merge($responsible, (array)
+				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user, true) : $GLOBALS['egw']->accounts->members($user, true)));
 			$responsible[] = $user;
 		}
 		if (is_array($users))
 		{
 			$responsible = array_unique($responsible);
 		}
-		foreach($responsible as $key => $uid)
+		foreach ($responsible as $key => $uid)
 		{
-			$responsible[$key] = $this->db->concat("','",'info_responsible',"','")." LIKE '%,$uid,%'";
+			$responsible[$key] = $this->db->concat("','", 'info_responsible', "','")." LIKE '%,$uid,%'";
 		}
 		//echo "<p align=right>responsible_filter($user) = ".'('.implode(' OR ',$responsible).')'."</p>\n";
-		return '('.implode(' OR ',$responsible).')';
+		return '('.implode(' OR ', $responsible).')';
 	}
 
 	/**
@@ -194,17 +193,17 @@ 
 	function aclFilter($_filter = False)
 	{
 		$vars = null;
-		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/',$_filter,$vars);
+		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/', $_filter, $vars);
 		$filter = $vars[1];
 		$f_user = $vars[2];
 
 		if (isset($this->acl_filter[$filter.$f_user]))
 		{
-			return $this->acl_filter[$filter.$f_user];  // used cached filter if found
+			return $this->acl_filter[$filter.$f_user]; // used cached filter if found
 		}
-		if ($f_user && strpos($f_user,',') !== false)
+		if ($f_user && strpos($f_user, ',') !== false)
 		{
-			$f_user = explode(',',$f_user);
+			$f_user = explode(',', $f_user);
 		}
 
 		$filtermethod = " (info_owner=$this->user"; // user has all rights
@@ -221,24 +220,24 @@ 
 		{
 			if (is_array($this->grants))
 			{
-				foreach($this->grants as $user => $grant)
+				foreach ($this->grants as $user => $grant)
 				{
 					// echo "<p>grants: user=$user, grant=$grant</p>";
-					if ($grant & (EGW_ACL_READ|EGW_ACL_EDIT))
+					if ($grant&(EGW_ACL_READ|EGW_ACL_EDIT))
 					{
 						$public_user_list[] = $user;
 					}
-					if ($grant & Acl::PRIVAT)
+					if ($grant&Acl::PRIVAT)
 					{
 						$private_user_list[] = $user;
 					}
 				}
 				if (count($private_user_list))
 				{
-					$has_private_access = $this->db->expression($this->info_table,array('info_owner' => $private_user_list));
+					$has_private_access = $this->db->expression($this->info_table, array('info_owner' => $private_user_list));
 				}
 			}
-			$public_access = $this->db->expression($this->info_table,array('info_owner' => $public_user_list));
+			$public_access = $this->db->expression($this->info_table, array('info_owner' => $public_user_list));
 			// implicit read-rights for responsible user
 			$filtermethod .= " OR (".$this->responsible_filter($this->user).')';
 
@@ -246,9 +245,9 @@ 
 			if ($filter == 'private' || $filter == 'privat' || $filter == 'own')
 			{
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
-					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
+					($filter == 'own' && count($public_user_list) ? // offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+				                 " AND (info_access='public'".($has_private_access ? " OR $has_private_access" : '').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{
@@ -265,13 +264,13 @@ 
 
 			if ($filter == 'user' && $f_user)
 			{
-				$filtermethod .= $this->db->expression($this->info_table,' AND (',array(
+				$filtermethod .= $this->db->expression($this->info_table, ' AND (', array(
 					'info_owner' => $f_user,
-				)," AND info_responsible='0' OR ",$this->responsible_filter($f_user),')');
+				), " AND info_responsible='0' OR ", $this->responsible_filter($f_user), ')');
 			}
 		}
 		//echo "<p>aclFilter(filter='$_filter',user='$f_user') = '$filtermethod', privat_user_list=".print_r($privat_user_list,True).", public_user_list=".print_r($public_user_list,True)."</p>\n";
-		return $this->acl_filter[$filter.$f_user] = $filtermethod;  // cache the filter
+		return $this->acl_filter[$filter.$f_user] = $filtermethod; // cache the filter
 	}
 
 	/**
@@ -281,18 +280,18 @@ 
 	 * @param boolean $prefix_and =true if true prefix the fileter with ' AND '
 	 * @return string the necesary sql
 	 */
-	function statusFilter($_filter = '',$prefix_and=true)
+	function statusFilter($_filter = '', $prefix_and = true)
 	{
 		$vars = null;
-		preg_match('/(done|open|offer|deleted|\+deleted)/',$_filter,$vars);
+		preg_match('/(done|open|offer|deleted|\+deleted)/', $_filter, $vars);
 		$filter = $vars[1];
 
 		switch ($filter)
 		{
 			case 'done':	$filter = "info_status IN ('done','billed','cancelled')"; break;
 			case 'open':	$filter = "NOT (info_status IN ('done','billed','cancelled','deleted','template','nonactive','archive'))"; break;
-			case 'offer':	$filter = "info_status = 'offer'";    break;
-			case 'deleted': $filter = "info_status = 'deleted'";  break;
+			case 'offer':	$filter = "info_status = 'offer'"; break;
+			case 'deleted': $filter = "info_status = 'deleted'"; break;
 			case '+deleted':$filter = "NOT (info_status IN ('template','nonactive','archive'))"; break;
 			default:        $filter = "NOT (info_status IN ('deleted','template','nonactive','archive'))"; break;
 		}
@@ -313,18 +312,18 @@ 
 	function dateFilter($_filter = '')
 	{
 		$vars = null;
-		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$_filter,$vars);
+		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/', $_filter, $vars);
 		$filter = $vars[1];
 
-		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/',$vars[2])))
+		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/', $vars[2])))
 		{
-			$today = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2]),intval($date[0]));
-			$tomorrow = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2])+1,intval($date[0]));
+			$today = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]), intval($date[0]));
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]) + 1, intval($date[0]));
 		}
 		else
 		{
-			$now = getdate(time()-60*60*$this->tz_offset);
-			$tomorrow = mktime(-$this->tz_offset,0,0,$now['mon'],$now['mday']+1,$now['year']);
+			$now = getdate(time() - 60 * 60 * $this->tz_offset);
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, $now['mon'], $now['mday'] + 1, $now['year']);
 		}
 		switch ($filter)
 		{
@@ -388,7 +387,7 @@ 
 			$minimum_uid_length = 8;
 		}
 
-		if (!$where || !($this->data = $this->db->select($this->info_table,'*',$where,__LINE__,__FILE__)->fetch()))
+		if (!$where || !($this->data = $this->db->select($this->info_table, '*', $where, __LINE__, __FILE__)->fetch()))
 		{
 			$this->init( );
 			//error_log(__METHOD__.'('.array2string($where).') returning FALSE');
@@ -400,15 +399,15 @@ 
 			$this->data['info_uid'] = Api\CalDAV::generate_uid('infolog', $this->data['info_id']);
 			$this->db->update($this->info_table,
 				array('info_uid' => $this->data['info_uid']),
-				array('info_id' => $this->data['info_id']), __LINE__,__FILE__);
+				array('info_id' => $this->data['info_id']), __LINE__, __FILE__);
 		}
 		if (!is_array($this->data['info_responsible']))
 		{
-			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',',$this->data['info_responsible']) : array();
+			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',', $this->data['info_responsible']) : array();
 		}
 		// Cast back to integer
 		$this->data['info_id_parent'] = (int)$this->data['info_id_parent'];
-		foreach($this->db->select($this->extra_table,'info_extra_name,info_extra_value',array('info_id'=>$this->data['info_id']),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->extra_table, 'info_extra_name,info_extra_value', array('info_id'=>$this->data['info_id']), __LINE__, __FILE__) as $row)
 		{
 			$this->data['#'.$row['info_extra_name']] = $row['info_extra_value'];
 		}
@@ -423,16 +422,16 @@ 
 	 * @param boolean $delete_children delete the children, if not set there parent-id to $new_parent
 	 * @param int $new_parent new parent-id to set for subs
 	 */
-	function delete($info_id,$delete_children=True,$new_parent=0)  // did _not_ ensure ACL
+	function delete($info_id, $delete_children = True, $new_parent = 0)  // did _not_ ensure ACL
 	{
 		//echo "<p>soinfolog::delete($info_id,'$delete_children',$new_parent)</p>\n";
-		if ((int) $info_id <= 0)
+		if ((int)$info_id <= 0)
 		{
 			return;
 		}
-		$this->db->delete($this->info_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		$this->db->delete($this->extra_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		Link::unlink(0,'infolog',$info_id);
+		$this->db->delete($this->info_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		$this->db->delete($this->extra_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		Link::unlink(0, 'infolog', $info_id);
 
 		if ($this->data['info_id'] == $info_id)
 		{
@@ -441,17 +440,17 @@ 
 		// delete children, if they are owned by the user
 		if ($delete_children)
 		{
-			$db2 = clone($this->db);	// we need an extra result-set
-			foreach($db2->select($this->info_table,'info_id',array(
+			$db2 = clone($this->db); // we need an extra result-set
+			foreach ($db2->select($this->info_table, 'info_id', array(
 					'info_id_parent'	=> $info_id,
 					'info_owner'		=> $this->user,
-				),__LINE__,__FILE__) as $row)
+				), __LINE__, __FILE__) as $row)
 			{
 				$this->delete($row['info_id'], $delete_children);
 			}
 		}
 		// set parent_id to $new_parent or 0 for all not deleted children
-		$this->db->update($this->info_table,array('info_id_parent'=>$new_parent),array('info_id_parent'=>$info_id),__LINE__,__FILE__);
+		$this->db->update($this->info_table, array('info_id_parent'=>$new_parent), array('info_id_parent'=>$info_id), __LINE__, __FILE__);
 	}
 
 	/**
@@ -463,9 +462,9 @@ 
 	function get_children($info_id)
 	{
 		$children = array();
-		foreach($this->db->select($this->info_table, 'info_id,info_owner', array(
+		foreach ($this->db->select($this->info_table, 'info_id,info_owner', array(
 			'info_id_parent'	=> $info_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$children[$row['info_id']] = $row['info_owner'];
 		}
@@ -481,27 +480,27 @@ 
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
-		if (!(int) $args['new_owner'])
+		if (!(int)$args['new_owner'])
 		{
-			foreach($this->db->select($this->info_table,'info_id',array('info_owner'=>$args['account_id']),__LINE__,__FILE__,false,'','infolog') as $row)
+			foreach ($this->db->select($this->info_table, 'info_id', array('info_owner'=>$args['account_id']), __LINE__, __FILE__, false, '', 'infolog') as $row)
 			{
-				$this->delete($row['info_id'],False);
+				$this->delete($row['info_id'], False);
 			}
 		}
 		else
 		{
-			$this->db->update($this->info_table,array('info_owner'=>$args['new_owner']),array('info_owner'=>$args['account_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array('info_owner'=>$args['new_owner']), array('info_owner'=>$args['account_id']), __LINE__, __FILE__, 'infolog');
 		}
-		foreach($this->db->select($this->info_table,'info_id,info_responsible',
-			$this->db->concat("','",'info_responsible',"','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
-			__LINE__,__FILE__,false,'','infolog') as $row)
+		foreach ($this->db->select($this->info_table, 'info_id,info_responsible',
+			$this->db->concat("','", 'info_responsible', "','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
+			__LINE__, __FILE__, false, '', 'infolog') as $row)
 		{
-			$new_responsible = explode(',',$row['info_responsible']);
-			unset($new_responsible[array_search($args['account_id'],$new_responsible)]);
+			$new_responsible = explode(',', $row['info_responsible']);
+			unset($new_responsible[array_search($args['account_id'], $new_responsible)]);
 			if ((int)$args['new_owner']) $new_responsible[] = (int)$args['new_owner'];
-			$this->db->update($this->info_table,array(
-				'info_responsible' => implode(',',$new_responsible),
-			),array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array(
+				'info_responsible' => implode(',', $new_responsible),
+			), array('info_id' => $row['info_id']), __LINE__, __FILE__, 'infolog');
 		}
 	}
 
@@ -513,7 +512,7 @@ 
 	 * @param string $purge_cfs =null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
 	 * @return int|boolean info_id, false on error or 0 if the entry has been updated in the meantime
 	 */
-	function write($values, $check_modified=0, $purge_cfs=null)  // did _not_ ensure ACL
+	function write($values, $check_modified = 0, $purge_cfs = null)  // did _not_ ensure ACL
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -525,19 +524,19 @@ 
 		}
 
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
-		$info_id = (int) $values['info_id'];
+		$info_id = (int)$values['info_id'];
 
-		if (array_key_exists('info_responsible',$values))	// isset($values['info_responsible']) returns false for NULL!
+		if (array_key_exists('info_responsible', $values))	// isset($values['info_responsible']) returns false for NULL!
 		{
-			$values['info_responsible'] = $values['info_responsible'] ? implode(',',$values['info_responsible']) : '0';
+			$values['info_responsible'] = $values['info_responsible'] ? implode(',', $values['info_responsible']) : '0';
 		}
-		$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+		$table_def = $this->db->get_table_definitions('infolog', $this->info_table);
 		$to_write = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if ($key != 'info_id' && isset($table_def['fd'][$key]))
 			{
-				$to_write[$key] = $this->data[$key] = $val;   // update internal data
+				$to_write[$key] = $this->data[$key] = $val; // update internal data
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
@@ -547,23 +546,23 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($check_modified) $where['info_datemodified'] = $check_modified;
-			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
+			if (!$this->db->update($this->info_table, $to_write, $where, __LINE__, __FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
-				return false;	// Error
+				return false; // Error
 			}
 			if ($check_modified && $this->db->affected_rows() < 1)
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning 0 (nothing updated, eg. condition not met)");
-				return 0;	// someone else updated the modtime or deleted the entry
+				return 0; // someone else updated the modtime or deleted the entry
 			}
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0; // must not be null
 
-			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
-			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
+			$this->db->insert($this->info_table, $to_write, false, __LINE__, __FILE__);
+			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table, 'info_id');
 		}
 
 		$update = array();
@@ -579,8 +578,8 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->info_table,$update,
-				array('info_id' => $info_id), __LINE__,__FILE__);
+			$this->db->update($this->info_table, $update,
+				array('info_id' => $info_id), __LINE__, __FILE__);
 		}
 
 		//echo "<p>soinfolog.write values= "; _debug_array($values);
@@ -590,38 +589,38 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
-			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
+			$this->db->delete($this->extra_table, $where, __LINE__, __FILE__);
 		}
 		$to_delete = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if ($key[0] != '#')
 			{
-				continue;	// no customfield
+				continue; // no customfield
 			}
-			$this->data[$key] = $val;	// update internal data
+			$this->data[$key] = $val; // update internal data
 
 			if ($val)
 			{
-				$this->db->insert($this->extra_table,array(
+				$this->db->insert($this->extra_table, array(
 						// store multivalued CalDAV properties as serialized array, everything else get comma-separated
-						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',',$val)) : $val,
-					),array(
+						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',', $val)) : $val,
+					), array(
 						'info_id'			=> $info_id,
-						'info_extra_name'	=> substr($key,1),
-					),__LINE__,__FILE__);
+						'info_extra_name'	=> substr($key, 1),
+					), __LINE__, __FILE__);
 			}
 			else
 			{
-				$to_delete[] = substr($key,1);
+				$to_delete[] = substr($key, 1);
 			}
 		}
 		if ($to_delete && !$purge_cfs)
 		{
-			$this->db->delete($this->extra_table,array(
+			$this->db->delete($this->extra_table, array(
 					'info_id'			=> $info_id,
 					'info_extra_name'	=> $to_delete,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 		}
 		// echo "<p>soinfolog.write this->data= "; _debug_array($this->data);
 		//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning id=".$this->data['info_id']);
@@ -637,18 +636,18 @@ 
 	 * @param int|array $info_id id(s) of log-entry
 	 * @return int|array the number of sub-entries or indexed by info_id, if array as param given
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
 			if ((int)$info_id <= 0) return 0;
 		}
 		$counts = array();
-		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
+		foreach ($this->db->select($this->info_table, 'info_id_parent,COUNT(*) AS info_anz_subs', array(
 			'info_id_parent' => $info_id,
-			"info_status != 'deleted'",	// dont count deleted subs as subs, as they are not shown by default
-		),__LINE__,__FILE__,
-			false,'GROUP BY info_id_parent','infolog') as $row)
+			"info_status != 'deleted'", // dont count deleted subs as subs, as they are not shown by default
+		), __LINE__, __FILE__,
+			false, 'GROUP BY info_id_parent', 'infolog') as $row)
 		{
 			$counts[$row['info_id_parent']] = (int)$row['info_anz_subs'];
 		}
@@ -688,102 +687,102 @@ 
 			$action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action'];
 			if ($action)
 			{
-				$links = Link\Storage::get_links($action=='sp'?'infolog':$action,
-					is_array($query['action_id']) ? $query['action_id'] : explode(',',$query['action_id']),'infolog','',$query['col_filter']['info_status'] =='deleted');
+				$links = Link\Storage::get_links($action == 'sp' ? 'infolog' : $action,
+					is_array($query['action_id']) ? $query['action_id'] : explode(',', $query['action_id']), 'infolog', '', $query['col_filter']['info_status'] == 'deleted');
 
 				if (count($links))
 				{
-					$links = call_user_func_array('array_merge',$links);	// flatten the array
-					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',',$links).')';
+					$links = call_user_func_array('array_merge', $links); // flatten the array
+					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',', $links).')';
 				}
 			}
 		}
-		$sortbycf='';
-		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i',$query['order']) || stripos($query['order'],'#')!==FALSE ) &&
-			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i',$query['sort'])))
+		$sortbycf = '';
+		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i', $query['order']) || stripos($query['order'], '#') !== FALSE) &&
+			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i', $query['sort'])))
 		{
 			$order = array();
-			foreach(explode(',',$query['order']) as $val)
+			foreach (explode(',', $query['order']) as $val)
 			{
 				$val = trim($val);
 				if ($val[0] == '#')
 				{
-					$sortbycf = substr($val,1);
+					$sortbycf = substr($val, 1);
 					$val = "cfsortcrit IS NULL,cfsortcrit";
 				}
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog', $this->info_table);
+					if (substr($val, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
 						if (!$this->db->capabilities['order_on_text']) continue;
 
-						$val = sprintf($this->db->capabilities['order_on_text'],$val);
+						$val = sprintf($this->db->capabilities['order_on_text'], $val);
 					}
 				}
 				$order[] = $val;
 			}
-			$ordermethod = 'ORDER BY ' . implode(',',$order) . ' ' . $query['sort'];
+			$ordermethod = 'ORDER BY '.implode(',', $order).' '.$query['sort'];
 		}
 		else
 		{
-			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
+			$ordermethod = 'ORDER BY info_datemodified DESC'; // newest first
 		}
 		$filtermethod = $this->aclFilter($query['filter']);
 		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
 		$filtermethod .= $this->dateFilter($query['filter']);
-		$cfcolfilter=0;
+		$cfcolfilter = 0;
 		if (is_array($query['col_filter']))
 		{
-			foreach($query['col_filter'] as $col => $data)
+			foreach ($query['col_filter'] as $col => $data)
 			{
 				if (is_int($col))
 				{
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
-				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
+				if ($col[0] != '#' && substr($col, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i', $col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
-							$data = (int) $data;
+							$data = (int)$data;
 							if (!$data) continue;
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR info_responsible='0' AND ".
-								$this->db->expression($this->info_table,array(
-									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
+								$this->db->expression($this->info_table, array(
+									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data, true)
 								)).')';
 							break;
 
 						case 'info_id':	// info_id itself is ambigous
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,'main.',array('info_id' => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, 'main.', array('info_id' => $data));
 							break;
 
 						default:
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,array($col => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, array($col => $data));
 							break;
 					}
 				}
-				if ($col[0] == '#' &&  $query['custom_fields'] && $data)
+				if ($col[0] == '#' && $query['custom_fields'] && $data)
 				{
 					$filtermethod .= " AND main.info_id IN (SELECT DISTINCT info_id FROM $this->extra_table WHERE ";
 					$custom_fields = Api\Storage\Customfields::get('infolog');
 
-					if($custom_fields[substr($col,1)]['type'] == 'select' && $custom_fields[substr($col,1)]['rows'] > 1)
+					if ($custom_fields[substr($col, 1)]['type'] == 'select' && $custom_fields[substr($col, 1)]['rows'] > 1)
 					{
 						// Multi-select - any entry with the filter value selected matches
 						$filtermethod .= $this->db->expression($this->extra_table, array(
-							'info_extra_name' => substr($col,1),
-							$this->db->concat("','",'info_extra_value',"','").' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
+							'info_extra_name' => substr($col, 1),
+							$this->db->concat("','", 'info_extra_value', "','").' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
 						)).')';
 					}
 					else
 					{
-						$filtermethod .= $this->db->expression($this->extra_table,array(
-							'info_extra_name'  => substr($col,1),
+						$filtermethod .= $this->db->expression($this->extra_table, array(
+							'info_extra_name'  => substr($col, 1),
 							'info_extra_value' => $data,
 						)).')';
 					}
@@ -795,15 +794,15 @@ 
 
 		if ((int)$query['cat_id'])
 		{
-			$categories = new Api\Categories('','infolog');
+			$categories = new Api\Categories('', 'infolog');
 			$cats = $categories->return_all_children((int)$query['cat_id']);
-			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
+			$filtermethod .= ' AND info_cat'.(count($cats) > 1 ? ' IN ('.implode(',', $cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
+		if ($query['query']) $query['search'] = $query['query']; // allow both names
 		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
 		{
-			$columns = array('info_from','info_addr','info_location','info_subject','info_extra_value');
+			$columns = array('info_from', 'info_addr', 'info_location', 'info_subject', 'info_extra_value');
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
 			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
 
@@ -811,13 +810,13 @@ 
 			$so_sql = new Api\Storage\Base('infolog', $this->info_table, $this->db);
 			$search = $so_sql->search2criteria($query['search'], $wildcard, $op, null, $columns);
 			$sql_query = 'AND ('.(is_numeric($query['search']) ? 'main.info_id='.(int)$query['search'].' OR ' : '').
-				implode($op, $search) .')';
+				implode($op, $search).')';
 
-			$join = ($cfcolfilter>0 ? '':'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
+			$join = ($cfcolfilter > 0 ? '' : 'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
 			// mssql and others cant use DISTICT if text columns (info_des) are involved
 			$distinct = $this->db->capabilities['distinct_on_text'] ? 'DISTINCT' : '';
 		}
-		$pid = 'AND ' . $this->db->expression($this->info_table,array('info_id_parent' => ($action == 'sp' ?$query['action_id'] : 0)));
+		$pid = 'AND '.$this->db->expression($this->info_table, array('info_id_parent' => ($action == 'sp' ? $query['action_id'] : 0)));
 
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] != '1' && $action != 'sp' ||
 			(string)$query['col_filter']['info_id_parent'] !== '' ||
@@ -838,14 +837,14 @@ 
 			}
 			else
 			{
-				$query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
+				$query['total'] = $this->db->query($sql = "SELECT $distinct main.info_id ".$sql_query, __LINE__, __FILE__)->NumRows();
 			}
 			$info_customfield = '';
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
 				if (!isset($custom_fields)) $custom_fields = Api\Storage\Customfields::get('infolog');
-				switch($custom_fields[$sortbycf]['type'])
+				switch ($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
 						$sort_col = $this->db->to_int($sort_col);
@@ -864,9 +863,9 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
-				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
-					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,Api\Db::FETCH_ASSOC);
+				if (is_array($cols)) $cols = implode(',', $cols);
+				$rs = $this->db->query($sql = 'SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod, __LINE__, __FILE__,
+					(int)$query['start'], isset($query['start']) ? (int)$query['num_rows'] : -1, false, Api\Db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
 
 				if ($mysql_calc_rows)
@@ -881,9 +880,9 @@ 
 			{
 				return $rs;
 			}
-			foreach($rs as $info)
+			foreach ($rs as $info)
 			{
-				$info['info_responsible'] = $info['info_responsible'] ? explode(',',$info['info_responsible']) : array();
+				$info['info_responsible'] = $info['info_responsible'] ? explode(',', $info['info_responsible']) : array();
 
 				$ids[$info['info_id']] = $info;
 			}
@@ -896,19 +895,19 @@ 
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
-				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 			{
 				$where = array('info_id' => array_keys($ids));
-				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',',$query['selectcols']):$query['selectcols'],'#') === false ||
-					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',', $query['selectcols']) : $query['selectcols'], '#') === false ||
+					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 				{
 					$where['info_extra_name'] = array();
-					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
+					foreach (is_array($query['selectcols']) ? $query['selectcols'] : explode(',', $query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#') $where['info_extra_name'][] = substr($col, 1);
 					}
 				}
-				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where, __LINE__, __FILE__) as $row)
 				{
 					$ids[$row['info_id']]['#'.$row['info_extra_name']] = $row['info_extra_value'];
 				}
@@ -933,27 +932,27 @@ 
 	{
 		$users = array();
 
-		foreach($this->db->select($this->info_table,'DISTINCT info_owner',array(
-			str_replace(' AND ','',$this->statusFilter('open')),
-			'(ABS(info_startdate-'.time().')<'.(4*24*60*60).' OR '.	// start_day within 4 days
-			'ABS(info_enddate-'.time().')<'.(4*24*60*60).')',		// end_day within 4 days
-		),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->info_table, 'DISTINCT info_owner', array(
+			str_replace(' AND ', '', $this->statusFilter('open')),
+			'(ABS(info_startdate-'.time().')<'.(4 * 24 * 60 * 60).' OR '.// start_day within 4 days
+			'ABS(info_enddate-'.time().')<'.(4 * 24 * 60 * 60).')', // end_day within 4 days
+		), __LINE__, __FILE__) as $row)
 		{
 			$users[] = $row['info_responsible'];
 		}
-		foreach($this->db->select($this->info_table,'DISTINCT info_responsible',$this->statusFilter('open',false),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->info_table, 'DISTINCT info_responsible', $this->statusFilter('open', false), __LINE__, __FILE__) as $row)
 		{
-			foreach(explode(',', $row['info_responsible']) as $responsible)
+			foreach (explode(',', $row['info_responsible']) as $responsible)
 			{
 				if ($GLOBALS['egw']->accounts->get_type($responsible) == 'g')
 				{
-					$responsible = $GLOBALS['egw']->accounts->members($responsible,true);
+					$responsible = $GLOBALS['egw']->accounts->members($responsible, true);
 				}
 				if ($responsible)
 				{
-					foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
+					foreach (is_array($responsible) ? $responsible : array($responsible) as $user)
 					{
-						if ($user && !in_array($user,$users)) $users[] = $user;
+						if ($user && !in_array($user, $users)) $users[] = $user;
 					}
 				}
 			}

Braces +118 added lines, -29 removed lines

@@ -89,10 +89,16 @@ 
 	 */
 	function is_responsible($info,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		static $um_cache = array();
-		if ($user == $this->user) $user_and_memberships =& $um_cache[$user];
+		if ($user == $this->user)
+		{
+			$user_and_memberships =& $um_cache[$user];
+		}
 		if (!isset($user_and_memberships))
 		{
 			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user,true);
@@ -113,20 +119,32 @@ 
 	 */
 	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
 	{
-		if (is_null($grants)) $grants = $this->grants;
-		if (!$user) $user = $this->user;
+		if (is_null($grants))
+		{
+			$grants = $this->grants;
+		}
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		// if info-array, but no owner given, force reading of info from db
-		if (is_array($info) && !$info['info_owner']) $info = $info['info_id'];
+		if (is_array($info) && !$info['info_owner'])
+		{
+			$info = $info['info_id'];
+		}
 
 		if (is_array($info))
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int) $info != $this->data['info_id'])
+		{
+			// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
+		}
 			$info = $this->read(array('info_id'=>$info));
 			$this->data = $backup_data;
 		}
@@ -160,7 +178,10 @@ 
 	 */
 	function responsible_filter($users)
 	{
-		if (!$users) return '0';
+		if (!$users)
+		{
+			return '0';
+		}
 
 		$responsible = array();
 		foreach((array)$users as $user)
@@ -250,11 +271,14 @@ 
 						" OR info_status = 'offer' AND $public_access" : '').")".
 				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
-			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
+			elseif ($filter != 'my' && $filter != 'responsible')
+			{
+				// none --> all entrys user has rights to see
 			{
 				if ($has_private_access)
 				{
 					$filtermethod .= " OR $has_private_access";
+			}
 				}
 				if (count($public_user_list))
 				{
@@ -498,7 +522,10 @@ 
 		{
 			$new_responsible = explode(',',$row['info_responsible']);
 			unset($new_responsible[array_search($args['account_id'],$new_responsible)]);
-			if ((int)$args['new_owner']) $new_responsible[] = (int)$args['new_owner'];
+			if ((int)$args['new_owner'])
+			{
+				$new_responsible[] = (int)$args['new_owner'];
+			}
 			$this->db->update($this->info_table,array(
 				'info_responsible' => implode(',',$new_responsible),
 			),array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
@@ -527,10 +554,13 @@ 
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
 		$info_id = (int) $values['info_id'];
 
-		if (array_key_exists('info_responsible',$values))	// isset($values['info_responsible']) returns false for NULL!
+		if (array_key_exists('info_responsible',$values))
+		{
+			// isset($values['info_responsible']) returns false for NULL!
 		{
 			$values['info_responsible'] = $values['info_responsible'] ? implode(',',$values['info_responsible']) : '0';
 		}
+		}
 		$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
 		$to_write = array();
 		foreach($values as $key => $val)
@@ -541,12 +571,18 @@ 
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
-		if ($to_write['info_price'] === '') $to_write['info_price'] = NULL;
+		if ($to_write['info_price'] === '')
+		{
+			$to_write['info_price'] = NULL;
+		}
 
 		if (($this->data['info_id'] = $info_id))
 		{
 			$where = array('info_id' => $info_id);
-			if ($check_modified) $where['info_datemodified'] = $check_modified;
+			if ($check_modified)
+			{
+				$where['info_datemodified'] = $check_modified;
+			}
 			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
@@ -560,7 +596,11 @@ 
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent']))
+			{
+				$to_write['info_id_parent'] = 0;
+			}
+			// must not be null
 
 			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
 			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
@@ -589,7 +629,10 @@ 
 		if ($purge_cfs)
 		{
 			$where = array('info_id' => $info_id);
-			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
+			if ($purge_cfs == 'ical')
+			{
+				$where[] = "info_extra_name LIKE '#%'";
+			}
 			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
 		}
 		$to_delete = array();
@@ -641,7 +684,10 @@ 
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
-			if ((int)$info_id <= 0) return 0;
+			if ((int)$info_id <= 0)
+			{
+				return 0;
+			}
 		}
 		$counts = array();
 		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
@@ -714,11 +760,20 @@ 
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def))
+					{
+						$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+					}
+					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val]))
+					{
+						$val = 'info_'.$val;
+					}
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
-						if (!$this->db->capabilities['order_on_text']) continue;
+						if (!$this->db->capabilities['order_on_text'])
+						{
+							continue;
+						}
 
 						$val = sprintf($this->db->capabilities['order_on_text'],$val);
 					}
@@ -732,7 +787,10 @@ 
 			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
 		}
 		$filtermethod = $this->aclFilter($query['filter']);
-		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
+		if (!$query['col_filter']['info_status'])
+		{
+			$filtermethod .= $this->statusFilter($query['filter']);
+		}
 		$filtermethod .= $this->dateFilter($query['filter']);
 		$cfcolfilter=0;
 		if (is_array($query['col_filter']))
@@ -744,14 +802,20 @@ 
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col]))
+				{
+					$col = 'info_'.$col;
+				}
 				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
 							$data = (int) $data;
-							if (!$data) continue;
+							if (!$data)
+							{
+								continue;
+							}
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR info_responsible='0' AND ".
 								$this->db->expression($this->info_table,array(
 									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
@@ -800,12 +864,22 @@ 
 			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
-		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
+		if ($query['query'])
+		{
+			$query['search'] = $query['query'];
+		}
+		// allow both names
+		if ($query['search'])
+		{
+			// we search in _from, _subject, _des and _extra_value for $query
 		{
 			$columns = array('info_from','info_addr','info_location','info_subject','info_extra_value');
+		}
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
-			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
+			if ($this->db->capabilities['like_on_text'])
+			{
+				$columns[] = 'info_des';
+			}
 
 			$wildcard = $op = null;
 			$so_sql = new Api\Storage\Base('infolog', $this->info_table, $this->db);
@@ -844,7 +918,10 @@ 
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
-				if (!isset($custom_fields)) $custom_fields = Api\Storage\Customfields::get('infolog');
+				if (!isset($custom_fields))
+				{
+					$custom_fields = Api\Storage\Customfields::get('infolog');
+				}
 				switch($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
@@ -864,7 +941,10 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
+				if (is_array($cols))
+				{
+					$cols = implode(',',$cols);
+				}
 				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
 					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,Api\Db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
@@ -892,7 +972,10 @@ 
 			{
 				$config_data = Api\Config::read('infolog');
 				$index_load_cfs = $config_data['index_load_cfs'];
-				if (!is_array($index_load_cfs)) $index_load_cfs = explode(',', $index_load_cfs);
+				if (!is_array($index_load_cfs))
+				{
+					$index_load_cfs = explode(',', $index_load_cfs);
+				}
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
@@ -905,7 +988,10 @@ 
 					$where['info_extra_name'] = array();
 					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#')
+						{
+							$where['info_extra_name'][] = substr($col,1);
+						}
 					}
 				}
 				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
@@ -953,7 +1039,10 @@ 
 				{
 					foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
 					{
-						if ($user && !in_array($user,$users)) $users[] = $user;
+						if ($user && !in_array($user,$users))
+						{
+							$users[] = $user;
+						}
 					}
 				}
 			}

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

@@ -828,7 +828,7 @@ 
 		$ids = array( );
 		if ($action == '' || $action == 'sp' || count($links))
 		{
-			$sql_query = "FROM $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
+			$sql_query = "from $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
 			#error_log("infolog.so.search:\n" . print_r($sql_query, true));
 
 			if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
@@ -838,7 +838,7 @@ 
 			}
 			else
 			{
-				$query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
+				$query['total'] = $this->db->query($sql="select $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
 			}
 			$info_customfield = '';
 			if ($sortbycf != '')

infolog/inc/class.infolog_tracking.inc.php

Doc Comments -1 removed lines

@@ -125,7 +125,6 @@
 	/**
 	 * Constructor
 	 *
-	 * @param botracker $botracker
 	 * @return tracker_tracking
 	 */
 	function __construct(&$infolog_bo)

Spacing +39 added lines, -39 removed lines

@@ -130,9 +130,9 @@ 
 	 */
 	function __construct(&$infolog_bo)
 	{
-		parent::__construct('infolog');	// add custom fields from infolog
+		parent::__construct('infolog'); // add custom fields from infolog
 
-		$this->infolog =& $infolog_bo;
+		$this->infolog = & $infolog_bo;
 	}
 
 	/**
@@ -144,23 +144,23 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_subject($data,$old)
+	function get_subject($data, $old)
 	{
 		if ($data['prefix'])
 		{
-			$prefix = $data['prefix'];	// async notification
+			$prefix = $data['prefix']; // async notification
 		}
 		elseif (!$old || $old['info_status'] == 'deleted')
 		{
-			$prefix = lang('New %1',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('New %1', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
-		elseif($data['info_status'] == 'deleted')
+		elseif ($data['info_status'] == 'deleted')
 		{
-			$prefix = lang('%1 deleted',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('%1 deleted', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
 		else
 		{
-			$prefix = lang('%1 modified',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('%1 modified', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
 		return $prefix.': '.$data['info_subject'];
 	}
@@ -172,22 +172,22 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_message($data,$old)
+	function get_message($data, $old)
 	{
-		if ($data['message']) return $data['message'];	// async notification
+		if ($data['message']) return $data['message']; // async notification
 
 		if (!$old || $old['info_status'] == 'deleted')
 		{
-			return lang('New %1 created by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
-				Api\Accounts::username($this->infolog->user),$this->datetime('now'));
+			return lang('New %1 created by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
+				Api\Accounts::username($this->infolog->user), $this->datetime('now'));
 		}
-		elseif($data['info_status'] == 'deleted')
+		elseif ($data['info_status'] == 'deleted')
 		{
-			return lang('%1 deleted by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
+			return lang('%1 deleted by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
 				Api\Accounts::username($data['info_modifier']),
 				$this->datetime($data['info_datemodified']));
 		}
-		return lang('%1 modified by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
+		return lang('%1 modified by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
 			Api\Accounts::username($data['info_modifier']),
 			$this->datetime($data['info_datemodified']));
 	}
@@ -199,14 +199,14 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($receiver);	// not used, but required function signature
+		unset($receiver); // not used, but required function signature
 		//error_log(__METHOD__.__LINE__.' Data:'.array2string($data));
 		$responsible = array();
 		if ($data['info_responsible'])
 		{
-			foreach($data['info_responsible'] as $uid)
+			foreach ($data['info_responsible'] as $uid)
 			{
 				$responsible[] = Api\Accounts::username($uid);
 			}
@@ -215,31 +215,31 @@ 
 		{
 			$id = ' #'.$data['info_id'];
 		}
-		foreach(array(
+		foreach (array(
 			'info_type'      => lang($this->infolog->enums['type'][$data['info_type']]).$id,
 			'info_from'      => $data['info_from'],
 			'info_addr'      => $data['info_addr'],
 			'info_cat'       => $data['info_cat'] ? $GLOBALS['egw']->categories->id2name($data['info_cat']) : '',
 			'info_priority'  => lang($this->infolog->enums['priority'][$data['info_priority']]),
 			'info_owner'     => Api\Accounts::username($data['info_owner']),
-			'info_status'    => lang($data['info_status']=='deleted'?'deleted':$this->infolog->status[$data['info_type']][$data['info_status']]),
+			'info_status'    => lang($data['info_status'] == 'deleted' ? 'deleted' : $this->infolog->status[$data['info_type']][$data['info_status']]),
 			'info_percent'   => (int)$data['info_percent'].'%',
 			'info_datecompleted' => $data['info_datecompleted'] ? $this->datetime($data['info_datecompleted']) : '',
 			'info_location'  => $data['info_location'],
-			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'],null) : '',
-			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'],null) : '',
-			'info_responsible' => implode(', ',$responsible),
+			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'], null) : '',
+			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'], null) : '',
+			'info_responsible' => implode(', ', $responsible),
 			'info_subject'   => $data['info_subject'],
 		) as $name => $value)
 		{
 			//error_log(__METHOD__.__LINE__.' Key:'.$name.' val:'.array2string($value));
-			if ($name=='info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
+			if ($name == 'info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
 			{
 				$lkeys = array_keys($data['link_to']['to_id']);
-				if (in_array($data['info_contact'],$lkeys))
+				if (in_array($data['info_contact'], $lkeys))
 				{
-					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = Link::title($app,$id);
+					list($app, $id) = explode(':', $data['info_contact']);
+					if (!empty($app) && !empty($id)) $value = Link::title($app, $id);
 				}
 			}
 			$details[$name] = array(
@@ -271,7 +271,7 @@ 
 	 * @param boolean $skip_notification = false do NOT send any notification
 	 * @return int|boolean false on error, integer number of changes logged or true for new entries ($old == null)
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null,$skip_notification=false)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__.__LINE__.' notify?'.($skip_notification?'no':'yes').function_backtrace());
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
@@ -280,23 +280,23 @@ 
 
 		if ($old && $this->field2history)
 		{
-			$changes = $this->save_history($data,$old,$deleted,$changed_fields);
+			$changes = $this->save_history($data, $old, $deleted, $changed_fields);
 		}
 
 		// Don't notify if the only change was to the modified date
-		if(is_null($changed_fields))
+		if (is_null($changed_fields))
 		{
 			$changed_fields = $this->changed_fields($data, $old);
 			$changes = count($changed_fields); // we need that since TRUE evaluates to 1
 		}
 		//error_log(__METHOD__.__LINE__.array2string($changed_fields));
-		if(is_array($changed_fields) && $changes == 1 && in_array('info_datemodified', $changed_fields))
+		if (is_array($changed_fields) && $changes == 1 && in_array('info_datemodified', $changed_fields))
 		{
 			return count($changes);
 		}
 
 		// do not run do_notifications if we have no changes
-		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		if ($changes && !$skip_notification && !$this->do_notifications($data, $old, $deleted))
 		{
 			$changes = false;
 		}
@@ -314,16 +314,16 @@ 
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
-		unset($old);	// not used, but required function signature
-		switch($name)
+		unset($old); // not used, but required function signature
+		switch ($name)
 		{
 			case 'copy':	// include the info_cc addresses
-				if ($data['info_access'] == 'private') return array();	// no copies for private entries
+				if ($data['info_access'] == 'private') return array(); // no copies for private entries
 				if ($data['info_cc'])
 				{
-					$config = preg_split('/, ?/',$data['info_cc']);
+					$config = preg_split('/, ?/', $data['info_cc']);
 				}
 				else
 				{
@@ -332,7 +332,7 @@ 
 				break;
 			case self::CUSTOM_NOTIFICATION:
 				$info_config = Api\Config::read('infolog');
-				if(!$info_config[self::CUSTOM_NOTIFICATION])
+				if (!$info_config[self::CUSTOM_NOTIFICATION])
 				{
 					return '';
 				}
@@ -341,7 +341,7 @@ 
 				$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
 
 				// Disabled
-				if(!$type_config['use_custom'] && !$global['use_custom']) return '';
+				if (!$type_config['use_custom'] && !$global['use_custom']) return '';
 
 				// Type or globabl
 				$config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];

Braces +22 added lines, -5 removed lines

@@ -174,7 +174,11 @@ 
 	 */
 	function get_message($data,$old)
 	{
-		if ($data['message']) return $data['message'];	// async notification
+		if ($data['message'])
+		{
+			return $data['message'];
+		}
+		// async notification
 
 		if (!$old || $old['info_status'] == 'deleted')
 		{
@@ -239,14 +243,20 @@ 
 				if (in_array($data['info_contact'],$lkeys))
 				{
 					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = Link::title($app,$id);
+					if (!empty($app)&&!empty($id))
+					{
+						$value = Link::title($app,$id);
+					}
 				}
 			}
 			$details[$name] = array(
 				'label' => lang($this->field2label[$name]),
 				'value' => $value,
 			);
-			if ($name == 'info_subject') $details[$name]['type'] = 'summary';
+			if ($name == 'info_subject')
+			{
+				$details[$name]['type'] = 'summary';
+			}
 		}
 		$details['info_des'] = array(
 			'value' => $data['info_des'],
@@ -320,7 +330,11 @@ 
 		switch($name)
 		{
 			case 'copy':	// include the info_cc addresses
-				if ($data['info_access'] == 'private') return array();	// no copies for private entries
+				if ($data['info_access'] == 'private')
+				{
+					return array();
+				}
+				// no copies for private entries
 				if ($data['info_cc'])
 				{
 					$config = preg_split('/, ?/',$data['info_cc']);
@@ -341,7 +355,10 @@ 
 				$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
 
 				// Disabled
-				if(!$type_config['use_custom'] && !$global['use_custom']) return '';
+				if(!$type_config['use_custom'] && !$global['use_custom'])
+				{
+					return '';
+				}
 
 				// Type or globabl
 				$config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];

infolog/inc/class.infolog_ui.inc.php

Doc Comments +9 added lines, -9 removed lines

@@ -295,6 +295,8 @@ 
 	 * @param array &$query
 	 * @param array &$rows
 	 * @param array &$readonlys
+	 * @param type|null $rows
+	 * @param type|null $readonlys
 	 * @return int
 	 */
 	function get_rows(&$query,&$rows,&$readonlys)
@@ -574,7 +576,6 @@ 
 	 * Hook for timesheet to set some extra data and links
 	 *
 	 * @param array $data
-	 * @param int $data[id] info_id
 	 * @return array with key => value pairs to set in new timesheet and link_app/link_id arrays
 	 */
 	function timesheet_set($data)
@@ -600,7 +601,6 @@ 
 	 * Hook for calendar to set some extra data and links
 	 *
 	 * @param array $data event-array preset by calendar plus
-	 * @param int $data[entry_id] info_id
 	 * @return array with key => value pairs to set in new event and link_app/link_id arrays
 	 */
 	function calendar_set($data)
@@ -688,11 +688,11 @@ 
 	/**
 	 * Shows the infolog list
 	 *
-	 * @param array/string $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
+	 * @param integer $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
 	 * @param string $action if set only entries liked to that $action:$action_id are shown
 	 * @param string $action_id if set only entries liked to that $action:$action_id are shown
-	 * @param mixed $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
-	 * @param boolean $e$extra_app_header * @param boolean $return_html=false
+	 * @param integer $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
+	 * @param boolean $extra_app_header * @param boolean $return_html
 	 * @param string $own_referer='' this is our own referer
 	 * @param string $action_title='' app_header for the action, if '' we try the link-title
 	 */
@@ -1288,7 +1288,7 @@ 
 	 * @param array $query get_rows parameter
 	 * @param string &$msg on return user feedback
 	 * @param boolean $skip_notifications true to NOT notify users about changes
-	 * @return boolean true if all actions succeded, false otherwise
+	 * @return boolean|null true if all actions succeded, false otherwise
 	 */
 	function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg,
 		array $query, &$msg, $skip_notifications = false)
@@ -1526,9 +1526,9 @@ 
 	/**
 	 * Closes an infolog
 	 *
-	 * @param int|array $values=0 info_id (default _GET[info_id])
+	 * @param int|array $values info_id (default _GET[info_id])
 	 * @param string $_referer=''
-	 * @param boolean $closesingle=false
+	 * @param boolean $closesingle
 	 */
 	function close($values=0,$_referer='',$closesingle=false,$skip_notification = false)
 	{
@@ -1576,7 +1576,7 @@ 
 	/**
 	 * Deletes an InfoLog entry
 	 *
-	 * @param array|int $values info_id (default _GET[info_id])
+	 * @param integer $values info_id (default _GET[info_id])
 	 * @param string $_referer
 	 * @param string $called_by
 	 * @param boolean $skip_notification Do not send notification of deletion

Indentation +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
-				    ($link['app'] != $action || $link['id'] != $action_id) &&
+					($link['app'] != $action || $link['id'] != $action_id) &&
 					($show_links == 'all' || ($show_links == 'links') === ($link['app'] != Link::VFS_APPNAME)))
 				{
 					$info['filelinks'][] = $link;

Spacing +351 added lines, -355 removed lines

@@ -55,32 +55,32 @@ 
 	 *
 	 * @var string
 	 */
-	var $duration_format = ',';	// comma is necessary!
+	var $duration_format = ','; // comma is necessary!
 
 	var $icons = array(
 		'type' => array(
-			'task'      => 'task.gif',      'task_alt'      => 'Task',
-			'phone'     => 'phone.gif',     'phone_alt'     => 'Phonecall',
-			'note'      => 'note.gif',      'note_alt'      => 'Note',
-			'confirm'   => 'confirm.gif',   'confirm_alt'   => 'Confirmation',
-			'reject'    => 'reject.gif',    'reject_alt'    => 'Reject',
-			'email'     => 'email.gif',     'email_alt'     => 'Email' ),
+			'task'      => 'task.gif', 'task_alt'      => 'Task',
+			'phone'     => 'phone.gif', 'phone_alt'     => 'Phonecall',
+			'note'      => 'note.gif', 'note_alt'      => 'Note',
+			'confirm'   => 'confirm.gif', 'confirm_alt'   => 'Confirmation',
+			'reject'    => 'reject.gif', 'reject_alt'    => 'Reject',
+			'email'     => 'email.gif', 'email_alt'     => 'Email' ),
 		'action' => array(
-			'new'       => 'new.gif',       'new_alt'       => 'Add Sub',
-			'view'      => 'view.gif',      'view_alt'      => 'View Subs',
-			'parent'    => 'parent.gif',    'parent_alt'    => 'View other Subs',
-			'edit'      => 'edit.gif',      'edit_alt'      => 'Edit',
-			'addfile'   => 'addfile.gif',   'addfile_alt'   => 'Add a file',
-			'delete'    => 'delete.gif',    'delete_alt'    => 'Delete',
-			'close'     => 'done.gif',      'close_alt'     => 'Close' ,
-			'close_all' => 'done_all.gif',  'close_all_alt' => 'Close' ),
+			'new'       => 'new.gif', 'new_alt'       => 'Add Sub',
+			'view'      => 'view.gif', 'view_alt'      => 'View Subs',
+			'parent'    => 'parent.gif', 'parent_alt'    => 'View other Subs',
+			'edit'      => 'edit.gif', 'edit_alt'      => 'Edit',
+			'addfile'   => 'addfile.gif', 'addfile_alt'   => 'Add a file',
+			'delete'    => 'delete.gif', 'delete_alt'    => 'Delete',
+			'close'     => 'done.gif', 'close_alt'     => 'Close',
+			'close_all' => 'done_all.gif', 'close_all_alt' => 'Close' ),
 		'status' => array(
-			'billed'    => 'billed.gif',    'billed_alt'    => 'billed',
-			'done'      => 'done.gif',      'done_alt'      => 'done',
+			'billed'    => 'billed.gif', 'billed_alt'    => 'billed',
+			'done'      => 'done.gif', 'done_alt'      => 'done',
 			'will-call' => 'will-call.gif', 'will-call_alt' => 'will-call',
-			'call'      => 'call.gif',      'call_alt'      => 'call',
-			'ongoing'   => 'ongoing.gif',   'ongoing_alt'   => 'ongoing',
-			'offer'     => 'offer.gif',     'offer_alt'     => 'offer' )
+			'call'      => 'call.gif', 'call_alt'      => 'call',
+			'ongoing'   => 'ongoing.gif', 'ongoing_alt'   => 'ongoing',
+			'offer'     => 'offer.gif', 'offer_alt'     => 'offer' )
 	);
 	var $filters;
 	var $messages = array(
@@ -100,7 +100,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') Api\Translation::add_app('infolog');
 
 		// Make sure Global category is infolog - on first load, it may not be
-		if($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
 		{
 			$GLOBALS['egw']->categories = new Api\Categories();
 		}
@@ -111,18 +111,18 @@ 
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['infolog'];
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['infolog'];
 
 		// read the duration format from project-manager
 		if ($GLOBALS['egw_info']['apps']['projectmanager'])
 		{
 			$pm_config = Api\Config::read('projectmanager');
-			$this->duration_format = str_replace(',','',implode('', (array)$pm_config['duration_units']));
+			$this->duration_format = str_replace(',', '', implode('', (array)$pm_config['duration_units']));
 			//error_log(__METHOD__."() ".__LINE__." duration_format=$this->duration_format, duration_unit=".array2string($pm_config['duration_units']));
 			$this->hours_per_workday = $pm_config['hours_per_workday'];
 			unset($pm_config);
 		}
-		$this->filters =& $this->bo->filters;
+		$this->filters = & $this->bo->filters;
 		/* these are just for testing of the notifications
 		for($i = -1; $i <= 3; ++$i)
 		{
@@ -141,7 +141,7 @@ 
 			$this->filters['responsible-open-date'.date('Y-m-d',time()+$i*24*60*60)] = "responsible starting in $i day(s)";
 		}
 		*/
-		$GLOBALS['infolog_ui'] =& $this;	// make ourself availible for ExecMethod of get_rows function
+		$GLOBALS['infolog_ui'] = & $this; // make ourself availible for ExecMethod of get_rows function
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @param int $details
 	 * @return array
 	 */
-	function get_info($info,&$readonlys,$action='',$action_id='',$show_links=false,$details = 1)
+	function get_info($info, &$readonlys, $action = '', $action_id = '', $show_links = false, $details = 1)
 	{
 		if (!is_array($info))
 		{
@@ -165,19 +165,19 @@ 
 		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
 		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
 		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
-			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ;
-		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent'] == 100) $done = true;
+		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']].($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{
 			$info['end_class'] = 'infolog_overdue';
 		}
 		if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
-		$this->bo->link_id2from($info,$action,$action_id);	// unset from for $action:$action_id
-		$info['info_percent'] = (int) $info['info_percent'].'%';
-		$editrights = $this->bo->check_access($info,Acl::EDIT);
+		$this->bo->link_id2from($info, $action, $action_id); // unset from for $action:$action_id
+		$info['info_percent'] = (int)$info['info_percent'].'%';
+		$editrights = $this->bo->check_access($info, Acl::EDIT);
 		$isresposible = $this->bo->is_responsible($info);
 		if ((!($editrights || // edit rights or more then standard responsible rights
-			$isresposible && array_diff($this->bo->responsible_edit,array('info_status','info_percent','info_datecompleted')))))
+			$isresposible && array_diff($this->bo->responsible_edit, array('info_status', 'info_percent', 'info_datecompleted')))))
 		{
 			$info['class'] .= 'rowNoEdit ';
 		}
@@ -196,11 +196,11 @@ 
 		{
 			$info['class'] .= 'rowNoCloseAll ';
 		}
-		if (!$this->bo->check_access($info,Acl::DELETE))
+		if (!$this->bo->check_access($info, Acl::DELETE))
 		{
 			$info['class'] .= 'rowNoDelete ';
 		}
-		if (!$this->bo->check_access($info,Acl::ADD))
+		if (!$this->bo->check_access($info, Acl::ADD))
 		{
 			$info['class'] .= 'rowNoSubs ';
 		}
@@ -212,7 +212,7 @@ 
 		if (!$show_links) $show_links = $this->prefs['show_links'];
 		if (($show_links != 'none' && $show_links != 'no_describtion' ||
 			 $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
-			(isset($info['links']) || ($info['links'] = Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true,true))))
+			(isset($info['links']) || ($info['links'] = Link::get_links('infolog', $info['info_id'], '', 'link_lastmod DESC', true, true))))
 		{
 			$timesheets = array();
 			foreach ($info['links'] as $link)
@@ -221,7 +221,7 @@ 
 				$link_mod = Api\DateTime::server2user($link['lastmod']);
 				if ($info['row_mod'] < $link_mod) $info['row_mod'] = $link_mod;
 
-				if ($link['deleted']) continue;	// skip deleted links, but incl. them in row_mod!
+				if ($link['deleted']) continue; // skip deleted links, but incl. them in row_mod!
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
@@ -238,7 +238,7 @@ 
 			}
 			if ($this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet']) && $timesheets)
 			{
-				$sum = ExecMethod('timesheet.timesheet_bo.sum',$timesheets);
+				$sum = ExecMethod('timesheet.timesheet_bo.sum', $timesheets);
 				$info['info_sum_timesheets'] = $sum['duration'];
 				// incl. max timesheet modification in row_mod
 				if ($info['row_mod'] < $sum['max_modified']) $info['row_mod'] = $sum['max_modified'];
@@ -256,7 +256,7 @@ 
 			}
 			$readonlys["edit_percent[$id]"] = true;
 		}
-		elseif($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
+		elseif ($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
 		{
 			$info['info_percent2'] = $info['info_percent'];
 		}
@@ -277,7 +277,7 @@ 
 	protected static function filter(array $query)
 	{
 		$filter = $query['filter'] ? 'filter' : ($query['cat_id'] ? 'cat_id' : null);
-		foreach((array)$query['col_filter'] as $name => $value)
+		foreach ((array)$query['col_filter'] as $name => $value)
 		{
 			if ((string)$value !== '')
 			{
@@ -297,7 +297,7 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	function get_rows(&$query,&$rows,&$readonlys)
+	function get_rows(&$query, &$rows, &$readonlys)
 	{
 		//error_log(__METHOD__."() query[csv_export]=".array2string($query['csv_export']).", query[filter]=".array2string($query['filter']).", query[col_filter]=".array2string(array_diff($query['col_filter'],array('',0))).' '.function_backtrace());
 		if (!$query['csv_export'])
@@ -314,7 +314,7 @@ 
 			}
 			//error_log(__METHOD__."() prefs[listNoSubs]=".array2string($this->prefs['listNoSubs'])." --> parent_id=$parent_id");
 			unset($query['col_filter']['parent_id']);
-			if(!$query['action'])
+			if (!$query['action'])
 			{
 				Api\Cache::setSession('infolog', $query['session_for'].'session_data', $query);
 			}
@@ -323,10 +323,10 @@ 
 			$query['row_modified'] = 'row_mod';
 			$query['parent_id'] = 'info_id_parent';
 			$query['is_parent'] = 'info_anz_subs';
-			$query['action_var'] = 'multi_action';	// as 'action' is already used in infolog
+			$query['action_var'] = 'multi_action'; // as 'action' is already used in infolog
 		}
 		// nextmatch opened an infolog containing children --> do not filter them, always show all children
-		elseif($query['csv_export'] === 'children')
+		elseif ($query['csv_export'] === 'children')
 		{
 			$query['filter'] = $query['search'] = $query['cat_id'] = '';
 			$query['col_filter'] = array('info_id_parent' => $query['col_filter']['info_id_parent']);
@@ -346,17 +346,17 @@ 
 			$links['linked'] = array();
 			unset($query['col_filter']['linked']);
 		}
-		if($query['action'] && in_array($query['action'], array_keys($GLOBALS['egw_info']['apps'])) && $query['action_id'])
+		if ($query['action'] && in_array($query['action'], array_keys($GLOBALS['egw_info']['apps'])) && $query['action_id'])
 		{
 			$link_filters['action'] = array('app'=>$query['action'], 'id' => $query['action_id']);
 			$links['action'] = array();
 		}
-		foreach($link_filters as $key => $link)
+		foreach ($link_filters as $key => $link)
 		{
-			if(!is_array($link))
+			if (!is_array($link))
 			{
 				// Legacy string style
-				list($app,$id) = explode(':',$link);
+				list($app, $id) = explode(':', $link);
 			}
 			else
 			{
@@ -364,25 +364,25 @@ 
 				$app = $link['app'];
 				$id = $link['id'];
 			}
-			if(!is_array($id)) $id = explode(',',$id);
-			if (!($linked = Link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
+			if (!is_array($id)) $id = explode(',', $id);
+			if (!($linked = Link::get_links_multiple($app, $id, true, 'infolog', '', $query['col_filter']['info_status'] == 'deleted')))
 			{
-				$rows = array();	// no infologs linked to selected link --> no rows to return
+				$rows = array(); // no infologs linked to selected link --> no rows to return
 				return 0;
 			}
 
 
-			foreach($linked as $infos)
+			foreach ($linked as $infos)
 			{
-				$links[$key] = array_merge($links[$key],$infos);
+				$links[$key] = array_merge($links[$key], $infos);
 			}
 			$links[$key] = array_unique($links[$key]);
-			if($key == 'linked')
+			if ($key == 'linked')
 			{
 				$linked = array('app' => $app, 'id' => $id, 'title' => (count($id) == 1 ? Link::title($app, $id) : lang('multiple')));
 			}
 		}
-		if(count($links))
+		if (count($links))
 		{
 			$query['col_filter']['info_id'] = count($links) > 1 ? call_user_func_array('array_intersect', $links) : $links[$key];
 		}
@@ -391,7 +391,7 @@ 
 		$old_template = $query['template'];
 
 		// Reset custom, type-specific template if type was cleared (without changing it for home)
-		if(!$query['template'] || stripos($query['template'], 'infolog.index.rows') === 0)
+		if (!$query['template'] || stripos($query['template'], 'infolog.index.rows') === 0)
 		{
 			$query['template'] = 'infolog.index.rows';
 		}
@@ -402,10 +402,10 @@ 
 			if ($tpl->read('infolog.index.rows.'.$query['col_filter']['info_type']))
 			{
 				$query['template'] = $tpl->name;
-				$query['custom_fields'] = true;	// read the custom fields too
+				$query['custom_fields'] = true; // read the custom fields too
 			}
 			// If status is not valid for selected type, clear status filter
-			if($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' &&
+			if ($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' &&
 				!in_array($query['col_filter']['info_status'], array_keys($this->bo->status[$query['col_filter']['info_type']])))
 			{
 				$query['col_filter']['info_status'] = '';
@@ -413,7 +413,7 @@ 
 			}
 		}
 		// Framework\Template change forces the UI to do a full update first, no point in getting rows right now
-		if($old_template && $old_template != $query['template']) return 0;
+		if ($old_template && $old_template != $query['template']) return 0;
 
 		// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
 		// so we have to check that as well
@@ -426,14 +426,14 @@ 
 
 		if (!$query['selectcols'] && $columselection)
 		{
-			$columselection = is_array($columselection) ? $columselection : explode(',',$columselection);
+			$columselection = is_array($columselection) ? $columselection : explode(',', $columselection);
 		}
 		else
 		{
-			$columselection = $query['selectcols'] ? (is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols'])) : array();
+			$columselection = $query['selectcols'] ? (is_array($query['selectcols']) ? $query['selectcols'] : explode(',', $query['selectcols'])) : array();
 		}
 		// do we need to query the cf's
-		$query['custom_fields'] = $this->bo->customfields && (!$columselection || in_array('customfields',$columselection));
+		$query['custom_fields'] = $this->bo->customfields && (!$columselection || in_array('customfields', $columselection));
 
 		$infos = $this->bo->search($query);
 		$query['col_filter'] = $orginal_colfilter;
@@ -451,12 +451,12 @@ 
 			$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
 		}
 		// set old show_times pref, that get_info calculates the cumulated time of the timesheets (we only check used&planned to work for both time cols)
-		$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']],'info_used_time_info_planned_time') !== false;
+		$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']], 'info_used_time_info_planned_time') !== false;
 
 		// query all links and sub counts in one go
 		if ($infos && (!$query['csv_export'] || !is_array($query['csv_export'])))
 		{
-			$links = Link::get_links_multiple('infolog',array_keys($infos),true,'','link_lastmod DESC',true);	// true=incl. deleted
+			$links = Link::get_links_multiple('infolog', array_keys($infos), true, '', 'link_lastmod DESC', true); // true=incl. deleted
 			$anzSubs = $this->bo->anzSubs(array_keys($infos));
 		}
 		$rows = array();
@@ -467,27 +467,27 @@ 
 			$parents = $query['action'] == 'sp' && $query['action_id'] ? (array)$query['action_id'] : array();
 			if (count($parents) == 1 && is_array($query['action_id']))
 			{
-				$query['action_id'] = array_shift($query['action_id']);	// display single parent as app_header
+				$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
 			}
 		}
 
 		$parent_first = count($parents) == 1;
 		$parent_index = 0;
 		// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
-		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
+		if ($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
 
 		// Check to see if we need to remove description
-		foreach($infos as $id => $info)
+		foreach ($infos as $id => $info)
 		{
-			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			if (!(strpos($info['info_addr'], ',') === false) && strpos($info['info_addr'], ', ') === false) $info['info_addr'] = str_replace(',', ', ', $info['info_addr']);
 			if (!$query['csv_export'] || !is_array($query['csv_export']))
 			{
-				$info['links'] =& $links[$id];
+				$info['links'] = & $links[$id];
 				$info['info_anz_subs'] = (int)$anzSubs[$id];
-				$info = $this->get_info($info,$readonlys,null,null,false,$details);
+				$info = $this->get_info($info, $readonlys, null, null, false, $details);
 			}
 			// for subs view ('sp') add parent(s) in front of subs once(!)
-			if ( $parent_first && ($main = $this->bo->read($query['action_id'])) ||
+			if ($parent_first && ($main = $this->bo->read($query['action_id'])) ||
 				$parents && ($parent_index = array_search($info['info_id_parent'], $parents)) !== false &&
 				($main = $this->bo->read($info['info_id_parent'])))
 			{
@@ -497,11 +497,11 @@ 
 				// as read() always read them all, while search() only reads the selected ones
 				if ($query['custom_fields'])
 				{
-					foreach($columselection as $col)
+					foreach ($columselection as $col)
 					{
 						if ($col[0] == '#')
 						{
-							foreach(array_keys($main) as $n)
+							foreach (array_keys($main) as $n)
 							{
 								if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
 							}
@@ -510,7 +510,7 @@ 
 					}
 				}
 				$parent_first = false;
-				if($query['start'] == 0)
+				if ($query['start'] == 0)
 				{
 					array_splice($rows, $id, 0, array($main));
 					unset($parents[$parent_index]);
@@ -523,7 +523,7 @@ 
 		if ($query['cat_id']) $rows['no_cat_id'] = true;
 		if ($query['no_actions']) $rows['no_actions'] = true;
 		$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
-		if($clear_status_filter)
+		if ($clear_status_filter)
 		{
 			$rows['info_status'] = '';
 		}
@@ -554,7 +554,7 @@ 
 				$headers[] = lang($this->filters[$query['filter']]);
 			}
 			if ($query['action'] && ($title = $query['action_title'] || is_array($query['action_id']) ?
-				$query['action_title'] : Link::title($query['action']=='sp'?'infolog':$query['action'],$query['action_id'])))
+				$query['action_title'] : Link::title($query['action'] == 'sp' ? 'infolog' : $query['action'], $query['action_id'])))
 			{
 				$headers[] = $title;
 			}
@@ -565,7 +565,7 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $headers);
 		}
 
-		if (isset($linked)) $query['col_filter']['linked'] = $linked;  // add linked back to the colfilter
+		if (isset($linked)) $query['col_filter']['linked'] = $linked; // add linked back to the colfilter
 
 		return $query['total'];
 	}
@@ -584,7 +584,7 @@ 
 		{
 			if ($info['info_cat']) $set['cat_id'] = $info['info_cat'];
 
-			foreach(Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true) as $link)
+			foreach (Link::get_links('infolog', $info['info_id'], '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != Link::VFS_APPNAME)
 				{
@@ -609,7 +609,7 @@ 
 		{
 			return $data;
 		}
-		$event = array_merge($data,array(
+		$event = array_merge($data, array(
 			'category'	=> $GLOBALS['egw']->categories->check_list(Acl::READ, $infolog['info_cat']),
 			'priority'	=> $infolog['info_priority'] + 1,
 			'public'	=> $infolog['info_access'] != 'private',
@@ -620,7 +620,7 @@ 
 			'end'		=> $infolog['info_enddate'] ? $infolog['info_enddate'] : $infolog['info_datecompleted']
 		));
 		unset($event['entry_id']);
-		if (!$event['end']) $event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		if (!$event['end']) $event['end'] = $event['start'] + (int)$GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength'] * 60;
 
 		// Match Api\Categories by name
 		$event['category'] = $GLOBALS['egw']->categories->name2id(Api\Categories::id2name($infolog['info_cat']));
@@ -629,38 +629,38 @@ 
 		$event['owner'] = $user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// add/modify participants according to prefs
-		$prefs = explode(',',$this->prefs['calendar_set'] ? $this->prefs['calendar_set'] : 'responsible,contact,user');
+		$prefs = explode(',', $this->prefs['calendar_set'] ? $this->prefs['calendar_set'] : 'responsible,contact,user');
 
 		// if no default participants (selected calendars) --> remove all
-		if (!in_array('selected',$prefs))
+		if (!in_array('selected', $prefs))
 		{
 			$event['participants'] = $event['participant_types'] = array();
 		}
 		// Add responsible as participant
-		if (in_array('responsible',$prefs))
+		if (in_array('responsible', $prefs))
 		{
-			foreach($infolog['info_responsible'] as $responsible)
+			foreach ($infolog['info_responsible'] as $responsible)
 			{
 				$event['participants'][$responsible] = $event['participant_types']['u'][$responsible] =
-					calendar_so::combine_status($user==$responsible?'A':'U');
+					calendar_so::combine_status($user == $responsible ? 'A' : 'U');
 			}
 		}
 		// Add linked contact as participant
-		if (in_array('contact',$prefs) && $infolog['info_link']['app'] == 'addressbook')
+		if (in_array('contact', $prefs) && $infolog['info_link']['app'] == 'addressbook')
 		{
-			$event['participants'][calendar_so::combine_user('c',$infolog['info_link']['id'])] =
+			$event['participants'][calendar_so::combine_user('c', $infolog['info_link']['id'])] =
 				$event['participant_types']['c'][$infolog['info_link']['id']] = calendar_so::combine_status('U');
 		}
-		if (in_array('owner',$prefs))
+		if (in_array('owner', $prefs))
 		{
 			$event['participants'][$infolog['info_owner']] = $event['participant_types']['u'][$infolog['info_owner']] =
-				calendar_so::combine_status('A',1,'CHAIR');
+				calendar_so::combine_status('A', 1, 'CHAIR');
 		}
 		// Add current user, if set or no other participants, which is not allowed
-		if (in_array('user',$prefs))
+		if (in_array('user', $prefs))
 		{
 			$event['participants'][$user] = $event['participant_types']['u'][$user] =
-				calendar_so::combine_status('A',1,'CHAIR');
+				calendar_so::combine_status('A', 1, 'CHAIR');
 		}
 
 		// Add infolog link to calendar entry
@@ -668,7 +668,7 @@ 
 		$event['link_id'][]  = $infolog['info_link']['id'];
 
 		// Copy infolog's links
-		foreach(Link::get_links('infolog',$infolog['info_id'],'','link_lastmod DESC',true) as $link)
+		foreach (Link::get_links('infolog', $infolog['info_id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != Link::VFS_APPNAME)
 			{
@@ -677,7 +677,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(Api\Storage\Customfields::get('calendar')) as $name)
+		foreach (array_keys(Api\Storage\Customfields::get('calendar')) as $name)
 		{
 			if ($this->bo->customfields[$name]) $event['#'.$name] = $infolog['#'.$name];
 		}
@@ -696,9 +696,9 @@ 
 	 * @param string $own_referer='' this is our own referer
 	 * @param string $action_title='' app_header for the action, if '' we try the link-title
 	 */
-	function index($values = null,$action='',$action_id='',$called_as=0,$extra_app_header=False,$return_html=False,$own_referer='',$action_title='')
+	function index($values = null, $action = '', $action_id = '', $called_as = 0, $extra_app_header = False, $return_html = False, $own_referer = '', $action_title = '')
 	{
-		unset($extra_app_header);	// not used, but dont want to change signature
+		unset($extra_app_header); // not used, but dont want to change signature
 		if (is_array($values))
 		{
 			$called_as = $values['called_as'];
@@ -707,7 +707,7 @@ 
 		elseif ($own_referer === '')
 		{
 			$own_referer = Api\Header\Referer::get();
-			if (strpos($own_referer,'menuaction=infolog.infolog_ui.edit') !== false)
+			if (strpos($own_referer, 'menuaction=infolog.infolog_ui.edit') !== false)
 			{
 				$own_referer = Api\Cache::getSession('infolog', 'own_session');
 			}
@@ -718,11 +718,11 @@ 
 		}
 
 		// Handle legacy buttons like actions
-		if(is_array($values))
+		if (is_array($values))
 		{
-			foreach(array('document', 'view', 'delete') as $button)
+			foreach (array('document', 'view', 'delete') as $button)
 			{
-				if(isset($values['nm']['rows'][$button]))
+				if (isset($values['nm']['rows'][$button]))
 				{
 					list($id) = @each($values['nm']['rows'][$button]);
 					$values['nm']['multi_action'] = $button;
@@ -742,27 +742,27 @@ 
 				// Some processing to add values in for links and cats
 				$multi_action = $values['nm']['multi_action'];
 				// Action has an additional action - add / delete, etc.  Buttons named <multi-action>_action[action_name]
-				if(in_array($multi_action, array('link', 'responsible')))
+				if (in_array($multi_action, array('link', 'responsible')))
 				{
 					// eTemplate ignores the _popup namespace, but et2 doesn't
-					if($values[$multi_action.'_popup'])
+					if ($values[$multi_action.'_popup'])
 					{
-						$popup =& $values[$multi_action.'_popup'];
+						$popup = & $values[$multi_action.'_popup'];
 					}
 					else
 					{
-						$popup =& $values;
+						$popup = & $values;
 					}
-					$values['nm']['multi_action'] .= '_' . key($popup[$multi_action . '_action']);
-					if($multi_action == 'link')
+					$values['nm']['multi_action'] .= '_'.key($popup[$multi_action.'_action']);
+					if ($multi_action == 'link')
 					{
-						$popup[$multi_action] = $popup['link']['app'] . ':'.$popup['link']['id'];
+						$popup[$multi_action] = $popup['link']['app'].':'.$popup['link']['id'];
 					}
-					else if(is_array($popup[$multi_action]))
+					else if (is_array($popup[$multi_action]))
 					{
-						$popup[$multi_action] = implode(',',$popup[$multi_action]);
+						$popup[$multi_action] = implode(',', $popup[$multi_action]);
 					}
-					$values['nm']['multi_action'] .= '_' . $popup[$multi_action];
+					$values['nm']['multi_action'] .= '_'.$popup[$multi_action];
 					unset($values[$multi_action.'_popup']);
 					unset($values[$multi_action]);
 				}
@@ -770,18 +770,18 @@ 
 				if ($this->action($values['nm']['multi_action'], $values['nm']['selected'], $values['nm']['select_all'],
 					$success, $failed, $action_msg, $values['nm'], $msg, $values['nm']['checkboxes']['no_notifications']))
 				{
-					$msg .= lang('%1 entries %2',$success,$action_msg);
+					$msg .= lang('%1 entries %2', $success, $action_msg);
 					Framework::message($msg);
 				}
-				elseif(is_null($msg))
+				elseif (is_null($msg))
 				{
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					Framework::message($msg,'error');
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					Framework::message($msg, 'error');
 				}
-				elseif($msg)
+				elseif ($msg)
 				{
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
-					Framework::message($msg,'error');
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
+					Framework::message($msg, 'error');
 				}
 				unset($values['nm']['multi_action']);
 				unset($values['nm']['select_all']);
@@ -804,7 +804,7 @@ 
 				$action_id = 0;
 				$action_title = '';
 			}
-			if($_GET['ajax'] === 'true')
+			if ($_GET['ajax'] === 'true')
 			{
 				$nm['action'] = '';
 				$nm['action_id'] = 0;
@@ -820,8 +820,7 @@ 
 
 			if (isset($_GET['filter']) && $_GET['filter'] != 'default' || !isset($values['nm']['filter']) && !$this->called_by)
 			{
-				$values['nm']['filter'] = $_GET['filter'] && $_GET['filter'] != 'default' ? $_GET['filter'] :
-					$this->prefs['defaultFilter'];
+				$values['nm']['filter'] = $_GET['filter'] && $_GET['filter'] != 'default' ? $_GET['filter'] : $this->prefs['defaultFilter'];
 			}
 			if (!isset($values['nm']['order']) || !$values['nm']['order'])
 			{
@@ -835,21 +834,21 @@ 
 			$action_title = $values['action_title'] = $action ? $action_title : $nm['action_title'];
 			$action = $values['action'] = $action ? $action : $nm['action'];
 		}
-		if($_GET['search']) $values['nm']['search'] = $_GET['search'];
+		if ($_GET['search']) $values['nm']['search'] = $_GET['search'];
 
 		if ($values['nm']['add'])
 		{
 			$values['add'] = $values['nm']['add'];
 			unset($values['nm']['add']);
 		}
-		unset($values['nm']['rows']['checked']);	// not longer used, but hides button actions
+		unset($values['nm']['rows']['checked']); // not longer used, but hides button actions
 
 		if ($values['add'] || $values['cancel'] || isset($values['main']))
 		{
 			if ($values['add'])
 			{
 				list($type) = each($values['add']);
-				return $this->edit(0,$action,$action_id,$type,$called_as);
+				return $this->edit(0, $action, $action_id, $type, $called_as);
 			}
 			elseif ($values['cancel'] && $own_referer)
 			{
@@ -860,14 +859,14 @@ 
 			}
 			else
 			{
-				list($do,$do2) = each($values['main']);
+				list($do, $do2) = each($values['main']);
 				list($do_id) = @each($do2);
-				switch((string)$do)
+				switch ((string)$do)
 				{
 					case 'close':
-						$closesingle=true;
+						$closesingle = true;
 					case 'close_all':
-						$this->close($do_id,$called_as,$closesingle);
+						$this->close($do_id, $called_as, $closesingle);
 						break;
 					case 'view':
 						$value = array();
@@ -905,7 +904,7 @@ 
 		$this->tmpl->read('infolog.index');
 		$values['nm']['options-filter'] = $this->filters;
 		$values['nm']['get_rows'] = 'infolog.infolog_ui.get_rows';
-		$values['nm']['options-filter2'] = (in_array($this->prefs['show_links'],array('all','no_describtion')) ? array() : array(
+		$values['nm']['options-filter2'] = (in_array($this->prefs['show_links'], array('all', 'no_describtion')) ? array() : array(
 			''               => 'default',
 		)) + array(
 			'no_describtion' => 'no details',
@@ -926,34 +925,34 @@ 
 		else
 		{
 			// Allow saving parent ID into favorites
-			$values['nm']['favorites'] = array('action','action_id');
+			$values['nm']['favorites'] = array('action', 'action_id');
 		}
 
 		// Allow add actions even when there's no rows
 		$values['nm']['placeholder_actions'] = array('new');
 
-		if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		if (!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
 
 		// disable columns for main entry as set in the pref for details or no details
 		$values['nm']['columnselection_pref'] = 'nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows')
-			.($values['nm']['filter2']=='all' ? '-details' : '');
+			.($values['nm']['filter2'] == 'all' ? '-details' : '');
 		if ($action == 'sp')
 		{
 			$pref = $values['nm']['columnselection_pref'];
-			foreach(array('info_used_time_info_planned_time_info_replanned_time','info_datemodified','info_owner_info_responsible','customfields') as $name)
+			foreach (array('info_used_time_info_planned_time_info_replanned_time', 'info_datemodified', 'info_owner_info_responsible', 'customfields') as $name)
 			{
-				$values['main']['no_'.$name] = strpos($this->prefs[$pref],$name) === false;
+				$values['main']['no_'.$name] = strpos($this->prefs[$pref], $name) === false;
 			}
 			if (!$values['main']['no_customfields'])
 			{
 				// set the column-header of the main table for the customfields.
-				foreach(array_keys($this->bo->customfields) as $lname)
+				foreach (array_keys($this->bo->customfields) as $lname)
 				{
-					$values['main']['customfields'].=$lname."\n";
+					$values['main']['customfields'] .= $lname."\n";
 				}
 			}
 		}
-		if ($values['nm']['filter']=='bydate')
+		if ($values['nm']['filter'] == 'bydate')
 		{
 			foreach (array_keys($values['nm']['col_filter']) as $colfk)
 			{
@@ -986,7 +985,7 @@ 
 		{
 			$values['css'] .= '<style type="text/css">@media screen { .infoDes {  '.
 				' max-height: '.
-				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	// dono why em is not real lines
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).// dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
 
@@ -998,13 +997,13 @@ 
 
 		// remove group-types user has not any rights to as filter
 		// does not take implicit rights as delegated into account, so they will not be available as filters
-		foreach($this->bo->group_owners as $type => $group)
+		foreach ($this->bo->group_owners as $type => $group)
 		{
 			if (!isset($this->bo->grants[$group])) unset($sel_options['info_type'][$type]);
 		}
 
 
-		return $this->tmpl->exec('infolog.infolog_ui.index',$values,$sel_options,$readonlys,$persist,$return_html ? -1 : 0);
+		return $this->tmpl->exec('infolog.infolog_ui.index', $values, $sel_options, $readonlys, $persist, $return_html ? -1 : 0);
 	}
 
 	/**
@@ -1019,9 +1018,9 @@ 
 		if ($this->bo->group_owners)
 		{
 			// remove types owned by groups the user has no edit grant
-			foreach($this->bo->group_owners as $type => $group)
+			foreach ($this->bo->group_owners as $type => $group)
 			{
-				if (!($this->bo->grants[$group] & Acl::EDIT))
+				if (!($this->bo->grants[$group]&Acl::EDIT))
 				{
 					unset($types[$type]);
 				}
@@ -1038,7 +1037,7 @@ 
 	 */
 	private function get_actions(array $query)
 	{
-		for($i = 0; $i <= 100; $i += 10)
+		for ($i = 0; $i <= 100; $i += 10)
 		{
 			$percent[$i] = $i.'%';
 		}
@@ -1047,9 +1046,9 @@ 
 		$types_add = array();
 		// Do not add deleted type to add or change menus
 		unset($types['delete']);
-		foreach($types as $type => &$data)
+		foreach ($types as $type => &$data)
 		{
-			$image_exists = Api\Image::find('infolog',$type);
+			$image_exists = Api\Image::find('infolog', $type);
 			$data = array(
 				'caption' => $data,
 				'icon' => $image_exists ? $type : 'infolog/navbar',
@@ -1061,9 +1060,9 @@ 
 
 		$icons = null;
 		$statis = $this->bo->get_status($query['col_filter']['info_type'], $icons);
-		foreach($statis as $type => &$data)
+		foreach ($statis as $type => &$data)
 		{
-			$image_exists = Api\Image::find('infolog',$icons[$type]);
+			$image_exists = Api\Image::find('infolog', $icons[$type]);
 			$data = array(
 				'caption' => $data,
 				'icon' => $image_exists ? $icons[$type] : 'infolog/status',
@@ -1075,10 +1074,10 @@ 
 				'caption' => 'Open',
 				'default' => true,
 				'allowOnMultiple' => false,
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.infolog.viewEntry':'',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.infolog.viewEntry' : '',
 				'url' => 'menuaction=infolog.infolog_ui.edit&info_id=$id',
 				'popup' => Link::get_registry('infolog', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'mobileViewTemplate' => 'edit?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/infolog/templates/mobile/edit.xet'))
 			),
 			'parent' => array(
@@ -1152,7 +1151,7 @@ 
 						'icon' => 'completed',
 					),
 					'cat' =>  Etemplate\Widget\Nextmatch::category_action(
-						'infolog',$group,'Change category','cat_'
+						'infolog', $group, 'Change category', 'cat_'
 					),
 					'responsible' => array(
 						'caption' => 'Delegation',
@@ -1189,7 +1188,7 @@ 
 				'onExecute' => 'javaScript:app.infolog.infolog_menu_print'
 			)
 		);
-		++$group;	// integration with other apps
+		++$group; // integration with other apps
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(
@@ -1207,7 +1206,7 @@ 
 				'caption' => 'Schedule appointment',
 				'group' => $group,
 				'url' => 'menuaction=calendar.calendar_uiforms.edit&'.
-					Link::get_registry('calendar', 'add_app') . '[]=infolog&'.Link::get_registry('calendar','add_id').'[]=$id',
+					Link::get_registry('calendar', 'add_app').'[]=infolog&'.Link::get_registry('calendar', 'add_id').'[]=$id',
 				'allowOnMultiple' => false,
 				'popup' => Link::get_registry('calendar', 'add_popup'),
 			);
@@ -1231,7 +1230,7 @@ 
 				'hint' => 'Convert to a ticket',
 				'group' => $group,
 				'url' => 'menuaction=tracker.tracker_ui.edit&'.
-					Link::get_registry('tracker', 'add_app') . '[]=infolog&'.Link::get_registry('tracker','add_id').'[]=$id',
+					Link::get_registry('tracker', 'add_app').'[]=infolog&'.Link::get_registry('tracker', 'add_id').'[]=$id',
 				'allowOnMultiple' => false,
 				'popup' => Link::get_registry('tracker', 'add_popup'),
 			);
@@ -1244,7 +1243,7 @@ 
 		$actions['ical'] = array(
 			'icon' => 'ical',
 			'caption' => 'Export iCal',
-			'postSubmit' => true,	// download needs post submit to work
+			'postSubmit' => true, // download needs post submit to work
 			'group' => $group,
 			'allowOnMultiple' => true,
 			'hideOnMobile' => true
@@ -1297,14 +1296,14 @@ 
 		$success = $failed = 0;
 		if ($use_all)
 		{
-			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;        // all
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
 			$result = $readonlys = null;
-			$this->get_rows($query,$result,$readonlys);
+			$this->get_rows($query, $result, $readonlys);
 			$checked = array();
-			foreach($result as $key => $info)
+			foreach ($result as $key => $info)
 			{
-				if(is_numeric($key))
+				if (is_numeric($key))
 				{
 					$checked[] = $info['info_id'];
 				}
@@ -1315,29 +1314,29 @@ 
 		list($action, $settings) = explode('_', $_action, 2);
 
 		// Actions that can handle a list of IDs
-		switch($action)
+		switch ($action)
 		{
 			case 'link':
 				list($add_remove, $link) = explode('_', $settings, 2);
-				list($app, $link_id) = explode(strpos($link,':') !== false ? ':' : ',', $link);
-				if(!$link_id)
+				list($app, $link_id) = explode(strpos($link, ':') !== false ? ':' : ',', $link);
+				if (!$link_id)
 				{
 					$action_msg = 'linked';
 					$msg = lang('You need to select an entry for linking.');
 					break;
 				}
 				$title = Link::title($app, $link_id);
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
-					if(!$this->bo->check_access($id, Acl::EDIT))
+					if (!$this->bo->check_access($id, Acl::EDIT))
 					{
 						$failed++;
 						continue;
 					}
-					if($add_remove == 'add')
+					if ($add_remove == 'add')
 					{
 						$action_msg = lang('linked to %1', $title);
-						if(Link::link('infolog', $id, $app, $link_id))
+						if (Link::link('infolog', $id, $app, $link_id))
 						{
 							$success++;
 						}
@@ -1364,20 +1363,20 @@ 
 			case 'ical':
 				// infolog_ical lets horde be auto-loaded, so it must go first
 				$boical = new infolog_ical();
-				Api\Header\Content::type('todo.ics','text/calendar');
+				Api\Header\Content::type('todo.ics', 'text/calendar');
 				echo $boical->exportvCalendar($checked);
 				exit();
 
 		}
 
 		// Actions that need to loop
-		foreach($checked as $id)
+		foreach ($checked as $id)
 		{
-			if(!$entry = $this->bo->read($id))
+			if (!$entry = $this->bo->read($id))
 			{
 				continue;
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'close':
 					$action_msg = lang('closed');
@@ -1387,8 +1386,8 @@ 
 
 				case 'delete':
 					$action_msg = $settings == 'sub' ? lang(' (and children) deleted') : lang('deleted');
-					$result = $this->bo->delete($id, $settings=='sub', false, $skip_notifications);
-					if($result == true)
+					$result = $this->bo->delete($id, $settings == 'sub', false, $skip_notifications);
+					if ($result == true)
 					{
 						$success++;
 					}
@@ -1401,14 +1400,14 @@ 
 				case 'type':
 					$action_msg = lang('changed type');
 					// Dont allow to change the type, if user has no delete rights from the group-owner
-					if ($id && !($this->bo->grants[$entry['info_owner']] & Acl::DELETE))
+					if ($id && !($this->bo->grants[$entry['info_owner']]&Acl::DELETE))
 					{
 						$failed++;
 						break;
 					}
 					$entry['info_type'] = $settings;
 					try {
-						$this->bo->write($entry, true,true,true,$skip_notifications,true); // Throw exceptions
+						$this->bo->write($entry, true, true, true, $skip_notifications, true); // Throw exceptions
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
@@ -1423,11 +1422,11 @@ 
 					$action_msg = lang('changed completion to %1%', $settings);
 					$entry['info_percent'] = $settings;
 					// Done and not-started entries will get changed right back if we don't change the status too
-					if(in_array($entry['info_status'],array('not-started','done','billed','cancelled','archive')))
+					if (in_array($entry['info_status'], array('not-started', 'done', 'billed', 'cancelled', 'archive')))
 					{
 						$entry['info_status'] = 'ongoing';
 					}
-					if($entry['info_percent'] == 0)
+					if ($entry['info_percent'] == 0)
 					{
 						$entry['info_status'] = 'not-started';
 					}
@@ -1435,7 +1434,7 @@ 
 					{
 						$entry['info_status'] = 'done';
 					}
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1447,24 +1446,23 @@ 
 
 				case 'undelete':	// set it to valid status != 'deleted' for that type
 					$settings = isset($this->bo->status[$entry['info_type']]['done']) ?
-						$this->bo->status[$entry['info_type']]['done'] :
-						$this->bo->status['defaults'][$entry['info_type']];
+						$this->bo->status[$entry['info_type']]['done'] : $this->bo->status['defaults'][$entry['info_type']];
 					// fall-through
 				case 'status':
-					if(isset($this->bo->status[$entry['info_type']][$settings]))
+					if (isset($this->bo->status[$entry['info_type']][$settings]))
 					{
 						$action_msg = lang('changed status to %1', lang($this->bo->status[$entry['info_type']][$settings]));
-						if(!in_array($settings,array('done','billed','cancelled','archive')) && $entry['info_percent'] == 100)
+						if (!in_array($settings, array('done', 'billed', 'cancelled', 'archive')) && $entry['info_percent'] == 100)
 						{
 							// Done entries will get changed right back if we don't change the completion too
 							$entry['info_percent'] = 10;
 						}
-						if(in_array($settings, array('not-started')) && $entry['info_percent'] > 0)
+						if (in_array($settings, array('not-started')) && $entry['info_percent'] > 0)
 						{
 							$entry['info_percent'] = 0;
 						}
 						$entry['info_status'] = $settings;
-						if($this->bo->write($entry, true,true,true,$skip_notifications))
+						if ($this->bo->write($entry, true, true, true, $skip_notifications))
 						{
 							$success++;
 						}
@@ -1477,7 +1475,7 @@ 
 					break;
 
 				case 'cat':
-					if($settings)
+					if ($settings)
 					{
 						$cat_name = Api\Categories::id2name($settings);
 						$action_msg = lang('changed category to %1', $cat_name);
@@ -1487,7 +1485,7 @@ 
 						$action_msg = lang('removed category');
 					}
 					$entry['info_cat'] = $settings;
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1499,17 +1497,17 @@ 
 
 				case 'responsible':
 					list($add_remove, $user_str) = explode('_', $settings, 2);
-					$action_msg = ($add_remove == 'add' ? lang('added') : lang('removed')) . ' ';
+					$action_msg = ($add_remove == 'add' ? lang('added') : lang('removed')).' ';
 					$names = array();
 					$users = explode(',', $user_str);
-					foreach($users as $account_id)
+					foreach ($users as $account_id)
 					{
 						$names[] = Api\Accounts::username($account_id);
 					}
 					$action_msg .= implode(', ', $names);
 					$function = $add_remove == 'add' ? 'array_merge' : 'array_diff';
 					$entry['info_responsible'] = array_unique($function($entry['info_responsible'], (array)$users));
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1530,10 +1528,10 @@ 
 	 * @param string $_referer=''
 	 * @param boolean $closesingle=false
 	 */
-	function close($values=0,$_referer='',$closesingle=false,$skip_notification = false)
+	function close($values = 0, $_referer = '', $closesingle = false, $skip_notification = false)
 	{
 		//echo "<p>".__METHOD__."($values,$referer,$closeall)</p>\n";
-		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
+		$info_id = (int)(is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
 		if ($info_id)
@@ -1543,11 +1541,11 @@ 
 			$status = $info['info_status'];
 			// closed stati assumed array('done','billed','cancelled')
 			if (isset($this->bo->status[$info['info_type']]['done'])) {
-				$status ='done';
+				$status = 'done';
 			} elseif (isset($this->bo->status[$info['info_type']]['billed'])) {
-				$status ='billed';
+				$status = 'billed';
 			} elseif (isset($this->bo->status[$info['info_type']]['cancelled'])) {
-				$status ='cancelled';
+				$status = 'cancelled';
 			}
 			#_debug_array($status);
 			$values = array(
@@ -1557,15 +1555,15 @@ 
 				'info_percent'=> 100,
 				'info_datecompleted' => $this->bo->now_su,
 			);
-			$this->bo->write($values, true,true,true,$skip_notification);
+			$this->bo->write($values, true, true, true, $skip_notification);
 
-			$query = array('action'=>'sp','action_id'=>$info_id);
+			$query = array('action'=>'sp', 'action_id'=>$info_id);
 			if (!$closesingle) {
-				foreach((array)$this->bo->search($query) as $info)
+				foreach ((array)$this->bo->search($query) as $info)
 				{
 					if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
 					{
-						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);	// we call ourselfs recursive to process subs from subs too
+						$this->close($info['info_id'], $referer, $closesingle, $skip_notification); // we call ourselfs recursive to process subs from subs too
 					}
 				}
 			}
@@ -1581,9 +1579,9 @@ 
 	 * @param string $called_by
 	 * @param boolean $skip_notification Do not send notification of deletion
 	 */
-	function delete($values=0,$_referer='',$called_by='',$skip_notification=False)
+	function delete($values = 0, $_referer = '', $called_by = '', $skip_notification = False)
 	{
-		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
+		$info_id = (int)(is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
 		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))	// entries without subs get confirmed by javascript
@@ -1594,9 +1592,9 @@ 
 
 		if (is_array($values) || $info_id <= 0)
 		{
-			if (($values['delete'] || $values['delete_subs']) && $info_id > 0 && $this->bo->check_access($info_id,Acl::DELETE))
+			if (($values['delete'] || $values['delete_subs']) && $info_id > 0 && $this->bo->check_access($info_id, Acl::DELETE))
 			{
-				$deleted = $this->bo->delete($info_id,$values['delete_subs'],$values['info_id_parent'], $skip_notification);
+				$deleted = $this->bo->delete($info_id, $values['delete_subs'], $values['info_id_parent'], $skip_notification);
 			}
 			if ($called_by)		// direct call from the same request
 			{
@@ -1606,7 +1604,7 @@ 
 			{
 				$this->edit(array(
 					'info_id' => $info_id,
-					'button'  => array('deleted' => true),	// not delete!
+					'button'  => array('deleted' => true), // not delete!
 					'referer' => $referer,
 					'msg'     => $deleted ? lang('Infolog entry deleted') : '',
 				));
@@ -1614,7 +1612,7 @@ 
 			return $referer ? $this->tmpl->location($referer) : $this->index();
 		}
 		$readonlys = $values = array();
-		$values['main'][1] = $this->get_info($info_id,$readonlys['main']);
+		$values['main'][1] = $this->get_info($info_id, $readonlys['main']);
 
 		$this->tmpl->read('infolog.delete');
 
@@ -1635,7 +1633,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '.lang('Delete');
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualInfologDelete');
 
-		$this->tmpl->exec('infolog.infolog_ui.delete',$values,array(),$readonlys,$persist,$called_by == 'edit' ? 2 : 0);
+		$this->tmpl->exec('infolog.infolog_ui.delete', $values, array(), $readonlys, $persist, $called_by == 'edit' ? 2 : 0);
 	}
 
 	/**
@@ -1647,77 +1645,77 @@ 
 	 * @param string $type Type of log-entry: note,todo,task
 	 * @param string $referer array with param/get-vars of the refering page
 	 */
-	function edit($content = null,$action = '',$action_id=0,$type='',$referer='')
+	function edit($content = null, $action = '', $action_id = 0, $type = '', $referer = '')
 	{
 		if (($submit = is_array($content)))
 		{
 			//echo "infolog_ui::edit: content="; _debug_array($content);
 			$info_id   = $content['info_id'];
-			$action    = $content['action'];    unset($content['action']);
+			$action    = $content['action']; unset($content['action']);
 			$action_id = $content['action_id']; unset($content['action_id']);
-			$referer   = $content['referer'];   unset($content['referer']);
-			$no_popup  = $content['no_popup'];  unset($content['no_popup']);
+			$referer   = $content['referer']; unset($content['referer']);
+			$no_popup  = $content['no_popup']; unset($content['no_popup']);
 
 			list($button) = @each($content['button']);
-			if (!$button && $action) $button = $action;	// action selectbox
+			if (!$button && $action) $button = $action; // action selectbox
 			//info_cc expects an comma separated string
 			//error_log(__METHOD__.__LINE__.array2string($content));
 			if (empty($content['info_cc'])) $content['info_cc'] = "";
 			if (is_array($content['info_cc']))
 			{
-				foreach($content['info_cc'] as $i => $value)
+				foreach ($content['info_cc'] as $i => $value)
 				{
 					//imap_rfc822 should not be used, but it works reliable here, until we have some regex solution or use horde stuff
 					$addresses = imap_rfc822_parse_adrlist($value, '');
 					//error_log(__METHOD__.__LINE__.$value.'->'.array2string($addresses[0]));
-					$content['info_cc'][$i]=$addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
+					$content['info_cc'][$i] = $addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
 				}
-				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',',$content['info_cc']);
+				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',', $content['info_cc']);
 			}
 			unset($content['button']);
 			if ($button)
 			{
 				// Copy or schedule Infolog
-				if (in_array($button,array('copy','schedule','ical','tracker')))
+				if (in_array($button, array('copy', 'schedule', 'ical', 'tracker')))
 				{
 					$action = $button;
-					if (!$info_id || $this->bo->check_access($info_id,Acl::EDIT))
+					if (!$info_id || $this->bo->check_access($info_id, Acl::EDIT))
 					{
-						$button = 'apply';	// need to store infolog first
+						$button = 'apply'; // need to store infolog first
 					}
 				}
 				//Validate the enddate must be grather than startdate
 				if (!empty($content['info_enddate']) && !empty($content['info_startdate']))
 				{
-					$duration_date = $content['info_enddate']-$content['info_startdate'];
+					$duration_date = $content['info_enddate'] - $content['info_startdate'];
 					if ($duration_date < 0)
 					{
 						$this->tmpl->set_validation_error('info_startdate', lang('Startdate must be before Enddate!!!'));
-						$button = $action = '';	// stop save or apply
+						$button = $action = ''; // stop save or apply
 					}
 				}
 				//echo "<p>infolog_ui::edit(info_id=$info_id) '$button' button pressed, content="; _debug_array($content);
 				if (($button == 'save' || $button == 'apply') && isset($content['info_subject']) && empty($content['info_subject']))
 				{
-					$this->tmpl->set_validation_error('info_subject',lang('Field must not be empty !!!'));
-					$button = $action = '';	// stop save or apply
+					$this->tmpl->set_validation_error('info_subject', lang('Field must not be empty !!!'));
+					$button = $action = ''; // stop save or apply
 				}
 				if (($button == 'save' || $button == 'apply') && $info_id)
 				{
 					$old = $this->bo->read($info_id);
-					if (!($edit_acl = $this->bo->check_access($info_id,Acl::EDIT)))
+					if (!($edit_acl = $this->bo->check_access($info_id, Acl::EDIT)))
 					{
 						$status_only = $this->bo->is_responsible($old);
-						$undelete = $this->bo->check_access($old,infolog_bo::ACL_UNDELETE);
+						$undelete = $this->bo->check_access($old, infolog_bo::ACL_UNDELETE);
 					}
 				}
 				if (($button == 'save' || $button == 'apply') && (!$info_id || $edit_acl || $status_only || $undelete))
 				{
-					$operation = $info_id ?  'edit' : 'add';
+					$operation = $info_id ? 'edit' : 'add';
 					if ($content['info_contact'])
 					{
 						$old_link_id = (int)$content['info_link_id'];
-						if(is_array($content['info_contact']))
+						if (is_array($content['info_contact']))
 						{
 							// eTemplate2 returns the array all ready
 							$app = $content['info_contact']['app'];
@@ -1730,11 +1728,11 @@ 
 						}
 						elseif ($app && $id)
 						{
-							if(!is_array($content['link_to']))
+							if (!is_array($content['link_to']))
 							{
 								$content['link_to'] = array();
 							}
-							$content['info_link_id'] = (int)($info_link_id = Link::link('infolog',$content['link_to']['to_id'],$app,$id));
+							$content['info_link_id'] = (int)($info_link_id = Link::link('infolog', $content['link_to']['to_id'], $app, $id));
 						}
 						else
 						{
@@ -1744,7 +1742,7 @@ 
 						{
 							$link = Link::get_link($old_link_id);
 							// remove selected project, if removed link is that project
-							if($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id'])
+							if ($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id'])
 							{
 								unset($content['pm_id'], $content['old_pm_id']);
 							}
@@ -1758,39 +1756,38 @@ 
 					}
 					if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 					{
-						$content['info_link_id'] = 0;	// as field has to be int
+						$content['info_link_id'] = 0; // as field has to be int
 					}
 					$active_tab = $content['tabs'];
 					if (!($info_id = $this->bo->write($content, true, true, true, $content['no_notifications'])))
 					{
-						$content['msg'] = $info_id !== 0 || !$content['info_id'] ? lang('Error: saving the entry') :
-							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(
+						$content['msg'] = $info_id !== 0 || !$content['info_id'] ? lang('Error: saving the entry') : 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(
 									'menuaction' => 'infolog.infolog_ui.edit',
 									'info_id'    => $content['info_id'],
 									'no_popup'   => $no_popup,
 									'referer'    => $referer,
-								))).'">','</a>');
-						$button = $action = '';	// not exiting edit
+								))).'">', '</a>');
+						$button = $action = ''; // not exiting edit
 						$info_id = $content['info_id'];
 					}
 					else
 					{
-						$GLOBALS['egw']->preferences->add('infolog','preferred_type',$content['info_type']);
-						$GLOBALS['egw']->preferences->save_repository(false,'user',false);
+						$GLOBALS['egw']->preferences->add('infolog', 'preferred_type', $content['info_type']);
+						$GLOBALS['egw']->preferences->save_repository(false, 'user', false);
 						$content['msg'] = lang('InfoLog entry saved');
-						Framework::refresh_opener($content['msg'],'infolog',$info_id,$operation);
+						Framework::refresh_opener($content['msg'], 'infolog', $info_id, $operation);
 					}
 					$content['tabs'] = $active_tab;
-					if ((int) $content['pm_id'] != (int) $content['old_pm_id'])
+					if ((int)$content['pm_id'] != (int)$content['old_pm_id'])
 					{
 						//echo "<p>pm_id changed: $content[old_pm_id] -> $content[pm_id]</p>\n";
 						// update links accordingly, if selected project changed
 						if ($content['pm_id'])
 						{
 							//echo "<p>this->link->link('infolog',{$content['link_to']['to_id']},'projectmanager',{$content['pm_id']});</p>";
-							Link::link('infolog',$content['link_to']['to_id'],'projectmanager',$content['pm_id']);
+							Link::link('infolog', $content['link_to']['to_id'], 'projectmanager', $content['pm_id']);
 							// making the project the selected link, if no other link selected
 							if (!$info_link_id || $info_link_id == 'projectmanager:'.$content['old_pm_id'])
 							{
@@ -1800,7 +1797,7 @@ 
 						if ($content['old_pm_id'])
 						{
 							//echo "<p>this->link->unlink2(0,infolog,{$content['link_to']['to_id']},0,'projectmanager',{$content['old_pm_id']});</p>\n";
-							Link::unlink2(0,infolog,$content['link_to']['to_id'],0,'projectmanager',$content['old_pm_id']);
+							Link::unlink2(0, infolog, $content['link_to']['to_id'], 0, 'projectmanager', $content['old_pm_id']);
 						}
 						$content['old_pm_id'] = $content['pm_id'];
 					}
@@ -1808,14 +1805,14 @@ 
 					if ($info_id && is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 					{
 						//echo "<p>writing links for new entry $info_id</p>\n"; _debug_array($content['link_to']['to_id']);
-						Link::link('infolog',$info_id,$content['link_to']['to_id']);
+						Link::link('infolog', $info_id, $content['link_to']['to_id']);
 						$content['link_to']['to_id'] = $info_id;
 					}
-					if ($info_link_id && strpos($info_link_id,':') !== false)	// updating info_link_id if necessary
+					if ($info_link_id && strpos($info_link_id, ':') !== false)	// updating info_link_id if necessary
 					{
-						list($app,$id) = explode(':',$info_link_id);
-						$link = Link::get_link('infolog',$info_id,$app,$id);
-						if ((int) $content['info_link_id'] != (int) $link['link_id'])
+						list($app, $id) = explode(':', $info_link_id);
+						$link = Link::get_link('infolog', $info_id, $app, $id);
+						if ((int)$content['info_link_id'] != (int)$link['link_id'])
 						{
 							$content['info_link_id'] = $link['link_id'];
 
@@ -1827,9 +1824,9 @@ 
 								'info_owner'   => $content['info_owner'],
 							);
 							//echo "<p>updating info_link_id: ".print_r($to_write,true)."</p>\n";
-							$this->bo->write($to_write,False,true,true,true);	// last true = no notifications, as no real change
+							$this->bo->write($to_write, False, true, true, true); // last true = no notifications, as no real change
 							// we need eg. the new modification date, for further updates
-							$content = array_merge($content,$to_write);
+							$content = array_merge($content, $to_write);
 						}
 					}
 				}
@@ -1840,33 +1837,33 @@ 
 						'action' => $action,
 						'action_id' => $action_id
 					);
-					if (!($content['msg'] = $this->delete($info_id,$referer,'edit'))) return;	// checks ACL first
+					if (!($content['msg'] = $this->delete($info_id, $referer, 'edit'))) return; // checks ACL first
 
-					Framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
+					Framework::refresh_opener($content['msg'], 'infolog', $info_id, 'delete');
 				}
 				// called again after delete confirmation dialog
-				elseif ($button == 'deleted'  && $content['msg'])
+				elseif ($button == 'deleted' && $content['msg'])
 				{
-					Framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
+					Framework::refresh_opener($content['msg'], 'infolog', $info_id, 'delete');
 				}
 				if ($button == 'save' || $button == 'cancel' || $button == 'delete' || $button == 'deleted')
 				{
 					if ($no_popup)
 					{
-						Egw::redirect_link($referer,array('msg' => $content['msg']));
+						Egw::redirect_link($referer, array('msg' => $content['msg']));
 					}
 					Framework::window_close();
 				}
 			}
 			// on a type-change, set the status to the default status of that type, if the actual status is not supported by the new type
-			if (!array_key_exists($content['info_status'],$this->bo->status[$content['info_type']]))
+			if (!array_key_exists($content['info_status'], $this->bo->status[$content['info_type']]))
 			{
 				$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 				// Make sure we don't end up with invalid status / percent combinations
 				if ($content['info_status'] != 'done')
 				{
 					$content['info_datecompleted'] = '';
-					if((int)$content['info_percent'] === 100)
+					if ((int)$content['info_percent'] === 100)
 					{
 						$content['info_percent'] = 10;
 					}
@@ -1875,7 +1872,7 @@ 
 				{
 					$content['info_percent'] = 100;
 				}
-				if($content['info_status'] != 'not-started' && (int)$content['info_percent'] == 0)
+				if ($content['info_status'] != 'not-started' && (int)$content['info_percent'] == 0)
 				{
 					$content['info_percent'] = 10;
 				}
@@ -1884,22 +1881,21 @@ 
 		else	// new call via GET
 		{
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
-			$action    = $action    ? $action    : $_REQUEST['action'];
+			$action    = $action ? $action : $_REQUEST['action'];
 			$action_id = $action_id ? $action_id : $_REQUEST['action_id'];
-			$info_id   = $content   ? $content   : $_REQUEST['info_id'];
-			$type      = $type      ? $type      : $_REQUEST['type'];
-			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
-				Api\Header\Referer::get('/index.php?menuaction=infolog.infolog_ui.index'));
-			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);	// remove previou/old msg from referer
+			$info_id   = $content ? $content : $_REQUEST['info_id'];
+			$type      = $type ? $type : $_REQUEST['type'];
+			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] : Api\Header\Referer::get('/index.php?menuaction=infolog.infolog_ui.index'));
+			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/', '\\1', $referer); // remove previou/old msg from referer
 			$no_popup  = $_GET['no_popup'];
-			$print = (int) $_REQUEST['print'];
+			$print = (int)$_REQUEST['print'];
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
 
-			$content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id );
-			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
-			foreach(array('info_subject', 'info_des') as $key)
+			$content = $this->bo->read($info_id || $action != 'sp' ? $info_id : $action_id);
+			if (!(strpos($content['info_addr'], ',') === false) && strpos($content['info_addr'], ', ') === false) $content['info_addr'] = str_replace(',', ', ', $content['info_addr']);
+			foreach (array('info_subject', 'info_des') as $key)
 			{
-				if(!isset($content[$key]) || strlen($content[$key]) < 75)
+				if (!isset($content[$key]) || strlen($content[$key]) < 75)
 				{
 					continue;
 				}
@@ -1907,66 +1903,66 @@ 
 				$clarray = array();
 				foreach ($contlines as &$line)
 				{
-					if(strlen($line) < 75)
+					if (strlen($line) < 75)
 					{
 						$clarray[] = $line;
 						continue;
 					}
 					$cont = explode(' ', $line);
 					$ckarray = array();
-					foreach($cont as &$word)
+					foreach ($cont as &$word)
 					{
 						// set blank behind all , and . if words are too long, apply wordwrap afterwards to make sure we get
-						if (strlen($word)>75)
+						if (strlen($word) > 75)
 						{
 							$buff = Api\Html::activate_links($word);
 							if (strlen($buff) == strlen($word)) // no links -> try to break overlong words
 							{
-								if (!(strpos($word,',')===false) && strpos($word,', ')===false) $word = str_replace(',',', ',$word);
-								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false) $word = str_replace('.','. ',$word);
+								if (!(strpos($word, ',') === false) && strpos($word, ', ') === false) $word = str_replace(',', ', ', $word);
+								if (!(strpos($word, '.') === false) && strpos($word, '. ') === false) $word = str_replace('.', '. ', $word);
 								$word = wordwrap($word, 75, ' ', true);
 							}
 						}
-						$ckarray[] =$word;
+						$ckarray[] = $word;
 					}
-					$line = join(' ',$ckarray);
+					$line = join(' ', $ckarray);
 					unset($ckarray);
 					$clarray[] = $line;
 				}
-				$content[$key] = join("\n",$clarray);
+				$content[$key] = join("\n", $clarray);
 				unset($clarray);
 			}
 			if (is_numeric($_REQUEST['cat_id']))
 			{
-				$content['info_cat'] = (int) $_REQUEST['cat_id'];
+				$content['info_cat'] = (int)$_REQUEST['cat_id'];
 			}
 			if (!$content)
 			{
 				$content['info_cat'] = $this->prefs['cat_add_default'];
 			}
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']); // dont allow HTML!
 
-			switch($this->prefs['set_start'])
+			switch ($this->prefs['set_start'])
 			{
-				case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break;
+				case 'date': default: $set_startdate = mktime(0, 0, 0, date('m', $this->bo->user_time_now), date('d', $this->bo->user_time_now), date('Y', $this->bo->user_time_now)); break;
 				case 'datetime':      $set_startdate = $this->bo->user_time_now; break;
 				case 'empty':         $set_startdate = 0; break;
 			}
 			if ((int)$content['info_link_id'] > 0 && !Link::get_link($content['info_link_id']))
 			{
-				$content['info_link_id'] = 0;	// link has been deleted
+				$content['info_link_id'] = 0; // link has been deleted
 				if (!$content['info_custom_link']) $content['info_from'] = '';
 			}
 			if (!$info_id && $action_id && $action == 'sp')    // new SubProject
 			{
-				if (!$this->bo->check_access($action_id,Acl::ADD))
+				if (!$this->bo->check_access($action_id, Acl::ADD))
 				{
-					return $referer ? $this->tmpl->location($referer) : $this->index(0,$action,$action_id);
+					return $referer ? $this->tmpl->location($referer) : $this->index(0, $action, $action_id);
 				}
 			}
 			else
 			{
-				$undelete = $this->bo->check_access($info_id,infolog_bo::ACL_UNDELETE);
+				$undelete = $this->bo->check_access($info_id, infolog_bo::ACL_UNDELETE);
 			}
 			$content['links'] = $content['link_to'] = array(
 				'to_id' => $info_id,
@@ -1974,12 +1970,12 @@ 
 			);
 		}
 		// new call via GET or some actions handled here, as they can happen both ways ($_GET[action] or button/action in GUI)
-		if (!$submit || in_array($action,array('sp','copy','schedule','ical','to_tracker')))
+		if (!$submit || in_array($action, array('sp', 'copy', 'schedule', 'ical', 'to_tracker')))
 		{
 			switch ($action)
 			{
 				case 'schedule':
-					Egw::redirect_link('/index.php',array(
+					Egw::redirect_link('/index.php', array(
 						'menuaction' => 'calendar.calendar_uiforms.edit',
 						'link_app' => 'infolog',
 						'link_id' => $info_id,
@@ -1987,7 +1983,7 @@ 
 					break;
 				case 'ical':
 					$boical = new infolog_ical();
-					$result = $boical->exportVTODO($content,'2.0','PUBLISH',false);
+					$result = $boical->exportVTODO($content, '2.0', 'PUBLISH', false);
 					Api\Header\Content::type('todo.ics', 'text/calendar');
 					echo $result;
 					exit();
@@ -1998,23 +1994,23 @@ 
 					if ($action == 'sp')	// for sub-entries use type or category, like for new entries
 					{
 						if ($type) $content['info_type'] = $type;
-						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int) $_REQUEST['cat_id'];
+						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int)$_REQUEST['cat_id'];
 					}
-					unset($action);	// it get stored in $content and will cause an other copy after [apply]
+					unset($action); // it get stored in $content and will cause an other copy after [apply]
 					break;
 				case 'to_tracker':
-					Egw::redirect_link('/index.php',array(
+					Egw::redirect_link('/index.php', array(
 						'menuaction' => 'tracker.tracker_ui.edit',
 						Link::get_registry('tracker', 'add_app').'[]' => 'infolog',
-						Link::get_registry('tracker','add_id').'[]' => $info_id,
+						Link::get_registry('tracker', 'add_id').'[]' => $info_id,
 					));
 					break;
 				case 'projectmanager':
 					$pm_links = array($action_id);
 				default:	// to allow other apps to participate
 					$content['info_subject'] = Link::title($action, $id);
-					$action_ids = explode(',',$action_id);
-					if(count($action_ids) == 1)
+					$action_ids = explode(',', $action_id);
+					if (count($action_ids) == 1)
 					{
 						$content['info_contact'] = $action.':'.$action_id;
 					}
@@ -2023,11 +2019,11 @@ 
 						Link::link('infolog', $content['link_to']['to_id'], $action, $id);
 
 						// calling "infolog_set" hook for first, in case app wants to set some more values
-						if (!$n && ($set = Api\Hooks::single(array('location'=>'infolog_set','id'=>$action_id),$action)))
+						if (!$n && ($set = Api\Hooks::single(array('location'=>'infolog_set', 'id'=>$action_id), $action)))
 						{
-							foreach((array)$set['link_app'] as $i => $l_app)
+							foreach ((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) Link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id = $set['link_id'][$i])) Link::link('infolog', $content['link_to']['to_id'], $l_app, $l_id);
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -2041,12 +2037,12 @@ 
 					{
 						if (!isset($pm_links))
 						{
-							$pm_links = Link::get_links('infolog',$info_id,'projectmanager');
+							$pm_links = Link::get_links('infolog', $info_id, 'projectmanager');
 						}
-						break;	// normal edit
+						break; // normal edit
 					}
 				case 'new':		// new entry, set some defaults, if not set by infolog_set hook
-					if (empty($content['info_startdate'])) $content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
+					if (empty($content['info_startdate'])) $content['info_startdate'] = (int)$_GET['startdate'] ? (int)$_GET['startdate'] : $set_startdate;
 					if (empty($content['info_priority'])) $content['info_priority'] = 1; // normal
 					$content['info_owner'] = $this->user;
 					if ($type != '' && empty($content['info_type']))
@@ -2071,9 +2067,9 @@ 
 		if ($this->bo->group_owners)
 		{
 			// remove types owned by groups the user has no edit grant (current type is made readonly)
-			foreach($this->bo->group_owners as $type => $group)
+			foreach ($this->bo->group_owners as $type => $group)
 			{
-				if (!($this->bo->grants[$group] & Acl::EDIT))
+				if (!($this->bo->grants[$group]&Acl::EDIT))
 				{
 					if ($type == $content['info_type'])
 					{
@@ -2091,7 +2087,7 @@ 
 			{
 				$content['info_owner'] = $this->bo->group_owners[$content['info_type']];
 				// Dont allow to change the type, if user has no delete rights from the group-owner
-				if ($info_id && !($this->bo->grants[$content['info_owner']] & Acl::DELETE))
+				if ($info_id && !($this->bo->grants[$content['info_owner']]&Acl::DELETE))
 				{
 					//echo "<p>setting type to r/o as user has no delete rights from group #$group</p>\n";
 					$readonlys['info_type'] = true;
@@ -2099,7 +2095,7 @@ 
 				// disable info_access for group-owners
 				$readonlys['info_access'] = true;
 			}
-			elseif($GLOBALS['egw']->accounts->get_type($content['info_owner']) == 'g')
+			elseif ($GLOBALS['egw']->accounts->get_type($content['info_owner']) == 'g')
 			{
 				$content['info_owner'] = $this->user;
 			}
@@ -2111,18 +2107,18 @@ 
 		unset($preserv['links']); unset($preserv['link_to']);
 
 		// for no edit rights or implizit edit of responsible user make all fields readonly, but status and percent
-		if ($info_id && !$this->bo->check_access($info_id,Acl::EDIT) && !$undelete)
+		if ($info_id && !$this->bo->check_access($info_id, Acl::EDIT) && !$undelete)
 		{
-			$readonlys['__ALL__'] = true;	// make all fields not explicitly set readonly
+			$readonlys['__ALL__'] = true; // make all fields not explicitly set readonly
 			if ($this->bo->is_responsible($content))
 			{
-				foreach($this->bo->responsible_edit as $name)
+				foreach ($this->bo->responsible_edit as $name)
 				{
 					$readonlys[$name] = false;
 				}
 				$readonlys['button[edit]'] = $readonlys['button[save]'] = $readonlys['button[apply]'] = $readonlys['no_notifications'] = false;
 			}
-			$readonlys['action'] = $readonlys['button[cancel]'] = false;	// always allowed
+			$readonlys['action'] = $readonlys['button[cancel]'] = false; // always allowed
 		}
 		elseif (!$info_id)
 		{
@@ -2135,16 +2131,16 @@ 
 			$this->tmpl->setElementAttribute('button[save]', 'label', 'Un-Delete');
 		}
 
-		if (!($readonlys['button[delete]'] = !$info_id || !$this->bo->check_access($info_id,Acl::DELETE)))
+		if (!($readonlys['button[delete]'] = !$info_id || !$this->bo->check_access($info_id, Acl::DELETE)))
 		{
-			$content['info_anz_subs'] = $this->bo->anzSubs($info_id);	// to determine js confirmation of delete or not
+			$content['info_anz_subs'] = $this->bo->anzSubs($info_id); // to determine js confirmation of delete or not
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = lang($this->messages[$info_id ? 'edit' : ($action == 'sp' ? 'add_sub' : 'add')]);
 
 		// use a typ-specific template (infolog.edit.xyz), if one exists, otherwise fall back to the generic one
 		if (!$this->tmpl->read('infolog.edit.'.$content['info_type']))
 		{
-			$this->tmpl->read($print ? 'infolog.edit.print':'infolog.edit');
+			$this->tmpl->read($print ? 'infolog.edit.print' : 'infolog.edit');
 		}
 		if ($this->bo->has_customfields($content['info_type']))
 		{
@@ -2156,14 +2152,14 @@ 
 		}
 		if (!isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
 		{
-			$readonlys['tabs']['project'] = true;	// disable the project tab
+			$readonlys['tabs']['project'] = true; // disable the project tab
 		}
 
 		$content['duration_format'] = $this->duration_format;
 		$content['hours_per_workday'] = $this->hours_per_workday;
 		if ($this->prefs['show_id']) $content['info_number'] = $info_id;
 
-		$content['info_anz_subs'] = (int)$content['info_anz_subs'];	// gives javascript error if empty!
+		$content['info_anz_subs'] = (int)$content['info_anz_subs']; // gives javascript error if empty!
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
 		if (!isset($content['pm_id']) && $old_pm_id) $content['pm_id'] = $old_pm_id;
@@ -2181,7 +2177,7 @@ 
 					'Pr' => $this->bo->enums['priority'],
 					'Ow' => 'select-account',
 					//'Ac',	//	info_access: private||public
-					'St' => $this->bo->status[$content['info_type']]+array('deleted' => 'deleted'),
+					'St' => $this->bo->status[$content['info_type']] + array('deleted' => 'deleted'),
 					'Pe' => 'select-percent',
 					'Co' => 'date-time',
 					'st' => 'date-time',
@@ -2198,7 +2194,7 @@ 
 			);
 			$history_stati = array();
 			$tracking = new infolog_tracking($this);
-			foreach($tracking->field2history as $field => $history)
+			foreach ($tracking->field2history as $field => $history)
 			{
 				$history_stati[$history] = $tracking->field2label[$field];
 			}
@@ -2239,15 +2235,15 @@ 
 		//$content['info_des'] = substr($content['info_des'],0,1793);
 		//echo "<p>infolog_ui.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content);
 		//$content['info_cc'] is expected (by the widget) to be an array of emailaddresses, but is stored as comma separated string
-		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))$content['info_cc'] = explode(',',$content['info_cc']);
-		$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserv+array(	// preserved values
+		if (!empty($content['info_cc']) && !is_array($content['info_cc']))$content['info_cc'] = explode(',', $content['info_cc']);
+		$this->tmpl->exec('infolog.infolog_ui.edit', $content, $sel_options, $readonlys, $preserv + array(	// preserved values
 			'info_id'       => $info_id,
 			'action'        => $action,
 			'action_id'     => $action_id,
 			'referer'       => $referer,
 			'no_popup'      => $no_popup,
 			'old_pm_id'     => $old_pm_id,
-		),$no_popup ? 0 : 2);
+		), $no_popup ? 0 : 2);
 	}
 
 	/**
@@ -2258,16 +2254,16 @@ 
 	 * @param array &$content
 	 * @param boolean $create_sub true: create a sub-entry instead of a copy, default false to create a copy
 	 */
-	private function create_copy(array &$content, $create_sub=false)
+	private function create_copy(array &$content, $create_sub = false)
 	{
-		$info_id = $content['info_id'];	// it will be unset by exclude-fields
+		$info_id = $content['info_id']; // it will be unset by exclude-fields
 
 		// empty fields configured to be excluded (also contains id, uid, ...)
 		$exclude_fields = $create_sub ? $this->bo->sub_excludefields : $this->bo->copy_excludefields;
 		foreach ($exclude_fields as $field)
 		{
 			unset($content[$field]);
-			if ($field == 'info_from') unset($content['info_link_id']);	// both together is called contact in UI
+			if ($field == 'info_from') unset($content['info_link_id']); // both together is called contact in UI
 		}
 		if ($create_sub)
 		{
@@ -2276,9 +2272,9 @@ 
 		// no startdate or startdate in the past --> set startdate from pref
 		if (!isset($content['info_startdate']) || $content['info_startdate'] < $this->bo->user_time_now)
 		{
-			switch($this->prefs['set_start'])
+			switch ($this->prefs['set_start'])
 			{
-				case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break;
+				case 'date': default: $set_startdate = mktime(0, 0, 0, date('m', $this->bo->user_time_now), date('d', $this->bo->user_time_now), date('Y', $this->bo->user_time_now)); break;
 				case 'datetime':      $set_startdate = $this->bo->user_time_now; break;
 				case 'empty':         $set_startdate = 0; break;
 			}
@@ -2297,17 +2293,17 @@ 
 		// get a consistent status, percent and date-completed
 		if (!isset($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 		if (!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
-		$content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
+		$content['info_datecompleted'] = $content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
 
 		if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default'];
 
-		if(!is_array($content['link_to'])) $content['link_to'] = array();
+		if (!is_array($content['link_to'])) $content['link_to'] = array();
 		$content['link_to']['to_app'] = 'infolog';
 		$content['link_to']['to_id'] = 0;
 		// Get links to be copied, if not excluded
-		if (!in_array('link_to',$exclude_fields) || !in_array('attachments',$exclude_fields))
+		if (!in_array('link_to', $exclude_fields) || !in_array('attachments', $exclude_fields))
 		{
-			foreach(Link::get_links($content['link_to']['to_app'], $info_id) as $link)
+			foreach (Link::get_links($content['link_to']['to_app'], $info_id) as $link)
 			{
 				if ($link['app'] != Link::VFS_APPNAME && !in_array('link_to', $exclude_fields))
 				{
@@ -2331,19 +2327,19 @@ 
 			if (!isset($content['info_contact']) || empty($content['info_contact']) || $content['info_contact'] === 'copy:')
 			{
 				$linkinfos = Link::get_link($info_link_id);
-				$content['info_contact'] = $linkinfos['link_app1']=='infolog'? $linkinfos['link_app2'].':'.$linkinfos['link_id2']:$linkinfos['link_app1'].':'.$linkinfos['link_id1'];
-				if (stripos($content['info_contact'],'projectmanager')!==false) $content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				$content['info_contact'] = $linkinfos['link_app1'] == 'infolog' ? $linkinfos['link_app2'].':'.$linkinfos['link_id2'] : $linkinfos['link_app1'].':'.$linkinfos['link_id1'];
+				if (stripos($content['info_contact'], 'projectmanager') !== false) $content['pm_id'] = $linkinfos['link_app1'] == 'projectmanager' ? $linkinfos['link_id1'] : $linkinfos['link_id2'];
 			}
 			unset($content['info_link_id']);
 		}
-		$content['info_owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD,0,$this->owner) ? $this->user : $this->owner;
+		$content['info_owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD, 0, $this->owner) ? $this->user : $this->owner;
 
 		if (!empty($content['info_subject']))
 		{
 			if ($create_sub)
 			{
 				$config = Api\Config::read('infolog');
-				$prefix = lang(empty($config['sub_prefix']) ? 'Re:': $config['sub_prefix']);
+				$prefix = lang(empty($config['sub_prefix']) ? 'Re:' : $config['sub_prefix']);
 			}
 			else
 			{
@@ -2353,11 +2349,11 @@ 
 		}
 		if (!$create_sub)
 		{
-			$content['msg'] .= ($content['msg']?"\n":'').lang('Infolog copied - the copy can now be edited');
+			$content['msg'] .= ($content['msg'] ? "\n" : '').lang('Infolog copied - the copy can now be edited');
 		}
 	}
 
-	function icon($cat,$id,$status='')
+	function icon($cat, $id, $status = '')
 	{
 		if (!$status || !($icon = $this->icons[$cat][$id.'_'.$status]))
 		{
@@ -2374,7 +2370,7 @@ 
 				$alt = $id;
 			}
 		}
-		return $icon ? Api\Html::image('infolog',$icon,lang($alt),'border=0') : lang($alt);
+		return $icon ? Api\Html::image('infolog', $icon, lang($alt), 'border=0') : lang($alt);
 	}
 
 	/**
@@ -2424,27 +2420,27 @@ 
 			'info_cc' => 'CC',
 		);
 		// add customfields to field list
-		foreach(Api\Storage\Customfields::get('infolog') as $name => $data)
+		foreach (Api\Storage\Customfields::get('infolog') as $name => $data)
 		{
 			$excludefields['#'.$name] = $data['label'];
 		}
 		$sub_excludefields = $excludefields;
-		unset($sub_excludefields['info_id_parent']);	// always set to parent!
+		unset($sub_excludefields['info_id_parent']); // always set to parent!
 
 		$config = Api\Config::read('infolog');
 
-		if($content)
+		if ($content)
 		{
 			// Save
 			$button = key($content['button']);
-			if($button == 'save' || $button == 'apply')
+			if ($button == 'save' || $button == 'apply')
 			{
-				$this->bo->responsible_edit = array('info_status','info_percent','info_datecompleted');
+				$this->bo->responsible_edit = array('info_status', 'info_percent', 'info_datecompleted');
 
 				if ($content['responsible_edit'])
 				{
-					$extra = array_intersect($content['responsible_edit'],array_keys($fields));
-					$this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit,$extra));
+					$extra = array_intersect($content['responsible_edit'], array_keys($fields));
+					$this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit, $extra));
 				}
 				Api\Config::save_value('copy_excludefields', $content['copy_excludefields'] ? $content['copy_excludefields'] : null, 'infolog');
 				Api\Config::save_value('sub_excludefields', $content['sub_excludefields'] ? $content['sub_excludefields'] : array('*NONE*'), 'infolog');
@@ -2455,12 +2451,12 @@ 
 				Api\Config::save_value('sub_prefix', $content['sub_prefix'], 'infolog');
 
 				// Notifications
-				$notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION];
+				$notifications = & $config[infolog_tracking::CUSTOM_NOTIFICATION];
 				$notifications[$content['notification_type']] = $content['notification'];
-				Api\Config::save_value(infolog_tracking::CUSTOM_NOTIFICATION, $notifications,'infolog');
+				Api\Config::save_value(infolog_tracking::CUSTOM_NOTIFICATION, $notifications, 'infolog');
 			}
 
-			if($button == 'save' || $button == 'cancel')
+			if ($button == 'save' || $button == 'cancel')
 			{
 				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
@@ -2483,7 +2479,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '.lang('Site configuration');
 
 		// Load selected custom notification
-		if(!$content['notification_type'])
+		if (!$content['notification_type'])
 		{
 			$content['notification_type'] = '~global~';
 		}
@@ -2507,7 +2503,7 @@ 
 		);
 		$preserve['notification_old_type'] = $content['notification_type'];
 		$this->tmpl->read('infolog.config');
-		$this->tmpl->exec('infolog.infolog_ui.admin',$content,$sel_options,array(),$preserve);
+		$this->tmpl->exec('infolog.infolog_ui.admin', $content, $sel_options, array(), $preserve);
 	}
 
 	/**
@@ -2516,13 +2512,13 @@ 
 	 * @param array $mailContent = null content of mail
 	 * @return  array
 	 */
-	function mail_import(array $mailContent=null)
+	function mail_import(array $mailContent = null)
 	{
 		// It would get called from compose as a popup with egw_data
 		if (!is_array($mailContent) && ($_GET['egw_data']))
 		{
 			// get the mail raw data
-			Link::get_data ($_GET['egw_data']);
+			Link::get_data($_GET['egw_data']);
 			return false;
 		}
 
@@ -2553,7 +2549,7 @@ 
 	function hook_view($args)
 	{
 		// Load JS for infolog actions
-		Framework::includeJS('.','app','infolog');
+		Framework::includeJS('.', 'app', 'infolog');
 
 		switch ($args['location'])
 		{
@@ -2581,7 +2577,7 @@ 
 		{
 			return False;
 		}
-		$this->called_by = $app;	// for read/save_sessiondata, to have different sessions for the hooks
+		$this->called_by = $app; // for read/save_sessiondata, to have different sessions for the hooks
 
 		// Set to calling app, so actions wind up in the correct place client side
 		$GLOBALS['egw_info']['flags']['currentapp'] = $app;
@@ -2589,11 +2585,11 @@ 
 		Api\Translation::add_app('infolog');
 
 		// Still want infolog Api\Categories though
-		$GLOBALS['egw']->categories = new Api\Categories('','infolog');
-		$this->index(null,$app,$args[$view_id],array(
+		$GLOBALS['egw']->categories = new Api\Categories('', 'infolog');
+		$this->index(null, $app, $args[$view_id], array(
 			'menuaction' => $view,
 			isset($view_id2) ? $view_id2 : $view_id => $args[$view_id]
-		),True);
+		), True);
 	}
 
 	/**
@@ -2602,26 +2598,26 @@ 
 	 * @param string $type infolog type to include only the matching custom fields if set
 	 * @return array
 	 */
-	function csv_export_fields($type=null)
+	function csv_export_fields($type = null)
 	{
 		$fields = array(
 			'info_type'          => lang('Type'),
 			'info_from'          => lang('Contact'),
 			'info_addr'          => lang('Phone/Email'),
 //			'info_link_id'       => lang('primary link'),
-			'info_cat'           => array('label' => lang('Category'),'type' => 'select-cat'),
+			'info_cat'           => array('label' => lang('Category'), 'type' => 'select-cat'),
 			'info_priority'      => lang('Priority'),
-			'info_owner'         => array('label' => lang('Owner'),'type' => 'select-account'),
+			'info_owner'         => array('label' => lang('Owner'), 'type' => 'select-account'),
 			'info_access'        => lang('Access'),
 			'info_status'        => lang('Status'),
 			'info_percent'       => lang('Completed'),
 			'info_datecompleted' => lang('Date completed'),
 			'info_datemodified'  => lang('Last modified'),
-			'info_modifier'      => array('label' => lang('Modifier'),'type' => 'select-account'),
+			'info_modifier'      => array('label' => lang('Modifier'), 'type' => 'select-account'),
 			'info_location'      => lang('Location'),
 			'info_startdate'     => lang('Startdate'),
 			'info_enddate'       => lang('Enddate'),
-			'info_responsible'   => array('label' => lang('Responsible'),'type' => 'select-account'),
+			'info_responsible'   => array('label' => lang('Responsible'), 'type' => 'select-account'),
 			'info_subject'       => lang('Subject'),
 			'info_des'           => lang('Description'),
 			'info_id'            => lang('Id'),
@@ -2631,13 +2627,13 @@ 
 			'pl_id'              => lang('pricelist'),
 			'info_price'         => lang('price'),
 		);
-		foreach($this->bo->timestamps as $name)
+		foreach ($this->bo->timestamps as $name)
 		{
-			$fields[$name] = array('label' => $fields[$name],'type' => 'date-time');
+			$fields[$name] = array('label' => $fields[$name], 'type' => 'date-time');
 		}
-		foreach($this->bo->customfields as $name => $data)
+		foreach ($this->bo->customfields as $name => $data)
 		{
-			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2']))) continue;
+			if ($data['type2'] && $type && !in_array($type, explode(',', $data['type2']))) continue;
 
 			$fields['#'.$name] = array(
 				'label' => $data['label'],

Braces +284 added lines, -71 removed lines

@@ -97,7 +97,10 @@ 
 	 */
 	function __construct()
 	{
-		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') Api\Translation::add_app('infolog');
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog')
+		{
+			Api\Translation::add_app('infolog');
+		}
 
 		// Make sure Global category is infolog - on first load, it may not be
 		if($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
@@ -165,13 +168,19 @@ 
 		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
 		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
 		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
-			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ;
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100)
+		{
+			$done = true ;
+		}
 		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{
 			$info['end_class'] = 'infolog_overdue';
 		}
-		if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
+		if (!isset($info['info_anz_subs']))
+		{
+			$info['info_anz_subs'] = $this->bo->anzSubs($id);
+		}
 		$this->bo->link_id2from($info,$action,$action_id);	// unset from for $action:$action_id
 		$info['info_percent'] = (int) $info['info_percent'].'%';
 		$editrights = $this->bo->check_access($info,Acl::EDIT);
@@ -204,12 +213,21 @@ 
 		{
 			$info['class'] .= 'rowNoSubs ';
 		}
-		if ($info['info_id_parent']) $info['class'] .= 'infolog_rowHasParent ';
-		if ($info['info_anz_subs'] > 0) $info['class'] .= 'infolog_rowHasSubs ';
+		if ($info['info_id_parent'])
+		{
+			$info['class'] .= 'infolog_rowHasParent ';
+		}
+		if ($info['info_anz_subs'] > 0)
+		{
+			$info['class'] .= 'infolog_rowHasSubs ';
+		}
 
 		$info['row_mod'] = $info['info_datemodified'];
 
-		if (!$show_links) $show_links = $this->prefs['show_links'];
+		if (!$show_links)
+		{
+			$show_links = $this->prefs['show_links'];
+		}
 		if (($show_links != 'none' && $show_links != 'no_describtion' ||
 			 $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
 			(isset($info['links']) || ($info['links'] = Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true,true))))
@@ -219,9 +237,16 @@ 
 			{
 				// incl. link modification time into row_mod (link's lastmod is always in server-time!)
 				$link_mod = Api\DateTime::server2user($link['lastmod']);
-				if ($info['row_mod'] < $link_mod) $info['row_mod'] = $link_mod;
+				if ($info['row_mod'] < $link_mod)
+				{
+					$info['row_mod'] = $link_mod;
+				}
 
-				if ($link['deleted']) continue;	// skip deleted links, but incl. them in row_mod!
+				if ($link['deleted'])
+				{
+					continue;
+				}
+				// skip deleted links, but incl. them in row_mod!
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
@@ -234,14 +259,20 @@ 
 				{
 					$info['pm_id'] = $link['id'];
 				}
-				if ($link['app'] == 'timesheet') $timesheets[] = $link['id'];
+				if ($link['app'] == 'timesheet')
+				{
+					$timesheets[] = $link['id'];
+				}
 			}
 			if ($this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet']) && $timesheets)
 			{
 				$sum = ExecMethod('timesheet.timesheet_bo.sum',$timesheets);
 				$info['info_sum_timesheets'] = $sum['duration'];
 				// incl. max timesheet modification in row_mod
-				if ($info['row_mod'] < $sum['max_modified']) $info['row_mod'] = $sum['max_modified'];
+				if ($info['row_mod'] < $sum['max_modified'])
+				{
+					$info['row_mod'] = $sum['max_modified'];
+				}
 			}
 		}
 		$info['info_type_label'] = $this->bo->enums['type'][$info['info_type']];
@@ -256,10 +287,13 @@ 
 			}
 			$readonlys["edit_percent[$id]"] = true;
 		}
-		elseif($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
+		elseif($readonlys["edit_percent[$id]"])
+		{
+			// show percent, but button is switched off
 		{
 			$info['info_percent2'] = $info['info_percent'];
 		}
+		}
 		if ($this->prefs['show_id'] == 1 || $this->prefs['show_id'] == 2 && $details)
 		{
 			$info['info_number'] = $info['info_id'];
@@ -332,10 +366,16 @@ 
 			$query['col_filter'] = array('info_id_parent' => $query['col_filter']['info_id_parent']);
 		}
 		$orginal_colfilter = $query['col_filter'];
-		if (isset($parent_id)) $query['col_filter']['info_id_parent'] = (string)$parent_id;
+		if (isset($parent_id))
+		{
+			$query['col_filter']['info_id_parent'] = (string)$parent_id;
+		}
 
 		//echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])</p>\n";
-		if (!isset($query['start'])) $query['start'] = 0;
+		if (!isset($query['start']))
+		{
+			$query['start'] = 0;
+		}
 
 		// handle action and linked filter (show only entries linked to a certain other entry)
 		$link_filters = array();
@@ -364,7 +404,10 @@ 
 				$app = $link['app'];
 				$id = $link['id'];
 			}
-			if(!is_array($id)) $id = explode(',',$id);
+			if(!is_array($id))
+			{
+				$id = explode(',',$id);
+			}
 			if (!($linked = Link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
 			{
 				$rows = array();	// no infologs linked to selected link --> no rows to return
@@ -413,7 +456,10 @@ 
 			}
 		}
 		// Framework\Template change forces the UI to do a full update first, no point in getting rows right now
-		if($old_template && $old_template != $query['template']) return 0;
+		if($old_template && $old_template != $query['template'])
+		{
+			return 0;
+		}
 
 		// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
 		// so we have to check that as well
@@ -474,12 +520,18 @@ 
 		$parent_first = count($parents) == 1;
 		$parent_index = 0;
 		// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
-		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
+		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id']))
+		{
+			$query['total']++;
+		}
 
 		// Check to see if we need to remove description
 		foreach($infos as $id => $info)
 		{
-			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false)
+			{
+				$info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			}
 			if (!$query['csv_export'] || !is_array($query['csv_export']))
 			{
 				$info['links'] =& $links[$id];
@@ -503,7 +555,10 @@ 
 						{
 							foreach(array_keys($main) as $n)
 							{
-								if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
+								if ($n[0] == '#' && !in_array($n, $columselection))
+								{
+									unset($main[$n]);
+								}
 							}
 							break;
 						}
@@ -520,8 +575,14 @@ 
 		}
 		unset($links);
 
-		if ($query['cat_id']) $rows['no_cat_id'] = true;
-		if ($query['no_actions']) $rows['no_actions'] = true;
+		if ($query['cat_id'])
+		{
+			$rows['no_cat_id'] = true;
+		}
+		if ($query['no_actions'])
+		{
+			$rows['no_actions'] = true;
+		}
 		$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
 		if($clear_status_filter)
 		{
@@ -565,7 +626,11 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $headers);
 		}
 
-		if (isset($linked)) $query['col_filter']['linked'] = $linked;  // add linked back to the colfilter
+		if (isset($linked))
+		{
+			$query['col_filter']['linked'] = $linked;
+		}
+		// add linked back to the colfilter
 
 		return $query['total'];
 	}
@@ -582,7 +647,10 @@ 
 		$set = array();
 		if ((int)$data['id'] && ($info = $this->bo->read($data['id'])))
 		{
-			if ($info['info_cat']) $set['cat_id'] = $info['info_cat'];
+			if ($info['info_cat'])
+			{
+				$set['cat_id'] = $info['info_cat'];
+			}
 
 			foreach(Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true) as $link)
 			{
@@ -620,7 +688,10 @@ 
 			'end'		=> $infolog['info_enddate'] ? $infolog['info_enddate'] : $infolog['info_datecompleted']
 		));
 		unset($event['entry_id']);
-		if (!$event['end']) $event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		if (!$event['end'])
+		{
+			$event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		}
 
 		// Match Api\Categories by name
 		$event['category'] = $GLOBALS['egw']->categories->name2id(Api\Categories::id2name($infolog['info_cat']));
@@ -679,7 +750,10 @@ 
 		// Copy same custom fields
 		foreach(array_keys(Api\Storage\Customfields::get('calendar')) as $name)
 		{
-			if ($this->bo->customfields[$name]) $event['#'.$name] = $infolog['#'.$name];
+			if ($this->bo->customfields[$name])
+			{
+				$event['#'.$name] = $infolog['#'.$name];
+			}
 		}
 		//error_log(__METHOD__.'('.array2string($data).') infolog='.array2string($infolog).' returning '.array2string($event));
 		return $event;
@@ -829,13 +903,19 @@ 
 				$values['nm']['sort'] = 'DESC';
 			}
 
-			if (!$values['nm']['session_for'] && $this->called_by) $values['nm']['session_for'] = $this->called_by;
+			if (!$values['nm']['session_for'] && $this->called_by)
+			{
+				$values['nm']['session_for'] = $this->called_by;
+			}
 
 			$action_id = $values['action_id'] = $action ? $action_id : $nm['action_id'];
 			$action_title = $values['action_title'] = $action ? $action_title : $nm['action_title'];
 			$action = $values['action'] = $action ? $action : $nm['action'];
 		}
-		if($_GET['search']) $values['nm']['search'] = $_GET['search'];
+		if($_GET['search'])
+		{
+			$values['nm']['search'] = $_GET['search'];
+		}
 
 		if ($values['nm']['add'])
 		{
@@ -885,7 +965,10 @@ 
 		switch ($action)
 		{
 			case 'sp':
-				if (!is_array($action_id) && strpos($action_id, 'infolog:') === 0) $action_id = (int)substr($action_id, 8);
+				if (!is_array($action_id) && strpos($action_id, 'infolog:') === 0)
+				{
+					$action_id = (int)substr($action_id, 8);
+				}
 				if ((is_array($action_id) && !$this->bo->read(current($action_id))) || !$this->bo->read($action_id))
 				{
 					$action = '';
@@ -932,7 +1015,10 @@ 
 		// Allow add actions even when there's no rows
 		$values['nm']['placeholder_actions'] = array('new');
 
-		if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		if(!isset($values['nm']['filter2']))
+		{
+			$values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		}
 
 		// disable columns for main entry as set in the pref for details or no details
 		$values['nm']['columnselection_pref'] = 'nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows')
@@ -957,7 +1043,10 @@ 
 		{
 			foreach (array_keys($values['nm']['col_filter']) as $colfk)
 			{
-				if (is_int($colfk)) unset($values['nm']['col_filter']);
+				if (is_int($colfk))
+				{
+					unset($values['nm']['col_filter']);
+				}
 			}
 		}
 		$values['action'] = $persist['action'] = $values['nm']['action'] = $action;
@@ -1000,7 +1089,10 @@ 
 		// does not take implicit rights as delegated into account, so they will not be available as filters
 		foreach($this->bo->group_owners as $type => $group)
 		{
-			if (!isset($this->bo->grants[$group])) unset($sel_options['info_type'][$type]);
+			if (!isset($this->bo->grants[$group]))
+			{
+				unset($sel_options['info_type'][$type]);
+			}
 		}
 
 
@@ -1356,7 +1448,10 @@ 
 				return $failed == 0;
 
 			case 'document':
-				if (!$settings) $settings = $this->prefs['default_document'];
+				if (!$settings)
+				{
+					$settings = $this->prefs['default_document'];
+				}
 				$document_merge = new infolog_merge();
 				$msg = $document_merge->download($settings, $checked, '', $this->prefs['document_dir']);
 				$failed = count($checked);
@@ -1542,11 +1637,16 @@ 
 			#_debug_array($info);
 			$status = $info['info_status'];
 			// closed stati assumed array('done','billed','cancelled')
-			if (isset($this->bo->status[$info['info_type']]['done'])) {
+			if (isset($this->bo->status[$info['info_type']]['done']))
+			{
 				$status ='done';
-			} elseif (isset($this->bo->status[$info['info_type']]['billed'])) {
+			}
+			elseif (isset($this->bo->status[$info['info_type']]['billed']))
+			{
 				$status ='billed';
-			} elseif (isset($this->bo->status[$info['info_type']]['cancelled'])) {
+			}
+			elseif (isset($this->bo->status[$info['info_type']]['cancelled']))
+			{
 				$status ='cancelled';
 			}
 			#_debug_array($status);
@@ -1560,17 +1660,25 @@ 
 			$this->bo->write($values, true,true,true,$skip_notification);
 
 			$query = array('action'=>'sp','action_id'=>$info_id);
-			if (!$closesingle) {
+			if (!$closesingle)
+			{
 				foreach((array)$this->bo->search($query) as $info)
 				{
-					if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
+					if ($info['info_id_parent'] == $info_id)
+					{
+						// search also returns linked entries!
 					{
-						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);	// we call ourselfs recursive to process subs from subs too
+						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);
+					}
+					// we call ourselfs recursive to process subs from subs too
 					}
 				}
 			}
 		}
-		if ($referer) $this->tmpl->location($referer);
+		if ($referer)
+		{
+			$this->tmpl->location($referer);
+		}
 	}
 
 	/**
@@ -1586,10 +1694,13 @@ 
 		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
-		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))	// entries without subs get confirmed by javascript
+		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))
+		{
+			// entries without subs get confirmed by javascript
 		{
 			$values = array('delete' => true);
 		}
+		}
 		//echo "<p>infolog_ui::delete(".print_r($values,true).",'$referer','$called_by') info_id=$info_id</p>\n";
 
 		if (is_array($values) || $info_id <= 0)
@@ -1598,11 +1709,16 @@ 
 			{
 				$deleted = $this->bo->delete($info_id,$values['delete_subs'],$values['info_id_parent'], $skip_notification);
 			}
-			if ($called_by)		// direct call from the same request
+			if ($called_by)
+			{
+				// direct call from the same request
 			{
 				return $deleted ? lang('InfoLog entry deleted') : '';
 			}
-			if ($values['called_by'] == 'edit')	// we run in the edit popup => give control back to edit
+			}
+			if ($values['called_by'] == 'edit')
+			{
+				// we run in the edit popup => give control back to edit
 			{
 				$this->edit(array(
 					'info_id' => $info_id,
@@ -1611,6 +1727,7 @@ 
 					'msg'     => $deleted ? lang('Infolog entry deleted') : '',
 				));
 			}
+			}
 			return $referer ? $this->tmpl->location($referer) : $this->index();
 		}
 		$readonlys = $values = array();
@@ -1659,10 +1776,17 @@ 
 			$no_popup  = $content['no_popup'];  unset($content['no_popup']);
 
 			list($button) = @each($content['button']);
-			if (!$button && $action) $button = $action;	// action selectbox
+			if (!$button && $action)
+			{
+				$button = $action;
+			}
+			// action selectbox
 			//info_cc expects an comma separated string
 			//error_log(__METHOD__.__LINE__.array2string($content));
-			if (empty($content['info_cc'])) $content['info_cc'] = "";
+			if (empty($content['info_cc']))
+			{
+				$content['info_cc'] = "";
+			}
 			if (is_array($content['info_cc']))
 			{
 				foreach($content['info_cc'] as $i => $value)
@@ -1672,7 +1796,10 @@ 
 					//error_log(__METHOD__.__LINE__.$value.'->'.array2string($addresses[0]));
 					$content['info_cc'][$i]=$addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
 				}
-				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',',$content['info_cc']);
+				if (!empty($content['info_cc']))
+				{
+					$content['info_cc'] = implode(',',$content['info_cc']);
+				}
 			}
 			unset($content['button']);
 			if ($button)
@@ -1811,9 +1938,12 @@ 
 						Link::link('infolog',$info_id,$content['link_to']['to_id']);
 						$content['link_to']['to_id'] = $info_id;
 					}
-					if ($info_link_id && strpos($info_link_id,':') !== false)	// updating info_link_id if necessary
+					if ($info_link_id && strpos($info_link_id,':') !== false)
+					{
+						// updating info_link_id if necessary
 					{
 						list($app,$id) = explode(':',$info_link_id);
+					}
 						$link = Link::get_link('infolog',$info_id,$app,$id);
 						if ((int) $content['info_link_id'] != (int) $link['link_id'])
 						{
@@ -1835,12 +1965,19 @@ 
 				}
 				elseif ($button == 'delete' && $info_id > 0)
 				{
-					if (!$referer && $action) $referer = array(
+					if (!$referer && $action)
+					{
+						$referer = array(
 						'menuaction' => 'infolog.infolog_ui.index',
 						'action' => $action,
 						'action_id' => $action_id
 					);
-					if (!($content['msg'] = $this->delete($info_id,$referer,'edit'))) return;	// checks ACL first
+					}
+					if (!($content['msg'] = $this->delete($info_id,$referer,'edit')))
+					{
+						return;
+					}
+					// checks ACL first
 
 					Framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
 				}
@@ -1890,13 +2027,20 @@ 
 			$type      = $type      ? $type      : $_REQUEST['type'];
 			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
 				Api\Header\Referer::get('/index.php?menuaction=infolog.infolog_ui.index'));
-			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);	// remove previou/old msg from referer
+			if (strpos($referer, 'msg=') !== false)
+			{
+				$referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);
+			}
+			// remove previou/old msg from referer
 			$no_popup  = $_GET['no_popup'];
 			$print = (int) $_REQUEST['print'];
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
 
 			$content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id );
-			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
+			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false)
+			{
+				$content['info_addr'] = str_replace(',',', ',$content['info_addr']);
+			}
 			foreach(array('info_subject', 'info_des') as $key)
 			{
 				if(!isset($content[$key]) || strlen($content[$key]) < 75)
@@ -1920,10 +2064,16 @@ 
 						if (strlen($word)>75)
 						{
 							$buff = Api\Html::activate_links($word);
-							if (strlen($buff) == strlen($word)) // no links -> try to break overlong words
+							if (strlen($buff) == strlen($word))
+							{
+								// no links -> try to break overlong words
 							{
 								if (!(strpos($word,',')===false) && strpos($word,', ')===false) $word = str_replace(',',', ',$word);
-								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false) $word = str_replace('.','. ',$word);
+							}
+								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false)
+								{
+									$word = str_replace('.','. ',$word);
+								}
 								$word = wordwrap($word, 75, ' ', true);
 							}
 						}
@@ -1944,7 +2094,11 @@ 
 			{
 				$content['info_cat'] = $this->prefs['cat_add_default'];
 			}
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg'])
+			{
+				$content['msg'] = strip_tags($_GET['msg']);
+			}
+			// dont allow HTML!
 
 			switch($this->prefs['set_start'])
 			{
@@ -1955,13 +2109,19 @@ 
 			if ((int)$content['info_link_id'] > 0 && !Link::get_link($content['info_link_id']))
 			{
 				$content['info_link_id'] = 0;	// link has been deleted
-				if (!$content['info_custom_link']) $content['info_from'] = '';
+				if (!$content['info_custom_link'])
+				{
+					$content['info_from'] = '';
+				}
 			}
-			if (!$info_id && $action_id && $action == 'sp')    // new SubProject
+			if (!$info_id && $action_id && $action == 'sp')
+			{
+				// new SubProject
 			{
 				if (!$this->bo->check_access($action_id,Acl::ADD))
 				{
 					return $referer ? $this->tmpl->location($referer) : $this->index(0,$action,$action_id);
+			}
 				}
 			}
 			else
@@ -1995,10 +2155,16 @@ 
 				case 'copy':
 					$info_id = 0;
 					$this->create_copy($content, $action == 'sp');
-					if ($action == 'sp')	// for sub-entries use type or category, like for new entries
+					if ($action == 'sp')
+					{
+						// for sub-entries use type or category, like for new entries
 					{
 						if ($type) $content['info_type'] = $type;
-						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int) $_REQUEST['cat_id'];
+					}
+						if (is_numeric($_REQUEST['cat_id']))
+						{
+							$content['info_cat'] = (int) $_REQUEST['cat_id'];
+						}
 					}
 					unset($action);	// it get stored in $content and will cause an other copy after [apply]
 					break;
@@ -2027,7 +2193,10 @@ 
 						{
 							foreach((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) Link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id=$set['link_id'][$i]))
+								{
+									Link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								}
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -2046,8 +2215,15 @@ 
 						break;	// normal edit
 					}
 				case 'new':		// new entry, set some defaults, if not set by infolog_set hook
-					if (empty($content['info_startdate'])) $content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
-					if (empty($content['info_priority'])) $content['info_priority'] = 1; // normal
+					if (empty($content['info_startdate']))
+					{
+						$content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
+					}
+					if (empty($content['info_priority']))
+					{
+						$content['info_priority'] = 1;
+					}
+					// normal
 					$content['info_owner'] = $this->user;
 					if ($type != '' && empty($content['info_type']))
 					{
@@ -2057,8 +2233,14 @@ 
 					{
 						$content['info_type'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['preferred_type'];
 					}
-					if (empty($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
-					if (empty($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+					if (empty($content['info_status']))
+					{
+						$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
+					}
+					if (empty($content['info_percent']))
+					{
+						$content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+					}
 					break;
 			}
 			if (!isset($this->bo->enums['type'][$content['info_type']]))
@@ -2161,12 +2343,18 @@ 
 
 		$content['duration_format'] = $this->duration_format;
 		$content['hours_per_workday'] = $this->hours_per_workday;
-		if ($this->prefs['show_id']) $content['info_number'] = $info_id;
+		if ($this->prefs['show_id'])
+		{
+			$content['info_number'] = $info_id;
+		}
 
 		$content['info_anz_subs'] = (int)$content['info_anz_subs'];	// gives javascript error if empty!
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
-		if (!isset($content['pm_id']) && $old_pm_id) $content['pm_id'] = $old_pm_id;
+		if (!isset($content['pm_id']) && $old_pm_id)
+		{
+			$content['pm_id'] = $old_pm_id;
+		}
 
 		if ($info_id && $this->bo->history)
 		{
@@ -2239,7 +2427,10 @@ 
 		//$content['info_des'] = substr($content['info_des'],0,1793);
 		//echo "<p>infolog_ui.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content);
 		//$content['info_cc'] is expected (by the widget) to be an array of emailaddresses, but is stored as comma separated string
-		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))$content['info_cc'] = explode(',',$content['info_cc']);
+		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))
+		{
+			$content['info_cc'] = explode(',',$content['info_cc']);
+		}
 		$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserv+array(	// preserved values
 			'info_id'       => $info_id,
 			'action'        => $action,
@@ -2267,7 +2458,11 @@ 
 		foreach ($exclude_fields as $field)
 		{
 			unset($content[$field]);
-			if ($field == 'info_from') unset($content['info_link_id']);	// both together is called contact in UI
+			if ($field == 'info_from')
+			{
+				unset($content['info_link_id']);
+			}
+			// both together is called contact in UI
 		}
 		if ($create_sub)
 		{
@@ -2295,13 +2490,25 @@ 
 			$content['info_type'] = $types[0];
 		}
 		// get a consistent status, percent and date-completed
-		if (!isset($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
-		if (!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+		if (!isset($content['info_status']))
+		{
+			$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
+		}
+		if (!isset($content['info_percent']))
+		{
+			$content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+		}
 		$content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
 
-		if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default'];
+		if (!isset($content['info_cat']))
+		{
+			$content['info_cat'] = $this->prefs['cat_add_default'];
+		}
 
-		if(!is_array($content['link_to'])) $content['link_to'] = array();
+		if(!is_array($content['link_to']))
+		{
+			$content['link_to'] = array();
+		}
 		$content['link_to']['to_app'] = 'infolog';
 		$content['link_to']['to_id'] = 0;
 		// Get links to be copied, if not excluded
@@ -2332,7 +2539,10 @@ 
 			{
 				$linkinfos = Link::get_link($info_link_id);
 				$content['info_contact'] = $linkinfos['link_app1']=='infolog'? $linkinfos['link_app2'].':'.$linkinfos['link_id2']:$linkinfos['link_app1'].':'.$linkinfos['link_id1'];
-				if (stripos($content['info_contact'],'projectmanager')!==false) $content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				if (stripos($content['info_contact'],'projectmanager')!==false)
+				{
+					$content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				}
 			}
 			unset($content['info_link_id']);
 		}
@@ -2637,7 +2847,10 @@ 
 		}
 		foreach($this->bo->customfields as $name => $data)
 		{
-			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2']))) continue;
+			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2'])))
+			{
+				continue;
+			}
 
 			$fields['#'.$name] = array(
 				'label' => $data['label'],

json.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * callback if the session-check fails, redirects to login.php, if no valid basic auth credentials given
  *
  * @param array &$anon_account anon account_info with keys 'login', 'passwd' and optional 'passwd_type'
- * @return boolean|string true if we allow anon access and anon_account is set, a sessionid or false otherwise
+ * @return string|null true if we allow anon access and anon_account is set, a sessionid or false otherwise
  */
 function login_redirect(&$anon_account)
 {

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		return $session_id;
 	}
-	Json\Request::isJSONRequest(true);	// because Api\Json\Request::parseRequest() is not (yet) called
+	Json\Request::isJSONRequest(true); // because Api\Json\Request::parseRequest() is not (yet) called
 	$response = Json\Response::get();
 	$response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10', true);
 
@@ -53,7 +53,7 @@ 
 	$message = null;
 	if (function_exists('_egw_log_exception'))
 	{
-		_egw_log_exception($e,$message);
+		_egw_log_exception($e, $message);
 	}
 	$response = Json\Response::get();
 	$message .= ($message ? "\n\n" : '').$e->getMessage();
@@ -73,9 +73,9 @@ 
 
 if (isset($_GET['menuaction']))
 {
-	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)	// static method name app_something::method
+	if (strpos($_GET['menuaction'], '::') !== false && strpos($_GET['menuaction'], '.') === false)	// static method name app_something::method
 	{
-		@list($className,$functionName,$handler) = explode('::',$_GET['menuaction']);
+		@list($className, $functionName, $handler) = explode('::', $_GET['menuaction']);
 
 		if (substr($className, 0, 11) == 'EGroupware\\')
 		{
@@ -83,12 +83,12 @@ 
 		}
 		else
 		{
-			list($appName) = explode('_',$className);
+			list($appName) = explode('_', $className);
 		}
 	}
 	else
 	{
-		@list($appName, $className, $functionName, $handler) = explode('.',$_GET['menuaction']);
+		@list($appName, $className, $functionName, $handler) = explode('.', $_GET['menuaction']);
 	}
 	//error_log("json.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler");
 
@@ -98,7 +98,7 @@ 
 			'noheader'		=> True,
 			'disable_Template_class'	=> True,
 			'autocreate_session_callback' => 'login_redirect',
-			'no_exception_handler' => true,	// we already installed our own
+			'no_exception_handler' => true, // we already installed our own
 			// only log ajax requests which represent former GET requests or submits
 			// cuts down updates to egw_access_log table
 			'no_dla_update' => !preg_match('/(Etemplate::ajax_process_content|\.jdots_framework\.ajax_exec\.template)$/', $_GET['menuaction']),
@@ -113,7 +113,7 @@ 
 	//Check whether the request data is set
 	if (isset($GLOBALS['egw_unset_vars']['_POST[json_data]']))
 	{
-		$json->isJSONRequest(true);	// otherwise exception is not send back to client, as we have not yet called parseRequest()
+		$json->isJSONRequest(true); // otherwise exception is not send back to client, as we have not yet called parseRequest()
 		throw new Json\Exception\ScriptTags("JSON Data contains script tags. Aborting...");
 	}
 	$json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']);
@@ -121,4 +121,4 @@ 
 	exit();
 }
 
-throw new Json\Exception($_SERVER['PHP_SELF'] . ' Invalid AJAX JSON Request');
+throw new Json\Exception($_SERVER['PHP_SELF'].' Invalid AJAX JSON Request');

Braces +4 added lines, -1 removed lines

@@ -73,9 +73,12 @@
 
 if (isset($_GET['menuaction']))
 {
-	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)	// static method name app_something::method
+	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)
+	{
+		// static method name app_something::method
 	{
 		@list($className,$functionName,$handler) = explode('::',$_GET['menuaction']);
+	}
 
 		if (substr($className, 0, 11) == 'EGroupware\\')
 		{

mail/inc/class.mail_acl.inc.php

Doc Comments -2 removed lines

@@ -277,8 +277,6 @@
 	 * Update ACL rights of a folder or including subfolders for an account(s)
 	 *
 	 * @param array $content content including the acl rights
-	 * @param Boolean $recursive boolean flag FALSE|TRUE. If it is FALSE, only the folder take in to account, but in case of TRUE
-	 *		the mailbox including all its subfolders will be considered.
 	 * @param string $msg Message
 	 *
 	 */

Spacing +40 added lines, -40 removed lines

@@ -33,12 +33,12 @@ 
 	 *
 	 */
 	var $aclRightsAbbrvs = array(
-		'lrs'		=> array('label'=>'readable','title'=>'Allows a user to read the contents of the mailbox.'),
-		'lprs'		=> array('label'=>'post','title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
-		'ilprs'		=> array('label'=>'append','title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
-		'ilprsw'	=> array('label'=>'write','title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
-		'aeiklprstwx'=> array('label'=>'all','title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
-		'custom'	=> array('label'=>'custom','title'=>'User defined combination of rights for the ACL'),
+		'lrs'		=> array('label'=>'readable', 'title'=>'Allows a user to read the contents of the mailbox.'),
+		'lprs'		=> array('label'=>'post', 'title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
+		'ilprs'		=> array('label'=>'append', 'title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
+		'ilprsw'	=> array('label'=>'write', 'title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
+		'aeiklprstwx'=> array('label'=>'all', 'title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
+		'custom'	=> array('label'=>'custom', 'title'=>'User defined combination of rights for the ACL'),
 	);
 
 	/**
@@ -61,12 +61,12 @@ 
 	 * @param array $msg = ''
 	 *
 	 */
-	function edit(array $content=null ,$msg='')
+	function edit(array $content = null, $msg = '')
 	{
 		$tmpl = new Etemplate('mail.acl');
 		if (!is_array($content))
 		{
-			$acc_id = $_GET['acc_id']?$_GET['acc_id']:$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			$acc_id = $_GET['acc_id'] ? $_GET['acc_id'] : $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 			if (isset($_GET['account_id']) && !isset($GLOBALS['egw_info']['user']['apps']['admin']))
 			{
 				Framework::window_close(lang('Permission denied'));
@@ -81,7 +81,7 @@ 
 		$account = Mail\Account::read($acc_id, $account_id);
 		$this->imap = $account->imapServer(isset($account_id) ? (int)$account_id : false);
 
-		$mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']): $content['mailbox'][0];
+		$mailbox = $_GET['mailbox'] ? base64_decode($_GET['mailbox']) : $content['mailbox'][0];
 		if (empty($mailbox))
 		{
 			$mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($this->imap->isAdminConnection) : 'INBOX';
@@ -111,14 +111,14 @@ 
 
 					foreach ($rights as $right)
 					{
-						$content['grid'][$n]['acl_'. $right] = true;
+						$content['grid'][$n]['acl_'.$right] = true;
 					}
-					$virtualD = array('e','t');
-					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'],array_intersect($rights,$virtuals['c']))? false: true; //c=kx more information rfc4314, Obsolote Rights
-					$content['grid'][$n]['acl_d'] = array_diff($virtualD,array_intersect($rights,$virtuals['d']))? false: true; //d=et more information rfc4314, Obsolote Rights
+					$virtualD = array('e', 't');
+					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'], array_intersect($rights, $virtuals['c'])) ? false : true; //c=kx more information rfc4314, Obsolote Rights
+					$content['grid'][$n]['acl_d'] = array_diff($virtualD, array_intersect($rights, $virtuals['d'])) ? false : true; //d=et more information rfc4314, Obsolote Rights
 
 					sort($rights);
-					$acl_abbrvs = implode('',$rights);
+					$acl_abbrvs = implode('', $rights);
 
 					if (array_key_exists($acl_abbrvs, $this->aclRightsAbbrvs))
 					{
@@ -159,7 +159,7 @@ 
 				case 'apply':
 					if ($content)
 					{
-						$validation_err = $this->update_acl($content,$msg);
+						$validation_err = $this->update_acl($content, $msg);
 						if ($validation_err)
 						{
 							foreach ($validation_err as &$row)
@@ -193,7 +193,7 @@ 
 					}
 					else
 					{
-						error_log(__METHOD__.__LINE__. "()" . "The remove_acl suppose to return an array back, something is wrong there");
+						error_log(__METHOD__.__LINE__."()"."The remove_acl suppose to return an array back, something is wrong there");
 					}
 					Framework::message($msg);
 			}
@@ -202,7 +202,7 @@ 
 		$sel_options['acl'] = $this->aclRightsAbbrvs;
 
 		//Make the account owner's fields all readonly as owner has all rights and should not be able to change them
-		foreach($content['grid'] as $key => $fields)
+		foreach ($content['grid'] as $key => $fields)
 		{
 			if ($fields['acc_id'] == $this->imap->acc_imap_username ||
 					$fields['acc_id'][0] == $this->imap->acc_imap_username)
@@ -235,7 +235,7 @@ 
 			));
 		}
 
-		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv,2);
+		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 		$mailbox = $imap->isAdminConnection ? $imap->getUserMailboxString($imap->isAdminConnection) : 'INBOX';
 
 		$folders = array();
-		foreach(self::getSubfolders($mailbox, $imap) as $folder)
+		foreach (self::getSubfolders($mailbox, $imap) as $folder)
 		{
 			if (stripos($folder, $_GET['query']) !== false)
 			{
@@ -282,7 +282,7 @@ 
 	 * @param string $msg Message
 	 *
 	 */
-	function update_acl ($content, &$msg)
+	function update_acl($content, &$msg)
 	{
 		$validator = array();
 
@@ -298,14 +298,14 @@ 
 			{
 				if ($value[$key] == true)
 				{
-					$right = explode("acl_" ,$key);
+					$right = explode("acl_", $key);
 					if ($right[1] === 'c') $right[1] = 'kx'; // c = kx , rfc 4314
 					if ($right[1] === 'd') $right[1] = 'et'; // d = et , rfc 4314
-					$options['rights'] .=  $right[1];
+					$options['rights'] .= $right[1];
 				}
 			}
 			$username = $content['grid'][$keys]['acc_id'] == $this->imap->acc_imap_username
-				?$content['grid'][$keys]['acc_id']:$content['grid'][$keys]['acc_id'][0];
+				? $content['grid'][$keys]['acc_id'] : $content['grid'][$keys]['acc_id'][0];
 			//error_log(__METHOD__."(".__LINE__.") setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
 			if (is_numeric($username) && ($u = $this->imap->getMailBoxUserName($username)))
 			{
@@ -314,7 +314,7 @@ 
 			if (!empty($username))
 			{
 				//error_log(__METHOD__."() setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
-				if (($ret=$this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
+				if (($ret = $this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
 				{
 					$msg = lang("The Folder %1 's ACLs saved", $content['mailbox']);
 
@@ -326,7 +326,7 @@ 
 			}
 			else
 			{
-				if($keys !== count($content['grid']))
+				if ($keys !== count($content['grid']))
 				{
 					array_push($validator, $keys);
 					$msg = lang("Error:Could not save the ACL! Because some names are empty!");
@@ -343,7 +343,7 @@ 
 	 * Retrive Folder ACL rights
 	 * @todo rights 'c' and 'd' should be fixed
 	 */
-	function retrive_acl ($mailbox, &$msg)
+	function retrive_acl($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
 		 {
@@ -368,7 +368,7 @@ 
 	 */
 	function remove_acl($content, &$msg)
 	{
-		$row_num = array_keys($content['grid']['delete'],"pressed");
+		$row_num = array_keys($content['grid']['delete'], "pressed");
 		if ($row_num) $row_num = $row_num[0];
 		$recursive = $content['grid'][$row_num]['acl_recursive'];
 		$identifier = $content['grid'][$row_num]['acc_id'][0];
@@ -378,24 +378,24 @@ 
 			$identifier = $u;
 		}
 		//error_log(__METHOD__.__LINE__."(".$content['mailbox'].", ".$identifier.", ".$recursive.")");
-		if(($res = $this->deleteACL($content['mailbox'], $identifier,$recursive)))
+		if (($res = $this->deleteACL($content['mailbox'], $identifier, $recursive)))
 		{
 			unset($content['grid'][$row_num]);
 			unset($content['grid']['delete']);
 			if ($recursive)
 			{
-				$msg = lang("The %1 's acl, including its subfolders, removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl, including its subfolders, removed from the %2", $content['mailbox'], $identifier);
 			}
 			else
 			{
-				$msg = lang("The %1 's acl removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl removed from the %2", $content['mailbox'], $identifier);
 			}
 
 			return array_combine(range(1, count($content['grid'])), array_values($content['grid']));
 		}
 		else
 		{
-			$msg = lang("An error happend while trying to remove ACL rights from the account %1!",$identifier);
+			$msg = lang("An error happend while trying to remove ACL rights from the account %1!", $identifier);
 			return false;
 		}
 	}
@@ -410,7 +410,7 @@ 
 	 *
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success
 	 */
-	function deleteACL ($mailbox, $identifier, $recursive)
+	function deleteACL($mailbox, $identifier, $recursive)
 	{
 		if ($recursive)
 		{
@@ -420,7 +420,7 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
@@ -428,7 +428,7 @@ 
 			}
 			catch (Exception $e)
 			{
-				error_log(__METHOD__. "Could not delete ACL rights of folder " . $mailbox . " for account ". $identifier ." because of " .$e->getMessage());
+				error_log(__METHOD__."Could not delete ACL rights of folder ".$mailbox." for account ".$identifier." because of ".$e->getMessage());
 				return false;
 			}
 		}
@@ -471,7 +471,7 @@ 
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success,
 	 *
 	 */
-	function setACL($mailbox, $identifier,$options, $recursive, &$msg)
+	function setACL($mailbox, $identifier, $options, $recursive, &$msg)
 	{
 		if ($recursive)
 		{
@@ -481,16 +481,16 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
-				$this->imap->setACL($sbFolders,$identifier,$options);
+				$this->imap->setACL($sbFolders, $identifier, $options);
 			}
 			catch (Exception $e)
 			{
 				$msg = $e->getMessage();
-				error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . " because of " .$e->getMessage());
+				error_log(__METHOD__."Could not set ACL rights on folder ".$mailbox." for account ".$identifier." because of ".$e->getMessage());
 				return false;
 			}
 		}
@@ -503,14 +503,14 @@ 
 	 * @param String $mailbox folder name that needs to be read
 	 * @return Boolean FALSE in case of any exceptions and if TRUE in case of success,
 	 */
-	function getACL ($mailbox)
+	function getACL($mailbox)
 	{
 		try
 		{
 			$acl = $this->imap->getACL($mailbox);
 			return $acl;
 		} catch (Exception $e) {
-			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage());
+			error_log(__METHOD__."Could not get ACL rights from folder ".$mailbox." because of ".$e->getMessage());
 			return false;
 		}
 	}

Braces +32 added lines, -9 removed lines

@@ -95,7 +95,10 @@ 
 			//Todo: Implement autocomplete_url function with admin stuffs consideration
 		}
 		// Unset the content if folder is changed, in order to read acl rights for new selected folder
-		if (!is_array($content['button']) && is_array($content['mailbox']) && !is_array($content['grid']['delete'])) unset($content);
+		if (!is_array($content['button']) && is_array($content['mailbox']) && !is_array($content['grid']['delete']))
+		{
+			unset($content);
+		}
 
 		if (!is_array($content))
 		{
@@ -170,7 +173,9 @@ 
 
 						//Add new row at the end
 						if ($content['grid'][count($content['grid'])]['acc_id'])
-							array_push($content['grid'], array('acc_id'=>''));
+						{
+													array_push($content['grid'], array('acc_id'=>''));
+						}
 					}
 					else
 					{
@@ -178,7 +183,10 @@ 
 					}
 					//Send message
 					Framework::message($msg);
-					if ($button == "apply") break;
+					if ($button == "apply")
+					{
+						break;
+					}
 
 				//Fall through
 				case 'cancel':
@@ -299,8 +307,16 @@ 
 				if ($value[$key] == true)
 				{
 					$right = explode("acl_" ,$key);
-					if ($right[1] === 'c') $right[1] = 'kx'; // c = kx , rfc 4314
-					if ($right[1] === 'd') $right[1] = 'et'; // d = et , rfc 4314
+					if ($right[1] === 'c')
+					{
+						$right[1] = 'kx';
+					}
+					// c = kx , rfc 4314
+					if ($right[1] === 'd')
+					{
+						$right[1] = 'et';
+					}
+					// d = et , rfc 4314
 					$options['rights'] .=  $right[1];
 				}
 			}
@@ -346,7 +362,7 @@ 
 	function retrive_acl ($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
-		 {
+		{
 			$msg = lang('ACL rights retrived successfully');
 			return $acl;
 		 }
@@ -369,10 +385,16 @@ 
 	function remove_acl($content, &$msg)
 	{
 		$row_num = array_keys($content['grid']['delete'],"pressed");
-		if ($row_num) $row_num = $row_num[0];
+		if ($row_num)
+		{
+			$row_num = $row_num[0];
+		}
 		$recursive = $content['grid'][$row_num]['acl_recursive'];
 		$identifier = $content['grid'][$row_num]['acc_id'][0];
-		if (is_array($content['mailbox'])) $content['mailbox'] = $content['mailbox'][0];
+		if (is_array($content['mailbox']))
+		{
+			$content['mailbox'] = $content['mailbox'][0];
+		}
 		if (is_numeric($identifier) && ($u = $this->imap->getMailBoxUserName($identifier)))
 		{
 			$identifier = $u;
@@ -509,7 +531,8 @@ 
 		{
 			$acl = $this->imap->getACL($mailbox);
 			return $acl;
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage());
 			return false;
 		}

mail/inc/class.mail_compose.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1960,7 +1960,7 @@
 	/**
 	 * Gather the replyData and save it with the session, to be used then
 	 *
-	 * @param $_mode can be:
+	 * @param string $_mode can be:
 	 * 		single: for a reply to one address
 	 * 		all: for a reply to all
 	 * 		forward: inlineforwarding of a message with its attachments

Indentation +4 added lines, -4 removed lines

@@ -2126,11 +2126,11 @@ 
 		} else {
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
-            $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
-                @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
+			$this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
+				@htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
 				$toAddress.$ccAddress.
 				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
-                '-------------------------------------------------'."\r\n \r\n ";
+				'-------------------------------------------------'."\r\n \r\n ";
 			$this->sessionData['mimeType']	= 'plain';
 
 			for($i=0; $i<count($bodyParts); $i++) {
@@ -2968,7 +2968,7 @@ 
 		//error_log(__METHOD__.__LINE__."Number of Folders to move copy the message to:".count($folder));
 		//error_log(__METHOD__.__LINE__.array2string($folder));
 		if ((count($folder) > 0) || (isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
 			$mail_bo = $this->mail_bo;
 			$mail_bo->openConnection();
 			//$mail_bo->reopen($this->sessionData['messageFolder']);

Spacing +598 added lines, -599 removed lines

@@ -24,8 +24,7 @@ 
  */
 class mail_compose
 {
-	var $public_functions = array
-	(
+	var $public_functions = array(
 		'compose'		=> True,
 		'getAttachment'		=> True,
 	);
@@ -34,8 +33,8 @@ 
 	 * class vars for destination, priorities, mimeTypes
 	 */
 	static $destinations = array(
-		'to' 		=> 'to',  // lang('to')
-		'cc'		=> 'cc',  // lang('cc')
+		'to' 		=> 'to', // lang('to')
+		'cc'		=> 'cc', // lang('cc')
 		'bcc'		=> 'bcc', // lang('bcc')
 		'replyto'	=> 'replyto', // lang('replyto')
 		'folder'	=> 'folder'  // lang('folder')
@@ -63,20 +62,20 @@ 
 	 * @var array
 	 */
 	var $mailPreferences;
-	var $attachments;	// Array of attachments
+	var $attachments; // Array of attachments
 	var $displayCharset;
 	var $composeID;
 	var $sessionData;
 
 	function __construct()
 	{
-		$this->displayCharset   = Api\Translation::charset();
+		$this->displayCharset = Api\Translation::charset();
 
 		$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
-		$this->mail_bo	= Mail::getInstance(true,$profileID);
+		$this->mail_bo = Mail::getInstance(true, $profileID);
 		$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $this->mail_bo->profileID;
 
-		$this->mailPreferences	=& $this->mail_bo->mailPreferences;
+		$this->mailPreferences = & $this->mail_bo->mailPreferences;
 		//force the default for the forwarding -> asmail
 		if (!is_array($this->mailPreferences) || empty($this->mailPreferences['message_forwarding']))
 		{
@@ -84,7 +83,7 @@ 
 		}
 		if (is_null(Mail::$mailConfig)) Mail::$mailConfig = Api\Config::read('mail');
 
-		$this->mailPreferences  =& $this->mail_bo->mailPreferences;
+		$this->mailPreferences = & $this->mail_bo->mailPreferences;
 	}
 
 	/**
@@ -94,15 +93,15 @@ 
 	 */
 	function changeProfile($_icServerID)
 	{
-		if ($this->mail_bo->profileID!=$_icServerID)
+		if ($this->mail_bo->profileID != $_icServerID)
 		{
 			if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
-			$this->mail_bo = Mail::getInstance(false,$_icServerID);
+			$this->mail_bo = Mail::getInstance(false, $_icServerID);
 			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
 			// no icServer Object: something failed big time
 			if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config
 			$this->mail_bo->openConnection($this->mail_bo->profileID);
-			$this->mailPreferences  =& $this->mail_bo->mailPreferences;
+			$this->mailPreferences = & $this->mail_bo->mailPreferences;
 		}
 	}
 
@@ -204,7 +203,7 @@ 
 				'children' => array(),
 				'hint' => 'Select the message priority tag',
 			),
-			'save2vfs' => array (
+			'save2vfs' => array(
 				'caption' => 'Save to VFS',
 				'icon' => 'filesave',
 				'group' => ++$group,
@@ -241,7 +240,7 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' ))) {
+				if (!in_array($key, array('send', 'button[saveAsDraft]', 'uploadForCompose'))) {
 					$actions[$key]['toolbarDefault'] = false;
 				}
 			}
@@ -259,7 +258,7 @@ 
 	 * @var boolean $suppressSigOnTop =false
 	 * @var boolean $isReply =false
 	 */
-	function compose(array $_content=null,$msg=null, $_focusElement='to',$suppressSigOnTop=false, $isReply=false)
+	function compose(array $_content = null, $msg = null, $_focusElement = 'to', $suppressSigOnTop = false, $isReply = false)
 	{
 		if ($msg) Framework::message($msg);
 
@@ -280,14 +279,14 @@ 
 		//lang('compose'),lang('from') // needed to be found by translationtools
 		//error_log(__METHOD__.__LINE__.array2string($_REQUEST).function_backtrace());
 		//error_log(__METHOD__.__LINE__.array2string($_content).function_backtrace());
-		$_contentHasSigID = $_content?array_key_exists('mailidentity',(array)$_content):false;
-		$_contentHasMimeType = $_content? array_key_exists('mimeType',(array)$_content):false;
+		$_contentHasSigID = $_content ? array_key_exists('mailidentity', (array)$_content) : false;
+		$_contentHasMimeType = $_content ? array_key_exists('mimeType', (array)$_content) : false;
 		if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id'];
 		if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id'];
 
 		// Process different places we can use as a start for composing an email
 		$actionToProcess = 'compose';
-		if($_GET['from'] && $replyID)
+		if ($_GET['from'] && $replyID)
 		{
 			$_content = array_merge((array)$_content, $this->getComposeFrom(
 				// Parameters needed for fetching appropriate data
@@ -305,10 +304,10 @@ 
 		}
 
 		$composeCache = array();
-		if (isset($_content['composeID'])&&!empty($_content['composeID']))
+		if (isset($_content['composeID']) && !empty($_content['composeID']))
 		{
 			$isFirstLoad = false;
-			$composeCache = Api\Cache::getCache(Api\Cache::SESSION,'mail','composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$_content['composeID'],$callback=null,$callback_params=array(),$expiration=60*60*2);
+			$composeCache = Api\Cache::getCache(Api\Cache::SESSION, 'mail', 'composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$_content['composeID'], $callback = null, $callback_params = array(), $expiration = 60 * 60 * 2);
 			$this->composeID = $_content['composeID'];
 			//error_log(__METHOD__.__LINE__.array2string($composeCache));
 		}
@@ -318,7 +317,7 @@ 
 			// respect that composeasnew may not want that, as we assume there
 			// is some style already set and our initalStyle always adds a span with &nbsp;
 			// and we want to avoid that
-			$isFirstLoad = !($actionToProcess=='composeasnew');//true;
+			$isFirstLoad = !($actionToProcess == 'composeasnew'); //true;
 			$this->composeID = $_content['composeID'] = $this->generateComposeID();
 			if (!is_array($_content))
 			{
@@ -353,7 +352,7 @@ 
 				if (!isset($upload['file'])) $upload['file'] = $upload['tmp_name'];
 				try
 				{
-					$upload['file'] = $upload['tmp_name'] = Mail::checkFileBasics($upload,$this->composeID,false);
+					$upload['file'] = $upload['tmp_name'] = Mail::checkFileBasics($upload, $this->composeID, false);
 				}
 				catch (Api\Exception\WrongUserinput $e)
 				{
@@ -379,12 +378,12 @@ 
 			unset($_content['attachments']['delete']);
 			$attachments = $_content['attachments'];
 			unset($_content['attachments']);
-			foreach($attachments as $i => $att)
+			foreach ($attachments as $i => $att)
 			{
-				$remove=false;
-				foreach(array_keys($toDelete) as $k)
+				$remove = false;
+				foreach (array_keys($toDelete) as $k)
 				{
-					if ($att['tmp_name']==$k) $remove=true;
+					if ($att['tmp_name'] == $k) $remove = true;
 				}
 				if (!$remove) $_content['attachments'][] = $att;
 			}
@@ -392,7 +391,7 @@ 
 		// someone clicked something like send, or saveAsDraft
 		// make sure, we are connected to the correct server for sending and storing the send message
 		$activeProfile = $composeProfile = $this->mail_bo->profileID; // active profile may not be the profile uised in/for compose
-		$activeFolderCache = Api\Cache::getCache(Api\Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
+		$activeFolderCache = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 10);
 		if (!empty($activeFolderCache[$this->mail_bo->profileID]))
 		{
 			//error_log(__METHOD__.__LINE__.' CurrentFolder:'.$activeFolderCache[$this->mail_bo->profileID]);
@@ -400,7 +399,7 @@ 
 		}
 		//error_log(__METHOD__.__LINE__.array2string($_content));
 		if (!empty($_content['serverID']) && $_content['serverID'] != $this->mail_bo->profileID &&
-			($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft']||$_content['button']['saveAsDraftAndPrint'])
+			($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft'] || $_content['button']['saveAsDraftAndPrint'])
 		)
 		{
 			$this->changeProfile($_content['serverID']);
@@ -414,19 +413,19 @@ 
 		{
 			$buttonClicked = $suppressSigOnTop = true;
 			$sendOK = true;
-			$_content['body'] = ($_content['body'] ? $_content['body'] : $_content['mail_'.($_content['mimeType'] == 'html'?'html':'plain').'text']);
+			$_content['body'] = ($_content['body'] ? $_content['body'] : $_content['mail_'.($_content['mimeType'] == 'html' ? 'html' : 'plain').'text']);
 			/*
 			perform some simple checks, before trying to send on:
 			$_content['to'];$_content['cc'];$_content['bcc'];
 			trim($_content['subject']);
 			trim(strip_tags(str_replace('&nbsp;','',$_content['body'])));
 			*/
-			if (strlen(trim(strip_tags(str_replace('&nbsp;','',$_content['body']))))==0 && count($_content['attachments'])==0)
+			if (strlen(trim(strip_tags(str_replace('&nbsp;', '', $_content['body'])))) == 0 && count($_content['attachments']) == 0)
 			{
 				$sendOK = false;
 				$_content['msg'] = $message = lang("no message body supplied");
 			}
-			if ($sendOK && strlen(trim($_content['subject']))==0)
+			if ($sendOK && strlen(trim($_content['subject'])) == 0)
 			{
 				$sendOK = false;
 				$_content['msg'] = $message = lang("no subject supplied");
@@ -441,15 +440,15 @@ 
 				try
 				{
 					$success = $this->send($_content);
-					if ($success==false)
+					if ($success == false)
 					{
-						$sendOK=false;
+						$sendOK = false;
 						$message = $this->errorInfo;
 					}
 					if (!empty($_content['mailidentity']) && $_content['mailidentity'] != $sigPref[$this->mail_bo->profileID])
 					{
-						$sigPref[$this->mail_bo->profileID]=$_content['mailidentity'];
-						$GLOBALS['egw']->preferences->add('mail','LastSignatureIDUsed',$sigPref,'user');
+						$sigPref[$this->mail_bo->profileID] = $_content['mailidentity'];
+						$GLOBALS['egw']->preferences->add('mail', 'LastSignatureIDUsed', $sigPref, 'user');
 						// save prefs
 						$GLOBALS['egw']->preferences->save_repository(true);
 					}
@@ -473,23 +472,23 @@ 
 				if (isset($_content['mode']) && !empty($_content['mode']))
 				{
 					$mode = $_content['mode'];
-					if ($_content['mode']=='forward' && !empty($_content['processedmail_id']))
+					if ($_content['mode'] == 'forward' && !empty($_content['processedmail_id']))
 					{
-						$_content['processedmail_id'] = explode(',',$_content['processedmail_id']);
+						$_content['processedmail_id'] = explode(',', $_content['processedmail_id']);
 						foreach ($_content['processedmail_id'] as $k =>$rowid)
 						{
 							$fhA = mail_ui::splitRowID($rowid);
 							//$this->sessionData['uid'][] = $fhA['msgUID'];
 							//$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
-							$idsForRefresh[] = mail_ui::generateRowID($fhA['profileID'], $fhA['folder'], $fhA['msgUID'], $_prependApp=false);
+							$idsForRefresh[] = mail_ui::generateRowID($fhA['profileID'], $fhA['folder'], $fhA['msgUID'], $_prependApp = false);
 							if (!empty($fhA['folder'])) $workingFolder = $fhA['folder'];
 						}
 					}
-					if ($_content['mode']=='reply' && !empty($_content['processedmail_id']))
+					if ($_content['mode'] == 'reply' && !empty($_content['processedmail_id']))
 					{
 						$rhA = mail_ui::splitRowID($_content['processedmail_id']);
 						//$this->sessionData['uid'] = $rhA['msgUID'];
-						$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp=false);
+						$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp = false);
 						$workingFolder = $rhA['folder'];
 					}
 				}
@@ -497,30 +496,30 @@ 
 				if (empty($idsForRefresh) && !empty($_content['processedmail_id']))
 				{
 					$rhA = mail_ui::splitRowID($_content['processedmail_id']);
-					$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp=false);
+					$idsForRefresh[] = mail_ui::generateRowID($rhA['profileID'], $rhA['folder'], $rhA['msgUID'], $_prependApp = false);
 				}
 				$response = Api\Json\Response::get();
 				if ($activeProfile != $composeProfile)
 				{
 					// we need a message only, when account ids (composeProfile vs. activeProfile) differ
-					$response->call('opener.egw_message',lang('Message send successfully.'));
+					$response->call('opener.egw_message', lang('Message send successfully.'));
 				}
-				elseif ($activeProfile == $composeProfile && ($workingFolder==$activeFolder && $mode != 'compose') || ($this->mail_bo->isSentFolder($workingFolder)||$this->mail_bo->isDraftFolder($workingFolder)))
+				elseif ($activeProfile == $composeProfile && ($workingFolder == $activeFolder && $mode != 'compose') || ($this->mail_bo->isSentFolder($workingFolder) || $this->mail_bo->isDraftFolder($workingFolder)))
 				{
-					if ($this->mail_bo->isSentFolder($workingFolder)||$this->mail_bo->isDraftFolder($workingFolder))
+					if ($this->mail_bo->isSentFolder($workingFolder) || $this->mail_bo->isDraftFolder($workingFolder))
 					{
 						// we may need a refresh when on sent folder or in drafts, as drafted messages will/should be deleted after succeeded send action
-						$response->call('opener.egw_refresh',lang('Message send successfully.'),'mail');
+						$response->call('opener.egw_refresh', lang('Message send successfully.'), 'mail');
 					}
 					else
 					{
 						//error_log(__METHOD__.__LINE__.array2string($idsForRefresh));
-						$response->call('opener.egw_refresh',lang('Message send successfully.'),'mail',$idsForRefresh,'update');
+						$response->call('opener.egw_refresh', lang('Message send successfully.'), 'mail', $idsForRefresh, 'update');
 					}
 				}
 				else
 				{
-					$response->call('opener.egw_message',lang('Message send successfully.'));
+					$response->call('opener.egw_message', lang('Message send successfully.'));
 				}
 				//egw_framework::refresh_opener(lang('Message send successfully.'),'mail');
 				Framework::window_close();
@@ -528,60 +527,60 @@ 
 			if ($sendOK == false)
 			{
 				$response = Api\Json\Response::get();
-				Framework::message(lang('Message send failed: %1',$message),'error');// maybe error is more appropriate
+				Framework::message(lang('Message send failed: %1', $message), 'error'); // maybe error is more appropriate
 				$response->call('app.mail.clearIntevals');
 			}
 		}
 
 		if ($activeProfile != $composeProfile) $this->changeProfile($activeProfile);
 		$insertSigOnTop = false;
-		$content = (is_array($_content)?$_content:array());
+		$content = (is_array($_content) ? $_content : array());
 		if ($_contentHasMimeType)
 		{
 			// mimeType is now a checkbox; convert it here to match expectations
 			// ToDo: match Code to meet checkbox value
-			if ($content['mimeType']==1)
+			if ($content['mimeType'] == 1)
 			{
-				$_content['mimeType'] = $content['mimeType']='html';
+				$_content['mimeType'] = $content['mimeType'] = 'html';
 			}
 			else
 			{
-				$_content['mimeType'] = $content['mimeType']='plain';
+				$_content['mimeType'] = $content['mimeType'] = 'plain';
 			}
 
 		}
 		// user might have switched desired mimetype, so we should convert
-		if ($content['is_html'] && $content['mimeType']=='plain')
+		if ($content['is_html'] && $content['mimeType'] == 'plain')
 		{
 			//error_log(__METHOD__.__LINE__.$content['mail_htmltext']);
 			$suppressSigOnTop = true;
-			if (stripos($content['mail_htmltext'],'<pre>')!==false)
+			if (stripos($content['mail_htmltext'], '<pre>') !== false)
 			{
 				$contentArr = Api\Mail\Html::splithtmlByPRE($content['mail_htmltext']);
 				if (is_array($contentArr))
 				{
 					foreach ($contentArr as $k =>&$elem)
 					{
-						if (stripos($elem,'<pre>')!==false) $elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						if (stripos($elem, '<pre>') !== false) $elem = str_replace(array("\r\n", "\n", "\r"), array("<br>", "<br>", "<br>"), $elem);
 					}
-					$content['mail_htmltext'] = implode('',$contentArr);
+					$content['mail_htmltext'] = implode('', $contentArr);
 				}
 			}
 			$content['mail_htmltext'] = $this->_getCleanHTML($content['mail_htmltext']);
-			$content['mail_htmltext'] = Api\Mail\Html::convertHTMLToText($content['mail_htmltext'],$charset=false,false,true);
+			$content['mail_htmltext'] = Api\Mail\Html::convertHTMLToText($content['mail_htmltext'], $charset = false, false, true);
 
 			$content['body'] = $content['mail_htmltext'];
 			unset($content['mail_htmltext']);
 			$content['is_html'] = false;
 			$content['is_plain'] = true;
 		}
-		if ($content['is_plain'] && $content['mimeType']=='html')
+		if ($content['is_plain'] && $content['mimeType'] == 'html')
 		{
 			// the possible font span should only be applied on first load or on switch plain->html
 			$isFirstLoad = "switchedplaintohtml";
 			//error_log(__METHOD__.__LINE__.$content['mail_plaintext']);
 			$suppressSigOnTop = true;
-			$content['mail_plaintext'] = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$content['mail_plaintext']);
+			$content['mail_plaintext'] = str_replace(array("\r\n", "\n", "\r"), array("<br>", "<br>", "<br>"), $content['mail_plaintext']);
 			//$this->replaceEmailAdresses($content['mail_plaintext']);
 			$content['body'] = $content['mail_plaintext'];
 			unset($content['mail_plaintext']);
@@ -589,14 +588,14 @@ 
 			$content['is_plain'] = false;
 		}
 
-		$content['body'] = ($content['body'] ? $content['body'] : $content['mail_'.($content['mimeType'] == 'html'?'html':'plain').'text']);
+		$content['body'] = ($content['body'] ? $content['body'] : $content['mail_'.($content['mimeType'] == 'html' ? 'html' : 'plain').'text']);
 		unset($_content['body']);
 		unset($_content['mail_htmltext']);
 		unset($_content['mail_plaintext']);
 
 		// form was submitted either by clicking a button or by changing one of the triggering selectboxes
 		// identity and signatureid; this might trigger that the signature in mail body may have to be altered
-		if ( !empty($content['body']) &&
+		if (!empty($content['body']) &&
 			(!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount']) ||
 			(!empty($composeCache['mailidentity']) && !empty($_content['mailidentity']) && $_content['mailidentity'] != $composeCache['mailidentity'])
 		)
@@ -607,7 +606,7 @@ 
 			{
 				$acc = Mail\Account::read($_content['mailaccount']);
 				//error_log(__METHOD__.__LINE__.array2string($acc));
-				$Identities = Mail\Account::read_identity($acc['ident_id'],true);
+				$Identities = Mail\Account::read_identity($acc['ident_id'], true);
 				//error_log(__METHOD__.__LINE__.array2string($Identities));
 				if ($Identities['ident_id'])
 				{
@@ -620,41 +619,41 @@ 
 				}
 			}
 			$_oldSig = $composeCache['mailidentity'];
-			$_signatureid = ($newSig?$newSig:$_content['mailidentity']);
+			$_signatureid = ($newSig ? $newSig : $_content['mailidentity']);
 			$_currentMode = $_content['mimeType'];
 			if ($_oldSig != $_signatureid)
 			{
-				if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				if ($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
 				// prepare signatures, the selected sig may be used on top of the body
 				try
 				{
-					$oldSignature = Mail\Account::read_identity($_oldSig,true);
+					$oldSignature = Mail\Account::read_identity($_oldSig, true);
 					//error_log(__METHOD__.__LINE__.'Old:'.array2string($oldSignature).'#');
 					$oldSigText = $oldSignature['ident_signature'];
 				}
 				catch (Exception $e)
 				{
-					$oldSignature=array();
+					$oldSignature = array();
 					$oldSigText = null;
 				}
 				try
 				{
-					$signature = Mail\Account::read_identity($_signatureid,true);
+					$signature = Mail\Account::read_identity($_signatureid, true);
 					//error_log(__METHOD__.__LINE__.'New:'.array2string($signature).'#');
 					$sigText = $signature['ident_signature'];
 				}
 				catch (Exception $e)
 				{
-					$signature=array();
+					$signature = array();
 					$sigText = null;
 				}
 				//error_log(__METHOD__.'Old:'.$oldSigText.'#');
 				//error_log(__METHOD__.'New:'.$sigText.'#');
 				if ($_currentMode == 'plain')
 				{
-					$oldSigText = $this->convertHTMLToText($oldSigText,true,true);
-					$sigText = $this->convertHTMLToText($sigText,true,true);
-					if($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText);
+					$oldSigText = $this->convertHTMLToText($oldSigText, true, true);
+					$sigText = $this->convertHTMLToText($sigText, true, true);
+					if ($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText);
 				}
 
 				//$oldSigText = Mail::merge($oldSigText,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
@@ -664,22 +663,22 @@ 
 				$_htmlConfig = Mail::$htmLawed_config;
 				Mail::$htmLawed_config['comment'] = 2;
 				Mail::$htmLawed_config['transform_anchor'] = false;
-				$oldSigTextCleaned = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($oldSigText,null,array(),true):$oldSigText));
+				$oldSigTextCleaned = str_replace(array("\r", "\t", "<br />\n", ": "), array("", "", "<br />", ":"), ($_currentMode == 'html' ? html::purify($oldSigText, null, array(), true) : $oldSigText));
 				//error_log(__METHOD__.'Old(clean):'.$oldSigTextCleaned.'#');
 				if ($_currentMode == 'html')
 				{
-					$content['body'] = str_replace("\n",'\n',$content['body']);	// dont know why, but \n screws up preg_replace
+					$content['body'] = str_replace("\n", '\n', $content['body']); // dont know why, but \n screws up preg_replace
 					$styles = Mail::getStyles(array(array('body'=>$content['body'])));
-					if (stripos($content['body'],'style')!==false) Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true); // clean out empty or pagewide style definitions / left over tags
+					if (stripos($content['body'], 'style') !== false) Api\Mail\Html::replaceTagsCompletley($content['body'], 'style', $endtag = '', true); // clean out empty or pagewide style definitions / left over tags
 				}
-				$content['body'] = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($content['body'],Mail::$htmLawed_config,array(),true):$content['body']));
+				$content['body'] = str_replace(array("\r", "\t", "<br />\n", ": "), array("", "", "<br />", ":"), ($_currentMode == 'html' ? html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']));
 				Mail::$htmLawed_config = $_htmlConfig;
 				if ($_currentMode == 'html')
 				{
 					$replaced = null;
-					$content['body'] = preg_replace($reg='|'.preg_quote('<!-- HTMLSIGBEGIN -->','|').'.*'.preg_quote('<!-- HTMLSIGEND -->','|').'|u',
-						$rep='<!-- HTMLSIGBEGIN -->'.$sigText.'<!-- HTMLSIGEND -->', $in=$content['body'], -1, $replaced);
-					$content['body'] = str_replace(array('\n',"\xe2\x80\x93","\xe2\x80\x94","\xe2\x82\xac"),array("\n",'&ndash;','&mdash;','&euro;'),$content['body']);
+					$content['body'] = preg_replace($reg = '|'.preg_quote('<!-- HTMLSIGBEGIN -->', '|').'.*'.preg_quote('<!-- HTMLSIGEND -->', '|').'|u',
+						$rep = '<!-- HTMLSIGBEGIN -->'.$sigText.'<!-- HTMLSIGEND -->', $in = $content['body'], -1, $replaced);
+					$content['body'] = str_replace(array('\n', "\xe2\x80\x93", "\xe2\x80\x94", "\xe2\x82\xac"), array("\n", '&ndash;', '&mdash;', '&euro;'), $content['body']);
 					//error_log(__METHOD__."() preg_replace('$reg', '$rep', '$in', -1)='".$content['body']."', replaced=$replaced");
 					unset($rep, $in);
 					if ($replaced)
@@ -690,32 +689,32 @@ 
 					else
 					{
 						// try the old way
-						$found = (strlen(trim($oldSigTextCleaned))>0?strpos($content['body'],trim($oldSigTextCleaned)):false);
+						$found = (strlen(trim($oldSigTextCleaned)) > 0 ? strpos($content['body'], trim($oldSigTextCleaned)) : false);
 					}
 				}
 				else
 				{
-					$found = (strlen(trim($oldSigTextCleaned))>0?strpos($content['body'],trim($oldSigTextCleaned)):false);
+					$found = (strlen(trim($oldSigTextCleaned)) > 0 ? strpos($content['body'], trim($oldSigTextCleaned)) : false);
 				}
 
-				if ($found !== false && $_oldSig != -2 && !(empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned,true,true)) ==''))
+				if ($found !== false && $_oldSig != -2 && !(empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned, true, true)) == ''))
 				{
 					//error_log(__METHOD__.'Old Content:'.$content['body'].'#');
-					$_oldSigText = preg_quote($oldSigTextCleaned,'~');
+					$_oldSigText = preg_quote($oldSigTextCleaned, '~');
 					//error_log(__METHOD__.'Old(masked):'.$_oldSigText.'#');
-					$content['body'] = preg_replace('~'.$_oldSigText.'~mi',$sigText,$content['body'],1);
+					$content['body'] = preg_replace('~'.$_oldSigText.'~mi', $sigText, $content['body'], 1);
 					//error_log(__METHOD__.'new Content:'.$content['body'].'#');
 				}
 
-				if ($_oldSig == -2 && (empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned,true,true)) ==''))
+				if ($_oldSig == -2 && (empty($oldSigTextCleaned) || trim($this->convertHTMLToText($oldSigTextCleaned, true, true)) == ''))
 				{
 					// if there is no sig selected, there is no way to replace a signature
 				}
 
 				if ($found === false)
 				{
-					if($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
-					if($this->_debug) error_log(__METHOD__." Compare content:".$content['body']);
+					if ($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
+					if ($this->_debug) error_log(__METHOD__." Compare content:".$content['body']);
 				}
 				else
 				{
@@ -734,7 +733,7 @@ 
 		if ($isFirstLoad)
 		{
 			$alwaysAttachVCardAtCompose = false; // we use this to eliminate double attachments, if users VCard is already present/attached
-			if ( isset($GLOBALS['egw_info']['apps']['stylite']) && (isset($this->mailPreferences['attachVCardAtCompose']) &&
+			if (isset($GLOBALS['egw_info']['apps']['stylite']) && (isset($this->mailPreferences['attachVCardAtCompose']) &&
 				$this->mailPreferences['attachVCardAtCompose']))
 			{
 				$alwaysAttachVCardAtCompose = true;
@@ -743,7 +742,7 @@ 
 					$f = $_REQUEST['preset']['file'];
 					$_REQUEST['preset']['file'] = array($f);
 				}
-				$_REQUEST['preset']['file'][] = "vfs://default/apps/addressbook/".$GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')."/.entry";
+				$_REQUEST['preset']['file'][] = "vfs://default/apps/addressbook/".$GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')."/.entry";
 			}
 			// an app passed the request for fetching and mailing an entry
 			if (isset($_REQUEST['app']) && isset($_REQUEST['method']) && isset($_REQUEST['id']))
@@ -752,33 +751,33 @@ 
 				$mt = $_REQUEST['method'];
 				$id = $_REQUEST['id'];
 				// passed method MUST be registered
-				$method = Link::get_registry($app,$mt);
+				$method = Link::get_registry($app, $mt);
 				//error_log(__METHOD__.__LINE__.array2string($method));
 				if ($method)
 				{
-					$res = ExecMethod($method,array($id,'html'));
+					$res = ExecMethod($method, array($id, 'html'));
 					//error_log(__METHOD__.__LINE__.array2string($res));
 					if (!empty($res))
 					{
 						$insertSigOnTop = 'below';
 						if (isset($res['attachments']) && is_array($res['attachments']))
 						{
-							foreach($res['attachments'] as $f)
+							foreach ($res['attachments'] as $f)
 							{
 								$_REQUEST['preset']['file'][] = $f;
 							}
 						}
 						$content['subject'] = lang($app).' #'.$res['id'].': ';
-						foreach(array('subject','body','mimetype') as $name) {
+						foreach (array('subject', 'body', 'mimetype') as $name) {
 							$sName = $name;
-							if ($name=='mimetype'&&$res[$name])
+							if ($name == 'mimetype' && $res[$name])
 							{
 								$sName = 'mimeType';
 								$content[$sName] = $res[$name];
 							}
 							else
 							{
-								if ($res[$name]) $content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								if ($res[$name]) $content[$sName] .= (strlen($content[$sName]) > 0 ? ' ' : '').$res[$name];
 							}
 						}
 					}
@@ -787,45 +786,45 @@ 
 			// handle preset info/values
 			if (is_array($_REQUEST['preset']))
 			{
-				$alreadyProcessed=array();
+				$alreadyProcessed = array();
 				//_debug_array($_REQUEST);
 				if ($_REQUEST['preset']['mailto']) {
 					// handle mailto strings such as
 					// mailto:larry,dan?cc=mike&bcc=sue&subject=test&body=type+your&body=message+here
 					// the above string may be htmlentyty encoded, then multiple body tags are supported
 					// first, strip the mailto: string out of the mailto URL
-					$tmp_send_to = (stripos($_REQUEST['preset']['mailto'],'mailto')===false?$_REQUEST['preset']['mailto']:trim(substr(html_entity_decode($_REQUEST['preset']['mailto']),7)));
+					$tmp_send_to = (stripos($_REQUEST['preset']['mailto'], 'mailto') === false ? $_REQUEST['preset']['mailto'] : trim(substr(html_entity_decode($_REQUEST['preset']['mailto']), 7)));
 					// check if there is more than the to address
-					$mailtoArray = explode('?',$tmp_send_to,2);
+					$mailtoArray = explode('?', $tmp_send_to, 2);
 					if ($mailtoArray[1]) {
 						// check if there are more than one requests
-						$addRequests = explode('&',$mailtoArray[1]);
+						$addRequests = explode('&', $mailtoArray[1]);
 						foreach ($addRequests as $key => $reqval) {
 							// the additional requests should have a =, to separate key from value.
-							$keyValuePair = explode('=',$reqval,2);
-							$content[$keyValuePair[0]] .= (strlen($content[$keyValuePair[0]])>0 ? ' ':'') . $keyValuePair[1];
+							$keyValuePair = explode('=', $reqval, 2);
+							$content[$keyValuePair[0]] .= (strlen($content[$keyValuePair[0]]) > 0 ? ' ' : '').$keyValuePair[1];
 						}
 					}
-					$content['to']=$mailtoArray[0];
-					$alreadyProcessed['to']='to';
+					$content['to'] = $mailtoArray[0];
+					$alreadyProcessed['to'] = 'to';
 					// if the mailto string is not htmlentity decoded the arguments are passed as simple requests
-					foreach(array('cc','bcc','subject','body') as $name) {
-						$alreadyProcessed[$name]=$name;
-						if ($_REQUEST[$name]) $content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+					foreach (array('cc', 'bcc', 'subject', 'body') as $name) {
+						$alreadyProcessed[$name] = $name;
+						if ($_REQUEST[$name]) $content[$name] .= (strlen($content[$name]) > 0 ? ($name == 'cc' || $name == 'bcc' ? ',' : ' ') : '').$_REQUEST[$name];
 					}
 				}
 
 				if ($_REQUEST['preset']['mailtocontactbyid']) {
 					if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
 						$contacts_obj = new Api\Contacts();
-						$addressbookprefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
-						if (method_exists($contacts_obj,'search')) {
+						$addressbookprefs = & $GLOBALS['egw_info']['user']['preferences']['addressbook'];
+						if (method_exists($contacts_obj, 'search')) {
 
-							$addressArray = explode(',',$_REQUEST['preset']['mailtocontactbyid']);
+							$addressArray = explode(',', $_REQUEST['preset']['mailtocontactbyid']);
 							foreach ((array)$addressArray as $id => $addressID)
 							{
-								$addressID = (int) $addressID;
-								if (!($addressID>0))
+								$addressID = (int)$addressID;
+								if (!($addressID > 0))
 								{
 									unset($addressArray[$id]);
 								}
@@ -834,44 +833,44 @@ 
 							{
 								$_searchCond = array('contact_id'=>$addressArray);
 								//error_log(__METHOD__.__LINE__.$_searchString);
-								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
-								$filter = ($showAccounts?array():array('account_id' => null));
-								$filter['cols_to_search']=array('n_fn','email','email_home');
-								$contacts = $contacts_obj->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),$filter);
+								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts = false;
+								$filter = ($showAccounts ? array() : array('account_id' => null));
+								$filter['cols_to_search'] = array('n_fn', 'email', 'email_home');
+								$contacts = $contacts_obj->search($_searchCond, array('n_fn', 'email', 'email_home'), 'n_fn', '', '%', false, 'OR', array(0, 100), $filter);
 								// additionally search the accounts, if the contact storage is not the account storage
 								if ($showAccounts &&
 									$GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 									$GLOBALS['egw_info']['server']['contact_repository'] == 'sql')
 								{
-									$accounts = $contacts_obj->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),array('owner' => 0));
+									$accounts = $contacts_obj->search($_searchCond, array('n_fn', 'email', 'email_home'), 'n_fn', '', '%', false, 'OR', array(0, 100), array('owner' => 0));
 
 									if ($contacts && $accounts)
 									{
-										$contacts = array_merge($contacts,$accounts);
-										usort($contacts,create_function('$a,$b','return strcasecmp($a["n_fn"],$b["n_fn"]);'));
+										$contacts = array_merge($contacts, $accounts);
+										usort($contacts, create_function('$a,$b', 'return strcasecmp($a["n_fn"],$b["n_fn"]);'));
 									}
-									elseif($accounts)
+									elseif ($accounts)
 									{
-										$contacts =& $accounts;
+										$contacts = & $accounts;
 									}
 									unset($accounts);
 								}
 							}
-							if(is_array($contacts)) {
+							if (is_array($contacts)) {
 								$mailtoArray = array();
 								$primary = $addressbookprefs['distributionListPreferredMail'];
 								if ($primary != 'email' && $primary != 'email_home') $primary = 'email';
-								$secondary = ($primary == 'email'?'email_home':'email');
+								$secondary = ($primary == 'email' ? 'email_home' : 'email');
 								//error_log(__METHOD__.__LINE__.array2string($contacts));
-								foreach($contacts as $contact) {
-									$innerCounter=0;
-									foreach(array($contact[$primary],$contact[$secondary]) as $email) {
+								foreach ($contacts as $contact) {
+									$innerCounter = 0;
+									foreach (array($contact[$primary], $contact[$secondary]) as $email) {
 										// use pref distributionListPreferredMail for the primary address
 										// avoid wrong addresses, if an rfc822 encoded address is in addressbook
-										$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
-										$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
-										$completeMailString = addslashes(trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']) .' <'. trim($email) .'>');
-										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false) {
+										$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/", '$2', $email);
+										$contact['n_fn'] = str_replace(array(',', '@'), ' ', $contact['n_fn']);
+										$completeMailString = addslashes(trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']).' <'.trim($email).'>');
+										if ($innerCounter == 0 && !empty($email) && in_array($completeMailString, $mailtoArray) === false) {
 											$i++;
 											$innerCounter++;
 											$mailtoArray[$i] = $completeMailString;
@@ -880,8 +879,8 @@ 
 								}
 							}
 							//error_log(__METHOD__.__LINE__.array2string($mailtoArray));
-							$alreadyProcessed['to']='to';
-							$content['to']=$mailtoArray;
+							$alreadyProcessed['to'] = 'to';
+							$content['to'] = $mailtoArray;
 						}
 					}
 				}
@@ -896,20 +895,20 @@ 
 					$types = (array)$_REQUEST['preset']['type'];
 					//if (!empty($types) && in_array('text/calendar; method=request',$types))
 					$files = (array)$_REQUEST['preset']['file'];
-					foreach($files as $k => $path)
+					foreach ($files as $k => $path)
 					{
-						if (!empty($types[$k]) && stripos($types[$k],'text/calendar')!==false)
+						if (!empty($types[$k]) && stripos($types[$k], 'text/calendar') !== false)
 						{
 							$insertSigOnTop = 'below';
 						}
 						//error_log(__METHOD__.__LINE__.$path.'->'.array2string(parse_url($path,PHP_URL_SCHEME == 'vfs')));
-						if (parse_url($path,PHP_URL_SCHEME == 'vfs'))
+						if (parse_url($path, PHP_URL_SCHEME == 'vfs'))
 						{
 							//Vfs::load_wrapper('vfs');
 							$type = Vfs::mime_content_type($path);
 							// special handling for attaching vCard of iCal --> use their link-title as name
-							if (substr($path,-7) != '/.entry' ||
-								!(list($app,$id) = array_slice(explode('/',$path),-3)) ||
+							if (substr($path, -7) != '/.entry' ||
+								!(list($app, $id) = array_slice(explode('/', $path), -3)) ||
 								!($name = Link::title($app, $id)))
 							{
 								$name = Vfs::decodePath(Vfs::basename($path));
@@ -923,7 +922,7 @@ 
 							{
 								$type = $types[$k];
 							}
-							$path = str_replace('+','%2B',$path);
+							$path = str_replace('+', '%2B', $path);
 							$formData = array(
 								'name' => $name,
 								'type' => $type,
@@ -936,7 +935,7 @@ 
 								Framework::message(lang('Directories have to be shared.'), 'info');
 							}
 						}
-						elseif(is_readable($path))
+						elseif (is_readable($path))
 						{
 							$formData = array(
 								'name' => isset($names[$k]) ? $names[$k] : basename($path),
@@ -949,28 +948,28 @@ 
 						{
 							continue;
 						}
-						$this->addAttachment($formData,$content,($alwaysAttachVCardAtCompose?true:false));
+						$this->addAttachment($formData, $content, ($alwaysAttachVCardAtCompose ? true : false));
 					}
 					$remember = array();
 					if (isset($_REQUEST['preset']['mailto']) || (isset($_REQUEST['app']) && isset($_REQUEST['method']) && isset($_REQUEST['id'])))
 					{
-						foreach(array_keys($content) as $k)
+						foreach (array_keys($content) as $k)
 						{
-							if (in_array($k,array('to','cc','bcc','subject','body','mimeType'))&&isset($this->sessionData[$k]))
+							if (in_array($k, array('to', 'cc', 'bcc', 'subject', 'body', 'mimeType')) && isset($this->sessionData[$k]))
 							{
-								$alreadyProcessed[$k]=$k;
+								$alreadyProcessed[$k] = $k;
 								$remember[$k] = $this->sessionData[$k];
 							}
 						}
 					}
-					if(!empty($remember)) $content = array_merge($content,$remember);
+					if (!empty($remember)) $content = array_merge($content, $remember);
 				}
-				foreach(array('to','cc','bcc','subject','body','mimeType') as $name)
+				foreach (array('to', 'cc', 'bcc', 'subject', 'body', 'mimeType') as $name)
 				{
 					//always handle mimeType
-					if ($name=='mimeType' && $_REQUEST['preset'][$name])
+					if ($name == 'mimeType' && $_REQUEST['preset'][$name])
 					{
-						$_content[$name]=$content[$name]=$_REQUEST['preset'][$name];
+						$_content[$name] = $content[$name] = $_REQUEST['preset'][$name];
 					}
 					//skip if already processed by "preset Routines"
 					if ($alreadyProcessed[$name]) continue;
@@ -983,36 +982,36 @@ 
 			{
 				$content['to'] = base64_decode($_REQUEST['send_to']);
 				// first check if there is a questionmark or ampersand
-				if (strpos($content['to'],'?')!== false) list($content['to'],$rest) = explode('?',$content['to'],2);
+				if (strpos($content['to'], '?') !== false) list($content['to'], $rest) = explode('?', $content['to'], 2);
 				$content['to'] = html_entity_decode($content['to']);
-				if (($at_pos = strpos($content['to'],'@')) !== false)
+				if (($at_pos = strpos($content['to'], '@')) !== false)
 				{
-					if (($amp_pos = strpos(substr($content['to'],$at_pos),'&')) !== false)
+					if (($amp_pos = strpos(substr($content['to'], $at_pos), '&')) !== false)
 					{
 						//list($email,$addoptions) = explode('&',$value,2);
-						$email = substr($content['to'],0,$amp_pos+$at_pos);
-						$rest = substr($content['to'], $amp_pos+$at_pos+1);
+						$email = substr($content['to'], 0, $amp_pos + $at_pos);
+						$rest = substr($content['to'], $amp_pos + $at_pos + 1);
 						//error_log(__METHOD__.__LINE__.$email.' '.$rest);
 						$content['to'] = $email;
 					}
 				}
-				if (strpos($content['to'],'%40')!== false) $content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				if (strpos($content['to'], '%40') !== false) $content['to'] = Api\Html::purify(str_replace('%40', '@', $content['to']));
 				$rarr = array(Api\Html::purify($rest));
-				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false) $rarr = explode('&',$rest);
+				if (isset($rest) && !empty($rest) && strpos($rest, '&') !== false) $rarr = explode('&', $rest);
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($rarr));
 				$karr = array();
 				foreach ($rarr as &$rval)
 				{
 					//must contain =
-					if (strpos($rval,'=')!== false)
+					if (strpos($rval, '=') !== false)
 					{
-						list($k,$v) = explode('=',$rval,2);
+						list($k, $v) = explode('=', $rval, 2);
 						$karr[$k] = (string)$v;
-						unset($k,$v);
+						unset($k, $v);
 					}
 				}
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($karr));
-				foreach(array('cc','bcc','subject','body') as $name)
+				foreach (array('cc', 'bcc', 'subject', 'body') as $name)
 				{
 					if ($karr[$name]) $content[$name] = $karr[$name];
 				}
@@ -1024,17 +1023,17 @@ 
 		if ($isFirstLoad && !empty($_REQUEST['mimeType']))
 		{
 			$_content['mimeType'] = $content['mimeType'];
-			if (($_REQUEST['mimeType']=="text" ||$_REQUEST['mimeType']=="plain") && $content['mimeType'] == 'html')
+			if (($_REQUEST['mimeType'] == "text" || $_REQUEST['mimeType'] == "plain") && $content['mimeType'] == 'html')
 			{
-				$_content['mimeType'] = $content['mimeType']  = 'plain';
-				$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r","\n"),' ',$content['body']));
+				$_content['mimeType'] = $content['mimeType'] = 'plain';
+				$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r", "\n"), ' ', $content['body']));
 			}
-			if ($_REQUEST['mimeType']=="html" && $content['mimeType'] != 'html')
+			if ($_REQUEST['mimeType'] == "html" && $content['mimeType'] != 'html')
 			{
-				$_content['mimeType'] = $content['mimeType']  = 'html';
+				$_content['mimeType'] = $content['mimeType'] = 'html';
 				$content['body'] = "<pre>".$content['body']."</pre>";
 				// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-				if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				if (strpos($content['body'], "<pre> \r\n \r\n---") === 0) $content['body'] = substr_replace($content['body'], " <br>\r\n<pre>---", 0, strlen("<pre> \r\n \r\n---") - 1);
 			}
 		}
 		else
@@ -1042,24 +1041,24 @@ 
 			// try to enforce a mimeType on reply ( if type is not of the wanted type )
 			if ($isReply)
 			{
-				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions']=="text" &&
+				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions'] == "text" &&
 					$content['mimeType'] == 'html')
 				{
-					$_content['mimeType'] = $content['mimeType']  = 'plain';
-					$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r","\n"),' ',$content['body']));
+					$_content['mimeType'] = $content['mimeType'] = 'plain';
+					$content['body'] = $this->convertHTMLToText(str_replace(array("\n\r", "\n"), ' ', $content['body']));
 				}
-				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions']=="html" &&
+				if (!empty($this->mailPreferences['replyOptions']) && $this->mailPreferences['replyOptions'] == "html" &&
 					$content['mimeType'] != 'html')
 				{
-					$_content['mimeType'] = $content['mimeType']  = 'html';
+					$_content['mimeType'] = $content['mimeType'] = 'html';
 					$content['body'] = "<pre>".$content['body']."</pre>";
 					// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-					if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					if (strpos($content['body'], "<pre> \r\n \r\n---") === 0) $content['body'] = substr_replace($content['body'], " <br>\r\n<pre>---", 0, strlen("<pre> \r\n \r\n---") - 1);
 				}
 			}
 		}
 
-		if ($content['mimeType'] == 'html' && Api\Html::htmlarea_availible()===false)
+		if ($content['mimeType'] == 'html' && Api\Html::htmlarea_availible() === false)
 		{
 			$_content['mimeType'] = $content['mimeType'] = 'plain';
 			$content['body'] = $this->convertHTMLToText($content['body']);
@@ -1078,36 +1077,36 @@ 
 		//_debug_array(($presetSig ? $presetSig : $content['mailidentity']));
 		try
 		{
-			$signature = Mail\Account::read_identity($content['mailidentity'] ? $content['mailidentity'] : $presetSig,true);
+			$signature = Mail\Account::read_identity($content['mailidentity'] ? $content['mailidentity'] : $presetSig, true);
 		}
 		catch (Exception $e)
 		{
 			//PROBABLY NOT FOUND
-			$signature=array();
+			$signature = array();
 		}
 		if ((isset($this->mailPreferences['disableRulerForSignatureSeparation']) &&
 			$this->mailPreferences['disableRulerForSignatureSeparation']) ||
-			empty($signature['ident_signature']) || trim($this->convertHTMLToText($signature['ident_signature'],true,true)) =='')
+			empty($signature['ident_signature']) || trim($this->convertHTMLToText($signature['ident_signature'], true, true)) == '')
 		{
 			$disableRuler = true;
 		}
 		$font_span = $font_part = '';
-		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
+		if ($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
 			// User preferences for style
 			$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 			$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
-			$font_part = '<span style="width:100%; display: inline; '.($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">';
+			$font_part = '<span style="width:100%; display: inline; '.($font ? 'font-family:'.$font.'; ' : '').($font_size ? 'font-size:'.$font_size.'; ' : '').'">';
 			$font_span = $font_part.'&#8203;</span>';
 			if (empty($font) && empty($font_size)) $font_span = '';
 		}
 		// the font span should only be applied on first load or on switch plain->html and the absence of the font_part of the span
-		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false) $font_span = '';
+		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'], $font_part) === false) $font_span = '';
 		//remove possible html header stuff
-		if (stripos($content['body'],'<html><head></head><body>')!==false) $content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		if (stripos($content['body'], '<html><head></head><body>') !== false) $content['body'] = str_ireplace(array('<html><head></head><body>', '</body></html>'), array('', ''), $content['body']);
 		//error_log(__METHOD__.__LINE__.array2string($this->mailPreferences));
-		$blockElements = array('address','blockquote','center','del','dir','div','dl','fieldset','form','h1','h2','h3','h4','h5','h6','hr','ins','isindex','menu','noframes','noscript','ol','p','pre','table','ul');
-		if ($this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend' &&
-			!(isset($_POST['mySigID']) && !empty($_POST['mySigID']) ) && !$suppressSigOnTop
+		$blockElements = array('address', 'blockquote', 'center', 'del', 'dir', 'div', 'dl', 'fieldset', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'ins', 'isindex', 'menu', 'noframes', 'noscript', 'ol', 'p', 'pre', 'table', 'ul');
+		if ($this->mailPreferences['insertSignatureAtTopOfMessage'] != 'no_belowaftersend' &&
+			!(isset($_POST['mySigID']) && !empty($_POST['mySigID'])) && !$suppressSigOnTop
 		)
 		{
 			// ON tOP OR BELOW? pREF CAN TELL
@@ -1117,54 +1116,54 @@ 
 						'1' => 'before reply, visible during compose',
 						'no_belowaftersend'  => 'appended after reply before sending',
 			*/
-			$insertSigOnTop = ($insertSigOnTop?$insertSigOnTop:($this->mailPreferences['insertSignatureAtTopOfMessage']?$this->mailPreferences['insertSignatureAtTopOfMessage']:'below'));
-			$sigText = Mail::merge($signature['ident_signature'],array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
+			$insertSigOnTop = ($insertSigOnTop ? $insertSigOnTop : ($this->mailPreferences['insertSignatureAtTopOfMessage'] ? $this->mailPreferences['insertSignatureAtTopOfMessage'] : 'below'));
+			$sigText = Mail::merge($signature['ident_signature'], array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')));
 			if ($content['mimeType'] == 'html')
 			{
-				$sigTextStartsWithBlockElement = ($disableRuler?false:true);
-				foreach($blockElements as $e)
+				$sigTextStartsWithBlockElement = ($disableRuler ? false : true);
+				foreach ($blockElements as $e)
 				{
 					if ($sigTextStartsWithBlockElement) break;
-					if (stripos(trim($sigText),'<'.$e)===0) $sigTextStartsWithBlockElement = true;
+					if (stripos(trim($sigText), '<'.$e) === 0) $sigTextStartsWithBlockElement = true;
 				}
 			}
-			if($content['mimeType'] == 'html') {
+			if ($content['mimeType'] == 'html') {
 				$before = $disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">';
 				$inbetween = '';
 			} else {
-				$before = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
+				$before = ($disableRuler ? "\r\n\r\n" : "\r\n\r\n-- \r\n");
 				$inbetween = "\r\n";
 			}
 			if ($content['mimeType'] == 'html')
 			{
-				$sigText = ($sigTextStartsWithBlockElement?'':"<div>")."<!-- HTMLSIGBEGIN -->".$sigText."<!-- HTMLSIGEND -->".($sigTextStartsWithBlockElement?'':"</div>");
+				$sigText = ($sigTextStartsWithBlockElement ? '' : "<div>")."<!-- HTMLSIGBEGIN -->".$sigText."<!-- HTMLSIGEND -->".($sigTextStartsWithBlockElement ? '' : "</div>");
 			}
 
 			if ($insertSigOnTop === 'below')
 			{
-				$content['body'] = $font_span.$content['body'].$before.($content['mimeType'] == 'html'?$sigText:$this->convertHTMLToText($sigText,true,true));
+				$content['body'] = $font_span.$content['body'].$before.($content['mimeType'] == 'html' ? $sigText : $this->convertHTMLToText($sigText, true, true));
 			}
 			else
 			{
-				$content['body'] = $font_span.$before.($content['mimeType'] == 'html'?$sigText:$this->convertHTMLToText($sigText,true,true)).$inbetween.$content['body'];
+				$content['body'] = $font_span.$before.($content['mimeType'] == 'html' ? $sigText : $this->convertHTMLToText($sigText, true, true)).$inbetween.$content['body'];
 			}
 		}
 		else
 		{
-			$content['body'] = ($font_span?($isFirstLoad === "switchedplaintohtml"?$font_part:$font_span):/*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body'].($isFirstLoad === "switchedplaintohtml"?"</span>":"");
+			$content['body'] = ($font_span ? ($isFirstLoad === "switchedplaintohtml" ? $font_part : $font_span) : /*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body'].($isFirstLoad === "switchedplaintohtml" ? "</span>" : "");
 		}
 		//error_log(__METHOD__.__LINE__.$content['body']);
 
 		// prepare body
 		// in a way, this tests if we are having real utf-8 (the displayCharset) by now; we should if charsets reported (or detected) are correct
-		$content['body'] = Api\Translation::convert_jsonsafe($content['body'],'utf-8');
+		$content['body'] = Api\Translation::convert_jsonsafe($content['body'], 'utf-8');
 		//error_log(__METHOD__.__LINE__.array2string($content));
 
 		// get identities of all accounts as "$acc_id:$ident_id" => $identity
 		$sel_options['mailaccount'] = $identities = array();
-		foreach(Mail\Account::search(true,false) as $acc_id => $account)
+		foreach (Mail\Account::search(true, false) as $acc_id => $account)
 		{
-			foreach($account->identities($acc_id) as $ident_id => $identity)
+			foreach ($account->identities($acc_id) as $ident_id => $identity)
 			{
 				$sel_options['mailaccount'][$acc_id.':'.$ident_id] = $identity;
 				$identities[$ident_id] = $identity;
@@ -1175,7 +1174,7 @@ 
 		//$content['bcc'] = array('kl@stylite.de','kl@leithoff.net');
 		// address stuff like from, to, cc, replyto
 		$destinationRows = 0;
-		foreach(self::$destinations as $destination) {
+		foreach (self::$destinations as $destination) {
 			if (!is_array($content[$destination]))
 			{
 				if (!empty($content[$destination])) $content[$destination] = (array)$content[$destination];
@@ -1183,22 +1182,22 @@ 
 			$addr_content = $content[strtolower($destination)];
 			// we clear the given address array and rebuild it
 			unset($content[strtolower($destination)]);
-			foreach((array)$addr_content as $key => $value) {
-				if ($value=="NIL@NIL") continue;
-				if ($destination=='replyto' && str_replace('"','',$value) ==
-					str_replace('"','',$identities[$this->mail_bo->getDefaultIdentity()]))
+			foreach ((array)$addr_content as $key => $value) {
+				if ($value == "NIL@NIL") continue;
+				if ($destination == 'replyto' && str_replace('"', '', $value) ==
+					str_replace('"', '', $identities[$this->mail_bo->getDefaultIdentity()]))
 				{
 					// preserve/restore the value to content.
-					$content[strtolower($destination)][]=$value;
+					$content[strtolower($destination)][] = $value;
 					continue;
 				}
 				//error_log(__METHOD__.__LINE__.array2string(array('key'=>$key,'value'=>$value)));
-				$value = str_replace("\"\"",'"', htmlspecialchars_decode($value, ENT_COMPAT));
-				foreach(Mail::parseAddressList($value) as $addressObject) {
+				$value = str_replace("\"\"", '"', htmlspecialchars_decode($value, ENT_COMPAT));
+				foreach (Mail::parseAddressList($value) as $addressObject) {
 					if ($addressObject->host == '.SYNTAX-ERROR.') continue;
-					$address = imap_rfc822_write_address($addressObject->mailbox,$addressObject->host,$addressObject->personal);
+					$address = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 					//$address = Mail::htmlentities($address, $this->displayCharset);
-					$content[strtolower($destination)][]=$address;
+					$content[strtolower($destination)][] = $address;
 					$destinationRows++;
 				}
 			}
@@ -1206,10 +1205,10 @@ 
 		if ($_content)
 		{
 			//input array of _content had no signature information but was seeded later, and content has a valid setting
-			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content)) unset($_content['mailidentity']);
-			$content = array_merge($content,$_content);
+			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity', $_content)) unset($_content['mailidentity']);
+			$content = array_merge($content, $_content);
 
-			if (!empty($content['folder'])) $sel_options['folder']=$this->ajax_searchFolder(0,true);
+			if (!empty($content['folder'])) $sel_options['folder'] = $this->ajax_searchFolder(0, true);
 			if (empty($content['mailaccount'])) $content['mailaccount'] = $this->mail_bo->profileID;
 		}
 		else
@@ -1218,12 +1217,12 @@ 
 			$content['mailaccount'] = $this->mail_bo->profileID;
 			//error_log(__METHOD__.__LINE__.$content['body']);
 		}
-		$content['is_html'] = ($content['mimeType'] == 'html'?true:'');
-		$content['is_plain'] = ($content['mimeType'] == 'html'?'':true);
-		$content['mail_'.($content['mimeType'] == 'html'?'html':'plain').'text'] =$content['body'];
-		$content['showtempname']=0;
+		$content['is_html'] = ($content['mimeType'] == 'html' ? true : '');
+		$content['is_plain'] = ($content['mimeType'] == 'html' ? '' : true);
+		$content['mail_'.($content['mimeType'] == 'html' ? 'html' : 'plain').'text'] = $content['body'];
+		$content['showtempname'] = 0;
 		//if (is_array($content['attachments']))error_log(__METHOD__.__LINE__.'before merging content with uploadforCompose:'.array2string($content['attachments']));
-		$content['attachments']=(is_array($content['attachments'])&&is_array($content['uploadForCompose'])?array_merge($content['attachments'],(!empty($content['uploadForCompose'])?$content['uploadForCompose']:array())):(is_array($content['uploadForCompose'])?$content['uploadForCompose']:(is_array($content['attachments'])?$content['attachments']:null)));
+		$content['attachments'] = (is_array($content['attachments']) && is_array($content['uploadForCompose']) ? array_merge($content['attachments'], (!empty($content['uploadForCompose']) ? $content['uploadForCompose'] : array())) : (is_array($content['uploadForCompose']) ? $content['uploadForCompose'] : (is_array($content['attachments']) ? $content['attachments'] : null)));
 		//if (is_array($content['attachments'])) foreach($content['attachments'] as $k => &$file) $file['delete['.$file['tmp_name'].']']=0;
 		$content['no_griddata'] = empty($content['attachments']);
 		$preserv['attachments'] = $content['attachments'];
@@ -1257,12 +1256,12 @@ 
 		$sel_options['mimeType'] = self::$mimeTypes;
 		$sel_options['priority'] = self::$priorities;
 		$sel_options['filemode'] = Vfs\Sharing::$modes;
-		if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3;
+		if (!isset($content['priority']) || empty($content['priority'])) $content['priority'] = 3;
 		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new Etemplate('mail.compose');
 
 		$etpl->setElementAttribute('composeToolbar', 'actions', $this->getToolbarActions($_content));
-		if ($content['mimeType']=='html')
+		if ($content['mimeType'] == 'html')
 		{
 			//mode="$cont[rtfEditorFeatures]" validation_rules="$cont[validation_rules]" base_href="$cont[upload_dir]"
 			$_htmlConfig = Mail::$htmLawed_config;
@@ -1272,23 +1271,23 @@ 
 			// and not the eGroupware wide pref to prevent users from trying things that will potentially not work
 			// or not work as expected, as a full featured editor that may be wanted in other apps
 			// is way overloading the "normal" needs for composing mails
-			$content['rtfEditorFeatures']='simple-withimage';//Api\Html\CkEditorConfig::get_ckeditor_config();
+			$content['rtfEditorFeatures'] = 'simple-withimage'; //Api\Html\CkEditorConfig::get_ckeditor_config();
 			//$content['rtfEditorFeatures']='advanced';//Api\Html\CkEditorConfig::get_ckeditor_config();
-			$content['validation_rules']= json_encode(Mail::$htmLawed_config);
-			$etpl->setElementAttribute('mail_htmltext','mode',$content['rtfEditorFeatures']);
-			$etpl->setElementAttribute('mail_htmltext','validation_rules',$content['validation_rules']);
+			$content['validation_rules'] = json_encode(Mail::$htmLawed_config);
+			$etpl->setElementAttribute('mail_htmltext', 'mode', $content['rtfEditorFeatures']);
+			$etpl->setElementAttribute('mail_htmltext', 'validation_rules', $content['validation_rules']);
 			Mail::$htmLawed_config = $_htmlConfig;
 		}
 
-		if (isset($content['composeID'])&&!empty($content['composeID']))
+		if (isset($content['composeID']) && !empty($content['composeID']))
 		{
 			$composeCache = $content;
 			unset($composeCache['body']);
 			unset($composeCache['mail_htmltext']);
 			unset($composeCache['mail_plaintext']);
-			Api\Cache::setCache(Api\Cache::SESSION,'mail','composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$this->composeID,$composeCache,$expiration=60*60*2);
+			Api\Cache::setCache(Api\Cache::SESSION, 'mail', 'composeCache'.trim($GLOBALS['egw_info']['user']['account_id']).'_'.$this->composeID, $composeCache, $expiration = 60 * 60 * 2);
 		}
-		if (!isset($_content['serverID'])||empty($_content['serverID']))
+		if (!isset($_content['serverID']) || empty($_content['serverID']))
 		{
 			$content['serverID'] = $this->mail_bo->profileID;
 		}
@@ -1304,25 +1303,25 @@ 
 		$preserv['list-id'] = $content['list-id'];
 		$preserv['mode'] = $content['mode'];
 		// convert it back to checkbox expectations
-		if($content['mimeType'] == 'html') {
-			$content['mimeType']=1;
+		if ($content['mimeType'] == 'html') {
+			$content['mimeType'] = 1;
 		} else {
-			$content['mimeType']=0;
+			$content['mimeType'] = 0;
 		}
 		// set the current selected mailaccount as param for folderselection
-		$etpl->setElementAttribute('folder','autocomplete_params',array('mailaccount'=>$content['mailaccount']));
+		$etpl->setElementAttribute('folder', 'autocomplete_params', array('mailaccount'=>$content['mailaccount']));
 		// join again mailaccount and identity
 		$content['mailaccount'] .= ':'.$content['mailidentity'];
 
 		// Resolve distribution list before send content to client
-		foreach(array('to', 'cc', 'bcc', 'replyto')  as $f)
+		foreach (array('to', 'cc', 'bcc', 'replyto')  as $f)
 		{
-			if (is_array($content[$f])) $content[$f]= self::resolveEmailAddressList ($content[$f]);
+			if (is_array($content[$f])) $content[$f] = self::resolveEmailAddressList($content[$f]);
 		}
 
 		$content['to'] = self::resolveEmailAddressList($content['to']);
 		//error_log(__METHOD__.__LINE__.array2string($content));
-		$etpl->exec('mail.mail_compose.compose',$content,$sel_options,array(),$preserv,2);
+		$etpl->exec('mail.mail_compose.compose', $content, $sel_options, array(), $preserv, 2);
 	}
 
 	/**
@@ -1343,9 +1342,9 @@ 
 		$content = array();
 		//error_log(__METHOD__.__LINE__.array2string($mail_id).", $part_id, $from, $_focusElement, $suppressSigOnTop, $isReply");
 		// on forward we may have to support multiple ids
-		if ($from=='forward')
+		if ($from == 'forward')
 		{
-			$replyIds = explode(',',$mail_id);
+			$replyIds = explode(',', $mail_id);
 			$mail_id = $replyIds[0];
 		}
 		$hA = mail_ui::splitRowID($mail_id);
@@ -1357,15 +1356,15 @@ 
 			$this->changeProfile($icServerID);
 		}
 		$icServer = $this->mail_bo->icServer;
-		if (!empty($folder) && !empty($msgUID) )
+		if (!empty($folder) && !empty($msgUID))
 		{
 			// this fill the session data with the values from the original email
-			switch($from)
+			switch ($from)
 			{
 				case 'composefromdraft':
 				case 'composeasnew':
 					$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
-					if ($from =='composefromdraft') $content['mode'] = 'composefromdraft';
+					if ($from == 'composefromdraft') $content['mode'] = 'composefromdraft';
 					$content['processedmail_id'] = $mail_id;
 
 					$_focusElement = 'body';
@@ -1381,7 +1380,7 @@ 
 					$isReply = true;
 					break;
 				case 'forward':
-					$mode  = ($_GET['mode']=='forwardinline'?'inline':'asmail');
+					$mode = ($_GET['mode'] == 'forwardinline' ? 'inline' : 'asmail');
 					// this fill the session data with the values from the original email
 					foreach ($replyIds as &$mail_id)
 					{
@@ -1391,14 +1390,14 @@ 
 						$folder = $hA['folder'];
 						$content = $this->getForwardData($icServer, $folder, $msgUID, $part_id, $mode);
 					}
-					$content['processedmail_id'] = implode(',',$replyIds);
+					$content['processedmail_id'] = implode(',', $replyIds);
 					$content['mode'] = 'forward';
-					$isReply = ($mode?$mode=='inline':$this->mailPreferences['message_forwarding'] == 'inline');
-					$suppressSigOnTop = false;// ($mode && $mode=='inline'?true:false);// may be a better solution
+					$isReply = ($mode ? $mode == 'inline' : $this->mailPreferences['message_forwarding'] == 'inline');
+					$suppressSigOnTop = false; // ($mode && $mode=='inline'?true:false);// may be a better solution
 					$_focusElement = 'to';
 					break;
 				default:
-					error_log('Unhandled compose source: ' . $from);
+					error_log('Unhandled compose source: '.$from);
 			}
 		}
 		else if ($from == 'merge' && $_REQUEST['document'])
@@ -1413,12 +1412,12 @@ 
 			$document_merge = new $merge_class();
 			$this->mail_bo->openConnection();
 			$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
-			if (!is_array($merge_ids)) $merge_ids = explode(',',$merge_ids);
+			if (!is_array($merge_ids)) $merge_ids = explode(',', $merge_ids);
 			try
 			{
 				$merged_mail_id = '';
 				$folder = '';
-				if(($error = $document_merge->check_document($_REQUEST['document'],'')))
+				if (($error = $document_merge->check_document($_REQUEST['document'], '')))
 				{
 					$content['msg'] = $error;
 					return $content;
@@ -1428,10 +1427,10 @@ 
 				//$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
 				// Actually do the merge
-				if(count($merge_ids) <= 1)
+				if (count($merge_ids) <= 1)
 				{
 					$results = $this->mail_bo->importMessageToMergeAndSend(
-						$document_merge, Vfs::PREFIX . $_REQUEST['document'], $merge_ids, $folder, $merged_mail_id
+						$document_merge, Vfs::PREFIX.$_REQUEST['document'], $merge_ids, $folder, $merged_mail_id
 					);
 
 					// Open compose
@@ -1442,9 +1441,9 @@ 
 				}
 				else
 				{
-					$success = implode(', ',$results['success']);
+					$success = implode(', ', $results['success']);
 					$fail = implode(', ', $results['failed']);
-					if($success) Framework::message($success, 'success');
+					if ($success) Framework::message($success, 'success');
 					Framework::window_close($fail);
 				}
 			}
@@ -1472,22 +1471,22 @@ 
 		return 1;
 	}
 
-	function convertHTMLToText(&$_html,$sourceishtml = true, $stripcrl=false)
+	function convertHTMLToText(&$_html, $sourceishtml = true, $stripcrl = false)
 	{
 		$stripalltags = true;
 		// third param is stripalltags, we may not need that, if the source is already in ascii
-		if (!$sourceishtml) $stripalltags=false;
-		return Api\Mail\Html::convertHTMLToText($_html,$this->displayCharset,$stripcrl,$stripalltags);
+		if (!$sourceishtml) $stripalltags = false;
+		return Api\Mail\Html::convertHTMLToText($_html, $this->displayCharset, $stripcrl, $stripalltags);
 	}
 
 	function generateRFC822Address($_addressObject)
 	{
-		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host) {
-			return sprintf('"%s" <%s@%s>', $this->mail_bo->decode_header($_addressObject->personal), $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} elseif($_addressObject->mailbox && $_addressObject->host) {
-			return sprintf("%s@%s", $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
+		if ($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host) {
+			return sprintf('"%s" <%s@%s>', $this->mail_bo->decode_header($_addressObject->personal), $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host, 'FORCE'));
+		} elseif ($_addressObject->mailbox && $_addressObject->host) {
+			return sprintf("%s@%s", $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host, 'FORCE'));
 		} else {
-			return $this->mail_bo->decode_header($_addressObject->mailbox,true);
+			return $this->mail_bo->decode_header($_addressObject->mailbox, true);
 		}
 	}
 
@@ -1502,9 +1501,9 @@ 
 	// $_mode can be:
 	// single: for a reply to one address
 	// all: for a reply to all
-	function getDraftData($_icServer, $_folder, $_uid, $_partID=NULL)
+	function getDraftData($_icServer, $_folder, $_uid, $_partID = NULL)
 	{
-		unset($_icServer);	// not used
+		unset($_icServer); // not used
 		$this->sessionData['to'] = array();
 
 		$mail_bo = $this->mail_bo;
@@ -1513,7 +1512,7 @@ 
 
 		// get message headers for specified message
 		#$headers	= $mail_bo->getMessageHeader($_folder, $_uid);
-		$headers	= $mail_bo->getMessageEnvelope($_uid, $_partID);
+		$headers = $mail_bo->getMessageEnvelope($_uid, $_partID);
 		$addHeadInfo = $mail_bo->getMessageHeader($_uid, $_partID);
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
 		// horde does not support the encoding of thread-topic, and probably will not no so in the future
@@ -1521,10 +1520,10 @@ 
 
 		//error_log(__METHOD__.__LINE__.array2string($headers));
 		if (!empty($addHeadInfo['X-MAILFOLDER'])) {
-			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val ) {
-				$fval=$val;
+			foreach (explode('|', $addHeadInfo['X-MAILFOLDER']) as $val) {
+				$fval = $val;
 				$icServerID = $mail_bo->icServer->ImapServerId;
-				if (stripos($val,'::')!==false) list($icServerID,$fval) = explode('::',$val,2);
+				if (stripos($val, '::') !== false) list($icServerID, $fval) = explode('::', $val, 2);
 				if ($icServerID != $mail_bo->icServer->ImapServerId) continue;
 				if ($mail_bo->folderExists($fval)) $this->sessionData['folder'][] = $val;
 			}
@@ -1560,71 +1559,71 @@ 
 			}
 		}
 		// if the message is located within the draft folder, add it as last drafted version (for possible cleanup on abort))
-		if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);//array('uid'=>$_uid,'folder'=>$_folder);
+		if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid); //array('uid'=>$_uid,'folder'=>$_folder);
 		$this->sessionData['uid'] = $_uid;
 		$this->sessionData['messageFolder'] = $_folder;
 		$this->sessionData['isDraft'] = true;
 		$foundAddresses = array();
-		foreach((array)$headers['CC'] as $val) {
-			$rfcAddr=Mail::parseAddressList($val);
+		foreach ((array)$headers['CC'] as $val) {
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host)) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['cc'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['TO'] as $val) {
-			if(!is_array($val))
+		foreach ((array)$headers['TO'] as $val) {
+			if (!is_array($val))
 			{
 				$this->sessionData['to'][] = $val;
 				continue;
 			}
-			$rfcAddr=Mail::parseAddressList($val);
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host)) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['to'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['REPLY-TO'] as $val) {
-			$rfcAddr=Mail::parseAddressList($val);
+		foreach ((array)$headers['REPLY-TO'] as $val) {
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host))) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['replyto'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['BCC'] as $val) {
-			$rfcAddr=Mail::parseAddressList($val);
+		foreach ((array)$headers['BCC'] as $val) {
+			$rfcAddr = Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
 			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if ($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host))) {
 				continue;
 			}
-			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
-				$address = $this->mail_bo->decode_header($val,true);
+			$keyemail = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
+			if (!$foundAddresses[$keyemail]) {
+				$address = $this->mail_bo->decode_header($val, true);
 				$this->sessionData['bcc'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
@@ -1633,48 +1632,48 @@ 
 		$this->sessionData['subject']	= $mail_bo->decode_header($headers['SUBJECT']);
 		// remove a printview tag if composing
 		$searchfor = '/^\['.lang('printview').':\]/';
-		$this->sessionData['subject'] = preg_replace($searchfor,'',$this->sessionData['subject']);
-		$bodyParts = $mail_bo->getMessageBody($_uid,'always_display', $_partID);
+		$this->sessionData['subject'] = preg_replace($searchfor, '', $this->sessionData['subject']);
+		$bodyParts = $mail_bo->getMessageBody($_uid, 'always_display', $_partID);
 		//_debug_array($bodyParts);
 		#$fromAddress = ($headers['FROM'][0]['PERSONAL_NAME'] != 'NIL') ? $headers['FROM'][0]['RFC822_EMAIL'] : $headers['FROM'][0]['EMAIL'];
-		if($bodyParts['0']['mimeType'] == 'text/html') {
-			$this->sessionData['mimeType'] 	= 'html';
+		if ($bodyParts['0']['mimeType'] == 'text/html') {
+			$this->sessionData['mimeType'] = 'html';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if ($bodyParts[$i]['mimeType'] == 'text/plain') {
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body']);
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
-				$this->sessionData['body'] .= ($i>0?"<br>":""). $bodyParts[$i]['body'] ;
+				$this->sessionData['body'] .= ($i > 0 ? "<br>" : "").$bodyParts[$i]['body'];
 			}
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID);
 
 		} else {
-			$this->sessionData['mimeType']	= 'plain';
+			$this->sessionData['mimeType'] = 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= "<hr>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
-				$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ;
+				$this->sessionData['body'] .= ($i > 0 ? "\r\n" : "").$bodyParts[$i]['body'];
 			}
-			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID,'plain');
+			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'plain');
 		}
 
-		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
-			foreach($attachments as $attachment) {
+		if (($attachments = $mail_bo->getMessageAttachments($_uid, $_partID))) {
+			foreach ($attachments as $attachment) {
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				$cid = $attachment['cid'];
-				$match=null;
+				$match = null;
 				preg_match("/cid:{$cid}/", $bodyParts['0']['body'], $match);
 				//error_log(__METHOD__.__LINE__.'searching for cid:'."/cid:{$cid}/".'#'.$r.'#'.array2string($match));
 				if (!$match || !$attachment['cid'])
@@ -1693,7 +1692,7 @@ 
 
 	function getErrorInfo()
 	{
-		if(isset($this->errorInfo)) {
+		if (isset($this->errorInfo)) {
 			$errorInfo = $this->errorInfo;
 			unset($this->errorInfo);
 			return $errorInfo;
@@ -1701,39 +1700,39 @@ 
 		return false;
 	}
 
-	function getForwardData($_icServer, $_folder, $_uid, $_partID, $_mode=false)
+	function getForwardData($_icServer, $_folder, $_uid, $_partID, $_mode = false)
 	{
 		if ($_mode)
 		{
 			$modebuff = $this->mailPreferences['message_forwarding'];
 			$this->mailPreferences['message_forwarding'] = $_mode;
 		}
-		if  ($this->mailPreferences['message_forwarding'] == 'inline') {
+		if ($this->mailPreferences['message_forwarding'] == 'inline') {
 			$this->getReplyData('forward', $_icServer, $_folder, $_uid, $_partID);
 		}
-		$mail_bo    = $this->mail_bo;
+		$mail_bo = $this->mail_bo;
 		$mail_bo->openConnection();
 		$mail_bo->reopen($_folder);
 
 		// get message headers for specified message
-		$headers	= $mail_bo->getMessageEnvelope($_uid, $_partID,false,$_folder);
+		$headers = $mail_bo->getMessageEnvelope($_uid, $_partID, false, $_folder);
 		//error_log(__METHOD__.__LINE__.array2string($headers));
 		//_debug_array($headers); exit;
 		// check for Re: in subject header
-		$this->sessionData['subject'] 	= "[FWD] " . $mail_bo->decode_header($headers['SUBJECT']);
+		$this->sessionData['subject'] = "[FWD] ".$mail_bo->decode_header($headers['SUBJECT']);
 		// the three attributes below are substituted by processedmail_id and mode
 		//$this->sessionData['sourceFolder']=$_folder;
 		//$this->sessionData['forwardFlag']='forwarded';
 		//$this->sessionData['forwardedUID']=$_uid;
-		if  ($this->mailPreferences['message_forwarding'] == 'asmail') {
-			$this->sessionData['mimeType']  = $this->mailPreferences['composeOptions'];
-			if($headers['SIZE'])
+		if ($this->mailPreferences['message_forwarding'] == 'asmail') {
+			$this->sessionData['mimeType'] = $this->mailPreferences['composeOptions'];
+			if ($headers['SIZE'])
 				$size				= $headers['SIZE'];
 			else
 				$size				= lang('unknown');
 
 			$this->addMessageAttachment($_uid, $_partID, $_folder,
-				$mail_bo->decode_header(($headers['SUBJECT']?$headers['SUBJECT']:lang('no subject'))).'.eml',
+				$mail_bo->decode_header(($headers['SUBJECT'] ? $headers['SUBJECT'] : lang('no subject'))).'.eml',
 				'MESSAGE/RFC822', $size);
 		}
 		else
@@ -1741,10 +1740,10 @@ 
 			unset($this->sessionData['in-reply-to']);
 			unset($this->sessionData['to']);
 			unset($this->sessionData['cc']);
-			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
+			if (($attachments = $mail_bo->getMessageAttachments($_uid, $_partID))) {
 				//error_log(__METHOD__.__LINE__.':'.array2string($attachments));
-				foreach($attachments as $attachment) {
-					if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])))
+				foreach ($attachments as $attachment) {
+					if (!($attachment['cid'] && preg_match("/image\//", $attachment['mimeType'])))
 					{
 						$this->addMessageAttachment($_uid, $attachment['partID'],
 							$_folder,
@@ -1773,7 +1772,7 @@ 
 	 * @param array $_content the content passed to the function and to be modified
 	 * @return void
 	 */
-	function addAttachment($_formData,&$_content,$eliminateDoubleAttachments=false)
+	function addAttachment($_formData, &$_content, $eliminateDoubleAttachments = false)
 	{
 		//error_log(__METHOD__.__LINE__.' Formdata:'.array2string($_formData).' Content:'.array2string($_content));
 
@@ -1782,7 +1781,7 @@ 
 		// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
 		try
 		{
-			$tmpFileName = Mail::checkFileBasics($_formData,$this->composeID,false);
+			$tmpFileName = Mail::checkFileBasics($_formData, $this->composeID, false);
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
@@ -1798,8 +1797,8 @@ 
 			foreach ((array)$_content['attachments'] as $attach)
 			{
 				if ($attach['name'] && $attach['name'] == $_formData['name'] &&
-					strtolower($_formData['type'])== strtolower($attach['type']) &&
-					stripos($_formData['file'],'vfs://') !== false) return;
+					strtolower($_formData['type']) == strtolower($attach['type']) &&
+					stripos($_formData['file'], 'vfs://') !== false) return;
 			}
 		}
 		if ($attachfailed === false)
@@ -1811,7 +1810,7 @@ 
 				'tmp_name'	=> $tmpFileName,
 				'size'	=> $_formData['size']
 			);
-			if (!is_array($_content['attachments'])) $_content['attachments']=array();
+			if (!is_array($_content['attachments'])) $_content['attachments'] = array();
 			$_content['attachments'][] = $buffer;
 			unset($buffer);
 		}
@@ -1823,14 +1822,14 @@ 
 
 	function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size)
 	{
-		$this->sessionData['attachments'][]=array (
+		$this->sessionData['attachments'][] = array(
 			'uid'		=> $_uid,
 			'partID'	=> $_partID,
 			'name'		=> $_name,
 			'type'		=> $_type,
 			'size'		=> $_size,
 			'folder'	=> $_folder,
-			'tmp_name'	=> mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID)?$_partID:count($this->sessionData['attachments'])+1),
+			'tmp_name'	=> mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID) ? $_partID : count($this->sessionData['attachments']) + 1),
 		);
 	}
 
@@ -1839,7 +1838,7 @@ 
 		// read attachment data from etemplate request, use tmpname only to identify it
 		if (($request = Etemplate\Request::read($_GET['etemplate_exec_id'])))
 		{
-			foreach($request->preserv['attachments'] as $attachment)
+			foreach ($request->preserv['attachments'] as $attachment)
 			{
 				if ($_GET['tmpname'] === $attachment['tmp_name']) break;
 			}
@@ -1851,7 +1850,7 @@ 
 		}
 
 		//error_log(__METHOD__.__LINE__.array2string($_GET));
-		if (parse_url($attachment['tmp_name'],PHP_URL_SCHEME) == 'vfs')
+		if (parse_url($attachment['tmp_name'], PHP_URL_SCHEME) == 'vfs')
 		{
 			Vfs::load_wrapper('vfs');
 		}
@@ -1860,7 +1859,7 @@ 
 		{
 			$attachment['tmp_name'] = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['tmp_name']);
 		}
-		if(!file_exists($attachment['tmp_name']))
+		if (!file_exists($attachment['tmp_name']))
 		{
 			header('HTTP/1.1 404 Not found');
 			die('Attachment '.htmlspecialchars($attachment['tmp_name']).' NOT found!');
@@ -1873,7 +1872,7 @@ 
 			if (strtoupper($attachment['type']) == 'TEXT/DIRECTORY')
 			{
 				$sfxMimeType = $attachment['type'];
-				$buff = explode('.',$attachment['tmp_name']);
+				$buff = explode('.', $attachment['tmp_name']);
 				$suffix = '';
 				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
 				if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
@@ -1885,10 +1884,10 @@ 
 			{
 				//error_log(__METHOD__."about to call calendar_ical");
 				$calendar_ical = new calendar_ical();
-				$eventid = $calendar_ical->search($attachment['attachment'],-1);
+				$eventid = $calendar_ical->search($attachment['attachment'], -1);
 				//error_log(__METHOD__.array2string($eventid));
 				if (!$eventid) $eventid = -1;
-				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true);
+				$event = $calendar_ical->importVCal($attachment['attachment'], (is_array($eventid) ? $eventid[0] : $eventid), null, true);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
 				{
@@ -1896,7 +1895,7 @@ 
 						'menuaction'      => 'calendar.calendar_uiforms.edit',
 						'cal_id'      => $event,
 					);
-					$GLOBALS['egw']->redirect_link('../index.php',$vars);
+					$GLOBALS['egw']->redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
@@ -1911,13 +1910,13 @@ 
 				{
 					$vcard['uid'] = trim($vcard['uid']);
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
-					$contact = $addressbook_vcal->find_contact($vcard,false);
+					$contact = $addressbook_vcal->find_contact($vcard, false);
 				}
 				if (!$contact) $contact = null;
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
-				if ($contact || count($vcard)>2)
+				if ($contact || count($vcard) > 2)
 				{
-					$contact = $addressbook_vcal->addVCard($attachment['attachment'],(is_array($contact)?array_shift($contact):$contact),true);
+					$contact = $addressbook_vcal->addVCard($attachment['attachment'], (is_array($contact) ? array_shift($contact) : $contact), true);
 				}
 				if ((int)$contact > 0)
 				{
@@ -1925,13 +1924,13 @@ 
 						'menuaction'	=> 'addressbook.addressbook_ui.edit',
 						'contact_id'	=> $contact,
 					);
-					$GLOBALS['egw']->redirect_link('../index.php',$vars);
+					$GLOBALS['egw']->redirect_link('../index.php', $vars);
 				}
 				//Import failed, download content anyway
 			}
 		}
 		//error_log(__METHOD__.__LINE__.'->'.array2string($attachment));
-		Api\Header\Content::safe($attachment['attachment'], $attachment['name'], $attachment['type'], $size=0, true, $_GET['mode'] == "save");
+		Api\Header\Content::safe($attachment['attachment'], $attachment['name'], $attachment['type'], $size = 0, true, $_GET['mode'] == "save");
 		echo $attachment['attachment'];
 
 		exit();
@@ -1944,11 +1943,11 @@ 
 	 * @param string haystack
 	 * @return boolean
 	 */
-	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack) {
+	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst, $haystack) {
 		foreach (array_keys($arrayToTestAgainst) as $k)
 		{
 			//error_log(__METHOD__.__LINE__.':'.$k.'<->'.$haystack);
-			if (stripos($haystack,$k)!==false)
+			if (stripos($haystack, $k) !== false)
 			{
 				//error_log(__METHOD__.__LINE__.':FOUND:'.$k.'<->'.$haystack.function_backtrace());
 				return true;
@@ -1971,10 +1970,10 @@ 
 	 */
 	function getReplyData($_mode, $_icServer, $_folder, $_uid, $_partID)
 	{
-		unset($_icServer);	// not used
+		unset($_icServer); // not used
 		$foundAddresses = array();
 
-		$mail_bo  = $this->mail_bo;
+		$mail_bo = $this->mail_bo;
 		$mail_bo->openConnection();
 		$mail_bo->reopen($_folder);
 
@@ -1982,12 +1981,12 @@ 
 
 		// get message headers for specified message
 		//print "AAAA: $_folder, $_uid, $_partID<br>";
-		$headers	= $mail_bo->getMessageEnvelope($_uid, $_partID,false,$_folder,$useHeaderInsteadOfEnvelope=true);
+		$headers = $mail_bo->getMessageEnvelope($_uid, $_partID, false, $_folder, $useHeaderInsteadOfEnvelope = true);
 		//$headers	= $mail_bo->getMessageHeader($_uid, $_partID, true, true, $_folder);
 		$this->sessionData['uid'] = $_uid;
 		$this->sessionData['messageFolder'] = $_folder;
-		$this->sessionData['in-reply-to'] = ($headers['IN-REPLY-TO']?$headers['IN-REPLY-TO']:$headers['MESSAGE_ID']);
-		$this->sessionData['references'] = ($headers['REFERENCES']?$headers['REFERENCES']:$headers['MESSAGE_ID']);
+		$this->sessionData['in-reply-to'] = ($headers['IN-REPLY-TO'] ? $headers['IN-REPLY-TO'] : $headers['MESSAGE_ID']);
+		$this->sessionData['references'] = ($headers['REFERENCES'] ? $headers['REFERENCES'] : $headers['MESSAGE_ID']);
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
 		// horde does not support the encoding of thread-topic, and probably will not no so in the future
 		//if ($headers['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $headers['THREAD-TOPIC'];
@@ -1995,36 +1994,36 @@ 
 		if ($headers['LIST-ID']) $this->sessionData['list-id'] = $headers['LIST-ID'];
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_mode.':'.array2string($headers));
 		// check for Reply-To: header and use if available
-		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM'])) {
-			foreach($headers['REPLY-TO'] as $val) {
-				if(!$foundAddresses[$val]) {
+		if (!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM'])) {
+			foreach ($headers['REPLY-TO'] as $val) {
+				if (!$foundAddresses[$val]) {
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
 			}
-			$oldToAddress	= (is_array($headers['REPLY-TO'])?$headers['REPLY-TO'][0]:$headers['REPLY-TO']);
+			$oldToAddress = (is_array($headers['REPLY-TO']) ? $headers['REPLY-TO'][0] : $headers['REPLY-TO']);
 		} else {
-			foreach($headers['FROM'] as $val) {
-				if(!$foundAddresses[$val]) {
+			foreach ($headers['FROM'] as $val) {
+				if (!$foundAddresses[$val]) {
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
 			}
-			$oldToAddress	= (is_array($headers['FROM'])?$headers['FROM'][0]:$headers['FROM']);
+			$oldToAddress = (is_array($headers['FROM']) ? $headers['FROM'][0] : $headers['FROM']);
 		}
 		//error_log(__METHOD__.__LINE__.' OldToAddress:'.$oldToAddress.'#');
-		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) ) {
+		if ($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $oldToAddress))) {
 			$this->sessionData['to'] = $oldTo;
 		}
 
-		if($_mode == 'all') {
+		if ($_mode == 'all') {
 			// reply to any address which is cc, but not to my self
 			#if($headers->cc) {
-				foreach($headers['CC'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach ($headers['CC'] as $val) {
+					if ($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $val)) {
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if (!$foundAddresses[$val]) {
 						$this->sessionData['cc'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2033,11 +2032,11 @@ 
 
 			// reply to any address which is to, but not to my self
 			#if($headers->to) {
-				foreach($headers['TO'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach ($headers['TO'] as $val) {
+					if ($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $val)) {
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if (!$foundAddresses[$val]) {
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2045,12 +2044,12 @@ 
 			#}
 
 			#if($headers->from) {
-				foreach($headers['FROM'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach ($headers['FROM'] as $val) {
+					if ($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses, $val)) {
 						continue;
 					}
 					//error_log(__METHOD__.__LINE__.' '.$val);
-					if(!$foundAddresses[$val]) {
+					if (!$foundAddresses[$val]) {
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2059,59 +2058,59 @@ 
 		}
 
 		// check for Re: in subject header
-		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:") {
+		if (strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:") {
 			$this->sessionData['subject'] = $mail_bo->decode_header($headers['SUBJECT']);
 		} else {
-			$this->sessionData['subject'] = "Re: " . $mail_bo->decode_header($headers['SUBJECT']);
+			$this->sessionData['subject'] = "Re: ".$mail_bo->decode_header($headers['SUBJECT']);
 		}
 
 		//_debug_array($headers);
 		//error_log(__METHOD__.__LINE__.'->'.array2string($this->mailPreferences['htmlOptions']));
-		$bodyParts = $mail_bo->getMessageBody($_uid, ($this->mailPreferences['htmlOptions']?$this->mailPreferences['htmlOptions']:''), $_partID);
+		$bodyParts = $mail_bo->getMessageBody($_uid, ($this->mailPreferences['htmlOptions'] ? $this->mailPreferences['htmlOptions'] : ''), $_partID);
 		//_debug_array($bodyParts);
 		$styles = Mail::getStyles($bodyParts);
 
-		$fromAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$headers['FROM']));
+		$fromAddress = implode(', ', str_replace(array('<', '>'), array('[', ']'), $headers['FROM']));
 
 		$toAddressA = array();
 		$toAddress = '';
 		foreach ($headers['TO'] as $mailheader) {
-			$toAddressA[] =  $mailheader;
+			$toAddressA[] = $mailheader;
 		}
-		if (count($toAddressA)>0)
+		if (count($toAddressA) > 0)
 		{
-			$toAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$toAddressA));
-			$toAddress = @htmlspecialchars(lang("to")).": ".$toAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
+			$toAddress = implode(', ', str_replace(array('<', '>'), array('[', ']'), $toAddressA));
+			$toAddress = @htmlspecialchars(lang("to")).": ".$toAddress.($bodyParts['0']['mimeType'] == 'text/html' ? "<br>" : "\r\n");
 		}
 		$ccAddressA = array();
 		$ccAddress = '';
 		foreach ($headers['CC'] as $mailheader) {
-			$ccAddressA[] =  $mailheader;
+			$ccAddressA[] = $mailheader;
 		}
-		if (count($ccAddressA)>0)
+		if (count($ccAddressA) > 0)
 		{
-			$ccAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA));
-			$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
+			$ccAddress = implode(', ', str_replace(array('<', '>'), array('[', ']'), $ccAddressA));
+			$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html' ? "<br>" : "\r\n");
 		}
-		if($bodyParts['0']['mimeType'] == 'text/html') {
-			$this->sessionData['body']	= /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
+		if ($bodyParts['0']['mimeType'] == 'text/html') {
+			$this->sessionData['body'] = /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
 				@htmlspecialchars(lang("from")).": ".$fromAddress."<br>".
 				$toAddress.$ccAddress.
-				@htmlspecialchars(lang("date").": ".$headers['DATE'],ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."<br>".
+				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES|ENT_IGNORE, Mail::$displayCharset, false)."<br>".
 				'----------------------------------------------------------'."</div>";
-			$this->sessionData['mimeType'] 	= 'html';
+			$this->sessionData['mimeType'] = 'html';
 			if (!empty($styles)) $this->sessionData['body'] .= $styles;
-			$this->sessionData['body']	.= '<blockquote type="cite">';
+			$this->sessionData['body'] .= '<blockquote type="cite">';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if ($bodyParts[$i]['mimeType'] == 'text/plain') {
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body'])."<br>";
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet'] === false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
 
 				$_htmlConfig = Mail::$htmLawed_config;
 				Mail::$htmLawed_config['comment'] = 2;
@@ -2121,30 +2120,30 @@ 
 				#error_log( "GetReplyData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 			}
 
-			$this->sessionData['body']	.= '</blockquote><br>';
-			$this->sessionData['body'] =  mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'html');
+			$this->sessionData['body'] .= '</blockquote><br>';
+			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'html');
 		} else {
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
-            $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
+            $this->sessionData['body'] = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
                 @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
 				$toAddress.$ccAddress.
-				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
+				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES|ENT_IGNORE, Mail::$displayCharset, false)."\r\n".
                 '-------------------------------------------------'."\r\n \r\n ";
-			$this->sessionData['mimeType']	= 'plain';
+			$this->sessionData['mimeType'] = 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for ($i = 0; $i < count($bodyParts); $i++) {
+				if ($i > 0) {
 					$this->sessionData['body'] .= "<hr>";
 				}
 
 				// add line breaks to $bodyParts
-				$newBody2 = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'],$bodyParts[$i]['charSet']);
+				$newBody2 = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetReplyData (Plain) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$newBody = mail_ui::resolve_inline_images($newBody2, $_folder, $_uid, $_partID, 'plain');
 				$this->sessionData['body'] .= "\r\n";
 				// create body new, with good line breaks and indention
-				foreach(explode("\n",$newBody) as $value) {
+				foreach (explode("\n", $newBody) as $value) {
 					// the explode is removing the character
 					if (trim($value) != '') {
 						#if ($value != "\r") $value .= "\n";
@@ -2152,12 +2151,12 @@ 
 					$numberOfChars = strspn(trim($value), ">");
 					$appendString = str_repeat('>', $numberOfChars + 1);
 
-					$bodyAppend = $this->mail_bo->wordwrap($value, 76-strlen("\r\n$appendString "), "\r\n$appendString ",'>');
+					$bodyAppend = $this->mail_bo->wordwrap($value, 76 - strlen("\r\n$appendString "), "\r\n$appendString ", '>');
 
-					if($bodyAppend[0] == '>') {
-						$bodyAppend = '>'. $bodyAppend;
+					if ($bodyAppend[0] == '>') {
+						$bodyAppend = '>'.$bodyAppend;
 					} else {
-						$bodyAppend = '> '. $bodyAppend;
+						$bodyAppend = '> '.$bodyAppend;
 					}
 
 					$this->sessionData['body'] .= $bodyAppend;
@@ -2180,16 +2179,16 @@ 
 	 */
 	static function _getCleanHTML($_body, $_useTidy = false)
 	{
-		static $nonDisplayAbleCharacters = array('[\016]','[\017]',
-				'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-				'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+		static $nonDisplayAbleCharacters = array('[\016]', '[\017]',
+				'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+				'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 
-		if ($_useTidy && extension_loaded('tidy') )
+		if ($_useTidy && extension_loaded('tidy'))
 		{
 			$tidy = new tidy();
-			$cleaned = $tidy->repairString($_body, Mail::$tidy_config,'utf8');
+			$cleaned = $tidy->repairString($_body, Mail::$tidy_config, 'utf8');
 			// Found errors. Strip it all so there's some output
-			if($tidy->getStatus() == 2)
+			if ($tidy->getStatus() == 2)
 			{
 				error_log(__METHOD__.' ('.__LINE__.') '.' ->'.$tidy->errorBuffer);
 			}
@@ -2221,14 +2220,14 @@ 
 	 * @param array $_identity
 	 * @param boolean $_autosaving =false true: autosaving, false: save-as-draft or send
 	 */
-	function createMessage(Api\Mailer $_mailObject, array $_formData, array $_identity, $_autosaving=false)
+	function createMessage(Api\Mailer $_mailObject, array $_formData, array $_identity, $_autosaving = false)
 	{
 		if (substr($_formData['body'], 0, 27) == '-----BEGIN PGP MESSAGE-----')
 		{
 			$_formData['mimeType'] = 'openpgp';
 		}
 		//error_log(__METHOD__."(, formDate[filemode]=$_formData[filemode], _autosaving=".array2string($_autosaving).') '.function_backtrace());
-		$mail_bo	= $this->mail_bo;
+		$mail_bo = $this->mail_bo;
 		$activeMailProfile = Mail\Account::read($this->mail_bo->profileID);
 
 		// you need to set the sender, if you work with different identities, since most smtp servers, dont allow
@@ -2238,17 +2237,17 @@ 
 			error_log(__METHOD__.__LINE__.' Faking From/SenderInfo for '.$activeMailProfile['ident_email'].' with ID:'.$activeMailProfile['ident_id'].'. Identitiy to use for sending:'.array2string($_identity));
 		}
 		$_mailObject->setFrom($_identity['ident_email'] ? $_identity['ident_email'] : $activeMailProfile['ident_email'],
-			Mail::generateIdentityString($_identity,false));
+			Mail::generateIdentityString($_identity, false));
 
 		$_mailObject->addHeader('X-Priority', $_formData['priority']);
 		$_mailObject->addHeader('X-Mailer', 'EGroupware-Mail');
-		if(!empty($_formData['in-reply-to'])) {
-			if (stripos($_formData['in-reply-to'],'<')===false) $_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+		if (!empty($_formData['in-reply-to'])) {
+			if (stripos($_formData['in-reply-to'], '<') === false) $_formData['in-reply-to'] = '<'.trim($_formData['in-reply-to']).'>';
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(In-Reply-To', $_formData['in-reply-to'].")");
 			$_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']);
 		}
-		if(!empty($_formData['references'])) {
-			if (stripos($_formData['references'],'<')===false) $_formData['references']='<'.trim($_formData['references']).'>';
+		if (!empty($_formData['references'])) {
+			if (stripos($_formData['references'], '<') === false) $_formData['references'] = '<'.trim($_formData['references']).'>';
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(References', $_formData['references'].")");
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
@@ -2259,16 +2258,16 @@ 
 		//	$_mailObject->addHeader('Thread-Topic', $_formData['thread-topic']);
 		//}
 
-		if(!empty($_formData['thread-index'])) {
+		if (!empty($_formData['thread-index'])) {
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Index', $_formData['thread-index'].")");
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
 		}
-		if(!empty($_formData['list-id'])) {
+		if (!empty($_formData['list-id'])) {
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(List-Id', $_formData['list-id'].")");
 			$_mailObject->addHeader('List-Id', $_formData['list-id']);
 		}
 		//error_log(__METHOD__.__LINE__.' notify to:'.$_identity['ident_email'].'->'.array2string($_formData));
-		if($_formData['disposition']=='on') {
+		if ($_formData['disposition'] == 'on') {
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
 		//error_log(__METHOD__.__LINE__.' Organization:'.array2string($_identity));
@@ -2277,7 +2276,7 @@ 
 		//}
 
 		// Expand any mailing lists
-		foreach(array('to', 'cc', 'bcc', 'replyto')  as $field)
+		foreach (array('to', 'cc', 'bcc', 'replyto')  as $field)
 		{
 			if ($field != 'replyto') $_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
 
@@ -2300,7 +2299,7 @@ 
 					'1' => 'before reply, visible during compose',
 					'no_belowaftersend'  => 'appended after reply before sending',
 		*/
-		$sigAlreadyThere = $this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend'?1:0;
+		$sigAlreadyThere = $this->mailPreferences['insertSignatureAtTopOfMessage'] != 'no_belowaftersend' ? 1 : 0;
 		if ($sigAlreadyThere)
 		{
 			// note: if you use stationery ' s the insert signatures at the top does not apply here anymore, as the signature
@@ -2309,7 +2308,7 @@ 
 		}
 		if ((isset($this->mailPreferences['disableRulerForSignatureSeparation']) &&
 			$this->mailPreferences['disableRulerForSignatureSeparation']) ||
-			empty($signature) || trim($this->convertHTMLToText($signature)) =='')
+			empty($signature) || trim($this->convertHTMLToText($signature)) == '')
 		{
 			$disableRuler = true;
 		}
@@ -2326,7 +2325,7 @@ 
 				array_unique(array_merge((array)$_formData['to'], (array)$_formData['cc'], (array)$_formData['bcc'])),
 				$_formData['expiration'], $_formData['password']);
 		}
-		if($_formData['mimeType'] == 'html')
+		if ($_formData['mimeType'] == 'html')
 		{
 			$body = $_formData['body'];
 			if ($attachment_links)
@@ -2340,13 +2339,13 @@ 
 					$body .= $attachment_links;
 				}
 			}
-			if(!empty($signature))
+			if (!empty($signature))
 			{
 				$_mailObject->setBody($this->convertHTMLToText($body, true, true).
 					($disableRuler ? "\r\n" : "\r\n-- \r\n").
 					$this->convertHTMLToText($signature, true, true));
 
-				$body .= ($disableRuler ?'<br>':'<hr style="border:1px dotted silver; width:90%;">').$signature;
+				$body .= ($disableRuler ? '<br>' : '<hr style="border:1px dotted silver; width:90%;">').$signature;
 			}
 			else
 			{
@@ -2354,11 +2353,11 @@ 
 			}
 			// convert URL Images to inline images - if possible
 			if (!$_autosaving) Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
-			if (strpos($body,"<!-- HTMLSIGBEGIN -->")!==false)
+			if (strpos($body, "<!-- HTMLSIGBEGIN -->") !== false)
 			{
-				$body = str_replace(array('<!-- HTMLSIGBEGIN -->','<!-- HTMLSIGEND -->'),'',$body);
+				$body = str_replace(array('<!-- HTMLSIGBEGIN -->', '<!-- HTMLSIGEND -->'), '', $body);
 			}
-			$_mailObject->setHtmlBody($body, null, false);	// false = no automatic alternative, we called setBody()
+			$_mailObject->setHtmlBody($body, null, false); // false = no automatic alternative, we called setBody()
 		}
 		elseif ($_formData['mimeType'] == 'openpgp')
 		{
@@ -2366,14 +2365,14 @@ 
 		}
 		else
 		{
-			$body = $this->convertHTMLToText($_formData['body'],false);
+			$body = $this->convertHTMLToText($_formData['body'], false);
 
 			if ($attachment_links) $body .= $attachment_links;
 
 			#$_mailObject->Body = $_formData['body'];
-			if(!empty($signature)) {
-				$body .= ($disableRuler ?"\r\n":"\r\n-- \r\n").
-					$this->convertHTMLToText($signature,true,true);
+			if (!empty($signature)) {
+				$body .= ($disableRuler ? "\r\n" : "\r\n-- \r\n").
+					$this->convertHTMLToText($signature, true, true);
 			}
 			$_mailObject->setBody($body);
 		}
@@ -2384,9 +2383,9 @@ 
 			$connection_opened = false;
 			//error_log(__METHOD__.__LINE__.array2string($_formData['attachments']));
 			$tnfattachments = null;
-			foreach((array)$_formData['attachments'] as $attachment) {
+			foreach ((array)$_formData['attachments'] as $attachment) {
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
-				if(is_array($attachment))
+				if (is_array($attachment))
 				{
 					if (!empty($attachment['uid']) && !empty($attachment['folder'])) {
 						/* Example:
@@ -2404,20 +2403,20 @@ 
 							$connection_opened = true;
 						}
 						$mail_bo->reopen($attachment['folder']);
-						switch(strtoupper($attachment['type'])) {
+						switch (strtoupper($attachment['type'])) {
 							case 'MESSAGE/RFC':
 							case 'MESSAGE/RFC822':
-								$rawBody='';
+								$rawBody = '';
 								if (isset($attachment['partID'])) {
-									$eml = $mail_bo->getAttachment($attachment['uid'],$attachment['partID'],0,false,true,$attachment['folder']);
-									$rawBody=$eml['attachment'];
+									$eml = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'], 0, false, true, $attachment['folder']);
+									$rawBody = $eml['attachment'];
 								} else {
-									$rawBody        = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']);
+									$rawBody = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'], $attachment['folder']);
 								}
 								$_mailObject->addStringAttachment($rawBody, $attachment['name'], 'message/rfc822');
 								break;
 							default:
-								$attachmentData	= $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false);
+								$attachmentData = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'], 0, false);
 								if ($attachmentData['type'] == 'APPLICATION/MS-TNEF')
 								{
 									if (!is_array($tnfattachments)) $tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
@@ -2425,7 +2424,7 @@ 
 									{
 										if ($k['name'] == $attachment['name'])
 										{
-											$tnfpart = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID'],$k['is_winmail']);
+											$tnfpart = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID'], $k['is_winmail']);
 											$attachmentData['attachment'] = $tnfpart['attachment'];
 											//error_log(__METHOD__.__LINE__.$k['name'].'<->'.$attachment['name'].':'.array2string($attachmentData['attachment']));
 											break;
@@ -2439,7 +2438,7 @@ 
 					// attach files not for autosaving
 					elseif ($_formData['filemode'] == Vfs\Sharing::ATTACH && !$_autosaving)
 					{
-						if (isset($attachment['file']) && parse_url($attachment['file'],PHP_URL_SCHEME) == 'vfs')
+						if (isset($attachment['file']) && parse_url($attachment['file'], PHP_URL_SCHEME) == 'vfs')
 						{
 							Vfs::load_wrapper('vfs');
 							$tmp_path = $attachment['file'];
@@ -2448,7 +2447,7 @@ 
 						{
 							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file']);
 						}
-						$_mailObject->addAttachment (
+						$_mailObject->addAttachment(
 							$tmp_path,
 							$attachment['name'],
 							$attachment['type']
@@ -2473,16 +2472,16 @@ 
 	 * @param string $password =null
 	 * @return string might be empty if no file attachments found
 	 */
-	protected function getAttachmentLinks(array $attachments, $filemode, $html, $recipients=array(), $expiration=null, $password=null)
+	protected function getAttachmentLinks(array $attachments, $filemode, $html, $recipients = array(), $expiration = null, $password = null)
 	{
 		if ($filemode == Vfs\Sharing::ATTACH) return '';
 
 		$links = array();
-		foreach($attachments as $attachment)
+		foreach ($attachments as $attachment)
 		{
 			$path = $attachment['file'];
-			if (empty($path)) continue;	// we only care about file attachments, not forwarded messages or parts
-			if (parse_url($attachment['file'],PHP_URL_SCHEME) != 'vfs')
+			if (empty($path)) continue; // we only care about file attachments, not forwarded messages or parts
+			if (parse_url($attachment['file'], PHP_URL_SCHEME) != 'vfs')
 			{
 				$path = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($path);
 			}
@@ -2512,7 +2511,7 @@ 
 		}
 		if (!$links)
 		{
-			return null;	// no file attachments found
+			return null; // no file attachments found
 		}
 		elseif ($html)
 		{
@@ -2527,7 +2526,7 @@ 
 	 * @param array $content content sent from client-side
 	 * @param string $action ='button[saveAsDraft]' 'autosaving', 'button[saveAsDraft]' or 'button[saveAsDraftAndPrint]'
 	 */
-	public function ajax_saveAsDraft ($content, $action='button[saveAsDraft]')
+	public function ajax_saveAsDraft($content, $action = 'button[saveAsDraft]')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($content)."(, action=$action)");
 		$response = Api\Json\Response::get();
@@ -2541,8 +2540,8 @@ 
 
 		$formData = array_merge($content, array(
 			'isDrafted' => 1,
-			'body' => $content['mail_'.($content['mimeType']?'htmltext':'plaintext')],
-			'mimeType' => $content['mimeType']?'html':'plain' // checkbox has only true|false value
+			'body' => $content['mail_'.($content['mimeType'] ? 'htmltext' : 'plaintext')],
+			'mimeType' => $content['mimeType'] ? 'html' : 'plain' // checkbox has only true|false value
 		));
 
 		//Saving draft procedure
@@ -2554,8 +2553,8 @@ 
 			if (($messageUid = $this->saveAsDraft($formData, $folder, $action)))
 			{
 				// saving as draft, does not mean closing the message
-				$messageUid = ($messageUid===true ? $status['uidnext'] : $messageUid);
-				if (is_array($this->mail_bo->getMessageHeader($messageUid, '',false, false, $folder)))
+				$messageUid = ($messageUid === true ? $status['uidnext'] : $messageUid);
+				if (is_array($this->mail_bo->getMessageHeader($messageUid, '', false, false, $folder)))
 				{
 					$draft_id = mail_ui::generateRowID($this->mail_bo->profileID, $folder, $messageUid);
 					if ($content['lastDrafted'] != $draft_id && isset($content['lastDrafted']))
@@ -2564,7 +2563,7 @@ 
 						$duid = $dhA['msgUID'];
 						$dmailbox = $dhA['folder'];
 						// beware: do not delete the original mail as found in processedmail_id
-						$pMuid='';
+						$pMuid = '';
 						if ($content['processedmail_id'])
 						{
 							$pMhA = mail_ui::splitRowID($content['processedmail_id']);
@@ -2572,15 +2571,15 @@ 
 						}
 						//error_log(__METHOD__.__LINE__."#$pMuid#$pMuid!=$duid#".array2string($content['attachments']));
 						// do not delete the original message if attachments are present
-						if (empty($pMuid) || $pMuid!=$duid || empty($content['attachments']))
+						if (empty($pMuid) || $pMuid != $duid || empty($content['attachments']))
 						{
 							try
 							{
-								$this->mail_bo->deleteMessages($duid,$dmailbox,'remove_immediately');
+								$this->mail_bo->deleteMessages($duid, $dmailbox, 'remove_immediately');
 							}
 							catch (Api\Exception $e)
 							{
-								$msg = str_replace('"',"'",$e->getMessage());
+								$msg = str_replace('"', "'", $e->getMessage());
 								$success = false;
 								error_log(__METHOD__.__LINE__.$msg);
 							}
@@ -2601,7 +2600,7 @@ 
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
-			$msg = str_replace('"',"'",$e->getMessage());
+			$msg = str_replace('"', "'", $e->getMessage());
 			error_log(__METHOD__.__LINE__.$msg);
 			$success = false;
 		}
@@ -2625,17 +2624,17 @@ 
 	static function resolveEmailAddressList($_emailAddressList)
 	{
 		$contacts_obs = null;
-		$addrFromList=array();
-		foreach((array)$_emailAddressList as $ak => $address)
+		$addrFromList = array();
+		foreach ((array)$_emailAddressList as $ak => $address)
 		{
-			if(is_int($address))
+			if (is_int($address))
 			{
 				if (!isset($contacts_obs)) $contacts_obj = new Api\Contacts();
 				// List was selected, expand to addresses
 				unset($_emailAddressList[$ak]);
-				$list = $contacts_obj->search('',array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home'),'','','',False,'AND',false,array('list' =>(int)$address));
+				$list = $contacts_obj->search('', array('n_fn', 'n_prefix', 'n_given', 'n_family', 'org_name', 'email', 'email_home'), '', '', '', False, 'AND', false, array('list' =>(int)$address));
 				// Just add email addresses, they'll be checked below
-				foreach($list as $email)
+				foreach ($list as $email)
 				{
 					$addrFromList[] = $email['email'] ? $email['email'] : $email['email_home'];
 				}
@@ -2645,7 +2644,7 @@ 
 		{
 			foreach ($addrFromList as $addr)
 			{
-				if (!empty($addr)) $_emailAddressList[]=$addr;
+				if (!empty($addr)) $_emailAddressList[] = $addr;
 			}
 		}
 		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
@@ -2659,15 +2658,15 @@ 
 	 * @param string $action ='button[saveAsDraft]' 'autosaving', 'button[saveAsDraft]' or 'button[saveAsDraftAndPrint]'
 	 * @return boolean return messageUID| false due to an error
 	 */
-	function saveAsDraft($_formData, &$savingDestination='', $action='button[saveAsDraft]')
+	function saveAsDraft($_formData, &$savingDestination = '', $action = 'button[saveAsDraft]')
 	{
 		//error_log(__METHOD__."(..., $savingDestination, action=$action)");
-		$mail_bo	= $this->mail_bo;
-		$mail		= new Api\Mailer($this->mail_bo->profileID);
+		$mail_bo = $this->mail_bo;
+		$mail = new Api\Mailer($this->mail_bo->profileID);
 
 		// preserve the bcc and if possible the save to folder information
-		$this->sessionData['folder']    = $_formData['folder'];
-		$this->sessionData['bcc']   = $_formData['bcc'];
+		$this->sessionData['folder'] = $_formData['folder'];
+		$this->sessionData['bcc'] = $_formData['bcc'];
 		$this->sessionData['mailidentity'] = $_formData['mailidentity'];
 		//$this->sessionData['stationeryID'] = $_formData['stationeryID'];
 		$this->sessionData['mailaccount']  = $_formData['mailaccount'];
@@ -2676,11 +2675,11 @@ 
 		{
 			$acc = Mail\Account::read($this->sessionData['mailaccount']);
 			//error_log(__METHOD__.__LINE__.array2string($acc));
-			$identity = Mail\Account::read_identity($acc['ident_id'],true);
+			$identity = Mail\Account::read_identity($acc['ident_id'], true);
 		}
 		catch (Exception $e)
 		{
-			$identity=array();
+			$identity = array();
 		}
 
 		$flags = '\\Seen \\Draft';
@@ -2690,7 +2689,7 @@ 
 		// folder list as Customheader
 		if (!empty($this->sessionData['folder']))
 		{
-			$folders = implode('|',array_unique($this->sessionData['folder']));
+			$folders = implode('|', array_unique($this->sessionData['folder']));
 			$mail->addHeader('X-Mailfolder', $folders);
 		}
 		$mail->addHeader('X-Mailidentity', $this->sessionData['mailidentity']);
@@ -2710,25 +2709,25 @@ 
 			$savingDestination = $this->sessionData['messageFolder'];
 			//error_log(__METHOD__.__LINE__.' SavingDestination:'.$savingDestination);
 		}
-		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 ) $savingDestination = $mail_bo->getDraftFolder();
+		if (!empty($_formData['printit']) && $_formData['printit'] == 0) $savingDestination = $mail_bo->getDraftFolder();
 
 		// normaly Bcc is only added to recipients, but not as header visible to all recipients
 		$mail->forceBccHeader();
 
 		$mail_bo->openConnection();
-		if ($mail_bo->folderExists($savingDestination,true)) {
+		if ($mail_bo->folderExists($savingDestination, true)) {
 			try
 			{
 				$messageUid = $mail_bo->appendMessage($savingDestination, $mail->getRaw(), null, $flags);
 			}
 			catch (Api\Exception\WrongUserinput $e)
 			{
-				error_log(__METHOD__.__LINE__.lang("Save of message %1 failed. Could not save message to folder %2 due to: %3",__METHOD__,$savingDestination,$e->getMessage()));
+				error_log(__METHOD__.__LINE__.lang("Save of message %1 failed. Could not save message to folder %2 due to: %3", __METHOD__, $savingDestination, $e->getMessage()));
 				return false;
 			}
 
 		} else {
-			error_log(__METHOD__.__LINE__."->".lang("folder")." ". $savingDestination." ".lang("does not exist on IMAP Server."));
+			error_log(__METHOD__.__LINE__."->".lang("folder")." ".$savingDestination." ".lang("does not exist on IMAP Server."));
 			return false;
 		}
 		$mail_bo->closeConnection();
@@ -2737,26 +2736,26 @@ 
 
 	function send($_formData)
 	{
-		$mail_bo	= $this->mail_bo;
-		$mail 		= new Api\Mailer($mail_bo->profileID);
-		$messageIsDraft	=  false;
+		$mail_bo = $this->mail_bo;
+		$mail = new Api\Mailer($mail_bo->profileID);
+		$messageIsDraft = false;
 
-		$this->sessionData['mailaccount']	= $_formData['mailaccount'];
+		$this->sessionData['mailaccount'] = $_formData['mailaccount'];
 		$this->sessionData['to']	= self::resolveEmailAddressList($_formData['to']);
 		$this->sessionData['cc']	= self::resolveEmailAddressList($_formData['cc']);
-		$this->sessionData['bcc']	= self::resolveEmailAddressList($_formData['bcc']);
-		$this->sessionData['folder']	= $_formData['folder'];
+		$this->sessionData['bcc'] = self::resolveEmailAddressList($_formData['bcc']);
+		$this->sessionData['folder'] = $_formData['folder'];
 		$this->sessionData['replyto']	= $_formData['replyto'];
 		$this->sessionData['subject']	= trim($_formData['subject']);
-		$this->sessionData['body']	= $_formData['body'];
-		$this->sessionData['priority']	= $_formData['priority'];
+		$this->sessionData['body'] = $_formData['body'];
+		$this->sessionData['priority'] = $_formData['priority'];
 		$this->sessionData['mailidentity'] = $_formData['mailidentity'];
 		//$this->sessionData['stationeryID'] = $_formData['stationeryID'];
 		$this->sessionData['disposition'] = $_formData['disposition'];
-		$this->sessionData['mimeType']	= $_formData['mimeType'];
+		$this->sessionData['mimeType'] = $_formData['mimeType'];
 		$this->sessionData['to_infolog'] = $_formData['to_infolog'];
 		$this->sessionData['to_tracker'] = $_formData['to_tracker'];
-		$this->sessionData['attachments']  = $_formData['attachments'];
+		$this->sessionData['attachments'] = $_formData['attachments'];
 
 		if (isset($_formData['lastDrafted']) && !empty($_formData['lastDrafted']))
 		{
@@ -2765,11 +2764,11 @@ 
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_formData['mode'].' PID:'.$_formData['processedmail_id']);
 		if (isset($_formData['mode']) && !empty($_formData['mode']))
 		{
-			if ($_formData['mode']=='forward' && !empty($_formData['processedmail_id']))
+			if ($_formData['mode'] == 'forward' && !empty($_formData['processedmail_id']))
 			{
-				$this->sessionData['forwardFlag']='forwarded';
-				$_formData['processedmail_id'] = explode(',',$_formData['processedmail_id']);
-				$this->sessionData['uid']=array();
+				$this->sessionData['forwardFlag'] = 'forwarded';
+				$_formData['processedmail_id'] = explode(',', $_formData['processedmail_id']);
+				$this->sessionData['uid'] = array();
 				foreach ($_formData['processedmail_id'] as $k =>$rowid)
 				{
 					$fhA = mail_ui::splitRowID($rowid);
@@ -2778,13 +2777,13 @@ 
 					if (!empty($fhA['folder'])) $this->sessionData['sourceFolder'] = $fhA['folder'];
 				}
 			}
-			if ($_formData['mode']=='reply' && !empty($_formData['processedmail_id']))
+			if ($_formData['mode'] == 'reply' && !empty($_formData['processedmail_id']))
 			{
 				$rhA = mail_ui::splitRowID($_formData['processedmail_id']);
 				$this->sessionData['uid'] = $rhA['msgUID'];
 				$this->sessionData['messageFolder'] = $rhA['folder'];
 			}
-			if ($_formData['mode']=='composefromdraft' && !empty($_formData['processedmail_id']))
+			if ($_formData['mode'] == 'composefromdraft' && !empty($_formData['processedmail_id']))
 			{
 				$dhA = mail_ui::splitRowID($_formData['processedmail_id']);
 				$this->sessionData['uid'] = $dhA['msgUID'];
@@ -2793,26 +2792,26 @@ 
 		}
 		// if the body is empty, maybe someone pasted something with scripts, into the message body
 		// this should not happen anymore, unless you call send directly, since the check was introduced with the action command
-		if(empty($this->sessionData['body']))
+		if (empty($this->sessionData['body']))
 		{
 			// this is to be found with the egw_unset_vars array for the _POST['body'] array
-			$name='_POST';
-			$key='body';
+			$name = '_POST';
+			$key = 'body';
 			#error_log($GLOBALS['egw_unset_vars'][$name.'['.$key.']']);
 			if (isset($GLOBALS['egw_unset_vars'][$name.'['.$key.']']))
 			{
-				$this->sessionData['body'] = self::_getCleanHTML( $GLOBALS['egw_unset_vars'][$name.'['.$key.']']);
-				$_formData['body']=$this->sessionData['body'];
+				$this->sessionData['body'] = self::_getCleanHTML($GLOBALS['egw_unset_vars'][$name.'['.$key.']']);
+				$_formData['body'] = $this->sessionData['body'];
 			}
 			#error_log($this->sessionData['body']);
 		}
-		if(empty($this->sessionData['to']) && empty($this->sessionData['cc']) &&
+		if (empty($this->sessionData['to']) && empty($this->sessionData['cc']) &&
 		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder'])) {
 		   	$messageIsDraft = true;
 		}
 		try
 		{
-			$identity = Mail\Account::read_identity((int)$this->sessionData['mailidentity'],true);
+			$identity = Mail\Account::read_identity((int)$this->sessionData['mailidentity'], true);
 		}
 		catch (Exception $e)
 		{
@@ -2823,7 +2822,7 @@ 
 		// create the messages
 		$this->createMessage($mail, $_formData, $identity);
 		// remember the identity
-		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') $fromAddress = $mail->From;//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
+		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') $fromAddress = $mail->From; //$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
 		#print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>";
 		#print "<pre>". $mail->getMessageBody() ."</pre><hr><br>";
 		#exit;
@@ -2834,12 +2833,12 @@ 
 		$folderOnMailAccount = array();
 		foreach ($folderToCheck as $k => $f)
 		{
-			$fval=$f;
-			$icServerID = $_formData['serverID'];//folders always assumed with serverID
-			if (stripos($f,'::')!==false) list($icServerID,$fval) = explode('::',$f,2);
-			if ($_formData['serverID']!=$_formData['mailaccount'])
+			$fval = $f;
+			$icServerID = $_formData['serverID']; //folders always assumed with serverID
+			if (stripos($f, '::') !== false) list($icServerID, $fval) = explode('::', $f, 2);
+			if ($_formData['serverID'] != $_formData['mailaccount'])
 			{
-				if ($icServerID == $_formData['serverID'] )
+				if ($icServerID == $_formData['serverID'])
 				{
 					$folder[$fval] = $fval;
 					$folderOnServerID[] = $fval;
@@ -2852,7 +2851,7 @@ 
 			}
 			else
 			{
-				if ($icServerID == $_formData['serverID'] )
+				if ($icServerID == $_formData['serverID'])
 				{
 					$folder[$fval] = $fval;
 					$folderOnServerID[] = $fval;
@@ -2869,7 +2868,7 @@ 
 		// we use the sentFolder settings of the choosen mailaccount
 		// sentFolder is account specific
 		$changeProfileOnSentFolderNeeded = false;
-		if ($_formData['serverID']!=$_formData['mailaccount'])
+		if ($_formData['serverID'] != $_formData['mailaccount'])
 		{
 			$this->changeProfile($_formData['mailaccount']);
 			//error_log(__METHOD__.__LINE__.'#'.$this->mail_bo->profileID.'<->'.$mail_bo->profileID.'#');
@@ -2877,30 +2876,30 @@ 
 			// sentFolder is account specific
 			$sentFolder = $this->mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder && $sentFolder != 'none' && !$this->mail_bo->folderExists($sentFolder, true)) $sentFolder = false;
 		}
 		else
 		{
 			$sentFolder = $mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder && $sentFolder != 'none' && !$mail_bo->folderExists($sentFolder, true)) $sentFolder = false;
 		}
 		//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
 
 		// we switch $this->mail_bo back to the account we used to work on
-		if ($_formData['serverID']!=$_formData['mailaccount'])
+		if ($_formData['serverID'] != $_formData['mailaccount'])
 		{
 			$this->changeProfile($_formData['serverID']);
 		}
 
 
-		if(isset($sentFolder) && $sentFolder && $sentFolder != 'none' &&
+		if (isset($sentFolder) && $sentFolder && $sentFolder != 'none' &&
 			$this->mailPreferences['sendOptions'] != 'send_only' &&
 			$messageIsDraft == false)
 		{
 			if ($sentFolder)
 			{
-				if ($_formData['serverID']!=$_formData['mailaccount'])
+				if ($_formData['serverID'] != $_formData['mailaccount'])
 				{
 					$folderOnMailAccount[] = $sentFolder;
 				}
@@ -2917,14 +2916,14 @@ 
 		}
 		else
 		{
-			if (((!isset($sentFolder)||$sentFolder==false) && $this->mailPreferences['sendOptions'] != 'send_only') ||
+			if (((!isset($sentFolder) || $sentFolder == false) && $this->mailPreferences['sendOptions'] != 'send_only') ||
 				($this->mailPreferences['sendOptions'] != 'send_only' &&
 				$sentFolder != 'none')) $this->errorInfo = lang("No Send Folder set in preferences");
 		}
 		// draftFolder is on Server we start from
-		if($messageIsDraft == true) {
+		if ($messageIsDraft == true) {
 			$draftFolder = $mail_bo->getDraftFolder();
-			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true)) {
+			if (!empty($draftFolder) && $mail_bo->folderExists($draftFolder, true)) {
 				$this->sessionData['folder'] = array($draftFolder);
 				$folderOnServerID[] = $draftFolder;
 				$folder[$draftFolder] = $draftFolder;
@@ -2933,10 +2932,10 @@ 
 		if ($folderOnServerID) $folderOnServerID = array_unique($folderOnServerID);
 		if ($folderOnMailAccount) $folderOnMailAccount = array_unique($folderOnMailAccount);
 		if (($this->mailPreferences['sendOptions'] != 'send_only' && $sentFolder != 'none') &&
-			!( count($folder) > 0) &&
-			!($_formData['to_infolog']=='on' || $_formData['to_tracker']=='on'))
+			!(count($folder) > 0) &&
+			!($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on'))
 		{
-			$this->errorInfo = lang("Error: ").lang("No Folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required.").($this->errorInfo?' '.$this->errorInfo:'');
+			$this->errorInfo = lang("Error: ").lang("No Folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required.").($this->errorInfo ? ' '.$this->errorInfo : '');
 			#error_log($this->errorInfo);
 			return false;
 		}
@@ -2945,18 +2944,18 @@ 
 		@set_time_limit(120);
 		//$mail->SMTPDebug = 10;
 		//error_log("Folder:".count(array($this->sessionData['folder']))."To:".count((array)$this->sessionData['to'])."CC:". count((array)$this->sessionData['cc']) ."bcc:".count((array)$this->sessionData['bcc']));
-		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
+		if (count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
 			try {
 				$mail->send();
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				_egw_log_exception($e);
 				//if( $e->details ) error_log(__METHOD__.__LINE__.array2string($e->details));
-				$this->errorInfo = $e->getMessage().($e->details?'<br/>'.$e->details:'');
+				$this->errorInfo = $e->getMessage().($e->details ? '<br/>'.$e->details : '');
 				return false;
 			}
 		} else {
-			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder'])) {
+			if (count(array($this->sessionData['folder'])) > 0 && !empty($this->sessionData['folder'])) {
 				//error_log(__METHOD__.__LINE__."Folders:".print_r($this->sessionData['folder'],true));
 			} else {
 				$this->errorInfo = lang("Error: ").lang("No Address TO/CC/BCC supplied, and no folder to save message to provided.");
@@ -2984,15 +2983,15 @@ 
 		// copying mail to folder
 		if (count($folder) > 0)
 		{
-			foreach($folderOnServerID as $folderName) {
+			foreach ($folderOnServerID as $folderName) {
 				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($mail_bo->folderExists($folderName,true)) {
-					if($mail_bo->isSentFolder($folderName)) {
+				if ($mail_bo->folderExists($folderName, true)) {
+					if ($mail_bo->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($mail_bo->isDraftFolder($folderName)) {
+					} elseif ($mail_bo->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '\\Seen';
@@ -3008,25 +3007,25 @@ 
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
-						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$this->sessionData['subject'],$folderName,$e->getMessage()));
+						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $this->sessionData['subject'], $folderName, $e->getMessage()));
 					}
 				}
 				else
 				{
-					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$this->sessionData['subject'],$folderName));
+					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $this->sessionData['subject'], $folderName));
 				}
 			}
 			// if we choose to send from a differing profile
 			if ($folderOnMailAccount)  $this->changeProfile($_formData['mailaccount']);
-			foreach($folderOnMailAccount as $folderName) {
+			foreach ($folderOnMailAccount as $folderName) {
 				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($this->mail_bo->folderExists($folderName,true)) {
-					if($this->mail_bo->isSentFolder($folderName)) {
+				if ($this->mail_bo->folderExists($folderName, true)) {
+					if ($this->mail_bo->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($this->mail_bo->isDraftFolder($folderName)) {
+					} elseif ($this->mail_bo->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '\\Seen';
@@ -3042,12 +3041,12 @@ 
 					}
 					catch (Api\Exception\WrongUserinput $e)
 					{
-						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$this->sessionData['subject'],$folderName,$e->getMessage()));
+						error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $this->sessionData['subject'], $folderName, $e->getMessage()));
 					}
 				}
 				else
 				{
-					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$this->sessionData['subject'],$folderName));
+					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $this->sessionData['subject'], $folderName));
 				}
 			}
 			if ($folderOnMailAccount)  $this->changeProfile($_formData['serverID']);
@@ -3058,27 +3057,27 @@ 
 		$lastDrafted = false;
 		if (isset($this->sessionData['lastDrafted']))
 		{
-			$lastDrafted=array();
+			$lastDrafted = array();
 			$dhA = mail_ui::splitRowID($this->sessionData['lastDrafted']);
 			$lastDrafted['uid'] = $dhA['msgUID'];
 			$lastDrafted['folder'] = $dhA['folder'];
-			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid']=trim($lastDrafted['uid']);
+			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid'] = trim($lastDrafted['uid']);
 			// manually drafted, do not delete
 			// will be handled later on IF mode was $_formData['mode']=='composefromdraft'
-			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
+			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted = false;
 			//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
 		}
 		if ($lastDrafted && is_array($lastDrafted) && $mail_bo->isDraftFolder($lastDrafted['folder']))
 		{
 			try
 			{
-				if ($this->sessionData['lastDrafted'] != $this->sessionData['uid'] || !($_formData['mode']=='composefromdraft' &&
-					($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' )&&$this->sessionData['attachments']))
+				if ($this->sessionData['lastDrafted'] != $this->sessionData['uid'] || !($_formData['mode'] == 'composefromdraft' &&
+					($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on') && $this->sessionData['attachments']))
 				{
 					//error_log(__METHOD__.__LINE__."#".$lastDrafted['uid'].'#'.$lastDrafted['folder'].array2string($_formData));
 					//error_log(__METHOD__.__LINE__."#".array2string($_formData));
 					//error_log(__METHOD__.__LINE__."#".array2string($this->sessionData));
-					$mail_bo->deleteMessages($lastDrafted['uid'],$lastDrafted['folder'],'remove_immediately');
+					$mail_bo->deleteMessages($lastDrafted['uid'], $lastDrafted['folder'], 'remove_immediately');
 				}
 			}
 			catch (Api\Exception $e)
@@ -3090,22 +3089,22 @@ 
 		unset($this->sessionData['lastDrafted']);
 
 		//error_log("handling draft messages, flagging and such");
-		if((isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
+		if ((isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
 			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
 			// mark message as answered
 			$mail_bo->openConnection();
-			$mail_bo->reopen(($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
+			$mail_bo->reopen(($this->sessionData['messageFolder'] ? $this->sessionData['messageFolder'] : $this->sessionData['sourceFolder']));
 			// if the draft folder is a starting part of the messages folder, the draft message will be deleted after the send
 			// unless your templatefolder is a subfolder of your draftfolder, and the message is in there
 			if ($mail_bo->isDraftFolder($this->sessionData['messageFolder']) && !$mail_bo->isTemplateFolder($this->sessionData['messageFolder']))
 			{
 				try // message may be deleted already, as it maybe done by autosave
 				{
-					if ($_formData['mode']=='composefromdraft' &&
+					if ($_formData['mode'] == 'composefromdraft' &&
 						!(($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on') && $this->sessionData['attachments']))
 					{
 						//error_log(__METHOD__.__LINE__."#".$this->sessionData['uid'].'#'.$this->sessionData['messageFolder']);
-						$mail_bo->deleteMessages(array($this->sessionData['uid']),$this->sessionData['messageFolder']);
+						$mail_bo->deleteMessages(array($this->sessionData['uid']), $this->sessionData['messageFolder']);
 					}
 				}
 				catch (Api\Exception $e)
@@ -3114,14 +3113,14 @@ 
 					unset($e);
 				}
 			} else {
-				$mail_bo->flagMessages("answered", $this->sessionData['uid'],($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
+				$mail_bo->flagMessages("answered", $this->sessionData['uid'], ($this->sessionData['messageFolder'] ? $this->sessionData['messageFolder'] : $this->sessionData['sourceFolder']));
 				//error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData)).':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
-				if (array_key_exists('forwardFlag',$this->sessionData) && $this->sessionData['forwardFlag']=='forwarded')
+				if (array_key_exists('forwardFlag', $this->sessionData) && $this->sessionData['forwardFlag'] == 'forwarded')
 				{
 					try
 					{
 						//error_log(__METHOD__.__LINE__.':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
-						$mail_bo->flagMessages("forwarded", $this->sessionData['forwardedUID'],$this->sessionData['sourceFolder']);
+						$mail_bo->flagMessages("forwarded", $this->sessionData['forwardedUID'], $this->sessionData['sourceFolder']);
 					}
 					catch (Api\Exception $e)
 					{
@@ -3149,18 +3148,18 @@ 
 		if (is_array($this->sessionData['bcc'])) $mailaddresses['bcc'] = $this->sessionData['bcc'];
 		if (!empty($mailaddresses)) $mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
 
-		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' )
+		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on')
 		{
-			foreach(array('to_infolog','to_tracker','to_calendar') as $app_key)
+			foreach (array('to_infolog', 'to_tracker', 'to_calendar') as $app_key)
 			{
 				if ($_formData[$app_key] == 'on')
 				{
-					$app_name = substr($app_key,3);
+					$app_name = substr($app_key, 3);
 					// Get registered hook data of the app called for integration
-					$hook = Api\Hooks::single(array('location'=> 'mail_import'),$app_name);
+					$hook = Api\Hooks::single(array('location'=> 'mail_import'), $app_name);
 
 					// store mail / eml in temp. file to not have to download it from mail-server again
-					$eml = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'mail_integrate');
+					$eml = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'mail_integrate');
 					$eml_fp = fopen($eml, 'w');
 					stream_copy_to_stream($mail->getRaw(), $eml_fp);
 					fclose($eml_fp);
@@ -3170,24 +3169,24 @@ 
 					// be stored from registered app method later
 					Framework::popup(Egw::link('/index.php', array(
 						'menuaction' => $hook['menuaction'],
-						'egw_data' => Link::set_data(null,'mail_integration::integrate',array(
+						'egw_data' => Link::set_data(null, 'mail_integration::integrate', array(
 							$mailaddresses,
 							$this->sessionData['subject'],
 							$this->convertHTMLToText($this->sessionData['body']),
 							$this->sessionData['attachments'],
 							false, // date
 							$eml,
-							$_formData['serverID']),true),
+							$_formData['serverID']), true),
 						'app' => $app_name
-					)),'_blank',$hook['popup']);
+					)), '_blank', $hook['popup']);
 				}
 			}
 		}
 		// only clean up temp-files, if we dont need them for mail_integration::integrate
-		elseif(is_array($this->sessionData['attachments']))
+		elseif (is_array($this->sessionData['attachments']))
 		{
-			foreach($this->sessionData['attachments'] as $value) {
-				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs') {	// happens when forwarding mails
+			foreach ($this->sessionData['attachments'] as $value) {
+				if (!empty($value['file']) && parse_url($value['file'], PHP_URL_SCHEME) != 'vfs') {	// happens when forwarding mails
 					unlink($GLOBALS['egw_info']['server']['temp_dir'].'/'.$value['file']);
 				}
 			}
@@ -3204,7 +3203,7 @@ 
 	 * @param array $content
 	 * @return array - the input, enriched with some not set attributes
 	 */
-	function setDefaults($content=array())
+	function setDefaults($content = array())
 	{
 		// if there's not already an identity selected for current account
 		if (empty($content['mailidentity']))
@@ -3213,7 +3212,7 @@ 
 			if (!empty($GLOBALS['egw_info']['user']['preferences']['mail']['LastSignatureIDUsed']))
 			{
 				$sigPref = $GLOBALS['egw_info']['user']['preferences']['mail']['LastSignatureIDUsed'];
-				if (!empty($sigPref[$this->mail_bo->profileID]) && $sigPref[$this->mail_bo->profileID]>0)
+				if (!empty($sigPref[$this->mail_bo->profileID]) && $sigPref[$this->mail_bo->profileID] > 0)
 				{
 					$content['mailidentity'] = $sigPref[$this->mail_bo->profileID];
 				}
@@ -3222,7 +3221,7 @@ 
 			if (empty($content['mailidentity']))
 			{
 				$default_identity = null;
-				foreach(Mail\Account::identities($this->mail_bo->profileID, true, 'params') as $identity)
+				foreach (Mail\Account::identities($this->mail_bo->profileID, true, 'params') as $identity)
 				{
 					if (!isset($default_identity)) $default_identity = $identity['ident_id'];
 					if (!empty($identity['ident_signature']))
@@ -3237,7 +3236,7 @@ 
 		if (!isset($content['mimeType']) || empty($content['mimeType']))
 		{
 			$content['mimeType'] = 'html';
-			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text") $content['mimeType']  = 'plain';
+			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions'] == "text") $content['mimeType'] = 'plain';
 		}
 		return $content;
 
@@ -3260,7 +3259,7 @@ 
 	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 * @return type
 	 */
-	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) {
+	function ajax_searchFolder($_searchStringLength = 2, $_returnList = false, $_mailaccountToSearch = null, $_noPrefixId = false) {
 		//error_log(__METHOD__.__LINE__.':'.array2string($_REQUEST));
 		static $useCacheIfPossible = null;
 		if (is_null($useCacheIfPossible)) $useCacheIfPossible = true;
@@ -3273,36 +3272,36 @@ 
 		{
 			$this->changeProfile($_mailaccountToSearch);
 		}
-		if (strlen($_searchString)>=$_searchStringLength && isset($this->mail_bo->icServer))
+		if (strlen($_searchString) >= $_searchStringLength && isset($this->mail_bo->icServer))
 		{
 			//error_log(__METHOD__.__LINE__.':'.$this->mail_bo->icServer->ImapServerId);
 			$this->mail_bo->openConnection($this->mail_bo->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($_searchString).'<->'.$searchString);
-			$folderObjects = $this->mail_bo->getFolderObjects(true,false,true,$useCacheIfPossible);
-			if (count($folderObjects)<=1) {
+			$folderObjects = $this->mail_bo->getFolderObjects(true, false, true, $useCacheIfPossible);
+			if (count($folderObjects) <= 1) {
 				$useCacheIfPossible = false;
 			}
 			else
 			{
 				$useCacheIfPossible = true;
 			}
-			$searchString = Api\Translation::convert($_searchString, Mail::$displayCharset,'UTF7-IMAP');
+			$searchString = Api\Translation::convert($_searchString, Mail::$displayCharset, 'UTF7-IMAP');
 			foreach ($folderObjects as $k =>$fA)
 			{
 				//error_log(__METHOD__.__LINE__.$_searchString.'/'.$searchString.' in '.$k.'->'.$fA->displayName);
-				$f=false;
-				$key = $_noPrefixId?$k:$_mailaccountToSearch.'::'.$k;
-				if ($_searchStringLength<=0)
+				$f = false;
+				$key = $_noPrefixId ? $k : $_mailaccountToSearch.'::'.$k;
+				if ($_searchStringLength <= 0)
 				{
-					$f=true;
+					$f = true;
 					$results[] = array('id'=>$key, 'label' => htmlspecialchars($fA->displayName));
 				}
-				if ($f==false && stripos($fA->displayName,$_searchString)!==false)
+				if ($f == false && stripos($fA->displayName, $_searchString) !== false)
 				{
-					$f=true;
+					$f = true;
 					$results[] = array('id'=>$key, 'label' => htmlspecialchars($fA->displayName));
 				}
-				if ($f==false && stripos($k,$searchString)!==false)
+				if ($f == false && stripos($k, $searchString) !== false)
 				{
 					$results[] = array('id'=>$key, 'label' => htmlspecialchars($fA->displayName));
 				}
@@ -3330,13 +3329,13 @@ 
 		exit();
 	}
 
-	public static function ajax_searchAddress($_searchStringLength=2) {
+	public static function ajax_searchAddress($_searchStringLength = 2) {
 		//error_log(__METHOD__. "request from seachAddress " . $_REQUEST['query']);
 		$_searchString = trim($_REQUEST['query']);
 		$include_lists = (boolean)$_REQUEST['include_lists'];
 
 		$contacts_obj = new Api\Contacts();
-		if ($GLOBALS['egw_info']['user']['apps']['addressbook'] && strlen($_searchString)>=$_searchStringLength)
+		if ($GLOBALS['egw_info']['user']['apps']['addressbook'] && strlen($_searchString) >= $_searchStringLength)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($_searchString));
 			$showAccounts = empty($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']);
@@ -3345,64 +3344,64 @@ 
 			{
 				if (mb_strlen($v) < 3) unset($search[$k]);
 			}
-			$search_str = implode(' +', $search);	// tell contacts/so_sql to AND search patterns
+			$search_str = implode(' +', $search); // tell contacts/so_sql to AND search patterns
 			//error_log(__METHOD__.__LINE__.$_searchString);
 			$filter = $showAccounts ? array() : array('account_id' => null);
-			$filter['cols_to_search'] = array('n_prefix','n_given','n_family','org_name','email','email_home');
-			$cols = array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home');
-			$contacts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false, 'OR', array(0,100), $filter);
+			$filter['cols_to_search'] = array('n_prefix', 'n_given', 'n_family', 'org_name', 'email', 'email_home');
+			$cols = array('n_fn', 'n_prefix', 'n_given', 'n_family', 'org_name', 'email', 'email_home');
+			$contacts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false, 'OR', array(0, 100), $filter);
 			// additionally search the accounts, if the contact storage is not the account storage
 			if ($showAccounts && $contacts_obj->so_accounts)
 			{
 				$filter['owner'] = 0;
-				$accounts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false,'OR', array(0,100), $filter);
+				$accounts = $contacts_obj->search($search_str, $cols, 'n_fn', '', '%', false, 'OR', array(0, 100), $filter);
 
 				if ($contacts && $accounts)
 				{
-					$contacts = array_merge($contacts,$accounts);
-					usort($contacts,function($a, $b)
+					$contacts = array_merge($contacts, $accounts);
+					usort($contacts, function($a, $b)
 					{
 						return strcasecmp($a['n_fn'], $b['n_fn']);
 					});
 				}
-				elseif($accounts)
+				elseif ($accounts)
 				{
-					$contacts =& $accounts;
+					$contacts = & $accounts;
 				}
 				unset($accounts);
 			}
 		}
 		$results = array();
-		if(is_array($contacts)) {
-			foreach($contacts as $contact) {
-				foreach(array($contact['email'],$contact['email_home']) as $email) {
+		if (is_array($contacts)) {
+			foreach ($contacts as $contact) {
+				foreach (array($contact['email'], $contact['email_home']) as $email) {
 					// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 					//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 					$rfcAddr = Mail::parseAddressList($email);
-					$_rfcAddr=$rfcAddr->first();
+					$_rfcAddr = $rfcAddr->first();
 					if (!$_rfcAddr->valid)
 					{
 						continue; // skip address if we encounter an error here
 					}
 					$email = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
 
-					if (method_exists($contacts_obj,'search'))
+					if (method_exists($contacts_obj, 'search'))
 					{
-						$contact['n_fn']='';
+						$contact['n_fn'] = '';
 						if (!empty($contact['n_prefix'])) $contact['n_fn'] = $contact['n_prefix'];
-						if (!empty($contact['n_given'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
-						if (!empty($contact['n_family'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
-						if (!empty($contact['org_name'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
-						$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
+						if (!empty($contact['n_given'])) $contact['n_fn'] .= ($contact['n_fn'] ? ' ' : '').$contact['n_given'];
+						if (!empty($contact['n_family'])) $contact['n_fn'] .= ($contact['n_fn'] ? ' ' : '').$contact['n_family'];
+						if (!empty($contact['org_name'])) $contact['n_fn'] .= ($contact['n_fn'] ? ' ' : '').'('.$contact['org_name'].')';
+						$contact['n_fn'] = str_replace(array(',', '@'), ' ', $contact['n_fn']);
 					}
 					else
 					{
-						$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
+						$contact['n_fn'] = str_replace(array(',', '@'), ' ', $contact['n_fn']);
 					}
 					$args = explode('@', trim($email));
 					$args[] = trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']);
 					$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
-					if(!empty($email) && in_array($completeMailString ,$results) === false) {
+					if (!empty($email) && in_array($completeMailString, $results) === false) {
 						$results[] = array(
 							'id'=>$completeMailString,
 							'label' => $completeMailString,
@@ -3418,10 +3417,10 @@ 
 		// Add groups
 		$group_options = array('account_type' => 'groups');
 		$groups = $GLOBALS['egw']->accounts->link_query($_searchString, $group_options);
-		foreach($groups as $g_id => $name)
+		foreach ($groups as $g_id => $name)
 		{
 			$group = $GLOBALS['egw']->accounts->read($g_id);
-			if(!$group['account_email']) continue;
+			if (!$group['account_email']) continue;
 			$args = explode('@', trim($group['account_email']));
 			$args[] = $name;
 			$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
@@ -3434,7 +3433,7 @@ 
 		}
 
 		// Add up to 5 matching mailing lists
-		if($include_lists)
+		if ($include_lists)
 		{
 			$lists = array_filter(
 				$contacts_obj->get_lists(Acl::READ),
@@ -3443,7 +3442,7 @@ 
 				}
 			);
 			$list_count = 0;
-			foreach($lists as $key => $list_name)
+			foreach ($lists as $key => $list_name)
 			{
 				$results[] = array(
 					'id'	=> $key,
@@ -3453,7 +3452,7 @@ 
 					'title' => lang('Mailinglist'),
 					'data'	=> $key
 				);
-				if($list_count++ > 5) break;
+				if ($list_count++ > 5) break;
 			}
 		}
 		 // switch regular JSON response handling off
@@ -3474,7 +3473,7 @@ 
 	public function ajax_merge($contact_id)
 	{
 		$response = Api\Json\Response::get();
-		if(class_exists($_REQUEST['merge']) && is_subclass_of($_REQUEST['merge'], 'EGroupware\\Api\\Storage\\Merge'))
+		if (class_exists($_REQUEST['merge']) && is_subclass_of($_REQUEST['merge'], 'EGroupware\\Api\\Storage\\Merge'))
 		{
 			$document_merge = new $_REQUEST['merge']();
 		}
@@ -3484,7 +3483,7 @@ 
 		}
 		$this->mail_bo->openConnection();
 
-		if(($error = $document_merge->check_document($_REQUEST['document'],'')))
+		if (($error = $document_merge->check_document($_REQUEST['document'], '')))
 		{
 			$response->error($error);
 			return;
@@ -3493,20 +3492,20 @@ 
 		// Actually do the merge
 		$folder = $merged_mail_id = null;
 		$results = $this->mail_bo->importMessageToMergeAndSend(
-			$document_merge, Vfs::PREFIX . $_REQUEST['document'],
+			$document_merge, Vfs::PREFIX.$_REQUEST['document'],
 			// Send an extra non-numeric ID to force actual send of document
 			// instead of save as draft
 			array((int)$contact_id, ''),
-			$folder,$merged_mail_id
+			$folder, $merged_mail_id
 		);
 
-		if($results['success'])
+		if ($results['success'])
 		{
-			$response->data(implode(',',$results['success']));
+			$response->data(implode(',', $results['success']));
 		}
-		if($results['failed'])
+		if ($results['failed'])
 		{
-			$response->error(implode(',',$results['failed']));
+			$response->error(implode(',', $results['failed']));
 		}
 	}
 }

Braces +799 added lines, -268 removed lines

@@ -82,7 +82,10 @@ 
 		{
 			$this->mailPreferences['message_forwarding'] = 'asmail';
 		}
-		if (is_null(Mail::$mailConfig)) Mail::$mailConfig = Api\Config::read('mail');
+		if (is_null(Mail::$mailConfig))
+		{
+			Mail::$mailConfig = Api\Config::read('mail');
+		}
 
 		$this->mailPreferences  =& $this->mail_bo->mailPreferences;
 	}
@@ -96,11 +99,21 @@ 
 	{
 		if ($this->mail_bo->profileID!=$_icServerID)
 		{
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.'->'.$this->mail_bo->profileID.'<->'.$_icServerID);
+			}
 			$this->mail_bo = Mail::getInstance(false,$_icServerID);
-			if (Mail::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
+			if (Mail::$debug)
+			{
+				error_log(__METHOD__.__LINE__.' Fetched IC Server:'.$this->mail_bo->profileID.':'.function_backtrace());
+			}
 			// no icServer Object: something failed big time
-			if (!isset($this->mail_bo->icServer)) exit; // ToDo: Exception or the dialog for setting up a server config
+			if (!isset($this->mail_bo->icServer))
+			{
+				exit;
+			}
+			// ToDo: Exception or the dialog for setting up a server config
 			$this->mail_bo->openConnection($this->mail_bo->profileID);
 			$this->mailPreferences  =& $this->mail_bo->mailPreferences;
 		}
@@ -241,7 +254,8 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' ))) {
+				if (!in_array($key, array('send','button[saveAsDraft]','uploadForCompose' )))
+				{
 					$actions[$key]['toolbarDefault'] = false;
 				}
 			}
@@ -261,7 +275,10 @@ 
 	 */
 	function compose(array $_content=null,$msg=null, $_focusElement='to',$suppressSigOnTop=false, $isReply=false)
 	{
-		if ($msg) Framework::message($msg);
+		if ($msg)
+		{
+			Framework::message($msg);
+		}
 
 		if (!empty($GLOBALS['egw_info']['user']['preferences']['mail']['LastSignatureIDUsed']))
 		{
@@ -282,8 +299,14 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($_content).function_backtrace());
 		$_contentHasSigID = $_content?array_key_exists('mailidentity',(array)$_content):false;
 		$_contentHasMimeType = $_content? array_key_exists('mimeType',(array)$_content):false;
-		if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id'];
-		if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id'];
+		if (isset($_GET['reply_id']))
+		{
+			$replyID = $_GET['reply_id'];
+		}
+		if (!$replyID && isset($_GET['id']))
+		{
+			$replyID = $_GET['id'];
+		}
 
 		// Process different places we can use as a start for composing an email
 		$actionToProcess = 'compose';
@@ -350,7 +373,10 @@ 
 			$suppressSigOnTop = true;
 			foreach ($_content['uploadForCompose'] as $i => &$upload)
 			{
-				if (!isset($upload['file'])) $upload['file'] = $upload['tmp_name'];
+				if (!isset($upload['file']))
+				{
+					$upload['file'] = $upload['tmp_name'];
+				}
 				try
 				{
 					$upload['file'] = $upload['tmp_name'] = Mail::checkFileBasics($upload,$this->composeID,false);
@@ -384,9 +410,15 @@ 
 				$remove=false;
 				foreach(array_keys($toDelete) as $k)
 				{
-					if ($att['tmp_name']==$k) $remove=true;
+					if ($att['tmp_name']==$k)
+					{
+						$remove=true;
+					}
+				}
+				if (!$remove)
+				{
+					$_content['attachments'][] = $att;
 				}
-				if (!$remove) $_content['attachments'][] = $att;
 			}
 		}
 		// someone clicked something like send, or saveAsDraft
@@ -401,8 +433,7 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($_content));
 		if (!empty($_content['serverID']) && $_content['serverID'] != $this->mail_bo->profileID &&
 			($_content['composeToolbar'] === 'send' || $_content['button']['saveAsDraft']||$_content['button']['saveAsDraftAndPrint'])
-		)
-		{
+		) {
 			$this->changeProfile($_content['serverID']);
 			$composeProfile = $this->mail_bo->profileID;
 		}
@@ -482,7 +513,10 @@ 
 							//$this->sessionData['uid'][] = $fhA['msgUID'];
 							//$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
 							$idsForRefresh[] = mail_ui::generateRowID($fhA['profileID'], $fhA['folder'], $fhA['msgUID'], $_prependApp=false);
-							if (!empty($fhA['folder'])) $workingFolder = $fhA['folder'];
+							if (!empty($fhA['folder']))
+							{
+								$workingFolder = $fhA['folder'];
+							}
 						}
 					}
 					if ($_content['mode']=='reply' && !empty($_content['processedmail_id']))
@@ -533,7 +567,10 @@ 
 			}
 		}
 
-		if ($activeProfile != $composeProfile) $this->changeProfile($activeProfile);
+		if ($activeProfile != $composeProfile)
+		{
+			$this->changeProfile($activeProfile);
+		}
 		$insertSigOnTop = false;
 		$content = (is_array($_content)?$_content:array());
 		if ($_contentHasMimeType)
@@ -562,7 +599,10 @@ 
 				{
 					foreach ($contentArr as $k =>&$elem)
 					{
-						if (stripos($elem,'<pre>')!==false) $elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						if (stripos($elem,'<pre>')!==false)
+						{
+							$elem = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$elem);
+						}
 					}
 					$content['mail_htmltext'] = implode('',$contentArr);
 				}
@@ -599,8 +639,7 @@ 
 		if ( !empty($content['body']) &&
 			(!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount']) ||
 			(!empty($composeCache['mailidentity']) && !empty($_content['mailidentity']) && $_content['mailidentity'] != $composeCache['mailidentity'])
-		)
-		{
+		) {
 			$buttonClicked = true;
 			$suppressSigOnTop = true;
 			if (!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount'])
@@ -616,7 +655,10 @@ 
 				else
 				{
 					$newSig = $this->mail_bo->getDefaultIdentity();
-					if ($newSig === false) $newSig = -2;
+					if ($newSig === false)
+					{
+						$newSig = -2;
+					}
 				}
 			}
 			$_oldSig = $composeCache['mailidentity'];
@@ -624,7 +666,10 @@ 
 			$_currentMode = $_content['mimeType'];
 			if ($_oldSig != $_signatureid)
 			{
-				if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				if($this->_debug)
+				{
+					error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
+				}
 				// prepare signatures, the selected sig may be used on top of the body
 				try
 				{
@@ -654,7 +699,10 @@ 
 				{
 					$oldSigText = $this->convertHTMLToText($oldSigText,true,true);
 					$sigText = $this->convertHTMLToText($sigText,true,true);
-					if($this->_debug) error_log(__METHOD__." Old signature:".$oldSigText);
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Old signature:".$oldSigText);
+					}
 				}
 
 				//$oldSigText = Mail::merge($oldSigText,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
@@ -670,7 +718,11 @@ 
 				{
 					$content['body'] = str_replace("\n",'\n',$content['body']);	// dont know why, but \n screws up preg_replace
 					$styles = Mail::getStyles(array(array('body'=>$content['body'])));
-					if (stripos($content['body'],'style')!==false) Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true); // clean out empty or pagewide style definitions / left over tags
+					if (stripos($content['body'],'style')!==false)
+					{
+						Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true);
+					}
+					// clean out empty or pagewide style definitions / left over tags
 				}
 				$content['body'] = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($content['body'],Mail::$htmLawed_config,array(),true):$content['body']));
 				Mail::$htmLawed_config = $_htmlConfig;
@@ -714,8 +766,14 @@ 
 
 				if ($found === false)
 				{
-					if($this->_debug) error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
-					if($this->_debug) error_log(__METHOD__." Compare content:".$content['body']);
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Old Signature failed to match:".$oldSigTextCleaned);
+					}
+					if($this->_debug)
+					{
+						error_log(__METHOD__." Compare content:".$content['body']);
+					}
 				}
 				else
 				{
@@ -730,7 +788,10 @@ 
 		}
 
 		// do not double insert a signature on a server roundtrip
-		if ($buttonClicked) $suppressSigOnTop = true;
+		if ($buttonClicked)
+		{
+			$suppressSigOnTop = true;
+		}
 		if ($isFirstLoad)
 		{
 			$alwaysAttachVCardAtCompose = false; // we use this to eliminate double attachments, if users VCard is already present/attached
@@ -769,7 +830,8 @@ 
 							}
 						}
 						$content['subject'] = lang($app).' #'.$res['id'].': ';
-						foreach(array('subject','body','mimetype') as $name) {
+						foreach(array('subject','body','mimetype') as $name)
+						{
 							$sName = $name;
 							if ($name=='mimetype'&&$res[$name])
 							{
@@ -778,7 +840,10 @@ 
 							}
 							else
 							{
-								if ($res[$name]) $content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								if ($res[$name])
+								{
+									$content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								}
 							}
 						}
 					}
@@ -789,7 +854,8 @@ 
 			{
 				$alreadyProcessed=array();
 				//_debug_array($_REQUEST);
-				if ($_REQUEST['preset']['mailto']) {
+				if ($_REQUEST['preset']['mailto'])
+				{
 					// handle mailto strings such as
 					// mailto:larry,dan?cc=mike&bcc=sue&subject=test&body=type+your&body=message+here
 					// the above string may be htmlentyty encoded, then multiple body tags are supported
@@ -797,10 +863,12 @@ 
 					$tmp_send_to = (stripos($_REQUEST['preset']['mailto'],'mailto')===false?$_REQUEST['preset']['mailto']:trim(substr(html_entity_decode($_REQUEST['preset']['mailto']),7)));
 					// check if there is more than the to address
 					$mailtoArray = explode('?',$tmp_send_to,2);
-					if ($mailtoArray[1]) {
+					if ($mailtoArray[1])
+					{
 						// check if there are more than one requests
 						$addRequests = explode('&',$mailtoArray[1]);
-						foreach ($addRequests as $key => $reqval) {
+						foreach ($addRequests as $key => $reqval)
+						{
 							// the additional requests should have a =, to separate key from value.
 							$keyValuePair = explode('=',$reqval,2);
 							$content[$keyValuePair[0]] .= (strlen($content[$keyValuePair[0]])>0 ? ' ':'') . $keyValuePair[1];
@@ -809,17 +877,24 @@ 
 					$content['to']=$mailtoArray[0];
 					$alreadyProcessed['to']='to';
 					// if the mailto string is not htmlentity decoded the arguments are passed as simple requests
-					foreach(array('cc','bcc','subject','body') as $name) {
+					foreach(array('cc','bcc','subject','body') as $name)
+					{
 						$alreadyProcessed[$name]=$name;
-						if ($_REQUEST[$name]) $content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+						if ($_REQUEST[$name])
+						{
+							$content[$name] .= (strlen($content[$name])>0 ? ( $name == 'cc' || $name == 'bcc' ? ',' : ' ') : '') . $_REQUEST[$name];
+						}
 					}
 				}
 
-				if ($_REQUEST['preset']['mailtocontactbyid']) {
-					if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
+				if ($_REQUEST['preset']['mailtocontactbyid'])
+				{
+					if ($GLOBALS['egw_info']['user']['apps']['addressbook'])
+					{
 						$contacts_obj = new Api\Contacts();
 						$addressbookprefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
-						if (method_exists($contacts_obj,'search')) {
+						if (method_exists($contacts_obj,'search'))
+						{
 
 							$addressArray = explode(',',$_REQUEST['preset']['mailtocontactbyid']);
 							foreach ((array)$addressArray as $id => $addressID)
@@ -834,7 +909,10 @@ 
 							{
 								$_searchCond = array('contact_id'=>$addressArray);
 								//error_log(__METHOD__.__LINE__.$_searchString);
-								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
+								if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+								{
+									$showAccounts=false;
+								}
 								$filter = ($showAccounts?array():array('account_id' => null));
 								$filter['cols_to_search']=array('n_fn','email','email_home');
 								$contacts = $contacts_obj->search($_searchCond,array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,100),$filter);
@@ -857,21 +935,28 @@ 
 									unset($accounts);
 								}
 							}
-							if(is_array($contacts)) {
+							if(is_array($contacts))
+							{
 								$mailtoArray = array();
 								$primary = $addressbookprefs['distributionListPreferredMail'];
-								if ($primary != 'email' && $primary != 'email_home') $primary = 'email';
+								if ($primary != 'email' && $primary != 'email_home')
+								{
+									$primary = 'email';
+								}
 								$secondary = ($primary == 'email'?'email_home':'email');
 								//error_log(__METHOD__.__LINE__.array2string($contacts));
-								foreach($contacts as $contact) {
+								foreach($contacts as $contact)
+								{
 									$innerCounter=0;
-									foreach(array($contact[$primary],$contact[$secondary]) as $email) {
+									foreach(array($contact[$primary],$contact[$secondary]) as $email)
+									{
 										// use pref distributionListPreferredMail for the primary address
 										// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 										$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 										$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
 										$completeMailString = addslashes(trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']) .' <'. trim($email) .'>');
-										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false) {
+										if($innerCounter==0 && !empty($email) && in_array($completeMailString ,$mailtoArray) === false)
+										{
 											$i++;
 											$innerCounter++;
 											$mailtoArray[$i] = $completeMailString;
@@ -963,7 +1048,10 @@ 
 							}
 						}
 					}
-					if(!empty($remember)) $content = array_merge($content,$remember);
+					if(!empty($remember))
+					{
+						$content = array_merge($content,$remember);
+					}
 				}
 				foreach(array('to','cc','bcc','subject','body','mimeType') as $name)
 				{
@@ -973,9 +1061,15 @@ 
 						$_content[$name]=$content[$name]=$_REQUEST['preset'][$name];
 					}
 					//skip if already processed by "preset Routines"
-					if ($alreadyProcessed[$name]) continue;
+					if ($alreadyProcessed[$name])
+					{
+						continue;
+					}
 					//error_log(__METHOD__.__LINE__.':'.$name.'->'. $_REQUEST['preset'][$name]);
-					if ($_REQUEST['preset'][$name]) $content[$name] = $_REQUEST['preset'][$name];
+					if ($_REQUEST['preset'][$name])
+					{
+						$content[$name] = $_REQUEST['preset'][$name];
+					}
 				}
 			}
 			// is the to address set already?
@@ -983,7 +1077,10 @@ 
 			{
 				$content['to'] = base64_decode($_REQUEST['send_to']);
 				// first check if there is a questionmark or ampersand
-				if (strpos($content['to'],'?')!== false) list($content['to'],$rest) = explode('?',$content['to'],2);
+				if (strpos($content['to'],'?')!== false)
+				{
+					list($content['to'],$rest) = explode('?',$content['to'],2);
+				}
 				$content['to'] = html_entity_decode($content['to']);
 				if (($at_pos = strpos($content['to'],'@')) !== false)
 				{
@@ -996,9 +1093,15 @@ 
 						$content['to'] = $email;
 					}
 				}
-				if (strpos($content['to'],'%40')!== false) $content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				if (strpos($content['to'],'%40')!== false)
+				{
+					$content['to'] = Api\Html::purify(str_replace('%40','@',$content['to']));
+				}
 				$rarr = array(Api\Html::purify($rest));
-				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false) $rarr = explode('&',$rest);
+				if (isset($rest)&&!empty($rest) && strpos($rest,'&')!== false)
+				{
+					$rarr = explode('&',$rest);
+				}
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($rarr));
 				$karr = array();
 				foreach ($rarr as &$rval)
@@ -1014,9 +1117,15 @@ 
 				//error_log(__METHOD__.__LINE__.$content['to'].'->'.array2string($karr));
 				foreach(array('cc','bcc','subject','body') as $name)
 				{
-					if ($karr[$name]) $content[$name] = $karr[$name];
+					if ($karr[$name])
+					{
+						$content[$name] = $karr[$name];
+					}
+				}
+				if (!empty($_REQUEST['subject']))
+				{
+					$content['subject'] = Api\Html::purify(trim(html_entity_decode($_REQUEST['subject'])));
 				}
-				if (!empty($_REQUEST['subject'])) $content['subject'] = Api\Html::purify(trim(html_entity_decode($_REQUEST['subject'])));
 			}
 		}
 		//error_log(__METHOD__.__LINE__.array2string($content));
@@ -1034,7 +1143,10 @@ 
 				$_content['mimeType'] = $content['mimeType']  = 'html';
 				$content['body'] = "<pre>".$content['body']."</pre>";
 				// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-				if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				if (strpos($content['body'],"<pre> \r\n \r\n---")===0)
+				{
+					$content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+				}
 			}
 		}
 		else
@@ -1054,7 +1166,10 @@ 
 					$_content['mimeType'] = $content['mimeType']  = 'html';
 					$content['body'] = "<pre>".$content['body']."</pre>";
 					// take care this assumption is made on the creation of the reply header in bocompose::getReplyData
-					if (strpos($content['body'],"<pre> \r\n \r\n---")===0) $content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					if (strpos($content['body'],"<pre> \r\n \r\n---")===0)
+					{
+						$content['body'] = substr_replace($content['body']," <br>\r\n<pre>---",0,strlen("<pre> \r\n \r\n---")-1);
+					}
 				}
 			}
 		}
@@ -1092,24 +1207,33 @@ 
 			$disableRuler = true;
 		}
 		$font_span = $font_part = '';
-		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
+		if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/)
+		{
 			// User preferences for style
 			$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 			$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
 			$font_part = '<span style="width:100%; display: inline; '.($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">';
 			$font_span = $font_part.'&#8203;</span>';
-			if (empty($font) && empty($font_size)) $font_span = '';
+			if (empty($font) && empty($font_size))
+			{
+				$font_span = '';
+			}
 		}
 		// the font span should only be applied on first load or on switch plain->html and the absence of the font_part of the span
-		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false) $font_span = '';
+		if (!$isFirstLoad && !empty($font_span) && stripos($content['body'],$font_part)===false)
+		{
+			$font_span = '';
+		}
 		//remove possible html header stuff
-		if (stripos($content['body'],'<html><head></head><body>')!==false) $content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		if (stripos($content['body'],'<html><head></head><body>')!==false)
+		{
+			$content['body'] = str_ireplace(array('<html><head></head><body>','</body></html>'),array('',''),$content['body']);
+		}
 		//error_log(__METHOD__.__LINE__.array2string($this->mailPreferences));
 		$blockElements = array('address','blockquote','center','del','dir','div','dl','fieldset','form','h1','h2','h3','h4','h5','h6','hr','ins','isindex','menu','noframes','noscript','ol','p','pre','table','ul');
 		if ($this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend' &&
 			!(isset($_POST['mySigID']) && !empty($_POST['mySigID']) ) && !$suppressSigOnTop
-		)
-		{
+		) {
 			// ON tOP OR BELOW? pREF CAN TELL
 			/*
 				Signature behavior preference changed. New default, if not set -> 0
@@ -1124,14 +1248,23 @@ 
 				$sigTextStartsWithBlockElement = ($disableRuler?false:true);
 				foreach($blockElements as $e)
 				{
-					if ($sigTextStartsWithBlockElement) break;
-					if (stripos(trim($sigText),'<'.$e)===0) $sigTextStartsWithBlockElement = true;
+					if ($sigTextStartsWithBlockElement)
+					{
+						break;
+					}
+					if (stripos(trim($sigText),'<'.$e)===0)
+					{
+						$sigTextStartsWithBlockElement = true;
+					}
 				}
 			}
-			if($content['mimeType'] == 'html') {
+			if($content['mimeType'] == 'html')
+			{
 				$before = $disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">';
 				$inbetween = '';
-			} else {
+			}
+			else
+			{
 				$before = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
 				$inbetween = "\r\n";
 			}
@@ -1175,16 +1308,24 @@ 
 		//$content['bcc'] = array('kl@stylite.de','kl@leithoff.net');
 		// address stuff like from, to, cc, replyto
 		$destinationRows = 0;
-		foreach(self::$destinations as $destination) {
+		foreach(self::$destinations as $destination)
+		{
 			if (!is_array($content[$destination]))
 			{
-				if (!empty($content[$destination])) $content[$destination] = (array)$content[$destination];
+				if (!empty($content[$destination]))
+				{
+					$content[$destination] = (array)$content[$destination];
+				}
 			}
 			$addr_content = $content[strtolower($destination)];
 			// we clear the given address array and rebuild it
 			unset($content[strtolower($destination)]);
-			foreach((array)$addr_content as $key => $value) {
-				if ($value=="NIL@NIL") continue;
+			foreach((array)$addr_content as $key => $value)
+			{
+				if ($value=="NIL@NIL")
+				{
+					continue;
+				}
 				if ($destination=='replyto' && str_replace('"','',$value) ==
 					str_replace('"','',$identities[$this->mail_bo->getDefaultIdentity()]))
 				{
@@ -1194,8 +1335,12 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.array2string(array('key'=>$key,'value'=>$value)));
 				$value = str_replace("\"\"",'"', htmlspecialchars_decode($value, ENT_COMPAT));
-				foreach(Mail::parseAddressList($value) as $addressObject) {
-					if ($addressObject->host == '.SYNTAX-ERROR.') continue;
+				foreach(Mail::parseAddressList($value) as $addressObject)
+				{
+					if ($addressObject->host == '.SYNTAX-ERROR.')
+					{
+						continue;
+					}
 					$address = imap_rfc822_write_address($addressObject->mailbox,$addressObject->host,$addressObject->personal);
 					//$address = Mail::htmlentities($address, $this->displayCharset);
 					$content[strtolower($destination)][]=$address;
@@ -1206,11 +1351,20 @@ 
 		if ($_content)
 		{
 			//input array of _content had no signature information but was seeded later, and content has a valid setting
-			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content)) unset($_content['mailidentity']);
+			if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content))
+			{
+				unset($_content['mailidentity']);
+			}
 			$content = array_merge($content,$_content);
 
-			if (!empty($content['folder'])) $sel_options['folder']=$this->ajax_searchFolder(0,true);
-			if (empty($content['mailaccount'])) $content['mailaccount'] = $this->mail_bo->profileID;
+			if (!empty($content['folder']))
+			{
+				$sel_options['folder']=$this->ajax_searchFolder(0,true);
+			}
+			if (empty($content['mailaccount']))
+			{
+				$content['mailaccount'] = $this->mail_bo->profileID;
+			}
 		}
 		else
 		{
@@ -1253,11 +1407,17 @@ 
 		//error_log(__METHOD__.__LINE__.' ComposeID:'.$preserv['composeID']);
 		$preserv['is_html'] = $content['is_html'];
 		$preserv['is_plain'] = $content['is_plain'];
-		if (isset($content['mimeType'])) $preserv['mimeType'] = $content['mimeType'];
+		if (isset($content['mimeType']))
+		{
+			$preserv['mimeType'] = $content['mimeType'];
+		}
 		$sel_options['mimeType'] = self::$mimeTypes;
 		$sel_options['priority'] = self::$priorities;
 		$sel_options['filemode'] = Vfs\Sharing::$modes;
-		if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3;
+		if (!isset($content['priority']) || empty($content['priority']))
+		{
+			$content['priority']=3;
+		}
 		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new Etemplate('mail.compose');
 
@@ -1304,9 +1464,12 @@ 
 		$preserv['list-id'] = $content['list-id'];
 		$preserv['mode'] = $content['mode'];
 		// convert it back to checkbox expectations
-		if($content['mimeType'] == 'html') {
+		if($content['mimeType'] == 'html')
+		{
 			$content['mimeType']=1;
-		} else {
+		}
+		else
+		{
 			$content['mimeType']=0;
 		}
 		// set the current selected mailaccount as param for folderselection
@@ -1317,7 +1480,10 @@ 
 		// Resolve distribution list before send content to client
 		foreach(array('to', 'cc', 'bcc', 'replyto')  as $f)
 		{
-			if (is_array($content[$f])) $content[$f]= self::resolveEmailAddressList ($content[$f]);
+			if (is_array($content[$f]))
+			{
+				$content[$f]= self::resolveEmailAddressList ($content[$f]);
+			}
 		}
 
 		$content['to'] = self::resolveEmailAddressList($content['to']);
@@ -1365,7 +1531,10 @@ 
 				case 'composefromdraft':
 				case 'composeasnew':
 					$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
-					if ($from =='composefromdraft') $content['mode'] = 'composefromdraft';
+					if ($from =='composefromdraft')
+					{
+						$content['mode'] = 'composefromdraft';
+					}
 					$content['processedmail_id'] = $mail_id;
 
 					$_focusElement = 'body';
@@ -1413,7 +1582,10 @@ 
 			$document_merge = new $merge_class();
 			$this->mail_bo->openConnection();
 			$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
-			if (!is_array($merge_ids)) $merge_ids = explode(',',$merge_ids);
+			if (!is_array($merge_ids))
+			{
+				$merge_ids = explode(',',$merge_ids);
+			}
 			try
 			{
 				$merged_mail_id = '';
@@ -1444,7 +1616,10 @@ 
 				{
 					$success = implode(', ',$results['success']);
 					$fail = implode(', ', $results['failed']);
-					if($success) Framework::message($success, 'success');
+					if($success)
+					{
+						Framework::message($success, 'success');
+					}
 					Framework::window_close($fail);
 				}
 			}
@@ -1476,17 +1651,25 @@ 
 	{
 		$stripalltags = true;
 		// third param is stripalltags, we may not need that, if the source is already in ascii
-		if (!$sourceishtml) $stripalltags=false;
+		if (!$sourceishtml)
+		{
+			$stripalltags=false;
+		}
 		return Api\Mail\Html::convertHTMLToText($_html,$this->displayCharset,$stripcrl,$stripalltags);
 	}
 
 	function generateRFC822Address($_addressObject)
 	{
-		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host) {
+		if($_addressObject->personal && $_addressObject->mailbox && $_addressObject->host)
+		{
 			return sprintf('"%s" <%s@%s>', $this->mail_bo->decode_header($_addressObject->personal), $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} elseif($_addressObject->mailbox && $_addressObject->host) {
+		}
+		elseif($_addressObject->mailbox && $_addressObject->host)
+		{
 			return sprintf("%s@%s", $_addressObject->mailbox, $this->mail_bo->decode_header($_addressObject->host,'FORCE'));
-		} else {
+		}
+		else
+		{
 			return $this->mail_bo->decode_header($_addressObject->mailbox,true);
 		}
 	}
@@ -1520,16 +1703,28 @@ 
 		//if ($addHeadInfo['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $addHeadInfo['THREAD-TOPIC'];
 
 		//error_log(__METHOD__.__LINE__.array2string($headers));
-		if (!empty($addHeadInfo['X-MAILFOLDER'])) {
-			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val ) {
+		if (!empty($addHeadInfo['X-MAILFOLDER']))
+		{
+			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val )
+			{
 				$fval=$val;
 				$icServerID = $mail_bo->icServer->ImapServerId;
-				if (stripos($val,'::')!==false) list($icServerID,$fval) = explode('::',$val,2);
-				if ($icServerID != $mail_bo->icServer->ImapServerId) continue;
-				if ($mail_bo->folderExists($fval)) $this->sessionData['folder'][] = $val;
+				if (stripos($val,'::')!==false)
+				{
+					list($icServerID,$fval) = explode('::',$val,2);
+				}
+				if ($icServerID != $mail_bo->icServer->ImapServerId)
+				{
+					continue;
+				}
+				if ($mail_bo->folderExists($fval))
+				{
+					$this->sessionData['folder'][] = $val;
+				}
 			}
 		}
-		if (!empty($addHeadInfo['X-MAILIDENTITY'])) {
+		if (!empty($addHeadInfo['X-MAILIDENTITY']))
+		{
 			// with the new system it would be the identity
 			try
 			{
@@ -1545,7 +1740,8 @@ 
 			$this->sessionData['stationeryID'] = $addHeadInfo['X-STATIONERY'];
 		}
 		*/
-		if (!empty($addHeadInfo['X-MAILACCOUNT'])) {
+		if (!empty($addHeadInfo['X-MAILACCOUNT']))
+		{
 			// with the new system it would the identity is the account id
 			try
 			{
@@ -1560,27 +1756,38 @@ 
 			}
 		}
 		// if the message is located within the draft folder, add it as last drafted version (for possible cleanup on abort))
-		if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);//array('uid'=>$_uid,'folder'=>$_folder);
+		if ($mail_bo->isDraftFolder($_folder))
+		{
+			$this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);
+		}
+		//array('uid'=>$_uid,'folder'=>$_folder);
 		$this->sessionData['uid'] = $_uid;
 		$this->sessionData['messageFolder'] = $_folder;
 		$this->sessionData['isDraft'] = true;
 		$foundAddresses = array();
-		foreach((array)$headers['CC'] as $val) {
+		foreach((array)$headers['CC'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['cc'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['TO'] as $val) {
+		foreach((array)$headers['TO'] as $val)
+		{
 			if(!is_array($val))
 			{
 				$this->sessionData['to'][] = $val;
@@ -1588,42 +1795,59 @@ 
 			}
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (!$_rfcAddr->mailbox && !$_rfcAddr->host) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['to'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['REPLY-TO'] as $val) {
+		foreach((array)$headers['REPLY-TO'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['replyto'][] = $val;
 				$foundAddresses[$keyemail] = true;
 			}
 		}
 
-		foreach((array)$headers['BCC'] as $val) {
+		foreach((array)$headers['BCC'] as $val)
+		{
 			$rfcAddr=Mail::parseAddressList($val);
 			$_rfcAddr = $rfcAddr[0];
-			if (!$_rfcAddr->valid) continue;
-			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) ) {
+			if (!$_rfcAddr->valid)
+			{
+				continue;
+			}
+			if($_rfcAddr->mailbox == 'undisclosed-recipients' || (empty($_rfcAddr->mailbox) && empty($_rfcAddr->host)) )
+			{
 				continue;
 			}
 			$keyemail=$_rfcAddr->mailbox.'@'.$_rfcAddr->host;
-			if(!$foundAddresses[$keyemail]) {
+			if(!$foundAddresses[$keyemail])
+			{
 				$address = $this->mail_bo->decode_header($val,true);
 				$this->sessionData['bcc'][] = $val;
 				$foundAddresses[$keyemail] = true;
@@ -1637,32 +1861,46 @@ 
 		$bodyParts = $mail_bo->getMessageBody($_uid,'always_display', $_partID);
 		//_debug_array($bodyParts);
 		#$fromAddress = ($headers['FROM'][0]['PERSONAL_NAME'] != 'NIL') ? $headers['FROM'][0]['RFC822_EMAIL'] : $headers['FROM'][0]['EMAIL'];
-		if($bodyParts['0']['mimeType'] == 'text/html') {
+		if($bodyParts['0']['mimeType'] == 'text/html')
+		{
 			$this->sessionData['mimeType'] 	= 'html';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if($bodyParts[$i]['mimeType'] == 'text/plain')
+				{
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body']);
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"<br>":""). $bodyParts[$i]['body'] ;
 			}
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID);
 
-		} else {
+		}
+		else
+		{
 			$this->sessionData['mimeType']	= 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= "<hr>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 				$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ;
@@ -1670,8 +1908,10 @@ 
 			$this->sessionData['body'] = mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID,'plain');
 		}
 
-		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
-			foreach($attachments as $attachment) {
+		if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID)))
+		{
+			foreach($attachments as $attachment)
+			{
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				$cid = $attachment['cid'];
 				$match=null;
@@ -1693,7 +1933,8 @@ 
 
 	function getErrorInfo()
 	{
-		if(isset($this->errorInfo)) {
+		if(isset($this->errorInfo))
+		{
 			$errorInfo = $this->errorInfo;
 			unset($this->errorInfo);
 			return $errorInfo;
@@ -1708,7 +1949,8 @@ 
 			$modebuff = $this->mailPreferences['message_forwarding'];
 			$this->mailPreferences['message_forwarding'] = $_mode;
 		}
-		if  ($this->mailPreferences['message_forwarding'] == 'inline') {
+		if  ($this->mailPreferences['message_forwarding'] == 'inline')
+		{
 			$this->getReplyData('forward', $_icServer, $_folder, $_uid, $_partID);
 		}
 		$mail_bo    = $this->mail_bo;
@@ -1725,12 +1967,16 @@ 
 		//$this->sessionData['sourceFolder']=$_folder;
 		//$this->sessionData['forwardFlag']='forwarded';
 		//$this->sessionData['forwardedUID']=$_uid;
-		if  ($this->mailPreferences['message_forwarding'] == 'asmail') {
+		if  ($this->mailPreferences['message_forwarding'] == 'asmail')
+		{
 			$this->sessionData['mimeType']  = $this->mailPreferences['composeOptions'];
 			if($headers['SIZE'])
-				$size				= $headers['SIZE'];
-			else
-				$size				= lang('unknown');
+			{
+							$size				= $headers['SIZE'];
+			}
+			else {
+							$size				= lang('unknown');
+			}
 
 			$this->addMessageAttachment($_uid, $_partID, $_folder,
 				$mail_bo->decode_header(($headers['SUBJECT']?$headers['SUBJECT']:lang('no subject'))).'.eml',
@@ -1741,9 +1987,11 @@ 
 			unset($this->sessionData['in-reply-to']);
 			unset($this->sessionData['to']);
 			unset($this->sessionData['cc']);
-			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
+			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID)))
+			{
 				//error_log(__METHOD__.__LINE__.':'.array2string($attachments));
-				foreach($attachments as $attachment) {
+				foreach($attachments as $attachment)
+				{
 					if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])))
 					{
 						$this->addMessageAttachment($_uid, $attachment['partID'],
@@ -1799,7 +2047,10 @@ 
 			{
 				if ($attach['name'] && $attach['name'] == $_formData['name'] &&
 					strtolower($_formData['type'])== strtolower($attach['type']) &&
-					stripos($_formData['file'],'vfs://') !== false) return;
+					stripos($_formData['file'],'vfs://') !== false)
+				{
+					return;
+				}
 			}
 		}
 		if ($attachfailed === false)
@@ -1811,7 +2062,10 @@ 
 				'tmp_name'	=> $tmpFileName,
 				'size'	=> $_formData['size']
 			);
-			if (!is_array($_content['attachments'])) $_content['attachments']=array();
+			if (!is_array($_content['attachments']))
+			{
+				$_content['attachments']=array();
+			}
 			$_content['attachments'][] = $buffer;
 			unset($buffer);
 		}
@@ -1841,7 +2095,10 @@ 
 		{
 			foreach($request->preserv['attachments'] as $attachment)
 			{
-				if ($_GET['tmpname'] === $attachment['tmp_name']) break;
+				if ($_GET['tmpname'] === $attachment['tmp_name'])
+				{
+					break;
+				}
 			}
 		}
 		if (!$request || $_GET['tmpname'] !== $attachment['tmp_name'])
@@ -1875,10 +2132,20 @@ 
 				$sfxMimeType = $attachment['type'];
 				$buff = explode('.',$attachment['tmp_name']);
 				$suffix = '';
-				if (is_array($buff)) $suffix = array_pop($buff); // take the last extension to check with ext2mime
-				if (!empty($suffix)) $sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+				if (is_array($buff))
+				{
+					$suffix = array_pop($buff);
+				}
+				// take the last extension to check with ext2mime
+				if (!empty($suffix))
+				{
+					$sfxMimeType = Api\MimeMagic::ext2mime($suffix);
+				}
 				$attachment['type'] = $sfxMimeType;
-				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD') $attachment['type'] = strtoupper($sfxMimeType);
+				if (strtoupper($sfxMimeType) == 'TEXT/VCARD' || strtoupper($sfxMimeType) == 'TEXT/X-VCARD')
+				{
+					$attachment['type'] = strtoupper($sfxMimeType);
+				}
 			}
 			//error_log(__METHOD__.print_r($attachment,true));
 			if (strtoupper($attachment['type']) == 'TEXT/CALENDAR' || strtoupper($attachment['type']) == 'TEXT/X-VCALENDAR')
@@ -1887,7 +2154,10 @@ 
 				$calendar_ical = new calendar_ical();
 				$eventid = $calendar_ical->search($attachment['attachment'],-1);
 				//error_log(__METHOD__.array2string($eventid));
-				if (!$eventid) $eventid = -1;
+				if (!$eventid)
+				{
+					$eventid = -1;
+				}
 				$event = $calendar_ical->importVCal($attachment['attachment'],(is_array($eventid)?$eventid[0]:$eventid),null,true);
 				//error_log(__METHOD__.$event);
 				if ((int)$event > 0)
@@ -1913,7 +2183,10 @@ 
 					//error_log(__METHOD__.__LINE__.print_r($vcard,true));
 					$contact = $addressbook_vcal->find_contact($vcard,false);
 				}
-				if (!$contact) $contact = null;
+				if (!$contact)
+				{
+					$contact = null;
+				}
 				// if there are not enough fields in the vcard (or the parser was unable to correctly parse the vcard (as of VERSION:3.0 created by MSO))
 				if ($contact || count($vcard)>2)
 				{
@@ -1944,7 +2217,8 @@ 
 	 * @param string haystack
 	 * @return boolean
 	 */
-	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack) {
+	function testIfOneKeyInArrayDoesExistInString($arrayToTestAgainst,$haystack)
+	{
 		foreach (array_keys($arrayToTestAgainst) as $k)
 		{
 			//error_log(__METHOD__.__LINE__.':'.$k.'<->'.$haystack);
@@ -1991,21 +2265,34 @@ 
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
 		// horde does not support the encoding of thread-topic, and probably will not no so in the future
 		//if ($headers['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $headers['THREAD-TOPIC'];
-		if ($headers['THREAD-INDEX']) $this->sessionData['thread-index'] = $headers['THREAD-INDEX'];
-		if ($headers['LIST-ID']) $this->sessionData['list-id'] = $headers['LIST-ID'];
+		if ($headers['THREAD-INDEX'])
+		{
+			$this->sessionData['thread-index'] = $headers['THREAD-INDEX'];
+		}
+		if ($headers['LIST-ID'])
+		{
+			$this->sessionData['list-id'] = $headers['LIST-ID'];
+		}
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_mode.':'.array2string($headers));
 		// check for Reply-To: header and use if available
-		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM'])) {
-			foreach($headers['REPLY-TO'] as $val) {
-				if(!$foundAddresses[$val]) {
+		if(!empty($headers['REPLY-TO']) && ($headers['REPLY-TO'] != $headers['FROM']))
+		{
+			foreach($headers['REPLY-TO'] as $val)
+			{
+				if(!$foundAddresses[$val])
+				{
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
 			}
 			$oldToAddress	= (is_array($headers['REPLY-TO'])?$headers['REPLY-TO'][0]:$headers['REPLY-TO']);
-		} else {
-			foreach($headers['FROM'] as $val) {
-				if(!$foundAddresses[$val]) {
+		}
+		else
+		{
+			foreach($headers['FROM'] as $val)
+			{
+				if(!$foundAddresses[$val])
+				{
 					$oldTo[] = $val;
 					$foundAddresses[$val] = true;
 				}
@@ -2013,18 +2300,23 @@ 
 			$oldToAddress	= (is_array($headers['FROM'])?$headers['FROM'][0]:$headers['FROM']);
 		}
 		//error_log(__METHOD__.__LINE__.' OldToAddress:'.$oldToAddress.'#');
-		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) ) {
+		if($_mode != 'all' || ($_mode == 'all' && !empty($oldToAddress) && !$this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$oldToAddress)) )
+		{
 			$this->sessionData['to'] = $oldTo;
 		}
 
-		if($_mode == 'all') {
+		if($_mode == 'all')
+		{
 			// reply to any address which is cc, but not to my self
 			#if($headers->cc) {
-				foreach($headers['CC'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['CC'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['cc'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2033,11 +2325,14 @@ 
 
 			// reply to any address which is to, but not to my self
 			#if($headers->to) {
-				foreach($headers['TO'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['TO'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2045,12 +2340,15 @@ 
 			#}
 
 			#if($headers->from) {
-				foreach($headers['FROM'] as $val) {
-					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val)) {
+				foreach($headers['FROM'] as $val)
+				{
+					if($this->testIfOneKeyInArrayDoesExistInString($userEMailAddresses,$val))
+					{
 						continue;
 					}
 					//error_log(__METHOD__.__LINE__.' '.$val);
-					if(!$foundAddresses[$val]) {
+					if(!$foundAddresses[$val])
+					{
 						$this->sessionData['to'][] = $val;
 						$foundAddresses[$val] = true;
 					}
@@ -2059,9 +2357,12 @@ 
 		}
 
 		// check for Re: in subject header
-		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:") {
+		if(strtolower(substr(trim($mail_bo->decode_header($headers['SUBJECT'])), 0, 3)) == "re:")
+		{
 			$this->sessionData['subject'] = $mail_bo->decode_header($headers['SUBJECT']);
-		} else {
+		}
+		else
+		{
 			$this->sessionData['subject'] = "Re: " . $mail_bo->decode_header($headers['SUBJECT']);
 		}
 
@@ -2075,7 +2376,8 @@ 
 
 		$toAddressA = array();
 		$toAddress = '';
-		foreach ($headers['TO'] as $mailheader) {
+		foreach ($headers['TO'] as $mailheader)
+		{
 			$toAddressA[] =  $mailheader;
 		}
 		if (count($toAddressA)>0)
@@ -2085,7 +2387,8 @@ 
 		}
 		$ccAddressA = array();
 		$ccAddress = '';
-		foreach ($headers['CC'] as $mailheader) {
+		foreach ($headers['CC'] as $mailheader)
+		{
 			$ccAddressA[] =  $mailheader;
 		}
 		if (count($ccAddressA)>0)
@@ -2093,25 +2396,35 @@ 
 			$ccAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA));
 			$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
 		}
-		if($bodyParts['0']['mimeType'] == 'text/html') {
+		if($bodyParts['0']['mimeType'] == 'text/html')
+		{
 			$this->sessionData['body']	= /*"<br>".*//*"&nbsp;".*/"<div>".'----------------'.lang("original message").'-----------------'."".'<br>'.
 				@htmlspecialchars(lang("from")).": ".$fromAddress."<br>".
 				$toAddress.$ccAddress.
 				@htmlspecialchars(lang("date").": ".$headers['DATE'],ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."<br>".
 				'----------------------------------------------------------'."</div>";
 			$this->sessionData['mimeType'] 	= 'html';
-			if (!empty($styles)) $this->sessionData['body'] .= $styles;
+			if (!empty($styles))
+			{
+				$this->sessionData['body'] .= $styles;
+			}
 			$this->sessionData['body']	.= '<blockquote type="cite">';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= '<hr>';
 				}
-				if($bodyParts[$i]['mimeType'] == 'text/plain') {
+				if($bodyParts[$i]['mimeType'] == 'text/plain')
+				{
 					#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body'])."<br>";
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				if ($bodyParts[$i]['charSet']===false)
+				{
+					$bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']);
+				}
 
 				$_htmlConfig = Mail::$htmLawed_config;
 				Mail::$htmLawed_config['comment'] = 2;
@@ -2123,7 +2436,9 @@ 
 
 			$this->sessionData['body']	.= '</blockquote><br>';
 			$this->sessionData['body'] =  mail_ui::resolve_inline_images($this->sessionData['body'], $_folder, $_uid, $_partID, 'html');
-		} else {
+		}
+		else
+		{
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
             $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
@@ -2133,8 +2448,10 @@ 
                 '-------------------------------------------------'."\r\n \r\n ";
 			$this->sessionData['mimeType']	= 'plain';
 
-			for($i=0; $i<count($bodyParts); $i++) {
-				if($i>0) {
+			for($i=0; $i<count($bodyParts); $i++)
+			{
+				if($i>0)
+				{
 					$this->sessionData['body'] .= "<hr>";
 				}
 
@@ -2144,9 +2461,11 @@ 
 				$newBody = mail_ui::resolve_inline_images($newBody2, $_folder, $_uid, $_partID, 'plain');
 				$this->sessionData['body'] .= "\r\n";
 				// create body new, with good line breaks and indention
-				foreach(explode("\n",$newBody) as $value) {
+				foreach(explode("\n",$newBody) as $value)
+				{
 					// the explode is removing the character
-					if (trim($value) != '') {
+					if (trim($value) != '')
+					{
 						#if ($value != "\r") $value .= "\n";
 					}
 					$numberOfChars = strspn(trim($value), ">");
@@ -2154,9 +2473,12 @@ 
 
 					$bodyAppend = $this->mail_bo->wordwrap($value, 76-strlen("\r\n$appendString "), "\r\n$appendString ",'>');
 
-					if($bodyAppend[0] == '>') {
+					if($bodyAppend[0] == '>')
+					{
 						$bodyAppend = '>'. $bodyAppend;
-					} else {
+					}
+					else
+					{
 						$bodyAppend = '> '. $bodyAppend;
 					}
 
@@ -2205,9 +2527,12 @@ 
 
 	static function _getHostName()
 	{
-		if (isset($_SERVER['SERVER_NAME'])) {
+		if (isset($_SERVER['SERVER_NAME']))
+		{
 			$result = $_SERVER['SERVER_NAME'];
-		} else {
+		}
+		else
+		{
 			$result = 'localhost.localdomain';
 		}
 		return $result;
@@ -2242,13 +2567,21 @@ 
 
 		$_mailObject->addHeader('X-Priority', $_formData['priority']);
 		$_mailObject->addHeader('X-Mailer', 'EGroupware-Mail');
-		if(!empty($_formData['in-reply-to'])) {
-			if (stripos($_formData['in-reply-to'],'<')===false) $_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+		if(!empty($_formData['in-reply-to']))
+		{
+			if (stripos($_formData['in-reply-to'],'<')===false)
+			{
+				$_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>';
+			}
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(In-Reply-To', $_formData['in-reply-to'].")");
 			$_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']);
 		}
-		if(!empty($_formData['references'])) {
-			if (stripos($_formData['references'],'<')===false) $_formData['references']='<'.trim($_formData['references']).'>';
+		if(!empty($_formData['references']))
+		{
+			if (stripos($_formData['references'],'<')===false)
+			{
+				$_formData['references']='<'.trim($_formData['references']).'>';
+			}
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(References', $_formData['references'].")");
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
@@ -2259,16 +2592,19 @@ 
 		//	$_mailObject->addHeader('Thread-Topic', $_formData['thread-topic']);
 		//}
 
-		if(!empty($_formData['thread-index'])) {
+		if(!empty($_formData['thread-index']))
+		{
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Index', $_formData['thread-index'].")");
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
 		}
-		if(!empty($_formData['list-id'])) {
+		if(!empty($_formData['list-id']))
+		{
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(List-Id', $_formData['list-id'].")");
 			$_mailObject->addHeader('List-Id', $_formData['list-id']);
 		}
 		//error_log(__METHOD__.__LINE__.' notify to:'.$_identity['ident_email'].'->'.array2string($_formData));
-		if($_formData['disposition']=='on') {
+		if($_formData['disposition']=='on')
+		{
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
 		//error_log(__METHOD__.__LINE__.' Organization:'.array2string($_identity));
@@ -2279,15 +2615,22 @@ 
 		// Expand any mailing lists
 		foreach(array('to', 'cc', 'bcc', 'replyto')  as $field)
 		{
-			if ($field != 'replyto') $_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
+			if ($field != 'replyto')
+			{
+				$_formData[$field] = self::resolveEmailAddressList($_formData[$field]);
+			}
 
-			if ($_formData[$field]) $_mailObject->addAddress($_formData[$field], '', $field);
+			if ($_formData[$field])
+			{
+				$_mailObject->addAddress($_formData[$field], '', $field);
+			}
 		}
 
 		$_mailObject->addHeader('Subject', $_formData['subject']);
 
 		// this should never happen since we come from the edit dialog
-		if (Mail::detect_qp($_formData['body'])) {
+		if (Mail::detect_qp($_formData['body']))
+		{
 			//error_log("Error: bocompose::createMessage found QUOTED-PRINTABLE while Composing Message. Charset:$realCharset Message:".print_r($_formData['body'],true));
 			$_formData['body'] = preg_replace('/=\r\n/', '', $_formData['body']);
 			$_formData['body'] = quoted_printable_decode($_formData['body']);
@@ -2353,7 +2696,10 @@ 
 				$_mailObject->setBody($this->convertHTMLToText($body, true, true));
 			}
 			// convert URL Images to inline images - if possible
-			if (!$_autosaving) Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			if (!$_autosaving)
+			{
+				Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			}
 			if (strpos($body,"<!-- HTMLSIGBEGIN -->")!==false)
 			{
 				$body = str_replace(array('<!-- HTMLSIGBEGIN -->','<!-- HTMLSIGEND -->'),'',$body);
@@ -2368,10 +2714,14 @@ 
 		{
 			$body = $this->convertHTMLToText($_formData['body'],false);
 
-			if ($attachment_links) $body .= $attachment_links;
+			if ($attachment_links)
+			{
+				$body .= $attachment_links;
+			}
 
 			#$_mailObject->Body = $_formData['body'];
-			if(!empty($signature)) {
+			if(!empty($signature))
+			{
 				$body .= ($disableRuler ?"\r\n":"\r\n-- \r\n").
 					$this->convertHTMLToText($signature,true,true);
 			}
@@ -2384,11 +2734,13 @@ 
 			$connection_opened = false;
 			//error_log(__METHOD__.__LINE__.array2string($_formData['attachments']));
 			$tnfattachments = null;
-			foreach((array)$_formData['attachments'] as $attachment) {
+			foreach((array)$_formData['attachments'] as $attachment)
+			{
 				//error_log(__METHOD__.__LINE__.array2string($attachment));
 				if(is_array($attachment))
 				{
-					if (!empty($attachment['uid']) && !empty($attachment['folder'])) {
+					if (!empty($attachment['uid']) && !empty($attachment['folder']))
+					{
 						/* Example:
 						Array([0] => Array(
 						[uid] => 21178
@@ -2404,14 +2756,18 @@ 
 							$connection_opened = true;
 						}
 						$mail_bo->reopen($attachment['folder']);
-						switch(strtoupper($attachment['type'])) {
+						switch(strtoupper($attachment['type']))
+						{
 							case 'MESSAGE/RFC':
 							case 'MESSAGE/RFC822':
 								$rawBody='';
-								if (isset($attachment['partID'])) {
+								if (isset($attachment['partID']))
+								{
 									$eml = $mail_bo->getAttachment($attachment['uid'],$attachment['partID'],0,false,true,$attachment['folder']);
 									$rawBody=$eml['attachment'];
-								} else {
+								}
+								else
+								{
 									$rawBody        = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']);
 								}
 								$_mailObject->addStringAttachment($rawBody, $attachment['name'], 'message/rfc822');
@@ -2420,7 +2776,10 @@ 
 								$attachmentData	= $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false);
 								if ($attachmentData['type'] == 'APPLICATION/MS-TNEF')
 								{
-									if (!is_array($tnfattachments)) $tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
+									if (!is_array($tnfattachments))
+									{
+										$tnfattachments = $mail_bo->decode_winmail($attachment['uid'], $attachment['partID']);
+									}
 									foreach ($tnfattachments as $k)
 									{
 										if ($k['name'] == $attachment['name'])
@@ -2456,7 +2815,10 @@ 
 					}
 				}
 			}
-			if ($connection_opened) $mail_bo->closeConnection();
+			if ($connection_opened)
+			{
+				$mail_bo->closeConnection();
+			}
 		}
 	}
 
@@ -2475,13 +2837,20 @@ 
 	 */
 	protected function getAttachmentLinks(array $attachments, $filemode, $html, $recipients=array(), $expiration=null, $password=null)
 	{
-		if ($filemode == Vfs\Sharing::ATTACH) return '';
+		if ($filemode == Vfs\Sharing::ATTACH)
+		{
+			return '';
+		}
 
 		$links = array();
 		foreach($attachments as $attachment)
 		{
 			$path = $attachment['file'];
-			if (empty($path)) continue;	// we only care about file attachments, not forwarded messages or parts
+			if (empty($path))
+			{
+				continue;
+			}
+			// we only care about file attachments, not forwarded messages or parts
 			if (parse_url($attachment['file'],PHP_URL_SCHEME) != 'vfs')
 			{
 				$path = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($path);
@@ -2584,13 +2953,19 @@ 
 								$success = false;
 								error_log(__METHOD__.__LINE__.$msg);
 							}
-						} else {
+						}
+						else
+						{
 							error_log(__METHOD__.__LINE__.': original message ('.$pMuid.') has attachments and lastDrafted ID ('.$duid.') equals the former');
 						}
-					} else {
+					}
+					else
+					{
 						error_log(__METHOD__.__LINE__." No current draftID (".$draft_id."), or no lastDrafted Info (".$content['lastDrafted'].") or the former being equal:".array2string($content)."(, action=$action)");
 					}
-				} else {
+				}
+				else
+				{
 					error_log(__METHOD__.__LINE__.' No headerdata found for messageUID='.$messageUid.' in Folder:'.$folder.':'.array2string($content)."(, action=$action)");
 				}
 			}
@@ -2606,7 +2981,10 @@ 
 			$success = false;
 		}
 
-		if ($success) $msg = lang('Message saved successfully.');
+		if ($success)
+		{
+			$msg = lang('Message saved successfully.');
+		}
 
 		// Include new information to json respose, because we need them in client-side callback
 		$response->data(array(
@@ -2630,7 +3008,10 @@ 
 		{
 			if(is_int($address))
 			{
-				if (!isset($contacts_obs)) $contacts_obj = new Api\Contacts();
+				if (!isset($contacts_obs))
+				{
+					$contacts_obj = new Api\Contacts();
+				}
 				// List was selected, expand to addresses
 				unset($_emailAddressList[$ak]);
 				$list = $contacts_obj->search('',array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home'),'','','',False,'AND',false,array('list' =>(int)$address));
@@ -2645,7 +3026,10 @@ 
 		{
 			foreach ($addrFromList as $addr)
 			{
-				if (!empty($addr)) $_emailAddressList[]=$addr;
+				if (!empty($addr))
+				{
+					$_emailAddressList[]=$addr;
+				}
 			}
 		}
 		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
@@ -2699,7 +3083,10 @@ 
 		// decide where to save the message (default to draft folder, if we find nothing else)
 		// if the current folder is in draft or template folder save it there
 		// if it is called from printview then save it with the draft folder
-		if (empty($savingDestination)) $savingDestination = $mail_bo->getDraftFolder();
+		if (empty($savingDestination))
+		{
+			$savingDestination = $mail_bo->getDraftFolder();
+		}
 		if (empty($this->sessionData['messageFolder']) && !empty($this->sessionData['mailbox']))
 		{
 			$this->sessionData['messageFolder'] = $this->sessionData['mailbox'];
@@ -2710,13 +3097,17 @@ 
 			$savingDestination = $this->sessionData['messageFolder'];
 			//error_log(__METHOD__.__LINE__.' SavingDestination:'.$savingDestination);
 		}
-		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 ) $savingDestination = $mail_bo->getDraftFolder();
+		if (  !empty($_formData['printit']) && $_formData['printit'] == 0 )
+		{
+			$savingDestination = $mail_bo->getDraftFolder();
+		}
 
 		// normaly Bcc is only added to recipients, but not as header visible to all recipients
 		$mail->forceBccHeader();
 
 		$mail_bo->openConnection();
-		if ($mail_bo->folderExists($savingDestination,true)) {
+		if ($mail_bo->folderExists($savingDestination,true))
+		{
 			try
 			{
 				$messageUid = $mail_bo->appendMessage($savingDestination, $mail->getRaw(), null, $flags);
@@ -2727,7 +3118,9 @@ 
 				return false;
 			}
 
-		} else {
+		}
+		else
+		{
 			error_log(__METHOD__.__LINE__."->".lang("folder")." ". $savingDestination." ".lang("does not exist on IMAP Server."));
 			return false;
 		}
@@ -2775,7 +3168,10 @@ 
 					$fhA = mail_ui::splitRowID($rowid);
 					$this->sessionData['uid'][] = $fhA['msgUID'];
 					$this->sessionData['forwardedUID'][] = $fhA['msgUID'];
-					if (!empty($fhA['folder'])) $this->sessionData['sourceFolder'] = $fhA['folder'];
+					if (!empty($fhA['folder']))
+					{
+						$this->sessionData['sourceFolder'] = $fhA['folder'];
+					}
 				}
 			}
 			if ($_formData['mode']=='reply' && !empty($_formData['processedmail_id']))
@@ -2807,7 +3203,8 @@ 
 			#error_log($this->sessionData['body']);
 		}
 		if(empty($this->sessionData['to']) && empty($this->sessionData['cc']) &&
-		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder'])) {
+		   empty($this->sessionData['bcc']) && empty($this->sessionData['folder']))
+		{
 		   	$messageIsDraft = true;
 		}
 		try
@@ -2823,7 +3220,11 @@ 
 		// create the messages
 		$this->createMessage($mail, $_formData, $identity);
 		// remember the identity
-		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') $fromAddress = $mail->From;//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
+		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on')
+		{
+			$fromAddress = $mail->From;
+		}
+		//$mail->FromName.($mail->FromName?' <':'').$mail->From.($mail->FromName?'>':'');
 		#print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>";
 		#print "<pre>". $mail->getMessageBody() ."</pre><hr><br>";
 		#exit;
@@ -2836,7 +3237,10 @@ 
 		{
 			$fval=$f;
 			$icServerID = $_formData['serverID'];//folders always assumed with serverID
-			if (stripos($f,'::')!==false) list($icServerID,$fval) = explode('::',$f,2);
+			if (stripos($f,'::')!==false)
+			{
+				list($icServerID,$fval) = explode('::',$f,2);
+			}
 			if ($_formData['serverID']!=$_formData['mailaccount'])
 			{
 				if ($icServerID == $_formData['serverID'] )
@@ -2877,13 +3281,19 @@ 
 			// sentFolder is account specific
 			$sentFolder = $this->mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder&& $sentFolder!= 'none' && !$this->mail_bo->folderExists($sentFolder, true))
+			{
+				$sentFolder=false;
+			}
 		}
 		else
 		{
 			$sentFolder = $mail_bo->getSentFolder();
 			//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
-			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true)) $sentFolder=false;
+			if ($sentFolder&& $sentFolder!= 'none' && !$mail_bo->folderExists($sentFolder, true))
+			{
+				$sentFolder=false;
+			}
 		}
 		//error_log(__METHOD__.__LINE__.' SentFolder configured:'.$sentFolder.'#');
 
@@ -2919,19 +3329,30 @@ 
 		{
 			if (((!isset($sentFolder)||$sentFolder==false) && $this->mailPreferences['sendOptions'] != 'send_only') ||
 				($this->mailPreferences['sendOptions'] != 'send_only' &&
-				$sentFolder != 'none')) $this->errorInfo = lang("No Send Folder set in preferences");
+				$sentFolder != 'none'))
+			{
+				$this->errorInfo = lang("No Send Folder set in preferences");
+			}
 		}
 		// draftFolder is on Server we start from
-		if($messageIsDraft == true) {
+		if($messageIsDraft == true)
+		{
 			$draftFolder = $mail_bo->getDraftFolder();
-			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true)) {
+			if(!empty($draftFolder) && $mail_bo->folderExists($draftFolder,true))
+			{
 				$this->sessionData['folder'] = array($draftFolder);
 				$folderOnServerID[] = $draftFolder;
 				$folder[$draftFolder] = $draftFolder;
 			}
 		}
-		if ($folderOnServerID) $folderOnServerID = array_unique($folderOnServerID);
-		if ($folderOnMailAccount) $folderOnMailAccount = array_unique($folderOnMailAccount);
+		if ($folderOnServerID)
+		{
+			$folderOnServerID = array_unique($folderOnServerID);
+		}
+		if ($folderOnMailAccount)
+		{
+			$folderOnMailAccount = array_unique($folderOnMailAccount);
+		}
 		if (($this->mailPreferences['sendOptions'] != 'send_only' && $sentFolder != 'none') &&
 			!( count($folder) > 0) &&
 			!($_formData['to_infolog']=='on' || $_formData['to_tracker']=='on'))
@@ -2945,7 +3366,8 @@ 
 		@set_time_limit(120);
 		//$mail->SMTPDebug = 10;
 		//error_log("Folder:".count(array($this->sessionData['folder']))."To:".count((array)$this->sessionData['to'])."CC:". count((array)$this->sessionData['cc']) ."bcc:".count((array)$this->sessionData['bcc']));
-		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0) {
+		if(count((array)$this->sessionData['to']) > 0 || count((array)$this->sessionData['cc']) > 0 || count((array)$this->sessionData['bcc']) > 0)
+		{
 			try {
 				$mail->send();
 			}
@@ -2955,10 +3377,15 @@ 
 				$this->errorInfo = $e->getMessage().($e->details?'<br/>'.$e->details:'');
 				return false;
 			}
-		} else {
-			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder'])) {
+		}
+		else
+		{
+			if (count(array($this->sessionData['folder']))>0 && !empty($this->sessionData['folder']))
+			{
 				//error_log(__METHOD__.__LINE__."Folders:".print_r($this->sessionData['folder'],true));
-			} else {
+			}
+			else
+			{
 				$this->errorInfo = lang("Error: ").lang("No Address TO/CC/BCC supplied, and no folder to save message to provided.");
 				//error_log(__METHOD__.__LINE__.$this->errorInfo);
 				return false;
@@ -2968,14 +3395,16 @@ 
 		//error_log(__METHOD__.__LINE__."Number of Folders to move copy the message to:".count($folder));
 		//error_log(__METHOD__.__LINE__.array2string($folder));
 		if ((count($folder) > 0) || (isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder'])))
+		{
 			$mail_bo = $this->mail_bo;
 			$mail_bo->openConnection();
 			//$mail_bo->reopen($this->sessionData['messageFolder']);
 			#error_log("(re)opened Connection");
 		}
 		// if copying mail to folder, or saving mail to infolog, we need to gather the needed information
-		if (count($folder) > 0 || $_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') {
+		if (count($folder) > 0 || $_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on')
+		{
 			//error_log(__METHOD__.__LINE__.array2string($this->sessionData['bcc']));
 
 			// normaly Bcc is only added to recipients, but not as header visible to all recipients
@@ -2984,17 +3413,28 @@ 
 		// copying mail to folder
 		if (count($folder) > 0)
 		{
-			foreach($folderOnServerID as $folderName) {
-				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
+			foreach($folderOnServerID as $folderName)
+			{
+				if (is_array($folderName))
+				{
+					$folderName = array_shift($folderName);
+				}
+				// should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($mail_bo->folderExists($folderName,true)) {
-					if($mail_bo->isSentFolder($folderName)) {
+				if ($mail_bo->folderExists($folderName,true))
+				{
+					if($mail_bo->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($mail_bo->isDraftFolder($folderName)) {
+					}
+					elseif($mail_bo->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '\\Seen';
 					}
 					#$mailHeader=explode('From:',$mail->getMessageHeader());
@@ -3017,18 +3457,32 @@ 
 				}
 			}
 			// if we choose to send from a differing profile
-			if ($folderOnMailAccount)  $this->changeProfile($_formData['mailaccount']);
-			foreach($folderOnMailAccount as $folderName) {
-				if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
+			if ($folderOnMailAccount)
+			{
+				$this->changeProfile($_formData['mailaccount']);
+			}
+			foreach($folderOnMailAccount as $folderName)
+			{
+				if (is_array($folderName))
+				{
+					$folderName = array_shift($folderName);
+				}
+				// should not happen at all
 				//error_log(__METHOD__.__LINE__." attempt to save message to:".array2string($folderName));
 				// if $_formData['serverID']!=$_formData['mailaccount'] skip copying to sentfolder on serverID
 				// if($_formData['serverID']!=$_formData['mailaccount'] && $folderName==$sentFolder && $changeProfileOnSentFolderNeeded) continue;
-				if ($this->mail_bo->folderExists($folderName,true)) {
-					if($this->mail_bo->isSentFolder($folderName)) {
+				if ($this->mail_bo->folderExists($folderName,true))
+				{
+					if($this->mail_bo->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($this->mail_bo->isDraftFolder($folderName)) {
+					}
+					elseif($this->mail_bo->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '\\Seen';
 					}
 					#$mailHeader=explode('From:',$mail->getMessageHeader());
@@ -3050,7 +3504,10 @@ 
 					error_log(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$this->sessionData['subject'],$folderName));
 				}
 			}
-			if ($folderOnMailAccount)  $this->changeProfile($_formData['serverID']);
+			if ($folderOnMailAccount)
+			{
+				$this->changeProfile($_formData['serverID']);
+			}
 
 			//$mail_bo->closeConnection();
 		}
@@ -3062,10 +3519,16 @@ 
 			$dhA = mail_ui::splitRowID($this->sessionData['lastDrafted']);
 			$lastDrafted['uid'] = $dhA['msgUID'];
 			$lastDrafted['folder'] = $dhA['folder'];
-			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid']=trim($lastDrafted['uid']);
+			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid']))
+			{
+				$lastDrafted['uid']=trim($lastDrafted['uid']);
+			}
 			// manually drafted, do not delete
 			// will be handled later on IF mode was $_formData['mode']=='composefromdraft'
-			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
+			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid']))
+			{
+				$lastDrafted=false;
+			}
 			//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
 		}
 		if ($lastDrafted && is_array($lastDrafted) && $mail_bo->isDraftFolder($lastDrafted['folder']))
@@ -3091,7 +3554,8 @@ 
 
 		//error_log("handling draft messages, flagging and such");
 		if((isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
-			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
+			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder'])))
+		{
 			// mark message as answered
 			$mail_bo->openConnection();
 			$mail_bo->reopen(($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
@@ -3113,7 +3577,9 @@ 
 					//error_log(__METHOD__.__LINE__." ". str_replace('"',"'",$e->getMessage()));
 					unset($e);
 				}
-			} else {
+			}
+			else
+			{
 				$mail_bo->flagMessages("answered", $this->sessionData['uid'],($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
 				//error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData)).':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
 				if (array_key_exists('forwardFlag',$this->sessionData) && $this->sessionData['forwardFlag']=='forwarded')
@@ -3132,7 +3598,10 @@ 
 			}
 			//$mail_bo->closeConnection();
 		}
-		if ($mail_bo) $mail_bo->closeConnection();
+		if ($mail_bo)
+		{
+			$mail_bo->closeConnection();
+		}
 		//error_log("performing Infolog Stuff");
 		//error_log(print_r($this->sessionData['to'],true));
 		//error_log(print_r($this->sessionData['cc'],true));
@@ -3145,9 +3614,18 @@ 
 		{
 			$mailaddresses = array();
 		}
-		if (is_array($this->sessionData['cc'])) $mailaddresses['cc'] = $this->sessionData['cc'];
-		if (is_array($this->sessionData['bcc'])) $mailaddresses['bcc'] = $this->sessionData['bcc'];
-		if (!empty($mailaddresses)) $mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
+		if (is_array($this->sessionData['cc']))
+		{
+			$mailaddresses['cc'] = $this->sessionData['cc'];
+		}
+		if (is_array($this->sessionData['bcc']))
+		{
+			$mailaddresses['bcc'] = $this->sessionData['bcc'];
+		}
+		if (!empty($mailaddresses))
+		{
+			$mailaddresses['from'] = Mail\Html::decodeMailHeader($fromAddress);
+		}
 
 		if ($_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on' || $_formData['to_calendar'] == 'on' )
 		{
@@ -3186,8 +3664,11 @@ 
 		// only clean up temp-files, if we dont need them for mail_integration::integrate
 		elseif(is_array($this->sessionData['attachments']))
 		{
-			foreach($this->sessionData['attachments'] as $value) {
-				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs') {	// happens when forwarding mails
+			foreach($this->sessionData['attachments'] as $value)
+			{
+				if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs')
+				{
+// happens when forwarding mails
 					unlink($GLOBALS['egw_info']['server']['temp_dir'].'/'.$value['file']);
 				}
 			}
@@ -3224,7 +3705,10 @@ 
 				$default_identity = null;
 				foreach(Mail\Account::identities($this->mail_bo->profileID, true, 'params') as $identity)
 				{
-					if (!isset($default_identity)) $default_identity = $identity['ident_id'];
+					if (!isset($default_identity))
+					{
+						$default_identity = $identity['ident_id'];
+					}
 					if (!empty($identity['ident_signature']))
 					{
 						$content['mailidentity'] = $identity['ident_id'];
@@ -3232,12 +3716,18 @@ 
 					}
 				}
 			}
-			if (empty($content['mailidentity'])) $content['mailidentity'] = $default_identity;
+			if (empty($content['mailidentity']))
+			{
+				$content['mailidentity'] = $default_identity;
+			}
 		}
 		if (!isset($content['mimeType']) || empty($content['mimeType']))
 		{
 			$content['mimeType'] = 'html';
-			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text") $content['mimeType']  = 'plain';
+			if (!empty($this->mailPreferences['composeOptions']) && $this->mailPreferences['composeOptions']=="text")
+			{
+				$content['mimeType']  = 'plain';
+			}
 		}
 		return $content;
 
@@ -3245,9 +3735,12 @@ 
 
 	function stripSlashes($_string)
 	{
-		if (get_magic_quotes_gpc()) {
+		if (get_magic_quotes_gpc())
+		{
 			return stripslashes($_string);
-		} else {
+		}
+		else
+		{
 			return $_string;
 		}
 	}
@@ -3260,15 +3753,25 @@ 
 	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 * @return type
 	 */
-	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) {
+	function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
+	{
 		//error_log(__METHOD__.__LINE__.':'.array2string($_REQUEST));
 		static $useCacheIfPossible = null;
-		if (is_null($useCacheIfPossible)) $useCacheIfPossible = true;
+		if (is_null($useCacheIfPossible))
+		{
+			$useCacheIfPossible = true;
+		}
 		$_searchString = trim($_REQUEST['query']);
 		$results = array();
 		$rememberServerID = $this->mail_bo->icServer->ImapServerId;
-		if (is_null($_mailaccountToSearch) && !empty($_REQUEST['mailaccount'])) $_mailaccountToSearch = $_REQUEST['mailaccount'];
-		if (empty($_mailaccountToSearch)) $_mailaccountToSearch = $this->mail_bo->icServer->ImapServerId;
+		if (is_null($_mailaccountToSearch) && !empty($_REQUEST['mailaccount']))
+		{
+			$_mailaccountToSearch = $_REQUEST['mailaccount'];
+		}
+		if (empty($_mailaccountToSearch))
+		{
+			$_mailaccountToSearch = $this->mail_bo->icServer->ImapServerId;
+		}
 		if ($this->mail_bo->icServer && $_mailaccountToSearch && $this->mail_bo->icServer->ImapServerId != $_mailaccountToSearch)
 		{
 			$this->changeProfile($_mailaccountToSearch);
@@ -3279,7 +3782,8 @@ 
 			$this->mail_bo->openConnection($this->mail_bo->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($_searchString).'<->'.$searchString);
 			$folderObjects = $this->mail_bo->getFolderObjects(true,false,true,$useCacheIfPossible);
-			if (count($folderObjects)<=1) {
+			if (count($folderObjects)<=1)
+			{
 				$useCacheIfPossible = false;
 			}
 			else
@@ -3330,7 +3834,8 @@ 
 		exit();
 	}
 
-	public static function ajax_searchAddress($_searchStringLength=2) {
+	public static function ajax_searchAddress($_searchStringLength=2)
+	{
 		//error_log(__METHOD__. "request from seachAddress " . $_REQUEST['query']);
 		$_searchString = trim($_REQUEST['query']);
 		$include_lists = (boolean)$_REQUEST['include_lists'];
@@ -3343,7 +3848,10 @@ 
 			$search = explode(' ', $_searchString);
 			foreach ($search as $k => $v)
 			{
-				if (mb_strlen($v) < 3) unset($search[$k]);
+				if (mb_strlen($v) < 3)
+				{
+					unset($search[$k]);
+				}
 			}
 			$search_str = implode(' +', $search);	// tell contacts/so_sql to AND search patterns
 			//error_log(__METHOD__.__LINE__.$_searchString);
@@ -3373,9 +3881,12 @@ 
 			}
 		}
 		$results = array();
-		if(is_array($contacts)) {
-			foreach($contacts as $contact) {
-				foreach(array($contact['email'],$contact['email_home']) as $email) {
+		if(is_array($contacts))
+		{
+			foreach($contacts as $contact)
+			{
+				foreach(array($contact['email'],$contact['email_home']) as $email)
+				{
 					// avoid wrong addresses, if an rfc822 encoded address is in addressbook
 					//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
 					$rfcAddr = Mail::parseAddressList($email);
@@ -3389,10 +3900,22 @@ 
 					if (method_exists($contacts_obj,'search'))
 					{
 						$contact['n_fn']='';
-						if (!empty($contact['n_prefix'])) $contact['n_fn'] = $contact['n_prefix'];
-						if (!empty($contact['n_given'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
-						if (!empty($contact['n_family'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
-						if (!empty($contact['org_name'])) $contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
+						if (!empty($contact['n_prefix']))
+						{
+							$contact['n_fn'] = $contact['n_prefix'];
+						}
+						if (!empty($contact['n_given']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_given'];
+						}
+						if (!empty($contact['n_family']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').$contact['n_family'];
+						}
+						if (!empty($contact['org_name']))
+						{
+							$contact['n_fn'] .= ($contact['n_fn']?' ':'').'('.$contact['org_name'].')';
+						}
 						$contact['n_fn'] = str_replace(array(',','@'),' ',$contact['n_fn']);
 					}
 					else
@@ -3402,7 +3925,8 @@ 
 					$args = explode('@', trim($email));
 					$args[] = trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']);
 					$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
-					if(!empty($email) && in_array($completeMailString ,$results) === false) {
+					if(!empty($email) && in_array($completeMailString ,$results) === false)
+					{
 						$results[] = array(
 							'id'=>$completeMailString,
 							'label' => $completeMailString,
@@ -3421,7 +3945,10 @@ 
 		foreach($groups as $g_id => $name)
 		{
 			$group = $GLOBALS['egw']->accounts->read($g_id);
-			if(!$group['account_email']) continue;
+			if(!$group['account_email'])
+			{
+				continue;
+			}
 			$args = explode('@', trim($group['account_email']));
 			$args[] = $name;
 			$completeMailString = call_user_func_array('imap_rfc822_write_address', $args);
@@ -3438,7 +3965,8 @@ 
 		{
 			$lists = array_filter(
 				$contacts_obj->get_lists(Acl::READ),
-				function($element) use($_searchString) {
+				function($element) use($_searchString)
+				{
 					return (stripos($element, $_searchString) !== false);
 				}
 			);
@@ -3453,7 +3981,10 @@ 
 					'title' => lang('Mailinglist'),
 					'data'	=> $key
 				);
-				if($list_count++ > 5) break;
+				if($list_count++ > 5)
+				{
+					break;
+				}
 			}
 		}
 		 // switch regular JSON response handling off

mail/inc/class.mail_sieve.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1278,7 +1278,7 @@
 	 * int $_searchStringLength
 	 * @param boolean $_returnList
 	 * @param int $_mailaccountToSearch
-	 * @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id
+	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 */
 	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
 	{

Indentation +6 added lines, -6 removed lines

@@ -275,7 +275,7 @@ 
 
 			//$ruleID is calculated by priority from the selected rule and is an unique ID
 			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2;
-            $error = 0;
+			$error = 0;
 			switch ($button)
 			{
 				case 'save':
@@ -1202,7 +1202,7 @@ 
 	/**
 	 *
 	 * Get the data for iterating the rows on rules list grid
- 	 *
+	 *
 	 * @return {boolean|array} Array of rows | false if failed
 	 */
 	function get_rows()
@@ -1222,7 +1222,7 @@ 
 				{
 					$row['class'] = 'mail_sieve_DISABLED';
 				}
-            }
+			}
 		}
 		else
 		{
@@ -1247,7 +1247,7 @@ 
 				'caption' => 'Edit',
 				'default' => true,
 				'onExecute' => 'javaScript:app.mail.action',
-                'disableClass' => 'th'
+				'disableClass' => 'th'
 			),
 			'add' => array(
 				'caption' => 'Add',
@@ -1257,13 +1257,13 @@ 
 				'caption' => 'Enable',
 				'onExecute' => 'javaScript:app.mail.action',
 				'enableClass' => 'mail_sieve_DISABLED',
-                'hideOnDisabled' => true
+				'hideOnDisabled' => true
 			),
 			'disable' => array(
 				'caption' => 'Disable',
 				'onExecute' => 'javaScript:app.mail.action',
 				'disableClass' => 'mail_sieve_DISABLED',
-                'hideOnDisabled' => true
+				'hideOnDisabled' => true
 			),
 			'delete' => array(
 				'caption' => 'Delete',

Spacing +139 added lines, -139 removed lines

@@ -74,8 +74,8 @@ 
 		if ($acc_id > 0)
 		{
 			$this->account = Mail\Account::read($acc_id);
-			$identity = Mail\Account::read_identity($this->account->ident_id,true);
-			$this->currentIdentity = Mail::generateIdentityString($identity,false);
+			$identity = Mail\Account::read_identity($this->account->ident_id, true);
+			$this->currentIdentity = Mail::generateIdentityString($identity, false);
 		}
 
 		$this->restoreSessionData();
@@ -87,7 +87,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		if (!is_array($content))
 		{
@@ -104,10 +104,10 @@ 
 		if ($this->account->acc_sieve_enabled)
 		{
 			//Initializes the Grid contents
-			$content['rg']= $this->get_rows();
+			$content['rg'] = $this->get_rows();
 
 			// Set content-menu actions
-			$tmpl->setElementAttribute('rg', 'actions',$this->get_actions());
+			$tmpl->setElementAttribute('rg', 'actions', $this->get_actions());
 
 			$sel_options = array(
 				'status' => array(
@@ -118,10 +118,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $this->account->acc_id);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$tmpl->exec('mail.mail_sieve.index',$content,$sel_options,array());
+		$tmpl->exec('mail.mail_sieve.index', $content, $sel_options, array());
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function editEmailNotification($content=null, $msg='')
+	function editEmailNotification($content = null, $msg = '')
 	{
 		//Instantiate an eTemplate object, representing sieve.emailNotification
 		$eNotitmpl = new Etemplate('mail.sieve.emailNotification');
@@ -146,7 +146,7 @@ 
 
 				if (!empty($eNotification['externalEmail']))
 				{
-					$content['externalEmail'] = explode(",",$eNotification['externalEmail']);
+					$content['externalEmail'] = explode(",", $eNotification['externalEmail']);
 				}
 			}
 			else
@@ -155,7 +155,7 @@ 
 				list($button) = @each($content['button']);
 				unset ($content['button']);
 
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -163,11 +163,11 @@ 
 						{
 							$newEmailNotification = $content;
 							if (empty($this->mailConfig['prefpreventforwarding']) ||
-								$this->mailConfig['prefpreventforwarding'] == 0 )
+								$this->mailConfig['prefpreventforwarding'] == 0)
 							{
 								if (is_array($content['externalEmail']) && !empty($content['externalEmail']))
 								{
-									$newEmailNotification['externalEmail'] = implode(",",$content['externalEmail']);
+									$newEmailNotification['externalEmail'] = implode(",", $content['externalEmail']);
 								}
 							}
 						}
@@ -215,10 +215,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $this->account->acc_id);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content,$sel_options);
+		$eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content, $sel_options);
 	}
 
 	/**
@@ -226,18 +226,18 @@ 
 	 *
 	 * @param {array} $content
 	 */
-	function edit ($content=null)
+	function edit($content = null)
 	{
 		//Instantiate an eTemplate object, representing sieve.edit template
 		$etmpl = new Etemplate('mail.sieve.edit');
-		$etmpl->setElementAttribute('action_folder_text','autocomplete_params', array('noPrefixId'=> true));
+		$etmpl->setElementAttribute('action_folder_text', 'autocomplete_params', array('noPrefixId'=> true));
 		if (!is_array($content))
 		{
-			if ( $this->getRules($_GET['ruleID']) && isset($_GET['ruleID']))
+			if ($this->getRules($_GET['ruleID']) && isset($_GET['ruleID']))
 			{
 
 				$rules = $this->rulesByID;
-				$content= $rules;
+				$content = $rules;
 				$content ['ruleID'] = $_GET['ruleID'];
 				switch ($rules['action'])
 				{
@@ -257,7 +257,7 @@ 
 			{
 
 				$this->getRules(null);
-				$newRulePriority = count($this->rules)*2+1;
+				$newRulePriority = count($this->rules) * 2 + 1;
 				$newRules ['priority'] = $newRulePriority;
 				$newRules ['status'] = 'ENABLED';
 				$readonlys = array(
@@ -274,19 +274,19 @@ 
 			list($button) = @each($content['button']);
 
 			//$ruleID is calculated by priority from the selected rule and is an unique ID
-			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2;
+			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] - 1) / 2;
             $error = 0;
 			switch ($button)
 			{
 				case 'save':
 				case 'apply':
-					if($content)
+					if ($content)
 					{
 						unset($content['button']);
 
 						$newRule = $content;
-						$newRule['priority']	= $this->rulesByID['priority'];
-						$newRule['status']	= $this->rulesByID['status'];
+						$newRule['priority'] = $this->rulesByID['priority'];
+						$newRule['status'] = $this->rulesByID['status'];
 
 						switch ($content['action'])
 						{
@@ -304,14 +304,14 @@ 
 						unset($newRule['action_address_text']);
 						unset($newRule['action_reject_text']);
 
-						$newRule['flg'] = 0 ;
-						if( $newRule['continue'] ) { $newRule['flg'] += 1; }
-						if( $newRule['gthan'] )    { $newRule['flg'] += 2; }
-						if( $newRule['anyof'] )    { $newRule['flg'] += 4; }
-						if( $newRule['keep'] )     { $newRule['flg'] += 8; }
-						if( $newRule['regexp'] )   { $newRule['flg'] += 128; }
+						$newRule['flg'] = 0;
+						if ($newRule['continue']) { $newRule['flg'] += 1; }
+						if ($newRule['gthan']) { $newRule['flg'] += 2; }
+						if ($newRule['anyof']) { $newRule['flg'] += 4; }
+						if ($newRule['keep']) { $newRule['flg'] += 8; }
+						if ($newRule['regexp']) { $newRule['flg'] += 128; }
 
-						if($newRule['action'] && $this->rulesByID['priority'])
+						if ($newRule['action'] && $this->rulesByID['priority'])
 						{
 							$this->rules[$ruleID] = $newRule;
 							$ret = $this->account->imapServer()->setRules($this->rules);
@@ -321,7 +321,7 @@ 
 							}
 							else
 							{
-								$msg .= lang("The rule with priority %1 successfully saved!",$ruleID);
+								$msg .= lang("The rule with priority %1 successfully saved!", $ruleID);
 							}
 							$this->saveSessionData();
 						}
@@ -346,14 +346,14 @@ 
 				case 'delete':
 					if ($button == "delete")
 					{
-						if ($ruleID === count($this->rules)-1)
+						if ($ruleID === count($this->rules) - 1)
 						{
-							$msg = lang('rule with priority ') . $ruleID . lang(' deleted!');
+							$msg = lang('rule with priority ').$ruleID.lang(' deleted!');
 						}
 						else
 						{
 
-							$msg = lang('rule with priority ') . $ruleID . lang(' deleted!') . lang(' And the rule with priority %1, now got the priority %2',$ruleID+1,$ruleID);
+							$msg = lang('rule with priority ').$ruleID.lang(' deleted!').lang(' And the rule with priority %1, now got the priority %2', $ruleID + 1, $ruleID);
 						}
 						unset($this->rules[$ruleID]);
 						$this->rules = array_values($this->rules);
@@ -384,9 +384,9 @@ 
 		);
 
 		//Set the preselect_options for mail/folders as we are not allow free entry for folder taglist
-		$sel_options['action_folder_text'] = $this->ajax_getFolders(0,true,null,true);
+		$sel_options['action_folder_text'] = $this->ajax_getFolders(0, true, null, true);
 
-		return $etmpl->exec('mail.mail_sieve.edit',$content,$sel_options,$readonlys,array(),2);
+		return $etmpl->exec('mail.mail_sieve.edit', $content, $sel_options, $readonlys, array(), 2);
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	function getEmailNotification()
 	{
-		if(!(empty($this->mailConfig['prefpreventnotificationformailviaemail']) || $this->mailConfig['prefpreventnotificationformailviaemail'] == 0))
+		if (!(empty($this->mailConfig['prefpreventnotificationformailviaemail']) || $this->mailConfig['prefpreventnotificationformailviaemail'] == 0))
 		{
 			throw new Api\Exception\NoPermission();
 		}
@@ -406,7 +406,7 @@ 
 		try {
 			$emailNotification = $this->account->imapServer()->getEmailNotification();
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			$emailNotification = array();
 		}
@@ -422,7 +422,7 @@ 
 	 */
 	function getVacation($accountID = null)
 	{
-		if(!(empty($this->mailConfig['prefpreventabsentnotice']) || $this->mailConfig['prefpreventabsentnotice'] == 0))
+		if (!(empty($this->mailConfig['prefpreventabsentnotice']) || $this->mailConfig['prefpreventabsentnotice'] == 0))
 		{
 			throw new Api\Exception\NoPermission();
 		}
@@ -439,7 +439,7 @@ 
 				$vacation = $icServer->getVacation();
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			Framework::window_close(lang($e->getMessage()));
 		}
@@ -449,9 +449,9 @@ 
 		$allAliases = array($this->account->ident_email);
 		foreach ($accAllIdentities as &$arrVal)
 		{
-			if ($arrVal['type'] !='default')
+			if ($arrVal['type'] != 'default')
 			{
-				$allAliases[] =  $arrVal['address'];
+				$allAliases[] = $arrVal['address'];
 			}
 		}
 		asort($allAliases);
@@ -467,7 +467,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function editVacation($content=null, $msg='')
+	function editVacation($content = null, $msg = '')
 	{
 		//Instantiate an eTemplate object, representing the sieve.vacation template
 		$vtmpl = new Etemplate('mail.sieve.vacation');
@@ -480,27 +480,27 @@ 
 			$account_id = $content['account_id'];
 			$preserv['acc_id'] = $content['acc_id'];
 		}
-		if(isset($account_id) && $this->mail_admin)
+		if (isset($account_id) && $this->mail_admin)
 		{
-			foreach(Mail\Account::search($account_id, false, null, false, 0, false) as $account)
+			foreach (Mail\Account::search($account_id, false, null, false, 0, false) as $account)
 			{
 				try {
 					// check if account is valid for multiple users, has admin credentials and sieve enabled
 					if (Mail\Account::is_multiple($account) &&
-						($icServer = $account->imapServer(true)) &&	// check on icServer object, so plugins can overwrite
+						($icServer = $account->imapServer(true)) && // check on icServer object, so plugins can overwrite
 						$icServer->acc_imap_admin_username && $icServer->acc_sieve_enabled)
 					{
 						$allAccounts[$account->acc_id] = $account->acc_name;
 						$accounts[$account->acc_id] = $account;
 					}
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					unset($e);
 					// ignore broken accounts
 				}
 			}
 
-			$profileID = !isset($content['acc_id']) ? key($accounts):$content['acc_id'];
+			$profileID = !isset($content['acc_id']) ? key($accounts) : $content['acc_id'];
 			if (isset($_GET['acc_id']) && isset($allAccounts[$_GET['acc_id']]))
 			{
 				$profileID = $content['acc_id'] = (int)$_GET['acc_id'];
@@ -512,7 +512,7 @@ 
 			$this->is_admin_vac = true;
 			$preserv['account_id'] = $account_id;
 		}
-		elseif(!is_array($content) && isset($_GET['acc_id']))
+		elseif (!is_array($content) && isset($_GET['acc_id']))
 		{
 			$this->account = Mail\Account::read($_GET['acc_id']);
 			$preserv['acc_id'] = $this->account->acc_id;
@@ -528,11 +528,11 @@ 
 		if ($icServer->acc_sieve_enabled)
 		{
 			$vacRules = $this->getVacation($account_id);
-			if ($vacRules['vacation']===false)
+			if ($vacRules['vacation'] === false)
 			{
 				$content['msg'] = lang('error').':'.lang('Serverside Vacationnotice (via Sieve) are not activated').'. '.
-					lang('Please contact your Administrator to validate if your Server supports Serverside Vacationmessages, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
-				$content['hideIfSieveDisabled']='mail_DisplayNone';
+					lang('Please contact your Administrator to validate if your Server supports Serverside Vacationmessages, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $icServer->ImapServerId);
+				$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 			}
 			else
 			{
@@ -540,24 +540,24 @@ 
 				{
 					$ByDate = array('by_date' => lang('By date'));
 				}
-				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text']))==0 && in_array($content['status'],array('on','by_date'))))
+				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text'])) == 0 && in_array($content['status'], array('on', 'by_date'))))
 				{
 					$content = $vacation = $vacRules['vacation'];
 					if (!empty($profileID)) $content['acc_id'] = $profileID;
-					if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
+					if (empty($vacation['addresses']) || implode('', $vacation['addresses']) == '')
 					{
 						$content['addresses'] = $vacRules['aliases'];
 					}
 					if (!empty($vacation['forwards']))
 					{
-						$content['forwards'] = explode(",",$vacation['forwards']);
+						$content['forwards'] = explode(",", $vacation['forwards']);
 					}
 					else
 					{
 						$content['forwards'] = '';
 					}
-					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
-					if (strlen(trim($content['text']))==0)
+					if (strlen(trim($vacation['text'])) == 0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
+					if (strlen(trim($content['text'])) == 0)
 					{
 						$content['msg'] = $msg = lang('error').': '.lang('No vacation notice text provided. Please enter a message.');
 						Framework::refresh_opener($msg, 'mail');
@@ -575,7 +575,7 @@ 
 					list($button) = @each($content['button']);
 					unset ($content['button']);
 
-					switch($button)
+					switch ($button)
 					{
 						case 'save':
 						case 'apply':
@@ -593,7 +593,7 @@ 
 								$newVacation = $content;
 
 								if (empty($this->mailConfig['prefpreventforwarding']) ||
-									$this->mailConfig['prefpreventforwarding'] == 0 )
+									$this->mailConfig['prefpreventforwarding'] == 0)
 								{
 									$content['forwards'] = self::strip_rfc882_addresses($content['forwards']);
 									$newVacation['forwards'] = implode(',', $content['forwards']);
@@ -603,7 +603,7 @@ 
 									unset($newVacation ['forwards']);
 								}
 
-								if (!in_array($newVacation['status'],array('on','off','by_date')))
+								if (!in_array($newVacation['status'], array('on', 'off', 'by_date')))
 								{
 									$newVacation['status'] = 'off';
 								}
@@ -615,7 +615,7 @@ 
 										self::strip_rfc882_addresses($content['addresses']);
 								}
 
-								if($this->checkRule($newVacation,$checkAddresses))
+								if ($this->checkRule($newVacation, $checkAddresses))
 								{
 									if (isset($account_id) && $this->mail_admin)
 									{
@@ -628,13 +628,13 @@ 
 
 									if (!$resSetvac)
 									{
-										$msg = lang('vacation update failed') . "\n" . lang('Vacation notice update failed') . ":" . $this->account->imapServer()->error;
+										$msg = lang('vacation update failed')."\n".lang('Vacation notice update failed').":".$this->account->imapServer()->error;
 										break;
 									}
 									// schedule job to switch message on/off, if request and not already in past
 									else
 									{
-										if ($newVacation['status'] == 'by_date' && $newVacation['end_date']+24*3600 > time() ||
+										if ($newVacation['status'] == 'by_date' && $newVacation['end_date'] + 24 * 3600 > time() ||
 											$vacRules && $vacRules['vacation']['status'] == 'by_date')
 										{
 											self::setAsyncJob($newVacation);
@@ -642,29 +642,29 @@ 
 										//Reset vacationNotice cache which is used in mail_ui get_rows
 										if (isset($account_id) && $this->mail_admin)
 										{
-											$account_lid = Api\Accounts::id2name($account_id,'account_lid');
+											$account_lid = Api\Accounts::id2name($account_id, 'account_lid');
 											$cachedVacations = array($icServer->acc_id => $newVacation) + (array)Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$account_lid);
 											//error_log(__METHOD__.__LINE__.' Setting Cache for '.$account_lid.':'.array2string($cachedVacations));
-											Api\Cache::setCache(Api\Cache::INSTANCE,'email', 'vacationNotice'.$account_lid, $cachedVacations);
+											Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$account_lid, $cachedVacations);
 										}
 										else
 										{
 											$cachedVacations = array($icServer->acc_id => $newVacation) + (array)Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
 											//error_log(__METHOD__.__LINE__.' Setting Cache for own ('.$GLOBALS['egw_info']['user']['account_lid'].'):'.array2string($cachedVacations));
-											Api\Cache::setCache(Api\Cache::INSTANCE,'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
+											Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
 										}
 										$msg = lang('Vacation notice sucessfully updated.');
 									}
 								}
 								else
 								{
-									$msg .= implode("\n",$this->errorStack);
+									$msg .= implode("\n", $this->errorStack);
 								}
 								// refresh vacationNotice on index
 								$response = Api\Json\Response::get();
-								$response->call('app.mail.mail_callRefreshVacationNotice',$icServer->ImapServerId);
+								$response->call('app.mail.mail_callRefreshVacationNotice', $icServer->ImapServerId);
 								Framework::refresh_opener($msg, 'mail');
-								if ($button === 'apply' || $icServer->error !=="")
+								if ($button === 'apply' || $icServer->error !== "")
 								{
 									break;
 								}
@@ -680,7 +680,7 @@ 
 						'on' => lang('Active'),
 						'off' => lang('Deactive'),
 					),
-					'addresses' => array_combine($vacRules['aliases'],$vacRules['aliases']),
+					'addresses' => array_combine($vacRules['aliases'], $vacRules['aliases']),
 				);
 				if (!isset($account_id))
 				{
@@ -704,10 +704,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $icServer->ImapServerId);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,$preserv,2);
+		$vtmpl->exec('mail.mail_sieve.editVacation', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -721,7 +721,7 @@ 
 	static function strip_rfc882_addresses($_addresses)
 	{
 		$addresses = array();
-		foreach(Mail::parseAddressList($_addresses) as $addr)
+		foreach (Mail::parseAddressList($_addresses) as $addr)
 		{
 			if ($addr->valid)
 			{
@@ -738,7 +738,7 @@ 
 	 * @param boolean $_reschedule do nothing but reschedule the job by 3 minutes
 	 * @return  void
 	 */
-	static function setAsyncJob (array $_vacation, $_reschedule=false)
+	static function setAsyncJob(array $_vacation, $_reschedule = false)
 	{
 		if (!($_vacation['acc_id'] > 0))
 		{
@@ -750,19 +750,19 @@ 
 		$async_id = !empty($_vacation['id']) ? $_vacation['id'] : 'mail-vacation-'.$_vacation['account_id'];
 		$async->delete($async_id);
 
-		$end_date = $_vacation['end_date'] + 24*3600;   // end-date is inclusive, so we have to add 24h
+		$end_date = $_vacation['end_date'] + 24 * 3600; // end-date is inclusive, so we have to add 24h
 		if ($_vacation['status'] == 'by_date' && time() < $end_date && !$_reschedule)
 		{
 			$time = time() < $_vacation['start_date'] ? $_vacation['start_date'] : $end_date;
-			$async->set_timer($time,$async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
+			$async->set_timer($time, $async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
 		}
 		if ($_reschedule)
 		{
-			$_vacation['rescheduled'] = $_vacation['rescheduled'] ? 2*$_vacation['rescheduled'] : 5;
+			$_vacation['rescheduled'] = $_vacation['rescheduled'] ? 2 * $_vacation['rescheduled'] : 5;
 			// only try to reschedule for 2 days max
 			if ($_vacation['rescheduled'] <= 2 * 24 * 60)
 			{
-				$time = time() + 60*($_vacation['rescheduled']);
+				$time = time() + 60 * ($_vacation['rescheduled']);
 				unset($_vacation['next']);
 				unset($_vacation['times']);
 				$async->set_timer($time, $async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
@@ -798,7 +798,7 @@ 
 		}
 		catch (Exception $e) {
 			error_log(__METHOD__.'('.array2string($_vacation).' failed '.$e->getMessage());
-			self::setAsyncJob($_vacation, true);	// reschedule
+			self::setAsyncJob($_vacation, true); // reschedule
 			$ret = false;
 		}
 
@@ -813,7 +813,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function checkRule($_vacation,$_checkAddresses=true)
+	function checkRule($_vacation, $_checkAddresses = true)
 	{
 		$this->errorStack = array();
 
@@ -827,12 +827,12 @@ 
 			$this->errorStack['days'] = lang('Please select the number of days to wait between responses').'!';
 		}
 
-		if(is_array($_vacation['addresses']) && !empty($_vacation['addresses']))
+		if (is_array($_vacation['addresses']) && !empty($_vacation['addresses']))
 		{
-			$regexp="/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
+			$regexp = "/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
 			foreach ($_vacation['addresses'] as $addr)
 			{
-				if (!preg_match($regexp,$addr) && $_checkAddresses)
+				if (!preg_match($regexp, $addr) && $_checkAddresses)
 				{
 					$this->errorStack['addresses'] = lang('One address is not valid').'!';
 				}
@@ -848,23 +848,23 @@ 
 			{
 				$this->errorStack['status'] = lang('Activating by date requires a start- AND end-date!');
 			}
-			elseif($_vacation['start_date'] > $_vacation['end_date'])
+			elseif ($_vacation['start_date'] > $_vacation['end_date'])
 			{
 				$this->errorStack['status'] = lang('Vacation start-date must be BEFORE the end-date!');
 			}
 		}
 		if ($_vacation['forwards'])
 		{
-			foreach(preg_split('/, ?/',$_vacation['forwards']) as $addr)
+			foreach (preg_split('/, ?/', $_vacation['forwards']) as $addr)
 			{
-				if (!preg_match($regexp,$addr) && $_checkAddresses)
+				if (!preg_match($regexp, $addr) && $_checkAddresses)
 				{
 					$this->errorStack['forwards'] = lang('One address is not valid'.'!');
 				}
 			}
 		}
 		//error_log(__METHOD__. array2string($this->errorStack));
-		if(count($this->errorStack) == 0)
+		if (count($this->errorStack) == 0)
 		{
 			return true;
 		}
@@ -885,14 +885,14 @@ 
 
 		foreach ($orders as $keys => $val)
 		{
-			$orders[$keys] = $val -1;
+			$orders[$keys] = $val - 1;
 		}
 
 		$this->getRules(null);
 
 		$newrules = $this->rules;
 
-		foreach($orders as $keys => $ruleID)
+		foreach ($orders as $keys => $ruleID)
 		{
 			$newrules[$keys] = $this->rules[$ruleID];
 		}
@@ -921,24 +921,24 @@ 
 		switch ($action)
 		{
 			case 'delete':
-				if ($checked === count($this->rules)-1)
+				if ($checked === count($this->rules) - 1)
 				{
-					$msg = lang('rule with priority ') . $checked . lang(' deleted!');
+					$msg = lang('rule with priority ').$checked.lang(' deleted!');
 				}
 				else
 				{
 
-					$msg = lang('rule with priority ') . $checked . lang(' deleted!') . lang(' And the rule with priority %1, now got the priority %2',$checked+1,$checked);
+					$msg = lang('rule with priority ').$checked.lang(' deleted!').lang(' And the rule with priority %1, now got the priority %2', $checked + 1, $checked);
 				}
 				unset($this->rules[$checked]);
 				$this->rules = array_values($this->rules);
 				break;
 			case 'enable':
-				$msg = lang('rule with priority ') . $checked . lang(' enabled!');
+				$msg = lang('rule with priority ').$checked.lang(' enabled!');
 				$this->rules[$checked][status] = 'ENABLED';
 				break;
 			case 'disable':
-				$msg = lang('rule with priority ') . $checked . lang(' disabled!');
+				$msg = lang('rule with priority ').$checked.lang(' disabled!');
 				$this->rules[$checked][status] = 'DISABLED';
 				break;
 			case 'move':
@@ -950,7 +950,7 @@ 
 
 		$response = Api\Json\Response::get();
 
-		if($result)
+		if ($result)
 		{
 			$response->error($result);
 			return;
@@ -968,11 +968,11 @@ 
 	 */
 	function buildRule($rule)
 	{
-		$andor = ' '. lang('and') .' ';
+		$andor = ' '.lang('and').' ';
 		$started = 0;
 		if ($rule['anyof'])
 		{
-			$andor = ' '. lang('or') .' ';
+			$andor = ' '.lang('or').' ';
 		}
 		$complete = lang('IF').' ';
 		if ($rule['unconditional'])
@@ -981,8 +981,8 @@ 
 		}
 		if ($rule['from'])
 		{
-			$match = $this->setMatchType($rule['from'],$rule['regexp']);
-			$complete .= "'From:' " . $match . " '" . $rule['from'] . "'";
+			$match = $this->setMatchType($rule['from'], $rule['regexp']);
+			$complete .= "'From:' ".$match." '".$rule['from']."'";
 			$started = 1;
 		}
 		if ($rule['to'])
@@ -991,8 +991,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['to'],$rule['regexp']);
-			$complete .= "'To:' " . $match . " '" . $rule['to'] . "'";
+			$match = $this->setMatchType($rule['to'], $rule['regexp']);
+			$complete .= "'To:' ".$match." '".$rule['to']."'";
 			$started = 1;
 		}
 		if ($rule['subject'])
@@ -1001,8 +1001,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['subject'],$rule['regexp']);
-			$complete .= "'Subject:' " . $match . " '" . $rule['subject'] . "'";
+			$match = $this->setMatchType($rule['subject'], $rule['regexp']);
+			$complete .= "'Subject:' ".$match." '".$rule['subject']."'";
 			$started = 1;
 		}
 		if ($rule['field'] && $rule['field_val'])
@@ -1011,8 +1011,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['field_val'],$rule['regexp']);
-			$complete .= "'" . $rule['field'] . "' " . $match . " '" . $rule['field_val'] . "'";
+			$match = $this->setMatchType($rule['field_val'], $rule['regexp']);
+			$complete .= "'".$rule['field']."' ".$match." '".$rule['field_val']."'";
 			$started = 1;
 		}
 		if ($rule['size'])
@@ -1026,7 +1026,7 @@ 
 			{
 				$complete .= $andor;
 			}
-			$complete .= "message " . $xthan . $rule['size'] . "KB'";
+			$complete .= "message ".$xthan.$rule['size']."KB'";
 			$started = 1;
 		}
 		if (!empty($rule['field_bodytransform']))
@@ -1035,7 +1035,7 @@ 
 			{
 				$newruletext .= ", ";
 			}
-			$btransform	= " :raw ";
+			$btransform = " :raw ";
 			$match = ' :contains';
 			if ($rule['bodytransform'])
 			{
@@ -1049,11 +1049,11 @@ 
 			{
 				$match = ':regex';
 			}
-			$complete .= " body " . $btransform . $match . " \"" . $rule['field_bodytransform'] . "\"";
+			$complete .= " body ".$btransform.$match." \"".$rule['field_bodytransform']."\"";
 			$started = 1;
 
 		}
-		if ($rule['ctype']!= '0' && !empty($rule['ctype']))
+		if ($rule['ctype'] != '0' && !empty($rule['ctype']))
 		{
 			if ($started)
 			{
@@ -1065,7 +1065,7 @@ 
 			{
 				$ctype_subtype = "/";
 			}
-			$complete .= " body :content " . " \"" . $btransform_ctype . $ctype_subtype . $rule['field_ctype_val'] . "\"" . " :contains \"\"";
+			$complete .= " body :content "." \"".$btransform_ctype.$ctype_subtype.$rule['field_ctype_val']."\""." :contains \"\"";
 			$started = 1;
 			//error_log(__CLASS__."::".__METHOD__.array2string(Mail\Script::$btransform_ctype_array));
 		}
@@ -1073,19 +1073,19 @@ 
 		{
 			$complete .= ' '.lang('THEN').' ';
 		}
-		if (preg_match("/folder/i",$rule['action']))
+		if (preg_match("/folder/i", $rule['action']))
 		{
-			$complete .= lang('file into')." '" . $rule['action_arg'] . "';";
+			$complete .= lang('file into')." '".$rule['action_arg']."';";
 		}
-		if (preg_match("/reject/i",$rule['action']))
+		if (preg_match("/reject/i", $rule['action']))
 		{
-			$complete .= lang('reject with')." '" . $rule['action_arg'] . "'.";
+			$complete .= lang('reject with')." '".$rule['action_arg']."'.";
 		}
-		if (preg_match("/address/i",$rule['action']))
+		if (preg_match("/address/i", $rule['action']))
 		{
-			$complete .= lang('forward to').' ' . $rule['action_arg'] .'.';
+			$complete .= lang('forward to').' '.$rule['action_arg'].'.';
 		}
-		if (preg_match("/discard/i",$rule['action']))
+		if (preg_match("/discard/i", $rule['action']))
 		{
 			$complete .= lang('discard').'.';
 		}
@@ -1107,7 +1107,7 @@ 
 	 * @param {string} $regex regular expresion as pattern to be matched
 	 * @return {string} return the type
 	 */
-	function setMatchType (&$matchstr, $regex = false)
+	function setMatchType(&$matchstr, $regex = false)
 	{
 		$match = lang('contains');
 		if (preg_match("/^\s*!/", $matchstr))
@@ -1132,11 +1132,11 @@ 
 		}
 		if ($regex && preg_match("/^\s*\\\\!/", $matchstr))
 		{
-			$matchstr = preg_replace("/^\s*\\\\!/","!",$matchstr);
+			$matchstr = preg_replace("/^\s*\\\\!/", "!", $matchstr);
 		}
 		else
 		{
-			$matchstr = preg_replace("/^\s*!/","",$matchstr);
+			$matchstr = preg_replace("/^\s*!/", "", $matchstr);
 		}
 		return $match;
 	}
@@ -1146,10 +1146,10 @@ 
 	 */
 	function saveSessionData()
 	{
-		$sessionData['sieve_rules']		= $this->rules;
+		$sessionData['sieve_rules'] = $this->rules;
 		$sessionData['sieve_rulesByID'] = $this->rulesByID;
-		$sessionData['sieve_scriptToEdit']	= $this->scriptToEdit;
-		$GLOBALS['egw']->session->appsession('sieve_session_data','',$sessionData);
+		$sessionData['sieve_scriptToEdit'] = $this->scriptToEdit;
+		$GLOBALS['egw']->session->appsession('sieve_session_data', '', $sessionData);
 	}
 
 	/**
@@ -1174,15 +1174,15 @@ 
 	{
 		try {
 			$this->account->imapServer()->retrieveRules();
-			$this->rules	= $this->account->imapServer()->getRules();
+			$this->rules = $this->account->imapServer()->getRules();
 			$this->rulesByID = $this->rules[$ruleID];
-			$this->vacation	= $this->account->imapServer()->getVacation();
+			$this->vacation = $this->account->imapServer()->getVacation();
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			error_log(__METHOD__.__LINE__.$e->getMessage().': '.$e->details);
-			$this->rules	= array();
+			$this->rules = array();
 			$this->rulesByID = array();
-			$this->vacation	= array();
+			$this->vacation = array();
 			return false;
 		}
 		return true;
@@ -1194,9 +1194,9 @@ 
 	function restoreSessionData()
 	{
 		$sessionData = $GLOBALS['egw']->session->appsession('sieve_session_data');
-		$this->rules		= $sessionData['sieve_rules'];
+		$this->rules = $sessionData['sieve_rules'];
 		$this->rulesByID = $sessionData['sieve_rulesByID'];
-		$this->scriptToEdit	= $sessionData['sieve_scriptToEdit'];
+		$this->scriptToEdit = $sessionData['sieve_scriptToEdit'];
 	}
 
 	/**
@@ -1210,14 +1210,14 @@ 
 		$rows = array();
 		$this->getRules(null);
 
-		if (is_array($this->rules) && !empty($this->rules) )
+		if (is_array($this->rules) && !empty($this->rules))
 		{
 			$rows = $this->rules;
 
-			foreach ($rows as &$row )
+			foreach ($rows as &$row)
 			{
 				$row['rules'] = $this->buildRule($row);
-				$row['ruleID'] =(string)(($row['priority'] -1) / 2 );
+				$row['ruleID'] = (string)(($row['priority'] - 1) / 2);
 				if ($row ['status'] === 'DISABLED')
 				{
 					$row['class'] = 'mail_sieve_DISABLED';
@@ -1230,7 +1230,7 @@ 
 			return false;
 		}
 		// Shift one down, because in grid the first row is reserved for header
-		array_unshift($rows,array(''=> ''));
+		array_unshift($rows, array(''=> ''));
 		return $rows;
 	}
 
@@ -1241,7 +1241,7 @@ 
 	 */
 	private function get_actions()
 	{
-		$actions =array(
+		$actions = array(
 
 			'edit' => array(
 				'caption' => 'Edit',
@@ -1280,7 +1280,7 @@ 
 	 * @param int $_mailaccountToSearch
 	 * @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id
 	 */
-	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
+	function ajax_getFolders($_searchStringLength = 2, $_returnList = false, $_mailaccountToSearch = null, $_noPrefixId = false)
 	{
 		$mailCompose = new mail_compose();
 		if ($_REQUEST['noPrefixId']) $_noPrefixId = $_REQUEST['noPrefixId'];

Braces +39 added lines, -11 removed lines

@@ -305,11 +305,21 @@ 
 						unset($newRule['action_reject_text']);
 
 						$newRule['flg'] = 0 ;
-						if( $newRule['continue'] ) { $newRule['flg'] += 1; }
-						if( $newRule['gthan'] )    { $newRule['flg'] += 2; }
-						if( $newRule['anyof'] )    { $newRule['flg'] += 4; }
-						if( $newRule['keep'] )     { $newRule['flg'] += 8; }
-						if( $newRule['regexp'] )   { $newRule['flg'] += 128; }
+						if( $newRule['continue'] )
+						{
+$newRule['flg'] += 1; }
+						if( $newRule['gthan'] )
+						{
+$newRule['flg'] += 2; }
+						if( $newRule['anyof'] )
+						{
+$newRule['flg'] += 4; }
+						if( $newRule['keep'] )
+						{
+$newRule['flg'] += 8; }
+						if( $newRule['regexp'] )
+						{
+$newRule['flg'] += 128; }
 
 						if($newRule['action'] && $this->rulesByID['priority'])
 						{
@@ -443,7 +453,10 @@ 
 		{
 			Framework::window_close(lang($e->getMessage()));
 		}
-		if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($accountID))
+		{
+			$accountID = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(Api\Accounts::id2name($accountID));
 		$allAliases = array($this->account->ident_email);
@@ -473,7 +486,10 @@ 
 		$vtmpl = new Etemplate('mail.sieve.vacation');
 		$vacation = array();
 
-		if (isset($_GET['account_id'])) $account_id = $preserv['account_id'] = $_GET['account_id'];
+		if (isset($_GET['account_id']))
+		{
+			$account_id = $preserv['account_id'] = $_GET['account_id'];
+		}
 
 		if (isset($content['account_id']))
 		{
@@ -543,7 +559,10 @@ 
 				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text']))==0 && in_array($content['status'],array('on','by_date'))))
 				{
 					$content = $vacation = $vacRules['vacation'];
-					if (!empty($profileID)) $content['acc_id'] = $profileID;
+					if (!empty($profileID))
+					{
+						$content['acc_id'] = $profileID;
+					}
 					if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
 					{
 						$content['addresses'] = $vacRules['aliases'];
@@ -556,7 +575,10 @@ 
 					{
 						$content['forwards'] = '';
 					}
-					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
+					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text'])
+					{
+						$content['text'] = $this->mailConfig['default_vacation_text'];
+					}
 					if (strlen(trim($content['text']))==0)
 					{
 						$content['msg'] = $msg = lang('error').': '.lang('No vacation notice text provided. Please enter a message.');
@@ -746,7 +768,10 @@ 
 		}
 		// setting up an async job to enable/disable the vacation message
 		$async = new Api\Asyncservice();
-		if (empty($_vacation['account_id'])) $_vacation['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
+		if (empty($_vacation['account_id']))
+		{
+			$_vacation['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		$async_id = !empty($_vacation['id']) ? $_vacation['id'] : 'mail-vacation-'.$_vacation['account_id'];
 		$async->delete($async_id);
 
@@ -1283,7 +1308,10 @@ 
 	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
 	{
 		$mailCompose = new mail_compose();
-		if ($_REQUEST['noPrefixId']) $_noPrefixId = $_REQUEST['noPrefixId'];
+		if ($_REQUEST['noPrefixId'])
+		{
+			$_noPrefixId = $_REQUEST['noPrefixId'];
+		}
 		$mailCompose->ajax_searchFolder($_searchStringLength, $_returnList, $_mailaccountToSearch, $_noPrefixId);
 	}
 }

mail/inc/class.mail_tree.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
 	 * @param string $_profileID icServer profile id
 	 * @param string $_err error message to be shown on tree node
 	 * @param mixed $_path
-	 * @param mixed $_parent
+	 * @param string $_parent
 	 * @return array returns an array of tree node
 	 */
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
@@ -123,7 +123,7 @@ 
 	/**
 	 * Check if the given tree id is account node (means root)
 	 *
-	 * @param type $_node a tree id node
+	 * @param string|null $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
 	private static function isAccountNode ($_node)
@@ -155,7 +155,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' icServer id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param $_noCheckboxNS = false no checkbox for namesapaces makes sure to not put checkbox for namespaces node
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
@@ -443,7 +443,7 @@ 
 	 *
 	 * @param type $_profileID = null Null means all accounts and giving profileid means fetches node for the account
 	 * @param type $_noCheckbox = false option to switch checkbox of
-	 * @param type $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
+	 * @param integer $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
@@ -491,7 +491,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' active profile / acc_id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go

Spacing +42 added lines, -42 removed lines

@@ -61,11 +61,11 @@ 
 		$this->ui = $mail_ui;
 
 		// check images available in png or svg
-		foreach(self::$leafImages as &$image)
+		foreach (self::$leafImages as &$image)
 		{
 			if (strpos($image, '.') === false)
 			{
-				$image = basename($img=Api\Image::find('mail', 'dhtmlxtree/'.$image));
+				$image = basename($img = Api\Image::find('mail', 'dhtmlxtree/'.$image));
 			}
 		}
 	}
@@ -82,7 +82,7 @@ 
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
 	{
 		$baseNode = array('id' => $_profileID);
-		$leaf =  array(
+		$leaf = array(
 			'id' => $_profileID.self::DELIMITER.'INBOX',
 			'text' => $_err,
 			'tooltip' => $_err,
@@ -94,7 +94,7 @@ 
 		);
 		self::setOutStructure($leaf, $baseNode, self::DELIMITER);
 
-		return ($baseNode?$baseNode:array( // fallback not connected array
+		return ($baseNode ? $baseNode : array( // fallback not connected array
 						'id'=>0,
 						'item'=> array(
 							'text'=>'INBOX',
@@ -111,7 +111,7 @@ 
 	 * @param array $_node array of a node
 	 * @return int returns 1 if it has children flag set otherwise 0
 	 */
-	private static function nodeHasChildren ($_node)
+	private static function nodeHasChildren($_node)
 	{
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
@@ -126,7 +126,7 @@ 
 	 * @param type $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
-	private static function isAccountNode ($_node)
+	private static function isAccountNode($_node)
 	{
 		list(,$leaf) = explode(self::DELIMITER, $_node);
 		if ($leaf || $_node == null) return false;
@@ -164,10 +164,10 @@ 
 	 *
 	 * @return array returns an array of mail tree structure according to provided node
 	 */
-	function getTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly= false, $_allInOneGo = false, $_checkSubscribed = true)
+	function getTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly = false, $_allInOneGo = false, $_checkSubscribed = true)
 	{
 		//Init mail folders
-		$tree = array(Tree::ID=> $_parent?$_parent:0,Tree::CHILDREN => array());
+		$tree = array(Tree::ID=> $_parent ? $_parent : 0, Tree::CHILDREN => array());
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
 		if ($_parent) list($_profileID) = explode(self::DELIMITER, $_parent);
@@ -178,7 +178,7 @@ 
 			{
 				$this->ui->changeProfile($_profileID);
 			} catch (Exception $ex) {
-				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 			}
 		}
 
@@ -196,7 +196,7 @@ 
 			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
 			{
 				$nodeInfo = Mail::pathToFolderData($_parent, $hDelimiter);
-				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
+				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'], false, $_allInOneGo ? 0 : 2, $_subscribedOnly);
 
 				$childrenNode = array();
 				foreach ($folders as &$node)
@@ -205,14 +205,14 @@ 
 					$nodeData = Mail::pathToFolderData($nodeId, $node['delimiter']);
 					$childrenNode[] = array(
 						Tree::ID=> $nodeId,
-						Tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($node),
+						Tree::AUTOLOAD_CHILDREN => $_allInOneGo ? false : self::nodeHasChildren($node),
 						Tree::CHILDREN =>array(),
 						Tree::LABEL => $nodeData['text'],
 						Tree::TOOLTIP => $nodeData['tooltip'],
 						Tree::IMAGE_LEAF => self::$leafImages['folderLeaf'],
 						Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderOpen'],
 						Tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderClosed'],
-						Tree::CHECKED => $_checkSubscribed?$node['SUBSCRIBED']:false,
+						Tree::CHECKED => $_checkSubscribed ? $node['SUBSCRIBED'] : false,
 						'parent' => $_parent
 					);
 				}
@@ -232,7 +232,7 @@ 
 				}
 
 				//List of folders
-				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, false);
+				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo ? 0 : 2, $_subscribedOnly, false);
 				foreach ($foldersList as &$folder)
 				{
 					$path = $parent = $parts = explode($folder['delimiter'], $folder['MAILBOX']);
@@ -242,14 +242,14 @@ 
 
 					$data = array(
 						Tree::ID=>$_profileID.self::DELIMITER.$folder['MAILBOX'],
-						Tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($folder),
+						Tree::AUTOLOAD_CHILDREN => $_allInOneGo ? false : self::nodeHasChildren($folder),
 						Tree::CHILDREN =>array(),
 						Tree::LABEL =>lang($folder['MAILBOX']),
-						Tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel?1:0,
+						Tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel ? 1 : 0,
 						Tree::TOOLTIP => lang($folder['MAILBOX']),
-						Tree::CHECKED => $_checkSubscribed?$folder['SUBSCRIBED']:false,
+						Tree::CHECKED => $_checkSubscribed ? $folder['SUBSCRIBED'] : false,
 						Tree::NOCHECKBOX => 0,
-						'parent' => $parent?$_profileID.self::DELIMITER.implode($folder['delimiter'], $parent):$_profileID,
+						'parent' => $parent ? $_profileID.self::DELIMITER.implode($folder['delimiter'], $parent) : $_profileID,
 						'path' => $path,
 						'folderarray' => $folder
 					);
@@ -287,7 +287,7 @@ 
 		catch (Exception $ex) // Catch exceptions
 		{
 			//mail_ui::callWizard($ex->getMessage(), false, 'error');
-			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 		}
 
 		return $tree;
@@ -304,19 +304,19 @@ 
 	 *					as clearance for access may be limited to a single branch-node of a tree
 	 * @return void
 	 */
-	static function setOutStructure($data, &$out, $del='.', $createMissingParents=true, $nameSpace=array(), $definedFolders= array())
+	static function setOutStructure($data, &$out, $del = '.', $createMissingParents = true, $nameSpace = array(), $definedFolders = array())
 	{
 		//error_log(__METHOD__."(".array2string($data).', '.array2string($out).", '$del')");
 		$components = $data['path'];
-		array_pop($components);	// remove own name
+		array_pop($components); // remove own name
 
 		$insert = &$out;
 		$parents = array();
-		foreach($components as $component)
+		foreach ($components as $component)
 		{
-			if (count($parents)>1)
+			if (count($parents) > 1)
 			{
-				$helper = array_slice($parents,1,null,true);
+				$helper = array_slice($parents, 1, null, true);
 				$parent = $parents[0].self::DELIMITER.implode($del, $helper);
 				if ($parent) $parent .= $del;
 			}
@@ -339,21 +339,21 @@ 
 				{
 					// if (appropriately padded) namespace prefix of (others or shared) is the leading part of parent
 					// we want to create the node in question as we meet the above considerations
-					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::DELIMITER.$nsp['prefix'])===0)
+					if ($nsp['type'] != 'personal' && $nsp['prefix_present'] && stripos($parent, $data['path'][0].self::DELIMITER.$nsp['prefix']) === 0)
 					{
 						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
-						$break=false;
+						$break = false;
 					}
 				}
 				if ($break) break;
 			}
 			if ($insert['item'])
 			{
-				foreach($insert['item'] as &$item)
+				foreach ($insert['item'] as &$item)
 				{
 					if ($item['id'] == $parent.$component)
 					{
-						$insert =& $item;
+						$insert = & $item;
 						break;
 					}
 				}
@@ -371,8 +371,8 @@ 
 						'im2' => self::$leafImages["folderNoSelectClosed"],
 						'tooltip' => lang('no access')
 					);
-					$insert['item'][] =& $item;
-					$insert =& $item;
+					$insert['item'][] = & $item;
+					$insert = & $item;
 				}
 				else
 				{
@@ -405,7 +405,7 @@ 
 					$data[Tree::IMAGE_FOLDER_OPEN] =
 					$data [Tree::IMAGE_FOLDER_CLOSED] = "MailFolder".$key.".png";
 			}
-			elseif(stripos(array2string($data['folderarray']['attributes']),'\noselect')!== false)
+			elseif (stripos(array2string($data['folderarray']['attributes']), '\noselect') !== false)
 			{
 				$data[Tree::IMAGE_LEAF] = self::$leafImages['folderNoSelectClosed'];
 				$data[Tree::IMAGE_FOLDER_OPEN] = self::$leafImages['folderNoSelectOpen'];
@@ -447,20 +447,20 @@ 
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
-	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0 )
+	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0)
 	{
 		$roots = array(Tree::ID => 0, Tree::CHILDREN => array());
 
-		foreach(Mail\Account::search(true, false) as $acc_id => $accObj)
+		foreach (Mail\Account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
-			$identity = Mail\Account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
+			if (!$accObj->is_imap() || $_profileID && $acc_id != $_profileID) continue;
+			$identity = Mail\Account::identity_name($accObj, true, $GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
-			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;
+			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id ? 1 : 0;
 
 			$baseNode = array(
 							Tree::ID=> (string)$acc_id,
-							Tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity),
+							Tree::LABEL => str_replace(array('<', '>'), array('[', ']'), $identity),
 							Tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity),
 							Tree::IMAGE_LEAF => self::$leafImages['folderAccount'],
 							Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderAccount'],
@@ -469,16 +469,16 @@ 
 							Tree::CHILDREN => array(), // dynamic loading on unfold
 							Tree::AUTOLOAD_CHILDREN => true,
 							'parent' => '',
-							Tree::OPEN => $_openTopLevel?$_openTopLevel:$openActiveAccount,
+							Tree::OPEN => $_openTopLevel ? $_openTopLevel : $openActiveAccount,
 							// mark on account if Sieve is enabled
 							'data' => array(
 										'sieve' => $accObj->imapServer()->acc_sieve_enabled,
-										'spamfolder'=> $accObj->imapServer()->acc_folder_junk&&(strtolower($accObj->imapServer()->acc_folder_junk)!='none')?true:false,
-										'archivefolder'=> $accObj->imapServer()->acc_folder_archive&&(strtolower($accObj->imapServer()->acc_folder_archive)!='none')?true:false
+										'spamfolder'=> $accObj->imapServer()->acc_folder_junk && (strtolower($accObj->imapServer()->acc_folder_junk) != 'none') ? true : false,
+										'archivefolder'=> $accObj->imapServer()->acc_folder_archive && (strtolower($accObj->imapServer()->acc_folder_archive) != 'none') ? true : false
 									),
 							Tree::NOCHECKBOX  => $_noCheckbox
 			);
-			self::setOutStructure($baseNode, $roots,self::DELIMITER);
+			self::setOutStructure($baseNode, $roots, self::DELIMITER);
 		}
 		return $roots;
 	}
@@ -497,10 +497,10 @@ 
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go
 	 * @return type an array of tree
 	 */
-	function getInitialIndexTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly= false, $_allInOneGo = false)
+	function getInitialIndexTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly = false, $_allInOneGo = false)
 	{
 		$tree = $this->getTree($_parent, '', $_openTopLevel, false, $_subscribedOnly, $_allInOneGo);
-		$branches = $this->getTree($_profileID, $_profileID,1,false,$_subscribedOnly,$_allInOneGo);
+		$branches = $this->getTree($_profileID, $_profileID, 1, false, $_subscribedOnly, $_allInOneGo);
 		foreach ($tree[Tree::CHILDREN] as &$account)
 		{
 			if ($account[Tree::ID] == $_profileID)

Braces +50 added lines, -13 removed lines

@@ -116,7 +116,10 @@ 
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
 				in_array('\Haschildren', $_node['ATTRIBUTES']) ||
-				in_array('\HasChildren', $_node['ATTRIBUTES'])) $hasChildren = 1;
+				in_array('\HasChildren', $_node['ATTRIBUTES']))
+		{
+			$hasChildren = 1;
+		}
 		return $hasChildren;
 	}
 
@@ -129,7 +132,10 @@ 
 	private static function isAccountNode ($_node)
 	{
 		list(,$leaf) = explode(self::DELIMITER, $_node);
-		if ($leaf || $_node == null) return false;
+		if ($leaf || $_node == null)
+		{
+			return false;
+		}
 		return true;
 	}
 
@@ -170,14 +176,18 @@ 
 		$tree = array(Tree::ID=> $_parent?$_parent:0,Tree::CHILDREN => array());
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
-		if ($_parent) list($_profileID) = explode(self::DELIMITER, $_parent);
+		if ($_parent)
+		{
+			list($_profileID) = explode(self::DELIMITER, $_parent);
+		}
 
 		if (is_numeric($_profileID) && $_profileID != $this->ui->mail_bo->profileID)
 		{
 			try
 			{
 				$this->ui->changeProfile($_profileID);
-			} catch (Exception $ex) {
+			}
+			catch (Exception $ex) {
 				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
 			}
 		}
@@ -193,9 +203,12 @@ 
 				'Junk'      => $this->ui->mail_bo->getJunkFolder(false),
 				'Outbox'    => $this->ui->mail_bo->getOutboxFolder(false),
 			);
-			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
+			if ($_parent && !self::isAccountNode($_parent))
+			{
+				// Single node loader
 			{
 				$nodeInfo = Mail::pathToFolderData($_parent, $hDelimiter);
+			}
 				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
 
 				$childrenNode = array();
@@ -220,15 +233,21 @@ 
 			}
 			else //Top Level Nodes loader
 			{
-				if (self::isAccountNode($_parent)) // An account called for open
+				if (self::isAccountNode($_parent))
+				{
+					// An account called for open
 				{
 					$_openTopLevel = 1;
+				}
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
 				}
 				else // Initial accounts|root nodes
 				{
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
-					if (!$_profileID && !$_openTopLevel) return $tree;
+					if (!$_profileID && !$_openTopLevel)
+					{
+						return $tree;
+					}
 				}
 
 				//List of folders
@@ -318,19 +337,28 @@ 
 			{
 				$helper = array_slice($parents,1,null,true);
 				$parent = $parents[0].self::DELIMITER.implode($del, $helper);
-				if ($parent) $parent .= $del;
+				if ($parent)
+				{
+					$parent .= $del;
+				}
 			}
 			else
 			{
 				$parent = implode(self::DELIMITER, $parents);
-				if ($parent) $parent .= self::DELIMITER;
+				if ($parent)
+				{
+					$parent .= self::DELIMITER;
+				}
 			}
 
 			if (!is_array($insert) || !isset($insert['item']))
 			{
 				// throwing an exeption here seems to be unrecoverable,
 				// even if the cause is a something that can be handeled by the mailserver
-				if (mail_bo::$debug) error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				if (mail_bo::$debug)
+				{
+					error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				}
 				// should we hit the break? if in personal: sure, something is wrong with the folderstructure
 				// if in shared or others we may proceed as access to folders may very well be limited to
 				// a single folder within the tree
@@ -341,11 +369,17 @@ 
 					// we want to create the node in question as we meet the above considerations
 					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::DELIMITER.$nsp['prefix'])===0)
 					{
-						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
+						if (mail_bo::$debug)
+						{
+							error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
+						}
 						$break=false;
 					}
 				}
-				if ($break) break;
+				if ($break)
+				{
+					break;
+				}
 			}
 			if ($insert['item'])
 			{
@@ -453,7 +487,10 @@ 
 
 		foreach(Mail\Account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
+			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID)
+			{
+				continue;
+			}
 			$identity = Mail\Account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
 			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;