EGroupware / egroupware

importexport/inc/class.importexport_export_csv.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
 	 *
 	 * @param stram $_stream resource where records are exported to.
 	 * @param array _options options for specific backends
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function __construct( $_stream, array $_options ) {
 		if (!is_object($GLOBALS['egw']->translation)) {
@@ -151,7 +151,7 @@ 
 	 * exports a record into resource of handle
 	 *
 	 * @param importexport_iface_egw_record record
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function export_record( importexport_iface_egw_record $_record ) {
 		$this->record = $_record;
@@ -284,7 +284,7 @@ 
 	 *
 	 * Uses the static variable $types to convert various datatypes.
 	 *
-	 * @param record Record to be converted
+	 * @param record importexport_iface_egw_record to be converted
 	 * @parem fields List of field types => field names to be converted
 	 * @param appname Current appname if you want to do custom fields too
 	 */

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

@@ -288,7 +288,7 @@ 
 	 * @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()) {
+	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);
@@ -452,7 +452,7 @@ 
 	 * @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) {

Spacing +77 added lines, -77 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,14 +330,14 @@ 
 				$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);
 				}
 			}
@@ -346,12 +346,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);
@@ -364,64 +364,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
 			{
@@ -448,18 +448,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);
 			

Braces +180 added lines, -71 removed lines

@@ -94,22 +94,32 @@ 
 	 * @param array _options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options ) {
-		if (!is_object($GLOBALS['egw']->translation)) {
+	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 ) ) {
+		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 +128,19 @@ 
 	 *
 	 * @param array $_mapping egw_field_name => csv_field_name
 	 */
-	public function set_mapping( array &$_mapping) {
-		if ($this->num_of_records > 0) {
+	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 +153,8 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion( array $_conversion)
+	{
 		$this->conversion = $_conversion;
 	}
 	
@@ -149,16 +164,23 @@ 
 	 * @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'])
@@ -176,11 +198,16 @@ 
 								$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) {
+					}
+					catch (Exception $e) {
 						translation::add_app($appname);
-						foreach($this->mapping as $field => &$label) {
+						foreach($this->mapping as $field => &$label)
+						{
 							$label = lang($label);
 						}
 					}
@@ -191,20 +218,24 @@ 
 		}
 
 		// 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 )) {
+		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) {
+			foreach ($this->mapping as $egw_field => $csv_field)
+			{
 				$this->record_array[$csv_field] = $record_data[$egw_field];
 			}
 		}
@@ -218,7 +249,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_num_of_records() {
+	public function get_num_of_records()
+	{
 		return $this->num_of_records;
 	}
 
@@ -232,14 +264,20 @@ 
 	 *
 	 * @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;
+	public static function convert_parse_custom_fields($appname, &$selects = array(), &$links = array(), &$methods = array())
+	{
+		if(!$appname)
+		{
+			return;
+		}
 
 		$fields = array();
 		$custom = config::get_customfields($appname);
-		foreach($custom as $name => $c_field) {
+		foreach($custom as $name => $c_field)
+		{
 			$name = '#' . $name;
-			switch($c_field['type']) {
+			switch($c_field['type'])
+			{
 				case 'date':
 					$fields['date'][] = $name;
 					break;
@@ -250,7 +288,8 @@ 
 					$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;
 					}
@@ -265,7 +304,8 @@ 
 					break;
 				default:
 					list($type) = explode('-',$c_field['type'],2);
-					if(in_array($type, array_keys($GLOBALS['egw_info']['apps']))) {
+					if(in_array($type, array_keys($GLOBALS['egw_info']['apps'])))
+					{
 						$fields['links'][] = $name;
 						$links[$name] = $c_field['type'];
 					}
@@ -284,9 +324,12 @@ 
 	 * @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);
 			}
@@ -295,7 +338,10 @@ 
 			// Add in any fields that are keys to another 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 +349,10 @@ 
 			}
 
 			// 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,16 +360,22 @@ 
 			$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);
-				} else {
+				}
+				else
+				{
 					$record->$name = lang($selects[$name][$record->$name]);
 				}
 			}
@@ -330,14 +384,18 @@ 
 				$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);
 				}
 			}
@@ -346,16 +404,22 @@ 
 				$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 ($record->$name !== null)
+			{
+				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);
-				} else {
+				}
+				else
+				{
 					$record->$name = common::grab_owner_name($record->$name);
 				}
 			}
@@ -364,23 +428,49 @@ 
 				$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) $record->$name = '';
+			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)
+			{
+				$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 = '';
+			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)
 		{
@@ -388,7 +478,10 @@ 
 			if (is_null($dec_separator))
 			{
 				$dec_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-				if (empty($dec_separator)) $dec_separator = '.';
+				if (empty($dec_separator))
+				{
+					$dec_separator = '.';
+				}
 				$thousands_separator = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][1];
 			}
 			if($record->$name && (string)$record->$name != '')
@@ -404,17 +497,27 @@ 
 		}
 
 		// 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))
 					{
@@ -435,7 +538,8 @@ 
 	 *
 	 * @return
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		
 	}
 
@@ -448,11 +552,16 @@ 
 	 * @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;
+		foreach($dataArray as $dataElement)
+		{
+			if($writeDelimiter)
+			{
+				$string .= $delimiter;
+			}
 			$string .= $enclosure . str_replace(array("\r\n", '"'), array("\n",'""'), $dataElement) . $enclosure;
 			$writeDelimiter = true;
 		}

importexport/inc/class.importexport_helper_functions.inc.php

