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) {

Braces +178 added lines, -70 removed lines

@@ -98,22 +98,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 Api\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(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if(!Api\Storage\Merge::is_export_limit_excepted())
+		{
 			$this->export_limit = Api\Storage\Merge::getExportLimit($_options['appname']);
 			//error_log(__METHOD__.__LINE__.' app:'.$_options['appname'].' limit:'.$this->export_limit);
-			if($this->export_limit == 'no') throw new Api\Exception\NoPermission\Admin('Export disabled');
+			if($this->export_limit == 'no')
+			{
+				throw new Api\Exception\NoPermission\Admin('Export disabled');
+			}
 		}
 	}
 	
@@ -122,15 +132,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 = Api\Storage\Customfields::get($_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;
 			}
 		}
@@ -143,7 +157,8 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion( array $_conversion)
+	{
 		$this->conversion = $_conversion;
 	}
 	
@@ -153,16 +168,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'])
@@ -180,11 +202,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) {
 						Api\Translation::add_app($appname);
-						foreach($this->mapping as $field => &$label) {
+						foreach($this->mapping as $field => &$label)
+						{
 							$label = lang($label);
 						}
 					}
@@ -195,20 +222,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];
 			}
 		}
@@ -222,7 +253,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_num_of_records() {
+	public function get_num_of_records()
+	{
 		return $this->num_of_records;
 	}
 
@@ -236,14 +268,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 = Api\Storage\Customfields::get($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;
@@ -254,7 +292,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;
 					}
@@ -269,7 +308,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'];
 					}
@@ -288,9 +328,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);
 			}
@@ -299,7 +342,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;
@@ -307,8 +353,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]);
 				}
@@ -316,16 +364,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 = is_string($record->$name) ? explode(',', $record->$name) : $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]);
 				}
 			}
@@ -334,9 +388,12 @@ 
 				$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 = 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']);
@@ -355,16 +412,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[] = Api\Accounts::username($_name);
 					}
 					$record->$name = implode(', ', $names);
-				} else {
+				}
+				else
+				{
 					$record->$name = Api\Accounts::username($record->$name);
 				}
 			}
@@ -373,23 +436,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)
 		{
@@ -397,7 +486,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 != '')
@@ -413,17 +505,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 Api\Categories(false,$appname);
-		foreach((array)$fields['select-cat'] as $name) {
-			if($record->$name) {
+		if(is_null($cat_object))
+		{
+			$cat_object = new Api\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(Acl::READ,$cat_id))
 					{
@@ -444,7 +546,8 @@ 
 	 *
 	 * @return
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		
 	}
 
@@ -457,11 +560,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;
 		}

Spacing +77 added lines, -77 removed lines

@@ -98,22 +98,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 Api\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(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if (!Api\Storage\Merge::is_export_limit_excepted()) {
 			$this->export_limit = Api\Storage\Merge::getExportLimit($_options['appname']);
 			//error_log(__METHOD__.__LINE__.' app:'.$_options['appname'].' limit:'.$this->export_limit);
-			if($this->export_limit == 'no') throw new Api\Exception\NoPermission\Admin('Export disabled');
+			if ($this->export_limit == 'no') throw new Api\Exception\NoPermission\Admin('Export disabled');
 		}
 	}
 	
@@ -122,15 +122,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 = Api\Storage\Customfields::get($_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;
 			}
 		}
@@ -143,7 +143,7 @@ 
 	 *
 	 * @param array $_conversion
 	 */
-	public function set_conversion( array $_conversion) {
+	public function set_conversion(array $_conversion) {
 		$this->conversion = $_conversion;
 	}
 	
@@ -153,59 +153,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) {
 						Api\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) {
@@ -213,7 +213,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++;
 	}
 
@@ -237,13 +237,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 = Api\Storage\Customfields::get($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;
@@ -254,7 +254,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;
 					}
@@ -268,8 +268,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'];
 					}
@@ -289,17 +289,17 @@ 
 	 * @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]) {
+		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;
@@ -307,8 +307,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]);
 				}
@@ -316,12 +316,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 = is_string($record->$name) ? explode(',', $record->$name) : $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);
@@ -334,18 +334,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 = 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 = Link::title($links[$name], $record->$name);
 				}
-				else if ( is_array($record->$name) && $record->$name['app'] && $record->$name['id'])
+				else if (is_array($record->$name) && $record->$name['app'] && $record->$name['id'])
 				{
 					$record->$name = Link::title($record->$name['app'], $record->$name['id']);
 				}
@@ -355,12 +355,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[] = Api\Accounts::username($_name);
 					}
 					$record->$name = implode(', ', $names);
@@ -373,64 +373,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 Api\Categories(false,$appname);
-		foreach((array)$fields['select-cat'] as $name) {
-			if($record->$name) {
+		if (is_null($cat_object)) $cat_object = new Api\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(Acl::READ,$cat_id))
+					if ($cat_id && $cat_object->check_perms(Acl::READ, $cat_id))
 					{
 						$cats[] = $cat_object->id2name($cat_id);
 					}
 				}
-				$record->$name = implode(', ',$cats);
+				$record->$name = implode(', ', $cats);
 			}
 			else
 			{
@@ -457,18 +457,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);
 			

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

@@ -32,19 +32,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),
         );
 
 	/**
@@ -85,22 +85,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
@@ -111,11 +111,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;
@@ -126,11 +126,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;
@@ -138,15 +138,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]);
@@ -157,59 +157,59 @@ 
 
 			// 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] == ' ')
+			if ($account_lids[$key + 1][0] == ' ')
 			{
 				$query = array('type' => 'accounts', 'query_type' => 'exact');
-				$given = $GLOBALS['egw']->accounts->search($query + array('query' => trim($account_lids[$key+1])));
+				$given = $GLOBALS['egw']->accounts->search($query + array('query' => trim($account_lids[$key + 1])));
 				$family = $GLOBALS['egw']->accounts->search($query + array('query' => trim($account_lid)));
 				$ids = array_intersect_key($family, $given);
-				if($ids)
+				if ($ids)
 				{
 					$account_ids[] = key($ids);
 					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'))));
 			}
 			// Group <name> (no comma)
-			else if(strpos($account_lid, lang('Group')) === 0)
+			else if (strpos($account_lid, lang('Group')) === 0)
 			{
 				$account_lid = trim(substr(trim($account_lid), 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
 
@@ -219,14 +219,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
 
 	/**
@@ -235,12 +235,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[] = Api\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[] = Api\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
 
 	/**
@@ -251,24 +251,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 Api\Categories();	// uses current user and app (egw_info[flags][currentapp])
+	public static function cat_name2id($_cat_names, $parent = 0) {
+		$cats = new Api\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
 
@@ -307,76 +307,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;
 		}
@@ -390,42 +390,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!');
 		}
 	}
 
@@ -436,23 +436,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 = Api\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 Api\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;
@@ -461,25 +461,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;
@@ -495,7 +495,7 @@ 
 			$d->close();
 
 			$config = Api\Config::read('importexport');
-			if($config['update'] == 'auto') {
+			if ($config['update'] == 'auto') {
 				self::load_defaults($appname);
 			}
 		}
@@ -510,37 +510,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) {
 
 	}
 
@@ -551,24 +551,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 = Api\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 !empty($definitions[$appname]);
@@ -578,11 +578,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) {
@@ -614,13 +614,13 @@ 
 			$plugin = is_object($plugin_name) ? $plugin_name : new $plugin_name();
 			$plugin_name = get_class($plugin);
 
-			if($record_classname == null) $record_classname = $plugin::get_egw_record_class();
-			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
+			if ($record_classname == null) $record_classname = $plugin::get_egw_record_class();
+			if (!class_exists($record_classname)) throw new Exception('Bad class name '.$record_classname);
 
-			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;
 			}
 		}
@@ -632,16 +632,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,
@@ -652,21 +652,21 @@ 
 		}
 		// Add custom fields
 		$custom = Api\Storage\Customfields::get($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
@@ -689,7 +689,7 @@ 
 			}
 		}
 
-		if(method_exists($plugin, 'get_filter_fields'))
+		if (method_exists($plugin, 'get_filter_fields'))
 		{
 			$plugin->get_filter_fields($fields);
 		}
@@ -705,65 +705,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 +208 added lines, -82 removed lines

@@ -16,7 +16,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)
@@ -85,13 +86,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;
@@ -111,12 +118,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;
 	}
@@ -126,11 +139,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;
@@ -138,7 +154,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;
@@ -183,19 +200,22 @@ 
 				$account_lid = trim(substr(trim($account_lid), 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]);
@@ -219,10 +239,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;
 			}
 		}
@@ -235,9 +258,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[] = Api\Categories::id2name( (int)$cat_id );
 		}
 		return is_array( $_cat_ids ) ? $cat_names : implode(',',(array)$cat_names);
@@ -251,14 +276,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 Api\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,
@@ -307,8 +338,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;
 
@@ -320,15 +355,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
@@ -338,19 +379,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,
@@ -358,12 +403,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,
@@ -390,11 +437,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 ) );
@@ -404,22 +453,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] ) );
@@ -436,7 +491,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 = Api\Cache::getTree(
 			__CLASS__,
 			'plugins',
@@ -449,38 +505,63 @@ 
 
 		// Testing: comment out Api\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;
 						}
@@ -495,7 +576,8 @@ 
 			$d->close();
 
 			$config = Api\Config::read('importexport');
-			if($config['update'] == 'auto') {
+			if($config['update'] == 'auto')
+			{
 				self::load_defaults($appname);
 			}
 		}
@@ -509,38 +591,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 )
+	{
 
 	}
 
@@ -551,7 +651,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 = Api\Cache::getSession(
 			__CLASS__,
 			'has_definitions',
@@ -565,27 +666,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 !empty($definitions[$appname]);
 	}
 
 	// 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) {
+		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;
@@ -614,13 +724,22 @@ 
 			$plugin = is_object($plugin_name) ? $plugin_name : new $plugin_name();
 			$plugin_name = get_class($plugin);
 
-			if($record_classname == null) $record_classname = $plugin::get_egw_record_class();
-			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
+			if($record_classname == null)
+			{
+				$record_classname = $plugin::get_egw_record_class();
+			}
+			if(!class_exists($record_classname))
+			{
+				throw new Exception('Bad class name ' . $record_classname);
+			}
 
 			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;
 			}
 		}
@@ -640,7 +759,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(
@@ -658,14 +780,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_export_record.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	 * destructor
 	 *
 	 * @return 
-	 */
+	 void
 	public function __destruct( );
 
 } // end of iface_export_record

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 	
 	/**
 	 * exports a record into resource of handle
@@ -41,7 +41,7 @@ 
 	 * @param object of interface egw_record _record
 	 * @return bool
 	 */
