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_tracking.inc.php

Doc Comments -1 removed lines

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

Spacing +42 added lines, -42 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,39 +215,39 @@ 
 		{
 			$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))
-				if(!empty($data['info_contact']) && is_array($data['link_to']['to_id']))
+			if ($name == 'info_from' && empty($value))
+				if (!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);
 					}
 				}
 				else if ($data['info_link_id'])
 				{
 					$this->infolog->link_id2from($data);
-					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(
 				'label' => lang($this->field2label[$name]),
@@ -278,7 +278,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'];
@@ -287,23 +287,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;
 		}
@@ -321,16 +321,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
 				{
@@ -339,7 +339,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 '';
 				}
@@ -348,7 +348,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 +29 added lines, -7 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')
 		{
@@ -234,26 +238,37 @@ 
 		{
 			//error_log(__METHOD__.__LINE__.' Key:'.$name.' val:'.array2string($value));
 			if ($name=='info_from' && empty($value))
-				if(!empty($data['info_contact']) && is_array($data['link_to']['to_id']))
+			{
+							if(!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))
 					{
 						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);
+						}
 					}
 				}
 				else if ($data['info_link_id'])
 				{
 					$this->infolog->link_id2from($data);
 					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'],
@@ -327,7 +342,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']);
@@ -348,7 +367,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'];

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
 	 *
 	 */

Braces +28 added lines, -8 removed lines

@@ -97,7 +97,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))
 		{
@@ -172,7 +175,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
 					{
@@ -180,7 +185,10 @@ 
 					}
 					//Send message
 					Framework::message($msg);
-					if ($button == "apply") break;
+					if ($button == "apply")
+					{
+						break;
+					}
 					Framework::window_close();
 					exit;
 
@@ -304,8 +312,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];
 				}
 			}
@@ -351,7 +367,7 @@ 
 	function retrieve_acl ($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
-		 {
+		{
 			$msg = lang('ACL rights retrieved successfully');
 			return $acl;
 		 }
@@ -374,7 +390,10 @@ 
 	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 = self::_extract_acc_id($content['grid'][$row_num]['acc_id']);
 		$content['mailbox'] = is_array($content['mailbox'])? $content['mailbox'][0] : $content['mailbox'];
@@ -514,7 +533,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 . "." .$e->getMessage());
 			return false;
 		}

Spacing +42 added lines, -43 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 string $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,8 +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']):
-			preg_replace("/^".$acc_id."::/",'',$content['mailbox'][0]);
+		$mailbox = $_GET['mailbox'] ? base64_decode($_GET['mailbox']) : preg_replace("/^".$acc_id."::/", '', $content['mailbox'][0]);
 		if (empty($mailbox))
 		{
 			$mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($account_id) : 'INBOX';
@@ -113,14 +112,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))
 					{
@@ -161,7 +160,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)
@@ -192,7 +191,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);
 			}
@@ -201,7 +200,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 (self::_extract_acc_id($fields['acc_id']) == $this->imap->acc_imap_username ||
 					$this->imap->getMailBoxUserName(self::_extract_acc_id($fields['acc_id'])) == $this->imap->acc_imap_username)
@@ -240,7 +239,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);
 	}
 
 	/**
@@ -259,7 +258,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)
 			{
@@ -287,7 +286,7 @@ 
 	 * @param string $msg Message
 	 *
 	 */
-	function update_acl ($content, &$msg)
+	function update_acl($content, &$msg)
 	{
 		$validator = array();
 
@@ -303,10 +302,10 @@ 
 			{
 				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 = self::_extract_acc_id($content['grid'][$keys]['acc_id']);
@@ -319,7 +318,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']);
 
@@ -331,7 +330,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!");
@@ -348,7 +347,7 @@ 
 	 * Retrieve Folder ACL rights
 	 * @todo rights 'c' and 'd' should be fixed
 	 */
-	function retrieve_acl ($mailbox, &$msg)
+	function retrieve_acl($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
 		 {
@@ -373,34 +372,34 @@ 
 	 */
 	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 = self::_extract_acc_id($content['grid'][$row_num]['acc_id']);
-		$content['mailbox'] = is_array($content['mailbox'])? $content['mailbox'][0] : $content['mailbox'];
+		$content['mailbox'] = is_array($content['mailbox']) ? $content['mailbox'][0] : $content['mailbox'];
 		if (is_numeric($identifier) && ($u = $this->imap->getMailBoxUserName($identifier)))
 		{
 			$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;
 		}
 	}
@@ -415,7 +414,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)
 		{
@@ -425,7 +424,7 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
@@ -433,7 +432,7 @@ 
 			}
 			catch (Exception $e)
 			{
-				error_log(__METHOD__. "Could not delete ACL rights of folder " . $mailbox . " for account ". $identifier ."." .$e->getMessage());
+				error_log(__METHOD__."Could not delete ACL rights of folder ".$mailbox." for account ".$identifier.".".$e->getMessage());
 				return false;
 			}
 		}
@@ -476,7 +475,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)
 		{
@@ -486,16 +485,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 . "." .$e->getMessage());
+				error_log(__METHOD__."Could not set ACL rights on folder ".$mailbox." for account ".$identifier.".".$e->getMessage());
 				return false;
 			}
 		}
@@ -508,14 +507,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 . "." .$e->getMessage());
+			error_log(__METHOD__."Could not get ACL rights from folder ".$mailbox.".".$e->getMessage());
 			return false;
 		}
 	}
@@ -527,8 +526,8 @@ 
 	 *
 	 * @return string returns acc_id in flat format
 	 */
-	private static function _extract_acc_id ($acc_id)
+	private static function _extract_acc_id($acc_id)
 	{
-		return is_array($acc_id)?$acc_id[0]:$acc_id;
+		return is_array($acc_id) ? $acc_id[0] : $acc_id;
 	}
 }

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 +604 added lines, -605 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;
 		}
 	}
 
@@ -180,7 +179,7 @@ 
 				'checkbox' => true,
 				'hint' => 'check to save as trackerentry on send',
 				'onExecute' => 'javaScript:app.mail.compose_setToggle',
-				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'),'tracker'),
+				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'), 'tracker'),
 			),
 			'to_calendar' => array(
 				'caption' => 'Calendar',
@@ -205,7 +204,7 @@ 
 				'children' => array(),
 				'hint' => 'Select the message priority tag',
 			),
-			'save2vfs' => array (
+			'save2vfs' => array(
 				'caption' => 'Save to filemanager',
 				'icon' => 'filesave',
 				'group' => ++$group,
@@ -242,7 +241,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;
 				}
 			}
@@ -266,7 +265,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);
 
@@ -287,14 +286,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
@@ -312,10 +311,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));
 		}
@@ -325,7 +324,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))
 			{
@@ -360,7 +359,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)
 				{
@@ -386,12 +385,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;
 			}
@@ -399,7 +398,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]);
@@ -407,7 +406,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']);
@@ -421,19 +420,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");
@@ -448,15 +447,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);
 					}
@@ -480,23 +479,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'];
 					}
 				}
@@ -504,30 +503,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();
@@ -535,60 +534,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']);
@@ -596,7 +595,7 @@ 
 			$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']);
@@ -608,7 +607,7 @@ 
 
 		// 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'])
 		)
@@ -619,7 +618,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'])
 				{
@@ -632,41 +631,41 @@ 
 				}
 			}
 			$_oldSig = $composeCache['mailidentity'];
-			$_signatureid = ($newSig?$newSig:$_content['mailidentity']);
+			$_signatureid = ($newSig ? $newSig : $_content['mailidentity']);
 
 			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')));
@@ -680,9 +679,9 @@ 
 				//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' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
@@ -690,9 +689,9 @@ 
 				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)
@@ -703,32 +702,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
 				{
@@ -750,7 +749,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;
@@ -759,7 +758,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']))
@@ -768,33 +767,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];
 							}
 						}
 					}
@@ -803,45 +802,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]);
 								}
@@ -850,44 +849,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;
@@ -896,8 +895,8 @@ 
 								}
 							}
 							//error_log(__METHOD__.__LINE__.array2string($mailtoArray));
-							$alreadyProcessed['to']='to';
-							$content['to']=$mailtoArray;
+							$alreadyProcessed['to'] = 'to';
+							$content['to'] = $mailtoArray;
 						}
 					}
 				}
@@ -912,20 +911,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));
@@ -939,7 +938,7 @@ 
 							{
 								$type = $types[$k];
 							}
-							$path = str_replace('+','%2B',$path);
+							$path = str_replace('+', '%2B', $path);
 							$formData = array(
 								'name' => $name,
 								'type' => $type,
@@ -952,7 +951,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),
@@ -965,28 +964,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;
@@ -999,36 +998,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];
 				}
@@ -1040,17 +1039,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
@@ -1058,24 +1057,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']);
@@ -1094,36 +1093,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
@@ -1133,57 +1132,57 @@ 
 						'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)
 		{
 			// do NOT add SMTP only accounts as identities
 			if (!$account->is_imap(false)) continue;
 
-			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;
@@ -1194,7 +1193,7 @@ 
 		//$content['bcc'] = array('kl@egroupware.org','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];
@@ -1202,22 +1201,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++;
 				}
 			}
@@ -1225,10 +1224,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
@@ -1237,12 +1236,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'];
@@ -1276,12 +1275,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;
@@ -1291,23 +1290,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;
 		}