Doc Comments +4 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
 	/**
 	 * converts accound_lid to account_id
 	 *
-	 * @param mixed $_account_lid comma seperated list or array with lids
+	 * @param mixed $_account_lids comma seperated list or array with lids
 	 * @return mixed comma seperated list or array with ids
 	 */
 	public static function account_name2id( &$_account_lids ) {
@@ -203,7 +203,7 @@ 
 	/**
 	 * converts account_ids to account_lids
 	 *
-	 * @param mixed $_account_ids comma seperated list or array with ids
+	 * @param mixed $_account_id comma seperated list or array with ids
 	 * @return mixed comma seperated list or array with lids
 	 */
 	public static function account_id2name( $_account_id ) {
@@ -419,7 +419,7 @@ 
 	/**
 	 * returns a list of importexport plugins
 	 *
-	 * @param string $_tpye {import | export | all}
+	 * @param string $_type {import | export | all}
 	 * @param string $_appname {<appname> | all}
 	 * @return array(<appname> => array( <type> => array(<plugin> => <title>)))
 	 */
@@ -591,6 +591,7 @@ 
 	 *
 	 * @param $app_name String name of app
 	 * @param $plugin_name Name of the plugin
+	 * @param importexport_wizard_basic_export_csv $wizard_plugin
 	 *
 	 * @return Array ([fieldname] => array(widget settings), ...)
 	 */

Indentation +21 added lines, -21 removed lines

@@ -32,25 +32,25 @@ 
 	 * Relative date ranges for filtering
 	 */
 	public static $relative_dates = array(      // Start: year,month,day,week, End: year,month,day,week
-                'Today'       => array(0,0,0,0,  0,0,1,0),
-                'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-                'This week'   => array(0,0,0,0,  0,0,0,1),
-                'Last week'   => array(0,0,0,-1, 0,0,0,0),
-                'This month'  => array(0,0,0,0,  0,1,0,0),
-                'Last month'  => array(0,-1,0,0, 0,0,0,0),
-                'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
-                'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
-                'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
-                'This year'   => array(0,0,0,0,  1,0,0,0),
-                'Last year'   => array(-1,0,0,0, 0,0,0,0),
-                '2 years ago' => array(-2,0,0,0, -1,0,0,0),
-                '3 years ago' => array(-3,0,0,0, -2,0,0,0),
-        );
+				'Today'       => array(0,0,0,0,  0,0,1,0),
+				'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
+				'This week'   => array(0,0,0,0,  0,0,0,1),
+				'Last week'   => array(0,0,0,-1, 0,0,0,0),
+				'This month'  => array(0,0,0,0,  0,1,0,0),
+				'Last month'  => array(0,-1,0,0, 0,0,0,0),
+				'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
+				'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
+				'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
+				'This year'   => array(0,0,0,0,  1,0,0,0),
+				'Last year'   => array(-1,0,0,0, 0,0,0,0),
+				'2 years ago' => array(-2,0,0,0, -1,0,0,0),
+				'3 years ago' => array(-3,0,0,0, -2,0,0,0),
+		);
 
 	/**
-	* Files known to cause problems, and will be skipped in a plugin scan
-	* If you put appname => true, the whole app will be skipped.
-	*/
+	 * Files known to cause problems, and will be skipped in a plugin scan
+	 * If you put appname => true, the whole app will be skipped.
+	 */
 	protected static $blacklist_files = array(
 		'api' => true,
 		'etemplate' => true,
@@ -64,10 +64,10 @@ 
 	);
 
 	/**
-	* Class used to provide extra conversion functions
-	*
-	* Passed in as a param to conversion()
-	*/
+	 * Class used to provide extra conversion functions
+	 *
+	 * Passed in as a param to conversion()
+	 */
 	protected static $cclass = null;
 
 	/**

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

@@ -445,7 +445,7 @@ 
 		return $plugins;
 	}
 
-	public static function _get_plugins(Array $appnames, Array $types) {
+	public static function _get_plugins(array $appnames, array $types) {
 		$plugins = array();
 		foreach ($appnames as $appname) {
 			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
@@ -562,7 +562,7 @@ 
 	}
 
 	// Api\Cache needs this public
-	public static function _has_definitions(Array $appnames, Array $types) {
+	public static function _has_definitions(array $appnames, array $types) {
 		$def = new importexport_definitions_bo(array('application'=>$appnames, 'type' => $types));
 		$list = array();
 		foreach((array)$def->get_definitions() as $id) {

Spacing +185 added lines, -185 removed lines

@@ -30,19 +30,19 @@ 
 	 * Relative date ranges for filtering
 	 */
 	public static $relative_dates = array(      // Start: year,month,day,week, End: year,month,day,week
-                'Today'       => array(0,0,0,0,  0,0,1,0),
-                'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-                'This week'   => array(0,0,0,0,  0,0,0,1),
-                'Last week'   => array(0,0,0,-1, 0,0,0,0),
-                'This month'  => array(0,0,0,0,  0,1,0,0),
-                'Last month'  => array(0,-1,0,0, 0,0,0,0),
-                'Last 3 months' => array(0,-3,0,0, 0,0,0,0),
-                'This quarter'=> array(0,0,0,0,  0,0,0,0),      // Just a marker, needs special handling
-                'Last quarter'=> array(0,-4,0,0, 0,-4,0,0),     // Just a marker
-                'This year'   => array(0,0,0,0,  1,0,0,0),
-                'Last year'   => array(-1,0,0,0, 0,0,0,0),
-                '2 years ago' => array(-2,0,0,0, -1,0,0,0),
-                '3 years ago' => array(-3,0,0,0, -2,0,0,0),
+                'Today'       => array(0, 0, 0, 0, 0, 0, 1, 0),
+                'Yesterday'   => array(0, 0, -1, 0, 0, 0, 0, 0),
+                'This week'   => array(0, 0, 0, 0, 0, 0, 0, 1),
+                'Last week'   => array(0, 0, 0, -1, 0, 0, 0, 0),
+                'This month'  => array(0, 0, 0, 0, 0, 1, 0, 0),
+                'Last month'  => array(0, -1, 0, 0, 0, 0, 0, 0),
+                'Last 3 months' => array(0, -3, 0, 0, 0, 0, 0, 0),
+                'This quarter'=> array(0, 0, 0, 0, 0, 0, 0, 0), // Just a marker, needs special handling
+                'Last quarter'=> array(0, -4, 0, 0, 0, -4, 0, 0), // Just a marker
+                'This year'   => array(0, 0, 0, 0, 1, 0, 0, 0),
+                'Last year'   => array(-1, 0, 0, 0, 0, 0, 0, 0),
+                '2 years ago' => array(-2, 0, 0, 0, -1, 0, 0, 0),
+                '3 years ago' => array(-3, 0, 0, 0, -2, 0, 0, 0),
         );
 
 	/**
@@ -77,22 +77,22 @@ 
 	 * @param string $_format format of time string e.g.: d.m.Y H:i
 	 * @param int $_is_dst is day light saving time? 0 = no, 1 = yes, -1 = system default
 	 */
-	public static function custom_strtotime( $_string, $_format='', $_is_dst = -1) {
-		if ( empty( $_format ) ) return strtotime( $_string );
-		$fparams = explode( ',', chunk_split( $_format, 1, ',' ) );
+	public static function custom_strtotime($_string, $_format = '', $_is_dst = -1) {
+		if (empty($_format)) return strtotime($_string);
+		$fparams = explode(',', chunk_split($_format, 1, ','));
 		$spos = 0;
-		foreach ( $fparams as $fparam ) {
-
-			switch ( $fparam ) {
-				case 'd': (int)$day = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'm': (int)$mon = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'y': (int)$year = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'Y': (int)$year = substr( $_string, $spos, 4 ); $spos += 4; break;
-				case 'H': (int)$hour = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'h': (int)$hour = substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'i': (int)$min =  substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 's': (int)$sec =  substr( $_string, $spos, 2 ); $spos += 2; break;
-				case 'O': (int)$offset = $year = substr( $_string, $spos, 5 ); $spos += 5; break;
+		foreach ($fparams as $fparam) {
+
+			switch ($fparam) {
+				case 'd': (int)$day = substr($_string, $spos, 2); $spos += 2; break;
+				case 'm': (int)$mon = substr($_string, $spos, 2); $spos += 2; break;
+				case 'y': (int)$year = substr($_string, $spos, 2); $spos += 2; break;
+				case 'Y': (int)$year = substr($_string, $spos, 4); $spos += 4; break;
+				case 'H': (int)$hour = substr($_string, $spos, 2); $spos += 2; break;
+				case 'h': (int)$hour = substr($_string, $spos, 2); $spos += 2; break;
+				case 'i': (int)$min = substr($_string, $spos, 2); $spos += 2; break;
+				case 's': (int)$sec = substr($_string, $spos, 2); $spos += 2; break;
+				case 'O': (int)$offset = $year = substr($_string, $spos, 5); $spos += 5; break;
 				case 'a': (int)$hour = $fparam == 'am' ? $hour : $hour + 12; break;
 				case 'A': (int)$hour = $fparam == 'AM' ? $hour : $hour + 12; break;
 				default: $spos++; // seperator
@@ -103,11 +103,11 @@ 
 		$timestamp = mktime($hour, $min, $sec, $mon, $day, $year, $_is_dst);
 
 		// offset given?
-		if ( isset( $offset ) && strlen( $offset == 5 ) ) {
+		if (isset($offset) && strlen($offset == 5)) {
 			$operator = $offset{0};
-			$ohour = 60 * 60 * (int)substr( $offset, 1, 2 );
-			$omin = 60 * (int)substr( $offset, 3, 2 );
-			if ( $operator == '+' ) $timestamp += $ohour + $omin;
+			$ohour = 60 * 60 * (int)substr($offset, 1, 2);
+			$omin = 60 * (int)substr($offset, 3, 2);
+			if ($operator == '+') $timestamp += $ohour + $omin;
 			else $timestamp -= $ohour + $omin;
 		}
 		return $timestamp;
@@ -118,11 +118,11 @@ 
 	 * @param mixed $_account_lid comma seperated list or array with lids
 	 * @return mixed comma seperated list or array with ids
 	 */
-	public static function account_name2id( &$_account_lids ) {
-		$account_lids = is_array( $_account_lids ) ? $_account_lids : explode( ',', $_account_lids );
+	public static function account_name2id(&$_account_lids) {
+		$account_lids = is_array($_account_lids) ? $_account_lids : explode(',', $_account_lids);
 		$skip = false;
-		foreach ( $account_lids as $key => $account_lid ) {
-			if($skip) {
+		foreach ($account_lids as $key => $account_lid) {
+			if ($skip) {
 				unset($account_lids[$key]);
 				$skip = false;
 				continue;
@@ -130,15 +130,15 @@ 
 			$account_lid = trim($account_lid);
 
 			// Handle any IDs that slip in
-			if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) {
+			if (is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) {
 				unset($account_lids[$key]);
 				$account_ids[] = (int)$account_lid;
 				continue;
 			}
 			// Check for [username]
-			if(strpos($account_lid,'[') !== false)
+			if (strpos($account_lid, '[') !== false)
 			{
-				if(preg_match('/\[(.+)\]/',$account_lid,$matches))
+				if (preg_match('/\[(.+)\]/', $account_lid, $matches))
 				{
 					$account_id = $GLOBALS['egw']->accounts->name2id($matches[1]);
 					unset($account_lids[$key]);
@@ -149,46 +149,46 @@ 
 
 			// Handle users listed as Lastname, Firstname instead of login ID
 			// Do this first, in case their first name matches a username
-			if ( $account_lids[$key+1][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lids[$key+1]).' ' .$account_lid, 'account_fullname')) {
+			if ($account_lids[$key + 1][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id(trim($account_lids[$key + 1]).' '.$account_lid, 'account_fullname')) {
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				$skip = true; // Skip the next one, it's the first name
-				continue ;
+				continue;
 			}
 
 			// Deal with groups listed as <name> Group, remove the Group
-			if(substr(trim($account_lid),-strlen(lang('Group'))) == lang('Group'))
+			if (substr(trim($account_lid), -strlen(lang('Group'))) == lang('Group'))
 			{
 				$account_lid = trim(substr(trim($account_lid), 0, -strlen(lang('Group'))));
 			}
 
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid )) {
+			if ($account_id = $GLOBALS['egw']->accounts->name2id($account_lid)) {
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid), 'account_fullname' )) {
+			if ($account_id = $GLOBALS['egw']->accounts->name2id(trim($account_lid), 'account_fullname')) {
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
 
 			// Handle groups listed as Group, <name>
-			if ( $account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid)) {
+			if ($account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id($account_lid)) {
 				$account_ids[] = $account_id;
-				unset($account_lids[$key-1]);
+				unset($account_lids[$key - 1]);
 				unset($account_lids[$key]);
 				continue;
 			}
 			// Group, <name> - remove the Group part
-			if($account_lid == lang('Group'))
+			if ($account_lid == lang('Group'))
 			{
 				unset($account_lids[$key]);
 				continue;
 			}
 		}
-		$_account_lids = (is_array($_account_lids) ? $account_lids : implode(',',array_unique($account_lids)));
-		return is_array( $_account_lids ) ? array_unique($account_ids) : implode( ',', array_unique((array)$account_ids ));
+		$_account_lids = (is_array($_account_lids) ? $account_lids : implode(',', array_unique($account_lids)));
+		return is_array($_account_lids) ? array_unique($account_ids) : implode(',', array_unique((array)$account_ids));
 
 	} // end of member function account_lid2id
 
@@ -198,14 +198,14 @@ 
 	 * @param mixed $_account_ids comma seperated list or array with ids
 	 * @return mixed comma seperated list or array with lids
 	 */
-	public static function account_id2name( $_account_id ) {
-		$account_ids = is_array( $_account_id ) ? $_account_id : explode( ',', $_account_id );
-		foreach ( $account_ids as $account_id ) {
-			if ( $account_lid = $GLOBALS['egw']->accounts->id2name( $account_id )) {
+	public static function account_id2name($_account_id) {
+		$account_ids = is_array($_account_id) ? $_account_id : explode(',', $_account_id);
+		foreach ($account_ids as $account_id) {
+			if ($account_lid = $GLOBALS['egw']->accounts->id2name($account_id)) {
 				$account_lids[] = $account_lid;
 			}
 		}
-		return is_array( $_account_id ) ? $account_lids : implode( ',', (array)$account_lids );
+		return is_array($_account_id) ? $account_lids : implode(',', (array)$account_lids);
 	} // end of member function account_id2lid
 
 	/**
@@ -214,12 +214,12 @@ 
 	 * @param mixed _cat_ids comma seperated list or array
 	 * @return mixed comma seperated list or array with cat_names
 	 */
-	public static function cat_id2name( $_cat_ids ) {
-		$cat_ids = is_array( $_cat_ids ) ? $_cat_ids : explode( ',', $_cat_ids );
-		foreach ( $cat_ids as $cat_id ) {
-			$cat_names[] = categories::id2name( (int)$cat_id );
+	public static function cat_id2name($_cat_ids) {
+		$cat_ids = is_array($_cat_ids) ? $_cat_ids : explode(',', $_cat_ids);
+		foreach ($cat_ids as $cat_id) {
+			$cat_names[] = categories::id2name((int)$cat_id);
 		}
-		return is_array( $_cat_ids ) ? $cat_names : implode(',',(array)$cat_names);
+		return is_array($_cat_ids) ? $cat_names : implode(',', (array)$cat_names);
 	} // end of member function category_id2name
 
 	/**
@@ -230,24 +230,24 @@ 
 	 * @param int $parent Optional parent ID to use for new categories
 	 * @return mixed comma seperated list or array with cat_ids
 	 */
-	public static function cat_name2id( $_cat_names, $parent = 0 ) {
-		$cats = new categories();	// uses current user and app (egw_info[flags][currentapp])
+	public static function cat_name2id($_cat_names, $parent = 0) {
+		$cats = new categories(); // uses current user and app (egw_info[flags][currentapp])
 
-		$cat_names = is_array( $_cat_names ) ? $_cat_names : explode( ',', $_cat_names );
-		foreach ( $cat_names as $cat_name ) {
+		$cat_names = is_array($_cat_names) ? $_cat_names : explode(',', $_cat_names);
+		foreach ($cat_names as $cat_name) {
 			$cat_name = trim($cat_name);
-			if ( $cat_name == '' ) continue;
-			if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run) {
-				$cat_id = $cats->add( array(
+			if ($cat_name == '') continue;
+			if (($cat_id = $cats->name2id($cat_name)) == 0 && !self::$dry_run) {
+				$cat_id = $cats->add(array(
 					'name' => $cat_name,
 					'parent' => $parent,
 					'access' => 'public',
-					'descr' => $cat_name. ' ('. lang('Automatically created by importexport'). ')'
+					'descr' => $cat_name.' ('.lang('Automatically created by importexport').')'
 				));
 			}
 			$cat_ids[] = $cat_id;
 		}
-		return is_array( $_cat_names ) ? $cat_ids : implode( ',', (array)$cat_ids );
+		return is_array($_cat_names) ? $cat_ids : implode(',', (array)$cat_ids);
 
 	} // end of member function category_name2id
 
@@ -286,76 +286,76 @@ 
 	 * @param object &$cclass calling class to process the '@ evals'
 	 * @return bool
 	 */
-	public static function conversion( &$_record,  $_conversion, &$_cclass = null ) {
-		if (empty( $_conversion ) ) return $_record;
+	public static function conversion(&$_record, $_conversion, &$_cclass = null) {
+		if (empty($_conversion)) return $_record;
 
-		self::$cclass =& $_cclass;
+		self::$cclass = & $_cclass;
 
 		$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in conversion
 		$ASep = '|>'; // Assignment-Separator, separats pattern and replacesment
-		$CPre = '|['; $CPos = ']';  // |[_record-idx] is expanded to the corespondig value
+		$CPre = '|['; $CPos = ']'; // |[_record-idx] is expanded to the corespondig value
 		$TPre = '|T{'; $TPos = '}'; // |{_record-idx} is trimmed
-		$CntlPre = '|TC{';		    // Filter all cntl-chars \x01-\x1f and trim
-		$CntlnCLPre  = '|TCnCL{';   // Like |C{ but allowes CR and LF
-		$INE = '|INE{';             // Only insert if stuff in ^^ is not empty
+		$CntlPre = '|TC{'; // Filter all cntl-chars \x01-\x1f and trim
+		$CntlnCLPre = '|TCnCL{'; // Like |C{ but allowes CR and LF
+		$INE = '|INE{'; // Only insert if stuff in ^^ is not empty
 
-		foreach ( $_conversion as $idx => $conversion_string ) {
-			if ( empty( $conversion_string ) ) continue;
+		foreach ($_conversion as $idx => $conversion_string) {
+			if (empty($conversion_string)) continue;
 
 			// fetch patterns ($rvalues)
 			$rvalues = array();
-			$pat_reps = explode( $PSep, stripslashes( $conversion_string ) );
-			foreach( $pat_reps as $k => $pat_rep ) {
-				list( $pattern, $replace ) = explode( $ASep, $pat_rep, 2 );
-				if( $replace == '' ) {
+			$pat_reps = explode($PSep, stripslashes($conversion_string));
+			foreach ($pat_reps as $k => $pat_rep) {
+				list($pattern, $replace) = explode($ASep, $pat_rep, 2);
+				if ($replace == '') {
 					$replace = $pattern; $pattern = '^.*$';
 				}
-				$rvalues[$pattern] = $replace;	// replace two with only one, added by the form
+				$rvalues[$pattern] = $replace; // replace two with only one, added by the form
 			}
 
 			// conversion list may be longer than $_record aka (no_csv)
-			$val = array_key_exists( $idx, $_record ) ? $_record[$idx] : '';
+			$val = array_key_exists($idx, $_record) ? $_record[$idx] : '';
 
 			$c_functions = array('cat', 'account', 'strtotime', 'list');
-			if($_cclass) {
+			if ($_cclass) {
 				// Add in additional methods
 				$reflection = new ReflectionClass(get_class($_cclass));
 				$methods = $reflection->getMethods(ReflectionMethod::IS_STATIC);
-				foreach($methods as $method) {
+				foreach ($methods as $method) {
 					$c_functions[] = $method->name;
 				}
 			}
 			$c_functions = implode('|', $c_functions);
-			foreach ( $rvalues as $pattern => $replace ) {
+			foreach ($rvalues as $pattern => $replace) {
 				// Allow to include record indexes in pattern
 				$reg = '/\|\[([0-9]+)\]/';
-				while( preg_match( $reg, $pattern, $vars ) ) {
+				while (preg_match($reg, $pattern, $vars)) {
 					// expand all _record fields
 					$pattern = str_replace(
-						$CPre . $vars[1] . $CPos,
+						$CPre.$vars[1].$CPos,
 						$_record[array_search($vars[1], array_keys($_record))],
 						$pattern
 					);
 				}
-				if( preg_match('/'. (string)$pattern.'/', $val) ) {
+				if (preg_match('/'.(string)$pattern.'/', $val)) {
 
-					$val = preg_replace( '/'.(string)$pattern.'/', $replace, (string)$val );
+					$val = preg_replace('/'.(string)$pattern.'/', $replace, (string)$val);
 
 					$reg = '/\|\[([a-zA-Z_0-9]+)\]/';
-					while( preg_match( $reg, $val, $vars ) ) {
+					while (preg_match($reg, $val, $vars)) {
 						// expand all _record fields
 						$val = str_replace(
-							$CPre . $vars[1] . $CPos,
+							$CPre.$vars[1].$CPos,
 							$_record[array_search($vars[1], array_keys($_record))],
 							$val
 						);
 					}
-					$val = preg_replace_callback( "/($c_functions)\(([^)]*)\)/i", array( self, 'c2_dispatcher') , $val );
+					$val = preg_replace_callback("/($c_functions)\(([^)]*)\)/i", array(self, 'c2_dispatcher'), $val);
 					break;
 				}
 			}
 			// clean each field
-			$val = preg_replace_callback("/(\|T\{|\|TC\{|\|TCnCL\{|\|INE\{)(.*)\}/", array( self, 'strclean'), $val );
+			$val = preg_replace_callback("/(\|T\{|\|TC\{|\|TCnCL\{|\|INE\{)(.*)\}/", array(self, 'strclean'), $val);
 
 			$_record[$idx] = $val;
 		}
@@ -369,42 +369,42 @@ 
 	 *
 	 * @param array $_matches
 	 */
-	private static function c2_dispatcher( $_matches ) {
+	private static function c2_dispatcher($_matches) {
 		$action = &$_matches[1]; // cat or account ...
-		$data = &$_matches[2];   // datas for action
+		$data = &$_matches[2]; // datas for action
 
-		switch ( $action ) {
+		switch ($action) {
 			case 'strtotime' :
-				list( $string, $format ) = explode( ',', $data );
-				return self::custom_strtotime( trim( $string ), trim( $format ) );
+				list($string, $format) = explode(',', $data);
+				return self::custom_strtotime(trim($string), trim($format));
 			case 'list':
-				list( $split, $data, $index) = explode(',',$data);
+				list($split, $data, $index) = explode(',', $data);
 				$exploded = explode($split, $data);
 				// 1 based indexing for user ease
 				return $exploded[$index - 1];
 			default :
-				if(self::$cclass && method_exists(self::$cclass, $action)) {
+				if (self::$cclass && method_exists(self::$cclass, $action)) {
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
 				}
-				$method = (string)$action. ( is_int( $data ) ? '_id2name' : '_name2id' );
-				if(self::$cclass && method_exists(self::$cclass, $method)) {
+				$method = (string)$action.(is_int($data) ? '_id2name' : '_name2id');
+				if (self::$cclass && method_exists(self::$cclass, $method)) {
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
 				} else {
-					return self::$method( $data );
+					return self::$method($data);
 				}
 		}
 	}
 
-	private static function strclean( $_matches ) {
-		switch( $_matches[1] ) {
-			case '|T{' : return trim( $_matches[2] );
-			case '|TC{' : return trim( preg_replace( '/[\x01-\x1F]+/', '', $_matches[2] ) );
-			case '|TCnCL{' : return trim( preg_replace( '/[\x01-\x09\x11\x12\x14-\x1F]+/', '', $_matches[2] ) );
-			case '|INE{' : return preg_match( '/\^.+\^/', $_matches[2] ) ? $_matches[2] : '';
+	private static function strclean($_matches) {
+		switch ($_matches[1]) {
+			case '|T{' : return trim($_matches[2]);
+			case '|TC{' : return trim(preg_replace('/[\x01-\x1F]+/', '', $_matches[2]));
+			case '|TCnCL{' : return trim(preg_replace('/[\x01-\x09\x11\x12\x14-\x1F]+/', '', $_matches[2]));
+			case '|INE{' : return preg_match('/\^.+\^/', $_matches[2]) ? $_matches[2] : '';
 			default:
-				throw new Exception('Error in conversion string! "'. substr( $_matches[1], 0, -1 ). '" is not valid!');
+				throw new Exception('Error in conversion string! "'.substr($_matches[1], 0, -1).'" is not valid!');
 		}
 	}
 
@@ -415,23 +415,23 @@ 
 	 * @param string $_appname {<appname> | all}
 	 * @return array(<appname> => array( <type> => array(<plugin> => <title>)))
 	 */
-	public static function get_plugins( $_appname = 'all', $_type = 'all' ) {
+	public static function get_plugins($_appname = 'all', $_type = 'all') {
 		$plugins = egw_cache::getTree(
 			__CLASS__,
 			'plugins',
-			array('importexport_helper_functions','_get_plugins'),
+			array('importexport_helper_functions', '_get_plugins'),
 			array(array_keys($GLOBALS['egw_info']['apps']), array('import', 'export')),
 			self::CACHE_EXPIRATION
 		);
 		$appnames = $_appname == 'all' ? array_keys($GLOBALS['egw_info']['apps']) : (array)$_appname;
-		$types = $_type == 'all' ? array('import','export') : (array)$_type;
+		$types = $_type == 'all' ? array('import', 'export') : (array)$_type;
 
 		// Testing: comment out egw_cache call, use this
 		//$plugins = self::_get_plugins($appnames, $types);
-		foreach($plugins as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($plugins[$appname]);
+		foreach ($plugins as $appname => $_types) {
+			if (!in_array($appname, $appnames)) unset($plugins[$appname]);
 		}
-		foreach($plugins as $appname => $types) {
+		foreach ($plugins as $appname => $types) {
 			$plugins[$appname] = array_intersect_key($plugins[$appname], $types);
 		}
 		return $plugins;
@@ -440,25 +440,25 @@ 
 	public static function _get_plugins(Array $appnames, Array $types) {
 		$plugins = array();
 		foreach ($appnames as $appname) {
-			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
+			if (array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
 
-			$appdir = EGW_INCLUDE_ROOT. "/$appname/inc";
-			if(!is_dir($appdir)) continue;
+			$appdir = EGW_INCLUDE_ROOT."/$appname/inc";
+			if (!is_dir($appdir)) continue;
 			$d = dir($appdir);
 
 			// step through each file in appdir
 			while (false !== ($entry = $d->read())) {
 				// Blacklisted?
-				if(is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))  continue;
+				if (is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))  continue;
 				if (!preg_match('/^class\.([^.]+)\.inc\.php$/', $entry, $matches)) continue;
 				$classname = $matches[1];
-				$file = $appdir. '/'. $entry;
+				$file = $appdir.'/'.$entry;
 
 				foreach ($types as $type) {
-					if( !is_file($file) || strpos($entry, $type) === false || strpos($entry,'wizard') !== false) continue;
+					if (!is_file($file) || strpos($entry, $type) === false || strpos($entry, 'wizard') !== false) continue;
 					require_once($file);
 					$reflectionClass = new ReflectionClass($classname);
-					if($reflectionClass->IsInstantiable() &&
+					if ($reflectionClass->IsInstantiable() &&
 							$reflectionClass->implementsInterface('importexport_iface_'.$type.'_plugin')) {
 						try {
 							$plugin_object = new $classname;
@@ -474,7 +474,7 @@ 
 			$d->close();
 
 			$config = config::read('importexport');
-			if($config['update'] == 'auto') {
+			if ($config['update'] == 'auto') {
 				self::load_defaults($appname);
 			}
 		}
@@ -489,37 +489,37 @@ 
 	 * @return array $num => $appname
 	 */
 	public static function get_apps($_type, $ignore_acl = false) {
-		$apps = array_keys(self::get_plugins('all',$_type));
-		if($ignore_acl) return $apps;
+		$apps = array_keys(self::get_plugins('all', $_type));
+		if ($ignore_acl) return $apps;
 
-		foreach($apps as $key => $app) {
-			if(!self::has_definitions($app, $_type)) unset($apps[$key]);
+		foreach ($apps as $key => $app) {
+			if (!self::has_definitions($app, $_type)) unset($apps[$key]);
 		}
 		return $apps;
 	}
 
 	public static function load_defaults($appname) {
 		// Check for new definitions to import from $appname/setup/*.xml
-		$appdir = EGW_INCLUDE_ROOT. "/$appname/setup";
-		if(!is_dir($appdir)) return;
+		$appdir = EGW_INCLUDE_ROOT."/$appname/setup";
+		if (!is_dir($appdir)) return;
 		$d = dir($appdir);
 
 		// step through each file in app's setup
 		while (false !== ($entry = $d->read())) {
-			$file = $appdir. '/'. $entry;
-			list( $filename, $extension) = explode('.',$entry);
-			if ( $extension != 'xml' ) continue;
+			$file = $appdir.'/'.$entry;
+			list($filename, $extension) = explode('.', $entry);
+			if ($extension != 'xml') continue;
 			try {
 				// import will skip invalid files
-				importexport_definitions_bo::import( $file );
+				importexport_definitions_bo::import($file);
 			} catch (Exception $e) {
-				error_log(__CLASS__.__FUNCTION__. " import $appname definitions: " . $e->getMessage());
+				error_log(__CLASS__.__FUNCTION__." import $appname definitions: ".$e->getMessage());
 			}
 		}
 		$d->close();
 	}
 
-	public static function guess_filetype( $_file ) {
+	public static function guess_filetype($_file) {
 
 	}
 
@@ -530,24 +530,24 @@ 
 	 * @param string $_type {import | export | all}
 	 * @return boolean
 	 */
-	public static function has_definitions( $_appname = 'all', $_type = 'all' ) {
+	public static function has_definitions($_appname = 'all', $_type = 'all') {
 		$definitions = egw_cache::getSession(
 			__CLASS__,
 			'has_definitions',
-			array('importexport_helper_functions','_has_definitions'),
+			array('importexport_helper_functions', '_has_definitions'),
 			array(array_keys($GLOBALS['egw_info']['apps']), array('import', 'export')),
 			self::CACHE_EXPIRATION
 		);
 		$appnames = $_appname == 'all' ? array_keys($GLOBALS['egw_info']['apps']) : (array)$_appname;
-		$types = $_type == 'all' ? array('import','export') : (array)$_type;
+		$types = $_type == 'all' ? array('import', 'export') : (array)$_type;
 
 		// Testing: Comment out cache call above, use this
 		//$definitions = self::_has_definitions($appnames, $types);
 
-		foreach($definitions as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($definitions[$appname]);
+		foreach ($definitions as $appname => $_types) {
+			if (!in_array($appname, $appnames)) unset($definitions[$appname]);
 		}
-		foreach($definitions as $appname => $_types) {
+		foreach ($definitions as $appname => $_types) {
 			$definitions[$appname] = array_intersect_key($definitions[$appname], array_flip($types));
 		}
 		return count($definitions[$appname]) > 0;
@@ -557,11 +557,11 @@ 
 	public static function _has_definitions(Array $appnames, Array $types) {
 		$def = new importexport_definitions_bo(array('application'=>$appnames, 'type' => $types));
 		$list = array();
-		foreach((array)$def->get_definitions() as $id) {
+		foreach ((array)$def->get_definitions() as $id) {
 			// Need to instanciate it to check, but if the user doesn't have permission, it throws an exception
 			try {
 				$definition = new importexport_definition($id);
-				if($def->is_permitted($definition->get_record_array())) {
+				if ($def->is_permitted($definition->get_record_array())) {
 					$list[$definition->application][$definition->type][] = $id;
 				}
 			} catch (Exception $e) {
@@ -590,16 +590,16 @@ 
 	{
 		$fields = array();
 		try {
-			if($record_classname == null) $record_classname = $app_name . '_egw_record';
-			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
+			if ($record_classname == null) $record_classname = $app_name.'_egw_record';
+			if (!class_exists($record_classname)) throw new Exception('Bad class name '.$record_classname);
 
 			$plugin = is_object($plugin_name) ? $plugin_name : new $plugin_name();
 			$plugin_name = get_class($plugin);
 
-			if(!$wizard_plugin)
+			if (!$wizard_plugin)
 			{
-				$wizard_name = $app_name . '_wizard_' . str_replace($app_name . '_', '', $plugin_name);
-				if(!class_exists($wizard_name)) throw new Exception('Bad wizard name ' . $wizard_name);
+				$wizard_name = $app_name.'_wizard_'.str_replace($app_name.'_', '', $plugin_name);
+				if (!class_exists($wizard_name)) throw new Exception('Bad wizard name '.$wizard_name);
 				$wizard_plugin = new $wizard_name;
 			}
 		}
@@ -611,16 +611,16 @@ 
 
 		// Get field -> label map and initialize fields using wizard field order
 		$fields = $export_fields = array();
-		if(method_exists($wizard_plugin, 'get_export_fields'))
+		if (method_exists($wizard_plugin, 'get_export_fields'))
 		{
 			$fields = $export_fields = $wizard_plugin->get_export_fields();
 		}
 
-		foreach($record_classname::$types as $type => $type_fields)
+		foreach ($record_classname::$types as $type => $type_fields)
 		{
 			// Only these for now, until filter methods for others are figured out
-			if(!in_array($type, array('select','select-cat','select-account','date','date-time'))) continue;
-			foreach($type_fields as $field_name)
+			if (!in_array($type, array('select', 'select-cat', 'select-account', 'date', 'date-time'))) continue;
+			foreach ($type_fields as $field_name)
 			{
 				$fields[$field_name] = array(
 					'name' => $field_name,
@@ -631,21 +631,21 @@ 
 		}
 		// Add custom fields
 		$custom = config::get_customfields($app_name);
-		foreach($custom as $field_name => $settings)
+		foreach ($custom as $field_name => $settings)
 		{
 			$settings['name'] = '#'.$field_name;
 			$fields['#'.$field_name] = $settings;
 		}
 
-		foreach($fields as $field_name => &$settings) {
+		foreach ($fields as $field_name => &$settings) {
 			// Can't really filter on these (or at least no generic, sane way figured out yet)
-			if(!is_array($settings) || in_array($settings['type'], array('text','button', 'label','url','url-email','url-phone','htmlarea')))
+			if (!is_array($settings) || in_array($settings['type'], array('text', 'button', 'label', 'url', 'url-email', 'url-phone', 'htmlarea')))
 			{
 				unset($fields[$field_name]);
 				continue;
 			}
-			if($settings['type'] == 'radio') $settings['type'] = 'select';
-			switch($settings['type'])
+			if ($settings['type'] == 'radio') $settings['type'] = 'select';
+			switch ($settings['type'])
 			{
 				case 'checkbox':
 					// This isn't quite right - there's only 2 options and you can select both
@@ -668,7 +668,7 @@ 
 			}
 		}
 
-		if(method_exists($plugin, 'get_filter_fields'))
+		if (method_exists($plugin, 'get_filter_fields'))
 		{
 			$plugin->get_filter_fields($fields);
 		}
@@ -684,65 +684,65 @@ 
 	 */
 	public static function date_rel2abs($value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
 			$abs = array();
-			foreach($value as $key => $val)
+			foreach ($value as $key => $val)
 			{
 				$abs[$key] = self::date_rel2abs($val);
 			}
 			return $abs;
 		}
-		if($date = self::$relative_dates[$value])
+		if ($date = self::$relative_dates[$value])
 		{
-			$year  = (int) date('Y');
-			$month = (int) date('m');
-			$day   = (int) date('d');
-			$today = mktime(0,0,0,date('m'),date('d'),date('Y'));
+			$year  = (int)date('Y');
+			$month = (int)date('m');
+			$day   = (int)date('d');
+			$today = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
 
-			list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) = $date;
+			list($syear, $smonth, $sday, $sweek, $eyear, $emonth, $eday, $eweek) = $date;
 
-			if(stripos($value, 'quarter') !== false)
+			if (stripos($value, 'quarter') !== false)
 			{
 				// Handle quarters
-				$start = mktime(0,0,0,((int)floor(($smonth+$month) / 3.1)) * 3 + 1, 1, $year);
-				$end = mktime(0,0,0,((int)floor(($emonth+$month) / 3.1)+1) * 3 + 1, 1, $year);
+				$start = mktime(0, 0, 0, ((int)floor(($smonth + $month) / 3.1)) * 3 + 1, 1, $year);
+				$end = mktime(0, 0, 0, ((int)floor(($emonth + $month) / 3.1) + 1) * 3 + 1, 1, $year);
 			}
 			elseif ($syear || $eyear)
 			{
-				$start = mktime(0,0,0,1,1,$syear+$year);
-				$end   = mktime(0,0,0,1,1,$eyear+$year);
+				$start = mktime(0, 0, 0, 1, 1, $syear + $year);
+				$end   = mktime(0, 0, 0, 1, 1, $eyear + $year);
 			}
 			elseif ($smonth || $emonth)
 			{
-				$start = mktime(0,0,0,$smonth+$month,1,$year);
-				$end   = mktime(0,0,0,$emonth+$month,1,$year);
+				$start = mktime(0, 0, 0, $smonth + $month, 1, $year);
+				$end   = mktime(0, 0, 0, $emonth + $month, 1, $year);
 			}
 			elseif ($sday || $eday)
 			{
-				$start = mktime(0,0,0,$month,$sday+$day,$year);
-				$end   = mktime(0,0,0,$month,$eday+$day,$year);
+				$start = mktime(0, 0, 0, $month, $sday + $day, $year);
+				$end   = mktime(0, 0, 0, $month, $eday + $day, $year);
 			}
 			elseif ($sweek || $eweek)
 			{
-				$wday = (int) date('w'); // 0=sun, ..., 6=sat
-				switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+				$wday = (int)date('w'); // 0=sun, ..., 6=sat
+				switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 				{
 					case 'Sunday':
-						$weekstart = $today - $wday * 24*60*60;
+						$weekstart = $today - $wday * 24 * 60 * 60;
 						break;
 					case 'Saturday':
-						$weekstart = $today - (6-$wday) * 24*60*60;
+						$weekstart = $today - (6 - $wday) * 24 * 60 * 60;
 						break;
 					case 'Moday':
 					default:
-						$weekstart = $today - ($wday ? $wday-1 : 6) * 24*60*60;
+						$weekstart = $today - ($wday ? $wday - 1 : 6) * 24 * 60 * 60;
 						break;
 				}
-				$start = $weekstart + $sweek*7*24*60*60;
-				$end   = $weekstart + $eweek*7*24*60*60;
+				$start = $weekstart + $sweek * 7 * 24 * 60 * 60;
+				$end   = $weekstart + $eweek * 7 * 24 * 60 * 60;
 			}
-			$end_param = $end - 24*60*60;
+			$end_param = $end - 24 * 60 * 60;
 		
 			// Take 1 second off end to provide an inclusive range.for filtering
 			$end -= 1;

Braces +210 added lines, -83 removed lines

@@ -14,7 +14,8 @@ 
  * class importexport_helper_functions (only static methods)
  * use importexport_helper_functions::method
  */
-class importexport_helper_functions {
+class importexport_helper_functions
+{
 
 	/**
 	 * Plugins are scanned and cached for all instances using this source path for given time (in seconds)
@@ -77,13 +78,19 @@ 
 	 * @param string $_format format of time string e.g.: d.m.Y H:i
 	 * @param int $_is_dst is day light saving time? 0 = no, 1 = yes, -1 = system default
 	 */
-	public static function custom_strtotime( $_string, $_format='', $_is_dst = -1) {
-		if ( empty( $_format ) ) return strtotime( $_string );
+	public static function custom_strtotime( $_string, $_format='', $_is_dst = -1)
+	{
+		if ( empty( $_format ) )
+		{
+			return strtotime( $_string );
+		}
 		$fparams = explode( ',', chunk_split( $_format, 1, ',' ) );
 		$spos = 0;
-		foreach ( $fparams as $fparam ) {
+		foreach ( $fparams as $fparam )
+		{
 
-			switch ( $fparam ) {
+			switch ( $fparam )
+			{
 				case 'd': (int)$day = substr( $_string, $spos, 2 ); $spos += 2; break;
 				case 'm': (int)$mon = substr( $_string, $spos, 2 ); $spos += 2; break;
 				case 'y': (int)$year = substr( $_string, $spos, 2 ); $spos += 2; break;
@@ -103,12 +110,18 @@ 
 		$timestamp = mktime($hour, $min, $sec, $mon, $day, $year, $_is_dst);
 
 		// offset given?
-		if ( isset( $offset ) && strlen( $offset == 5 ) ) {
+		if ( isset( $offset ) && strlen( $offset == 5 ) )
+		{
 			$operator = $offset{0};
 			$ohour = 60 * 60 * (int)substr( $offset, 1, 2 );
 			$omin = 60 * (int)substr( $offset, 3, 2 );
-			if ( $operator == '+' ) $timestamp += $ohour + $omin;
-			else $timestamp -= $ohour + $omin;
+			if ( $operator == '+' )
+			{
+				$timestamp += $ohour + $omin;
+			}
+			else {
+				$timestamp -= $ohour + $omin;
+			}
 		}
 		return $timestamp;
 	}
@@ -118,11 +131,14 @@ 
 	 * @param mixed $_account_lid comma seperated list or array with lids
 	 * @return mixed comma seperated list or array with ids
 	 */
-	public static function account_name2id( &$_account_lids ) {
+	public static function account_name2id( &$_account_lids )
+	{
 		$account_lids = is_array( $_account_lids ) ? $_account_lids : explode( ',', $_account_lids );
 		$skip = false;
-		foreach ( $account_lids as $key => $account_lid ) {
-			if($skip) {
+		foreach ( $account_lids as $key => $account_lid )
+		{
+			if($skip)
+			{
 				unset($account_lids[$key]);
 				$skip = false;
 				continue;
@@ -130,7 +146,8 @@ 
 			$account_lid = trim($account_lid);
 
 			// Handle any IDs that slip in
-			if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) {
+			if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid))
+			{
 				unset($account_lids[$key]);
 				$account_ids[] = (int)$account_lid;
 				continue;
@@ -149,7 +166,8 @@ 
 
 			// Handle users listed as Lastname, Firstname instead of login ID
 			// Do this first, in case their first name matches a username
-			if ( $account_lids[$key+1][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lids[$key+1]).' ' .$account_lid, 'account_fullname')) {
+			if ( $account_lids[$key+1][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lids[$key+1]).' ' .$account_lid, 'account_fullname'))
+			{
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				$skip = true; // Skip the next one, it's the first name
@@ -162,19 +180,22 @@ 
 				$account_lid = trim(substr(trim($account_lid), 0, -strlen(lang('Group'))));
 			}
 
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid )) {
+			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid ))
+			{
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid), 'account_fullname' )) {
+			if ( $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid), 'account_fullname' ))
+			{
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
 
 			// Handle groups listed as Group, <name>
-			if ( $account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid)) {
+			if ( $account_lids[$key][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid))
+			{
 				$account_ids[] = $account_id;
 				unset($account_lids[$key-1]);
 				unset($account_lids[$key]);
@@ -198,10 +219,13 @@ 
 	 * @param mixed $_account_ids comma seperated list or array with ids
 	 * @return mixed comma seperated list or array with lids
 	 */
-	public static function account_id2name( $_account_id ) {
+	public static function account_id2name( $_account_id )
+	{
 		$account_ids = is_array( $_account_id ) ? $_account_id : explode( ',', $_account_id );
-		foreach ( $account_ids as $account_id ) {
-			if ( $account_lid = $GLOBALS['egw']->accounts->id2name( $account_id )) {
+		foreach ( $account_ids as $account_id )
+		{
+			if ( $account_lid = $GLOBALS['egw']->accounts->id2name( $account_id ))
+			{
 				$account_lids[] = $account_lid;
 			}
 		}
@@ -214,9 +238,11 @@ 
 	 * @param mixed _cat_ids comma seperated list or array
 	 * @return mixed comma seperated list or array with cat_names
 	 */
-	public static function cat_id2name( $_cat_ids ) {
+	public static function cat_id2name( $_cat_ids )
+	{
 		$cat_ids = is_array( $_cat_ids ) ? $_cat_ids : explode( ',', $_cat_ids );
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ( $cat_ids as $cat_id )
+		{
 			$cat_names[] = categories::id2name( (int)$cat_id );
 		}
 		return is_array( $_cat_ids ) ? $cat_names : implode(',',(array)$cat_names);
@@ -230,14 +256,20 @@ 
 	 * @param int $parent Optional parent ID to use for new categories
 	 * @return mixed comma seperated list or array with cat_ids
 	 */
-	public static function cat_name2id( $_cat_names, $parent = 0 ) {
+	public static function cat_name2id( $_cat_names, $parent = 0 )
+	{
 		$cats = new categories();	// uses current user and app (egw_info[flags][currentapp])
 
 		$cat_names = is_array( $_cat_names ) ? $_cat_names : explode( ',', $_cat_names );
-		foreach ( $cat_names as $cat_name ) {
+		foreach ( $cat_names as $cat_name )
+		{
 			$cat_name = trim($cat_name);
-			if ( $cat_name == '' ) continue;
-			if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run) {
+			if ( $cat_name == '' )
+			{
+				continue;
+			}
+			if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run)
+			{
 				$cat_id = $cats->add( array(
 					'name' => $cat_name,
 					'parent' => $parent,
@@ -286,8 +318,12 @@ 
 	 * @param object &$cclass calling class to process the '@ evals'
 	 * @return bool
 	 */
-	public static function conversion( &$_record,  $_conversion, &$_cclass = null ) {
-		if (empty( $_conversion ) ) return $_record;
+	public static function conversion( &$_record,  $_conversion, &$_cclass = null )
+	{
+		if (empty( $_conversion ) )
+		{
+			return $_record;
+		}
 
 		self::$cclass =& $_cclass;
 
@@ -299,15 +335,21 @@ 
 		$CntlnCLPre  = '|TCnCL{';   // Like |C{ but allowes CR and LF
 		$INE = '|INE{';             // Only insert if stuff in ^^ is not empty
 
-		foreach ( $_conversion as $idx => $conversion_string ) {
-			if ( empty( $conversion_string ) ) continue;
+		foreach ( $_conversion as $idx => $conversion_string )
+		{
+			if ( empty( $conversion_string ) )
+			{
+				continue;
+			}
 
 			// fetch patterns ($rvalues)
 			$rvalues = array();
 			$pat_reps = explode( $PSep, stripslashes( $conversion_string ) );
-			foreach( $pat_reps as $k => $pat_rep ) {
+			foreach( $pat_reps as $k => $pat_rep )
+			{
 				list( $pattern, $replace ) = explode( $ASep, $pat_rep, 2 );
-				if( $replace == '' ) {
+				if( $replace == '' )
+				{
 					$replace = $pattern; $pattern = '^.*$';
 				}
 				$rvalues[$pattern] = $replace;	// replace two with only one, added by the form
@@ -317,19 +359,23 @@ 
 			$val = array_key_exists( $idx, $_record ) ? $_record[$idx] : '';
 
 			$c_functions = array('cat', 'account', 'strtotime', 'list');
-			if($_cclass) {
+			if($_cclass)
+			{
 				// Add in additional methods
 				$reflection = new ReflectionClass(get_class($_cclass));
 				$methods = $reflection->getMethods(ReflectionMethod::IS_STATIC);
-				foreach($methods as $method) {
+				foreach($methods as $method)
+				{
 					$c_functions[] = $method->name;
 				}
 			}
 			$c_functions = implode('|', $c_functions);
-			foreach ( $rvalues as $pattern => $replace ) {
+			foreach ( $rvalues as $pattern => $replace )
+			{
 				// Allow to include record indexes in pattern
 				$reg = '/\|\[([0-9]+)\]/';
-				while( preg_match( $reg, $pattern, $vars ) ) {
+				while( preg_match( $reg, $pattern, $vars ) )
+				{
 					// expand all _record fields
 					$pattern = str_replace(
 						$CPre . $vars[1] . $CPos,
@@ -337,12 +383,14 @@ 
 						$pattern
 					);
 				}
-				if( preg_match('/'. (string)$pattern.'/', $val) ) {
+				if( preg_match('/'. (string)$pattern.'/', $val) )
+				{
 
 					$val = preg_replace( '/'.(string)$pattern.'/', $replace, (string)$val );
 
 					$reg = '/\|\[([a-zA-Z_0-9]+)\]/';
-					while( preg_match( $reg, $val, $vars ) ) {
+					while( preg_match( $reg, $val, $vars ) )
+					{
 						// expand all _record fields
 						$val = str_replace(
 							$CPre . $vars[1] . $CPos,
@@ -369,11 +417,13 @@ 
 	 *
 	 * @param array $_matches
 	 */
-	private static function c2_dispatcher( $_matches ) {
+	private static function c2_dispatcher( $_matches )
+	{
 		$action = &$_matches[1]; // cat or account ...
 		$data = &$_matches[2];   // datas for action
 
-		switch ( $action ) {
+		switch ( $action )
+		{
 			case 'strtotime' :
 				list( $string, $format ) = explode( ',', $data );
 				return self::custom_strtotime( trim( $string ), trim( $format ) );
@@ -383,22 +433,28 @@ 
 				// 1 based indexing for user ease
 				return $exploded[$index - 1];
 			default :
-				if(self::$cclass && method_exists(self::$cclass, $action)) {
+				if(self::$cclass && method_exists(self::$cclass, $action))
+				{
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
 				}
 				$method = (string)$action. ( is_int( $data ) ? '_id2name' : '_name2id' );
-				if(self::$cclass && method_exists(self::$cclass, $method)) {
+				if(self::$cclass && method_exists(self::$cclass, $method))
+				{
 					$class = get_class(self::$cclass);
 					return call_user_func("$class::$action", $data);
-				} else {
+				}
+				else
+				{
 					return self::$method( $data );
 				}
 		}
 	}
 
-	private static function strclean( $_matches ) {
-		switch( $_matches[1] ) {
+	private static function strclean( $_matches )
+	{
+		switch( $_matches[1] )
+		{
 			case '|T{' : return trim( $_matches[2] );
 			case '|TC{' : return trim( preg_replace( '/[\x01-\x1F]+/', '', $_matches[2] ) );
 			case '|TCnCL{' : return trim( preg_replace( '/[\x01-\x09\x11\x12\x14-\x1F]+/', '', $_matches[2] ) );
@@ -415,7 +471,8 @@ 
 	 * @param string $_appname {<appname> | all}
 	 * @return array(<appname> => array( <type> => array(<plugin> => <title>)))
 	 */
-	public static function get_plugins( $_appname = 'all', $_type = 'all' ) {
+	public static function get_plugins( $_appname = 'all', $_type = 'all' )
+	{
 		$plugins = egw_cache::getTree(
 			__CLASS__,
 			'plugins',
@@ -428,38 +485,63 @@ 
 
 		// Testing: comment out egw_cache call, use this
 		//$plugins = self::_get_plugins($appnames, $types);
-		foreach($plugins as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($plugins[$appname]);
+		foreach($plugins as $appname => $_types)
+		{
+			if(!in_array($appname, $appnames))
+			{
+				unset($plugins[$appname]);
+			}
 		}
-		foreach($plugins as $appname => $types) {
+		foreach($plugins as $appname => $types)
+		{
 			$plugins[$appname] = array_intersect_key($plugins[$appname], $types);
 		}
 		return $plugins;
 	}
 
-	public static function _get_plugins(Array $appnames, Array $types) {
+	public static function _get_plugins(Array $appnames, Array $types)
+	{
 		$plugins = array();
-		foreach ($appnames as $appname) {
-			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true) continue;
+		foreach ($appnames as $appname)
+		{
+			if(array_key_exists($appname, self::$blacklist_files) && self::$blacklist_files[$appname] === true)
+			{
+				continue;
+			}
 
 			$appdir = EGW_INCLUDE_ROOT. "/$appname/inc";
-			if(!is_dir($appdir)) continue;
+			if(!is_dir($appdir))
+			{
+				continue;
+			}
 			$d = dir($appdir);
 
 			// step through each file in appdir
-			while (false !== ($entry = $d->read())) {
+			while (false !== ($entry = $d->read()))
+			{
 				// Blacklisted?
-				if(is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))  continue;
-				if (!preg_match('/^class\.([^.]+)\.inc\.php$/', $entry, $matches)) continue;
+				if(is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))
+				{
+					continue;
+				}
+				if (!preg_match('/^class\.([^.]+)\.inc\.php$/', $entry, $matches))
+				{
+					continue;
+				}
 				$classname = $matches[1];
 				$file = $appdir. '/'. $entry;
 
-				foreach ($types as $type) {
-					if( !is_file($file) || strpos($entry, $type) === false || strpos($entry,'wizard') !== false) continue;
+				foreach ($types as $type)
+				{
+					if( !is_file($file) || strpos($entry, $type) === false || strpos($entry,'wizard') !== false)
+					{
+						continue;
+					}
 					require_once($file);
 					$reflectionClass = new ReflectionClass($classname);
 					if($reflectionClass->IsInstantiable() &&
-							$reflectionClass->implementsInterface('importexport_iface_'.$type.'_plugin')) {
+							$reflectionClass->implementsInterface('importexport_iface_'.$type.'_plugin'))
+					{
 						try {
 							$plugin_object = new $classname;
 						}
@@ -474,7 +556,8 @@ 
 			$d->close();
 
 			$config = config::read('importexport');
-			if($config['update'] == 'auto') {
+			if($config['update'] == 'auto')
+			{
 				self::load_defaults($appname);
 			}
 		}
@@ -488,38 +571,56 @@ 
 	 * @param string $_type
 	 * @return array $num => $appname
 	 */
-	public static function get_apps($_type, $ignore_acl = false) {
+	public static function get_apps($_type, $ignore_acl = false)
+	{
 		$apps = array_keys(self::get_plugins('all',$_type));
-		if($ignore_acl) return $apps;
+		if($ignore_acl)
+		{
+			return $apps;
+		}
 
-		foreach($apps as $key => $app) {
-			if(!self::has_definitions($app, $_type)) unset($apps[$key]);
+		foreach($apps as $key => $app)
+		{
+			if(!self::has_definitions($app, $_type))
+			{
+				unset($apps[$key]);
+			}
 		}
 		return $apps;
 	}
 
-	public static function load_defaults($appname) {
+	public static function load_defaults($appname)
+	{
 		// Check for new definitions to import from $appname/setup/*.xml
 		$appdir = EGW_INCLUDE_ROOT. "/$appname/setup";
-		if(!is_dir($appdir)) return;
+		if(!is_dir($appdir))
+		{
+			return;
+		}
 		$d = dir($appdir);
 
 		// step through each file in app's setup
-		while (false !== ($entry = $d->read())) {
+		while (false !== ($entry = $d->read()))
+		{
 			$file = $appdir. '/'. $entry;
 			list( $filename, $extension) = explode('.',$entry);
-			if ( $extension != 'xml' ) continue;
+			if ( $extension != 'xml' )
+			{
+				continue;
+			}
 			try {
 				// import will skip invalid files
 				importexport_definitions_bo::import( $file );
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				error_log(__CLASS__.__FUNCTION__. " import $appname definitions: " . $e->getMessage());
 			}
 		}
 		$d->close();
 	}
 
-	public static function guess_filetype( $_file ) {
+	public static function guess_filetype( $_file )
+	{
 
 	}
 
@@ -530,7 +631,8 @@ 
 	 * @param string $_type {import | export | all}
 	 * @return boolean
 	 */
-	public static function has_definitions( $_appname = 'all', $_type = 'all' ) {
+	public static function has_definitions( $_appname = 'all', $_type = 'all' )
+	{
 		$definitions = egw_cache::getSession(
 			__CLASS__,
 			'has_definitions',
@@ -544,27 +646,36 @@ 
 		// Testing: Comment out cache call above, use this
 		//$definitions = self::_has_definitions($appnames, $types);
 
-		foreach($definitions as $appname => $_types) {
-			if(!in_array($appname, $appnames)) unset($definitions[$appname]);
+		foreach($definitions as $appname => $_types)
+		{
+			if(!in_array($appname, $appnames))
+			{
+				unset($definitions[$appname]);
+			}
 		}
-		foreach($definitions as $appname => $_types) {
+		foreach($definitions as $appname => $_types)
+		{
 			$definitions[$appname] = array_intersect_key($definitions[$appname], array_flip($types));
 		}
 		return count($definitions[$appname]) > 0;
 	}
 
 	// egw_cache needs this public
-	public static function _has_definitions(Array $appnames, Array $types) {
+	public static function _has_definitions(Array $appnames, Array $types)
+	{
 		$def = new importexport_definitions_bo(array('application'=>$appnames, 'type' => $types));
 		$list = array();
-		foreach((array)$def->get_definitions() as $id) {
+		foreach((array)$def->get_definitions() as $id)
+		{
 			// Need to instanciate it to check, but if the user doesn't have permission, it throws an exception
 			try {
 				$definition = new importexport_definition($id);
-				if($def->is_permitted($definition->get_record_array())) {
+				if($def->is_permitted($definition->get_record_array()))
+				{
 					$list[$definition->application][$definition->type][] = $id;
 				}
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				// That one doesn't work, keep going
 			}
 			$definition = null;
@@ -590,8 +701,14 @@ 
 	{
 		$fields = array();
 		try {
-			if($record_classname == null) $record_classname = $app_name . '_egw_record';
-			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
+			if($record_classname == null)
+			{
+				$record_classname = $app_name . '_egw_record';
+			}
+			if(!class_exists($record_classname))
+			{
+				throw new Exception('Bad class name ' . $record_classname);
+			}
 
 			$plugin = is_object($plugin_name) ? $plugin_name : new $plugin_name();
 			$plugin_name = get_class($plugin);
@@ -599,7 +716,10 @@ 
 			if(!$wizard_plugin)
 			{
 				$wizard_name = $app_name . '_wizard_' . str_replace($app_name . '_', '', $plugin_name);
-				if(!class_exists($wizard_name)) throw new Exception('Bad wizard name ' . $wizard_name);
+				if(!class_exists($wizard_name))
+				{
+					throw new Exception('Bad wizard name ' . $wizard_name);
+				}
 				$wizard_plugin = new $wizard_name;
 			}
 		}
@@ -619,7 +739,10 @@ 
 		foreach($record_classname::$types as $type => $type_fields)
 		{
 			// Only these for now, until filter methods for others are figured out
-			if(!in_array($type, array('select','select-cat','select-account','date','date-time'))) continue;
+			if(!in_array($type, array('select','select-cat','select-account','date','date-time')))
+			{
+				continue;
+			}
 			foreach($type_fields as $field_name)
 			{
 				$fields[$field_name] = array(
@@ -637,14 +760,18 @@ 
 			$fields['#'.$field_name] = $settings;
 		}
 
-		foreach($fields as $field_name => &$settings) {
+		foreach($fields as $field_name => &$settings)
+		{
 			// Can't really filter on these (or at least no generic, sane way figured out yet)
 			if(!is_array($settings) || in_array($settings['type'], array('text','button', 'label','url','url-email','url-phone','htmlarea')))
 			{
 				unset($fields[$field_name]);
 				continue;
 			}
-			if($settings['type'] == 'radio') $settings['type'] = 'select';
+			if($settings['type'] == 'radio')
+			{
+				$settings['type'] = 'select';
+			}
 			switch($settings['type'])
 			{
 				case 'checkbox':

importexport/inc/class.importexport_iface_egw_record.inc.php

Doc Comments +3 added lines

@@ -35,6 +35,7 @@ 
 	 * reads record from backend if identifier is given.
 	 *
 	 * @param string $_identifier
+	 * @return void
 	 */
 	public function __construct( $_identifier='' );
 	
@@ -50,6 +51,7 @@ 
 	 *
 	 * @param string $_attribute_name
 	 * @param data $data
+	 * @return void
 	 */
 	public function __set($_attribute_name, $data);
 	
@@ -126,6 +128,7 @@ 
 	/**
 	 * destructor
 	 *
+	 * @return void
 	 */
 	public function __destruct();
 

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' );
+	public function __construct($_identifier = '');
 	
 	/**
 	 * magic method to set attributes of record
@@ -97,7 +97,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier );
+	public function save($_dst_identifier);
 	
 	/**
 	 * copys current record to record identified by $_dst_identifier
@@ -105,7 +105,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier );
+	public function copy($_dst_identifier);
 	
 	/**
 	 * moves current record to record identified by $_dst_identifier
@@ -114,14 +114,14 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier );
+	public function move($_dst_identifier);
 	
 	/**
 	 * delets current record from backend
 	 * @return void
 	 *
 	 */
-	public function delete ();
+	public function delete();
 	
 	/**
 	 * destructor

importexport/inc/class.importexport_iface_import_plugin.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
 	/**
 	 * imports entries according to given definition object.
 	 *
-	 * @param stram $_stram
-	 * @param definition $_definition
+	 * @param stram $_stream
+	 * @param importexport_definition $_definition
 	 * @return int number of successful imports
 	 */
 	public function import( $_stream, importexport_definition $_definition );

Indentation +21 added lines, -21 removed lines

@@ -88,33 +88,33 @@
 	public function get_selectors_etpl();
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can concatenate them 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 concatenate them if you need to
+	 *
+	 * @return Array (
+	 *	record_# => error message
+	 *	)
+	 */
 	public function get_errors();
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can concatenate them 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 concatenate them if you need to
+	 *
+	 * @return Array (
+	 *	record_# => warning message
+	 *	)
+	 */
 	public function get_warnings();
 
 	/**
-	* 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();
 
 } // end of iface_export_plugin

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param definition $_definition
 	 * @return int number of successful imports
 	 */
-	public function import( $_stream, importexport_definition $_definition );
+	public function import($_stream, importexport_definition $_definition);
 
 	/**
 	 * Reads entries, and presents them back as they will be understood

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
  * So this interface just garanties the interaction with userinterfaces. It
  * has nothing to do with datatypes.
  */
-interface importexport_iface_import_plugin {
+interface importexport_iface_import_plugin
+{
 	
 	/**
 	 * imports entries according to given definition object.

importexport/inc/class.importexport_iface_import_record.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * cleanup
 	 *
 	 * @return 
-	 */
+	 void
 	public function __destruct( );
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 
 	/**
 	 * cleanup
@@ -42,7 +42,7 @@ 
 	 * @param string _position may be: {first|last|next|previous|somenumber}
 	 * @return bool
 	 */
-	public function get_record( $_position = 'next' );
+	public function get_record($_position = 'next');
 
 	/**
 	 * Retruns total number of records for the open resource.

importexport/inc/class.importexport_import_csv.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -137,8 +137,8 @@ 
 	/**
 	 * updates $this->record
 	 *
-	 * @param mixed $_position
-	 * @return bool
+	 * @param string $_position
+	 * @return null|false
 	 */
 	private function get_raw_record( $_position = 'next' ) {
 		switch ($_position) {
@@ -244,7 +244,7 @@ 
 	/**
 	 * does conversions according to $this->conversion
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	protected function do_conversions() {
 		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class )) {

Braces +143 added lines, -61 removed lines

@@ -22,7 +22,9 @@ 
  * @todo Throw away spechial chars and trim() entries ?
  * @todo Check for XSS like userinput! (see common_functions)
  */
-class importexport_import_csv implements importexport_iface_import_record { //, Iterator {
+class importexport_import_csv implements importexport_iface_import_record
+{
+//, Iterator {
 
 	const csv_max_linelength = 8000;
 	
@@ -83,10 +85,14 @@ 
 	 * @param string $_resource resource containing data. May be each valid php-stream
 	 * @param array $_options options for the resource array with keys: charset and fieldsep
 	 */
-	public function __construct( $_resource,  array $_options ) {
+	public function __construct( $_resource,  array $_options )
+	{
 		$this->resource = $_resource;
 		$this->csv_fieldsep = $_options['fieldsep'];
-		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'];
 		return;
 	} // end of member function __construct
@@ -94,7 +100,8 @@ 
 	/**
 	 * cleanup
 	 */
-	public function __destruct( ) {
+	public function __destruct( )
+	{
 	} // end of member function __destruct
 
 	/**
@@ -103,20 +110,27 @@ 
 	 * @param mixed _position may be: {current|first|last|next|previous|somenumber}
 	 * @return mixed array with data / false if no furtor records
 	 */
-	public function get_record( $_position = 'next' ) {
+	public function get_record( $_position = 'next' )
+	{
 		
-		if ($this->get_raw_record( $_position ) === false) {
+		if ($this->get_raw_record( $_position ) === false)
+		{
 			return false;
 		}
 		
 		// skip empty records
-		if( count( array_unique( $this->record ) ) < 2 ) return $this->get_record( $_position );
+		if( count( array_unique( $this->record ) ) < 2 )
+		{
+			return $this->get_record( $_position );
+		}
 		
-		if ( !empty( $this->conversion ) ) {
+		if ( !empty( $this->conversion ) )
+		{
 			$this->do_conversions();
 		}
 		
-		if ( !empty( $this->mapping ) ) {
+		if ( !empty( $this->mapping ) )
+		{
 			$this->do_fieldmapping();
 		}
 		
@@ -128,8 +142,10 @@ 
 	 *
 	 * @param int $_numToSkip
 	 */
-	public function skip_records( $_numToSkip ) {
-		while ( (int)$_numToSkip-- !== 0 ) {
+	public function skip_records( $_numToSkip )
+	{
+		while ( (int)$_numToSkip-- !== 0 )
+		{
 			fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
 		}
 	}
@@ -140,22 +156,27 @@ 
 	 * @param mixed $_position
 	 * @return bool
 	 */
-	private function get_raw_record( $_position = 'next' ) {
-		switch ($_position) {
+	private function get_raw_record( $_position = 'next' )
+	{
+		switch ($_position)
+		{
 			case 'current' :
-				if ($this->current_position == 0) {
+				if ($this->current_position == 0)
+				{
 					return;
 				}
 				break;
 			case 'first' :
-				if (!$this->current_position == 0) {
+				if (!$this->current_position == 0)
+				{
 					$this->current_position = 0;
 					rewind($this->resource);
 				}
 				
 			case 'next' :
 				$csv_data = fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
-				if (!is_array($csv_data)) {
+				if (!is_array($csv_data))
+				{
 					return false;
 				}
 				$this->current_position++;
@@ -163,33 +184,41 @@ 
 				break;
 				
 			case 'previous' :
-				if ($this->current_position < 2) {
+				if ($this->current_position < 2)
+				{
 					throw new Exception('Error: There is no previous record!');
 				}
 				$final_position = --$this->current_position;
 				$this->current_position = 0;
 				rewind($this->resource);
-				while ($this->current_position !== $final_position) {
+				while ($this->current_position !== $final_position)
+				{
 					$this->get_raw_record();
 				}
 				break;
 				
 			case 'last' :
-				while ($this->get_raw_record()) {}
+				while ($this->get_raw_record())
+				{
+}
 				break;
 				
 			default: //somenumber
-				if (!is_int($_position)) {
+				if (!is_int($_position))
+				{
 					throw new Exception('Error: $position must be one of {current|first|last|next|previous} or an integer value');
 				}
-				if ($_position == $this->current_position) {
+				if ($_position == $this->current_position)
+				{
 					break;
 				}
-				elseif ($_position < $this->current_position) {
+				elseif ($_position < $this->current_position)
+				{
 					$this->current_position = 0;
 					rewind($this->resource);
 				}
-				while ($this->current_position !== $_position) {
+				while ($this->current_position !== $_position)
+				{
 					$this->get_raw_record();
 				}
 				break;				
@@ -202,12 +231,16 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_num_of_records( ) {
-		if ($this->num_of_records > 0) {
+	public function get_num_of_records( )
+	{
+		if ($this->num_of_records > 0)
+		{
 			return $this->num_of_records;
 		}
 		$current_position = $this->current_position;
-		while ($this->get_raw_record()) {}
+		while ($this->get_raw_record())
+		{
+}
 		$this->num_of_records = $this->current_position;
 		$this->get_record($current_position);
 		return $this->num_of_records;
@@ -218,7 +251,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_current_position( ) {
+	public function get_current_position( )
+	{
 		
 		return $this->current_position;
 		
@@ -230,12 +264,16 @@ 
 	 *
 	 * @return
 	 */
-	protected function do_fieldmapping( ) {
+	protected function do_fieldmapping( )
+	{
 		$record = $this->record;
 		$this->record = array();
 		foreach ($this->mapping as $cvs_idx => $new_idx)
 		{
-			if( $new_idx == '' ) continue;
+			if( $new_idx == '' )
+			{
+				continue;
+			}
 			$this->record[$new_idx] = $record[$cvs_idx];
 		}
 		return true;
@@ -246,8 +284,10 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function do_conversions() {
-		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class )) {
+	protected function do_conversions()
+	{
+		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class ))
+		{
 			$this->record = $record;
 			return;
 		}
@@ -264,16 +304,19 @@ 
 	 *
 	 * @return string warnings, if any
 	 */
-	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0) {
+	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0)
+	{
 		$warnings = array();
 
 		// Automatic conversions
-		if($appname) {
+		if($appname)
+		{
 
 			// Load translations
 			Api\Translation::add_app($appname);
 
-			if(!self::$cf_parse_cache[$appname]) {
+			if(!self::$cf_parse_cache[$appname])
+			{
 				$c_fields = importexport_export_csv::convert_parse_custom_fields($appname, $selects, $links, $methods);
 				self::$cf_parse_cache[$appname] = array($c_fields, $selects, $links, $methods);
 			}
@@ -282,7 +325,10 @@ 
 			// Add in any fields that are keys to another 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;
@@ -292,7 +338,8 @@ 
 			// Not quite a recursive merge, since only one level
 			foreach($fields as $type => &$list)
 			{
-				if($c_fields[$type]) {
+				if($c_fields[$type])
+				{
 					$list = array_merge($c_fields[$type], $list);
 					unset($c_fields[$type]);
 				}
@@ -300,9 +347,12 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		if($fields) {
-			foreach((array)$fields['select'] as $name) {
-				if($record[$name] != null && is_array($selects) && $selects[$name]) {
+		if($fields)
+		{
+			foreach((array)$fields['select'] as $name)
+			{
+				if($record[$name] != null && is_array($selects) && $selects[$name])
+				{
 					$key = array_search(strtolower($record[$name]), array_map('strtolower',$selects[$name]));
 					if($key !== false)
 					{
@@ -311,11 +361,15 @@ 
 					else
 					{
 						$key = array_search(strtolower($record[$name]), array_map('strtolower',array_map('lang',$selects[$name])));
-						if($key !== false) $record[$name] = $key;
+						if($key !== false)
+						{
+							$record[$name] = $key;
+						}
 					}
 				}
 			}
-			foreach((array)$fields['links'] as $name) {
+			foreach((array)$fields['links'] as $name)
+			{
 				if($record[$name] && $links[$name])
 				{
 					// Primary key to another app, not a link
@@ -357,15 +411,19 @@ 
 								lang($links[$name]), $record[$name]).
  								' - ' . lang('no matches');
 							continue;
-						} else {
+						}
+						else
+						{
 							$record[$name] = key($results);
 						}
 					}
 				}
 			}
-			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]) {
+				if ($record[$name])
+				{
 					// Automatically handle text owner without explicit translation
 					$new_owner = importexport_helper_functions::account_name2id($record[$name]);
 					if(count($new_owner) != count(explode(',',$record[$name])))
@@ -373,20 +431,26 @@ 
 						// Unable to parse value into account
 						$warnings[] = $name . ': ' .lang('%1 is not a known user or group', $record[$name]);
 					}
-					if($new_owner != '') {
+					if($new_owner != '')
+					{
 						$record[$name] = $new_owner;
-					} else {
+					}
+					else
+					{
 						// Clear it to prevent trouble later on
 						$record[$name] = '';
 					}
 				}
 			}
-			foreach((array)$fields['select-bool'] as $name) {
-				if($record[$name] != null && $record[$name] != '') {
+			foreach((array)$fields['select-bool'] as $name)
+			{
+				if($record[$name] != null && $record[$name] != '')
+				{
 					$record[$name] = ($record[$name] == lang('Yes') || $record[$name] == '1' ? 1 : 0);
 				}
 			}
-			foreach((array)$fields['date-time'] as $name) {
+			foreach((array)$fields['date-time'] as $name)
+			{
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
@@ -412,7 +476,8 @@ 
 								// Try again, anything goes
 								try {
 									$formatted = new Api\DateTime($record[$name]);
-								} catch (Exception $e) {
+								}
+								catch (Exception $e) {
 									$warnings[] = $name.': ' . $e->getMessage() . "\n" .
 										'Format: '.'!'.Api\DateTime::$user_dateformat . ' ' .Api\DateTime::$user_timeformat;
 									continue;
@@ -434,7 +499,8 @@ 
 					}
 					
 					if(is_array(self::$cf_parse_cache[$appname][0]['date-time']) &&
-							in_array($name, self::$cf_parse_cache[$appname][0]['date-time'])) {
+							in_array($name, self::$cf_parse_cache[$appname][0]['date-time']))
+					{
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d H:i:s', $record[$name]);
 					}
@@ -444,7 +510,8 @@ 
 					$record[$name] = null;
 				}
 			}
-			foreach((array)$fields['date'] as $name) {
+			foreach((array)$fields['date'] as $name)
+			{
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
@@ -458,7 +525,8 @@ 
 					}
 					$record[$name] = Api\DateTime::server2user($record[$name],'ts');
 					if(is_array(self::$cf_parse_cache[$appname][0]['date']) &&
-							in_array($name, self::$cf_parse_cache[$appname][0]['date'])) {
+							in_array($name, self::$cf_parse_cache[$appname][0]['date']))
+					{
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d', $record[$name]);
 					}
@@ -470,26 +538,37 @@ 
 			}
 			foreach((array)$fields['float'] as $name)
 			{
-				if($record[$name] != null && $record[$name] != '') {
+				if($record[$name] != null && $record[$name] != '')
+				{
 					$dec_point = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-					if (empty($dec_point)) $dec_point = '.';
+					if (empty($dec_point))
+					{
+						$dec_point = '.';
+					}
 					$record[$name] = floatval(str_replace($dec_point, '.', preg_replace('/[^\d'.preg_quote($dec_point).']/', '', $record[$name])));
 				}
 			}
 
 			// 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]);
+				}
 			}
 
 			// cat_name2id will use currentapp to create new categories
 			$current_app = $GLOBALS['egw_info']['flags']['currentapp'];
-			if($appname) {
+			if($appname)
+			{
 				$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 			}
 			$categories = new Api\Categories('',$appname);
-			foreach((array)$fields['select-cat'] as $name) {
-				if($record[$name]) {
+			foreach((array)$fields['select-cat'] as $name)
+			{
+				if($record[$name])
+				{
 					// Only parse name if it needs it
 					if($format == 1)
 					{
@@ -503,7 +582,10 @@ 
 							$cat_id = importexport_helper_functions::cat_name2id($record[$name]);
 						}
 						// Don't clear it if it wasn't found
-						if($cat_id) $record[$name] = $cat_id;
+						if($cat_id)
+						{
+							$record[$name] = $cat_id;
+						}
 					}
 				}
 			}

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

@@ -264,7 +264,7 @@
 	 *
 	 * @return string warnings, if any
 	 */
-	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0) {
+	public static function convert(array &$record, array $fields = array(), $appname = null, array $selects = array(), $format=0) {
 		$warnings = array();
 
 		// Automatic conversions

Spacing +75 added lines, -75 removed lines

@@ -80,10 +80,10 @@ 
 	 * @param string $_resource resource containing data. May be each valid php-stream
 	 * @param array $_options options for the resource array with keys: charset and fieldsep
 	 */
-	public function __construct( $_resource,  array $_options ) {
+	public function __construct($_resource, array $_options) {
 		$this->resource = $_resource;
 		$this->csv_fieldsep = $_options['fieldsep'];
-		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'];
 		return;
 	} // end of member function __construct
@@ -100,20 +100,20 @@ 
 	 * @param mixed _position may be: {current|first|last|next|previous|somenumber}
 	 * @return mixed array with data / false if no furtor records
 	 */
-	public function get_record( $_position = 'next' ) {
+	public function get_record($_position = 'next') {
 		
-		if ($this->get_raw_record( $_position ) === false) {
+		if ($this->get_raw_record($_position) === false) {
 			return false;
 		}
 		
 		// skip empty records
-		if( count( array_unique( $this->record ) ) < 2 ) return $this->get_record( $_position );
+		if (count(array_unique($this->record)) < 2) return $this->get_record($_position);
 		
-		if ( !empty( $this->conversion ) ) {
+		if (!empty($this->conversion)) {
 			$this->do_conversions();
 		}
 		
-		if ( !empty( $this->mapping ) ) {
+		if (!empty($this->mapping)) {
 			$this->do_fieldmapping();
 		}
 		
@@ -125,9 +125,9 @@ 
 	 *
 	 * @param int $_numToSkip
 	 */
-	public function skip_records( $_numToSkip ) {
-		while ( (int)$_numToSkip-- !== 0 ) {
-			fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
+	public function skip_records($_numToSkip) {
+		while ((int)$_numToSkip-- !== 0) {
+			fgetcsv($this->resource, self::csv_max_linelength, $this->csv_fieldsep);
 		}
 	}
 	
@@ -137,7 +137,7 @@ 
 	 * @param mixed $_position
 	 * @return bool
 	 */
-	private function get_raw_record( $_position = 'next' ) {
+	private function get_raw_record($_position = 'next') {
 		switch ($_position) {
 			case 'current' :
 				if ($this->current_position == 0) {
@@ -151,7 +151,7 @@ 
 				}
 				
 			case 'next' :
-				$csv_data = fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
+				$csv_data = fgetcsv($this->resource, self::csv_max_linelength, $this->csv_fieldsep);
 				if (!is_array($csv_data)) {
 					return false;
 				}
@@ -232,7 +232,7 @@ 
 		$this->record = array();
 		foreach ($this->mapping as $cvs_idx => $new_idx)
 		{
-			if( $new_idx == '' ) continue;
+			if ($new_idx == '') continue;
 			$this->record[$new_idx] = $record[$cvs_idx];
 		}
 		return true;
@@ -244,7 +244,7 @@ 
 	 * @return bool
 	 */
 	protected function do_conversions() {
-		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class )) {
+		if ($record = importexport_helper_functions::conversion($this->record, $this->conversion, $this->conversion_class)) {
 			$this->record = $record;
 			return;
 		}
@@ -261,25 +261,25 @@ 
 	 *
 	 * @return string warnings, if any
 	 */
-	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0) {
+	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format = 0) {
 		$warnings = array();
 
 		// Automatic conversions
-		if($appname) {
+		if ($appname) {
 
 			// Load translations
 			translation::add_app($appname);
 
-			if(!self::$cf_parse_cache[$appname]) {
+			if (!self::$cf_parse_cache[$appname]) {
 				$c_fields = importexport_export_csv::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;
@@ -287,9 +287,9 @@ 
 			}
 
 			// Not quite a recursive merge, since only one level
-			foreach($fields as $type => &$list)
+			foreach ($fields as $type => &$list)
 			{
-				if($c_fields[$type]) {
+				if ($c_fields[$type]) {
 					$list = array_merge($c_fields[$type], $list);
 					unset($c_fields[$type]);
 				}
@@ -297,36 +297,36 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		if($fields) {
-			foreach((array)$fields['select'] as $name) {
-				if($record[$name] != null && is_array($selects) && $selects[$name]) {
-					$key = array_search(strtolower($record[$name]), array_map('strtolower',$selects[$name]));
-					if($key !== false)
+		if ($fields) {
+			foreach ((array)$fields['select'] as $name) {
+				if ($record[$name] != null && is_array($selects) && $selects[$name]) {
+					$key = array_search(strtolower($record[$name]), array_map('strtolower', $selects[$name]));
+					if ($key !== false)
 					{
 						$record[$name] = $key;
 					}
 					else
 					{
-						$key = array_search(strtolower($record[$name]), array_map('strtolower',array_map('lang',$selects[$name])));
-						if($key !== false) $record[$name] = $key;
+						$key = array_search(strtolower($record[$name]), array_map('strtolower', array_map('lang', $selects[$name])));
+						if ($key !== false) $record[$name] = $key;
 					}
 				}
 			}
-			foreach((array)$fields['links'] as $name) {
-				if($record[$name] && $links[$name])
+			foreach ((array)$fields['links'] as $name) {
+				if ($record[$name] && $links[$name])
 				{
 					// Primary key to another app, not a link
 					// Text - search for a matching record
-					if(!is_numeric($record[$name]))
+					if (!is_numeric($record[$name]))
 					{
 						$results = egw_link::query($links[$name], $record[$name]);
-						if(count($results) >= 1)
+						if (count($results) >= 1)
 						{
 							// More than 1 result.  Check for exact match
 							$exact_count = 0;
-							foreach($results as $id => $title)
+							foreach ($results as $id => $title)
 							{
-								if($title == $record[$name])
+								if ($title == $record[$name])
 								{
 									$exact_count++;
 									$app_id = $id;
@@ -335,11 +335,11 @@ 
 								unset($results[$id]);
 							}
 							// Too many exact matches, or none good enough
-							if($exact_count > 1 || count($results) == 0)
+							if ($exact_count > 1 || count($results) == 0)
 							{
 								$warnings[] = lang('Unable to link to %1 "%2"',
 									lang($links[$name]), $record[$name]).
- 									' - ' .lang('too many matches');
+ 									' - '.lang('too many matches');
 								continue;
 							}
 							elseif ($exact_count == 1)
@@ -352,7 +352,7 @@ 
 						{
 							$warnings[] = lang('Unable to link to %1 "%2"',
 								lang($links[$name]), $record[$name]).
- 								' - ' . lang('no matches');
+ 								' - '.lang('no matches');
 							continue;
 						} else {
 							$record[$name] = key($results);
@@ -360,17 +360,17 @@ 
 					}
 				}
 			}
-			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]) {
 					// Automatically handle text owner without explicit translation
 					$new_owner = importexport_helper_functions::account_name2id($record[$name]);
-					if(count($new_owner) != count(explode(',',$record[$name])))
+					if (count($new_owner) != count(explode(',', $record[$name])))
 					{
 						// Unable to parse value into account
-						$warnings[] = $name . ': ' .lang('%1 is not a known user or group', $record[$name]);
+						$warnings[] = $name.': '.lang('%1 is not a known user or group', $record[$name]);
 					}
-					if($new_owner != '') {
+					if ($new_owner != '') {
 						$record[$name] = $new_owner;
 					} else {
 						// Clear it to prevent trouble later on
@@ -378,24 +378,24 @@ 
 					}
 				}
 			}
-			foreach((array)$fields['select-bool'] as $name) {
-				if($record[$name] != null && $record[$name] != '') {
+			foreach ((array)$fields['select-bool'] as $name) {
+				if ($record[$name] != null && $record[$name] != '') {
 					$record[$name] = ($record[$name] == lang('Yes') || $record[$name] == '1' ? 1 : 0);
 				}
 			}
-			foreach((array)$fields['date-time'] as $name) {
+			foreach ((array)$fields['date-time'] as $name) {
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
-					if($format == 1)
+					if ($format == 1)
 					{
 						$formatted = egw_time::createFromFormat(
-							'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat,
+							'!'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat,
 							$record[$name],
 							egw_time::$user_timezone
 						);
 
-						if(!$formatted && $errors = egw_time::getLastErrors())
+						if (!$formatted && $errors = egw_time::getLastErrors())
 						{
 							// Try again, without time
 							$formatted = egw_time::createFromFormat(
@@ -404,70 +404,70 @@ 
 								egw_time::$user_timezone
 							);
 							
-							if(!$formatted && $errors = egw_time::getLastErrors())
+							if (!$formatted && $errors = egw_time::getLastErrors())
 							{
 								// Try again, anything goes
 								try {
 									$formatted = new egw_time($record[$name]);
 								} catch (Exception $e) {
-									$warnings[] = $name.': ' . $e->getMessage() . "\n" .
-										'Format: '.'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat;
+									$warnings[] = $name.': '.$e->getMessage()."\n".
+										'Format: '.'!'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat;
 									continue;
 								}
 								$errors = egw_time::getLastErrors();
-								foreach($errors['errors'] as $char => $msg)
+								foreach ($errors['errors'] as $char => $msg)
 								{
 									$warnings[] = "$name: [$char] $msg\n".
-										'Format: '.'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat;
+										'Format: '.'!'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat;
 								}
 							}
 						}
-						if($formatted)
+						if ($formatted)
 						{
 							$record[$name] = $formatted->getTimestamp();
 							// Timestamp is apparently in server time, but apps will do the same conversion
-							$record[$name] = egw_time::server2user($record[$name],'ts');
+							$record[$name] = egw_time::server2user($record[$name], 'ts');
 						}
 					}
 					
-					if(is_array(self::$cf_parse_cache[$appname][0]['date-time']) &&
+					if (is_array(self::$cf_parse_cache[$appname][0]['date-time']) &&
 							in_array($name, self::$cf_parse_cache[$appname][0]['date-time'])) {
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d H:i:s', $record[$name]);
 					}
 				}
-				if(array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
+				if (array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
 				{
 					$record[$name] = null;
 				}
 			}
-			foreach((array)$fields['date'] as $name) {
+			foreach ((array)$fields['date'] as $name) {
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
-					if($format == 1)
+					if ($format == 1)
 					{
 						$formatted = egw_time::createFromFormat('!'.egw_time::$user_dateformat, $record[$name]);
-						if($formatted && $errors = egw_time::getLastErrors() && $errors['error_count'] == 0)
+						if ($formatted && $errors = egw_time::getLastErrors() && $errors['error_count'] == 0)
 						{
 							$record[$name] = $formatted->getTimestamp();
 						}
 					}
-					$record[$name] = egw_time::server2user($record[$name],'ts');
-					if(is_array(self::$cf_parse_cache[$appname][0]['date']) &&
+					$record[$name] = egw_time::server2user($record[$name], 'ts');
+					if (is_array(self::$cf_parse_cache[$appname][0]['date']) &&
 							in_array($name, self::$cf_parse_cache[$appname][0]['date'])) {
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d', $record[$name]);
 					}
 				}
-				if(array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
+				if (array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
 				{
 					$record[$name] = null;
 				}
 			}
-			foreach((array)$fields['float'] as $name)
+			foreach ((array)$fields['float'] as $name)
 			{
-				if($record[$name] != null && $record[$name] != '') {
+				if ($record[$name] != null && $record[$name] != '') {
 					$dec_point = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
 					if (empty($dec_point)) $dec_point = '.';
 					$record[$name] = floatval(str_replace($dec_point, '.', preg_replace('/[^\d'.preg_quote($dec_point).']/', '', $record[$name])));
@@ -475,23 +475,23 @@ 
 			}
 
 			// 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]);
 			}
 
 			// cat_name2id will use currentapp to create new categories
 			$current_app = $GLOBALS['egw_info']['flags']['currentapp'];
-			if($appname) {
+			if ($appname) {
 				$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 			}
-			$categories = new categories('',$appname);
-			foreach((array)$fields['select-cat'] as $name) {
-				if($record[$name]) {
+			$categories = new categories('', $appname);
+			foreach ((array)$fields['select-cat'] as $name) {
+				if ($record[$name]) {
 					// Only parse name if it needs it
-					if($format == 1)
+					if ($format == 1)
 					{
-						$existing_cat = $categories->exists('all',$record[$name]);
-						if($existing_cat)
+						$existing_cat = $categories->exists('all', $record[$name]);
+						if ($existing_cat)
 						{
 							$cat_id = $existing_cat;
 						}
@@ -500,14 +500,14 @@ 
 							$cat_id = importexport_helper_functions::cat_name2id($record[$name]);
 						}
 						// Don't clear it if it wasn't found
-						if($cat_id) $record[$name] = $cat_id;
+						if ($cat_id) $record[$name] = $cat_id;
 					}
 				}
 			}
 			$GLOBALS['egw_info']['flags']['currentapp'] = $current_app;
 		}
 
-		return implode("\n",$warnings);
+		return implode("\n", $warnings);
 	}
 } // end of import_csv
 ?>

importexport/inc/class.importexport_import_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
 		 *
 		 * @param importexport_iface_import_plugin $plugin Instance of plugin to be used
 		 * @param resource $stream
-		 * @param importexport_definition $definition
+		 * @param importexport_definition $definition_obj
 		 * @return String HTML fragment illustrating how the data will be understood by Egw
 		 */
 		protected function preview(importexport_iface_import_plugin &$plugin, &$stream, importexport_definition &$definition_obj)

Indentation +6 added lines, -6 removed lines

@@ -41,8 +41,8 @@ 
 		}
 
 		/**
-		*  Step user through importing their file
-		*/
+		 *  Step user through importing their file
+		 */
 		public function import_dialog($content = array()) {
 			$appname = $_GET['appname'] ? $_GET['appname'] : $content['appname'];
 			$definition = $_GET['definition'] ? $_GET['definition'] : $content['definition'];
@@ -224,8 +224,8 @@ 
 		}
 
 		/**
-		* Get options for select boxes
-		*/
+		 * Get options for select boxes
+		 */
 		public static function get_select_options(Array $data) {
 			$options = array(
 				'delimiter' => array(
@@ -274,8 +274,8 @@ 
 		}
 
 		/**
-		* Get definitions via ajax
-		*/
+		 * Get definitions via ajax
+		 */
 		public function ajax_get_definitions($appname, $file=null) {
 			$options = self::get_select_options(array('appname'=>$appname, 'file'=>$file));
 			$response = new xajaxResponse();

Braces +81 added lines, -35 removed lines

@@ -20,7 +20,8 @@ 
  *
 */
 
-	class importexport_import_ui {
+	class importexport_import_ui
+	{
 
 		const _appname = 'importexport';
 
@@ -35,7 +36,8 @@ 
 		 */
 		private $plugins;
 
-		public function __construct() {
+		public function __construct()
+		{
 			$this->plugins = importexport_helper_functions::get_plugins('all','import');
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
 		}
@@ -43,7 +45,8 @@ 
 		/**
 		*  Step user through importing their file
 		*/
-		public function import_dialog($content = array()) {
+		public function import_dialog($content = array())
+		{
 			$appname = $_GET['appname'] ? $_GET['appname'] : $content['appname'];
 			$definition = $_GET['definition'] ? $_GET['definition'] : $content['definition'];
 
@@ -57,16 +60,19 @@ 
 			{
 				Api\Translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if($content['import'] && $definition)
+			{
 				try {
 					$definition_obj = new importexport_definition($content['definition']);
-					if($content['dry-run']) {
+					if($content['dry-run'])
+					{
 						// Set this so plugin doesn't do any data changes
 						$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 					}
 					$options =& $definition_obj->plugin_options;
 					$options['no_notification'] = $content['no_notifications'];
-					if($content['delimiter']) {
+					if($content['delimiter'])
+					{
 						$options['fieldsep'] =
 							$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
 					}
@@ -109,7 +115,8 @@ 
 						// Keep file
 						if($dst_file)
 						{
-							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file)) {
+							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file))
+							{
 								$preserve['file']['tmp_name'] = $dst_file;
 							}
 						}
@@ -162,31 +169,41 @@ 
 						Framework::refresh_opener(lang('%1 records processed',$count), $appname, null,null,$appname);
 					}
 					$total_processed = 0;
-					foreach($plugin->get_results() as $action => $a_count) {
+					foreach($plugin->get_results() as $action => $a_count)
+					{
 						$this->message .= "<br />\n" . lang($action) . ": $a_count";
 						$total_processed += $a_count;
 					}
-					if(count($plugin->get_warnings())) {
+					if(count($plugin->get_warnings()))
+					{
 						$this->message .= "<br />\n".lang('Warnings').':';
-						foreach($plugin->get_warnings() as $record => $message) {
+						foreach($plugin->get_warnings() as $record => $message)
+						{
 							$this->message .= "\n$record: $message";
 						}
 					}
-					if(count($plugin->get_errors())) {
+					if(count($plugin->get_errors()))
+					{
 						$this->message .= "<br />\n".lang('Problems during import:');
-						foreach($plugin->get_errors() as $record => $message) {
+						foreach($plugin->get_errors() as $record => $message)
+						{
 							$this->message .= "<br />\n$record: $message";
 						}
-						if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+						if($count != $total_processed)
+						{
+							$this->message .= "<br />\n".lang('Some records may not have been imported');
+						}
 					}
-					if ($dst_file && $content['file']['tmp_name'] == $dst_file) {
+					if ($dst_file && $content['file']['tmp_name'] == $dst_file)
+					{
 						// Remove file
 						$cachefile->delete(Api\Cache::keys(Api\Cache::INSTANCE, 'importexport',
 							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id'])));
 						unset($dst_file);
 					}
 
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->message .= $e->getMessage();
 				}
 			}
@@ -218,7 +235,10 @@ 
 			$data['message'] = $this->message;
 			Framework::includeJS('.','importexport','importexport');
 
-			if($_GET['appname']) $readonlys['appname'] = true;
+			if($_GET['appname'])
+			{
+				$readonlys['appname'] = true;
+			}
 
 			$template->exec('importexport.importexport_import_ui.import_dialog', $data, $sel_options, $readonlys, $preserve, 2);
 		}
@@ -226,7 +246,8 @@ 
 		/**
 		* Get options for select boxes
 		*/
-		public static function get_select_options(Array $data) {
+		public static function get_select_options(Array $data)
+		{
 			$options = array(
 				'delimiter' => array(
 					''	=>	lang('From definition'),
@@ -242,17 +263,20 @@ 
 			(array)$apps = importexport_helper_functions::get_apps('import');
 			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
 
-			if($data['appname']) {
+			if($data['appname'])
+			{
 				$options['definition'] = array();
 
-				if($data['file'] && !is_array($data['file'])) {
+				if($data['file'] && !is_array($data['file']))
+				{
 					$extension = substr($data['file'], -3);
 				}
 				$definitions = new importexport_definitions_bo(array(
 					'type' => 'import',
 					'application' => $data['appname']
 				));
-				foreach ((array)$definitions->get_definitions() as $identifier) {
+				foreach ((array)$definitions->get_definitions() as $identifier)
+				{
 					try
 					{
 						$definition = new importexport_definition($identifier);
@@ -262,7 +286,8 @@ 
 						// Permission error
 						continue;
 					}
-					if ($title = $definition->get_title()) {
+					if ($title = $definition->get_title())
+					{
 						$options['definition'][$title] = $title;
 					}
 					unset($definition);
@@ -276,12 +301,15 @@ 
 		/**
 		* Get definitions via ajax
 		*/
-		public function ajax_get_definitions($appname, $file=null) {
+		public function ajax_get_definitions($appname, $file=null)
+		{
 			$options = self::get_select_options(array('appname'=>$appname, 'file'=>$file));
 			$response = new xajaxResponse();
 			$response->addScript("clear_options('exec[definition]');");
-			if(is_array($options['definition'])) {
-				foreach ($options['definition'] as $value => $title) {
+			if(is_array($options['definition']))
+			{
+				foreach ($options['definition'] as $value => $title)
+				{
 					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',false);");
 				}
 			}
@@ -317,9 +345,15 @@ 
 				for($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
 				{
 					$row_data = $import_csv->get_record();
-					if($row_data === false) break;
+					if($row_data === false)
+					{
+						break;
+					}
 					$rows[$import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'] ? 'h1' : $row] = $row_data;
-					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
+					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'])
+					{
+						$row--;
+					}
 				}
 				$preview = Api\Html::table($rows);
 				rewind($stream);
@@ -328,19 +362,26 @@ 
 			{
 				$preview = lang('Preview not supported by %1', $plugin->get_name());
 			}
-			if(count($plugin->get_warnings())) {
+			if(count($plugin->get_warnings()))
+			{
 				$this->message .= "<br />\n".lang('Warnings').':';
-				foreach($plugin->get_warnings() as $record => $message) {
+				foreach($plugin->get_warnings() as $record => $message)
+				{
 					$this->message .= "\n$record: $message";
 				}
 				$this->message .= "<br />\n";
 			};
-			if(count($plugin->get_errors())) {
+			if(count($plugin->get_errors()))
+			{
 				$this->message .= "<br />\n".lang('Problems during import:');
-				foreach($plugin->get_errors() as $record => $message) {
+				foreach($plugin->get_errors() as $record => $message)
+				{
 					$this->message .= "<br />\n$record: $message";
 				}
-				if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+				if($count != $total_processed)
+				{
+					$this->message .= "<br />\n".lang('Some records may not have been imported');
+				}
 				$this->message .= "<br />\n";
 			}
 			return '<div class="header">' . lang('Preview') . ' - ' . $plugin->get_name() . '</div>' . $preview;
@@ -365,10 +406,16 @@ 
 			$message_count = count($message);
 
 			// Only CSV files
-			if(!$options['csv_fields']) return true;
+			if(!$options['csv_fields'])
+			{
+				return true;
+			}
 
 			// Can't check if definition has no header
-			if($options['num_header_lines'] == 0) return true;
+			if($options['num_header_lines'] == 0)
+			{
+				return true;
+			}
 
 			$preference = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 			$charset = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
@@ -412,8 +459,7 @@ 
 				if($lang_defn == $lang_file ||
 					$lang_defn == mb_strtoupper($header) ||
 					$lang_file == mb_strtoupper($options['csv_fields'][$index])
-				)
-				{
+				) {
 					continue;
 				}
 

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

@@ -226,7 +226,7 @@
 		/**
 		* Get options for select boxes
 		*/
-		public static function get_select_options(Array $data) {
+		public static function get_select_options(array $data) {
 			$options = array(
 				'delimiter' => array(
 					''	=>	lang('From definition'),

Spacing +79 added lines, -79 removed lines

@@ -32,7 +32,7 @@ 
 		private $plugins;
 
 		public function __construct() {
-			$this->plugins = importexport_helper_functions::get_plugins('all','import');
+			$this->plugins = importexport_helper_functions::get_plugins('all', 'import');
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
 		}
 
@@ -49,20 +49,20 @@ 
 			$template = new etemplate_new('importexport.import_dialog');
 
 			// Load application's translations
-			if($appname)
+			if ($appname)
 			{
 				translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if ($content['import'] && $definition) {
 				try {
 					$definition_obj = new importexport_definition($content['definition']);
-					if($content['dry-run']) {
+					if ($content['dry-run']) {
 						// Set this so plugin doesn't do any data changes
 						$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 					}
-					$options =& $definition_obj->plugin_options;
+					$options = & $definition_obj->plugin_options;
 					$options['no_notification'] = $content['no_notifications'];
-					if($content['delimiter']) {
+					if ($content['delimiter']) {
 						$options['fieldsep'] =
 							$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
 					}
@@ -71,8 +71,8 @@ 
 					$plugin = new $definition_obj->plugin;
 
 					// Check file encoding matches import
-					$sample = file_get_contents($content['file']['tmp_name'],false, null, 0, 1024);
-					if($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
+					$sample = file_get_contents($content['file']['tmp_name'], false, null, 0, 1024);
+					if ($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
 					{
 						$preference = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
 					}
@@ -82,7 +82,7 @@ 
 					}
 					$required = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
 					$encoding = translation::detect_encoding($sample, $required);
-					if($encoding && strtoupper($required) != strtoupper($encoding))
+					if ($encoding && strtoupper($required) != strtoupper($encoding))
 					{
 						$this->message = lang("Encoding mismatch.  Expected %1 file, you uploaded %2.<br />\n",
 							$required,
@@ -97,37 +97,37 @@ 
 					$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 
 					// Destination if we need to hold the file
-					if($file)
+					if ($file)
 					{
 						$cachefile = new egw_cache_files(array());
 						$dst_file = $cachefile->filename(egw_cache::keys(egw_cache::INSTANCE, 'importexport',
-							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true),true);
+							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true), true);
 						// Keep file
-						if($dst_file)
+						if ($dst_file)
 						{
-							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file)) {
+							if ($content['file']['name'] && copy($content['file']['tmp_name'], $dst_file)) {
 								$preserve['file']['tmp_name'] = $dst_file;
 							}
 						}
 
 						// Check on matching columns
 						$check_message = array();
-						if(!self::check_file($file, $definition_obj, $check_message, $dst_file))
+						if (!self::check_file($file, $definition_obj, $check_message, $dst_file))
 						{
 							// Set this so plugin doesn't do any data changes
 							$content['dry-run'] = true;
 							importexport_helper_functions::$dry_run = true;
-							$this->message .= '<b>' . lang('Import aborted').":</b><br />\n";
+							$this->message .= '<b>'.lang('Import aborted').":</b><br />\n";
 							$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 						}
-						if(count($check_message))
+						if (count($check_message))
 						{
-							$this->message .= implode($check_message, "<br />\n") . "<br />\n";
+							$this->message .= implode($check_message, "<br />\n")."<br />\n";
 						}
-						if($content['dry-run'])
+						if ($content['dry-run'])
 						{
 							$preview = $this->preview($plugin, $file, $definition_obj);
-							if(trim($this->message) == '')
+							if (trim($this->message) == '')
 							{
 								// Clear first, to prevent request from being collected if the result is the same
 								$template->setElementAttribute('preview', 'value', '');
@@ -146,34 +146,34 @@ 
 						$this->message .= lang('please select file to import'."<br />\n");
 					}
 
-					if($content['dry-run'])
+					if ($content['dry-run'])
 					{
-						$this->message .= '<b>' . lang('test only').":</b><br />\n";
+						$this->message .= '<b>'.lang('test only').":</b><br />\n";
 					}
 					$this->message .= lang('%1 records processed', $count);
 
 					// Refresh opening window
-					if(!$content['dry-run'])
+					if (!$content['dry-run'])
 					{
-						egw_framework::refresh_opener(lang('%1 records processed',$count), $appname, null,null,$appname);
+						egw_framework::refresh_opener(lang('%1 records processed', $count), $appname, null, null, $appname);
 					}
 					$total_processed = 0;
-					foreach($plugin->get_results() as $action => $a_count) {
-						$this->message .= "<br />\n" . lang($action) . ": $a_count";
+					foreach ($plugin->get_results() as $action => $a_count) {
+						$this->message .= "<br />\n".lang($action).": $a_count";
 						$total_processed += $a_count;
 					}
-					if(count($plugin->get_warnings())) {
+					if (count($plugin->get_warnings())) {
 						$this->message .= "<br />\n".lang('Warnings').':';
-						foreach($plugin->get_warnings() as $record => $message) {
+						foreach ($plugin->get_warnings() as $record => $message) {
 							$this->message .= "\n$record: $message";
 						}
 					}
-					if(count($plugin->get_errors())) {
+					if (count($plugin->get_errors())) {
 						$this->message .= "<br />\n".lang('Problems during import:');
-						foreach($plugin->get_errors() as $record => $message) {
+						foreach ($plugin->get_errors() as $record => $message) {
 							$this->message .= "<br />\n$record: $message";
 						}
-						if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+						if ($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
 					}
 					if ($dst_file && $content['file']['tmp_name'] == $dst_file) {
 						// Remove file
@@ -186,7 +186,7 @@ 
 					$this->message .= $e->getMessage();
 				}
 			}
-			elseif($content['cancel'])
+			elseif ($content['cancel'])
 			{
 				$GLOBALS['egw']->js->set_onload('window.close();');
 			}
@@ -199,7 +199,7 @@ 
 				);
 			}
 
-			if(!array_key_exists('dry-run',$content))
+			if (!array_key_exists('dry-run', $content))
 			{
 				$data['dry-run'] = true;
 			}
@@ -207,14 +207,14 @@ 
 			$data['appname'] = $preserve['appname'] = $appname ? $appname : ($definition_obj ? $definition_obj->application : '');
 			$data['definition'] = $definition;
 			$data['delimiter'] = $definition_obj->plugin_options['delimiter'];
-			$data['no_notifications'] = true;	// switch notifications off by default
+			$data['no_notifications'] = true; // switch notifications off by default
 
 			$sel_options = self::get_select_options($data);
 
 			$data['message'] = $this->message;
-			$GLOBALS['egw']->js->validate_file('.','importexport','importexport');
+			$GLOBALS['egw']->js->validate_file('.', 'importexport', 'importexport');
 
-			if($_GET['appname']) $readonlys['appname'] = true;
+			if ($_GET['appname']) $readonlys['appname'] = true;
 
 			$template->exec('importexport.importexport_import_ui.import_dialog', $data, $sel_options, $readonlys, $preserve, 2);
 		}
@@ -236,12 +236,12 @@ 
 			);
 
 			(array)$apps = importexport_helper_functions::get_apps('import');
-			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
+			$options['appname'] = array('' => lang('Select one')) + array_combine($apps, $apps);
 
-			if($data['appname']) {
+			if ($data['appname']) {
 				$options['definition'] = array();
 
-				if($data['file'] && !is_array($data['file'])) {
+				if ($data['file'] && !is_array($data['file'])) {
 					$extension = substr($data['file'], -3);
 				}
 				$definitions = new importexport_definitions_bo(array(
@@ -272,11 +272,11 @@ 
 		/**
 		* Get definitions via ajax
 		*/
-		public function ajax_get_definitions($appname, $file=null) {
+		public function ajax_get_definitions($appname, $file = null) {
 			$options = self::get_select_options(array('appname'=>$appname, 'file'=>$file));
 			$response = new xajaxResponse();
 			$response->addScript("clear_options('exec[definition]');");
-			if(is_array($options['definition'])) {
+			if (is_array($options['definition'])) {
 				foreach ($options['definition'] as $value => $title) {
 					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',false);");
 				}
@@ -294,28 +294,28 @@ 
 		 * @param importexport_definition $definition
 		 * @return String HTML fragment illustrating how the data will be understood by egw
 		 */
-		protected function preview(importexport_iface_import_plugin &$plugin, &$stream, importexport_definition &$definition_obj)
+		protected function preview(importexport_iface_import_plugin&$plugin, &$stream, importexport_definition&$definition_obj)
 		{
-			if(method_exists($plugin, 'preview'))
+			if (method_exists($plugin, 'preview'))
 			{
 				$preview = $plugin->preview($stream, $definition_obj);
 			}
-			elseif($definition_obj->plugin_options['csv_fields'])
+			elseif ($definition_obj->plugin_options['csv_fields'])
 			{
-				$import_csv = new importexport_import_csv( $stream, array(
+				$import_csv = new importexport_import_csv($stream, array(
 					'fieldsep' => $definition_obj->plugin_options['fieldsep'],
 					'charset' => $definition_obj->plugin_options['charset'],
 				));
 				// set FieldMapping.
 				$import_csv->mapping = $definition_obj->plugin_options['field_mapping'];
 
-				$rows = array('h1'=>array(),'f1'=>array(),'.h1'=>'class=th');
-				for($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
+				$rows = array('h1'=>array(), 'f1'=>array(), '.h1'=>'class=th');
+				for ($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
 				{
 					$row_data = $import_csv->get_record();
-					if($row_data === false) break;
+					if ($row_data === false) break;
 					$rows[$import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'] ? 'h1' : $row] = $row_data;
-					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
+					if ($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
 				}
 				$preview = html::table($rows);
 				rewind($stream);
@@ -324,22 +324,22 @@ 
 			{
 				$preview = lang('Preview not supported by %1', $plugin->get_name());
 			}
-			if(count($plugin->get_warnings())) {
+			if (count($plugin->get_warnings())) {
 				$this->message .= "<br />\n".lang('Warnings').':';
-				foreach($plugin->get_warnings() as $record => $message) {
+				foreach ($plugin->get_warnings() as $record => $message) {
 					$this->message .= "\n$record: $message";
 				}
 				$this->message .= "<br />\n";
 			};
-			if(count($plugin->get_errors())) {
+			if (count($plugin->get_errors())) {
 				$this->message .= "<br />\n".lang('Problems during import:');
-				foreach($plugin->get_errors() as $record => $message) {
+				foreach ($plugin->get_errors() as $record => $message) {
 					$this->message .= "<br />\n$record: $message";
 				}
-				if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+				if ($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
 				$this->message .= "<br />\n";
 			}
-			return '<div class="header">' . lang('Preview') . ' - ' . $plugin->get_name() . '</div>' . $preview;
+			return '<div class="header">'.lang('Preview').' - '.$plugin->get_name().'</div>'.$preview;
 		}
 
 		/**
@@ -357,24 +357,24 @@ 
 		 */
 		public static function check_file(&$file, &$definition, &$message = array(), $dst_file = false)
 		{
-			$options =& $definition->plugin_options;
+			$options = & $definition->plugin_options;
 			$message_count = count($message);
 
 			// Only CSV files
-			if(!$options['csv_fields']) return true;
+			if (!$options['csv_fields']) return true;
 
 			// Can't check if definition has no header
-			if($options['num_header_lines'] == 0) return true;
+			if ($options['num_header_lines'] == 0) return true;
 
 			$preference = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 			$charset = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
 
 			$data = fgetcsv($file, 8000, $options['fieldsep']);
 			rewind($file);
-			$data = translation::convert($data,$charset);
+			$data = translation::convert($data, $charset);
 
 			$ok = true;
-			if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
+			if (count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
 			{
 				$message[] = lang("Column mismatch.  Expected %1 columns, your file has %2.",
 					count($options['field_mapping']),
@@ -382,9 +382,9 @@ 
 				);
 				$ok = false;
 			}
-			foreach($data as $index => $header)
+			foreach ($data as $index => $header)
 			{
-				if($index < count($options['csv_fields']) && !$options['field_mapping'][$index])
+				if ($index < count($options['csv_fields']) && !$options['field_mapping'][$index])
 				{
 					// Skipped column in definition
 					continue;
@@ -396,16 +396,16 @@ 
 				}
 
 				// Check for matching headers
-				if($options['csv_fields'][$index] == $header)
+				if ($options['csv_fields'][$index] == $header)
 				{
 					// Simple match
 					continue;
 				}
 				// Check column headers, taking into account different translations - make sure no *
-				$lang_defn = mb_strtoupper(translation::translate($options['csv_fields'][$index],false,''));
-				$lang_file = mb_strtoupper(translation::translate($header,false,''));
+				$lang_defn = mb_strtoupper(translation::translate($options['csv_fields'][$index], false, ''));
+				$lang_file = mb_strtoupper(translation::translate($header, false, ''));
 
-				if($lang_defn == $lang_file ||
+				if ($lang_defn == $lang_file ||
 					$lang_defn == mb_strtoupper($header) ||
 					$lang_file == mb_strtoupper($options['csv_fields'][$index])
 				)
@@ -417,7 +417,7 @@ 
 				$file_message_id = translation::get_message_id($header, $definition->application);
 				$defn_message_id = translation::get_message_id($options['csv_fields'][$index], $definition->application);
 
-				if($file_message_id && $defn_message_id && $file_message_id == $defn_message_id)
+				if ($file_message_id && $defn_message_id && $file_message_id == $defn_message_id)
 				{
 					continue;
 				}
@@ -425,19 +425,19 @@ 
 
 				// Problem
 				$message[] = lang("Column mismatch: %1 should be %2, not %3",
-					$index,$options['csv_fields'][$index], $header);
+					$index, $options['csv_fields'][$index], $header);
 				// But can still continue
 				// $ok = false;
 			}
-			if(!$ok || count($message) != $message_count)
+			if (!$ok || count($message) != $message_count)
 			{
 				// Add links for new / edit definition
 				$config = config::read('importexport');
-				if($GLOBALS['egw_info']['user']['apps']['admin'] || $config['users_create_definitions'])
+				if ($GLOBALS['egw_info']['user']['apps']['admin'] || $config['users_create_definitions'])
 				{
 					$actions = '';
 					// New definition
-					$add_link = egw::link('/index.php',array(
+					$add_link = egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_definitions_ui.edit',
 						'application' => $definition->application,
 						'plugin' => $definition->plugin,
@@ -449,13 +449,13 @@ 
 							'menuaction' => 'importexport.importexport_import_ui.import_dialog',
 							// Don't set appname, or user won't be able to select & see their new definition
 							//'appname' => $definition->application,
-						)) . "';
+						))."';
 						egw_openWindowCentered2('$add_link','_blank',500,500,'yes');
 					";
 					$actions[] = lang('Create a <a href="%1">new definition</a> for this file', $add_link);
 
 					// Edit selected definition, if allowed
-					if($definition->owner == $GLOBALS['egw_info']['user']['account_id'] ||
+					if ($definition->owner == $GLOBALS['egw_info']['user']['account_id'] ||
 						!$definition->owner && $GLOBALS['egw_info']['user']['apps']['admin'])
 					{
 						$edit_link = array(
@@ -464,20 +464,20 @@ 
 							// Jump to file step
 							'step' => 'wizard_step21'
 						);
-						if($dst_file)
+						if ($dst_file)
 						{
 							// Still have uploaded file, jump there
-							$GLOBALS['egw']->session->appsession('csvfile','',$dst_file);
+							$GLOBALS['egw']->session->appsession('csvfile', '', $dst_file);
 							$edit_link['step'] = 'wizard_step30';
 						}
-						$edit_link = egw::link('/index.php',$edit_link);
+						$edit_link = egw::link('/index.php', $edit_link);
 						$edit_link = "javascript:egw_openWindowCentered2('$edit_link','_blank',500,500,'yes')";
 						$actions[] = lang('Edit definition <a href="%1">%2</a> to match your file',
-							$edit_link, $definition->name );
+							$edit_link, $definition->name);
 					}
-					$actions[] = lang('Edit your file to match the definition:') . ' '
-					. implode(array_map('lang',array_intersect_key($options['csv_fields'],$options['field_mapping'])),', ');
-					$message[] = "\n<li>".implode($actions,"\n<li>");
+					$actions[] = lang('Edit your file to match the definition:').' '
+					. implode(array_map('lang', array_intersect_key($options['csv_fields'], $options['field_mapping'])), ', ');
+					$message[] = "\n<li>".implode($actions, "\n<li>");
 				}
 			}
 			return $ok;

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 +77 added lines, -77 removed lines

@@ -14,19 +14,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(
@@ -52,14 +52,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
@@ -109,8 +109,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'],
 		));
@@ -120,7 +120,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();
@@ -141,9 +141,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);
 		}
@@ -168,18 +168,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;
@@ -187,34 +187,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 = translation::get_message_id($record['info_type'],'infolog');
-				if($record['info_type'] && $this->boinfolog->enums['type'][$un_trans])
+				$un_trans = 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.',
@@ -231,51 +231,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;
 
@@ -290,14 +290,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;
@@ -310,7 +310,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' :
@@ -319,7 +319,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']);
 				}
@@ -327,19 +327,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_id) = explode(':', $_data['link_custom'],2);
+						list($app, $app_id) = explode(':', $_data['link_custom'], 2);
 						$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 					}
 
@@ -347,12 +347,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']),
@@ -375,17 +375,17 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if (!is_numeric($result)) {
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
-				list($app, $app_id) = explode(':', $_data[$field],2);
+		foreach (self::$special_fields as $field => $desc) {
+			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);
 				}
@@ -396,14 +396,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 = egw_link::link('infolog',$id,$app,$app_id);
+				$link_id = egw_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;
 				}
 			}
@@ -530,18 +530,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 = config::get_customfields($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;
@@ -550,23 +550,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(egw_link::get_registry($app, 'query'))
+			if (egw_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 = egw_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

@@ -14,7 +14,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
@@ -109,7 +110,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'],
@@ -141,9 +143,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);
 		}
@@ -168,11 +173,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;
 
@@ -187,7 +196,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']])
@@ -228,7 +240,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;
@@ -253,27 +268,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() ));
 							}
@@ -284,7 +314,10 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
 			}
 			else
@@ -292,11 +325,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);
 			}
 		}
@@ -310,16 +348,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']);
 				}
@@ -327,13 +368,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
@@ -345,7 +388,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']
@@ -375,13 +420,19 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if(!is_numeric($result))
+		{
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
+		foreach(self::$special_fields as $field => $desc)
+		{
+			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
@@ -389,11 +440,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 = egw_link::link('infolog',$id,$app,$app_id);
@@ -416,7 +470,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog CSV import');
 	}
 
@@ -425,7 +480,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.");
 	}
 
@@ -434,7 +490,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -450,7 +507,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -459,7 +517,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -471,7 +530,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -483,7 +543,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -495,7 +556,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 	// end of iface_export_plugin
@@ -505,7 +567,10 @@ 
 	{
 		static $boprojects;
 
-		if (!$num_or_title) return false;
+		if (!$num_or_title)
+		{
+			return false;
+		}
 
 		if (!is_object($boprojects))
 		{
@@ -550,12 +615,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(egw_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 +39 added lines, -39 removed lines

@@ -127,9 +127,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;
 	}
 
 	/**
@@ -141,23 +141,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'];
 	}
@@ -169,22 +169,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']]),
-				common::grab_owner_name($this->infolog->user),$this->datetime('now'));
+			return lang('New %1 created by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
+				common::grab_owner_name($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']]),
 				common::grab_owner_name($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']]),
 			common::grab_owner_name($data['info_modifier']),
 			$this->datetime($data['info_datemodified']));
 	}
@@ -196,14 +196,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[] = common::grab_owner_name($uid);
 			}
@@ -212,31 +212,31 @@ 
 		{
 			$id = ' #'.$data['info_id'];
 		}
-		foreach(array(
+		foreach (array(
 			'info_type'      => lang($this->infolog->enums['type'][$data['info_type']]).$id,
 			'info_from'      => $data['info_from'],
 			'info_addr'      => $data['info_addr'],
 			'info_cat'       => $data['info_cat'] ? $GLOBALS['egw']->categories->id2name($data['info_cat']) : '',
 			'info_priority'  => lang($this->infolog->enums['priority'][$data['info_priority']]),
 			'info_owner'     => common::grab_owner_name($data['info_owner']),
-			'info_status'    => lang($data['info_status']=='deleted'?'deleted':$this->infolog->status[$data['info_type']][$data['info_status']]),
+			'info_status'    => lang($data['info_status'] == 'deleted' ? 'deleted' : $this->infolog->status[$data['info_type']][$data['info_status']]),
 			'info_percent'   => (int)$data['info_percent'].'%',
 			'info_datecompleted' => $data['info_datecompleted'] ? $this->datetime($data['info_datecompleted']) : '',
 			'info_location'  => $data['info_location'],
-			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'],null) : '',
-			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'],null) : '',
-			'info_responsible' => implode(', ',$responsible),
+			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'], null) : '',
+			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'], null) : '',
+			'info_responsible' => implode(', ', $responsible),
 			'info_subject'   => $data['info_subject'],
 		) as $name => $value)
 		{
 			//error_log(__METHOD__.__LINE__.' Key:'.$name.' val:'.array2string($value));
-			if ($name=='info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
+			if ($name == 'info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
 			{
 				$lkeys = array_keys($data['link_to']['to_id']);
-				if (in_array($data['info_contact'],$lkeys))
+				if (in_array($data['info_contact'], $lkeys))
 				{
-					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = egw_link::title($app,$id);
+					list($app, $id) = explode(':', $data['info_contact']);
+					if (!empty($app) && !empty($id)) $value = egw_link::title($app, $id);
 				}
 			}
 			$details[$name] = array(
@@ -268,7 +268,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'];
@@ -277,23 +277,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;
 		}
@@ -311,16 +311,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
 				{
@@ -329,7 +329,7 @@ 
 				break;
 			case self::CUSTOM_NOTIFICATION:
 				$info_config = config::read('infolog');
-				if(!$info_config[self::CUSTOM_NOTIFICATION])
+				if (!$info_config[self::CUSTOM_NOTIFICATION])
 				{
 					return '';
 				}
@@ -338,7 +338,7 @@ 
 				$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
 
 				// Disabled
-				if(!$type_config['use_custom'] && !$global['use_custom']) return '';
+				if (!$type_config['use_custom'] && !$global['use_custom']) return '';
 
 				// Type or globabl
 				$config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];

Braces +22 added lines, -5 removed lines

@@ -171,7 +171,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')
 		{
@@ -236,14 +240,20 @@ 
 				if (in_array($data['info_contact'],$lkeys))
 				{
 					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = egw_link::title($app,$id);
+					if (!empty($app)&&!empty($id))
+					{
+						$value = egw_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'],
@@ -317,7 +327,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']);
@@ -338,7 +352,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'];