-	public function export_record( importexport_iface_egw_record $_record );
+	public function export_record(importexport_iface_egw_record $_record);
 
 	/**
 	 * Retruns total number of exported records.

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

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.

Spacing +2 added lines, -2 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
@@ -79,7 +79,7 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl(importexport_definition &$definition=null);
+	public function get_options_etpl(importexport_definition &$definition = null);
 
 	/**
 	 * returns etemplate name for slectors of this plugin

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 )) {

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

@@ -83,10 +83,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
@@ -103,20 +103,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();
 		}
 		
@@ -128,9 +128,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);
 		}
 	}
 	
@@ -140,7 +140,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) {
@@ -154,7 +154,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;
 				}
@@ -235,7 +235,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;
@@ -247,7 +247,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;
 		}
@@ -264,25 +264,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
 			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);
 			}
 			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;
@@ -290,9 +290,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]);
 				}
@@ -300,26 +300,26 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		if($fields) {
-			foreach((array)$fields['select'] as $name) {
+		if ($fields) {
+			foreach ((array)$fields['select'] as $name) {
 				$record[$name] = static::find_select_key($record[$name], $selects[$name]);
 			}
 			
-			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 = 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;
@@ -328,11 +328,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)
@@ -345,7 +345,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);
@@ -353,17 +353,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
@@ -371,24 +371,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] = (strtolower($record[$name]) == strtolower(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 = Api\DateTime::createFromFormat(
-							'!'.Api\DateTime::$user_dateformat . ' ' .Api\DateTime::$user_timeformat,
+							'!'.Api\DateTime::$user_dateformat.' '.Api\DateTime::$user_timeformat,
 							$record[$name],
 							Api\DateTime::$user_timezone
 						);
 
-						if(!$formatted && $errors = Api\DateTime::getLastErrors())
+						if (!$formatted && $errors = Api\DateTime::getLastErrors())
 						{
 							// Try again, without time
 							$formatted = Api\DateTime::createFromFormat(
@@ -397,70 +397,70 @@ 
 								Api\DateTime::$user_timezone
 							);
 							
-							if(!$formatted && $errors = Api\DateTime::getLastErrors())
+							if (!$formatted && $errors = Api\DateTime::getLastErrors())
 							{
 								// Try again, anything goes
 								try {
 									$formatted = new Api\DateTime($record[$name]);
 								} catch (Exception $e) {
-									$warnings[] = $name.': ' . $e->getMessage() . "\n" .
-										'Format: '.'!'.Api\DateTime::$user_dateformat . ' ' .Api\DateTime::$user_timeformat;
+									$warnings[] = $name.': '.$e->getMessage()."\n".
+										'Format: '.'!'.Api\DateTime::$user_dateformat.' '.Api\DateTime::$user_timeformat;
 									continue;
 								}
 								$errors = Api\DateTime::getLastErrors();
-								foreach($errors['errors'] as $char => $msg)
+								foreach ($errors['errors'] as $char => $msg)
 								{
 									$warnings[] = "$name: [$char] $msg\n".
-										'Format: '.'!'.Api\DateTime::$user_dateformat . ' ' .Api\DateTime::$user_timeformat;
+										'Format: '.'!'.Api\DateTime::$user_dateformat.' '.Api\DateTime::$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] = Api\DateTime::server2user($record[$name],'ts');
+							$record[$name] = Api\DateTime::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 = Api\DateTime::createFromFormat('!'.Api\DateTime::$user_dateformat, $record[$name]);
-						if($formatted && $errors = Api\DateTime::getLastErrors() && $errors['error_count'] == 0)
+						if ($formatted && $errors = Api\DateTime::getLastErrors() && $errors['error_count'] == 0)
 						{
 							$record[$name] = $formatted->getTimestamp();
 						}
 					}
-					$record[$name] = Api\DateTime::server2user($record[$name],'ts');
-					if(is_array(self::$cf_parse_cache[$appname][0]['date']) &&
+					$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'])) {
 						// 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])));
@@ -468,23 +468,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 Api\Categories('',$appname);
-			foreach((array)$fields['select-cat'] as $name) {
-				if($record[$name]) {
+			$categories = new Api\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;
 						}
@@ -493,14 +493,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);
 	}
 
 	/**
@@ -514,36 +514,36 @@ 
 	 */
 	protected static function find_select_key($record_value, $selects)
 	{
-		if($record_value != null && is_array($selects)) {
-			if(is_array($record_value) || is_string($record_value) && strpos($record_value, ',') !== FALSE)
+		if ($record_value != null && is_array($selects)) {
+			if (is_array($record_value) || is_string($record_value) && strpos($record_value, ',') !== FALSE)
 			{
 				// Array, or CSV
 				$key = array();
-				$subs = explode(',',$record_value);
-				for($sub_index = 0; $sub_index < count($subs); $sub_index++)
+				$subs = explode(',', $record_value);
+				for ($sub_index = 0; $sub_index < count($subs); $sub_index++)
 				{
 					$sub_key = static::find_select_key(trim($subs[$sub_index]), $selects);
-					if(!$sub_key)
+					if (!$sub_key)
 					{
-						$sub_key = static::find_select_key(trim($subs[$sub_index]).','.trim($subs[$sub_index+1]), $selects);
-						if($sub_key) $sub_index++;
+						$sub_key = static::find_select_key(trim($subs[$sub_index]).','.trim($subs[$sub_index + 1]), $selects);
+						if ($sub_key) $sub_index++;
 					}
-					if($sub_key)
+					if ($sub_key)
 					{
 						$key[] = $sub_key;
 					}
 				}
 				return $key;
 			}
-			$key = array_search(strtolower($record_value), array_map('strtolower',$selects));
-			if($key !== false)
+			$key = array_search(strtolower($record_value), array_map('strtolower', $selects));
+			if ($key !== false)
 			{
 				$record_value = $key;
 			}
 			else
 			{
-				$key = array_search(strtolower($record_value), array_map('strtolower',array_map('lang',$selects)));
-				if($key !== false) $record_value = $key;
+				$key = array_search(strtolower($record_value), array_map('strtolower', array_map('lang', $selects)));
+				if ($key !== false) $record_value = $key;
 			}
 		}
 

Braces +147 added lines, -62 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,12 +347,15 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		if($fields) {
-			foreach((array)$fields['select'] as $name) {
+		if($fields)
+		{
+			foreach((array)$fields['select'] as $name)
+			{
 				$record[$name] = static::find_select_key($record[$name], $selects[$name]);
 			}
 			
-			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
@@ -347,15 +397,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])))
@@ -363,20 +417,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] = (strtolower($record[$name]) == strtolower(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
@@ -402,7 +462,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;
@@ -424,7 +485,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]);
 					}
@@ -434,7 +496,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
@@ -448,7 +511,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]);
 					}
@@ -460,26 +524,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)
 					{
@@ -493,7 +568,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;
+						}
 					}
 				}
 			}
@@ -514,7 +592,8 @@ 
 	 */
 	protected static function find_select_key($record_value, $selects)
 	{
-		if($record_value != null && is_array($selects)) {
+		if($record_value != null && is_array($selects))
+		{
 			if(is_array($record_value) || is_string($record_value) && strpos($record_value, ',') !== FALSE)
 			{
 				// Array, or CSV
@@ -526,7 +605,10 @@ 
 					if(!$sub_key)
 					{
 						$sub_key = static::find_select_key(trim($subs[$sub_index]).','.trim($subs[$sub_index+1]), $selects);
-						if($sub_key) $sub_index++;
+						if($sub_key)
+						{
+							$sub_index++;
+						}
 					}
 					if($sub_key)
 					{
@@ -543,7 +625,10 @@ 
 			else
 			{
 				$key = array_search(strtolower($record_value), array_map('strtolower',array_map('lang',$selects)));
-				if($key !== false) $record_value = $key;
+				if($key !== false)
+				{
+					$record_value = $key;
+				}
 			}
 		}
 

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)

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'),

Indentation +4 added lines, -4 removed lines

@@ -40,8 +40,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'];
@@ -223,8 +223,8 @@ 
 		}
 
 		/**
-		* Get options for select boxes
-		*/
+		 * Get options for select boxes
+		 */
 		public static function get_select_options(Array $data) {
 			$options = array(
 				'delimiter' => array(

Spacing +80 added lines, -80 removed lines

@@ -36,7 +36,7 @@ 
 		private $plugins;
 
 		public function __construct() {
-			$this->plugins = importexport_helper_functions::get_plugins('all','import');
+			$this->plugins = importexport_helper_functions::get_plugins('all', 'import');
 		}
 
 		/**
@@ -52,29 +52,29 @@ 
 			$template = new Etemplate('importexport.import_dialog');
 			$preserve = array();
 
-			if($definition)
+			if ($definition)
 			{
 				$definition_obj = new importexport_definition($content['definition']);
 			}
 
 			// Load application's translations
-			if($appname)
+			if ($appname)
 			{
 				Api\Translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if ($content['import'] && $definition) {
 				try {
-					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'];
 					}
-					$options = array_merge($options, array_diff_key($content, array_flip(array('dry-run','file','import'))));
+					$options = array_merge($options, array_diff_key($content, array_flip(array('dry-run', 'file', 'import'))));
 					$definition_obj->plugin_options = $options;
 
 					$plugin = new $definition_obj->plugin;
@@ -82,7 +82,7 @@ 
 					// Check file encoding matches import
 					$sample = mb_substr(file_get_contents($content['file']['tmp_name'], false, null, 0, 2048), 1024);
 
-					if($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
+					if ($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
 					{
 						$preference = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
 					}
@@ -92,7 +92,7 @@ 
 					}
 					$required = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
 					$encoding = Api\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,
@@ -107,37 +107,37 @@ 
 					$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 
 					// Destination if we need to hold the file
-					if($file)
+					if ($file)
 					{
 						$cachefile = new Api\Cache\Files(array());
 						$dst_file = $cachefile->filename(Api\Cache::keys(Api\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', '');
@@ -156,34 +156,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'])
 					{
-						Framework::refresh_opener(lang('%1 records processed',$count), $appname, null,null,$appname);
+						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 .= "<br />\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
@@ -198,7 +198,7 @@ 
 					$this->message .= $e->getMessage();
 				}
 			}
-			elseif($content['cancel'])
+			elseif ($content['cancel'])
 			{
 				egw_framework::set_onload('window.close();');
 			}
@@ -211,7 +211,7 @@ 
 				);
 			}
 
-			if(!array_key_exists('dry-run',$content))
+			if (!array_key_exists('dry-run', $content))
 			{
 				$data['dry-run'] = true;
 			}
@@ -219,20 +219,20 @@ 
 			$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);
 			$readonlys = array();
 
-			if(!$definition_obj && $sel_options['definition'] && !$data['definition'])
+			if (!$definition_obj && $sel_options['definition'] && !$data['definition'])
 			{
 				$definition_obj = new importexport_definition(key($sel_options['definition']));
 			}
-			if($definition_obj)
+			if ($definition_obj)
 			{
 				$plugin = new $definition_obj->plugin;
 				$options = $plugin->get_options_etpl($definition_obj);
-				if(is_array($options))
+				if (is_array($options))
 				{
 					$data['plugin_options_template'] = $options['name'];
 					$data += (array)$options['content'];
@@ -249,9 +249,9 @@ 
 			}
 
 			$data['message'] = $this->message;
-			Framework::includeJS('.','importexport','importexport');
+			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);
 		}
@@ -273,12 +273,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(
@@ -318,26 +318,26 @@ 
 		 */
 		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 = Api\Html::table($rows);
 				rewind($stream);
@@ -346,22 +346,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;
 		}
 
 		/**
@@ -379,24 +379,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 = Api\Translation::convert($data,$charset);
+			$data = Api\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']),
@@ -404,9 +404,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;
@@ -418,16 +418,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(Api\Translation::translate($options['csv_fields'][$index],false,''));
-				$lang_file = mb_strtoupper(Api\Translation::translate($header,false,''));
+				$lang_defn = mb_strtoupper(Api\Translation::translate($options['csv_fields'][$index], false, ''));
+				$lang_file = mb_strtoupper(Api\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])
 				)
@@ -439,7 +439,7 @@ 
 				$file_message_id = Api\Translation::get_message_id($header, $definition->application);
 				$defn_message_id = Api\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;
 				}
@@ -447,19 +447,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 = Api\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,
@@ -471,13 +471,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(
@@ -486,20 +486,20 @@ 
 							// Jump to file step
 							'step' => 'wizard_step21'
 						);
-						if($dst_file)
+						if ($dst_file)
 						{
 							// Still have uploaded file, jump there
-							Api\Cache::setSession($definition->application,'csvfile',$dst_file);
+							Api\Cache::setSession($definition->application, '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;

Braces +77 added lines, -33 removed lines

@@ -20,7 +20,8 @@ 
  *
 */
 
-	class importexport_import_ui {
+	class importexport_import_ui
+	{
 
 		const _appname = 'importexport';
 
@@ -35,14 +36,16 @@ 
 		 */
 		private $plugins;
 
-		public function __construct() {
+		public function __construct()
+		{
 			$this->plugins = importexport_helper_functions::get_plugins('all','import');
 		}
 
 		/**
 		*  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'];
 
@@ -62,15 +65,18 @@ 
 			{
 				Api\Translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if($content['import'] && $definition)
+			{
 				try {
-					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'];
 					}
@@ -115,7 +121,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;
 							}
 						}
@@ -168,33 +175,44 @@ 
 						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 .= "<br />\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 (Api\Db\Exception $db_ex) {
+				}
+				catch (Api\Db\Exception $db_ex) {
 					$this->message .= lang('Database error');
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->message .= $e->getMessage();
 				}
 			}
@@ -251,7 +269,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);
 		}
@@ -259,7 +280,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'),
@@ -275,17 +297,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);
@@ -295,7 +320,8 @@ 
 						// Permission error
 						continue;
 					}
-					if ($title = $definition->get_title()) {
+					if ($title = $definition->get_title())
+					{
 						$options['definition'][$title] = $title;
 					}
 					unset($definition);
@@ -335,9 +361,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);
@@ -346,19 +378,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;
@@ -383,10 +422,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'];
@@ -430,8 +475,7 @@ 
 				if($lang_defn == $lang_file ||
 					$lang_defn == mb_strtoupper($header) ||
 					$lang_file == mb_strtoupper($options['csv_fields'][$index])
-				)
-				{
+				) {
 					continue;
 				}
 

infolog/inc/class.infolog_bo.inc.php

Doc Comments +2 added lines, -5 removed lines

@@ -1226,7 +1226,7 @@ 
 	 * Is called as hook to participate in the linking
 	 *
 	 * @param int|array $info int info_id or array with infolog entry
-	 * @return string|boolean string with the title, null if $info not found, false if no perms to view
+	 * @return string string with the title, null if $info not found, false if no perms to view
 	 */
 	function link_title($info)
 	{
@@ -1324,9 +1324,6 @@ 
 	/**
 	 * hook called be calendar to include events or todos in the cal-dayview
 	 *
-	 * @param int $args[year], $args[month], $args[day] date of the events
-	 * @param int $args[owner] owner of the events
-	 * @param string $args[location] calendar_include_{events|todos}
 	 * @return array of events (array with keys starttime, endtime, title, view, icon, content)
 	 */
 	function cal_to_include($args)
@@ -1515,7 +1512,7 @@ 
 	 * Get names for categories specified by their id's
 	 *
 	 * @param array|string $cat_id_list array or comma-sparated list of id's
-	 * @return array with names
+	 * @return string|boolean with names
 	 */
 	function get_categories($cat_id_list)
 	{

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

@@ -1272,7 +1272,7 @@
 	 * @param array $options Array of options for the search
 	 * @return array with info_id - title pairs of the matching entries
 	 */
-	function link_query($pattern, Array &$options = array())
+	function link_query($pattern, array &$options = array())
 	{
 		$query = array(
 			'search' => $pattern,

Indentation +16 added lines, -16 removed lines

@@ -701,21 +701,21 @@ 
 	}
 
 	/**
-	* writes the given $values to InfoLog, a new entry gets created if info_id is not set or 0
-	*
-	* checks and asures ACL
-	*
-	* @param array &$values values to write
-	* @param boolean $check_defaults = true check and set certain defaults
-	* @param boolean|int $touch_modified = true touch the modification date and sets the modifier's user-id, 2: only modifier
-	* @param boolean $user2server = true conversion between user- and server-time necessary
-	* @param boolean $skip_notification = false true = do NOT send notification, false (default) = send notifications
-	* @param boolean $throw_exception = false Throw an exception (if required fields are not set)
-	* @param string $purge_cfs = null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
-	* @param boolean $ignore_acl =true
-	*
-	* @return int|boolean info_id on a successfull write or false
-	*/
+	 * writes the given $values to InfoLog, a new entry gets created if info_id is not set or 0
+	 *
+	 * checks and asures ACL
+	 *
+	 * @param array &$values values to write
+	 * @param boolean $check_defaults = true check and set certain defaults
+	 * @param boolean|int $touch_modified = true touch the modification date and sets the modifier's user-id, 2: only modifier
+	 * @param boolean $user2server = true conversion between user- and server-time necessary
+	 * @param boolean $skip_notification = false true = do NOT send notification, false (default) = send notifications
+	 * @param boolean $throw_exception = false Throw an exception (if required fields are not set)
+	 * @param string $purge_cfs = null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
+	 * @param boolean $ignore_acl =true
+	 *
+	 * @return int|boolean info_id on a successfull write or false
+	 */
 	function write(&$values_in, $check_defaults=true, $touch_modified=true, $user2server=true,
 		$skip_notification=false, $throw_exception=false, $purge_cfs=null, $ignore_acl=false)
 	{
@@ -752,7 +752,7 @@ 
 			}
 		}
 		if (!$ignore_acl && ($values['info_id'] && !$this->check_access($values['info_id'],Acl::EDIT) && !$status_only ||
-		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],Acl::ADD)))
+			!$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],Acl::ADD)))
 		{
 			return false;
 		}

Braces +203 added lines, -56 removed lines

@@ -232,7 +232,10 @@ 
 				$this->enums['type'] += $config_data['types'];
 				//echo "types:<pre>"; print_r($this->enums['type']); echo "</pre>\n";
 			}
-			if ($config_data['group_owners']) $this->group_owners = $config_data['group_owners'];
+			if ($config_data['group_owners'])
+			{
+				$this->group_owners = $config_data['group_owners'];
+			}
 
 			$this->customfields = Api\Storage\Customfields::get('infolog');
 			if ($this->customfields)
@@ -242,17 +245,35 @@ 
 					// old infolog customefield record
 					if(empty($field['type']))
 					{
-						if (count($field['values'])) $field['type'] = 'select'; // selectbox
-						elseif ($field['rows'] > 1) $field['type'] = 'textarea'; // textarea
-						elseif (intval($field['len']) > 0) $field['type'] = 'text'; // regular input field
-						else $field['type'] = 'label'; // header-row
+						if (count($field['values']))
+						{
+							$field['type'] = 'select';
+						}
+						// selectbox
+						elseif ($field['rows'] > 1)
+						{
+							$field['type'] = 'textarea';
+						}
+						// textarea
+						elseif (intval($field['len']) > 0)
+						{
+							$field['type'] = 'text';
+						}
+						// regular input field
+						else {
+							$field['type'] = 'label';
+						}
+						// header-row
 						$field['type2'] = $field['typ'];
 						unset($field['typ']);
 						$this->customfields[$name] = $field;
 						$save_config = true;
 					}
 				}
-				if ($save_config) Api\Config::save_value('customfields',$this->customfields,'infolog');
+				if ($save_config)
+				{
+					Api\Config::save_value('customfields',$this->customfields,'infolog');
+				}
 			}
 			if (is_array($config_data['responsible_edit']))
 			{
@@ -279,7 +300,10 @@ 
 		// sort types by there translation
 		foreach($this->enums['type'] as $key => $val)
 		{
-			if (($val = lang($key)) != $key.'*') $this->enums['type'][$key] = lang($key);
+			if (($val = lang($key)) != $key.'*')
+			{
+				$this->enums['type'][$key] = lang($key);
+			}
 		}
 		natcasesort($this->enums['type']);
 
@@ -334,11 +358,18 @@ 
 
 		$info_id = is_array($info) ? $info['info_id'] : $info;
 
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
-			if ($info_id) $access =& $cache[$info_id][$required_rights];	// we only cache the current user!
+			if ($info_id)
+			{
+				$access =& $cache[$info_id][$required_rights];
+			}
+			// we only cache the current user!
 		}
 		else
 		{
@@ -357,16 +388,22 @@ 
 			// handle delete for the various history modes
 			if ($this->history)
 			{
-				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id)))) return false;
+				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id))))
+				{
+					return false;
+				}
 
 				if ($info['info_status'] == 'deleted' &&
 					($required_rights == Acl::EDIT ||		// no edit rights for deleted entries
 					 $required_rights == Acl::ADD  ||		// no add rights for deleted entries
 					 $required_rights == Acl::DELETE && ($this->history == 'history_no_delete' || // no delete at all!
-					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))	// delete only for admins
+					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))
+				{
+					// delete only for admins
 				{
 					$access = false;
 				}
+				}
 				elseif ($required_rights == self::ACL_UNDELETE)
 				{
 					if ($info['info_status'] != 'deleted')
@@ -427,11 +464,14 @@ 
 
 		if ($info['info_link_id'] > 0 &&
 			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) ||	// use supplied links info
-			 ($link = Link::get_link($info['info_link_id'])) !== False))	// if link not found in supplied links, we always search!
+			 ($link = Link::get_link($info['info_link_id'])) !== False))
+		{
+			// if link not found in supplied links, we always search!
 		{
 			if (isset($info['links']) && isset($link['app']))
 			{
 				$app = $link['app'];
+		}
 				$id  = $link['id'];
 			}
 			else
@@ -442,10 +482,13 @@ 
 			}
 			$title = Link::title($app,$id);
 