@@ -1323,25 +1322,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);
 	}
 
 	/**
@@ -1362,9 +1361,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);
@@ -1376,15 +1375,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';
@@ -1400,7 +1399,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)
 					{
@@ -1410,14 +1409,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'])
@@ -1432,12 +1431,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;
@@ -1447,10 +1446,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
@@ -1461,9 +1460,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);
 				}
 			}
@@ -1491,22 +1490,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);
 		}
 	}
 
@@ -1521,9 +1520,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;
@@ -1532,7 +1531,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
@@ -1540,10 +1539,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;
 			}
@@ -1579,71 +1578,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;
 			}
@@ -1652,48 +1651,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'])
@@ -1713,7 +1712,7 @@ 
 
 	function getErrorInfo()
 	{
-		if(isset($this->errorInfo)) {
+		if (isset($this->errorInfo)) {
 			$errorInfo = $this->errorInfo;
 			unset($this->errorInfo);
 			return $errorInfo;
@@ -1721,39 +1720,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
@@ -1761,10 +1760,10 @@ 
 			unset($this->sessionData['in-reply-to']);
 			unset($this->sessionData['to']);
 			unset($this->sessionData['cc']);
-			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false))) {
+			if (($attachments = $mail_bo->getMessageAttachments($_uid, $_partID, null, true, false, false))) {
 				//error_log(__METHOD__.__LINE__.':'.array2string($attachments));
-				foreach($attachments as $attachment) {
-					if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
+				foreach ($attachments as $attachment) {
+					if (!($attachment['cid'] && preg_match("/image\//", $attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
 					{
 						$this->addMessageAttachment($_uid, $attachment['partID'],
 							$_folder,
@@ -1793,7 +1792,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));
 
@@ -1802,7 +1801,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)
 		{
@@ -1818,8 +1817,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)
@@ -1831,7 +1830,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);
 		}
@@ -1841,9 +1840,9 @@ 
 		}
 	}
 
-	function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size, $_is_winmail= null)
+	function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size, $_is_winmail = null)
 	{
-		$this->sessionData['attachments'][]=array (
+		$this->sessionData['attachments'][] = array(
 			'uid'		=> $_uid,
 			'partID'	=> $_partID,
 			'name'		=> $_name,
@@ -1851,7 +1850,7 @@ 
 			'size'		=> $_size,
 			'folder'	=> $_folder,
 			'winmailFlag' => $_is_winmail,
-			'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),
 		);
 	}
 
@@ -1860,7 +1859,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;
 			}
@@ -1872,7 +1871,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');
 		}
@@ -1881,7 +1880,7 @@ 
 		{
 			$attachment['tmp_name'] = $GLOBALS['egw_info']['server']['temp_dir'].'/'.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!');
@@ -1894,7 +1893,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);
@@ -1906,10 +1905,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)
 				{
@@ -1917,7 +1916,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
 			}
@@ -1932,13 +1931,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)
 				{
@@ -1946,13 +1945,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();
@@ -1965,11 +1964,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;
@@ -1992,10 +1991,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);
 
@@ -2003,20 +2002,20 @@ 
 
 		// 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']);
 
 		// break reference into multiple lines if they're greater than 998 chars
 		// and remove comma seperation. Fix error serer does not support binary
 		// data due to long references.
-		if (strlen($this->sessionData['references'])> 998)
+		if (strlen($this->sessionData['references']) > 998)
 		{
-			$temp_refs = explode(',',$this->sessionData['references']);
-			$this->sessionData['references'] = implode(" ",$temp_refs);
+			$temp_refs = explode(',', $this->sessionData['references']);
+			$this->sessionData['references'] = implode(" ", $temp_refs);
 		}
 
 		// thread-topic is a proprietary microsoft header and deprecated with the current version
@@ -2026,36 +2025,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;
 					}
@@ -2064,11 +2063,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;
 					}
@@ -2076,12 +2075,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;
 					}
@@ -2090,59 +2089,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;
@@ -2152,30 +2151,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";
@@ -2183,12 +2182,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;
@@ -2211,16 +2210,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);
 			}
@@ -2254,13 +2253,13 @@ 
 	 *
 	 * @return array returns found inline images as attachment structure
 	 */
-	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';
 		}
-		$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
@@ -2269,37 +2268,37 @@ 
 		{
 			error_log(__METHOD__.__LINE__.' Faking From/SenderInfo for '.$activeMailProfile['ident_email'].' with ID:'.$activeMailProfile['ident_id'].'. Identitiy to use for sending:'.array2string($_identity));
 		}
-		$email_From =  $_identity['ident_email'] ? $_identity['ident_email'] : $activeMailProfile['ident_email'];
+		$email_From = $_identity['ident_email'] ? $_identity['ident_email'] : $activeMailProfile['ident_email'];
 		// Try to fix identity email with no domain part set
 		$_mailObject->setFrom(Mail::fixInvalidAliasAddress(Api\Accounts::id2name($_identity['account_id'], 'account_email'), $email_From),
-			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']).'>';
 			$_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']);
 		}
