EGroupware / egroupware

importexport/inc/class.importexport_definitions_ui.inc.php

Spacing +157 added lines, -158 removed lines

@@ -56,12 +56,12 @@ 
 	function __construct()
 	{
 		// we cant deal with notice and warnings, as we are on ajax!
-		error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+		error_reporting(E_ALL&~E_NOTICE&~E_WARNING);
 		$GLOBALS['egw']->translation->add_app(self::_appname);
 		$GLOBALS['egw_info']['flags']['currentapp'] = self::_appname;
 		
 		$this->etpl = new etemplate_new();
-		$this->clock = html::image(self::_appname,'clock');
+		$this->clock = html::image(self::_appname, 'clock');
 		$this->steps = array(
 			'wizard_step10' => lang('Choose an application'),
 			'wizard_step20' => lang('Choose a plugin'),
@@ -78,18 +78,18 @@ 
 	 *
 	 * @param array $content=null
 	 */
-	function index($content = null,$msg='')
+	function index($content = null, $msg = '')
 	{
 		$filter = array('name' => '*');
 
-		if($GLOBALS['egw_info']['user']['apps']['admin']) {
+		if ($GLOBALS['egw_info']['user']['apps']['admin']) {
 			// Any public definition
-			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = ' . $GLOBALS['egw_info']['user']['account_id'] . ')';
+			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = '.$GLOBALS['egw_info']['user']['account_id'].')';
 		} else {
 			// Filter private definitions
 			$filter['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			$config = config::read('phpgwapi');
-			if($config['export_limit'] == 'no' && !bo_merge::is_export_limit_excepted()) {
+			if ($config['export_limit'] == 'no' && !bo_merge::is_export_limit_excepted()) {
 				$filter['type'] = 'import';
 			}
 		}
@@ -100,12 +100,12 @@ 
 			if (isset($content['nm']['rows']['delete']))
 			{
 				$content['nm']['action'] = 'delete';
-				$content['nm']['selected'] = array_keys($content['nm']['rows']['delete'],'pressed');
+				$content['nm']['selected'] = array_keys($content['nm']['rows']['delete'], 'pressed');
 			}
-			elseif(($button = array_search('pressed',$content['nm']['rows'])) !== false)
+			elseif (($button = array_search('pressed', $content['nm']['rows'])) !== false)
 			{
 				$selected = $content['nm']['rows']['selected'];
-				if(count($selected) < 1 || !is_array($selected)) common::egw_exit();
+				if (count($selected) < 1 || !is_array($selected)) common::egw_exit();
 				switch ($button)
 				{
 					case 'delete_selected' :
@@ -127,54 +127,54 @@ 
 				else
 				{
 					// Action has an additional parameter
-					if(in_array($content['nm']['action'], array('owner', 'allowed')))
+					if (in_array($content['nm']['action'], array('owner', 'allowed')))
 					{
 						$action = $content['nm']['action'];
-						if($content['nm']['action'] == 'allowed')
+						if ($content['nm']['action'] == 'allowed')
 						{
 							$content['allowed'] = $content['allowed_popup']['allowed_private'] == 'true' ? null : (
-								$content['allowed_popup']['all_users']=='true' ? 'all' : implode(',',$content['allowed_popup']['allowed'])
+								$content['allowed_popup']['all_users'] == 'true' ? 'all' : implode(',', $content['allowed_popup']['allowed'])
 							);
 						}
 						else
 						{
 							$content['owner'] = $content['owner_popup']['owner'];
 						}
-						if(is_array($content[$content['nm']['action']]))
+						if (is_array($content[$content['nm']['action']]))
 						{
-							$content[$content['nm']['action']] = implode(',',$content[$content['nm']['action']]);
+							$content[$content['nm']['action']] = implode(',', $content[$content['nm']['action']]);
 						}
-						$content['nm']['action'] .= '_' . $content[$action];
+						$content['nm']['action'] .= '_'.$content[$action];
 						unset($content[$action]);
 						unset($content['allowed_popup']);
 					}
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'index',$msg))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'index', $msg))
 					{
-						$msg .= lang('%1 definition(s) %2',$success,$action_msg);
+						$msg .= lang('%1 definition(s) %2', $success, $action_msg);
 					}
-					elseif(empty($msg))
+					elseif (empty($msg))
 					{
-						$msg .= lang('%1 definition(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 definition(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 				}
 			}
 		}
 
-		if(!is_array($content['nm'])) {
+		if (!is_array($content['nm'])) {
 			$content['nm'] = array(
 				'get_rows'	=> 'importexport.importexport_definitions_ui.get_rows',
 				'no_cat'	=> true,
 				'no_filter'	=> true,
 				'no_filter2'	=> true,
-				'csv_fields'	=> false,	// Disable CSV export, uses own export
-				'default_cols'  => '!actions',  // switch legacy actions column and row off by default
+				'csv_fields'	=> false, // Disable CSV export, uses own export
+				'default_cols'  => '!actions', // switch legacy actions column and row off by default
 				'row_id'	=> 'definition_id',
 				'placeholder_actions' => array('add')
 			);
-			if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
+			if ($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
 		}
-		if(egw_session::appsession('index', 'importexport'))
+		if (egw_session::appsession('index', 'importexport'))
 		{
 			$content['nm'] = array_merge($content['nm'], egw_session::appsession('index', 'importexport'));
 		}
@@ -191,14 +191,14 @@ 
 		);
 		foreach ($this->plugins as $appname => $options)
 		{
-			if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if ($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
 				$sel_options['application'][$appname] = lang($appname);
 			}
 		}
-		if($msg) $content['msg'] = $msg;
+		if ($msg) $content['msg'] = $msg;
 
 		$etpl = new etemplate_new(self::_appname.'.definition_index');
-		return $etpl->exec( self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv );
+		return $etpl->exec(self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv);
 	}
 
 	private function get_actions() {
@@ -287,7 +287,7 @@ 
 		);
 
 		// Unset admin actions
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			unset($actions['schedule']);
 		}
@@ -306,27 +306,27 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$selected,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $selected, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		//error_log( __METHOD__."('$action', ".array2string($selected).', '.array2string($use_all).",,, '$session_name')");
 		if ($use_all)
 		{
 			// get the whole selection
-			$old_query = $query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'importexport');
+			$old_query = $query = is_array($session_name) ? $session_name : egw_session::appsession($session_name, 'importexport');
 
-			@set_time_limit(0);				// switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;		// all
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->get_rows($query,$rows,$readonlys);
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->get_rows($query, $rows, $readonlys);
 
 			$selected = array();
-			foreach($rows as $row) {
+			foreach ($rows as $row) {
 				$selected[] = $row['definition_id'];
 			}
-			if(!is_array($session_name))
+			if (!is_array($session_name))
 			{
 				// Restore old query
-				egw_session::appsession($session_name, 'importexport',$old_query);
+				egw_session::appsession($session_name, 'importexport', $old_query);
 			}
 		}
 
@@ -335,10 +335,10 @@ 
 
 		$bodefinitions = new importexport_definitions_bo(false, true);
 
-		switch($action) {
+		switch ($action) {
 			case 'execute':
 				// There's probably a way to do this in just JS, all the info should be there...
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
 					$link = egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_'.$definition['type'].'_ui.'.$definition['type'].'_dialog',
@@ -349,14 +349,14 @@ 
 				}
 				break;
 			case 'allowed':
-				$action = 'allowed_users';// Field is allowed_users, popup doesn't like _
+				$action = 'allowed_users'; // Field is allowed_users, popup doesn't like _
 			case 'owner':
-				$action_msg = lang('changed'. ' ' . $action);
-				foreach($selected as $id) {
+				$action_msg = lang('changed'.' '.$action);
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if ($definition['definition_id']) {
 						// Prevent private with no owner
-						if(!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						if (!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
 						$definition[$action] = $settings;
 						$bodefinitions->save($definition);
@@ -374,7 +374,7 @@ 
 				$mime_type = ($GLOBALS['egw']->html->user_agent == 'msie' || $GLOBALS['egw']->html->user_agent == 'opera') ?
 					'application/octetstream' : 'application/octet-stream';
 				$name = 'importexport_definition.xml';
-				header('Content-Type: ' . $mime_type);
+				header('Content-Type: '.$mime_type);
 				header('Content-Disposition: attachment; filename="'.$name.'"');
 				echo $bodefinitions->export($selected);
 				common::egw_exit();
@@ -383,16 +383,16 @@ 
 			case 'copy':
 				$action_msg = lang('copied');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if ($definition['definition_id']) {
 						unset($definition['definition_id']);
-						$definition['name'] = $settings ? $settings : $definition['name'] . ' copy';
+						$definition['name'] = $settings ? $settings : $definition['name'].' copy';
 						try {
 							$bodefinitions->save($definition);
 						} catch (Exception $e) {
 							try {
-								$definition['name'] .= ' ' . $GLOBALS['egw_info']['user']['account_lid'];
+								$definition['name'] .= ' '.$GLOBALS['egw_info']['user']['account_lid'];
 								$bodefinitions->save($definition);
 							} catch (Exception $ex) {
 								$failed++;
@@ -407,16 +407,16 @@ 
 			case 'createexport':
 				$action_msg = lang('created');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = new importexport_definition($id);
 					try {
 						$export = $bodefinitions->export_from_import($definition);
 						$export->save();
 					} catch (Exception $e) {
-						if($export)
+						if ($export)
 						{
 							try {
-								$export->name = $export->name.' ' . $GLOBALS['egw_info']['user']['account_lid'];
+								$export->name = $export->name.' '.$GLOBALS['egw_info']['user']['account_lid'];
 								$export->save();
 							} catch (Exception $ex) {
 								$failed++;
@@ -438,13 +438,13 @@ 
 
 	public function get_rows(&$query, &$rows, &$readonlys) {
 		$rows = array();
-		egw_session::appsession('index','importexport',$query);
+		egw_session::appsession('index', 'importexport', $query);
 
 		// Special handling for allowed users 'private'
-		if($query['col_filter']['allowed_users'] == 'private')
+		if ($query['col_filter']['allowed_users'] == 'private')
 		{
 			unset($query['col_filter']['allowed_users']);
-			$query['col_filter'][] = 'allowed_users = ' . $GLOBALS['egw']->db->quote(',,');
+			$query['col_filter'][] = 'allowed_users = '.$GLOBALS['egw']->db->quote(',,');
 		}
 		$bodefinitions = new importexport_definitions_bo($query['col_filter'], true);
 		// We don't care about readonlys for the UI
@@ -459,7 +459,7 @@ 
 	 */
 	function edit()
 	{
-		if(!$_definition = $_GET['definition'])
+		if (!$_definition = $_GET['definition'])
 		{
 			$content = array(
 				'edit'		=> true,
@@ -468,11 +468,11 @@ 
 			);
 
 			// Jump to a step
-			if($_GET['step'])
+			if ($_GET['step'])
 			{
 				$content['edit'] = false;
 				// Wizard will process previous step, then advance
-				$content['step'] = $this->get_step($_GET['step'],-1);
+				$content['step'] = $this->get_step($_GET['step'], -1);
 				$content['button']['next'] = 'pressed';
 				$this->wizard($content);
 			}
@@ -483,7 +483,7 @@ 
 			}
 			return;
 		}
-		if(is_numeric($_GET['definition']))
+		if (is_numeric($_GET['definition']))
 		{
 			$definition = (int)$_GET['definition'];
 		}
@@ -495,31 +495,31 @@ 
 		$definition = $bodefinitions->read($definition);
 		$definition['edit'] = true;
 		// Jump to a step
-		if($_GET['step'])
+		if ($_GET['step'])
 		{
 			$definition['edit'] = false;
 			// Wizard will process previous step, then advance
-			$definition['step'] = $_GET['step'];;
+			$definition['step'] = $_GET['step']; ;
 			$definition['button'] = array('next' => 'pressed');
 		}
 		$this->wizard($definition);
 	}
 
-	function wizard($content = null, $msg='')
+	function wizard($content = null, $msg = '')
 	{
 		$this->etpl->read('importexport.wizardbox');
 
-		if(is_array($content) &&! $content['edit'])
+		if (is_array($content) && !$content['edit'])
 		{
-			if(self::_debug) error_log('importexport.wizard->$content '. print_r($content,true));
+			if (self::_debug) error_log('importexport.wizard->$content '.print_r($content, true));
 			//foreach($content as $key => $val) error_log(" $key : ".array2string($val));
 			// fetch plugin object
-			if($content['plugin'] && $content['application'])
+			if ($content['plugin'] && $content['application'])
 			{
-				$wizard_name = $content['application'] . '_wizard_' . str_replace($content['application'] . '_', '', $content['plugin']);
+				$wizard_name = $content['application'].'_wizard_'.str_replace($content['application'].'_', '', $content['plugin']);
 
 				// we need to deal with the wizard object if exists
-				if (file_exists(EGW_SERVER_ROOT . '/'. $content['application']."/inc/class.$wizard_name.inc.php"))
+				if (file_exists(EGW_SERVER_ROOT.'/'.$content['application']."/inc/class.$wizard_name.inc.php"))
 				{
 					$wizard_plugin = $wizard_name;
 				}
@@ -528,38 +528,38 @@ 
 					$wizard_plugin = $content['plugin'];
 				}
 				// App translations
-				if($content['application']) translation::add_app($content['application']);
+				if ($content['application']) translation::add_app($content['application']);
 
 				$this->plugin = is_object($GLOBALS['egw']->$wizard_plugin) ? $GLOBALS['egw']->$wizard_plugin : new $wizard_plugin;
 
 				// Global object needs to be the same, or references to plugin don't work
-				if(!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
-					$GLOBALS['egw']->importexport_definitions_ui =& $this;
+				if (!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
+					$GLOBALS['egw']->importexport_definitions_ui = & $this;
 			}
 			// deal with buttons even if we are not on ajax
-			if(isset($content['button']) && array_search('pressed',$content['button']) === false && count($content['button']) == 1)
+			if (isset($content['button']) && array_search('pressed', $content['button']) === false && count($content['button']) == 1)
 			{
 				$button = array_keys($content['button']);
 				$content['button'] = array($button[0] => 'pressed');
 			}
 
 			// post process submitted step
-			if($content['step'])
+			if ($content['step'])
 			{
-				if(!$this->can_edit($content))
+				if (!$this->can_edit($content))
 				{
 					// Each step changes definition, reload it
 					$bodefinitions = new importexport_definitions_bo();
 					$definition = $bodefinitions->read($content);
 					$content = $definition + array('step' => $content['step'], 'button' => $content['button']);
 				}
-				if(!key_exists($content['step'],$this->steps))
+				if (!key_exists($content['step'], $this->steps))
 				{
-					$next_step = $this->plugin->{$content['step']}($content,$sel_options,$readonlys,$preserv);
+					$next_step = $this->plugin->{$content['step']}($content, $sel_options, $readonlys, $preserv);
 				}
 				else
 				{
-					$next_step = $this->{$content['step']}($content,$sel_options,$readonlys,$preserv);
+					$next_step = $this->{$content['step']}($content, $sel_options, $readonlys, $preserv);
 				}
 			}
 			else
@@ -571,23 +571,23 @@ 
 			$sel_options = $readonlys = $preserv = array();
 
 			// Disable finish button if required fields are missing
-			if(!$content['name'] || !$content['type'] || !$content['plugin'])
+			if (!$content['name'] || !$content['type'] || !$content['plugin'])
 			{
 				$readonlys['button[finish]'] = true;
 			}
 			do
 			{
-				if(!key_exists($next_step,$this->steps))
+				if (!key_exists($next_step, $this->steps))
 				{
-					$this->wizard_content_template = $this->plugin->$next_step($content,$sel_options,$readonlys,$preserv);
+					$this->wizard_content_template = $this->plugin->$next_step($content, $sel_options, $readonlys, $preserv);
 				}
 				else
 				{
-					$this->wizard_content_template = $this->$next_step($content,$sel_options,$readonlys,$preserv);
+					$this->wizard_content_template = $this->$next_step($content, $sel_options, $readonlys, $preserv);
 				}
-				if($this->wizard_content_template == self::SKIP)
+				if ($this->wizard_content_template == self::SKIP)
 				{
-					if(!key_exists($content['step'],$this->steps))
+					if (!key_exists($content['step'], $this->steps))
 					{
 						$next_step = $this->plugin->{$content['step']}($content);
 					}
@@ -596,9 +596,9 @@ 
 						$next_step = $this->{$content['step']}($content);
 					}
 				}
-			} while($this->wizard_content_template == self::SKIP);
+			} while ($this->wizard_content_template == self::SKIP);
 			
-			if(!$this->can_edit($content))
+			if (!$this->can_edit($content))
 			{
 				$readonlys[$this->wizard_content_template] = true;
 				$preserve = $content;
@@ -607,21 +607,21 @@ 
 
 			unset($content['button']);
 			$content['wizard_content'] = $this->wizard_content_template;
-			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard',$content,$sel_options,$readonlys,$preserv,2);
+			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard', $content, $sel_options, $readonlys, $preserv, 2);
 		}
 		else
 		{
 			// initial content
 			$sel_options = $readonlys = $preserv = array();
 			$readonlys['button[previous]'] = true;
-			if($content['edit'])
+			if ($content['edit'])
 			{
 				unset ($content['edit']);
 			}
 
 			$this->wizard_content_template = $this->wizard_step10($content, $sel_options, $readonlys, $preserv);
 
-			if(!$this->can_edit($content))
+			if (!$this->can_edit($content))
 			{
 				$readonlys[$this->wizard_content_template] = true;
 				$preserve = $content;
@@ -629,7 +629,7 @@ 
 			}
 
 			$content['wizard_content'] = $this->wizard_content_template;
-			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard',$content,$sel_options,$readonlys,$preserv,2);
+			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard', $content, $sel_options, $readonlys, $preserv, 2);
 		}
 	}
 
@@ -640,31 +640,31 @@ 
 	 * @param int $step_width
 	 * @return string containing function name of next step
 	 */
-	function get_step ($curr_step, $step_width)
+	function get_step($curr_step, $step_width)
 	{
 		/*if($content['plugin'] && $content['application']&& !is_object($this->plugin))
 		{
 			$plugin_definition =  $this->plugins[$content['application']][$content['plugin']]['definition'];
 			if($plugin_definition) $this->plugin = new $plugin_definition;
 		}*/
-		if(is_object($this->plugin) && is_array($this->plugin->steps))
+		if (is_object($this->plugin) && is_array($this->plugin->steps))
 		{
-			$steps = array_merge($this->steps,$this->plugin->steps);
-			$steps = array_flip($steps); asort($steps);	$steps = array_flip($steps);
+			$steps = array_merge($this->steps, $this->plugin->steps);
+			$steps = array_flip($steps); asort($steps); $steps = array_flip($steps);
 		}
 		else
 		{
 			$steps = $this->steps;
 		}
 		$step_keys = array_keys($steps);
-		$nn = array_search($curr_step,$step_keys)+(int)$step_width;
-		return (key_exists($nn,$step_keys)) ? $step_keys[$nn] : 'wizard_finish';
+		$nn = array_search($curr_step, $step_keys) + (int)$step_width;
+		return (key_exists($nn, $step_keys)) ? $step_keys[$nn] : 'wizard_finish';
 	}
 
 
 	function wizard_step10(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content, true));
 
 		// return from step10
 		if ($content['step'] == 'wizard_step10')
@@ -672,11 +672,11 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step10($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step10($content, $sel_options, $readonlys, $preserv);
 			}
 
 		}
@@ -686,7 +686,7 @@ 
 			$content['text'] = $this->steps['wizard_step10'];
 			foreach ($this->plugins as $appname => $options)
 			{
-				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+				if ($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
 					$sel_options['application'][$appname] = lang($appname);
 				}
 			}
@@ -702,7 +702,7 @@ 
 	// get plugin
 	function wizard_step20(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.' . get_class($this) . '::wizard_step20->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.'.get_class($this).'::wizard_step20->$content '.print_r($content, true));
 
 		// return from step20
 		if ($content['step'] == 'wizard_step20')
@@ -711,21 +711,21 @@ 
 			{
 				case 'next':
 					// There's no real reason the plugin has to come from any of these, as long as it has a $steps variable
-					if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
+					if ($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
 						$content['type'] = 'import';
-					} elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false) {
+					} elseif ($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin), 'export') !== false) {
 						$content['type'] = 'export';
 					} else {
 						throw new egw_exception('Invalid plugin');
 					}
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'previous' :
 					$readonlys['button[previous]'] = true;
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step20($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step20($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step20
@@ -734,8 +734,8 @@ 
 			$content['text'] = $this->steps['wizard_step20'];
 			$config = config::read('phpgwapi');
 			foreach ($this->plugins[$content['application']] as $type => $plugins) {
-				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
-				foreach($plugins as $plugin => $name) {
+				if ($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
+				foreach ($plugins as $plugin => $name) {
 					$sel_options['plugin'][$plugin] = $name;
 				}
 			}
@@ -751,15 +751,15 @@ 
 	// name
 	function wizard_step21(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content, true));
 
 		// Check for duplicate name
 		$duplicate = isset($content['duplicate_error']);
-		if($content['name'] && !$duplicate)
+		if ($content['name'] && !$duplicate)
 		{
 			try {
 				$check_definition = new importexport_definition($content['name']);
-				if($check_definition && $check_definition->definition_id && $check_definition->definition_id != $content['definition_id'])
+				if ($check_definition && $check_definition->definition_id && $check_definition->definition_id != $content['definition_id'])
 				{
 					throw new Exception('Already exists');
 				}
@@ -769,21 +769,21 @@ 
 
 				// Try some suggestions
 				$suggestions = array(
-					$content['name'] .'-'. $GLOBALS['egw_info']['user']['account_lid'],
-					$content['name'] .'-'. $GLOBALS['egw_info']['user']['account_id'],
-					$content['name'] .'-'. egw_time::to('now', true),
+					$content['name'].'-'.$GLOBALS['egw_info']['user']['account_lid'],
+					$content['name'].'-'.$GLOBALS['egw_info']['user']['account_id'],
+					$content['name'].'-'.egw_time::to('now', true),
 					//$content['name'] .'-'. rand(0,100),
 				);
-				foreach($suggestions as $key => $suggestion) {
+				foreach ($suggestions as $key => $suggestion) {
 					$sug_definition = new importexport_definition($suggestion);
-					if($sug_definition->definition_id) {
+					if ($sug_definition->definition_id) {
 						unset($suggestions[$key]);
 					}
 				}
-				if($suggestions) {
-					$content['duplicate_error'] .= '  '. lang('Try')." \n" . implode("\n", $suggestions);
+				if ($suggestions) {
+					$content['duplicate_error'] .= '  '.lang('Try')." \n".implode("\n", $suggestions);
 				}
-				return $this->get_step($content['step'],0);
+				return $this->get_step($content['step'], 0);
 			}
 		}
 
@@ -793,19 +793,19 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'previous' :
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step21($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step21($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step21
 		else
 		{
-			$content['text'] = $this->steps['wizard_step21'] . ($duplicate ? "\n".$content['duplicate_error'] : '');
+			$content['text'] = $this->steps['wizard_step21'].($duplicate ? "\n".$content['duplicate_error'] : '');
 			$content['step'] = 'wizard_step21';
 			unset($content['duplicate_error']);
 			$preserv = $content;
@@ -817,17 +817,16 @@ 
 	// allowed users
 	function wizard_step90(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content, true));
 
 		// return from step90
 		if ($content['step'] == 'wizard_step90')
 		{
-			if($this->can_edit($content))
+			if ($this->can_edit($content))
 			{
-				$content['owner'] = $content['just_me'] || !$GLOBALS['egw']->acl->check('share_definitions', EGW_ACL_READ,'importexport') ?
-					($content['owner'] ? $content['owner'] : $GLOBALS['egw_info']['user']['account_id']) :
-					null;
-				$content['allowed_users'] = $content['just_me'] ? '' : ($content['all_users'] ? 'all' : implode(',',$content['allowed_users']));
+				$content['owner'] = $content['just_me'] || !$GLOBALS['egw']->acl->check('share_definitions', EGW_ACL_READ, 'importexport') ?
+					($content['owner'] ? $content['owner'] : $GLOBALS['egw_info']['user']['account_id']) : null;
+				$content['allowed_users'] = $content['just_me'] ? '' : ($content['all_users'] ? 'all' : implode(',', $content['allowed_users']));
 				unset($content['just_me']);
 			}
 
@@ -835,12 +834,12 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'previous' :
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'next':
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step90($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step90($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step90
@@ -851,10 +850,10 @@ 
 			$preserv = $content;
 
 			// Set owner for non-admins
-			$content['just_me'] = ((!$content['allowed_users'] || !$content['allowed_users'][0] && count($content['allowed_users']) ==1) && $content['owner']);
-			$content['all_users'] = is_array($content['allowed_users']) && array_key_exists('0',$content['allowed_users']) && $content['allowed_users'][0] == 'all' ||
+			$content['just_me'] = ((!$content['allowed_users'] || !$content['allowed_users'][0] && count($content['allowed_users']) == 1) && $content['owner']);
+			$content['all_users'] = is_array($content['allowed_users']) && array_key_exists('0', $content['allowed_users']) && $content['allowed_users'][0] == 'all' ||
 			$content['allowed_users'] == 'all';
-			if(!$GLOBALS['egw']->acl->check('share_definition', EGW_ACL_READ, 'importexport') && !$GLOBALS['egw_info']['user']['apps']['admin'])
+			if (!$GLOBALS['egw']->acl->check('share_definition', EGW_ACL_READ, 'importexport') && !$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
 				$content['allowed_users'] = array();
 				$readonlys['allowed_users'] = true;
@@ -870,11 +869,11 @@ 
 				)
 			);
 			// Hide 'just me' checkbox, users get confused by read-only
-			if($readonlys['just_me'] || !$this->can_edit($content))
+			if ($readonlys['just_me'] || !$this->can_edit($content))
 			{
 				$content['no_just_me'] = true;
 			}
-			if($readonlys['all_users'] || !$this->can_edit($content))
+			if ($readonlys['all_users'] || !$this->can_edit($content))
 			{
 				$content['no_all_users'] = true;
 			}
@@ -887,7 +886,7 @@ 
 
 	function wizard_finish(&$content)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content, true));
 		// Take out some UI leavings
 		unset($content['text']);
 		unset($content['step']);
@@ -897,26 +896,26 @@ 
 		$bodefinitions->save($content);
 		// This message is displayed if browser cant close window
 		$content['msg'] = lang('ImportExport wizard finished successfully!');
-		egw_framework::refresh_opener('','importexport');
+		egw_framework::refresh_opener('', 'importexport');
 		egw_framework::window_close();
 		return 'importexport.wizard_close';
 	}
 
-	function import_definition($content='')
+	function import_definition($content = '')
 	{
 		$bodefinitions = new importexport_definitions_bo();
 		if (is_array($content))
 		{
-			if($content['import_file']['tmp_name'])
+			if ($content['import_file']['tmp_name'])
 			{
 				$result = $bodefinitions->import($content['import_file']['tmp_name']);
-				$msg = lang('%1 definitions %2', count($result), lang('imported')) ."\n". implode("\n", array_keys($result));
+				$msg = lang('%1 definitions %2', count($result), lang('imported'))."\n".implode("\n", array_keys($result));
 				return $this->index(null, $msg);
 			}
-			if($content['update'])
+			if ($content['update'])
 			{
 				$applist = importexport_helper_functions::get_apps('all', true);
-				foreach($applist as $appname) {
+				foreach ($applist as $appname) {
 					importexport_helper_functions::load_defaults($appname);
 				}
 				return $this->index();
@@ -926,7 +925,7 @@ 
 		{
 			$content = array();
 			$etpl = new etemplate(self::_appname.'.import_definition');
-			return $etpl->exec(self::_appname.'.importexport_definitions_ui.import_definition',$content,array(),$readonlys,$preserv);
+			return $etpl->exec(self::_appname.'.importexport_definitions_ui.import_definition', $content, array(), $readonlys, $preserv);
 		}
 	}
 
@@ -936,17 +935,17 @@ 
 	 */
 	protected function can_edit(Array $definition)
 	{
-		if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
+		if ($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			// Definition belongs to user
 			return true;
 		}
-		elseif($definition['definition_id'] && !$definition['owner'] && $GLOBALS['egw_info']['user']['apps']['admin'])
+		elseif ($definition['definition_id'] && !$definition['owner'] && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			// Definition is unowned, and user is an admin
 			return true;
 		}
-		elseif(!$definition['definition_id'])
+		elseif (!$definition['definition_id'])
 		{
 			// Definition is in-progress, not saved yet
 			return true;
@@ -959,26 +958,26 @@ 
 	 */
 	public function site_config($content = array())
 	{
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			egw::redirect_link('/home');
 		}
-		if($content['save'])
+		if ($content['save'])
 		{
 			unset($content['save']);
 
 			// ACL
-			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'definition',false);
-			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'share_definition',false);
+			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'definition', false);
+			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'share_definition', false);
 
-			foreach($content['share_definition'] as $group)
+			foreach ($content['share_definition'] as $group)
 			{
-				$GLOBALS['egw']->acl->add_repository(self::_appname, 'share_definition', $group,EGW_ACL_READ);
+				$GLOBALS['egw']->acl->add_repository(self::_appname, 'share_definition', $group, EGW_ACL_READ);
 			}
 			unset($content['share_definition']);
 
 			// Other config
-			foreach($content as $key=>$value)
+			foreach ($content as $key=>$value)
 			{
 				config::save_value($key, $value, 'importexport');
 			}
@@ -988,18 +987,18 @@ 
 
 		$data = config::read(self::_appname);
 		$data['share_definition'] = $GLOBALS['egw']->acl->get_ids_for_location('share_definition', EGW_ACL_READ, self::_appname);
-		$sel_options['import_charsets'] = array_combine(mb_list_encodings(),mb_list_encodings());
+		$sel_options['import_charsets'] = array_combine(mb_list_encodings(), mb_list_encodings());
 
 		// Remove 'standard' encodings to prevent doubles
-		foreach($GLOBALS['egw']->translation->get_installed_charsets() as $charset => $label)
+		foreach ($GLOBALS['egw']->translation->get_installed_charsets() as $charset => $label)
 		{
 			unset($sel_options['import_charsets'][strtoupper($charset)]);
 		}
 
-		if(!$data['update']) $data['update'] = 'request';
+		if (!$data['update']) $data['update'] = 'request';
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('Site configuration') . ' - ' . lang(self::_appname);
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Site configuration').' - '.lang(self::_appname);
 		$etpl = new etemplate(self::_appname.'.config');
-		$etpl->exec(self::_appname.'.importexport_definitions_ui.site_config',$data,$sel_options,$readonlys,$preserv);
+		$etpl->exec(self::_appname.'.importexport_definitions_ui.site_config', $data, $sel_options, $readonlys, $preserv);
 	}
 }

infolog/inc/class.infolog_export_csv.inc.php

Spacing +43 added lines, -43 removed lines

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

Braces +52 added lines, -15 removed lines

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