-			if ((string)$info['info_custom_from'] === '')	// old entry
+			if ((string)$info['info_custom_from'] === '')
+			{
+				// old entry
 			{
 				$info['info_custom_from'] = (int) ($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
 			}
+			}
 			if (!$info['info_custom_from'])
 			{
 				$info['info_from'] = '';
@@ -493,7 +536,10 @@ 
 		$pm_links = Link::get_links('infolog',$info['info_id'],'projectmanager');
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $info['old_pm_id'];
-		if (!isset($info['pm_id']) && $old_pm_id) $info['pm_id'] = $old_pm_id;
+		if (!isset($info['pm_id']) && $old_pm_id)
+		{
+			$info['pm_id'] = $old_pm_id;
+		}
 		return $old_pm_id;
 	}
 
@@ -520,12 +566,15 @@ 
 	 function time2time(&$values, $fromTZId=false, $toTZId=null)
 	 {
 
-		if ($fromTZId === $toTZId) return;
+		if ($fromTZId === $toTZId)
+		{
+			return;
+		}
 
 		$tz = Api\DateTime::$server_timezone;
 
 	 	if ($fromTZId)
-		{
+	 	{
 			if (!isset(self::$tz_cache[$fromTZId]))
 			{
 				self::$tz_cache[$fromTZId] = calendar_timezones::DateTimeZone($fromTZId);
@@ -559,7 +608,7 @@ 
 		}
 		//error_log(__METHOD__.'(values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']).", from=".array2string($fromTZId).", to=".array2string($toTZId).") tz=".$tz->getName().', fromTZ='.$fromTZ->getName().', toTZ='.$toTZ->getName().', userTZ='.Api\DateTime::$user_timezone->getName());
 	 	foreach($this->timestamps as $key)
-		{
+	 	{
 		 	if ($values[$key])
 		 	{
 			 	$time = new Api\DateTime($values[$key], $tz);
@@ -589,7 +638,10 @@ 
 	 */
 	function date2usertime($ts,$date_format='ts')
 	{
-		if (empty($ts) || $date_format == 'server') return $ts;
+		if (empty($ts) || $date_format == 'server')
+		{
+			return $ts;
+		}
 
 		return Api\DateTime::server2user($ts,$date_format);
 	}
@@ -626,10 +678,13 @@ 
 			return null;
 		}
 
-		if (!$ignore_acl && !$this->check_access($data,Acl::READ))	// check behind read, to prevent a double read
+		if (!$ignore_acl && !$this->check_access($data,Acl::READ))
+		{
+			// check behind read, to prevent a double read
 		{
 			return False;
 		}
+		}
 
 		if ($data['info_subject'] == $this->subject_from_des($data['info_des']))
 		{
@@ -700,7 +755,11 @@ 
 		// if we have history switched on and not an already deleted item --> set only status deleted
 		if ($this->history && $info['info_status'] != 'deleted')
 		{
-			if ($info['info_status'] == 'deleted') return false;	// entry already deleted
+			if ($info['info_status'] == 'deleted')
+			{
+				return false;
+			}
+			// entry already deleted
 
 			$this->so->write($deleted);
 
@@ -712,7 +771,9 @@ 
 
 			Link::unlink(0,'infolog',$info_id);
 		}
-		if ($info['info_status'] != 'deleted')	// dont notify of final purge of already deleted items
+		if ($info['info_status'] != 'deleted')
+		{
+			// dont notify of final purge of already deleted items
 		{
 			// send email notifications and do the history logging
 			if(!$skip_notification)
@@ -720,6 +781,7 @@ 
 				if (!is_object($this->tracking))
 				{
 					$this->tracking = new infolog_tracking($this);
+		}
 				}
 				$this->tracking->track($deleted,$info,$this->user,true);
 			}
@@ -769,10 +831,13 @@ 
 			{
 				$responsible = $values['info_responsible'];
 			}
-			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
+			if (!($status_only = in_array($this->user, (array)$responsible)))
+			{
+				// responsible has implicit right to change status
 			{
 				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
+			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
 				$status_only = $undelete = $this->check_access($values['info_id'],self::ACL_UNDELETE);
@@ -793,17 +858,23 @@ 
 				$values['info_status'] = $this->status['defaults'][$values['info_type']];
 			}
 		}
-		if ($status_only && !$undelete)	// make sure only status gets writen
+		if ($status_only && !$undelete)
+		{
+			// make sure only status gets writen
 		{
 			$set_completed = !$values['info_datecompleted'] &&	// set date completed of finished job, only if its not already set
 				in_array($values['info_status'],array('done','billed','cancelled'));
+		}
 
 			$values = $old;
 			// only overwrite explicitly allowed fields
 			$values['info_datemodified'] = $values_in['info_datemodified'];
 			foreach ($this->responsible_edit as $name)
 			{
-				if (isset($values_in[$name])) $values[$name] = $values_in[$name];
+				if (isset($values_in[$name]))
+				{
+					$values[$name] = $values_in[$name];
+				}
 			}
 			if ($set_completed)
 			{
@@ -811,21 +882,30 @@ 
 				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
-				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled')))
+				{
 					$forcestatus = false;
 					//echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
-					if (isset($this->status[$values['info_type']]['done'])) {
+					if (isset($this->status[$values['info_type']]['done']))
+					{
 						$forcestatus = true;
 						$status = 'done';
-					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['billed']))
+					{
 						$forcestatus = true;
 						$status = 'billed';
-					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['cancelled']))
+					{
 						$forcestatus = true;
 						$status = 'cancelled';
 					}
 				}
-				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
+				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled')))
+				{
+					$values['info_status'] = $status;
+				}
 			}
 			$check_defaults = false;
 		}
@@ -857,14 +937,22 @@ 
 				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
 				//$values['info_status'] = 'done';
 				$status = 'done';
-				if (isset($values['info_type'])) {
-					if (isset($this->status[$values['info_type']]['done'])) {
+				if (isset($values['info_type']))
+				{
+					if (isset($this->status[$values['info_type']]['done']))
+					{
 						$status = 'done';
-					} elseif (isset($this->status[$values['info_type']]['billed'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['billed']))
+					{
 						$status = 'billed';
-					} elseif (isset($this->status[$values['info_type']]['cancelled'])) {
+					}
+					elseif (isset($this->status[$values['info_type']]['cancelled']))
+					{
 						$status = 'cancelled';
-					} else {
+					}
+					else
+					{
 						// since the comlete stati above do not exist for that type, dont change it
 						$status = $values['info_status'];
 					}
@@ -886,7 +974,10 @@ 
 				$custom = Api\Storage\Customfields::get('infolog');
 				foreach($custom as $c_name => $c_field)
 				{
-					if($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
+					if($c_field['type2'])
+					{
+						$type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
+					}
 					if($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'],$type2)))
 					{
 						// Required custom field
@@ -905,8 +996,7 @@ 
 			{
 				if (!$this->check_access($values['info_id'],Acl::EDIT) ||
 					!$values['info_id'] && !$this->check_access($values,Acl::ADD)
-				)
-				{
+				) {
 					return false;	// no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
 				}
 			}
@@ -965,10 +1055,16 @@ 
 			$to_write['info_id'] = $info_id;
 
 			// if the info responbsible array is not passed, fetch it from old.
-			if (!array_key_exists('info_responsible',$values)) $values['info_responsible'] = $old['info_responsible'];
-			if (!is_array($values['info_responsible']))		// this should not happen, bug it does ;-)
+			if (!array_key_exists('info_responsible',$values))
+			{
+				$values['info_responsible'] = $old['info_responsible'];
+			}
+			if (!is_array($values['info_responsible']))
+			{
+				// this should not happen, bug it does ;-)
 			{
 				$values['info_responsible'] = $values['info_responsible'] ? explode(',',$values['info_responsible']) : array();
+			}
 				$to_write['info_responsible'] = $values['info_responsible'];
 			}
 
@@ -1042,7 +1138,10 @@ 
 			$this->tracking->track($to_write,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
 				null,$skip_notification);
 
-			if ($info_from_set) $values['info_from'] = '';
+			if ($info_from_set)
+			{
+				$values['info_from'] = '';
+			}
 
 			// Change new values back to user time before sending them back
 			if($user2server)
@@ -1201,13 +1300,25 @@ 
 
 		if($query['filter'] == 'bydate')
 		{
-			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['startdate']))
+			{
+				$query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
+			}
+			if (is_int($query['enddate']))
+			{
+				$query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			}
 		}
 		elseif ($query['filter'] == 'duedate')
 		{
-			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['startdate']))
+			{
+				$query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
+			}
+			if (is_int($query['enddate']))
+			{
+				$query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			}
 		}
 		elseif ($query['filter'] == 'private')
 		{
@@ -1289,7 +1400,10 @@ 
 
 		$result =& $this->search($filter);
 
-		if (empty($result)) return 'EGw-empty-wGE';
+		if (empty($result))
+		{
+			return 'EGw-empty-wGE';
+		}
 
 		$entry = array_shift($result);
 
@@ -1335,7 +1449,10 @@ 
 				'to_id' => 0,
 			),
 		);
-		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default']) $info['info_cat'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'];
+		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'])
+		{
+			$info['info_cat'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default'];
+		}
 		// find the addressbookentry to link with
 		$addressbook = new Api\Contacts();
 		$contacts = array();
@@ -1596,7 +1713,10 @@ 
 			{
 				foreach($anzSubs as $info_id => $subs)
 				{
-					if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs';
+					if ($subs)
+					{
+						$infos[$info_id]['class'] .= ' infolog_rowHasSubs';
+					}
 				}
 			}
 		}
@@ -1723,7 +1843,10 @@ 
 		$save_prefs      = $GLOBALS['egw_info']['user']['preferences'];
 		foreach($users as $user)
 		{
-			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email'))) continue;
+			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email')))
+			{
+				continue;
+			}
 			// create the enviroment for $user
 			$this->user = $GLOBALS['egw_info']['user']['account_id'] = $user;
 			$GLOBALS['egw']->preferences->__construct($user);
@@ -1740,7 +1863,10 @@ 
 				'notify_start_delegated'   => 'open-delegated-date',
 			) as $pref => $filter)
 			{
-				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref])) continue;
+				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref]))
+				{
+					continue;
+				}
 
 				$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
 				//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
@@ -1749,7 +1875,10 @@ 
 				foreach($this->so->search($params) as $info)
 				{
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
-					if (in_array($info['info_id'],$notified_info_ids)) continue;
+					if (in_array($info['info_id'],$notified_info_ids))
+					{
+						continue;
+					}
 
 					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
@@ -1878,11 +2007,17 @@ 
 			$statis = $icons = array();
 			foreach($this->status as $t => $stati)
 			{
-				if ($t === 'defaults') continue;
+				if ($t === 'defaults')
+				{
+					continue;
+				}
 				foreach($stati as $val => $label)
 				{
 					$statis[$val][$label] = lang($label);
-					if (!isset($icons[$val])) $icons[$val] = $label;
+					if (!isset($icons[$val]))
+					{
+						$icons[$val] = $label;
+					}
 				}
 			}
 			foreach($statis as $val => &$labels)
@@ -1958,7 +2093,10 @@ 
 			{
 				return array($egwData['info_id']);
 			}
-			if (!$relax) return array();
+			if (!$relax)
+			{
+				return array();
+			}
 		}
 		unset($infoData['info_id']);
 
@@ -1967,7 +2105,10 @@ 
 			$filter = array('col_filter' => array('info_uid' => $infoData['info_uid']));
 			foreach($this->so->search($filter) as $egwData)
 			{
-				if (!$this->check_access($egwData,Acl::READ)) continue;
+				if (!$this->check_access($egwData,Acl::READ))
+				{
+					continue;
+				}
 				$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
 			}
 			return $foundInfoLogs;
@@ -2019,7 +2160,10 @@ 
 
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData,Acl::READ))
+			{
+				continue;
+			}
 
 			switch ($infoData['info_type'])
 			{
@@ -2092,7 +2236,10 @@ 
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData,Acl::READ))
+			{
+				continue;
+			}
 			// Horde::logMessage("findVTODO Trying\n"
 			//	. print_r($egwData, true),
 			//	__FILE__, __LINE__, PEAR_LOG_DEBUG);