-		if(!empty($_formData['references'])) {
-			if (stripos($_formData['references'],'<')===false)
+		if (!empty($_formData['references'])) {
+			if (stripos($_formData['references'], '<') === false)
 			{
-				$_formData['references']='<'.trim($_formData['references']).'>';
+				$_formData['references'] = '<'.trim($_formData['references']).'>';
 			}
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
 
-		if(!empty($_formData['thread-index'])) {
+		if (!empty($_formData['thread-index'])) {
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
 		}
-		if(!empty($_formData['list-id'])) {
+		if (!empty($_formData['list-id'])) {
 			$_mailObject->addHeader('List-Id', $_formData['list-id']);
 		}
-		if($_formData['disposition']=='on') {
+		if ($_formData['disposition'] == 'on') {
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
 
 		// 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]);
 
@@ -2315,7 +2314,7 @@ 
 		}
 		$disableRuler = false;
 		$signature = $_identity['ident_signature'];
-		$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
@@ -2324,7 +2323,7 @@ 
 		}
 		if ((isset($this->mailPreferences['disableRulerForSignatureSeparation']) &&
 			$this->mailPreferences['disableRulerForSignatureSeparation']) ||
-			empty($signature) || trim($this->convertHTMLToText($signature)) =='')
+			empty($signature) || trim($this->convertHTMLToText($signature)) == '')
 		{
 			$disableRuler = true;
 		}
@@ -2335,7 +2334,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)
@@ -2349,13 +2348,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
 			{
@@ -2363,11 +2362,11 @@ 
 			}
 			// convert URL Images to inline images - if possible
 			if (!$_autosaving) $inline_images = 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')
 		{
@@ -2375,14 +2374,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);
 		}
@@ -2391,8 +2390,8 @@ 
 		{
 			$connection_opened = false;
 			$tnfattachments = null;
-			foreach((array)$_formData['attachments'] as $attachment) {
-				if(is_array($attachment))
+			foreach ((array)$_formData['attachments'] as $attachment) {
+				if (is_array($attachment))
 				{
 					if (!empty($attachment['uid']) && !empty($attachment['folder'])) {
 						/* Example:
@@ -2410,20 +2409,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']);
@@ -2431,7 +2430,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'];
 											break;
 										}
@@ -2444,7 +2443,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'];
@@ -2453,7 +2452,7 @@ 
 						{
 							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($attachment['file']);
 						}
-						$_mailObject->addAttachment (
+						$_mailObject->addAttachment(
 							$tmp_path,
 							$attachment['name'],
 							$attachment['type']
@@ -2463,7 +2462,7 @@ 
 			}
 			if ($connection_opened) $mail_bo->closeConnection();
 		}
-		return is_array($inline_images)?$inline_images:array();
+		return is_array($inline_images) ? $inline_images : array();
 	}
 
 	/**
@@ -2479,16 +2478,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'].'/'.basename($path);
 			}
@@ -2518,7 +2517,7 @@ 
 		}
 		if (!$links)
 		{
-			return null;	// no file attachments found
+			return null; // no file attachments found
 		}
 		elseif ($html)
 		{
@@ -2533,7 +2532,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();
@@ -2547,8 +2546,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
@@ -2560,8 +2559,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']))
@@ -2570,7 +2569,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']);
@@ -2578,15 +2577,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);
 							}
@@ -2607,7 +2606,7 @@ 
 		}
 		catch (Api\Exception\WrongUserinput $e)
 		{
-			$msg = str_replace('"',"'",$e->getMessage());
+			$msg = str_replace('"', "'", $e->getMessage());
 			error_log(__METHOD__.__LINE__.$msg);
 			$success = false;
 		}
@@ -2631,17 +2630,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'];
 				}
@@ -2651,7 +2650,7 @@ 
 		{
 			foreach ($addrFromList as $addr)
 			{
-				if (!empty($addr)) $_emailAddressList[]=$addr;
+				if (!empty($addr)) $_emailAddressList[] = $addr;
 			}
 		}
 		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
@@ -2665,15 +2664,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'];
@@ -2682,11 +2681,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';
@@ -2696,7 +2695,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']);
@@ -2716,25 +2715,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();
@@ -2743,26 +2742,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']))
 		{
@@ -2771,11 +2770,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);
@@ -2784,13 +2783,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'];
@@ -2799,26 +2798,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)
 		{
@@ -2829,7 +2828,7 @@ 
 		// create the messages and store inline images
 		$inline_images = $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;
@@ -2840,12 +2839,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;
@@ -2858,7 +2857,7 @@ 
 			}
 			else
 			{
-				if ($icServerID == $_formData['serverID'] )
+				if ($icServerID == $_formData['serverID'])
 				{
 					$folder[$fval] = $fval;
 					$folderOnServerID[] = $fval;
@@ -2875,7 +2874,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.'#');
@@ -2883,30 +2882,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;
 				}
@@ -2923,14 +2922,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;
@@ -2939,10 +2938,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;
 		}
@@ -2951,18 +2950,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.");
@@ -2990,15 +2989,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';
@@ -3014,25 +3013,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';
@@ -3048,12 +3047,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']);
@@ -3064,27 +3063,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)
@@ -3096,22 +3095,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)
@@ -3120,14 +3119,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)
 					{
@@ -3155,49 +3154,49 @@ 
 		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')
 		{
 			$this->sessionData['attachments'] = array_merge((array)$this->sessionData['attachments'], (array)$inline_images);
 
-			foreach(array('to_infolog','to_tracker','to_calendar') as $app_key)
+			foreach (array('to_infolog', 'to_tracker', 'to_calendar') as $app_key)
 			{
 				$entryid = $_formData['to_integrate_ids'][0][$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);
 					$target = 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
 					);
 					if ($entryid) $target['entry_id'] = $entryid;
 					// Open the app called for integration in a popup
 					// and store the mail raw data as egw_data, in order to
 					// be stored from registered app method later
-					Framework::popup(Egw::link('/index.php', $target),'_blank',$hook['popup']);
+					Framework::popup(Egw::link('/index.php', $target), '_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']);
 				}
 			}
@@ -3214,7 +3213,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']))
@@ -3223,7 +3222,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];
 				}
@@ -3232,7 +3231,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']))
@@ -3247,7 +3246,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;
 
@@ -3270,7 +3269,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;
@@ -3283,36 +3282,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));
 				}
@@ -3340,7 +3339,7 @@ 
 		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'];
@@ -3349,7 +3348,7 @@ 
 		$results = array();
 
 		// Add up to 5 matching mailing lists
-		if($include_lists)
+		if ($include_lists)
 		{
 			$lists = array_filter(
 				$contacts_obj->get_lists(Acl::READ),
@@ -3358,7 +3357,7 @@ 
 				}
 			);
 			$list_count = 0;
-			foreach($lists as $key => $list_name)
+			foreach ($lists as $key => $list_name)
 			{
 				$results[] = array(
 					'id'	=> $key,
@@ -3368,11 +3367,11 @@ 
 					'title' => lang('Mailinglist'),
 					'data'	=> $key
 				);
-				if($list_count++ > 5) break;
+				if ($list_count++ > 5) break;
 			}
 		}
 
-		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']);
@@ -3381,64 +3380,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);
 			}
 		}
 		
-		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,
@@ -3454,10 +3453,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);
@@ -3487,7 +3486,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']();
 		}
@@ -3497,7 +3496,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;
@@ -3508,11 +3507,11 @@ 
 		try
 		{
 			$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
 			);
 		}
 		catch (Exception $e)
@@ -3526,13 +3525,13 @@ 
 			);
 		}
 
-		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 +803 added lines, -269 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;
 		}
@@ -242,7 +255,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;
 				}
 			}
@@ -268,7 +282,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']))
 		{
@@ -289,8 +306,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';
@@ -357,7 +380,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);
@@ -391,9 +417,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
@@ -408,8 +440,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;
 		}
@@ -489,7 +520,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']))
@@ -540,7 +574,10 @@ 
 			}
 		}
 
-		if ($activeProfile != $composeProfile) $this->changeProfile($activeProfile);
+		if ($activeProfile != $composeProfile)
+		{
+			$this->changeProfile($activeProfile);
+		}
 		$insertSigOnTop = false;
 		$content = (is_array($_content)?$_content:array());
 		if ($_contentHasMimeType)
@@ -569,7 +606,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);
 				}
@@ -611,8 +651,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'])
@@ -628,7 +667,10 @@ 
 				else
 				{
 					$newSig = $this->mail_bo->getDefaultIdentity();
-					if ($newSig === false) $newSig = -2;
+					if ($newSig === false)
+					{
+						$newSig = -2;
+					}
 				}
 			}
 			$_oldSig = $composeCache['mailidentity'];
@@ -636,7 +678,10 @@ 
 
 			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
 				{
@@ -666,7 +711,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')));
@@ -682,7 +730,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' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
@@ -727,8 +779,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
 				{
@@ -746,7 +804,10 @@ 
 		$_currentMode == 'html' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
 
 		// 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
@@ -785,7 +846,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])
 							{
@@ -794,7 +856,10 @@ 
 							}
 							else
 							{
-								if ($res[$name]) $content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								if ($res[$name])
+								{
+									$content[$sName] .= (strlen($content[$sName])>0 ? ' ':'') .$res[$name];
+								}
 							}
 						}
 					}
@@ -805,7 +870,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
@@ -813,10 +879,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];
@@ -825,17 +893,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)
@@ -850,7 +925,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);
@@ -873,21 +951,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;
@@ -979,7 +1064,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)
 				{
@@ -989,9 +1077,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?
@@ -999,7 +1093,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)
 				{
@@ -1012,9 +1109,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)
@@ -1030,9 +1133,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));
@@ -1050,7 +1159,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
@@ -1070,7 +1182,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);
+					}
 				}
 			}
 		}
@@ -1108,24 +1223,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
@@ -1140,14 +1264,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";
 			}
@@ -1181,7 +1314,10 @@ 
 		foreach(Mail\Account::search(true,false) as $acc_id => $account)
 		{
 			// do NOT add SMTP only accounts as identities
-			if (!$account->is_imap(false)) continue;
+			if (!$account->is_imap(false))
+			{
+				continue;
+			}
 
 			foreach($account->identities($acc_id) as $ident_id => $identity)
 			{
@@ -1194,16 +1330,24 @@ 
 		//$content['bcc'] = array('kl@egroupware.org','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()]))
 				{
@@ -1213,8 +1357,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;
@@ -1225,11 +1373,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
 		{
@@ -1272,11 +1429,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');
 
@@ -1323,9 +1486,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
@@ -1336,7 +1502,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']);
@@ -1384,7 +1553,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';
@@ -1432,7 +1604,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 = '';
@@ -1463,7 +1638,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);
 				}
 			}
@@ -1495,17 +1673,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);
 		}
 	}
@@ -1539,16 +1725,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
 			{
@@ -1564,7 +1762,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
 			{
@@ -1579,27 +1778,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;
@@ -1607,42 +1817,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;
@@ -1656,32 +1883,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'] ;
@@ -1689,8 +1930,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;
@@ -1713,7 +1956,8 @@ 
 
 	function getErrorInfo()
 	{
-		if(isset($this->errorInfo)) {
+		if(isset($this->errorInfo))
+		{
 			$errorInfo = $this->errorInfo;
 			unset($this->errorInfo);
 			return $errorInfo;
@@ -1728,7 +1972,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;
@@ -1745,12 +1990,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',
@@ -1761,9 +2010,11 @@ 
 			unset($this->sessionData['in-reply-to']);
 			unset($this->sessionData['to']);
 			unset($this->sessionData['cc']);
-			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false))) {
+			if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false)))
+			{
 				//error_log(__METHOD__.__LINE__.':'.array2string($attachments));
-				foreach($attachments as $attachment) {
+				foreach($attachments as $attachment)
+				{
 					if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
 					{
 						$this->addMessageAttachment($_uid, $attachment['partID'],
@@ -1819,7 +2070,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)
@@ -1831,7 +2085,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);
 		}
@@ -1862,7 +2119,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'])
@@ -1896,10 +2156,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')
@@ -1908,7 +2178,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)
@@ -1934,7 +2207,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)
 				{
@@ -1965,7 +2241,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);
@@ -2022,21 +2299,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;
 				}
@@ -2044,18 +2334,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;
 					}
@@ -2064,11 +2359,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;
 					}
@@ -2076,12 +2374,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;
 					}
@@ -2090,9 +2391,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']);
 		}
 
@@ -2106,7 +2410,8 @@ 
 
 		$toAddressA = array();
 		$toAddress = '';
-		foreach ($headers['TO'] as $mailheader) {
+		foreach ($headers['TO'] as $mailheader)
+		{
 			$toAddressA[] =  $mailheader;
 		}
 		if (count($toAddressA)>0)
@@ -2116,7 +2421,8 @@ 
 		}
 		$ccAddressA = array();
 		$ccAddress = '';
-		foreach ($headers['CC'] as $mailheader) {
+		foreach ($headers['CC'] as $mailheader)
+		{
 			$ccAddressA[] =  $mailheader;
 		}
 		if (count($ccAddressA)>0)
@@ -2124,25 +2430,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;
@@ -2154,7 +2470,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".
@@ -2164,8 +2482,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>";
 				}
 
@@ -2175,9 +2495,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), ">");
@@ -2185,9 +2507,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;
 					}
 
@@ -2236,9 +2561,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;
@@ -2276,11 +2604,16 @@ 
 
 		$_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']).'>';
+			}
 			$_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']);
 		}
-		if(!empty($_formData['references'])) {
+		if(!empty($_formData['references']))
+		{
 			if (stripos($_formData['references'],'<')===false)
 			{
 				$_formData['references']='<'.trim($_formData['references']).'>';
@@ -2288,28 +2621,38 @@ 
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
 
-		if(!empty($_formData['thread-index'])) {
+		if(!empty($_formData['thread-index']))
+		{
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
 		}
-		if(!empty($_formData['list-id'])) {
+		if(!empty($_formData['list-id']))
+		{
 			$_mailObject->addHeader('List-Id', $_formData['list-id']);
 		}
-		if($_formData['disposition']=='on') {
+		if($_formData['disposition']=='on')
+		{
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
 
 		// 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']))
+		{
 			$_formData['body'] = preg_replace('/=\r\n/', '', $_formData['body']);
 			$_formData['body'] = quoted_printable_decode($_formData['body']);
 		}
@@ -2362,7 +2705,10 @@ 
 				$_mailObject->setBody($this->convertHTMLToText($body, true, true));
 			}
 			// convert URL Images to inline images - if possible
-			if (!$_autosaving) $inline_images = Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			if (!$_autosaving)
+			{
+				$inline_images = Mail::processURL2InlineImages($_mailObject, $body, $mail_bo);
+			}
 			if (strpos($body,"<!-- HTMLSIGBEGIN -->")!==false)
 			{
 				$body = str_replace(array('<!-- HTMLSIGBEGIN -->','<!-- HTMLSIGEND -->'),'',$body);
@@ -2377,10 +2723,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);
 			}
@@ -2391,10 +2741,12 @@ 
 		{
 			$connection_opened = false;
 			$tnfattachments = null;
-			foreach((array)$_formData['attachments'] as $attachment) {
+			foreach((array)$_formData['attachments'] as $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
@@ -2410,14 +2762,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');
@@ -2426,7 +2782,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'])
@@ -2461,7 +2820,10 @@ 
 					}
 				}
 			}
-			if ($connection_opened) $mail_bo->closeConnection();
+			if ($connection_opened)
+			{
+				$mail_bo->closeConnection();
+			}
 		}
 		return is_array($inline_images)?$inline_images:array();
 	}
@@ -2481,13 +2843,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'].'/'.basename($path);
@@ -2590,13 +2959,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)");
 				}
 			}
@@ -2612,7 +2987,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(
@@ -2636,7 +3014,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));
@@ -2651,7 +3032,10 @@ 
 		{
 			foreach ($addrFromList as $addr)
 			{
-				if (!empty($addr)) $_emailAddressList[]=$addr;
+				if (!empty($addr))
+				{
+					$_emailAddressList[]=$addr;
+				}
 			}
 		}
 		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
@@ -2705,7 +3089,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'];
@@ -2716,13 +3103,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);
@@ -2733,7 +3124,9 @@ 
 				return false;
 			}
 
-		} else {
+		}
+		else
+		{
 			error_log(__METHOD__.__LINE__."->".lang("folder")." ". $savingDestination." ".lang("does not exist on IMAP Server."));
 			return false;
 		}
@@ -2781,7 +3174,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']))
@@ -2813,7 +3209,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
@@ -2829,7 +3226,11 @@ 
 		// create the messages and store inline images
 		$inline_images = $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;
@@ -2842,7 +3243,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'] )
@@ -2883,13 +3287,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.'#');
 
@@ -2925,19 +3335,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'))
@@ -2951,7 +3372,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();
 			}
@@ -2961,10 +3383,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;
@@ -2974,14 +3401,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
@@ -2990,17 +3419,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());
@@ -3023,18 +3463,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());
@@ -3056,7 +3510,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();
 		}
@@ -3068,10 +3525,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']))
@@ -3097,7 +3560,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']));
@@ -3119,7 +3583,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')
@@ -3138,7 +3604,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));
@@ -3151,9 +3620,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' )
 		{
@@ -3185,7 +3663,10 @@ 
 							$_formData['serverID']),true),
 						'app' => $app_name
 					);
-					if ($entryid) $target['entry_id'] = $entryid;
+					if ($entryid)
+					{
+						$target['entry_id'] = $entryid;
+					}
 					// Open the app called for integration in a popup
 					// and store the mail raw data as egw_data, in order to
 					// be stored from registered app method later
@@ -3196,8 +3677,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']);
 				}
 			}
@@ -3234,7 +3718,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'];
@@ -3242,12 +3729,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;
 
@@ -3255,9 +3748,12 @@ 
 
 	function stripSlashes($_string)
 	{
-		if (get_magic_quotes_gpc()) {
+		if (get_magic_quotes_gpc())
+		{
 			return stripslashes($_string);
-		} else {
+		}
+		else
+		{
 			return $_string;
 		}
 	}
@@ -3270,15 +3766,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);
@@ -3289,7 +3795,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
@@ -3340,7 +3847,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'];
@@ -3353,7 +3861,8 @@ 
 		{
 			$lists = array_filter(
 				$contacts_obj->get_lists(Acl::READ),
-				function($element) use($_searchString) {
+				function($element) use($_searchString)
+				{
 					return (stripos($element, $_searchString) !== false);
 				}
 			);
@@ -3368,7 +3877,10 @@ 
 					'title' => lang('Mailinglist'),
 					'data'	=> $key
 				);
-				if($list_count++ > 5) break;
+				if($list_count++ > 5)
+				{
+					break;
+				}
 			}
 		}
 
@@ -3379,7 +3891,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);
@@ -3409,9 +3924,12 @@ 
 			}
 		}
 		
-		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);
@@ -3425,10 +3943,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
@@ -3438,7 +3968,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,
@@ -3457,7 +3988,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);

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 +140 added lines, -140 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,25 +439,25 @@ 
 				$vacation = $icServer->getVacation();
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			Framework::window_close(lang($e->getMessage()));
 		}
 		if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
 
-		$account_email =  Api\Accounts::id2name($accountID, 'account_email');
+		$account_email = Api\Accounts::id2name($accountID, 'account_email');
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(Api\Accounts::id2name($accountID));
-		$allAliases = $this->account->ident_email !=''?
+		$allAliases = $this->account->ident_email != '' ?
 				// Fix ident_email with no domain part set
 				array(Mail::fixInvalidAliasAddress($account_email, $this->account->ident_email))
 				: array();
 		foreach ($accAllIdentities as &$val)
 		{
-			if ($val['type'] !='default')
+			if ($val['type'] != 'default')
 			{
 				// if the alias has no domain part set try to add
 				// default domain extracted from ident_email address
-				$allAliases[] =  Mail::fixInvalidAliasAddress($account_email, $val['address']);
+				$allAliases[] = Mail::fixInvalidAliasAddress($account_email, $val['address']);
 			}
 		}
 		// try to fix already stored aliases
@@ -478,7 +478,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');
@@ -491,27 +491,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'];
@@ -523,7 +523,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;
@@ -539,11 +539,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
 			{
@@ -551,24 +551,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');
@@ -586,7 +586,7 @@ 
 					list($button) = @each($content['button']);
 					unset ($content['button']);
 
-					switch($button)
+					switch ($button)
 					{
 						case 'save':
 						case 'apply':
@@ -604,7 +604,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']);
@@ -614,7 +614,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';
 								}
@@ -626,7 +626,7 @@ 
 										self::strip_rfc882_addresses($content['addresses']);
 								}
 
-								if($this->checkRule($newVacation,$checkAddresses))
+								if ($this->checkRule($newVacation, $checkAddresses))
 								{
 									if (isset($account_id) && $this->mail_admin)
 									{
@@ -639,13 +639,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);
@@ -653,29 +653,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;
 								}
@@ -691,7 +691,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))
 				{
@@ -715,10 +715,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);
 	}
 
 	/**
@@ -732,7 +732,7 @@ 
 	static function strip_rfc882_addresses($_addresses)
 	{
 		$addresses = array();
-		foreach(Mail::parseAddressList($_addresses) as $addr)
+		foreach (Mail::parseAddressList($_addresses) as $addr)
 		{
 			if ($addr->valid)
 			{
@@ -749,7 +749,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))
 		{
@@ -761,19 +761,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']);
@@ -809,7 +809,7 @@ 
 		}
 		catch (Exception $e) {
 			error_log(__METHOD__.'('.array2string($_vacation).' failed '.$e->getMessage());
-			self::setAsyncJob($_vacation, true);	// reschedule
+			self::setAsyncJob($_vacation, true); // reschedule
 			$ret = false;
 		}
 
@@ -824,7 +824,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function checkRule($_vacation,$_checkAddresses=true)
+	function checkRule($_vacation, $_checkAddresses = true)
 	{
 		$this->errorStack = array();
 
@@ -838,12 +838,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').'!';
 				}
@@ -859,23 +859,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;
 		}
@@ -896,14 +896,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];
 		}
@@ -932,24 +932,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':
@@ -961,7 +961,7 @@ 
 
 		$response = Api\Json\Response::get();
 
-		if($result)
+		if ($result)
 		{
 			$response->error($result);
 			return;
@@ -979,11 +979,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'])
@@ -992,8 +992,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'])
@@ -1002,8 +1002,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'])
@@ -1012,8 +1012,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'])
@@ -1022,8 +1022,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'])
@@ -1037,7 +1037,7 @@ 
 			{
 				$complete .= $andor;
 			}
-			$complete .= "message " . $xthan . $rule['size'] . "KB'";
+			$complete .= "message ".$xthan.$rule['size']."KB'";
 			$started = 1;
 		}
 		if (!empty($rule['field_bodytransform']))
@@ -1046,7 +1046,7 @@ 
 			{
 				$newruletext .= ", ";
 			}
-			$btransform	= " :raw ";
+			$btransform = " :raw ";
 			$match = ' :contains';
 			if ($rule['bodytransform'])
 			{
@@ -1060,11 +1060,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)
 			{
@@ -1076,7 +1076,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));
 		}
@@ -1084,19 +1084,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').'.';
 		}
@@ -1118,7 +1118,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))
@@ -1143,11 +1143,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;
 	}
@@ -1157,9 +1157,9 @@ 
 	 */
 	function saveSessionData()
 	{
-		$sessionData['sieve_rules']		= $this->rules;
+		$sessionData['sieve_rules'] = $this->rules;
 		$sessionData['sieve_rulesByID'] = $this->rulesByID;
-		$sessionData['sieve_scriptToEdit']	= $this->scriptToEdit;
+		$sessionData['sieve_scriptToEdit'] = $this->scriptToEdit;
 		Api\Cache::setSession(__CLASS__, 'sieve_session_data', $sessionData);
 	}
 
@@ -1185,15 +1185,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;
@@ -1205,9 +1205,9 @@ 
 	function restoreSessionData()
 	{
 		$sessionData = Api\Cache::getSession(__CLASS__, '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'];
 	}
 
 	/**
@@ -1221,14 +1221,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';
@@ -1241,7 +1241,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;
 	}
 
@@ -1252,7 +1252,7 @@ 
 	 */
 	private function get_actions()
 	{
-		$actions =array(
+		$actions = array(
 
 			'edit' => array(
 				'caption' => 'Edit',
@@ -1291,7 +1291,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'];
+		}
 
 		$account_email =  Api\Accounts::id2name($accountID, 'account_email');
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(Api\Accounts::id2name($accountID));
@@ -484,7 +497,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']))
 		{
@@ -554,7 +570,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'];
@@ -567,7 +586,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.');
@@ -757,7 +779,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);
 
@@ -1294,7 +1319,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

Braces +54 added lines, -14 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;
 	}
 
@@ -168,17 +174,24 @@ 
 	{
 		//Init mail folders
 		$tree = array(Tree::ID=> $_parent?$_parent:0,Tree::CHILDREN => array());
-		if (!isset($this->ui->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
+		if (!isset($this->ui->mail_bo))
+		{
+			throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
+		}
 		$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), '');
 			}
 		}
@@ -188,9 +201,12 @@ 
 			// *** Note: Should not apply any imap transaction, because in case of exception it will stop the
 			// process of rendering root node
 
-			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();
@@ -215,15 +231,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
@@ -323,19 +345,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
@@ -346,11 +377,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'])
 			{
@@ -458,7 +495,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;

Spacing +43 added lines, -43 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());
 		if (!isset($this->ui->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
@@ -179,7 +179,7 @@ 
 			{
 				$this->ui->changeProfile($_profileID);
 			} catch (Exception $ex) {
-				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 			}
 		}
 
@@ -191,7 +191,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)
@@ -200,14 +200,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
 					);
 				}
@@ -227,7 +227,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);
 
 				// User defined folders based on account
 				$definedFolders = array(
@@ -247,14 +247,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
 					);
@@ -292,7 +292,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;
@@ -309,19 +309,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;
 			}
@@ -344,21 +344,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;
 					}
 				}
@@ -376,8 +376,8 @@ 
 						'im2' => self::$leafImages["folderNoSelectClosed"],
 						'tooltip' => lang('no access')
 					);
