EGroupware / egroupware

importexport/inc/class.importexport_export_csv.inc.php

Spacing +78 added lines, -78 removed lines

@@ -94,22 +94,22 @@ 
 	 * @param array _options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options ) {
+	public function __construct($_stream, array $_options) {
 		if (!is_object($GLOBALS['egw']->translation)) {
 			$GLOBALS['egw']->translation = new translation();
 		}
 		$this->translation = &$GLOBALS['egw']->translation;
 		$this->handle = $_stream;
-		if($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
+		if ($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 		$this->csv_charset = $_options['charset'] ? $_options['charset'] : 'utf-8';
-		if ( !empty( $_options ) ) {
-			$this->csv_options = array_merge( $this->csv_options, $_options );
+		if (!empty($_options)) {
+			$this->csv_options = array_merge($this->csv_options, $_options);
 		}
 		//error_log(__METHOD__.__LINE__.array2string($_options['appname']));
-		if(!bo_merge::is_export_limit_excepted()) {
+		if (!bo_merge::is_export_limit_excepted()) {
 			$this->export_limit = bo_merge::getExportLimit($_options['appname']);
 			//error_log(__METHOD__.__LINE__.' app:'.$_options['appname'].' limit:'.$this->export_limit);
-			if($this->export_limit == 'no') throw new egw_exception_no_permission_admin('Export disabled');
+			if ($this->export_limit == 'no') throw new egw_exception_no_permission_admin('Export disabled');
 		}
 	}
 	
@@ -118,15 +118,15 @@ 
 	 *
 	 * @param array $_mapping egw_field_name => csv_field_name
 	 */
-	public function set_mapping( array &$_mapping) {
+	public function set_mapping(array &$_mapping) {
 		if ($this->num_of_records > 0) {
 			throw new Exception('Error: Field mapping can\'t be set during ongoing export!');
 		}
-		if($_mapping['all_custom_fields']) {
+		if ($_mapping['all_custom_fields']) {
 			// Field value is the appname, so we can pull the fields
 			$custom = config::get_customfields($_mapping['all_custom_fields']);
 			unset($_mapping['all_custom_fields']);
-			foreach($custom as $field => $info) {
+			foreach ($custom as $field => $info) {
 				$_mapping['#'.$field] = $this->csv_options['begin_with_fieldnames'] == 'label' ? $info['label'] : $field;
 			}
 		}
@@ -139,7 +139,7 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion(array $_conversion) {
 		$this->conversion = $_conversion;
 	}
 	
@@ -149,59 +149,59 @@ 
 	 * @param importexport_iface_egw_record record
 	 * @return bool
 	 */
-	public function export_record( importexport_iface_egw_record $_record ) {
+	public function export_record(importexport_iface_egw_record $_record) {
 		$this->record = $_record;
 		$this->record_array = $_record->get_record_array();
 		
 		// begin with fieldnames ?
-		if ($this->num_of_records == 0 && $this->csv_options['begin_with_fieldnames'] ) {
-			if($this->csv_options['begin_with_fieldnames'] == 'label') {
+		if ($this->num_of_records == 0 && $this->csv_options['begin_with_fieldnames']) {
+			if ($this->csv_options['begin_with_fieldnames'] == 'label') {
 				// Load translations for app
 				list($appname, $part2) = explode('_', get_class($_record));
-				if(!$GLOBALS['egw_info']['apps'][$appname]) $appname .= $part2; // Handle apps with _ in the name
+				if (!$GLOBALS['egw_info']['apps'][$appname]) $appname .= $part2; // Handle apps with _ in the name
 
 				// Get translations from wizard, if possible
-				if(!$this->csv_options['no_header_translation'])
+				if (!$this->csv_options['no_header_translation'])
 				{
 					$backtrace = debug_backtrace();
 					$plugin = $backtrace[1]['class'];
-					$wizard_name = $appname . '_wizard_' . str_replace($appname . '_', '', $plugin);
+					$wizard_name = $appname.'_wizard_'.str_replace($appname.'_', '', $plugin);
 					try {
 						$wizard = new $wizard_name;
 						$fields = $wizard->get_export_fields();
-						foreach($this->mapping as $field => &$label)
+						foreach ($this->mapping as $field => &$label)
 						{
-							if($fields[$field])
+							if ($fields[$field])
 							{
 								$label = $label != $fields[$field] ? $fields[$field] : lang($label);
 							}
 							// Make sure no *
-							if(substr($label,-1) == '*') $label = substr($label,0,-1);
+							if (substr($label, -1) == '*') $label = substr($label, 0, -1);
 						}
 					} catch (Exception $e) {
 						translation::add_app($appname);
-						foreach($this->mapping as $field => &$label) {
+						foreach ($this->mapping as $field => &$label) {
 							$label = lang($label);
 						}
 					}
 				}
 			}
-			$mapping = ! empty( $this->mapping ) ? $this->mapping : array_keys ( $this->record_array );
-			self::fputcsv( $this->handle ,$mapping ,$this->csv_options['delimiter'], $this->csv_options['enclosure'] );
+			$mapping = !empty($this->mapping) ? $this->mapping : array_keys($this->record_array);
+			self::fputcsv($this->handle, $mapping, $this->csv_options['delimiter'], $this->csv_options['enclosure']);
 		}
 
 		// Check for limit
-		if($this->export_limit && $this->num_of_records >= $this->export_limit) {
+		if ($this->export_limit && $this->num_of_records >= $this->export_limit) {
 			return;
 		}
 		
 		// do conversions
-		if ( !empty( $this->conversion )) {
-			$this->record_array = importexport_helper_functions::conversion( $this->record_array, $this->conversion );
+		if (!empty($this->conversion)) {
+			$this->record_array = importexport_helper_functions::conversion($this->record_array, $this->conversion);
 		}
 		
 		// do fieldmapping
-		if ( !empty( $this->mapping ) ) {
+		if (!empty($this->mapping)) {
 			$record_data = $this->record_array;
 			$this->record_array = array();
 			foreach ($this->mapping as $egw_field => $csv_field) {
@@ -209,7 +209,7 @@ 
 			}
 		}
 		
-		self::fputcsv( $this->handle, $this->record_array, $this->csv_options['delimiter'], $this->csv_options['enclosure'] );
+		self::fputcsv($this->handle, $this->record_array, $this->csv_options['delimiter'], $this->csv_options['enclosure']);
 		$this->num_of_records++;
 	}
 
@@ -233,13 +233,13 @@ 
 	 * @return Array of fields to be added to list of fields needing conversion
 	 */
 	public static function convert_parse_custom_fields($appname, &$selects = array(), &$links = array(), &$methods = array()) {
-		if(!$appname) return;
+		if (!$appname) return;
 
 		$fields = array();
 		$custom = config::get_customfields($appname);
-		foreach($custom as $name => $c_field) {
-			$name = '#' . $name;
-			switch($c_field['type']) {
+		foreach ($custom as $name => $c_field) {
+			$name = '#'.$name;
+			switch ($c_field['type']) {
 				case 'date':
 					$fields['date'][] = $name;
 					break;
@@ -250,7 +250,7 @@ 
 					$fields['select-account'][] = $name;
 					break;
 				case 'ajax_select':
-					if($c_field['values']['get_title']) {
+					if ($c_field['values']['get_title']) {
 						$methods[$name] = $c_field['values']['get_title'];
 						break;
 					}
@@ -264,8 +264,8 @@ 
 					$selects[$name] = $c_field['values'];
 					break;
 				default:
-					list($type) = explode('-',$c_field['type'],2);
-					if(in_array($type, array_keys($GLOBALS['egw_info']['apps']))) {
+					list($type) = explode('-', $c_field['type'], 2);
+					if (in_array($type, array_keys($GLOBALS['egw_info']['apps']))) {
 						$fields['links'][] = $name;
 						$links[$name] = $c_field['type'];
 					}
@@ -284,18 +284,18 @@ 
 	 * @parem fields List of field types => field names to be converted
 	 * @param appname Current appname if you want to do custom fields too
 	 */
-	public static function convert(importexport_iface_egw_record &$record, Array $fields = array(), $appname = null, $selects = array()) {
-		if($appname) {
-			if(!self::$cf_parse_cache[$appname]) {
+	public static function convert(importexport_iface_egw_record&$record, Array $fields = array(), $appname = null, $selects = array()) {
+		if ($appname) {
+			if (!self::$cf_parse_cache[$appname]) {
 				$c_fields = self::convert_parse_custom_fields($appname, $selects, $links, $methods);
 				self::$cf_parse_cache[$appname] = array($c_fields, $selects, $links, $methods);
 			}
 			list($c_fields, $c_selects, $links, $methods) = self::$cf_parse_cache[$appname];
 
 			// Add in any fields that are keys to another app
-			foreach((array)$fields['links'] as $link_field => $app)
+			foreach ((array)$fields['links'] as $link_field => $app)
 			{
-				if(is_numeric($link_field)) continue;
+				if (is_numeric($link_field)) continue;
 				$links[$link_field] = $app;
 				// Set it as a normal link field
 				$fields['links'][] = $link_field;
@@ -303,8 +303,8 @@ 
 			}
 
 			// Not quite a recursive merge, since only one level
-			foreach($fields as $type => &$list) {
-				if($c_fields[$type]) {
+			foreach ($fields as $type => &$list) {
+				if ($c_fields[$type]) {
 					$list = array_merge($c_fields[$type], $list);
 					unset($c_fields[$type]);
 				}
@@ -312,12 +312,12 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		foreach((array)$fields['select'] as $name) {
-			if($record->$name != null && is_array($selects) && $selects[$name]) {
+		foreach ((array)$fields['select'] as $name) {
+			if ($record->$name != null && is_array($selects) && $selects[$name]) {
 				$record->$name = explode(',', $record->$name);
-				if(is_array($record->$name)) {
+				if (is_array($record->$name)) {
 					$names = array();
-					foreach($record->$name as $_name) {
+					foreach ($record->$name as $_name) {
 						$names[] = lang($selects[$name][$_name]);
 					}
 					$record->$name = implode(', ', $names);
@@ -330,17 +330,17 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['links'] as $name) {
-			if($record->$name) {
-				if(is_numeric($record->$name) && !$links[$name]) {
+		foreach ((array)$fields['links'] as $name) {
+			if ($record->$name) {
+				if (is_numeric($record->$name) && !$links[$name]) {
 					$link = egw_link::get_link($record->$name);
 					$links[$name] = ($link['link_app1'] == $appname ? $link['link_app2'] : $link['link_app1']);
 					$record->$name = ($link['link_app1'] == $appname ? $link['link_id2'] : $link['link_id1']);
 				}
-				if($links[$name]) {
+				if ($links[$name]) {
 					$record->$name = egw_link::title($links[$name], $record->$name);
 				}
-				else if ( is_array($record->$name) && $record->$name['app'] && $record->$name['id'])
+				else if (is_array($record->$name) && $record->$name['app'] && $record->$name['id'])
 				{
 					$record->$name = Link::title($record->$name['app'], $record->$name['id']);
 				}
@@ -350,12 +350,12 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['select-account'] as $name) {
+		foreach ((array)$fields['select-account'] as $name) {
 			// Compare against null to deal with empty arrays
 			if ($record->$name !== null) {
-				if(is_array($record->$name)) {
+				if (is_array($record->$name)) {
 					$names = array();
-					foreach($record->$name as $_name) {
+					foreach ($record->$name as $_name) {
 						$names[] = common::grab_owner_name($_name);
 					}
 					$record->$name = implode(', ', $names);
@@ -368,64 +368,64 @@ 
 				$record->$name = '';
 			}
 		}
-		foreach((array)$fields['select-bool'] as $name) {
-			if($record->$name !== null) {
+		foreach ((array)$fields['select-bool'] as $name) {
+			if ($record->$name !== null) {
 				$record->$name = $record->$name ? lang('Yes') : lang('No');
 			}
 		}
-		foreach((array)$fields['date-time'] as $name) {
+		foreach ((array)$fields['date-time'] as $name) {
 			//if ($record->$name) $record->$name = date('Y-m-d H:i:s',$record->$name); // Standard date format
 			if ($record->$name && !is_numeric($record->$name)) $record->$name = strtotime($record->$name); // Custom fields stored as string
-			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ' '.
-				($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H:i:s' : 'h:i:s a'),$record->$name); // User date format
+			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.
+				($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H:i:s' : 'h:i:s a'), $record->$name); // User date format
 			if (!$record->$name) $record->$name = '';
 		}
-		foreach((array)$fields['date'] as $name) {
+		foreach ((array)$fields['date'] as $name) {
 			//if ($record->$name) $record->$name = date('Y-m-d',$record->$name); // Standard date format
 			if ($record->$name && !is_numeric($record->$name)) $record->$name = strtotime($record->$name); // Custom fields stored as string
 			if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $record->$name); // User date format
 			if (!$record->$name) $record->$name = '';
 		}
-		foreach((array)$fields['float'] as $name)
+		foreach ((array)$fields['float'] as $name)
 		{
-			static $dec_separator,$thousands_separator;
+			static $dec_separator, $thousands_separator;
 			if (is_null($dec_separator))
 			{
 				$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
 				if (empty($dec_separator)) $dec_separator = '.';
 				$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 			}
-			if($record->$name && (string)$record->$name != '')
+			if ($record->$name && (string)$record->$name != '')
 			{
-				if(!is_numeric($record->$name))
+				if (!is_numeric($record->$name))
 				{
 					$record->$name = floatval(str_replace($dec_separator, '.', preg_replace('/[^\d'.preg_quote($dec_separator).']/', '', $record->$name)));
 				}
-				$record->$name = number_format(str_replace(' ','',$record->$name), 2,
-					$dec_separator,$thousands_separator
+				$record->$name = number_format(str_replace(' ', '', $record->$name), 2,
+					$dec_separator, $thousands_separator
 				);
 			}
 		}
 
 		// Some custom methods for conversion
-		foreach((array)$methods as $name => $method) {
-			if($record->$name) $record->$name = ExecMethod($method, $record->$name);
+		foreach ((array)$methods as $name => $method) {
+			if ($record->$name) $record->$name = ExecMethod($method, $record->$name);
 		}
 
 		static $cat_object;
-		if(is_null($cat_object)) $cat_object = new categories(false,$appname);
-		foreach((array)$fields['select-cat'] as $name) {
-			if($record->$name) {
+		if (is_null($cat_object)) $cat_object = new categories(false, $appname);
+		foreach ((array)$fields['select-cat'] as $name) {
+			if ($record->$name) {
 				$cats = array();
 				$ids = is_array($record->$name) ? $record->$name : explode(',', $record->$name);
-				foreach($ids as $n => $cat_id) {
+				foreach ($ids as $n => $cat_id) {
 
-					if ($cat_id && $cat_object->check_perms(EGW_ACL_READ,$cat_id))
+					if ($cat_id && $cat_object->check_perms(EGW_ACL_READ, $cat_id))
 					{
 						$cats[] = $cat_object->id2name($cat_id);
 					}
 				}
-				$record->$name = implode(', ',$cats);
+				$record->$name = implode(', ', $cats);
 			}
 			else
 			{
@@ -452,18 +452,18 @@ 
 	 * @param char $delimiter
 	 * @param char $enclosure
 	 */
-	protected function fputcsv($filePointer, Array $dataArray, $delimiter, $enclosure){
+	protected function fputcsv($filePointer, Array $dataArray, $delimiter, $enclosure) {
 		$string = "";
 		$writeDelimiter = false;
-		foreach($dataArray as $dataElement) {
-			if($writeDelimiter) $string .= $delimiter;
-			$string .= $enclosure . str_replace(array("\r\n", '"'), array("\n",'""'), $dataElement) . $enclosure;
+		foreach ($dataArray as $dataElement) {
+			if ($writeDelimiter) $string .= $delimiter;
+			$string .= $enclosure.str_replace(array("\r\n", '"'), array("\n", '""'), $dataElement).$enclosure;
 			$writeDelimiter = true;
 		}
 		$string .= "\n";
 		
 		// do charset translation
-		$string = $this->translation->convert( $string, $this->translation->charset(), $this->csv_charset );
+		$string = $this->translation->convert($string, $this->translation->charset(), $this->csv_charset);
 		
 		fwrite($filePointer, $string);
 			

infolog/inc/class.infolog_export_csv.inc.php

Spacing +42 added lines, -42 removed lines

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

Braces +56 added lines, -16 removed lines

@@ -18,7 +18,8 @@ 
 {
 
 
-	public function __construct() {
+	public function __construct()
+	{
 		translation::add_app('infolog');
 		$this->bo = new infolog_bo();
 		$this->get_selects();
@@ -50,7 +51,8 @@ 
 			case 'all':
 				// do we need to query the cf's
 				$query['custom_fields'] = false;
-				foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
+				foreach($options['mapping'] + (array)$_definition->filter as $field => $map)
+				{
 					if($field[0] == '#')
 					{
 						$query['custom_fields'] = true;
@@ -76,11 +78,20 @@ 
 					// Handle ranges
 					foreach($query['col_filter'] as $field => $value)
 					{
-						if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+						if(!is_array($value) || (!$value['from'] && !$value['to']))
+						{
+							continue;
+						}
 
 						// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-						if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-						if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+						if($value['from'])
+						{
+							$query['col_filter'][] = "$field >= " . (int)$value['from'];
+						}
+						if($value['to'])
+						{
+							$query['col_filter'][] = "$field <= " . (int)$value['to'];
+						}
 						unset($query['col_filter'][$field]);
 					}
 				}
@@ -97,9 +108,13 @@ 
 					{
 						foreach($selection as &$row)
 						{
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+							if($row[$field])
+							{
+								$cf_preload[$app][] = $row[$field];
+							}
 						}
-						if($cf_preload[$app]){
+						if($cf_preload[$app])
+						{
 							 $selects[$field] = egw_link::titles($app, $cf_preload[$app]);
 							//error_log('Preload ' . $field . '['.$app . ']: ' . implode(',',$cf_preload[$app]));
 						}
@@ -125,10 +140,17 @@ 
 		if($ids && $options['mapping']['info_link_id'])
 		{
 			$links = egw_link::get_links_multiple('infolog', $ids, true, '!'.egw_link::VFS_APPNAME);
-			foreach($links as $id => $link) {
-				if(!is_array($selection[$id])) break;
+			foreach($links as $id => $link)
+			{
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['info_link_id'] = $link;
-				if($options['convert']) $selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				if($options['convert'])
+				{
+					$selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				}
 			}
 		}
 		// If exporting PM fields, pre-load them all at once
@@ -137,7 +159,10 @@ 
 			$projects = egw_link::get_links_multiple('infolog', $ids, true, 'projectmanager');
 			foreach($projects as $id => $links)
 			{
-				if(!is_array($selection[$id])) break;
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['pm_id'] = current($links);
 				$selection[$id]['project'] = egw_link::title('projectmanager', $selection[$id]['pm_id']);
 				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',$selection[$id]['pm_id']);
@@ -149,7 +174,10 @@ 
 			if(!is_array($_identifier))
 			{
 				$record = new infolog_egw_record($_identifier);
-				if($link = $links[$record->info_id]) $record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				if($link = $links[$record->info_id])
+				{
+					$record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				}
 				if($project = $projects[$record->info_id])
 				{
 					$record->pm_id = current($project);
@@ -171,7 +199,10 @@ 
 				// Force 0 times to ''
 				foreach(array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
 				{
-					if($record->$field == 0) $record->$field = '';
+					if($record->$field == 0)
+					{
+						$record->$field = '';
+					}
 				}
 			}
 			else
@@ -179,7 +210,10 @@ 
 				// Implode arrays, so they don't say 'Array'
 				foreach($record->get_record_array() as $key => $value)
 				{
-					if(is_array($value)) $record->$key = implode(',', $value);
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
 			}
 			$export_object->export_record($record);
@@ -268,10 +302,16 @@ 
 	{
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 			
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
-			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
+			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0)
+			{
+				unset($filters[$field_name]);
+			}
 		}
 	}