Spacing +254 added lines, -255 removed lines

@@ -39,7 +39,7 @@ 
 	 */
 	var $total;
 	var $vfs;
-	var $vfs_basedir='/infolog';
+	var $vfs_basedir = '/infolog';
 	/**
 	 * Set Logging
 	 *
@@ -64,13 +64,13 @@ 
 	 *
 	 * @var array
 	 */
-	var $timestamps = array('info_startdate','info_enddate','info_datemodified','info_datecompleted','info_created');
+	var $timestamps = array('info_startdate', 'info_enddate', 'info_datemodified', 'info_datecompleted', 'info_created');
 	/**
 	 * fields the responsible user can change
 	 *
 	 * @var array
 	 */
-	var $responsible_edit=array('info_status','info_percent','info_datecompleted');
+	var $responsible_edit = array('info_status', 'info_percent', 'info_datecompleted');
 	/**
 	 * Fields to exclude from copy, if an entry is copied, the ones below are excluded by default.
 	 *
@@ -94,19 +94,19 @@ 
 	 *
 	 * @var string
 	 */
-	var $implicit_rights='read';
+	var $implicit_rights = 'read';
 	/**
 	 * Custom fields read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Group owners for certain types read from the infolog config
 	 *
 	 * @var array
 	 */
-	var $group_owners=array();
+	var $group_owners = array();
 	/**
 	 * Current user
 	 *
@@ -173,42 +173,42 @@ 
 	function __construct($info_id = 0)
 	{
 		$this->enums = $this->stock_enums = array(
-			'priority' => array (
+			'priority' => array(
 				3 => 'urgent',
 				2 => 'high',
 				1 => 'normal',
 				0 => 'low'
 			),
 			'confirm'   => array(
-				'not' => 'not','accept' => 'accept','finish' => 'finish',
+				'not' => 'not', 'accept' => 'accept', 'finish' => 'finish',
 				'both' => 'both' ),
 			'type'      => array(
-				'task' => 'task','phone' => 'phone','note' => 'note','email' => 'email'
+				'task' => 'task', 'phone' => 'phone', 'note' => 'note', 'email' => 'email'
 			/*	,'confirm' => 'confirm','reject' => 'reject','fax' => 'fax' not implemented so far */ )
 		);
 		$this->status = $this->stock_status = array(
 			'defaults' => array(
-				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done','email' => 'done'),
+				'task' => 'not-started', 'phone' => 'not-started', 'note' => 'done', 'email' => 'done'),
 			'task' => array(
-				'offer' => 'offer',				// -->  NEEDS-ACTION
-				'not-started' => 'not-started',	// iCal NEEDS-ACTION
-				'ongoing' => 'ongoing',			// iCal IN-PROCESS
-				'done' => 'done',				// iCal COMPLETED
-				'cancelled' => 'cancelled',		// iCal CANCELLED
-				'billed' => 'billed',			// -->  DONE
-				'template' => 'template',		// -->  cancelled
-				'nonactive' => 'nonactive',		// -->  cancelled
-				'archive' => 'archive' ), 		// -->  cancelled
+				'offer' => 'offer', // -->  NEEDS-ACTION
+				'not-started' => 'not-started', // iCal NEEDS-ACTION
+				'ongoing' => 'ongoing', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'cancelled' => 'cancelled', // iCal CANCELLED
+				'billed' => 'billed', // -->  DONE
+				'template' => 'template', // -->  cancelled
+				'nonactive' => 'nonactive', // -->  cancelled
+				'archive' => 'archive' ), // -->  cancelled
 			'phone' => array(
-				'not-started' => 'call',		// iCal NEEDS-ACTION
-				'ongoing' => 'will-call',		// iCal IN-PROCESS
-				'done' => 'done', 				// iCal COMPLETED
-				'billed' => 'billed' ),			// -->  DONE
+				'not-started' => 'call', // iCal NEEDS-ACTION
+				'ongoing' => 'will-call', // iCal IN-PROCESS
+				'done' => 'done', // iCal COMPLETED
+				'billed' => 'billed' ), // -->  DONE
 			'note' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 			'email' => array(
-				'ongoing' => 'ongoing',			// iCal has no status on notes
+				'ongoing' => 'ongoing', // iCal has no status on notes
 				'done' => 'done' ),
 		);
 		if (($config_data = Api\Config::read('infolog')))
@@ -216,13 +216,13 @@ 
 			$this->allow_past_due_date = $config_data['allow_past_due_date'] === null ? 1 : $config_data['allow_past_due_date'];
 			if (isset($config_data['status']) && is_array($config_data['status']))
 			{
-				foreach(array_keys($config_data['status']) as $key)
+				foreach (array_keys($config_data['status']) as $key)
 				{
 					if (!is_array($this->status[$key]))
 					{
 						$this->status[$key] = array();
 					}
-					$this->status[$key] = array_merge($this->status[$key],(array)$config_data['status'][$key]);
+					$this->status[$key] = array_merge($this->status[$key], (array)$config_data['status'][$key]);
 				}
 			}
 			if (isset($config_data['types']) && is_array($config_data['types']))
@@ -237,10 +237,10 @@ 
 			$this->customfields = Api\Storage\Customfields::get('infolog');
 			if ($this->customfields)
 			{
-				foreach($this->customfields as $name => $field)
+				foreach ($this->customfields as $name => $field)
 				{
 					// old infolog customefield record
-					if(empty($field['type']))
+					if (empty($field['type']))
 					{
 						if (count($field['values'])) $field['type'] = 'select'; // selectbox
 						elseif ($field['rows'] > 1) $field['type'] = 'textarea'; // textarea
@@ -252,23 +252,23 @@ 
 						$save_config = true;
 					}
 				}
-				if ($save_config) Api\Config::save_value('customfields',$this->customfields,'infolog');
+				if ($save_config) Api\Config::save_value('customfields', $this->customfields, 'infolog');
 			}
 			if (is_array($config_data['responsible_edit']))
 			{
-				$this->responsible_edit = array_merge($this->responsible_edit,$config_data['responsible_edit']);
+				$this->responsible_edit = array_merge($this->responsible_edit, $config_data['responsible_edit']);
 			}
 			if (is_array($config_data['copy_excludefields']))
 			{
-				$this->copy_excludefields = array_merge($this->copy_excludefields,$config_data['copy_excludefields']);
+				$this->copy_excludefields = array_merge($this->copy_excludefields, $config_data['copy_excludefields']);
 			}
 			if (is_array($config_data['sub_excludefields']) && $config_data['sub_excludefields'])
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$config_data['sub_excludefields']);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $config_data['sub_excludefields']);
 			}
 			else
 			{
-				$this->sub_excludefields = array_merge($this->sub_excludefields,$this->default_sub_excludefields);
+				$this->sub_excludefields = array_merge($this->sub_excludefields, $this->default_sub_excludefields);
 			}
 			if ($config_data['implicit_rights'] == 'edit')
 			{
@@ -277,7 +277,7 @@ 
 			$this->history = $config_data['history'];
 		}
 		// sort types by there translation
-		foreach($this->enums['type'] as $key => $val)
+		foreach ($this->enums['type'] as $key => $val)
 		{
 			if (($val = lang($key)) != $key.'*') $this->enums['type'][$key] = lang($key);
 		}
@@ -286,14 +286,14 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->now = time();
-		$this->user_time_now = Api\DateTime::server2user($this->now,'ts');
+		$this->user_time_now = Api\DateTime::server2user($this->now, 'ts');
 
