EGroupware / egroupware

importexport/inc/class.importexport_iface_import_plugin.inc.php

Braces +2 added lines, -1 removed lines

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

importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php

Braces +21 added lines, -9 removed lines

@@ -90,14 +90,22 @@ 
 	/**
 	 * Called from framework so Import / Export can add links into other apps' sidebox.
 	 */
-	public static function other_apps() {
-		if(!$GLOBALS['egw_info']['user']['apps']['importexport']) return array();
-		if($GLOBALS['egw_info']['flags']['no_importexport'] === true) return array();
+	public static function other_apps()
+	{
+		if(!$GLOBALS['egw_info']['user']['apps']['importexport'])
+		{
+			return array();
+		}
+		if($GLOBALS['egw_info']['flags']['no_importexport'] === true)
+		{
+			return array();
+		}
 
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		$cache = Api\Cache::getCache(Api\Cache::SESSION, 'importexport', 'sidebox_links');
 
-		if(!$cache[$appname] && $GLOBALS['egw_info']['user']['apps']['importexport']) {
+		if(!$cache[$appname] && $GLOBALS['egw_info']['user']['apps']['importexport'])
+		{
 			$cache[$appname]['import'] = importexport_helper_functions::has_definitions($appname, 'import');
 			$cache[$appname]['export'] = importexport_helper_functions::has_definitions($appname, 'export');
 			Api\Cache::setCache(Api\Cache::SESSION, 'importexport', 'sidebox_links', $cache);
@@ -117,7 +125,8 @@ 
 				'app' => 'importexport',
 				'text' => in_array($appname, array('sitemgr')) || count($plugins[$appname]['import']) > 1 ? 'Import' : 'Import CSV'
 			);
-			if($GLOBALS['egw_info']['flags']['disable_importexport']['import']) {
+			if($GLOBALS['egw_info']['flags']['disable_importexport']['import'])
+			{
 				$file['Import CSV']['link'] = '';
 			}
 		}
@@ -134,7 +143,8 @@ 
 				'app' => 'importexport',
 				'text' => in_array($appname, array('sitemgr')) || count($plugins[$appname]['export']) > 1 ? 'Export' : 'Export CSV'
 			);
-			if($GLOBALS['egw_info']['flags']['disable_importexport']['export']) {
+			if($GLOBALS['egw_info']['flags']['disable_importexport']['export'])
+			{
 				$file['Export CSV']['link'] = '';
 			}
 		}
@@ -142,15 +152,17 @@ 
 		$config = Api\Config::read('importexport');
 		if($appname != 'admin' && ($config['users_create_definitions'] || $GLOBALS['egw_info']['user']['apps']['admin']) &&
 			count(importexport_helper_functions::get_plugins($appname)) > 0
-		)
-		{
+		) {
 			$file['Define imports|exports']	= Egw::link('/index.php',array(
 				'menuaction' => 'importexport.importexport_definitions_ui.index',
 				'application' => $appname,
 				'ajax' => 'true'
 			),$GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
 		}
-		if($file) display_sidebox($appname,lang('importexport'),$file);
+		if($file)
+		{
+			display_sidebox($appname,lang('importexport'),$file);
+		}
 	}
 	
 	/**

importexport/inc/class.importexport_arrayxml.inc.php

Braces +36 added lines, -15 removed lines

@@ -20,7 +20,8 @@ 
  * @todo deal with other types like objects

  * @static only namespace here

  */ 

-class importexport_arrayxml {

+class importexport_arrayxml
+{
 	

 	/**

 	 * converts a php array to an xml string

@@ -30,29 +31,34 @@ 
 	 * @param DOMElement $_node

 	 * @return string XML string

 	 */

-	public static function array2xml ( $_data, $_name = 'root', $_node=null ) {

+	public static function array2xml ( $_data, $_name = 'root', $_node=null )
+	{
 		$returnXML = false;

-		if ( $_node === null ) {

+		if ( $_node === null )
+		{
 			$_node = new DOMDocument( '1.0', 'utf-8' );

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

 		$datatype = gettype( $_data );

-		switch ( $datatype ) {

+		switch ( $datatype )
+		{
 			case 'array' :

 				$subnode = new DOMElement( 'entry' );

 				$_node->appendChild( $subnode );

 				$subnode->setAttribute( 'type', $datatype );

 				$subnode->setAttribute( 'name' , $_name );

 					

-				foreach ( $_data as $ikey => $ivalue ) {

+				foreach ( $_data as $ikey => $ivalue )
+				{
 					self::array2xml( $ivalue, $ikey, $subnode );

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

+				switch ( $datatype )
+				{
 					case 'boolean' :

 						$data = $_data !== false ? 'TRUE' : 'FALSE';

 						break;

@@ -74,28 +80,43 @@ 
 	 * @param string $_xml

 	 * @return array

 	 */

-	public static function xml2array( $_xml ) {

-		if ( $_xml instanceof DOMElement ) {

+	public static function xml2array( $_xml )
+	{
+		if ( $_xml instanceof DOMElement )
+		{
 			$n = &$_xml;

-		} else {

+		}
+		else
+		{
 			$n = new DOMDocument;

 			$loaded = $n->loadXML($_xml);

-			if(!$loaded) return array();

+			if(!$loaded)
+			{
+				return array();
+			}
 		}

 		$xml_array = array();

 		

-		foreach($n->childNodes as $nc) {

+		foreach($n->childNodes as $nc)
+		{
 			

-			if ( $nc->nodeType != XML_ELEMENT_NODE ) continue;

+			if ( $nc->nodeType != XML_ELEMENT_NODE )
+			{
+				continue;
+			}
 				

 			$name = $nc->attributes->getNamedItem('name')->nodeValue;

 			$type = $nc->attributes->getNamedItem('type')->nodeValue;

 

 			//echo $nc->nodeType. "(length ): ". $nc->nodeName. " => ". $nc->nodeValue. "; Attriubtes: name=$name, type=$type  \n ";

-			if( $nc->childNodes->length >= 2) {

+			if( $nc->childNodes->length >= 2)
+			{
 				$xml_array[$name] = self::xml2array($nc);

-			} else {

-				switch ( $type ) {

+			}
+			else
+			{
+				switch ( $type )
+				{
 					case 'boolean' :

 						$value = $nc->nodeValue == 'FALSE' ? false : true;

 						break;

importexport/inc/class.importexport_iface_export_plugin.inc.php

Braces +2 added lines, -1 removed lines

@@ -34,7 +34,8 @@
  *
  * get_selector();  //returns array
  */
-interface importexport_iface_export_plugin {
+interface importexport_iface_export_plugin
+{
 	
 	/**
 	 * exports entries according to given definition object.

importexport/inc/class.importexport_widget_filter.inc.php

Braces +5 added lines, -2 removed lines

@@ -93,7 +93,8 @@ 
 						'get_rows'      => 'etemplate.ajax_select_widget.array_rows',
 						'id_field'      => ajax_select_widget::ARRAY_KEY,
 					);
-					if($field['rows']) {
+					if($field['rows'])
+					{
 						$options['num_rows'] = $field['rows'];
 					}
 
@@ -103,7 +104,9 @@ 
 					{
 						$options['values'] = Api\Storage\Customfields::get_options_from_file($field['values']['@']);
 						unset($field['values']['@']);
-					} else {
+					}
+					else
+					{
 						$options['values'] = array_diff_key($field['values'], array_flip(ajax_select_widget::$known_options));
 					}
 					$options = array_merge($options, array_intersect_key($field['values'], array_flip(ajax_select_widget::$known_options)));

importexport/inc/class.importexport_schedule_ui.inc.php

Braces +16 added lines, -5 removed lines

@@ -113,7 +113,10 @@ 
 			// Remove any left blank
 			foreach($schedule as $key => &$value)
 			{
-				if($value == '') unset($schedule[$key]);
+				if($value == '')
+				{
+					unset($schedule[$key]);
+				}
 			}
 			$result = $async->set_timer(
 				$schedule,
@@ -283,14 +286,16 @@ 
 	*
 	* $data should contain target & type
 	*/
-	public static function check_target(Array $data) {
+	public static function check_target(Array $data)
+	{
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
 		if($scheme == '' || $scheme == 'file')
 		{
 			return 'Direct file access not allowed';
 		}
 
-		if($scheme == Vfs::SCHEME  && !in_array(Vfs::SCHEME, stream_get_wrappers())) {
+		if($scheme == Vfs::SCHEME  && !in_array(Vfs::SCHEME, stream_get_wrappers()))
+		{
 			stream_wrapper_register(Vfs::SCHEME, 'vfs_stream_wrapper', STREAM_IS_URL);
 		}
 
@@ -315,8 +320,14 @@ 
 			// Response code has an integer key, but redirects may add more responses
 			for($i = 0; $i < count($headers); $i++)
 			{
-				if(!$headers[$i]) break;
-				if(strpos($headers[$i],'200') !== false) return true;
+				if(!$headers[$i])
+				{
+					break;
+				}
+				if(strpos($headers[$i],'200') !== false)
+				{
+					return true;
+				}
 			}
 			return lang('%1 is not readable',$data['target']);
 		}

importexport/inc/class.importexport_definitions_bo.inc.php

Braces +77 added lines, -29 removed lines

@@ -16,7 +16,8 @@ 
  *
  * @todo make this class an egw_record_pool!
  */
-class importexport_definitions_bo {
+class importexport_definitions_bo
+{
 
 	const _appname = 'importexport';
 	const _defintion_table = 'egw_importexport_definitions';
@@ -34,10 +35,15 @@ 
 	public function __construct($_query=false, $ignore_acl = false)
 	{
 		$this->so_sql = new Api\Storage\Base(self::_appname, self::_defintion_table );
-		if ($_query) {
+		if ($_query)
+		{
 			$definitions = $this->so_sql->search($_query, false);
-			foreach ((array)$definitions as $definition) {
-				if(self::is_permitted($definition) || $ignore_acl) $this->definitions[] = $definition['definition_id'];
+			foreach ((array)$definitions as $definition)
+			{
+				if(self::is_permitted($definition) || $ignore_acl)
+				{
+					$this->definitions[] = $definition['definition_id'];
+				}
 			}
 		}
 	}
@@ -45,7 +51,8 @@ 
 	public function get_rows(&$query, &$rows, &$readonlys)
 	{
 		// Filter only definitions user is allowed to use
-		if(!$GLOBALS['egw_info']['user']['apps']['admin']) {
+		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		{
 			$this_membership = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 			$this_membership[] = $GLOBALS['egw_info']['user']['account_id'];
 			$sql .= ' (';
@@ -80,7 +87,8 @@ 
 		
 		$total = $this->so_sql->get_rows($query, $rows, $readonlys);
 		$ro_count = 0;
-		foreach($rows as &$row) {
+		foreach($rows as &$row)
+		{
 			// Strip off leading + trailing ,
 			$row['allowed_users'] = substr($row['allowed_users'],1,-1);
 
@@ -103,14 +111,19 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_definitions() {
+	public function get_definitions()
+	{
 		return $this->definitions;
 	}
-	public function read($definition_id) {
-		if(is_numeric($definition_id)) {
+	public function read($definition_id)
+	{
+		if(is_numeric($definition_id))
+		{
 			$this->so_sql->read($definition_id);
 			$definition = new importexport_definition($this->so_sql->data['name']);
-		} else {
+		}
+		else
+		{
 			$definition = new importexport_definition( $definition_id['name'] );
 		}
 		return $definition->get_record_array();
@@ -120,18 +133,24 @@ 
 	 *
 	 * @param array $keys
 	 */
-	public function delete($keys) {
-		foreach ($keys as $index => $key) {
+	public function delete($keys)
+	{
+		foreach ($keys as $index => $key)
+		{
 			// Check for ownership
 			$definition = $this->read($key);
-			if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'] || $GLOBALS['egw_info']['user']['apps']['admin'])
+			{
 				// clear private cache
 				unset($this->definitions[array_search($key,$this->definitions)]);
-			} else {
+			}
+			else
+			{
 				unset($keys[$index]);
 			}
 		}
-		if(count($keys) > 0) {
+		if(count($keys) > 0)
+		{
 			$this->so_sql->delete(array('definition_id' => $keys));
 		}
 	}
@@ -141,7 +160,8 @@ 
 	*
 	* @param definition $definition
 	*/
-	public function save(Array $data) {
+	public function save(Array $data)
+	{
 		$definition = new importexport_definition();
 		$definition->set_record($data);
 		$definition->save($data['definition_id']);
@@ -153,7 +173,8 @@ 
 	 * @param array $_definition
 	 * @return bool
 	 */
-	static public function is_permitted($_definition) {
+	static public function is_permitted($_definition)
+	{
 		$allowed_user = is_array($_definition['allowed_users']) ? $_definition['allowed_users'] : explode(',',$_definition['allowed_users']);
 		$this_user_id = $GLOBALS['egw_info']['user']['account_id'];
 		$this_membership = $GLOBALS['egw']->accounts->memberships($this_user_id, true);
@@ -177,25 +198,30 @@ 
 		));
 
 		$export_data['definitions'] = array();
-		foreach ($keys as $definition_id) {
+		foreach ($keys as $definition_id)
+		{
 			$definition = new importexport_definition( $definition_id );
 			$export_data['definitions'][$definition->name] = $definition->get_record_array();
 			$export_data['definitions'][$definition->name]['allowed_users'] =
 				importexport_helper_functions::account_id2name(
 					$export_data['definitions'][$definition->name]['allowed_users']
 				);
-			if($export_date['definitions'][$definition->name]['owner']) {
+			if($export_date['definitions'][$definition->name]['owner'])
+			{
 				$export_data['definitions'][$definition->name]['owner'] =
 					importexport_helper_functions::account_id2name(
 						$export_data['definitions'][$definition->name]['owner']
 					);
-			} else {
+			}
+			else
+			{
 				unset($export_data['definitions'][$definition->name]['owner']);
 			}
 			unset($export_data['definitions'][$definition->name]['definition_id']);
 			unset($export_data['definitions'][$definition->name]['description']);
 			unset($export_data['definitions'][$definition->name]['user_timezone_read']);
-			if(is_array($export_data['definitions'][$definition->name]['plugin_options'])) {
+			if(is_array($export_data['definitions'][$definition->name]['plugin_options']))
+			{
 				unset($export_data['definitions'][$definition->name]['plugin_options']['user_timezone_read']);
 			}
 			unset($definition);
@@ -215,7 +241,8 @@ 
 	 */
 	public static function import( $_import_file )
 	{
-		if ( !is_file( $_import_file ) ) {
+		if ( !is_file( $_import_file ) )
+		{
 			throw new Exception("'$_import_file' does not exist or is not readable" );
 		}
 
@@ -233,14 +260,20 @@ 
 		);
 
 		// Avoid warning if no definitions found
-		if(!is_array($definitions)) return lang('None found');
+		if(!is_array($definitions))
+		{
+			return lang('None found');
+		}
 
 		// save definition(s) into internal table
 		foreach ( $definitions as $name => $definition_data )
 		{
 			// convert allowed_user
 			$definition_data['allowed_users'] = importexport_helper_functions::account_name2id( $definition_data['allowed_users'] );
-			if($definition_data['all_users'] && !$definition_data['allowed_users']) $definition_data['allowed_users'] = 'all';
+			if($definition_data['all_users'] && !$definition_data['allowed_users'])
+			{
+				$definition_data['allowed_users'] = 'all';
+			}
 
 			$definition_data['owner'] = importexport_helper_functions::account_name2id( $definition_data['owner'] );
 
@@ -275,7 +308,10 @@ 
 	public static function export_from_import(importexport_definition $import)
 	{
 		// Only operates on import definitions
-		if($import->type != 'import') throw new Api\Exception\WrongParameter('Only import definitions');
+		if($import->type != 'import')
+		{
+			throw new Api\Exception\WrongParameter('Only import definitions');
+		}
 
 		// Find export plugin
 		$plugin = str_replace('import', 'export',$import->plugin);
@@ -285,18 +321,30 @@ 
 			$plugins = $type['export'];
 			foreach($plugins as $name => $label)
 			{
-				if($plugin == $name) break;
+				if($plugin == $name)
+				{
+					break;
+				}
+			}
+			if($plugin !== $name)
+			{
+				$plugin = $name;
 			}
-			if($plugin !== $name) $plugin = $name;
 		}
 
 		$export = new importexport_definition();
 
 		// Common settings
 		$export->name = str_replace('import', 'export',$import->name);
-		if($export->name == $import->name) $export->name = $export->name . '-export';
+		if($export->name == $import->name)
+		{
+			$export->name = $export->name . '-export';
+		}
 		$test = new importexport_definition($export->name);
-		if($test->name) $export->name = $export->name .'-'.$GLOBALS['egw_info']['user']['account_lid'];
+		if($test->name)
+		{
+			$export->name = $export->name .'-'.$GLOBALS['egw_info']['user']['account_lid'];
+		}
 
 		$export->application = $import->application;
 		$export->plugin = $plugin;

importexport/inc/class.importexport_wizard_basic_export_csv.inc.php

Braces +57 added lines, -21 removed lines

@@ -64,7 +64,11 @@ 
 			'wizard_step80' => lang('Filters'),
 		);
 		list($appname, $part2) = explode('_', get_class($this));
-		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
 		Api\Translation::add_app($appname);
 	}
 
@@ -73,7 +77,10 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		}
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
@@ -89,12 +96,17 @@ 
 					$content['mapping'][$field_name] = $field_name;
 				}
 			}
-			if($content['mapping']['all_custom_fields']) {
+			if($content['mapping']['all_custom_fields'])
+			{
 				// Need the appname during actual export, to fetch the fields
 				$parts = explode('_', get_class($this));
 				$appname = $parts[0];
-				foreach($parts as $name_part) {
-					if($GLOBALS['egw_info']['apps'][$appname]) break;
+				foreach($parts as $name_part)
+				{
+					if($GLOBALS['egw_info']['apps'][$appname])
+					{
+						break;
+					}
 					$appname .= '_'.$name_part; // Handle apps with _ in the name
 				}
 				$content['mapping']['all_custom_fields'] = $appname;
@@ -125,15 +137,20 @@ 
 			unset ($preserv['button']);
 			unset ($preserv['fields']);
 			$content['fields'] = array('');
-			if(!$content['mapping']) $content['mapping'] = $content['plugin_options']['mapping'];
+			if(!$content['mapping'])
+			{
+				$content['mapping'] = $content['plugin_options']['mapping'];
+			}
 		
 			$row = 1;
-			foreach($this->export_fields as $field => $name) {
+			foreach($this->export_fields as $field => $name)
+			{
 				$content['fields'][] = array(
 					'field'	=>	$field,
 					'name'	=>	lang($name),
 				);
-				if($content['mapping'][$field]) {
+				if($content['mapping'][$field])
+				{
 					$content['fields']['export'][$row] = $field;
 				}
 				$row++;
@@ -155,11 +172,17 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		}
 		// return from step40
-		if ($content['step'] == 'wizard_step40') {
-			if($content['begin_with_fieldnames'] == 'label') {
-				foreach($content['mapping'] as $field => &$label) {
+		if ($content['step'] == 'wizard_step40')
+		{
+			if($content['begin_with_fieldnames'] == 'label')
+			{
+				foreach($content['mapping'] as $field => &$label)
+				{
 					// Check first, to avoid clearing any pseudo-columns (ex: All custom fields)
 					$label = $this->export_fields[$field] ? $this->export_fields[$field] : $label;
 				}
@@ -183,18 +206,24 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['delimiter'] && $content['plugin_options']['delimiter']) {
+			if(!$content['delimiter'] && $content['plugin_options']['delimiter'])
+			{
 				$content['delimiter'] = $content['plugin_options']['delimiter'];
-			} elseif (!$content['delimiter']) {
+			}
+			elseif (!$content['delimiter'])
+			{
 				$content['delimiter'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
 			}
-			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) {
+			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options']))
+			{
 				$content['begin_with_fieldnames'] = $content['plugin_options']['begin_with_fieldnames'];
 			}
-			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options']))
+			{
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 
@@ -238,15 +267,20 @@ 
 	 */
 	function wizard_step80(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		}
 		// return from submit
-		if ($content['step'] == 'wizard_step80') {
+		if ($content['step'] == 'wizard_step80')
+		{
 			// Process submitted
 			unset($content['filter']);
 			unset($content['set_filter']['fields']);
 			foreach($content['set_filter'] as $key => $value)
 			{
-				if($value) {
+				if($value)
+				{
 					$content['filter'][$key] = $value;
 				}
 			}
@@ -264,7 +298,9 @@ 
 				default :
 					return $this->wizard_step80($content,$sel_options,$readonlys,$preserv);
 			}
-		} else {
+		}
+		else
+		{
 
 			// Step 50 - filters
 			$content['text'] = $this->steps['wizard_step80'];

importexport/importexport_cli.php

Braces +19 added lines, -9 removed lines

@@ -23,7 +23,8 @@ 
 		--dry-run                            no real action, just console output
 		\n";
 
-if (php_sapi_name() != 'cli') {
+if (php_sapi_name() != 'cli')
+{
 	die('This script only runs form command line');
 }
 
@@ -44,7 +45,8 @@ 
 $args = Console_Getopt::readPHPArgv();
 
 // Make sure we got them (for non CLI binaries)
-if (PEAR::isError($args)) {
+if (PEAR::isError($args))
+{
    fwrite(STDERR,"importexport_cli: ".$args->getMessage()."\n".$usage);
    exit(NO_ARGS);
 }
@@ -63,22 +65,28 @@ 
    );
 
 // Convert the arguments to options - check for the first argument
-if ( realpath($_SERVER['argv'][0]) == __FILE__ ) {
+if ( realpath($_SERVER['argv'][0]) == __FILE__ )
+{
    $options = Console_Getopt::getOpt($args,$short_opts,$long_opts);
-} else {
+}
+else
+{
    $options = Console_Getopt::getOpt2($args,$short_opts,$long_opts);
 }
 
 // Check the options are valid
-if (PEAR::isError($options)) {
+if (PEAR::isError($options))
+{
    fwrite(STDERR,"importexport_cli: ".$options->getMessage()."\n".$usage."\n");
    exit(INVALID_OPTION);
 }
 
 $domain = 'default';
 $dryrun = false;
-foreach ($options[0] as $option) {
-	switch ($option[0]) {
+foreach ($options[0] as $option)
+{
+	switch ($option[0])
+	{
 		case '--file' :
 			$file = $option[1];
 			break;
@@ -103,7 +111,8 @@ 
 	}
 }
 // check file
-if ( !$user || !$password ) {
+if ( !$user || !$password )
+{
 	fwrite(STDERR,'importexport_cli: You have to supply a username / password'."\n".$usage);
 	exit(INVALID_OPTION);
 }
@@ -135,7 +144,8 @@ 
 }
 
 $definition = new importexport_definition($definition);
-if( $definition->get_identifier() < 1 ) {
+if( $definition->get_identifier() < 1 )
+{
 	fwrite(STDERR,"importexport_cli: Definition not found! \n");
 	exit(INVALID_OPTION);
 }