-					$insert['item'][] =& $item;
-					$insert =& $item;
+					$insert['item'][] = & $item;
+					$insert = & $item;
 				}
 				else
 				{
@@ -410,7 +410,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'];
@@ -452,20 +452,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'],
@@ -474,16 +474,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;
 	}
@@ -502,15 +502,15 @@ 
 	 * @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)
 			{
-				$account = array_merge($account , $branches);
+				$account = array_merge($account, $branches);
 			}
 		}
 		return $tree;

notifications/inc/class.notifications.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -434,7 +434,7 @@
 	 * Sets backends that should be skipped even if the user
 	 * defined them in its chain
 	 *
-	 * @param array $_skip_backends array with names of the backends to be skipped
+	 * @param string[] $_skip_backends array with names of the backends to be skipped
 	 * e.g. array('popup', 'winpopup')
 	 */
 	public function set_skip_backends(array $_skip_backends) {

Indentation +8 added lines, -8 removed lines

@@ -660,14 +660,14 @@
 	 }
 
 	 /**
-	 * returns notification chains based on admin prefs
-	 * @abstract the available chains can be retrieved in two different output formats:
-	 * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
-	 * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
-	 *
-	 * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
-	 * @return array containing notification chains, output like given in $_output
-	 */
+	  * returns notification chains based on admin prefs
+	  * @abstract the available chains can be retrieved in two different output formats:
+	  * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
+	  * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
+	  *
+	  * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
+	  * @return array containing notification chains, output like given in $_output
+	  */
 	public function get_available_chains($_output = 'routing') {
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();

Spacing +78 added lines, -78 removed lines

@@ -179,7 +179,7 @@ 
 	 *
 	 */
 	public function __construct() {
-		$this->config = (object) Api\Config::read(self::_appname);
+		$this->config = (object)Api\Config::read(self::_appname);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 	 * @param boolean $reset =false true: reset all errors
 	 * @return array
 	 */
-	public static function errors($reset=false)
+	public static function errors($reset = false)
 	{
 		$ret = self::$errors;
 		if ($reset) self::$errors = array();
@@ -203,19 +203,19 @@ 
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
 	public function set_sender($_sender) {
-		if(is_object($_sender)) {
+		if (is_object($_sender)) {
 			$this->sender = $_sender;
 			return true;
 		} else {
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_sender)) {
-				$this->sender = (object) $GLOBALS['egw']->accounts->read($_sender);
+			if (is_numeric($_sender)) {
+				$this->sender = (object)$GLOBALS['egw']->accounts->read($_sender);
 				return true;
 			}
-			if(is_string($_sender) && strpos($_sender,'@')) {
-				$this->sender = (object) array (
-									'account_email' => $this->get_addresspart($_sender,'email'),
-									'account_fullname' => $this->get_addresspart($_sender,'fullname'),
+			if (is_string($_sender) && strpos($_sender, '@')) {
+				$this->sender = (object)array(
+									'account_email' => $this->get_addresspart($_sender, 'email'),
+									'account_fullname' => $this->get_addresspart($_sender, 'fullname'),
 									);
 				return true;
 			}
@@ -245,19 +245,19 @@ 
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
 	public function add_receiver($_receiver) {
-		if(is_object($_receiver)) {
+		if (is_object($_receiver)) {
 			$this->receivers[] = $_receiver;
 			return true;
 		} else {
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_receiver)) {
-				$this->receivers[] = (object) $GLOBALS['egw']->accounts->read($_receiver);
+			if (is_numeric($_receiver)) {
+				$this->receivers[] = (object)$GLOBALS['egw']->accounts->read($_receiver);
 				return true;
 			}
-			if(is_string($_receiver) && strpos($_receiver,'@')) {
-				$this->receivers[] = (object) array (
-									'account_email' => $this->get_addresspart($_receiver,'email'),
-									'account_fullname' => $this->get_addresspart($_receiver,'fullname'),
+			if (is_string($_receiver) && strpos($_receiver, '@')) {
+				$this->receivers[] = (object)array(
+									'account_email' => $this->get_addresspart($_receiver, 'email'),
+									'account_fullname' => $this->get_addresspart($_receiver, 'fullname'),
 									);
 				return true;
 			}
@@ -296,7 +296,7 @@ 
 	 * @param string $_message
 	 */
 	public function set_message($_message) {
-		if(strlen($_message) == strlen(strip_tags($_message))) {
+		if (strlen($_message) == strlen(strip_tags($_message))) {
 			$this->message_plain = $_message;
 		} else {
 			$this->message_html = $_message;
@@ -314,7 +314,7 @@ 
 	 */
 	public function set_popupmessage($_message) {
 		//popup requires html
-		if(strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
+		if (strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
 		$this->message_popup = $_message;
 		return true;
 	}
@@ -326,9 +326,9 @@ 
 	 */
 	public function set_links(array $_links) {
 		$this->links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
-				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'],$link['id']);
+		foreach ($_links as $link) {
+			if (is_array($link)) {
+				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'], $link['id']);
 			}
 		}
 		return true;
@@ -341,8 +341,8 @@ 
 	 */
 	public function set_popuplinks(array $_links) {
 		$this->popup_links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach ($_links as $link) {
+			if (is_array($link)) {
 				$this->add_popuplink($link['text'], $link['view'], $link['popup']);
 			}
 		}
@@ -359,7 +359,7 @@ 
 	 * @param string $_id Application ID, to use link registry (popup & view ignored)
 	 */
 	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false) {
-		if(!$_view || !$_text) { return false; }
+		if (!$_view || !$_text) { return false; }
 		$this->links[] = (object)array(
 			'text'	=> $_text,
 			'view'	=> $_view,
@@ -378,8 +378,8 @@ 
 	 * @param string $_popup if link can be viewed in a popup something like '300x200' otherwise false
 	 */
 	public function add_popuplink($_text, $_view, $_popup = false) {
-		if(!$_view || !$_text) { return false; }
-		$this->popup_links[] = (object)array(	'text'	=> $_text,
+		if (!$_view || !$_text) { return false; }
+		$this->popup_links[] = (object)array('text'	=> $_text,
 										'view'	=> $_view,
 										'popup'	=> $_popup,
 										);
@@ -393,8 +393,8 @@ 
 	 */
 	public function set_attachments(array $_attachments) {
 		$this->attachments = array(); // clear array if set
-		foreach($_attachments as $attachment) {
-			if(is_array($attachment)) {
+		foreach ($_attachments as $attachment) {
+			if (is_array($attachment)) {
 				$this->add_attachment(
 					$attachment['string'],
 					$attachment['filename'],
@@ -418,8 +418,8 @@ 
 	 * @param string $_type File extension (MIME) type.
 	 * @param string $_path optional path to attachment, if !$_string
 	 */
-	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null) {
-		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
+	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path = null) {
+		if (!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
 		$this->attachments[] = (object)array(
 			'string' => $_string,
 			'filename' => $_filename,
@@ -451,7 +451,7 @@ 
 		if (!is_array($this->receivers) || count($this->receivers) == 0) {
 			throw new Exception('Error: cannot send notifications. No receivers supplied');
 		}
-		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
+		if (!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
 			throw new Exception('Error: cannot send notifications. No valid messages supplied');
 		}
 
@@ -463,7 +463,7 @@ 
 			$backend_errors = array();
 			try {
 				// system or non-system user
-				if($receiver->account_id && is_numeric($receiver->account_id)) {
+				if ($receiver->account_id && is_numeric($receiver->account_id)) {
 					// system user, collect data and check for Status and expire state, skip notification if expired or not active
 					$userData = $GLOBALS['egw']->accounts->read($receiver->account_id);
 					//error_log(__METHOD__.__LINE__." fetched data for User:".array2string($userData['account_lid']).'#'.$userData['account_type'].'#'.$userData['account_status'].'#'.$GLOBALS['egw']->accounts->is_expired($userData).'#');
@@ -476,17 +476,17 @@ 
 					}
 					$receiver->handle = $receiver->account_lid;
 					// check if the receiver has rights to run the notifcation app
-					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id,true);
+					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id, true);
 					$ids[] = $receiver->account_id;
-					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications')) {
+					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids, 'run', 'notifications')) {
 						// read the users notification chain
 						$prefs = new Api\Preferences($receiver->account_id);
 						$preferences_all = $prefs->read();
 						$preferences = (object)$preferences_all[self::_appname];
-						if($preferences->notification_chain) {
+						if ($preferences->notification_chain) {
 							// fallback: admin disabled user-chosen chain
-							if(!$notification_chain = $available_chains[$preferences->notification_chain]) {
-								$prepend_message .= lang(	'This eGroupWare notification has been sent to you by mail because your'
+							if (!$notification_chain = $available_chains[$preferences->notification_chain]) {
+								$prepend_message .= lang('This eGroupWare notification has been sent to you by mail because your'
 															.' chosen notification-chain has been disabled by the administrator.'
 															.' Please choose another notification-chain in your preferences!');
 								$notification_chain = $available_chains[self::_fallback];
@@ -503,28 +503,28 @@ 
 					$notification_chain = $available_chains[self::_fallback]; // fallback: non-system user
 				}
 
-				if($notification_chain == 'disable') {
+				if ($notification_chain == 'disable') {
 					continue; //user disabled notifications
 				}
 
-				foreach($notification_chain as $backend => $action) {
+				foreach ($notification_chain as $backend => $action) {
 					$notification_backend = null;
 					try {
 						// check if backend should be skipped
-						if( in_array($backend, $this->skip_backends) ) {
+						if (in_array($backend, $this->skip_backends)) {
 							// log as error just for the case too much skipping prevents user from being notified
 							$backend_errors[] = $backend.' will be skipped (as defined by calling application)';
 							continue;
 						}
 
 						$notification_backend = self::_appname.'_'.$backend;
-						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php')) {
-							throw new Exception('file for '.$notification_backend. ' does not exist');
+						if (!file_exists(EGW_INCLUDE_ROOT.'/'.self::_appname.'/inc/class.'.$notification_backend.'.inc.php')) {
+							throw new Exception('file for '.$notification_backend.' does not exist');
 						}
-						$obj = new $notification_backend( $this->sender, $receiver, $this->config, $preferences );
-						if ( !($obj instanceof notifications_iface) ) {
-							unset ( $obj );
-					 		throw new Exception($notification_backend. ' is no implementation of notifications_iface');
+						$obj = new $notification_backend($this->sender, $receiver, $this->config, $preferences);
+						if (!($obj instanceof notifications_iface)) {
+							unset ($obj);
+					 		throw new Exception($notification_backend.' is no implementation of notifications_iface');
 						}
 						$lsubject = $this->subject;
 						$llinks = $this->links;
@@ -538,17 +538,17 @@ 
 					catch (Exception $exception) {
 						$backend_errors[] = $notification_backend.' failed: '.$exception->getMessage();
 						// try next backend
-						if($action == 'fail' || $action == 'continue') {
+						if ($action == 'fail' || $action == 'continue') {
 							continue;
 						}
 						break; // stop running through chain
 					}
 					// backend sucseeded
 					$user_notified = true;
-					if($action == 'stop' || $action == 'fail') { break; } // stop running through chain
+					if ($action == 'stop' || $action == 'fail') { break; } // stop running through chain
 				}
 				// check if the user has been notified at all
-				if(!$user_notified) {
+				if (!$user_notified) {
 					/*error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
 					foreach($backend_errors as $id=>$backend_error) {
 						error_log($backend_error);
@@ -575,22 +575,22 @@ 
 	 * @return plain and html message in one array, $messages['plain'] and $messages['html'] and, if exists $messages['popup']
 	 */
 	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '') {
-		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
+		if (empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
 		$messages = array();
 
 		// create the messages
-		if(!empty($_message_plain)) {
+		if (!empty($_message_plain)) {
 			$messages['plain'] = $_message_plain;
 		} else {
 			$messages['plain'] = Api\Mail\Html::convertHTMLToText($_message_html, false, true);
 		}
 
-		if(!empty($_message_html)) {
+		if (!empty($_message_html)) {
 			$messages['html'] = $_message_html;
 		} else {
 			$messages['html'] = self::plain2html($_message_plain);
 		}
-		if (!empty($_message_popup)) $messages['popup']=$_message_popup;
+		if (!empty($_message_popup)) $messages['popup'] = $_message_popup;
 		return $messages;
 	}
 
@@ -613,9 +613,9 @@ 
 	 * @return plain and html message in one array including the prepended message, $messages['plain'] and $messages['html']
 	 */
 	 private function prepend_message(array $_messages, $_prepend = null) {
-		if(strlen($_prepend) > 0) {
-			foreach($_messages as $key => $value) {
-				switch($key) {
+		if (strlen($_prepend) > 0) {
+			foreach ($_messages as $key => $value) {
+				switch ($key) {
 					case 'plain':
 						$_messages[$key] = $_prepend."\n\n".$value;
 						break;
@@ -639,17 +639,17 @@ 
 	 * @param string $_part
 	 * @return string chosen part of the address
 	 */
-	private function get_addresspart($_address, $_part='email')
+	private function get_addresspart($_address, $_part = 'email')
 	{
 		$parts = null;
-	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts)) { // _address contains a fullname part
-	 		$fullname = trim(trim($parts[1]),'\"');
+	 	if (strpos($_address, '<') && preg_match('/^(.*)\S?\<(.*)\>/', $_address, $parts)) { // _address contains a fullname part
+	 		$fullname = trim(trim($parts[1]), '\"');
 	 		$email = $parts[2];
 	 	} else {
 	 		$fullname = false;
 	 		$email = $_address;
 	 	}
-	 	switch($_part) {
+	 	switch ($_part) {
 	 		case 'fullname':
 	 			return $fullname;
 	 		case 'email':
@@ -671,8 +671,8 @@ 
 	public function get_available_chains($_output = 'routing') {
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();
-		foreach($this->backends as $backend) {
-			switch($backend) {
+		foreach ($this->backends as $backend) {
+			switch ($backend) {
 				case 'email':
 				case 'popup':
 				case 'jpopup':
@@ -687,15 +687,15 @@ 
 
 		$enabled_chains = array();
 		$disabled_chains = array();
-		foreach($this->notification_chains as $key => $chain) {
+		foreach ($this->notification_chains as $key => $chain) {
 			$allow_chain = true;
-			if(is_array($chain)) {
-				foreach(array_keys($chain) as $name) {
-					if(!$enabled_backends[$name]) {
+			if (is_array($chain)) {
+				foreach (array_keys($chain) as $name) {
+					if (!$enabled_backends[$name]) {
 						$allow_chain = false; // disable whole chain if one backend is disabled
 					}
 				}
-				if($allow_chain) {
+				if ($allow_chain) {
 					$enabled_chains[$key] = $chain;
 				} else {
 					$disabled_chains[$key] = $chain;
@@ -710,15 +710,15 @@ 
 		// create the 'all' chain from the enabled backends
 		$chain_all = array();
 		$backend_count = 1;
-		foreach($enabled_backends as $backend => $enabled) {
-			if($enabled) {
+		foreach ($enabled_backends as $backend => $enabled) {
+			if ($enabled) {
 				$chain_all[$backend] = count($enabled_backends) == $backend_count ? 'stop' : 'continue';
 			}
 			$backend_count++;
 		}
 		$common_chains['all'] = $chain_all;
 
-		switch($_output) {
+		switch ($_output) {
 			case 'human':
 				$chain_groups = array(
 					lang('Common chains')	=> 'common_chains',
@@ -727,10 +727,10 @@ 
 					);
 				$suffix = '_human';
 				// create descriptions for each chain key in each group
-				foreach($chain_groups as $name => $arr_name) {
+				foreach ($chain_groups as $name => $arr_name) {
 					${$arr_name.$suffix} = array();
-					foreach(array_keys(${$arr_name}) as $key) {
-						if($arr_name == 'disabled_chains') {
+					foreach (array_keys(${$arr_name}) as $key) {
+						if ($arr_name == 'disabled_chains') {
 							${$arr_name.$suffix}[$key] = '('.lang('Disabled').') '.lang($this->chains_descriptions[$key]);
 						} else {
 							${$arr_name.$suffix}[$key] = lang($this->chains_descriptions[$key]);
@@ -739,8 +739,8 @@ 
 				}
 				// summarize all groups with minimum one chain to the final array
 				$chains_final = array();
-				foreach($chain_groups as $name => $arr_name) {
-					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
+				foreach ($chain_groups as $name => $arr_name) {
+					if (is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
 						$chains_final[$name] = ${$arr_name.$suffix};
 					}
 				}
@@ -760,10 +760,10 @@ 
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
 	public function deleteaccount($settings) {
-		foreach($this->backends as $backend) {
-			$backend_hook = array(self::_appname.'_'.$backend,'deleteaccount');
+		foreach ($this->backends as $backend) {
+			$backend_hook = array(self::_appname.'_'.$backend, 'deleteaccount');
 			if (is_callable($backend_hook)) {
-				call_user_func($backend_hook,$settings);
+				call_user_func($backend_hook, $settings);
 			}
 		}
 	}

Braces +222 added lines, -96 removed lines

@@ -24,7 +24,8 @@ 
  * called from this class. The backend's job is to deliver ONE message to ONE recipient.
  *
  */
-final class notifications {
+final class notifications
+{
 
 	/**
 	 * Appname
@@ -178,7 +179,8 @@ 
 	 * constructor of notifications
 	 *
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->config = (object) Api\Config::read(self::_appname);
 	}
 
@@ -191,7 +193,10 @@ 
 	public static function errors($reset=false)
 	{
 		$ret = self::$errors;
-		if ($reset) self::$errors = array();
+		if ($reset)
+		{
+			self::$errors = array();
+		}
 		return $ret;
 	}
 
@@ -202,17 +207,23 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
-	public function set_sender($_sender) {
-		if(is_object($_sender)) {
+	public function set_sender($_sender)
+	{
+		if(is_object($_sender))
+		{
 			$this->sender = $_sender;
 			return true;
-		} else {
+		}
+		else
+		{
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_sender)) {
+			if(is_numeric($_sender))
+			{
 				$this->sender = (object) $GLOBALS['egw']->accounts->read($_sender);
 				return true;
 			}
-			if(is_string($_sender) && strpos($_sender,'@')) {
+			if(is_string($_sender) && strpos($_sender,'@'))
+			{
 				$this->sender = (object) array (
 									'account_email' => $this->get_addresspart($_sender,'email'),
 									'account_fullname' => $this->get_addresspart($_sender,'fullname'),
@@ -230,9 +241,11 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an array with the int of the account id or the e-mail address of a non-eGW user
 	 */
-	public function set_receivers(array $_receivers) {
+	public function set_receivers(array $_receivers)
+	{
 		$this->receivers = array();
-		foreach ($_receivers as $receiver) {
+		foreach ($_receivers as $receiver)
+		{
 			$this->add_receiver($receiver);
 		}
 	}
@@ -244,17 +257,23 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
-	public function add_receiver($_receiver) {
-		if(is_object($_receiver)) {
+	public function add_receiver($_receiver)
+	{
+		if(is_object($_receiver))
+		{
 			$this->receivers[] = $_receiver;
 			return true;
-		} else {
+		}
+		else
+		{
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_receiver)) {
+			if(is_numeric($_receiver))
+			{
 				$this->receivers[] = (object) $GLOBALS['egw']->accounts->read($_receiver);
 				return true;
 			}
-			if(is_string($_receiver) && strpos($_receiver,'@')) {
+			if(is_string($_receiver) && strpos($_receiver,'@'))
+			{
 				$this->receivers[] = (object) array (
 									'account_email' => $this->get_addresspart($_receiver,'email'),
 									'account_fullname' => $this->get_addresspart($_receiver,'fullname'),
@@ -270,7 +289,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_subject($_subject) {
+	public function set_subject($_subject)
+	{
 		$this->subject = $_subject;
 		return true;
 	}
@@ -280,7 +300,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_popupsubject($_subject) {
+	public function set_popupsubject($_subject)
+	{
 		$this->popupsubject = $_subject;
 		return true;
 	}
@@ -295,10 +316,14 @@ 
 	 *
 	 * @param string $_message
 	 */
-	public function set_message($_message) {
-		if(strlen($_message) == strlen(strip_tags($_message))) {
+	public function set_message($_message)
+	{
+		if(strlen($_message) == strlen(strip_tags($_message)))
+		{
 			$this->message_plain = $_message;
-		} else {
+		}
+		else
+		{
 			$this->message_html = $_message;
 		}
 		return true;
@@ -312,9 +337,13 @@ 
 	 *
 	 * @param string $_message
 	 */
-	public function set_popupmessage($_message) {
+	public function set_popupmessage($_message)
+	{
 		//popup requires html
-		if(strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
+		if(strlen($_message) == strlen(strip_tags($_message)))
+		{
+			$_message = self::plain2html($_message);
+		}
 		$this->message_popup = $_message;
 		return true;
 	}
@@ -324,10 +353,13 @@ 
 	 *
 	 * @param array $_links link array (like defined in $this->add_link)
 	 */
-	public function set_links(array $_links) {
+	public function set_links(array $_links)
+	{
 		$this->links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach($_links as $link)
+		{
+			if(is_array($link))
+			{
 				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'],$link['id']);
 			}
 		}
@@ -339,10 +371,13 @@ 
 	 *
 	 * @param array $_links link array (like defined in $this->add_link)
 	 */
-	public function set_popuplinks(array $_links) {
+	public function set_popuplinks(array $_links)
+	{
 		$this->popup_links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach($_links as $link)
+		{
+			if(is_array($link))
+			{
 				$this->add_popuplink($link['text'], $link['view'], $link['popup']);
 			}
 		}
@@ -358,8 +393,11 @@ 
 	 * @param string $_app Application name, to use link registry (popup & view ignored)
 	 * @param string $_id Application ID, to use link registry (popup & view ignored)
 	 */
-	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false) {
-		if(!$_view || !$_text) { return false; }
+	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false)
+	{
+		if(!$_view || !$_text)
+		{
+return false; }
 		$this->links[] = (object)array(
 			'text'	=> $_text,
 			'view'	=> $_view,
@@ -377,8 +415,11 @@ 
 	 * @param array $_view all params needed to view the link (name => value pairs)
 	 * @param string $_popup if link can be viewed in a popup something like '300x200' otherwise false
 	 */
-	public function add_popuplink($_text, $_view, $_popup = false) {
-		if(!$_view || !$_text) { return false; }
+	public function add_popuplink($_text, $_view, $_popup = false)
+	{
+		if(!$_view || !$_text)
+		{
+return false; }
 		$this->popup_links[] = (object)array(	'text'	=> $_text,
 										'view'	=> $_view,
 										'popup'	=> $_popup,
@@ -391,10 +432,13 @@ 
 	 *
 	 * @param array $_attachments attachment array (like defined in $this->add_attachment)
 	 */
-	public function set_attachments(array $_attachments) {
+	public function set_attachments(array $_attachments)
+	{
 		$this->attachments = array(); // clear array if set
-		foreach($_attachments as $attachment) {
-			if(is_array($attachment)) {
+		foreach($_attachments as $attachment)
+		{
+			if(is_array($attachment))
+			{
 				$this->add_attachment(
 					$attachment['string'],
 					$attachment['filename'],
@@ -418,8 +462,12 @@ 
 	 * @param string $_type File extension (MIME) type.
 	 * @param string $_path optional path to attachment, if !$_string
 	 */
-	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null) {
-		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
+	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null)
+	{
+		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename)
+		{
+			return false;
+		}
 		$this->attachments[] = (object)array(
 			'string' => $_string,
 			'filename' => $_filename,
@@ -437,33 +485,40 @@ 
 	 * @param array $_skip_backends array with names of the backends to be skipped
 	 * e.g. array('popup', 'winpopup')
 	 */
-	public function set_skip_backends(array $_skip_backends) {
+	public function set_skip_backends(array $_skip_backends)
+	{
 		$this->skip_backends = $_skip_backends;
 	}
 
 	/**
 	 * sends notifications
 	 */
-	public function send() {
-		if (!is_object($this->sender)) {
+	public function send()
+	{
+		if (!is_object($this->sender))
+		{
 			throw new Exception('Error: cannot send notifications. No sender supplied');
 		}
-		if (!is_array($this->receivers) || count($this->receivers) == 0) {
+		if (!is_array($this->receivers) || count($this->receivers) == 0)
+		{
 			throw new Exception('Error: cannot send notifications. No receivers supplied');
 		}
-		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
+		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup))
+		{
 			throw new Exception('Error: cannot send notifications. No valid messages supplied');
 		}
 
 		$available_chains = $this->get_available_chains('routing');
 
-		foreach ($this->receivers as $receiver) {
+		foreach ($this->receivers as $receiver)
+		{
 			$user_notified = false;
 			$prepend_message = '';
 			$backend_errors = array();
 			try {
 				// system or non-system user
-				if($receiver->account_id && is_numeric($receiver->account_id)) {
+				if($receiver->account_id && is_numeric($receiver->account_id))
+				{
 					// system user, collect data and check for Status and expire state, skip notification if expired or not active
 					$userData = $GLOBALS['egw']->accounts->read($receiver->account_id);
 					//error_log(__METHOD__.__LINE__." fetched data for User:".array2string($userData['account_lid']).'#'.$userData['account_type'].'#'.$userData['account_status'].'#'.$GLOBALS['egw']->accounts->is_expired($userData).'#');
@@ -478,51 +533,65 @@ 
 					// check if the receiver has rights to run the notifcation app
 					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id,true);
 					$ids[] = $receiver->account_id;
-					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications')) {
+					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications'))
+					{
 						// read the users notification chain
 						$prefs = new Api\Preferences($receiver->account_id);
 						$preferences_all = $prefs->read();
 						$preferences = (object)$preferences_all[self::_appname];
-						if($preferences->notification_chain) {
+						if($preferences->notification_chain)
+						{
 							// fallback: admin disabled user-chosen chain
-							if(!$notification_chain = $available_chains[$preferences->notification_chain]) {
+							if(!$notification_chain = $available_chains[$preferences->notification_chain])
+							{
 								$prepend_message .= lang(	'This eGroupWare notification has been sent to you by mail because your'
 															.' chosen notification-chain has been disabled by the administrator.'
 															.' Please choose another notification-chain in your preferences!');
 								$notification_chain = $available_chains[self::_fallback];
 							}
-						} else {
+						}
+						else
+						{
 							$notification_chain = $available_chains[self::user_fallback]; // fallback: no prefs
 						}
-					} else {
+					}
+					else
+					{
 						$notification_chain = $available_chains[self::_fallback]; // fallback: no rights to app
 					}
-				} else {
+				}
+				else
+				{
 					// non-system user
 					$receiver->handle = $receiver->account_email;
 					$notification_chain = $available_chains[self::_fallback]; // fallback: non-system user
 				}
 
-				if($notification_chain == 'disable') {
+				if($notification_chain == 'disable')
+				{
 					continue; //user disabled notifications
 				}
 
-				foreach($notification_chain as $backend => $action) {
+				foreach($notification_chain as $backend => $action)
+				{
 					$notification_backend = null;
 					try {
 						// check if backend should be skipped
-						if( in_array($backend, $this->skip_backends) ) {
+						if( in_array($backend, $this->skip_backends) )
+						{
 							// log as error just for the case too much skipping prevents user from being notified
 							$backend_errors[] = $backend.' will be skipped (as defined by calling application)';
 							continue;
 						}
 
 						$notification_backend = self::_appname.'_'.$backend;
-						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php')) {
+						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php'))
+						{
 							throw new Exception('file for '.$notification_backend. ' does not exist');
 						}
 						$obj = new $notification_backend( $this->sender, $receiver, $this->config, $preferences );
-						if ( !($obj instanceof notifications_iface) ) {
+						if ( !($obj instanceof notifications_iface) )
+						{
 							unset ( $obj );
 					 		throw new Exception($notification_backend. ' is no implementation of notifications_iface');
 						}
@@ -530,31 +599,44 @@ 
 						$llinks = $this->links;
 						if ($backend == 'popup')
 						{
-							if (!empty($this->popupsubject)) $lsubject = $this->popupsubject;
-							if ($this->popup_links) $llinks = $this->popup_links;
+							if (!empty($this->popupsubject))
+							{
+								$lsubject = $this->popupsubject;
+							}
+							if ($this->popup_links)
+							{
+								$llinks = $this->popup_links;
+							}
 						}
 						$obj->send($this->prepend_message($messages, $prepend_message), $lsubject, $llinks, $this->attachments);
 					}
 					catch (Exception $exception) {
 						$backend_errors[] = $notification_backend.' failed: '.$exception->getMessage();
 						// try next backend
-						if($action == 'fail' || $action == 'continue') {
+						if($action == 'fail' || $action == 'continue')
+						{
 							continue;
 						}
 						break; // stop running through chain
 					}
 					// backend sucseeded
 					$user_notified = true;
-					if($action == 'stop' || $action == 'fail') { break; } // stop running through chain
+					if($action == 'stop' || $action == 'fail')
+					{
+break; } // stop running through chain
 				}
 				// check if the user has been notified at all
-				if(!$user_notified) {
+				if(!$user_notified)
+				{
 					/*error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
 					foreach($backend_errors as $id=>$backend_error) {
 						error_log($backend_error);
 					}*/
 					$error = implode(', ', $backend_errors);
-					if (stripos($error, (string)$receiver->handle) !== false) $error = $receiver->handle.': '.$error;
+					if (stripos($error, (string)$receiver->handle) !== false)
+					{
+						$error = $receiver->handle.': '.$error;
+					}
 					self::$errors[] = $error;
 				}
 			}
@@ -574,23 +656,35 @@ 
 	 * @param string $_message_popup
 	 * @return plain and html message in one array, $messages['plain'] and $messages['html'] and, if exists $messages['popup']
 	 */
-	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '') {
-		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
+	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '')
+	{
+		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup))
+		{
+return false; } // no message set
 		$messages = array();
 
 		// create the messages
-		if(!empty($_message_plain)) {
+		if(!empty($_message_plain))
+		{
 			$messages['plain'] = $_message_plain;
-		} else {
+		}
+		else
+		{
 			$messages['plain'] = Api\Mail\Html::convertHTMLToText($_message_html, false, true);
 		}
 
-		if(!empty($_message_html)) {
+		if(!empty($_message_html))
+		{
 			$messages['html'] = $_message_html;
-		} else {
+		}
+		else
+		{
 			$messages['html'] = self::plain2html($_message_plain);
 		}
-		if (!empty($_message_popup)) $messages['popup']=$_message_popup;
+		if (!empty($_message_popup))
+		{
+			$messages['popup']=$_message_popup;
+		}
 		return $messages;
 	}
 
@@ -612,10 +706,14 @@ 
 	 * @param string $_prepend just a plain message to prepend, no html!
 	 * @return plain and html message in one array including the prepended message, $messages['plain'] and $messages['html']
 	 */
-	 private function prepend_message(array $_messages, $_prepend = null) {
-		if(strlen($_prepend) > 0) {
-			foreach($_messages as $key => $value) {
-				switch($key) {
+	 private function prepend_message(array $_messages, $_prepend = null)
+	 {
+		if(strlen($_prepend) > 0)
+		{
+			foreach($_messages as $key => $value)
+			{
+				switch($key)
+				{
 					case 'plain':
 						$_messages[$key] = $_prepend."\n\n".$value;
 						break;
@@ -642,14 +740,19 @@ 
 	private function get_addresspart($_address, $_part='email')
 	{
 		$parts = null;
-	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts)) { // _address contains a fullname part
+	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts))
+	 	{
+// _address contains a fullname part
 	 		$fullname = trim(trim($parts[1]),'\"');
 	 		$email = $parts[2];
-	 	} else {
+	 	}
+	 	else
+	 	{
 	 		$fullname = false;
 	 		$email = $_address;
 	 	}
-	 	switch($_part) {
+	 	switch($_part)
+	 	{
 	 		case 'fullname':
 	 			return $fullname;
 	 		case 'email':
@@ -668,11 +771,14 @@ 
 	 * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
 	 * @return array containing notification chains, output like given in $_output
 	 */
-	public function get_available_chains($_output = 'routing') {
+	public function get_available_chains($_output = 'routing')
+	{
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();
-		foreach($this->backends as $backend) {
-			switch($backend) {
+		foreach($this->backends as $backend)
+		{
+			switch($backend)
+			{
 				case 'email':
 				case 'popup':
 				case 'jpopup':
@@ -687,17 +793,24 @@ 
 
 		$enabled_chains = array();
 		$disabled_chains = array();
-		foreach($this->notification_chains as $key => $chain) {
+		foreach($this->notification_chains as $key => $chain)
+		{
 			$allow_chain = true;
-			if(is_array($chain)) {
-				foreach(array_keys($chain) as $name) {
-					if(!$enabled_backends[$name]) {
+			if(is_array($chain))
+			{
+				foreach(array_keys($chain) as $name)
+				{
+					if(!$enabled_backends[$name])
+					{
 						$allow_chain = false; // disable whole chain if one backend is disabled
 					}
 				}
-				if($allow_chain) {
+				if($allow_chain)
+				{
 					$enabled_chains[$key] = $chain;
-				} else {
+				}
+				else
+				{
 					$disabled_chains[$key] = $chain;
 				}
 			}
@@ -710,15 +823,18 @@ 
 		// create the 'all' chain from the enabled backends
 		$chain_all = array();
 		$backend_count = 1;
-		foreach($enabled_backends as $backend => $enabled) {
-			if($enabled) {
+		foreach($enabled_backends as $backend => $enabled)
+		{
+			if($enabled)
+			{
 				$chain_all[$backend] = count($enabled_backends) == $backend_count ? 'stop' : 'continue';
 			}
 			$backend_count++;
 		}
 		$common_chains['all'] = $chain_all;
 
-		switch($_output) {
+		switch($_output)
+		{
 			case 'human':
 				$chain_groups = array(
 					lang('Common chains')	=> 'common_chains',
@@ -727,20 +843,27 @@ 
 					);
 				$suffix = '_human';
 				// create descriptions for each chain key in each group
-				foreach($chain_groups as $name => $arr_name) {
+				foreach($chain_groups as $name => $arr_name)
+				{
 					${$arr_name.$suffix} = array();
-					foreach(array_keys(${$arr_name}) as $key) {
-						if($arr_name == 'disabled_chains') {
+					foreach(array_keys(${$arr_name}) as $key)
+					{
+						if($arr_name == 'disabled_chains')
+						{
 							${$arr_name.$suffix}[$key] = '('.lang('Disabled').') '.lang($this->chains_descriptions[$key]);
-						} else {
+						}
+						else
+						{
 							${$arr_name.$suffix}[$key] = lang($this->chains_descriptions[$key]);
 						}
 					}
 				}
 				// summarize all groups with minimum one chain to the final array
 				$chains_final = array();
-				foreach($chain_groups as $name => $arr_name) {
-					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
+				foreach($chain_groups as $name => $arr_name)
+				{
+					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0)
+					{
 						$chains_final[$name] = ${$arr_name.$suffix};
 					}
 				}
@@ -759,10 +882,13 @@ 
 	 *
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
-	public function deleteaccount($settings) {
-		foreach($this->backends as $backend) {
+	public function deleteaccount($settings)
+	{
+		foreach($this->backends as $backend)
+		{
 			$backend_hook = array(self::_appname.'_'.$backend,'deleteaccount');
-			if (is_callable($backend_hook)) {
+			if (is_callable($backend_hook))
+			{
 				call_user_func($backend_hook,$settings);
 			}
 		}

notifications/inc/class.notifications_email.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	 * @param array $_links
 	 * @param boolean $_render_html
 	 * @param boolean $_render_external
-	 * @return plain or html rendered link(s) as complete string
+	 * @return false|string or html rendered link(s) as complete string
 	 */
 	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
 		if(!is_array($_links) || count($_links) == 0) { return false; }

Spacing +14 added lines, -14 removed lines

@@ -66,13 +66,13 @@ 
 	 * @param object $_preferences
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
 		$this->preferences = $_preferences;
-		if(is_object($this->mail))
+		if (is_object($this->mail))
 		{
 			unset($this->mail);
 		}
@@ -104,18 +104,18 @@ 
 		$this->mail->setFrom($this->sender->account_email, $this->sender->account_fullname);
 
 		$this->mail->addHeader('Subject', trim($_subject)); // trim the subject to avoid strange wrong encoding problem
-		$this->mail->setHtmlBody($body_html, null, false);	// no automatic alternativ
+		$this->mail->setHtmlBody($body_html, null, false); // no automatic alternativ
 		$this->mail->setBody($body_plain);
 
-		if(is_array($_attachments) && count($_attachments) > 0)
+		if (is_array($_attachments) && count($_attachments) > 0)
 		{
-			foreach($_attachments as $attachment)
+			foreach ($_attachments as $attachment)
 			{
 				if ($attachment->string)
 				{
 					$this->mail->AddStringAttachment($attachment->string, $attachment->filename, $attachment->encoding, $attachment->type);
 				}
-				elseif($attachment->path)
+				elseif ($attachment->path)
 				{
 					$this->mail->AddAttachment($attachment->path, $attachment->filename, $attachment->encoding, $attachment->type);
 				}
@@ -134,20 +134,20 @@ 
 	 * @return plain or html rendered link(s) as complete string
 	 */
 	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+		if (!is_array($_links) || count($_links) == 0) { return false; }
 
 		// provide defaults if given arguments are null
 		// php distinguishes between missing and present(null) arguments
-		if(is_null($_render_html)) { $_render_html = false; }
-		if(is_null($_render_external)) { $_render_external = true; }
+		if (is_null($_render_html)) { $_render_html = false; }
+		if (is_null($_render_external)) { $_render_external = true; }
 		$newline = $_render_html ? "<br />" : "\n";
 		$hruler = $_render_html ? Api\Html::hr() : '';
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
+		foreach ($_links as $link) {
+			if ($_render_external || !$link->popup) { $link->view['no_popup'] = 1; }
 			// do not expose sensitive data
-			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',Api\Html::link('/index.php', $link->view));
+			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', Api\Html::link('/index.php', $link->view));
 			// complete missing protocol and domain part if needed
 			if ($url{0} == '/' && $_render_external) {
 				$url = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
@@ -157,7 +157,7 @@ 
 			$rendered_links[] = $_render_html ? $a_href : $url;
 		}
 
-		return $hruler.$newline.lang('Linked entries:').$newline.implode($newline,$rendered_links);
+		return $hruler.$newline.lang('Linked entries:').$newline.implode($newline, $rendered_links);
 	}
 
 }

Braces +28 added lines, -11 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * User notification via email.
  */
-class notifications_email implements notifications_iface {
+class notifications_email implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -65,9 +66,14 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -133,23 +139,34 @@ 
 	 * @param boolean $_render_external
 	 * @return plain or html rendered link(s) as complete string
 	 */
-	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+	private function render_links($_links = false, $_render_html = false, $_render_external = true)
+	{
+		if(!is_array($_links) || count($_links) == 0)
+		{
+return false; }
 
 		// provide defaults if given arguments are null
 		// php distinguishes between missing and present(null) arguments
-		if(is_null($_render_html)) { $_render_html = false; }
-		if(is_null($_render_external)) { $_render_external = true; }
+		if(is_null($_render_html))
+		{
+$_render_html = false; }
+		if(is_null($_render_external))
+		{
+$_render_external = true; }
 		$newline = $_render_html ? "<br />" : "\n";
 		$hruler = $_render_html ? Api\Html::hr() : '';
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
+		foreach($_links as $link)
+		{
+			if($_render_external || ! $link->popup)
+			{
+$link->view['no_popup'] = 1; }
 			// do not expose sensitive data
 			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',Api\Html::link('/index.php', $link->view));
 			// complete missing protocol and domain part if needed
-			if ($url{0} == '/' && $_render_external) {
+			if ($url{0} == '/' && $_render_external)
+			{
 				$url = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
 					($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : $_SERVER['HTTP_HOST']).$url;
 			}