-		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
+		$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
 		$this->so = new infolog_so($this->grants);
 
 		if ($info_id)
 		{
-			$this->read( $info_id );
+			$this->read($info_id);
 		}
 		else
 		{
@@ -309,9 +309,9 @@ 
 	 */
 	function has_customfields($type)
 	{
-		foreach($this->customfields as $field)
+		foreach ($this->customfields as $field)
 		{
-			if ((!$type || empty($field['type2']) || in_array($type,is_array($field['type2']) ? $field['type2'] : explode(',',$field['type2']))))
+			if ((!$type || empty($field['type2']) || in_array($type, is_array($field['type2']) ? $field['type2'] : explode(',', $field['type2']))))
 			{
 				return True;
 			}
@@ -328,7 +328,7 @@ 
 	 * @param int $user = null user whos rights to check, default current user
 	 * @return boolean
 	 */
-	function check_access($info,$required_rights,$other=0,$user=null)
+	function check_access($info, $required_rights, $other = 0, $user = null)
 	{
 		static $cache = array();
 
@@ -338,17 +338,17 @@ 
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
-			if ($info_id) $access =& $cache[$info_id][$required_rights];	// we only cache the current user!
+			if ($info_id) $access = & $cache[$info_id][$required_rights]; // we only cache the current user!
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true, $user);
 		}
 		if (!$info)
 		{
 			$owner = $other ? $other : $user;
 			$grant = $grants[$owner];
-			return $grant & $required_rights;
+			return $grant&$required_rights;
 		}
 
 
@@ -360,10 +360,10 @@ 
 				if (!is_array($info) && !($info = $this->so->read(array('info_id' => $info_id)))) return false;
 
 				if ($info['info_status'] == 'deleted' &&
-					($required_rights == Acl::EDIT ||		// no edit rights for deleted entries
-					 $required_rights == Acl::ADD  ||		// no add rights for deleted entries
+					($required_rights == Acl::EDIT || // no edit rights for deleted entries
+					 $required_rights == Acl::ADD || // no add rights for deleted entries
 					 $required_rights == Acl::DELETE && ($this->history == 'history_no_delete' || // no delete at all!
-					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user!=$this->user))))	// delete only for admins
+					 $this->history == 'history_admin_delete' && (!isset($GLOBALS['egw_info']['user']['apps']['admin']) || $user != $this->user))))	// delete only for admins
 				{
 					$access = false;
 				}
@@ -371,12 +371,12 @@ 
 				{
 					if ($info['info_status'] != 'deleted')
 					{
-						$access = false;	// can only undelete deleted items
+						$access = false; // can only undelete deleted items
 					}
 					else
 					{
 						// undelete requires edit rights
-						$access = $this->so->check_access( $info,Acl::EDIT,$this->implicit_rights == 'edit',$grants,$user );
+						$access = $this->so->check_access($info, Acl::EDIT, $this->implicit_rights == 'edit', $grants, $user);
 					}
 				}
 			}
@@ -386,7 +386,7 @@ 
 			}
 			if (!isset($access))
 			{
-				$access = $this->so->check_access( $info,$required_rights,$this->implicit_rights == 'edit',$grants,$user );
+				$access = $this->so->check_access($info, $required_rights, $this->implicit_rights == 'edit', $grants, $user);
 			}
 		}
 		// else $cached = ' (from cache)';
@@ -421,12 +421,12 @@ 
 	 * @param string $not_id = '' id to exclude
 	 * @return boolean True if we have a linked item, False otherwise
 	 */
-	function link_id2from(&$info,$not_app='',$not_id='')
+	function link_id2from(&$info, $not_app = '', $not_id = '')
 	{
 		//error_log(__METHOD__ . "(subject='{$info['info_subject']}', link_id='{$info['info_link_id']}', from='{$info['info_from']}', not_app='$not_app', not_id='$not_id')");
 
 		if ($info['info_link_id'] > 0 &&
-			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) ||	// use supplied links info
+			(isset($info['links']) && ($link = $info['links'][$info['info_link_id']]) || // use supplied links info
 			 ($link = Link::get_link($info['info_link_id'])) !== False))	// if link not found in supplied links, we always search!
 		{
 			if (isset($info['links']) && isset($link['app']))
@@ -440,11 +440,11 @@ 
 				$app = $link['link_app'.$nr];
 				$id  = $link['link_id'.$nr];
 			}
-			$title = Link::title($app,$id);
+			$title = Link::title($app, $id);
 
 			if ((string)$info['info_custom_from'] === '')	// old entry
 			{
-				$info['info_custom_from'] = (int) ($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
+				$info['info_custom_from'] = (int)($title != $info['info_from'] && @htmlentities($title) != $info['info_from']);
 			}
 			if (!$info['info_custom_from'])
 			{
@@ -477,7 +477,7 @@ 
 
 		// Set ID to 'none' instead of unset to make it seem like there's a value
 		$info['info_link'] = $info['info_contact'] = $info['info_from'] ? array('id' => 'none', 'title' => $info['info_from']) : null;
-		$info['info_link_id'] = 0;	// link might have been deleted
+		$info['info_link_id'] = 0; // link might have been deleted
 		$info['info_custom_from'] = (int)!!$info['info_from'];
 
 		$this->get_pm_id($info);
@@ -492,7 +492,7 @@ 
 	 */
 	public function get_pm_id(&$info)
 	{
-		$pm_links = Link::get_links('infolog',$info['info_id'],'projectmanager');
+		$pm_links = Link::get_links('infolog', $info['info_id'], 'projectmanager');
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $info['old_pm_id'];
 		if (!isset($info['pm_id']) && $old_pm_id) $info['pm_id'] = $old_pm_id;
@@ -504,7 +504,7 @@ 
 	 */
 	static function subject_from_des($des)
 	{
-		return substr($des,0,60).' ...';
+		return substr($des, 0, 60).' ...';
 	}
 
 	/**
@@ -519,7 +519,7 @@ 
 	 * 			or NULL for timestamps in user-time
 	 * 			or false for timestamps in server-time
 	 */
-	 function time2time(&$values, $fromTZId=false, $toTZId=null)
+	 function time2time(&$values, $fromTZId = false, $toTZId = null)
 	 {
 
 		if ($fromTZId === $toTZId) return;
@@ -560,7 +560,7 @@ 
 			$toTZ = Api\DateTime::$server_timezone;
 		}
 		//error_log(__METHOD__.'(values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']).", from=".array2string($fromTZId).", to=".array2string($toTZId).") tz=".$tz->getName().', fromTZ='.$fromTZ->getName().', toTZ='.$toTZ->getName().', userTZ='.Api\DateTime::$user_timezone->getName());
-	 	foreach($this->timestamps as $key)
+	 	foreach ($this->timestamps as $key)
 		{
 		 	if ($values[$key])
 		 	{
@@ -569,14 +569,14 @@ 
 			 	if ($time->format('Hi') == '0000')
 			 	{
 				 	// we keep dates the same in new timezone
-				 	$arr = Api\DateTime::to($time,'array');
+				 	$arr = Api\DateTime::to($time, 'array');
 				 	$time = new Api\DateTime($arr, $toTZ);
 			 	}
 			 	else
 			 	{
 				 	$time->setTimezone($toTZ);
 			 	}
-			 	$values[$key] = Api\DateTime::to($time,'ts');
+			 	$values[$key] = Api\DateTime::to($time, 'ts');
 		 	}
 		}
 		//error_log(__METHOD__.'() --> values[info_enddate]='.date('Y-m-d H:i:s',$values['info_enddate']));
@@ -589,11 +589,11 @@ 
 	 * @param string $date_format = 'ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return Api\DateTime::server2user($ts,$date_format);
+		return Api\DateTime::server2user($ts, $date_format);
 	}
 
 	/**
@@ -608,10 +608,10 @@ 
 	 *
 	 * @return array|boolean infolog entry, null if not found or false if no permission to read it
 	 */
-	function &read($info_id,$run_link_id2from=true,$date_format='ts',$ignore_acl=false)
+	function &read($info_id, $run_link_id2from = true, $date_format = 'ts', $ignore_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($info_id).', '.array2string($run_link_id2from).", '$date_format') ".function_backtrace());
-		if (is_scalar($info_id) || isset($info_id[count($info_id)-1]))
+		if (is_scalar($info_id) || isset($info_id[count($info_id) - 1]))
 		{
 			if (is_scalar($info_id) && !is_numeric($info_id))
 			{
@@ -628,7 +628,7 @@ 
 			return null;
 		}
 
-		if (!$ignore_acl && !$this->check_access($data,Acl::READ))	// check behind read, to prevent a double read
+		if (!$ignore_acl && !$this->check_access($data, Acl::READ))	// check behind read, to prevent a double read
 		{
 			return False;
 		}
@@ -662,7 +662,7 @@ 
 	 * @param boolean $skip_notification Do not send notification of delete
 	 * @return boolean True if delete was successful, False otherwise ($info_id does not exist or no rights)
 	 */
-	function delete($info_id,$delete_children=False,$new_parent=False, $skip_notification=False)
+	function delete($info_id, $delete_children = False, $new_parent = False, $skip_notification = False)
 	{
 		if (is_array($info_id))
 		{
@@ -672,18 +672,18 @@ 
 		{
 			return False;
 		}
-		if (!$this->check_access($info,Acl::DELETE))
+		if (!$this->check_access($info, Acl::DELETE))
 		{
 			return False;
 		}
 		// check if we have children and delete or re-parent them
 		if (($children = $this->so->get_children($info_id)))
 		{
-			foreach($children as $id => $owner)
+			foreach ($children as $id => $owner)
 			{
-				if ($delete_children && $this->so->grants[$owner] & Acl::DELETE)
+				if ($delete_children && $this->so->grants[$owner]&Acl::DELETE)
 				{
-					$this->delete($id,$delete_children,$new_parent,$skip_notification);	// call ourself recursive to delete the child
+					$this->delete($id, $delete_children, $new_parent, $skip_notification); // call ourself recursive to delete the child
 				}
 				else	// dont delete or no rights to delete the child --> re-parent it
 				{
@@ -702,28 +702,28 @@ 
 		// if we have history switched on and not an already deleted item --> set only status deleted
 		if ($this->history && $info['info_status'] != 'deleted')
 		{
-			if ($info['info_status'] == 'deleted') return false;	// entry already deleted
+			if ($info['info_status'] == 'deleted') return false; // entry already deleted
 
 			$this->so->write($deleted);
 
-			Link::unlink(0,'infolog',$info_id,'','!file','',true);	// keep the file attachments, hide the rest
+			Link::unlink(0, 'infolog', $info_id, '', '!file', '', true); // keep the file attachments, hide the rest
 		}
 		else
 		{
-			$this->so->delete($info_id,false);	// we delete the children via bo to get all notifications!
+			$this->so->delete($info_id, false); // we delete the children via bo to get all notifications!
 
-			Link::unlink(0,'infolog',$info_id);
+			Link::unlink(0, 'infolog', $info_id);
 		}
 		if ($info['info_status'] != 'deleted')	// dont notify of final purge of already deleted items
 		{
 			// send email notifications and do the history logging
-			if(!$skip_notification)
+			if (!$skip_notification)
 			{
 				if (!is_object($this->tracking))
 				{
 					$this->tracking = new infolog_tracking($this);
 				}
-				$this->tracking->track($deleted,$info,$this->user,true);
+				$this->tracking->track($deleted, $info, $this->user, true);
 			}
 		}
 		return True;
@@ -745,13 +745,13 @@ 
 	*
 	* @return int|boolean info_id on a successfull write or false
 	*/
-	function write(&$values_in, $check_defaults=true, $touch_modified=true, $user2server=true,
-		$skip_notification=false, $throw_exception=false, $purge_cfs=null, $ignore_acl=false)
+	function write(&$values_in, $check_defaults = true, $touch_modified = true, $user2server = true,
+		$skip_notification = false, $throw_exception = false, $purge_cfs = null, $ignore_acl = false)
 	{
 		$values = $values_in;
 		//echo "boinfolog::write()values="; _debug_array($values);
-		if (!$ignore_acl && (!$values['info_id'] && !$this->check_access(0,Acl::EDIT,$values['info_owner']) &&
-			!$this->check_access(0,Acl::ADD,$values['info_owner'])))
+		if (!$ignore_acl && (!$values['info_id'] && !$this->check_access(0, Acl::EDIT, $values['info_owner']) &&
+			!$this->check_access(0, Acl::ADD, $values['info_owner'])))
 		{
 			return false;
 		}
@@ -761,7 +761,7 @@ 
 			$old = $this->read($values['info_id'], false, 'server', $ignore_acl);
 		}
 
-		if (($status_only = !$ignore_acl && $values['info_id'] && !$this->check_access($values,Acl::EDIT)))
+		if (($status_only = !$ignore_acl && $values['info_id'] && !$this->check_access($values, Acl::EDIT)))
 		{
 			if (!isset($values['info_responsible']))
 			{
@@ -773,21 +773,21 @@ 
 			}
 			if (!($status_only = in_array($this->user, (array)$responsible)))	// responsible has implicit right to change status
 			{
-				$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
+				$status_only = !!array_intersect((array)$responsible, array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
 			}
 			if (!$status_only && $values['info_status'] != 'deleted')
 			{
-				$status_only = $undelete = $this->check_access($values['info_id'],self::ACL_UNDELETE);
+				$status_only = $undelete = $this->check_access($values['info_id'], self::ACL_UNDELETE);
 			}
 		}
-		if (!$ignore_acl && ($values['info_id'] && !$this->check_access($values['info_id'],Acl::EDIT) && !$status_only ||
-		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'],Acl::ADD)))
+		if (!$ignore_acl && ($values['info_id'] && !$this->check_access($values['info_id'], Acl::EDIT) && !$status_only ||
+		    !$values['info_id'] && $values['info_id_parent'] && !$this->check_access($values['info_id_parent'], Acl::ADD)))
 		{
 			return false;
 		}
 
 		// Make sure status is still valid if the type changes
-		if($old['info_type'] != $values['info_type'] && $values['info_status'])
+		if ($old['info_type'] != $values['info_type'] && $values['info_status'])
 		{
 			if (isset($this->status[$values['info_type']]) &&
 				!in_array($values['info_status'], array_keys($this->status[$values['info_type']])))
@@ -797,8 +797,8 @@ 
 		}
 		if ($status_only && !$undelete)	// make sure only status gets writen
 		{
-			$set_completed = !$values['info_datecompleted'] &&	// set date completed of finished job, only if its not already set
-				in_array($values['info_status'],array('done','billed','cancelled'));
+			$set_completed = !$values['info_datecompleted'] && // set date completed of finished job, only if its not already set
+				in_array($values['info_status'], array('done', 'billed', 'cancelled'));
 
 			$values = $old;
 			// only overwrite explicitly allowed fields
@@ -813,7 +813,7 @@ 
 				$values['info_percent'] = 100;
 				$forcestatus = true;
 				$status = 'done';
-				if (isset($values['info_type']) && !in_array($values['info_status'],array('done','billed','cancelled'))) {
+				if (isset($values['info_type']) && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) {
 					$forcestatus = false;
 					//echo "set_completed:"; _debug_array($this->status[$values['info_type']]);
 					if (isset($this->status[$values['info_type']]['done'])) {
@@ -827,19 +827,19 @@ 
 						$status = 'cancelled';
 					}
 				}
-				if ($forcestatus && !in_array($values['info_status'],array('done','billed','cancelled'))) $values['info_status'] = $status;
+				if ($forcestatus && !in_array($values['info_status'], array('done', 'billed', 'cancelled'))) $values['info_status'] = $status;
 			}
 			$check_defaults = false;
 		}
 		if ($check_defaults)
 		{
 			if (!$values['info_datecompleted'] &&
-				(in_array($values['info_status'],array('done','billed'))))
+				(in_array($values['info_status'], array('done', 'billed'))))
 			{
-				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now;	// set date completed to today if status == done
+				$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now; // set date completed to today if status == done
 			}
 			// Check for valid status / percent combinations
-			if (in_array($values['info_status'],array('done','billed')))
+			if (in_array($values['info_status'], array('done', 'billed')))
 			{
 				$values['info_percent'] = 100;
 			}
@@ -854,7 +854,7 @@ 
 				// We change percent to match status, not status to match percent
 				$values['info_percent'] = 10;
 			}
-			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'],array('done','billed','cancelled','archive')))
+			if ((int)$values['info_percent'] == 100 && !in_array($values['info_status'], array('done', 'billed', 'cancelled', 'archive')))
 			{
 				//echo "check_defaults:"; _debug_array($this->status[$values['info_type']]);
 				//$values['info_status'] = 'done';
@@ -875,7 +875,7 @@ 
 			}
 			if ($values['info_responsible'] && $values['info_status'] == 'offer')
 			{
-				$values['info_status'] = 'not-started';   // have to match if not finished
+				$values['info_status'] = 'not-started'; // have to match if not finished
 			}
 			if (isset($values['info_subject']) && empty($values['info_subject']))
 			{
@@ -883,18 +883,18 @@ 
 			}
 
 			// Check required custom fields
-			if($throw_exception)
+			if ($throw_exception)
 			{
 				$custom = Api\Storage\Customfields::get('infolog');
-				foreach($custom as $c_name => $c_field)
+				foreach ($custom as $c_name => $c_field)
 				{
-					if($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',',$c_field['type2']);
-					if($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'],$type2)))
+					if ($c_field['type2']) $type2 = is_array($c_field['type2']) ? $c_field['type2'] : explode(',', $c_field['type2']);
+					if ($c_field['needed'] && (!$c_field['type2'] || $c_field['type2'] && in_array($values['info_type'], $type2)))
 					{
 						// Required custom field
-						if(!$values['#'.$c_name])
+						if (!$values['#'.$c_name])
 						{
-							throw new Api\Exception\WrongUserinput(lang('For infolog type %1, %2 is required',lang($values['info_type']),$c_field['label']));
+							throw new Api\Exception\WrongUserinput(lang('For infolog type %1, %2 is required', lang($values['info_type']), $c_field['label']));
 						}
 					}
 				}
@@ -903,16 +903,16 @@ 
 		if (isset($this->group_owners[$values['info_type']]))
 		{
 			$values['info_owner'] = $this->group_owners[$values['info_type']];
-			if (!$ignore_acl && !($this->grants[$this->group_owners[$values['info_type']]] & Acl::EDIT))
+			if (!$ignore_acl && !($this->grants[$this->group_owners[$values['info_type']]]&Acl::EDIT))
 			{
-				if (!$this->check_access($values['info_id'],Acl::EDIT) ||
-					!$values['info_id'] && !$this->check_access($values,Acl::ADD)
+				if (!$this->check_access($values['info_id'], Acl::EDIT) ||
+					!$values['info_id'] && !$this->check_access($values, Acl::ADD)
 				)
 				{
-					return false;	// no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
+					return false; // no edit rights from the group-owner and no implicit rights (delegated and sufficient rights)
 				}
 			}
-			$values['info_access'] = 'public';	// group-owners are allways public
+			$values['info_access'] = 'public'; // group-owners are allways public
 		}
 		elseif (!$values['info_id'] && !$values['info_owner'] || $GLOBALS['egw']->accounts->get_type($values['info_owner']) == 'g')
 		{
@@ -967,10 +967,10 @@ 
 			$to_write['info_id'] = $info_id;
 
 			// if the info responbsible array is not passed, fetch it from old.
-			if (!array_key_exists('info_responsible',$values)) $values['info_responsible'] = $old['info_responsible'];
+			if (!array_key_exists('info_responsible', $values)) $values['info_responsible'] = $old['info_responsible'];
 			if (!is_array($values['info_responsible']))		// this should not happen, bug it does ;-)
 			{
-				$values['info_responsible'] = $values['info_responsible'] ? explode(',',$values['info_responsible']) : array();
+				$values['info_responsible'] = $values['info_responsible'] ? explode(',', $values['info_responsible']) : array();
 				$to_write['info_responsible'] = $values['info_responsible'];
 			}
 
@@ -978,11 +978,11 @@ 
 			if (!$old && is_array($to_write['link_to']['to_id']) && count($to_write['link_to']['to_id']))
 			{
 				//echo "<p>writing links for new entry $info_id</p>\n"; _debug_array($content['link_to']['to_id']);
-				Link::link('infolog',$info_id,$to_write['link_to']['to_id']);
+				Link::link('infolog', $info_id, $to_write['link_to']['to_id']);
 				$values['link_to']['to_id'] = $info_id;
 			}
 			$this->write_check_links($to_write);
-			if(!$values['info_link_id'] || $values['info_link_id'] != $to_write['info_link_id'])
+			if (!$values['info_link_id'] || $values['info_link_id'] != $to_write['info_link_id'])
 			{
 				// Just got a link ID, need to save it
 				$this->so->write($to_write);
@@ -999,20 +999,20 @@ 
 			}
 
 			// create (and remove) links in custom fields
-			if(!is_array($old))
+			if (!is_array($old))
 			{
 				$old = array();
 			}
-			Api\Storage\Customfields::update_links('infolog',$values,$old,'info_id');
+			Api\Storage\Customfields::update_links('infolog', $values, $old, 'info_id');
 
 			// Check for restore of deleted entry, restore held links
-			if($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
+			if ($old['info_status'] == 'deleted' && $values['info_status'] != 'deleted')
 			{
 				Link::restore('infolog', $info_id);
 			}
 
 			// notify the link-class about the update, as other apps may be subscribt to it
-			Link::notify_update('infolog',$info_id,$values);
+			Link::notify_update('infolog', $info_id, $values);
 
 			// pre-cache the new values
 			self::set_link_cache($values);
@@ -1023,39 +1023,39 @@ 
 				$this->tracking = new infolog_tracking($this);
 			}
 
-			if ($old && ($missing_fields = array_diff_key($old,$values)))
+			if ($old && ($missing_fields = array_diff_key($old, $values)))
 			{
 				// Some custom fields (multiselect with nothing selected) will be missing,
 				// and that's OK.  Don't put them back.
-				foreach(array_keys($missing_fields) as $field)
+				foreach (array_keys($missing_fields) as $field)
 				{
-					if(array_key_exists($field, $values_in))
+					if (array_key_exists($field, $values_in))
 					{
 						unset($missing_fields[$field]);
 					}
 				}
-				$values = array_merge($values,$missing_fields);
+				$values = array_merge($values, $missing_fields);
 			}
 			// Add keys missing in the $to_write array
-			if (($missing_fields = array_diff_key($values,$to_write)))
+			if (($missing_fields = array_diff_key($values, $to_write)))
 			{
-				$to_write = array_merge($to_write,$missing_fields);
+				$to_write = array_merge($to_write, $missing_fields);
 			}
-			$this->tracking->track($to_write,$old,$this->user,$values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
-				null,$skip_notification);
+			$this->tracking->track($to_write, $old, $this->user, $values['info_status'] == 'deleted' || $old['info_status'] == 'deleted',
+				null, $skip_notification);
 
 			if ($info_from_set) $values['info_from'] = '';
 
 			// Change new values back to user time before sending them back
-			if($user2server)
+			if ($user2server)
 			{
 				$this->time2time($values);
 			}
 			// merge changes (keeping extra values from the UI)
-			$values_in = array_merge($values_in,$values);
+			$values_in = array_merge($values_in, $values);
 
 			// Update modified timestamp of parent
-			if($values['info_id_parent'] && $touch_modified)
+			if ($values['info_id_parent'] && $touch_modified)
 			{
 				$parent = $this->read($values['info_id_parent'], true, 'server', true);
 				$this->write($parent, false, true, false, true, false, null, $ignore_acl);
@@ -1077,14 +1077,14 @@ 
 		$old_link_id = (int)$values['info_link_id'];
 		$from = $values['info_from'];
 
-		if($values['info_contact'] && !(
+		if ($values['info_contact'] && !(
 				is_array($values['info_contact']) && $values['info_contact']['id'] == 'none'
 			) || (
 				is_array($values['info_contact']) && $values['info_contact']['id'] == 'none' &&
 				array_key_exists('search', $values['info_contact'])
 		))
 		{
-			if(is_array($values['info_contact']))
+			if (is_array($values['info_contact']))
 			{
 				// eTemplate2 returns the array all ready
 				$app = $values['info_contact']['app'];
@@ -1102,17 +1102,17 @@ 
 			}
 			else if ($app && $id)
 			{
-				if(!is_array($values['link_to']))
+				if (!is_array($values['link_to']))
 				{
 					$values['link_to'] = array();
 				}
 				$values['info_link_id'] = (int)($info_link_id = Link::link(
 						'infolog',
 						$values['info_id'],
-						$app,$id
+						$app, $id
 				));
 				$values['info_from'] = Link::title($app, $id);
-				if($values['pm_id'])
+				if ($values['pm_id'])
 				{
 					// They just changed the contact, don't clear the project
 					unset($old_link_id);
@@ -1136,7 +1136,7 @@ 
 			$values['info_link_id'] = (int)($info_link_id = Link::link(
 				'infolog',
 				$values['info_id'],
-				$app,$id
+				$app, $id
 			));
 		}
 		else
@@ -1145,14 +1145,14 @@ 
 			unset($values['info_contact']);
 			$values['info_from'] = $from ? $from : null;
 		}
-		if($values['info_id'] && $values['old_pm_id'] !== $values['pm_id'])
+		if ($values['info_id'] && $values['old_pm_id'] !== $values['pm_id'])
 		{
-			Link::unlink(0,'infolog',$values['info_id'],0,'projectmanager',$values['old_pm_id']);
+			Link::unlink(0, 'infolog', $values['info_id'], 0, 'projectmanager', $values['old_pm_id']);
 			// Project has changed, but link is not to project
-			if($values['pm_id'])
+			if ($values['pm_id'])
 			{
 				$link_id = Link::link('infolog', $values['info_id'], 'projectmanager', $values['pm_id']);
-				if(!$values['info_link_id'])
+				if (!$values['info_link_id'])
 				{
 					$values['info_link_id'] = $link_id;
 				}
@@ -1167,7 +1167,7 @@ 
 		{
 			$link = Link::get_link($old_link_id);
 			// remove selected project, if removed link is that project
-			if($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $values['old_pm_id'])
+			if ($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $values['old_pm_id'])
 			{
 				unset($values['pm_id'], $values['old_pm_id']);
 			}
@@ -1187,9 +1187,9 @@ 
 	 * @param int|array $info_id id
 	 * @return int|array number of subs
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
-		return $this->so->anzSubs( $info_id );
+		return $this->so->anzSubs($info_id);
 	}
 
 	/**
@@ -1206,23 +1206,23 @@ 
 	 * @param boolean $no_acl =false true: ignore all acl
 	 * @return array with id's as key of the matching log-entries
 	 */
-	function &search(&$query, $no_acl=false)
+	function &search(&$query, $no_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($query).')');
 
-		if($query['filter'] == 'bydate')
+		if ($query['filter'] == 'bydate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'duedate')
 		{
 			if (is_int($query['startdate'])) $query['col_filter'][] = 'info_enddate >= '.$GLOBALS['egw']->db->quote($query['startdate']);
-			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate']+(60*60*24)-1);
+			if (is_int($query['enddate'])) $query['col_filter'][] = 'info_enddate <= '.$GLOBALS['egw']->db->quote($query['enddate'] + (60 * 60 * 24) - 1);
 		}
 		elseif ($query['filter'] == 'private')
 		{
-			$query['col_filter'][] = 'info_access = ' . $GLOBALS['egw']->db->quote('private');
+			$query['col_filter'][] = 'info_access = '.$GLOBALS['egw']->db->quote('private');
 		}
 		if (!isset($query['date_format']) || $query['date_format'] != 'server')
 		{
@@ -1232,7 +1232,7 @@ 
 				{
 					if (!empty($query['col_filter'][$key]))
 					{
-						$query['col_filter'][$key] = Api\DateTime::user2server($query['col_filter'][$key],'ts');
+						$query['col_filter'][$key] = Api\DateTime::user2server($query['col_filter'][$key], 'ts');
 					}
 				}
 			}
@@ -1245,7 +1245,7 @@ 
 		{
 			foreach ($ret as $id => &$data)
 			{
-				if (!$no_acl && !$this->check_access($data,Acl::READ))
+				if (!$no_acl && !$this->check_access($data, Acl::READ))
 				{
 					unset($ret[$id]);
 					continue;
@@ -1261,7 +1261,7 @@ 
 							if ($time->format('Hi') == '0000')
 							{
 								// we keep dates the same in user-time
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$time = new Api\DateTime($arr, Api\DateTime::$user_timezone);
 							}
 							else
@@ -1269,7 +1269,7 @@ 
 								$time->setTimezone(Api\DateTime::$user_timezone);
 							}
 						}
-						$data[$key] = Api\DateTime::to($time,'ts');
+						$data[$key] = Api\DateTime::to($time, 'ts');
 					}
 				}
 				// pre-cache title and file access
@@ -1286,7 +1286,7 @@ 
 	 * @param array $filter = array('filter'=>'own','info_type'=>'task')
 	 * @return string
 	 */
-	public function getctag(array $filter=array('filter'=>'own','info_type'=>'task'))
+	public function getctag(array $filter = array('filter'=>'own', 'info_type'=>'task'))
 	{
 		$filter += array(
 			'order'			=> 'info_datemodified',
@@ -1298,7 +1298,7 @@ 
 		// we need to query deleted entries too for a ctag!
 		$filter['filter'] .= '+deleted';
 
-		$result =& $this->search($filter);
+		$result = & $this->search($filter);
 
 		if (empty($result)) return 'EGw-empty-wGE';
 
@@ -1320,12 +1320,12 @@ 
 	 * @param string $_date
 	 * @return array $content array for uiinfolog
 	 */
-	function import_mail($_addresses,$_subject,$_message,$_attachments,$_date)
+	function import_mail($_addresses, $_subject, $_message, $_attachments, $_date)
 	{
-		foreach($_addresses as $address)
+		foreach ($_addresses as $address)
 		{
 			$names[] = $address['name'];
-			$emails[] =$address['email'];
+			$emails[] = $address['email'];
 		}
 
 		$type = isset($this->enums['type']['email']) ? 'email' : 'note';
@@ -1333,7 +1333,7 @@ 
 		$info = array(
 			'info_id' => 0,
 			'info_type' => $type,
-			'info_from' => implode(', ',$names) . implode(', ', $emails),
+			'info_from' => implode(', ', $names).implode(', ', $emails),
 			'info_subject' => $_subject,
 			'info_des' => $_message,
 			'info_startdate' => Api\DateTime::server2user($_date),
@@ -1352,16 +1352,16 @@ 
 		$contacts = array();
 		foreach ($emails as $mailadr)
 		{
-			$contacts = array_merge($contacts,(array)$addressbook->search(
+			$contacts = array_merge($contacts, (array)$addressbook->search(
 				array(
 					'email' => $mailadr,
 					'email_home' => $mailadr
-				),True,'','','',false,'OR',false,null,'',false));
+				), True, '', '', '', false, 'OR', false, null, '', false));
 		}
 		if (!$contacts || !is_array($contacts) || !is_array($contacts[0]))
 		{
-			$info['msg'] = lang('Attention: No Contact with address %1 found.',$info['info_from']);
-			$info['info_custom_from'] = true;	// show the info_from line and NOT only the link
+			$info['msg'] = lang('Attention: No Contact with address %1 found.', $info['info_from']);
+			$info['info_custom_from'] = true; // show the info_from line and NOT only the link
 		}
 		else
 		{
@@ -1371,21 +1371,21 @@ 
 			// create the rest a "ordinary" links
 			foreach ($contacts as $contact)
 			{
-				Link::link('infolog',$info['link_to']['to_id'],'addressbook',$contact['id']);
+				Link::link('infolog', $info['link_to']['to_id'], 'addressbook', $contact['id']);
 			}
 		}
 		if (is_array($_attachments))
 		{
 			foreach ($_attachments as $attachment)
 			{
-				if($attachment['egw_data'])
+				if ($attachment['egw_data'])
 				{
-					Link::link('infolog',$info['link_to']['to_id'],Link::DATA_APPNAME,  $attachment);
+					Link::link('infolog', $info['link_to']['to_id'], Link::DATA_APPNAME, $attachment);
 				}
-				else if(is_readable($attachment['tmp_name']) ||
+				else if (is_readable($attachment['tmp_name']) ||
 					(Vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
 				{
-					Link::link('infolog',$info['link_to']['to_id'],'file',  $attachment);
+					Link::link('infolog', $info['link_to']['to_id'], 'file', $attachment);
 				}
 			}
 		}
@@ -1404,14 +1404,14 @@ 
 	{
 		if (!is_array($info))
 		{
-			$info = $this->read( $info,false );
+			$info = $this->read($info, false);
 		}
 		if (!$info)
 		{
 			return $info;
 		}
-		$title = !empty($info['info_subject']) ? $info['info_subject'] :self::subject_from_des($info['info_descr']);
-		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id']?' (#'.$info['info_id'].')':'');
+		$title = !empty($info['info_subject']) ? $info['info_subject'] : self::subject_from_des($info['info_descr']);
+		return $title.($GLOBALS['egw_info']['user']['preferences']['infolog']['show_id'] ? ' (#'.$info['info_id'].')' : '');
 	}
 
 	/**
@@ -1422,15 +1422,15 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		foreach ($this->search($params=array(
+		foreach ($this->search($params = array(
 			'col_filter' => array('info_id' => $ids),
 		)) as $info)
 		{
 			$titles[$info['info_id']] = $this->link_title($info);
 		}
-		foreach (array_diff($ids,array_keys($titles)) as $id)
+		foreach (array_diff($ids, array_keys($titles)) as $id)
 		{
-			$titles[$id] = false;	// we assume every not returned entry to be not readable, as we notify the link class about all deletes
+			$titles[$id] = false; // we assume every not returned entry to be not readable, as we notify the link class about all deletes
 		}
 		return $titles;
 	}
@@ -1457,7 +1457,7 @@ 
 		$content = array();
 		if (is_array($ids))
 		{
-			foreach(array_keys($ids) as $id)
+			foreach (array_keys($ids) as $id)
 			{
 				$content[$id] = $this->link_title($id);
 			}
@@ -1474,10 +1474,10 @@ 
 	 * @param int $user = null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used
-		return $this->check_access($id,$check,0,$user);
+		unset($rel_path); // not used
+		return $this->check_access($id, $check, 0, $user);
 	}
 
 	/**
@@ -1487,10 +1487,9 @@ 
 	 */
 	function set_link_cache(array $info)
 	{
-		Link::set_cache('infolog',$info['info_id'],
+		Link::set_cache('infolog', $info['info_id'],
 			$this->link_title($info),
-			$this->file_access($info,Acl::EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT :
-			($this->file_access($info,Acl::READ) ? Acl::READ : 0));
+			$this->file_access($info, Acl::EDIT) ? EGW_ACL_READ|EGW_ACL_EDIT : ($this->file_access($info, Acl::READ) ? Acl::READ : 0));
 	}
 
 	/**
@@ -1504,8 +1503,8 @@ 
 	function cal_to_include($args)
 	{
 		//echo "<p>cal_to_include("; print_r($args); echo ")</p>\n";
-		$user = (int) $args['owner'];
-		if ($user <= 0 && !checkdate($args['month'],$args['day'],$args['year']))
+		$user = (int)$args['owner'];
+		if ($user <= 0 && !checkdate($args['month'], $args['day'], $args['year']))
 		{
 			return False;
 		}
@@ -1513,7 +1512,7 @@ 
 
 		$do_events = $args['location'] == 'calendar_include_events';
 		$to_include = array();
-		$date_wanted = sprintf('%04d/%02d/%02d',$args['year'],$args['month'],$args['day']);
+		$date_wanted = sprintf('%04d/%02d/%02d', $args['year'], $args['month'], $args['day']);
 		$query = array(
 			'order' => $args['order'] ? $args['order'] : 'info_startdate',
 			'sort'  => $args['sort'] ? $args['sort'] : ($do_events ? 'ASC' : 'DESC'),
@@ -1522,34 +1521,34 @@ 
 		);
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] || $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] === '0')
 		{
-			$query['col_filter']['info_type'] = explode(',',$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
+			$query['col_filter']['info_type'] = explode(',', $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
 		}
 		elseif ($this->customfields && !$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show_custom'])
 		{
-			$query['col_filter']['info_type'] = array('task','phone','note','email');
+			$query['col_filter']['info_type'] = array('task', 'phone', 'note', 'email');
 		}
 		while ($infos = $this->search($query))
 		{
 			foreach ($infos as $info)
 			{
-				$start = new Api\DateTime($info['info_startdate'],Api\DateTime::$user_timezone);
+				$start = new Api\DateTime($info['info_startdate'], Api\DateTime::$user_timezone);
 				$title = ($do_events ? $start->format(false).' ' : '').
 					$info['info_subject'];
-				$view = Link::view('infolog',$info['info_id']);
+				$view = Link::view('infolog', $info['info_id']);
 				$size = null;
-				$edit = Link::edit('infolog',$info['info_id'], $size);
+				$edit = Link::edit('infolog', $info['info_id'], $size);
 				$edit['size'] = $size;
-				$content=array();
+				$content = array();
 				$status = $this->status[$info['info_type']][$info['info_status']];
 				$icons = array();
-				foreach(array(
+				foreach (array(
 					$info['info_type'] => 'navbar',
 					$status => 'status'
 				) as $icon => $default)
 				{
-					$icons[Api\Image::find('infolog',$icon) ? $icon : $default] = $icon;
+					$icons[Api\Image::find('infolog', $icon) ? $icon : $default] = $icon;
 				}
-				$content[] = Api\Html::a_href($title,$view);
+				$content[] = Api\Html::a_href($title, $view);
 				$html = Api\Html::table(array(1 => $content));
 
 				$to_include[] = array(
@@ -1562,9 +1561,9 @@ 
 					'content'   => $html,
 				);
 			}
-			if ($query['total'] <= ($query['start']+=count($infos)))
+			if ($query['total'] <= ($query['start'] += count($infos)))
 			{
-				break;	// no more availible
+				break; // no more availible
 			}
 		}
 		//echo "boinfolog::cal_to_include("; print_r($args); echo ")<pre>"; print_r($to_include); echo "</pre>\n";
@@ -1587,7 +1586,7 @@ 
 				'cols' => 'main.info_id,info_type,info_status,info_percent,info_id_parent',
 			);
 			$infos = array();
-			foreach($this->search($query) as $row)
+			foreach ($this->search($query) as $row)
 			{
 				$infos[$row['info_id']] = array(
 					'status' => $row['info_type'] != 'phone' && $row['info_status'] == 'ongoing' ?
@@ -1596,16 +1595,16 @@ 
 						'ongoing' : 'infolog/'.$row['info_status'],
 					'class'  => $row['info_id_parent'] ? 'infolog_rowHasParent' : null,
 				);
-				if (Api\Image::find('infolog', $icon=$row['info_type'].'_element') ||
-					Api\Image::find('infolog', $icon=$row['info_type']))
+				if (Api\Image::find('infolog', $icon = $row['info_type'].'_element') ||
+					Api\Image::find('infolog', $icon = $row['info_type']))
 				{
 					$infos[$row['info_id']]['icon'] = 'infolog/'.$icon;
 				}
 			}
 			$anzSubs = $this->anzSubs(array_keys($infos));
-			if($anzSubs && is_array($anzSubs))
+			if ($anzSubs && is_array($anzSubs))
 			{
-				foreach($anzSubs as $info_id => $subs)
+				foreach ($anzSubs as $info_id => $subs)
 				{
 					if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs';
 				}
@@ -1625,18 +1624,18 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $info_id=-1)
+	function find_or_add_categories($catname_list, $info_id = -1)
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Api\Categories($this->user,'infolog');
+			$this->categories = new Api\Categories($this->user, 'infolog');
 		}
 		$old_cats_preserve = array();
 		if ($info_id && $info_id > 0)
 		{
 			// preserve Api\Categories without users read access
 			$old_infolog = $this->read($info_id);
-			$old_categories = explode(',',$old_infolog['info_cat']);
+			$old_categories = explode(',', $old_infolog['info_cat']);
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
 				foreach ($old_categories as $cat_id)
@@ -1697,15 +1696,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Api\Categories($this->user,'infolog');
+			$this->categories = new Api\Categories($this->user, 'infolog');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(Acl::READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -1732,19 +1731,19 @@ 
 
 		$save_account_id = $GLOBALS['egw_info']['user']['account_id'];
 		$save_prefs      = $GLOBALS['egw_info']['user']['preferences'];
-		foreach($users as $user)
+		foreach ($users as $user)
 		{
-			if (!($email = $GLOBALS['egw']->accounts->id2name($user,'account_email'))) continue;
+			if (!($email = $GLOBALS['egw']->accounts->id2name($user, 'account_email'))) continue;
 			// create the enviroment for $user
 			$this->user = $GLOBALS['egw_info']['user']['account_id'] = $user;
 			$GLOBALS['egw']->preferences->__construct($user);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
 			$GLOBALS['egw']->acl->__construct($user);
-			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog',$this->group_owners ? $this->group_owners : true);
-			$this->so = new infolog_so($this->grants);	// so caches it's filters
+			$this->grants = $GLOBALS['egw']->acl->get_grants('infolog', $this->group_owners ? $this->group_owners : true);
+			$this->so = new infolog_so($this->grants); // so caches it's filters
 
 			$notified_info_ids = array();
-			foreach(array(
+			foreach (array(
 				'notify_due_responsible'   => 'open-responsible-enddate',
 				'notify_due_delegated'     => 'open-delegated-enddate',
 				'notify_start_responsible' => 'open-responsible-date',
@@ -1753,44 +1752,44 @@ 
 			{
 				if (!($pref_value = $GLOBALS['egw_info']['user']['preferences']['infolog'][$pref])) continue;
 
-				$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
+				$filter .= date('Y-m-d', time() + 24 * 60 * 60 * (int)$pref_value);
 				//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
 
 				$params = array('filter' => $filter, 'custom_fields' => true, 'subs' => true);
-				foreach($this->so->search($params) as $info)
+				foreach ($this->so->search($params) as $info)
 				{
 					// check if we already send a notification for that infolog entry, eg. starting and due on same day
-					if (in_array($info['info_id'],$notified_info_ids)) continue;
+					if (in_array($info['info_id'], $notified_info_ids)) continue;
 
 					if (is_null($this->tracking) || $this->tracking->user != $user)
 					{
 						$this->tracking = new infolog_tracking($this);
 					}
-					switch($pref)
+					switch ($pref)
 					{
 						case 'notify_due_responsible':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_due_delegated':
-							$info['prefix'] = lang('Due %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is due at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_enddate'],false));
+							$info['prefix'] = lang('Due %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is due at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_enddate'], false));
 							break;
 						case 'notify_start_responsible':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you are responsible for is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you are responsible for is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 						case 'notify_start_delegated':
-							$info['prefix'] = lang('Starting %1',$this->enums['type'][$info['info_type']]);
-							$info['message'] = lang('%1 you delegated is starting at %2',$this->enums['type'][$info['info_type']],
-								$this->tracking->datetime($info['info_startdate'],null));
+							$info['prefix'] = lang('Starting %1', $this->enums['type'][$info['info_type']]);
+							$info['message'] = lang('%1 you delegated is starting at %2', $this->enums['type'][$info['info_type']],
+								$this->tracking->datetime($info['info_startdate'], null));
 							break;
 					}
 					//error_log("notifiying $user($email) about $info[info_subject]: $info[message]");
-					$this->tracking->send_notification($info,null,$email,$user,$pref);
+					$this->tracking->send_notification($info, null, $email, $user, $pref);
 
 					$notified_info_ids[] = $info['info_id'];
 				}
@@ -1853,7 +1852,7 @@ 
 	 * @param string $x_infolog_status preserved original infolog status
 	 * @return string
 	 */
-	function vtodo2status($_vtodo_status,$x_infolog_status=null)
+	function vtodo2status($_vtodo_status, $x_infolog_status = null)
 	{
 		$vtodo_status = strtoupper($_vtodo_status);
 
@@ -1877,7 +1876,7 @@ 
 	 * @param array &$icons = null on return name of icons
 	 * @return array value => (commaseparated) translations
 	 */
-	function get_status($type=null, array &$icons=null)
+	function get_status($type = null, array &$icons = null)
 	{
 		// if filtered by type, show only the stati of the filtered type
 		if ($type && isset($this->status[$type]))
@@ -1887,16 +1886,16 @@ 
 		else	// show all stati
 		{
 			$statis = $icons = array();
-			foreach($this->status as $t => $stati)
+			foreach ($this->status as $t => $stati)
 			{
 				if ($t === 'defaults') continue;
-				foreach($stati as $val => $label)
+				foreach ($stati as $val => $label)
 				{
 					$statis[$val][$label] = lang($label);
 					if (!isset($icons[$val])) $icons[$val] = $label;
 				}
 			}
-			foreach($statis as $val => &$labels)
+			foreach ($statis as $val => &$labels)
 			{
 				$labels = implode(', ', $labels);
 			}
@@ -1912,7 +1911,7 @@ 
 	 */
 	function activate($info)
 	{
-		switch((int)$info['info_percent'])
+		switch ((int)$info['info_percent'])
 		{
 			case 0:		return 'not-started';
 			case 100:	return 'done';
@@ -1931,8 +1930,8 @@ 
 		#Horde::logMessage("getParentID($_guid)",  __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
 		$parentID = False;
-		$myfilter = array('col_filter' => array('info_uid'=>$_guid)) ;
-		if ($_guid && ($found=$this->search($myfilter)) && ($uidmatch = array_shift($found)))
+		$myfilter = array('col_filter' => array('info_uid'=>$_guid));
+		if ($_guid && ($found = $this->search($myfilter)) && ($uidmatch = array_shift($found)))
 		{
 			$parentID = $uidmatch['info_id'];
 		}
@@ -1949,7 +1948,7 @@ 
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
-	function findInfo($infoData, $relax=false, $tzid=null)
+	function findInfo($infoData, $relax = false, $tzid = null)
 	{
 		$foundInfoLogs = array();
 		$filter = array();
@@ -1957,7 +1956,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX, ': 'EXACT, ') . $tzid . ')[InfoData]:'
+				. '('.($relax ? 'RELAX, ' : 'EXACT, ').$tzid.')[InfoData]:'
 				. array2string($infoData));
 		}
 
@@ -1976,9 +1975,9 @@ 
 		if (!$relax && !empty($infoData['info_uid']))
 		{
 			$filter = array('col_filter' => array('info_uid' => $infoData['info_uid']));
-			foreach($this->so->search($filter) as $egwData)
+			foreach ($this->so->search($filter) as $egwData)
 			{
-				if (!$this->check_access($egwData,Acl::READ)) continue;
+				if (!$this->check_access($egwData, Acl::READ)) continue;
 				$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
 			}
 			return $foundInfoLogs;
@@ -2006,7 +2005,7 @@ 
 				$text = '';
 				foreach ($matches as $chunk)
 				{
-					if (strlen($text) <  strlen($chunk[0]))
+					if (strlen($text) < strlen($chunk[0]))
 					{
 						$text = $chunk[0];
 					}
@@ -2030,7 +2029,7 @@ 
 
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData, Acl::READ)) continue;
 
 			switch ($infoData['info_type'])
 			{
@@ -2047,9 +2046,9 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[location mismatch]: '
-								. $infoData['info_location'] . ' <> ' . $egwData['info_location']);
+								. $infoData['info_location'].' <> '.$egwData['info_location']);
 						}
-						continue 2;	// +1 for switch
+						continue 2; // +1 for switch
 					}
 				default:
 					if (!empty($egwData['info_des']))
@@ -2064,9 +2063,9 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[description mismatch]: '
-								. $infoData['info_des'] . ' <> ' . $egwData['info_des']);
+								. $infoData['info_des'].' <> '.$egwData['info_des']);
 						}
-						continue 2;	// +1 for switch
+						continue 2; // +1 for switch
 					}
 					// no further criteria to match
 					$foundInfoLogs[$egwData['info_id']] = $egwData['info_id'];
@@ -2078,7 +2077,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[FOUND]:' . array2string($foundInfoLogs));
+					. '()[FOUND]:'.array2string($foundInfoLogs));
 			}
 			return $foundInfoLogs;
 		}
@@ -2103,7 +2102,7 @@ 
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		foreach ($this->so->search($filter) as $itemID => $egwData)
 		{
-			if (!$this->check_access($egwData,Acl::READ)) continue;
+			if (!$this->check_access($egwData, Acl::READ)) continue;
 			// Horde::logMessage("findVTODO Trying\n"
 			//	. print_r($egwData, true),
 			//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -2115,7 +2114,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[category mismatch]: '
-						. $infoData['info_cat'] . ' <> ' . $egwData['info_cat']);
+						. $infoData['info_cat'].' <> '.$egwData['info_cat']);
 				}
 				continue;
 			}
@@ -2125,15 +2124,15 @@ 
 				if (isset($egwData['info_startdate']) && $egwData['info_startdate'])
 				{
 					// We compare the date only
-					$taskTime = new Api\DateTime($infoData['info_startdate'],Api\DateTime::$server_timezone);
-					$egwTime = new Api\DateTime($egwData['info_startdate'],Api\DateTime::$server_timezone);
+					$taskTime = new Api\DateTime($infoData['info_startdate'], Api\DateTime::$server_timezone);
+					$egwTime = new Api\DateTime($egwData['info_startdate'], Api\DateTime::$server_timezone);
 					if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 					{
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 								. '()[start mismatch]: '
-								. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+								. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 						}
 						continue;
 					}
@@ -2160,7 +2159,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 							. '()[status mismatch]: '
-							. $infoData['info_status'] . ' <> ' . $egwData['info_status']);
+							. $infoData['info_status'].' <> '.$egwData['info_status']);
 					}
 					continue;
 				}
@@ -2170,15 +2169,15 @@ 
 					if (isset($egwData['info_enddate']) && $egwData['info_enddate'])
 					{
 						// We compare the date only
-						$taskTime = new Api\DateTime($infoData['info_enddate'],Api\DateTime::$server_timezone);
-						$egwTime = new Api\DateTime($egwData['info_enddate'],Api\DateTime::$server_timezone);
+						$taskTime = new Api\DateTime($infoData['info_enddate'], Api\DateTime::$server_timezone);
+						$egwTime = new Api\DateTime($egwData['info_enddate'], Api\DateTime::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[DUE mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2199,15 +2198,15 @@ 
 					if (isset($egwData['info_datecompleted']) && $egwData['info_datecompleted'])
 					{
 						// We compare the date only
-						$taskTime = new Api\DateTime($infoData['info_datecompleted'],Api\DateTime::$server_timezone);
-						$egwTime = new Api\DateTime($egwData['info_datecompleted'],Api\DateTime::$server_timezone);
+						$taskTime = new Api\DateTime($infoData['info_datecompleted'], Api\DateTime::$server_timezone);
+						$egwTime = new Api\DateTime($egwData['info_datecompleted'], Api\DateTime::$server_timezone);
 						if ($taskTime->format('Ymd') != $egwTime->format('Ymd'))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 									. '()[completed mismatch]: '
-									. $taskTime->format('Ymd') . ' <> ' . $egwTime->format('Ymd'));
+									. $taskTime->format('Ymd').' <> '.$egwTime->format('Ymd'));
 							}
 							continue;
 						}
@@ -2237,7 +2236,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]:' . array2string($foundInfoLogs));
+				. '()[FOUND]:'.array2string($foundInfoLogs));
 		}
 		return $foundInfoLogs;
 	}