EGroupware / egroupware

importexport/setup/default_records.inc.php

Spacing +11 added lines, -11 removed lines

@@ -12,9 +12,9 @@ 
 if (!extension_loaded('dom'))
 {
 	echo "<p>Required PHP DOM extension missing, installation of ImportExport definitions aborted.</p>\n";
-	return;	// otherwise we mess up the whole eGroupware install process
+	return; // otherwise we mess up the whole eGroupware install process
 }
-require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 // This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 $GLOBALS['egw_setup']->setup_account_object();
@@ -22,22 +22,22 @@ 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
 while (false !== ($appdir = $egwdir->read())) {
-	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+	if (!is_dir($defdir)) continue;
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
 	while (false !== ($entry = $d->read())) {
-		$file = $defdir. '/'. $entry;
-		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
-		importexport_definitions_bo::import( $file );
+		$file = $defdir.'/'.$entry;
+		list($filename, $extension) = explode('.', $entry);
+		if ($extension != 'xml') continue;
+		importexport_definitions_bo::import($file);
 	}
 }
 
 // give Default and Admins group rights for ImportExport
-foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 {
-	$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+	$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 }

Braces +12 added lines, -4 removed lines

@@ -21,16 +21,24 @@
 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
-while (false !== ($appdir = $egwdir->read())) {
+while (false !== ($appdir = $egwdir->read()))
+{
 	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	if ( !is_dir( $defdir ) )
+	{
+		continue;
+	}
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
-	while (false !== ($entry = $d->read())) {
+	while (false !== ($entry = $d->read()))
+	{
 		$file = $defdir. '/'. $entry;
 		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
+		if ( $extension != 'xml' )
+		{
+			continue;
+		}
 		importexport_definitions_bo::import( $file );
 	}
 }

importexport/inc/class.importexport_iface_export_record.inc.php

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.

Doc Comments +1 added lines, -1 removed lines

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

importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php

Spacing +28 added lines, -28 removed lines

@@ -14,7 +14,7 @@ 
 
 if (!defined('IMPORTEXPORT_APP'))
 {
-	define('IMPORTEXPORT_APP','importexport');
+	define('IMPORTEXPORT_APP', 'importexport');
 }
 
 class importexport_admin_prefs_sidebox_hooks
@@ -35,40 +35,40 @@ 
 				array(
 					'text' => 'Import',
 					'link' => "javascript:egw_openWindowCentered2('".
-						Egw::link('/index.php','menuaction=importexport.importexport_import_ui.import_dialog',false).
+						Egw::link('/index.php', 'menuaction=importexport.importexport_import_ui.import_dialog', false).
 						"','_blank',850,440,'yes')",
 					'icon' => 'import'
 				),
 			);
 			$export_limit = Api\Storage\Merge::getExportLimit($appname);
 			//error_log(__METHOD__.__LINE__.' app:'.$appname.' limit:'.$export_limit);
-			if(Api\Storage\Merge::is_export_limit_excepted() || $export_limit !== 'no')
+			if (Api\Storage\Merge::is_export_limit_excepted() || $export_limit !== 'no')
 			{
 				$file[] = array(
 					'text' => 'Export',
 					'link' => "javascript:egw_openWindowCentered2('".
-						Egw::link('/index.php','menuaction=importexport.importexport_export_ui.export_dialog',false).
+						Egw::link('/index.php', 'menuaction=importexport.importexport_export_ui.export_dialog', false).
 						"','_blank',850,440,'yes')",
 					'icon' => 'export'
 				);
 			}
 			$config = Api\Config::read($appname);
-			if($config['users_create_definitions'])
+			if ($config['users_create_definitions'])
 			{
-				$file['Define imports|exports']	= Egw::link('/index.php',array(
+				$file['Define imports|exports'] = Egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_definitions_ui.index',
 						'ajax' => 'true'
-				),$GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
+				), $GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
 			}
-			display_sidebox($appname,lang($appname),$file);
+			display_sidebox($appname, lang($appname), $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site Configuration' => Egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.site_config'),
-				'Import definitions' => Egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.import_definition'),
-				'Define imports|exports'  => Egw::link('/index.php',array(
+				'Site Configuration' => Egw::link('/index.php', 'menuaction=importexport.importexport_definitions_ui.site_config'),
+				'Import definitions' => Egw::link('/index.php', 'menuaction=importexport.importexport_definitions_ui.import_definition'),
+				'Define imports|exports'  => Egw::link('/index.php', array(
 					'menuaction' => 'importexport.importexport_definitions_ui.index',
 					'ajax' => 'true'
 				)),
@@ -78,11 +78,11 @@ 
 			);
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -91,13 +91,13 @@ 
 	 * 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();
+		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);
@@ -106,51 +106,51 @@ 
 		// Add in import / export, if available
 		$file = array();
 		$plugins = importexport_helper_functions::get_plugins($appname);
-		if($cache[$appname]['import'])
+		if ($cache[$appname]['import'])
 		{
 			$file['Import CSV'] = array('link' => "javascript:egw_openWindowCentered2('".
-				Egw::link('/index.php',array(
+				Egw::link('/index.php', array(
 					'menuaction' => 'importexport.importexport_import_ui.import_dialog',
 					'appname'=>$appname
-				),false)."','_blank',850,440,'yes')",
+				), false)."','_blank',850,440,'yes')",
 				'icon' => 'import',
 				'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'] = '';
 			}
 		}
 		$export_limit = Api\Storage\Merge::getExportLimit($appname);
 		//error_log(__METHOD__.__LINE__.' app:'.$appname.' limit:'.$export_limit);
-		if ((Api\Storage\Merge::is_export_limit_excepted() || Api\Storage\Merge::hasExportLimit($export_limit,'ISALLOWED')) && $cache[$appname]['export'])
+		if ((Api\Storage\Merge::is_export_limit_excepted() || Api\Storage\Merge::hasExportLimit($export_limit, 'ISALLOWED')) && $cache[$appname]['export'])
 		{
 			$file['Export CSV'] = array('link' => "javascript:egw_openWindowCentered2('".
-				Egw::link('/index.php',array(
+				Egw::link('/index.php', array(
 					'menuaction' => 'importexport.importexport_export_ui.export_dialog',
 					'appname'=>$appname
-				),false)."','_blank',850,440,'yes')",
+				), false)."','_blank',850,440,'yes')",
 				'icon' => 'export',
 				'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'] = '';
 			}
 		}
 		
 		$config = Api\Config::read('importexport');
-		if($appname != 'admin' && ($config['users_create_definitions'] || $GLOBALS['egw_info']['user']['apps']['admin']) &&
+		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(
+			$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');
+			), $GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
 		}
-		if($file) display_sidebox($appname,lang('importexport'),$file);
+		if ($file) display_sidebox($appname, lang('importexport'), $file);
 	}
 	
 	/**

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);
+		}
 	}
 	
 	/**

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

@@ -108,7 +108,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site configuration' => Egw::link('/index.php',array(
 					'menuaction' => 'infolog.infolog_ui.admin' )),
 				'Global Categories'  => Egw::link('/index.php',array(

importexport/inc/class.importexport_arrayxml.inc.php

Spacing +23 added lines, -23 removed lines

@@ -30,39 +30,39 @@ 
 	 * @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 ) {

-			$_node = new DOMDocument( '1.0', 'utf-8' );

+		if ($_node === null) {

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

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

-		$datatype = gettype( $_data );

-		switch ( $datatype ) {

+		$datatype = gettype($_data);

+		switch ($datatype) {

 			case 'array' :

-				$subnode = new DOMElement( 'entry' );

-				$_node->appendChild( $subnode );

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

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

+				$subnode = new DOMElement('entry');

+				$_node->appendChild($subnode);

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

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

 					

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

-					self::array2xml( $ivalue, $ikey, $subnode );

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

+					self::array2xml($ivalue, $ikey, $subnode);

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

+				switch ($datatype) {

 					case 'boolean' :

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

 						break;

 					default:

 						$data = &$_data;

 				}

-				$subnode = new DOMElement( 'entry' , $data );

-				$_node->appendChild( $subnode );

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

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

+				$subnode = new DOMElement('entry', $data);

+				$_node->appendChild($subnode);

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

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

 				break;

 		}

 		return $returnXML ? $_node->saveXML() : '';

@@ -74,28 +74,28 @@ 
 	 * @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 {

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

+				switch ($type) {

 					case 'boolean' :

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

 						break;

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_widget_filter.inc.php

Spacing +20 added lines, -20 removed lines

@@ -41,18 +41,18 @@ 
 	public function beforeSendToClient($cname, Array $expand = Array())
 	{
 		$form_name = self::form_name($cname, $this->id);
-		if($this->getElementAttribute($form_name, 'customfields'))
+		if ($this->getElementAttribute($form_name, 'customfields'))
 		{
 			// Already done?  Still need to process, or sel_options may be missing
 			unset(self::$request->modifications[$form_name]);
 		}
-		$value =& self::get_array(self::$request->content, $form_name, true);
+		$value = & self::get_array(self::$request->content, $form_name, true);
 		$fields = $value['fields'];
 		unset($value['fields']);
 		$relative_dates = $this->attrs['relative_dates'];
 
 		// Fallback, so there's something there...
-		if(!is_array($fields))
+		if (!is_array($fields))
 		{
 			error_log("$this has no fields");
 			self::$transformation = array(
@@ -69,14 +69,14 @@ 
 		$this->setElementAttribute($form_name, 'prefix', self::$prefix);
 		
 		$n = 1;
-		foreach($fields as $lname => &$field)
+		foreach ($fields as $lname => &$field)
 		{
-			$type =& $field['type'];
+			$type = & $field['type'];
 			
 			// No filters are required
 			$field['needed'] = false;
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'date':
 				case 'date-time':
@@ -93,7 +93,7 @@ 
 						'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'];
 					}
 
@@ -112,15 +112,15 @@ 
 					break;
 				case 'select':
 				default:
-					if(strpos($field['type'],'select') === 0)
+					if (strpos($field['type'], 'select') === 0)
 					{
 						if (count($field['values']) == 1 && isset($field['values']['@']))
 						{
 							$field['values'] = Api\Storage\Customfields::get_options_from_file($field['values']['@']);
 						}
-						foreach((array)$field['values'] as $key => $val)
+						foreach ((array)$field['values'] as $key => $val)
 						{
-							if (substr($val = lang($val),-1) != '*')
+							if (substr($val = lang($val), -1) != '*')
 							{
 								$field['values'][$key] = $val;
 							}
@@ -132,27 +132,27 @@ 
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE);
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE);
 					}
-					else if( $GLOBALS['egw_info']['apps'][$field['type']])
+					else if ($GLOBALS['egw_info']['apps'][$field['type']])
 					{
 						// Links
 					}
 					else
 					{
-						error_log('Trying to filter with unsupported field type ' . $lname . ': ' . $field['type']);
+						error_log('Trying to filter with unsupported field type '.$lname.': '.$field['type']);
 					}
 			}
 
 			// Send select options
-			if($field['values'])
+			if ($field['values'])
 			{
 				self::$request->sel_options[self::$prefix.$lname] = $field['values'];
 			}
 			$widget = self::factory($type, '<'.$type.' type="'.$type.'" id="'.self::$prefix.$lname.'"/>', self::$prefix.$lname);
-			if(method_exists($widget, 'beforeSendToClient'))
+			if (method_exists($widget, 'beforeSendToClient'))
 			{
 				$widget->id = self::$prefix.$lname;
 				$widget->attrs['type'] = $type;
-				if($type == 'link-to')
+				if ($type == 'link-to')
 				{
 					$widget->attrs['only_app'] = $field['type'];
 				}
@@ -164,22 +164,22 @@ 
 		parent::beforeSendToClient($cname, $expand);
 
 		$this->setElementAttribute($form_name, 'customfields', $fields);
-		$this->setElementAttribute($form_name, 'fields',array_fill_keys(array_keys($fields), true));
+		$this->setElementAttribute($form_name, 'fields', array_fill_keys(array_keys($fields), true));
 		return false;
 	}
 	
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value_in = (array)self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
+			$valid = & self::get_array($validated, $this->id ? $form_name : $field, true);
 
-			foreach($value_in as $key => $value)
+			foreach ($value_in as $key => $value)
 			{
 				// Client side cf widget automatically prefixes #
-				$valid[substr($key,strlen(self::$prefix))] = $value;
+				$valid[substr($key, strlen(self::$prefix))] = $value;
 			}
 		}
 	}

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

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

@@ -38,7 +38,7 @@
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname, Array $expand = Array())
+	public function beforeSendToClient($cname, array $expand = array())
 	{
 		$form_name = self::form_name($cname, $this->id);
 		if($this->getElementAttribute($form_name, 'customfields'))

importexport/inc/class.importexport_schedule_ui.inc.php

Indentation +16 added lines, -16 removed lines

@@ -196,8 +196,8 @@ 
 	}
 
 	/**
-	* Get options for select boxes
-	*/
+	 * Get options for select boxes
+	 */
 	public static function get_select_options(Array $data)
 	{
 		$options = array(
@@ -261,8 +261,8 @@ 
 	}
 
 	/**
-	* Generate a async key
-	*/
+	 * Generate a async key
+	 */
 	public static function generate_id($data)
 	{
 
@@ -278,11 +278,11 @@ 
 	}
 
 	/**
-	* Check that the target is valid for the type (readable or writable)
-	* and that they're not trying to write directly to the filesystem
-	*
-	* $data should contain target & type
-	*/
+	 * Check that the target is valid for the type (readable or writable)
+	 * and that they're not trying to write directly to the filesystem
+	 *
+	 * $data should contain target & type
+	 */
 	public static function check_target(Array $data) {
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
 		if($scheme == '' || $scheme == 'file')
@@ -329,11 +329,11 @@ 
 	}
 
 	/**
-	* Writable that checks the folder too, in case the file does not exist yet
-	* http://ca3.php.net/manual/en/function.is-writable.php#73596
-	*
-	* @param path Path to check
-	*/
+	 * Writable that checks the folder too, in case the file does not exist yet
+	 * http://ca3.php.net/manual/en/function.is-writable.php#73596
+	 *
+	 * @param path Path to check
+	 */
 	private static function is__writable($path)
 	{
 		if ($path{strlen($path)-1}=='/')
@@ -365,8 +365,8 @@ 
 	}
 
 	/**
-	* Execute a scheduled import or export
-	*/
+	 * Execute a scheduled import or export
+	 */
 	public static function exec($data)
 	{
 		ob_start();

Spacing +98 added lines, -98 removed lines

@@ -37,11 +37,11 @@ 
 	public function index($content = array())
 	{
 		$async = new Api\Asyncservice();
-		if(is_array($content['scheduled']))
+		if (is_array($content['scheduled']))
 		{
-			foreach($content['scheduled'] as $row)
+			foreach ($content['scheduled'] as $row)
 			{
-				if($row['delete'])
+				if ($row['delete'])
 				{
 					$key = urldecode(key($row['delete']));
 					$async->cancel_timer($key);
@@ -50,16 +50,16 @@ 
 		}
 		$async_list = $async->read('importexport%');
 		$data = array();
-		if(is_array($async_list))
+		if (is_array($async_list))
 		{
-			foreach($async_list as $id => $async)
+			foreach ($async_list as $id => $async)
 			{
-				foreach(array('errors', 'warnings', 'result') as $messages)
+				foreach (array('errors', 'warnings', 'result') as $messages)
 				{
-					if(is_array($async['data'][$messages]))
+					if (is_array($async['data'][$messages]))
 					{
 						$list = array();
-						foreach($async['data'][$messages] as $target => $message)
+						foreach ($async['data'][$messages] as $target => $message)
 						{
 							$list[] = array(
 								'target' => (is_numeric($target) ? '' : $target),
@@ -69,7 +69,7 @@ 
 						$async['data'][$messages] = $list;
 					}
 				}
-				if(is_numeric($async['data']['record_count']))
+				if (is_numeric($async['data']['record_count']))
 				{
 					$async['data']['record_count'] = lang('%1 records processed', $async['data']['record_count']);
 				}
@@ -100,7 +100,7 @@ 
 		$data = $content;
 
 		// Deal with incoming
-		if($content['save'] && self::check_target($content) === true)
+		if ($content['save'] && self::check_target($content) === true)
 		{
 			unset($content['save']);
 			$async->cancel_timer($id);
@@ -111,9 +111,9 @@ 
 			unset($content['schedule']);
 
 			// Remove any left blank
-			foreach($schedule as $key => &$value)
+			foreach ($schedule as $key => &$value)
 			{
-				if($value == '') unset($schedule[$key]);
+				if ($value == '') unset($schedule[$key]);
 			}
 			$result = $async->set_timer(
 				$schedule,
@@ -121,9 +121,9 @@ 
 				'importexport.importexport_schedule_ui.exec',
 				$content
 			);
-			if($result)
+			if ($result)
 			{
-				Framework::refresh_opener('', 'admin',$id,'update','admin');
+				Framework::refresh_opener('', 'admin', $id, 'update', 'admin');
 				Framework::window_close();
 			}
 			else
@@ -133,19 +133,19 @@ 
 			}
 		}
 
-		if($id)
+		if ($id)
 		{
 
 			$preserve['id'] = $id;
 			$async = $async->read($id);
-			if(is_array($async[$id]['data']))
+			if (is_array($async[$id]['data']))
 			{
 				$data += $async[$id]['data'];
 				$data['schedule'] = $async[$id]['times'];
 				unset($data['times']);
 
 				// Async sometimes changes minutes to an array - show user what they typed
-				if(is_array($data['schedule']['min']))
+				if (is_array($data['schedule']['min']))
 				{
 					$data['schedule']['min'] = $data['min'];
 				}
@@ -159,11 +159,11 @@ 
 		{
 			$data['type'] = $content['type'] ? $content['type'] : 'import';
 
-			if((int)$definition_id)
+			if ((int)$definition_id)
 			{
 				$bo = new importexport_definitions_bo();
 				$definition = $bo->read($definition_id);
-				if($definition['definition_id'])
+				if ($definition['definition_id'])
 				{
 					$data['type'] = $definition['type'];
 					$data['appname'] = $definition['application'];
@@ -173,12 +173,12 @@ 
 			}
 		}
 
-		if($data['target'] && $data['type'])
+		if ($data['target'] && $data['type'])
 		{
 			$file_check = self::check_target($data);
-			if($file_check !== true)
+			if ($file_check !== true)
 			{
-				$data['message'] .= ($data['message'] ? "\n" . $file_check : $file_check);
+				$data['message'] .= ($data['message'] ? "\n".$file_check : $file_check);
 			}
 		}
 
@@ -188,7 +188,7 @@ 
 		$data['current_time'] = time();
 
 		$sel_options = self::get_select_options($data);
-		Framework::includeJS('.','importexport','importexport');
+		Framework::includeJS('.', 'importexport', 'importexport');
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Schedule import / export');
 		$this->template->read('importexport.schedule_edit');
@@ -208,21 +208,21 @@ 
 		);
 
 		(array)$apps = importexport_helper_functions::get_apps($data['type'] ? $data['type'] : 'all');
-		if(count($apps))
+		if (count($apps))
 		{
-			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
+			$options['appname'] = array('' => lang('Select one')) + array_combine($apps, $apps);
 		}
 
 		$plugins = importexport_helper_functions::get_plugins($data['appname'] ? $data['appname'] : 'all', $data['type']);
-		if(is_array($plugins))
+		if (is_array($plugins))
 		{
-			foreach($plugins as $types)
+			foreach ($plugins as $types)
 			{
-				if(!is_array($types[$data['type']]))
+				if (!is_array($types[$data['type']]))
 				{
 					continue;
 				}
-				foreach($types[$data['type']] as $key => $title)
+				foreach ($types[$data['type']] as $key => $title)
 				{
 					$options['plugin'][$key] = $title;
 				}
@@ -285,27 +285,27 @@ 
 	*/
 	public static function check_target(Array $data) {
 		$scheme = parse_url($data['target'], PHP_URL_SCHEME);
-		if($scheme == '' || $scheme == 'file')
+		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);
 		}
 
 		if ($data['type'] == 'import' && ($scheme == Vfs::SCHEME && !Vfs::is_readable($data['target'])))
 		{
-			return lang('%1 is not readable',$data['target']);
+			return lang('%1 is not readable', $data['target']);
 		}
-		elseif ($data['type'] == 'import' && in_array($scheme, array('http','https')))
+		elseif ($data['type'] == 'import' && in_array($scheme, array('http', 'https')))
 		{
 			// Not supported by is_readable, try headers...
 			stream_context_set_default(array('http'=>array(
 				'method'	=> 'HEAD',
 				'ignore_errors'	=> 1
 			)));
-			$headers = get_headers($data['target'],1);
+			$headers = get_headers($data['target'], 1);
 
 			// Reset...
 			stream_context_set_default(array('http'=>array(
@@ -313,16 +313,16 @@ 
 				'ignore_errors'	=> 0
 			)));
 			// Response code has an integer key, but redirects may add more responses
-			for($i = 0; $i < count($headers); $i++)
+			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']);
+			return lang('%1 is not readable', $data['target']);
 		}
 		elseif ($data['type'] == 'export' && !self::is__writable($data['target']))
 		{
-			return lang('%1 is not writable',$data['target']);
+			return lang('%1 is not writable', $data['target']);
 		}
 
 		return true;
@@ -336,7 +336,7 @@ 
 	*/
 	private static function is__writable($path)
 	{
-		if ($path{strlen($path)-1}=='/')
+		if ($path{strlen($path) - 1} == '/')
 		{
 			// recursively return a temporary file path
 			return self::is__writable($path.uniqid(mt_rand()).'.tmp');
@@ -350,7 +350,7 @@ 
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
 
-		if ($f===false)
+		if ($f === false)
 		{
 			return false;
 		}
@@ -376,10 +376,10 @@ 
 		unset($data['warnings']);
 		unset($data['result']);
 
-		if($data['lock'])
+		if ($data['lock'])
 		{
 			// Lock expires
-			if($data['lock'] < time())
+			if ($data['lock'] < time())
 			{
 				unset($data['lock']);
 				$data['warnings'][][] = lang('Lock expired on previous run');
@@ -400,25 +400,25 @@ 
 
 		// check file
 		$file_check = self::check_target($data);
-		if($file_check !== true)
+		if ($file_check !== true)
 		{
 			$data['errors'] = array($file_check=>'');
 			// Update job with results
 			self::update_job($data);
 
-			error_log('importexport_schedule: ' . date('c') . ": $file_check \n");
+			error_log('importexport_schedule: '.date('c').": $file_check \n");
 			error_log(ob_get_flush());
 			return;
 		}
 
 		$definition = new importexport_definition($data['definition']);
-		if( $definition->get_identifier() < 1 )
+		if ($definition->get_identifier() < 1)
 		{
 			$data['errors'] = array('Definition not found!');
 			// Update job with results
 			self::update_job($data);
 
-			error_log('importexport_schedule: ' . date('c') . ": Definition not found! \n");
+			error_log('importexport_schedule: '.date('c').": Definition not found! \n");
 			return;
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $definition->application;
@@ -427,30 +427,30 @@ 
 
 		$type = $data['type'];
 
-		if(is_dir($data['target']))
+		if (is_dir($data['target']))
 		{
-			if($data['type'] == 'import')
+			if ($data['type'] == 'import')
 			{
 				$targets = array();
-				foreach(scandir($data['target']) as $target)
+				foreach (scandir($data['target']) as $target)
 				{
 					if ($target == '.' || $target == '..')
 					{
 						continue;
 					}
-					$target = $data['target'].(substr($data['target'],-1) == '/' ? '' : '/').$target;
+					$target = $data['target'].(substr($data['target'], -1) == '/' ? '' : '/').$target;
 
 					// Check modification time, make sure it's not currently being written
 					// Skip files modified in the last 10 seconds
 					$mod_time = filemtime($target);
-					if($mod_time >= time() - 10)
+					if ($mod_time >= time() - 10)
 					{
 						$data['result'][$target] = lang('Skipped');
 						continue;
 					}
 					$targets[$mod_time.$target] = $target;
 				}
-				if($targets)
+				if ($targets)
 				{
 					ksort($targets);
 				}
@@ -466,27 +466,27 @@ 
 			$targets = array($data['target']);
 		}
 
-		if($type == 'export')
+		if ($type == 'export')
 		{
 			// Set to export all or filter, if set
 			$selection = array('selection' => 'all');
-			if($definition->filter)
+			if ($definition->filter)
 			{
 				$fields = importexport_helper_functions::get_filter_fields($definition->application, $po);
 				$selection = array('selection' => 'filter');
 				$filters = array();
-				foreach($definition->filter as $field => $value)
+				foreach ($definition->filter as $field => $value)
 				{
 					 // Handle multiple values
-					if(!is_array($value) && strpos($value,',') !== false)
+					if (!is_array($value) && strpos($value, ',') !== false)
 					{
-						$value = explode(',',$value);
+						$value = explode(',', $value);
 					}
 
 					$filters[$field] = $value;
 
 					// Process relative dates into the current absolute date
-					if($filters[$field] && strpos($fields[$field]['type'],'date') === 0)
+					if ($filters[$field] && strpos($fields[$field]['type'], 'date') === 0)
 					{
 						$filters[$field] = importexport_helper_functions::date_rel2abs($value);
 					}
@@ -494,14 +494,14 @@ 
 				// Update filter to use current absolute dates
 				$definition->filter = $filters;
 			}
-			if(!is_array($definition->plugin_options))
+			if (!is_array($definition->plugin_options))
 			{
 				$definition->plugin_options = array();
 			}
 			$definition->plugin_options = array_merge($definition->plugin_options, $selection);
 		}
 
-		foreach($targets as $target)
+		foreach ($targets as $target)
 		{
 			// Update lock timeout
 			$data['lock'] = time() + 3600;
@@ -510,16 +510,16 @@ 
 			$resource = null;
 			try
 			{
-				if (($resource = @fopen( $target, $data['type'] == 'import' ? 'rb' : 'wb' )))
+				if (($resource = @fopen($target, $data['type'] == 'import' ? 'rb' : 'wb')))
 				{
-					$result = $po->$type( $resource, $definition );
+					$result = $po->$type($resource, $definition);
 
 					fclose($resource);
 				}
 				else
 				{
-					error_log('importexport_schedule: ' . date('c') . ": File $target not readable! \n");
-					$data['errors'][$target][] = lang('%1 is not readable',$target);
+					error_log('importexport_schedule: '.date('c').": File $target not readable! \n");
+					$data['errors'][$target][] = lang('%1 is not readable', $target);
 				}
 			}
 			catch (Exception $i_ex)
@@ -529,20 +529,20 @@ 
 			}
 
 
-			if(method_exists($po, 'get_warnings') && $po->get_warnings())
+			if (method_exists($po, 'get_warnings') && $po->get_warnings())
 			{
-				$buffer = 'importexport_schedule: ' . date('c') . ": Import warnings:\n#\tWarning\n";
-				foreach($po->get_warnings() as $record => $msg)
+				$buffer = 'importexport_schedule: '.date('c').": Import warnings:\n#\tWarning\n";
+				foreach ($po->get_warnings() as $record => $msg)
 				{
 					$data['warnings'][$target][] = "#$record: $msg";
 					$buffer += "$record\t$msg\n";
 				}
 				error_log($buffer);
 			}
-			if(method_exists($po, 'get_errors') && $po->get_errors())
+			if (method_exists($po, 'get_errors') && $po->get_errors())
 			{
-				$buffer = 'importexport_schedule: ' . date('c') . ": Import errors:\n#\tError\n";
-				foreach($po->get_errors() as $record => $error)
+				$buffer = 'importexport_schedule: '.date('c').": Import errors:\n#\tError\n";
+				foreach ($po->get_errors() as $record => $error)
 				{
 					$data['errors'][$target][] = "#$record: $error";
 					$buffer += "$record\t$error\n";
@@ -550,22 +550,22 @@ 
 				error_log($buffer);
 			}
 
-			if($po instanceof importexport_iface_import_plugin)
+			if ($po instanceof importexport_iface_import_plugin)
 			{
-				if(is_numeric($result))
+				if (is_numeric($result))
 				{
 					$data['record_count'] += $result;
 					$data['result'][$target][] = lang('%1 records processed', $result);
 				}
 				$data['result'][$target] = array();
-				foreach($po->get_results() as $action => $count)
+				foreach ($po->get_results() as $action => $count)
 				{
-					$data['result'][$target][] = lang($action) . ": $count";
+					$data['result'][$target][] = lang($action).": $count";
 				}
 			}
 			else
 			{
-				if($result instanceof importexport_iface_export_record)
+				if ($result instanceof importexport_iface_export_record)
 				{
 					$data['record_count'] += $result->get_num_of_records();
 					$data['result'][$target][] = lang('%1 records processed', $result->get_num_of_records());
@@ -574,23 +574,23 @@ 
 		}
 
 		// Delete file?
-		if($data['delete_files'] && $type == 'import' && !$data['errors'])
+		if ($data['delete_files'] && $type == 'import' && !$data['errors'])
 		{
-			foreach($targets as $target)
+			foreach ($targets as $target)
 			{
-				if(unlink($target))
+				if (unlink($target))
 				{
-					$data['result'][$target][] .= "\n..." . lang('deleted');
+					$data['result'][$target][] .= "\n...".lang('deleted');
 				}
 				else
 				{
-					$data['errors'][$target][] .= "\n..." . lang('Unable to delete');
+					$data['errors'][$target][] .= "\n...".lang('Unable to delete');
 				}
 			}
 		}
 
 		// Run time in minutes
-		$data['run_time'] = round((time() - $data['last_run']) / 60,1);
+		$data['run_time'] = round((time() - $data['last_run']) / 60, 1);
 
 		// Clear lock
 		$data['lock'] = 0;
@@ -601,9 +601,9 @@ 
 		$contents = ob_get_contents();
 
 		// Log to error log
-		if($contents)
+		if ($contents)
 		{
-			error_log('importexport_schedule: ' . date('c') . ": \n".$contents);
+			error_log('importexport_schedule: '.date('c').": \n".$contents);
 		}
 
 		ob_end_clean();
@@ -620,7 +620,7 @@ 
 		$jobs = $async->read($id);
 		$job = $jobs[$id];
 
-		if(is_array($job))
+		if (is_array($job))
 		{
 			$async->cancel_timer($id);
 			$result = $async->set_timer(
@@ -630,37 +630,37 @@ 
 				$data
 			);
 		}
-		if($no_notification)
+		if ($no_notification)
 		{
 			return $result;
 		}
 
 		// Send notification to user
-		if($data['warnings'] || $data['errors'])
+		if ($data['warnings'] || $data['errors'])
 		{
 			$notify = new notifications();
 			$notify->set_sender($data['account_id']);
 			$notify->add_receiver($data['account_id']);
-			$notify->set_subject(lang('Schedule import | export'). ' ' . lang('errors'));
+			$notify->set_subject(lang('Schedule import | export').' '.lang('errors'));
 			$contents = '';
 
-			if($data['warnings'])
+			if ($data['warnings'])
 			{
-				$contents .= lang($data['type']) . ' ' . lang('Warnings') . ' ' . Api\DateTime::to() . ':';
-				foreach($data['warnings'] as $target => $message)
+				$contents .= lang($data['type']).' '.lang('Warnings').' '.Api\DateTime::to().':';
+				foreach ($data['warnings'] as $target => $message)
 				{
-					$contents .= "\n". (is_numeric($target) ? '' : $target."\n");
-					$contents .= is_array($message) ? implode("\n",$message) : $message;
+					$contents .= "\n".(is_numeric($target) ? '' : $target."\n");
+					$contents .= is_array($message) ? implode("\n", $message) : $message;
 				}
 				$contents .= "\n";
 			}
-			if($data['errors'])
+			if ($data['errors'])
 			{
-				$contents .= lang($data['type']) . ' ' . lang('Errors') . ' ' . Api\DateTime::to() . ':';
-				foreach($data['errors'] as $target => $errors)
+				$contents .= lang($data['type']).' '.lang('Errors').' '.Api\DateTime::to().':';
+				foreach ($data['errors'] as $target => $errors)
 				{
-					$contents .= "\n". (is_numeric($target) ? '' : $target."\n");
-					$contents .= is_array($errors) ? implode("\n",$errors) : $errors;
+					$contents .= "\n".(is_numeric($target) ? '' : $target."\n");
+					$contents .= is_array($errors) ? implode("\n", $errors) : $errors;
 				}
 				$contents .= "\n";
 			}

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']);
 		}

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

@@ -198,7 +198,7 @@ 
 	/**
 	* Get options for select boxes
 	*/
-	public static function get_select_options(Array $data)
+	public static function get_select_options(array $data)
 	{
 		$options = array(
 			'type'	=>	array(
@@ -283,7 +283,7 @@ 
 	*
 	* $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')
 		{

importexport/inc/class.importexport_wizard_basic_export_csv.inc.php

Indentation +22 added lines, -22 removed lines

@@ -23,13 +23,13 @@ 
 	const TEMPLATE_MARKER = '-eTemplate-';
 
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step30' => 'importexport.wizard_basic_export_csv.choose_fields',
 		'wizard_step40' => 'importexport.wizard_basic_export_csv.choosesepncharset',
@@ -38,19 +38,19 @@ 
 		
 
 	/**
-	* Destination fields for the export
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the export
+	 * Key is the field name, value is the human version
+	 */
 	protected $export_fields = array();
 	
 	/**
-	* List of conditions your plugin supports
-	*/
+	 * List of conditions your plugin supports
+	 */
 	protected $conditions = array();
 
 	/**
-	* List of actions your plugin supports
-	*/
+	 * List of actions your plugin supports
+	 */
 	protected $actions = array();
 
 	/**
@@ -69,8 +69,8 @@ 
 	}
 
 	/**
-	* Choose fields to export
-	*/
+	 * Choose fields to export
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -206,16 +206,16 @@ 
 			);
 			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
 			array(
-                                'user'  => lang('User preference'),
-                        );
+								'user'  => lang('User preference'),
+						);
 
-                        // Add in extra allowed charsets
-                        $config = Api\Config::read('importexport');
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-                        if($extra_charsets)
-                        {
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
-                        }
+						// Add in extra allowed charsets
+						$config = Api\Config::read('importexport');
+						$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
+						if($extra_charsets)
+						{
+								$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+						}
 			$sel_options['convert'] = array(
 				0	=> lang('Database values'),
 				1	=> lang('Human friendly values')

Spacing +36 added lines, -36 removed lines

@@ -64,7 +64,7 @@ 
 			'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,14 +73,14 @@ 
 	*/
 	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')
 		{
-			foreach($content['fields']['export'] as $field_name)
+			foreach ($content['fields']['export'] as $field_name)
 			{
 				// Preserve original field names, where available
-				if($content['plugin_options']['no_header_translation'] && $content['plugin_options']['mapping'][$field_name])
+				if ($content['plugin_options']['no_header_translation'] && $content['plugin_options']['mapping'][$field_name])
 				{
 					$content['mapping'][$field_name] = $content['plugin_options']['mapping'][$field_name];
 				}
@@ -89,12 +89,12 @@ 
 					$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;
@@ -105,13 +105,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step30($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step30($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step30
@@ -125,15 +125,15 @@ 
 			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 +155,11 @@ 
 	 */
 	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['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;
 				}
@@ -167,13 +167,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -183,18 +183,18 @@ 
 			$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']) {
 				$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'];
 			}
 
@@ -204,17 +204,17 @@ 
 				1	=> lang('Field names'),
 				'label'	=> lang('Field labels')
 			);
-			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
+			$sel_options['charset'] = Api\Translation::get_installed_charsets() +
 			array(
                                 'user'  => lang('User preference'),
                         );
 
                         // Add in extra allowed charsets
                         $config = Api\Config::read('importexport');
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-                        if($extra_charsets)
+                        $extra_charsets = array_intersect(explode(',', $config['import_charsets']), mb_list_encodings());
+                        if ($extra_charsets)
                         {
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets, $extra_charsets));
                         }
 			$sel_options['convert'] = array(
 				0	=> lang('Database values'),
@@ -238,15 +238,15 @@ 
 	 */
 	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') {
 			// Process submitted
 			unset($content['filter']);
 			unset($content['set_filter']['fields']);
-			foreach($content['set_filter'] as $key => $value)
+			foreach ($content['set_filter'] as $key => $value)
 			{
-				if($value) {
+				if ($value) {
 					$content['filter'][$key] = $value;
 				}
 			}
@@ -256,13 +256,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step80($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step80($content, $sel_options, $readonlys, $preserv);
 			}
 		} else {
 
@@ -273,15 +273,15 @@ 
 			unset ($preserv['button']);
 
 			$content['set_filter']['fields'] = importexport_helper_functions::get_filter_fields(
-				$content['application'],$content['plugin'],$this
+				$content['application'], $content['plugin'], $this
 			);
 			// Load existing filter from either content or definition
-			foreach($content['set_filter']['fields'] as $field => $settings)
+			foreach ($content['set_filter']['fields'] as $field => $settings)
 			{
 				$content['set_filter'][$field] = $content['filter'][$field];
 			}
 
-			if(!$content['set_filter']['fields'])
+			if (!$content['set_filter']['fields'])
 			{
 				// No fields
 				return importexport_definitions_ui::SKIP;

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/inc/class.importexport_wizard_basic_import_csv.inc.php

Indentation +20 added lines, -20 removed lines

@@ -23,13 +23,13 @@ 
 	const TEMPLATE_MARKER = '-eTemplate-';
 
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step30' => 'importexport.wizard_basic_import_csv.sample_file',
 		'wizard_step40' => 'importexport.wizard_basic_import_csv.choosesepncharset',
@@ -39,19 +39,19 @@ 
 		
 
 	/**
-	* Destination fields for the mapping
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the mapping
+	 * Key is the field name, value is the human version
+	 */
 	protected $mapping_fields = array();
 	
 	/**
-	* List of conditions your plugin supports
-	*/
+	 * List of conditions your plugin supports
+	 */
 	protected $conditions = array();
 
 	/**
-	* List of actions your plugin supports
-	*/
+	 * List of actions your plugin supports
+	 */
 	protected $actions = array();
 
 	/**
@@ -68,8 +68,8 @@ 
 	}
 
 	/**
-	* Take a sample CSV file.  It will be processed in later steps
-	*/
+	 * Take a sample CSV file.  It will be processed in later steps
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -263,11 +263,11 @@ 
 	}
 	
 	/**
-	* Process the sample file, get the fields out of it, then allow them to be mapped onto
-	* the fields the destination understands.  Also, set any translations to be done to the field.
-	*
-	* You can use the eTemplate
-	*/
+	 * Process the sample file, get the fields out of it, then allow them to be mapped onto
+	 * the fields the destination understands.  Also, set any translations to be done to the field.
+	 *
+	 * You can use the eTemplate
+	 */
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
@@ -348,8 +348,8 @@ 
 	}
 	
 	/**
-	* Edit conditions
-	*/
+	 * Edit conditions
+	 */
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));

Spacing +61 added lines, -61 removed lines

@@ -72,7 +72,7 @@ 
 	*/
 	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')
 		{
@@ -80,17 +80,17 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
-						$GLOBALS['egw']->session->appsession('csvfile',$content['application'],$content['file']['tmp_name']);
+					if ($content['file']['tmp_name']) {
+						$GLOBALS['egw']->session->appsession('csvfile', $content['application'], $content['file']['tmp_name']);
 					}
 					unset($content['file']);
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step30($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step30($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step30
@@ -117,57 +117,57 @@ 
 	 */
 	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') {
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
 					// Process sample file for fields
-					if (Api\Cache::getSession($content['application'],'csvfile') &&
-						($handle = fopen(Api\Cache::getSession($content['application'],'csvfile'), "rb")) !== FALSE
+					if (Api\Cache::getSession($content['application'], 'csvfile') &&
+						($handle = fopen(Api\Cache::getSession($content['application'], 'csvfile'), "rb")) !== FALSE
 					) {
 						$data = fgetcsv($handle, 8000, $content['fieldsep']);
 						//error_log(array2string($data));
 						fclose($handle);
 
 						// Remove & forget file
-						unlink(Api\Cache::getSession($content['application'],'csvfile'));
+						unlink(Api\Cache::getSession($content['application'], 'csvfile'));
 						Api\Cache::setSession($content['application'], 'csvfile', '');
-						$content['csv_fields'] = Api\Translation::convert($data,$content['charset']);
+						$content['csv_fields'] = Api\Translation::convert($data, $content['charset']);
 
 						// Reset field mapping for new file
 						$content['field_mapping'] = array();
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach ($content['csv_fields'] as $index => $field) {
+							if ($content['field_mapping'][$index]) continue;
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach ($this->mapping_fields as $key => $field_name) {
+								if (is_array($field_name)) continue;
+								if (strcasecmp($field, $field_name) == 0 || strcasecmp($field, $key) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
 									$msg_id = Api\Translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if ($msg_id) {
 									$english[$field_name] = Api\Translation::read('en', $content['application'], $msg_id);
 								} else {
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if ($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 
 								// Check for similar but slightly different
 								$match = 0;
-								if(similar_text(strtolower($field), strtolower($field_name), $match) &&
+								if (similar_text(strtolower($field), strtolower($field_name), $match) &&
 										$match > 85 &&
 										$match > $best_match_value
 								) {
@@ -176,20 +176,20 @@ 
 								}
 
 							}
-							if($best_match) {
+							if ($best_match) {
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					} elseif (!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -199,17 +199,17 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if (!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
 			} elseif (!$content['fieldsep']) {
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
-			if(!array_key_exists('num_header_lines', $content))
+			if (!array_key_exists('num_header_lines', $content))
 			{
-				if(is_array($content['plugin_options']) && array_key_exists('num_header_lines', $content['plugin_options']))
+				if (is_array($content['plugin_options']) && array_key_exists('num_header_lines', $content['plugin_options']))
 				{
 					$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
 				}
@@ -219,10 +219,10 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if (!$content['update_cats'] && $content['plugin_options']['update_cats']) {
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if (!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -231,24 +231,24 @@ 
 				$content['convert'] = 1;
 			}
 
-			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
+			$sel_options['charset'] = Api\Translation::get_installed_charsets() +
 			array(
 				'user'	=> lang('User preference'),
 			);
 
 			// Add in extra allowed charsets
 			$config = Api\Config::read('importexport');
-			$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-			if($extra_charsets)
+			$extra_charsets = array_intersect(explode(',', $config['import_charsets']), mb_list_encodings());
+			if ($extra_charsets)
 			{
-				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets, $extra_charsets));
 			}
 			$sel_options['convert'] = array(
 				0       => lang('Database values'),
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if ($this->mapping_fields['cat_id']) {
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
@@ -270,18 +270,18 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step50->$content '.print_r($content, true));
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
 			unset($content['field_mapping']);
 			unset($content['field_conversion']);
-			foreach($content['mapping'] as $field)
+			foreach ($content['mapping'] as $field)
 			{
 				$index = $field['index'];
-				foreach(array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
+				foreach (array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
 				{
-					if(trim($field[$id]) != '' && $field[$id] !== '--NONE--')
+					if (trim($field[$id]) != '' && $field[$id] !== '--NONE--')
 					{
 						$content[$dest][$index] = trim($field[$id]);
 					}
@@ -291,13 +291,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step50($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step50($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step50
@@ -307,7 +307,7 @@ 
 			$content['step'] = 'wizard_step50';
 
 			$content['mapping'] = array(false);
-			if(array_key_exists('field_mapping', $content))
+			if (array_key_exists('field_mapping', $content))
 			{
 				$field = $content['field_mapping'];
 				$conversion = $content['field_conversion'];
@@ -318,7 +318,7 @@ 
 				$conversion = $content['plugin_options']['field_conversion'];
 			}
 			$empties = 1;
-			foreach($content['csv_fields'] as $index => $title)
+			foreach ($content['csv_fields'] as $index => $title)
 			{
 				$content['mapping'][] = array(
 					'index'	=>	$index,
@@ -326,15 +326,15 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if (strstr($title, lang('Extra %1'))) $empties++;
 			}
-			while($empties <= 3)
+			while ($empties <= 3)
 			{
 				$content['mapping'][] = array(
 					'index' => $index + $empties,
 					'title' => lang('Extra %1', $empties),
-					'field' => $field[$index+$empties],
-					'conversion'	=>	$conversion[$index+$empties]
+					'field' => $field[$index + $empties],
+					'conversion'	=>	$conversion[$index + $empties]
 				);
 				$empties++;
 			}
@@ -352,7 +352,7 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step55->$content '.print_r($content, true));
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -360,8 +360,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
-				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
+			foreach ($content['conditions'] as $key => &$condition) {
+				if (($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
 				) {
@@ -370,7 +370,7 @@ 
 				}
 
 				// Check for true without false, or false without true - set to 'none'
-				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
+				elseif ($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
 				)
@@ -382,9 +382,9 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				case 'add':
@@ -393,7 +393,7 @@ 
 					$content['conditions'][] = array('string' => '');
 					return 'wizard_step55';
 				default :
-					return $this->wizard_step55($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step55($content, $sel_options, $readonlys, $preserv);
 					break;
 			}
 		}
@@ -401,18 +401,18 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if (!$content['conditions'] && $content['plugin_options']['conditions']) {
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach ($content['field_mapping'] as $field) {
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
-			if(!$sel_options['string'][$field])
+			if (!$sel_options['string'][$field])
 			{
-				foreach($this->mapping_fields as $fields)
+				foreach ($this->mapping_fields as $fields)
 				{
-					if(is_array($fields) && $fields[$field])
+					if (is_array($fields) && $fields[$field])
 					{
 						$sel_options['string'][$field] = $fields[$field];
 					}

Braces +75 added lines, -30 removed lines

@@ -72,7 +72,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')
 		{
@@ -80,7 +83,8 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
+					if($content['file']['tmp_name'])
+					{
 						$GLOBALS['egw']->session->appsession('csvfile',$content['application'],$content['file']['tmp_name']);
 					}
 					unset($content['file']);
@@ -117,9 +121,13 @@ 
 	 */
 	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['step'] == 'wizard_step40')
+		{
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
@@ -141,26 +149,40 @@ 
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach($content['csv_fields'] as $index => $field)
+						{
+							if($content['field_mapping'][$index])
+							{
+								continue;
+							}
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach($this->mapping_fields as $key => $field_name)
+							{
+								if(is_array($field_name))
+								{
+									continue;
+								}
+								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name]))
+								{
 									$msg_id = Api\Translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if($msg_id)
+								{
 									$english[$field_name] = Api\Translation::read('en', $content['application'], $msg_id);
-								} else {
+								}
+								else
+								{
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
@@ -176,11 +198,14 @@ 
 								}
 
 							}
-							if($best_match) {
+							if($best_match)
+							{
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					}
+					elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields'])
+					{
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
 					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
@@ -199,12 +224,16 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep'])
+			{
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
-			} elseif (!$content['fieldsep']) {
+			}
+			elseif (!$content['fieldsep'])
+			{
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
 			if(!array_key_exists('num_header_lines', $content))
@@ -219,10 +248,12 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if(!$content['update_cats'] && $content['plugin_options']['update_cats'])
+			{
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options']))
+			{
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -248,12 +279,15 @@ 
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if($this->mapping_fields['cat_id'])
+			{
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
 				);
-			} else {
+			}
+			else
+			{
 				$content['no_cats'] = true;
 			}
 			unset ($preserv['button']);
@@ -270,7 +304,10 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		}
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
@@ -326,7 +363,10 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if(strstr($title,lang('Extra %1')))
+				{
+					$empties++;
+				}
 			}
 			while($empties <= 3)
 			{
@@ -352,7 +392,10 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		}
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -360,7 +403,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
+			foreach($content['conditions'] as $key => &$condition)
+			{
 				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
@@ -373,8 +417,7 @@ 
 				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
-				)
-				{
+				) {
 					$condition[$condition['true']['action'] == '' ? 'true' : 'false']['action'] = "none";
 				}
 			}
@@ -401,12 +444,14 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if(!$content['conditions'] && $content['plugin_options']['conditions'])
+		{
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach($content['field_mapping'] as $field)
+		{
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
 			if(!$sel_options['string'][$field])
 			{

importexport/inc/class.importexport_export_ui.inc.php

Spacing +77 added lines, -77 removed lines

@@ -36,47 +36,47 @@ 
 	private $export_plugins;
 
 	public function __construct() {
-		Framework::includeJS('.','export_dialog','importexport');
-		Framework::includeJS('.','importexport','importexport');
+		Framework::includeJS('.', 'export_dialog', 'importexport');
+		Framework::includeJS('.', 'importexport', 'importexport');
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
-		$this->export_plugins = importexport_helper_functions::get_plugins('all','export');
+		$this->export_plugins = importexport_helper_functions::get_plugins('all', 'export');
 		$GLOBALS['egw_info']['flags']['include_xajax'] = true;
 
 	}
 
-	public function export_dialog($_content=array()) {
+	public function export_dialog($_content = array()) {
 		$tabs = 'general_tab|selection_tab|options_tab';
 		$sel_options = array();
 		$readonlys = array();
 		$preserv = array();
 
-		$et = new Etemplate(self::_appname. '.export_dialog');
+		$et = new Etemplate(self::_appname.'.export_dialog');
 		$_appname = $_content['appname'] ? $_content['appname'] : $_GET['appname'];
 		$_definition = $_content['definition'] ? $_content['definition'] : $_GET['definition'];
 		$_plugin = $_content['plugin'] ? $_content['plugin'] : $_GET['plugin'];
 		// Select all from context menu, means use all search results, not just selected
-		if($_GET['select_all'] == 'true') $_GET['selection'] = 'search';
+		if ($_GET['select_all'] == 'true') $_GET['selection'] = 'search';
 		$_selection = $_content['selection'] ? $_content['selection'] : $_GET['selection'];
-		if($_GET['selection'] || $_content['selection_passed']) $content['selection_passed'] = $preserv['selection_passed'] = true;
+		if ($_GET['selection'] || $_content['selection_passed']) $content['selection_passed'] = $preserv['selection_passed'] = true;
 
 		// Check global setting
-		if(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if (!Api\Storage\Merge::is_export_limit_excepted()) {
 			$export_limit = Api\Storage\Merge::getExportLimit($_appname);
-			if($export_limit == 'no') {
+			if ($export_limit == 'no') {
 				die(lang('Admin disabled exporting'));
 			}
 		}
 			//error_log(__FILE__.__FUNCTION__. '::$_GET[\'appname\']='. $_appname. ',$_GET[\'definition\']='. $_definition. ',$_GET[\'plugin\']='.$_plugin. ',$_GET[\'selection\']='.$_selection);
 		// if appname is given and valid, list available definitions (if no definition is given)
-		$readonlys['appname'] = (!empty($_appname) && $GLOBALS['egw']->acl->check('run',1,$_appname));
+		$readonlys['appname'] = (!empty($_appname) && $GLOBALS['egw']->acl->check('run', 1, $_appname));
 		$content['appname'] = $_appname;
 		$preserv['appname'] = $_appname;
-		if(empty($_appname)) {
-			$et->setElementAttribute('select_definition','disabled',true);
+		if (empty($_appname)) {
+			$et->setElementAttribute('select_definition', 'disabled', true);
 		}
 
 		// Check for preferred definition
-		if(!$_definition && $_appname) {
+		if (!$_definition && $_appname) {
 			$_definition = $GLOBALS['egw_info']['user']['preferences'][$_appname]['nextmatch-export-definition'];
 		}
 		// fill definitions
@@ -98,13 +98,13 @@ 
 			}
 			unset($definition);
 		}
-		if(count($sel_options['definition']) == 2 && !$content['definition']) {
+		if (count($sel_options['definition']) == 2 && !$content['definition']) {
 			$content['definition'] = end($sel_options['definition']);
 		}
 		unset($definitions);
 		//$sel_options['definition']['expert'] = lang('Expert options');
 
-		if(isset($_definition) && array_key_exists($_definition,$sel_options['definition'])) {
+		if (isset($_definition) && array_key_exists($_definition, $sel_options['definition'])) {
 			$content['definition'] = $_definition;
 		}
 
@@ -112,8 +112,8 @@ 
 		$sel_options['plugin'] = $this->export_plugins[$_appname]['export'];
 
 		// show definitions or plugins in ui?
-		if($content['definition'] == 'expert') {
-			if(isset($_plugin) && array_key_exists($_plugin,$sel_options['plugin'])) {
+		if ($content['definition'] == 'expert') {
+			if (isset($_plugin) && array_key_exists($_plugin, $sel_options['plugin'])) {
 				$content['plugin'] = $_plugin;
 				$selected_plugin = $_plugin;
 			}
@@ -131,7 +131,7 @@ 
 			$readonlys['save_definition'] = true;
 
 			$definition = new importexport_definition($content['definition']);
-			if($definition) {
+			if ($definition) {
 				$content += (array)$definition->plugin_options;
 				$selected_plugin = $definition->plugin;
 				$content['description'] = $definition->description;
@@ -148,27 +148,27 @@ 
 			'|'	=>	'|',
 			''	=>	lang('Other')
 		);
-		if(!$sel_options['delimiter'][$content['delimiter']]) $sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
-		$sel_options['delimiter'][$content['delimiter']] = lang('Use default') . ' "' . $sel_options['delimiter'][$content['delimiter']] . '"';
+		if (!$sel_options['delimiter'][$content['delimiter']]) $sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
+		$sel_options['delimiter'][$content['delimiter']] = lang('Use default').' "'.$sel_options['delimiter'][$content['delimiter']].'"';
 
-		if(!$_content['delimiter']) $et->setElementAttribute('other_delimiter','disabled',true);
+		if (!$_content['delimiter']) $et->setElementAttribute('other_delimiter', 'disabled', true);
 
 		// Other delimiter (options)
-		if($_content['other_delimiter']) $_content['delimiter'] = $_content['other_delimiter'];
+		if ($_content['other_delimiter']) $_content['delimiter'] = $_content['other_delimiter'];
 
 		// handle selector
-		if($selected_plugin) {
+		if ($selected_plugin) {
 			$content['plugin'] = $selected_plugin;
 			$plugin_object = new $selected_plugin;
 
 			$content['description'] = $plugin_object->get_description();
 
 			// fill options tab
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+ 			if (method_exists($plugin_object, 'get_selectors_html')) {
 				$content['plugin_options_html'] = $plugin_object->get_options_html();
 			} else {
 				$options = $plugin_object->get_options_etpl($definition);
-				if(is_array($options)) {
+				if (is_array($options)) {
 					$content['plugin_options_template'] = $options['name'];
 					$content += (array)$options['content'];
 					$sel_options += (array)$options['sel_options'];
@@ -181,7 +181,7 @@ 
 		}
 
 		// fill selection tab
-		if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) {
+		if ($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) {
 			$_selection = $definition->plugin_options['selection'];
 		}
 
@@ -191,11 +191,11 @@ 
 			$preserv['selection'] = $_selection;
 		}
 		elseif ($plugin_object) {
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+ 			if (method_exists($plugin_object, 'get_selectors_html')) {
 				$content['plugin_selectors_html'] = $plugin_object->get_selectors_html();
 			} else {
 				$options = $plugin_object->get_selectors_etpl($definition);
-				if(is_array($options)) {
+				if (is_array($options)) {
 					$content += is_array($options['content']) ? $options['content'] : array('selection' => $options['content']);
 					$sel_options += (array)$options['sel_options'];
 					$readonlys['selection'] = (array)$options['readonlys'];
@@ -205,12 +205,12 @@ 
 					$content['plugin_selectors_template'] = $options;
 				}
 			}
-			if(!$content['plugin_selectors_html'] && !$content['plugin_selectors_template']) {
+			if (!$content['plugin_selectors_html'] && !$content['plugin_selectors_template']) {
 				$readonlys[$tabs]['selection_tab'] = true;
 			}
 			$content['filter'] = $definition->filter;
 			$content['filter']['fields'] = importexport_helper_functions::get_filter_fields($_appname, $selected_plugin);
-			if(!$content['filter']['fields'])
+			if (!$content['filter']['fields'])
 			{
 				$content['no_filter'] = true;
 			}
@@ -228,7 +228,7 @@ 
 		{
 			$content['selection'] = 'filter';
 		}
-		if(!$content['selection'])
+		if (!$content['selection'])
 		{
 			$content['selection'] = 'search';
 		}
@@ -239,33 +239,33 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($apps));
 		if (empty($apps)) throw new Exception('Error: no application profiles available for export');
 		if (!is_array($apps) && $apps) $apps = (array)$apps;
-		$sel_options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
-		if(!$_application && !$selected_plugin) {
+		$sel_options['appname'] = array('' => lang('Select one')) + array_combine($apps, $apps);
+		if (!$_application && !$selected_plugin) {
 			$content['plugin_selectors_html'] = $content['plugin_options_html'] =
 			lang('You need to select an app and format first!');
 			$readonlys[$tabs] = array('selection_tab' => true, 'options_tab' => true);
 		}
 
-		if($_content['preview'] || $_content['export'])
+		if ($_content['preview'] || $_content['export'])
 		{
 			//error_log(__LINE__.__FILE__.'$_content: '.print_r($_content,true));
 			$response = Api\Json\Response::get();
 
 			if ($_content['definition'] == 'expert') {
 				$definition = new importexport_definition();
-				$definition->definition_id	= $_content['definition_id'] ? $_content['definition_id'] : '';
+				$definition->definition_id = $_content['definition_id'] ? $_content['definition_id'] : '';
 				$definition->name		= $_content['name'] ? $_content['name'] : '';
-				$definition->application	= $_content['appname'];
-				$definition->plugin		= $_content['plugin'];
+				$definition->application = $_content['appname'];
+				$definition->plugin = $_content['plugin'];
 				$definition->type		= 'export';
-				$definition->allowed_users	= $_content['allowed_users'] ? $_content['allowed_users'] : $this->user;
-				$definition->owner		= $_content['owner'] ? $_content['owner'] : $this->user;
+				$definition->allowed_users = $_content['allowed_users'] ? $_content['allowed_users'] : $this->user;
+				$definition->owner = $_content['owner'] ? $_content['owner'] : $this->user;
 			}
 			else {
 				$definition = new importexport_definition($_content['definition']);
 			}
 
-			if(!is_array($definition->plugin_options)) {
+			if (!is_array($definition->plugin_options)) {
 				$definition->plugin_options = array(
 					'mapping'	=>	array()
 				);
@@ -275,30 +275,30 @@ 
 			// Note that because not all dates are DB dates, the plugin has to handle them
 			$filter = array();
 			$_content['filter'] = $_content['filter_html'] ? $_content['filter_html'] : $_content['filter_tpl'];
-			if(is_array($_content['filter']))
+			if (is_array($_content['filter']))
 			{
-				foreach($_content['filter'] as $key => $value)
+				foreach ($_content['filter'] as $key => $value)
 				{
 					// Handle multiple values
-					if(!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
+					if (!is_array($value) && strpos($value, ',') !== false) $value = explode(',', $value);
 
 					$filter[$key] = $value;
 
 					// Skip empty values or empty ranges
-					if($value == "" || is_null($value) || (is_array($value) && count($value) == 0) || is_array($value) && array_key_exists('from',$value) && !$value['from'] && !$value['to'] )
+					if ($value == "" || is_null($value) || (is_array($value) && count($value) == 0) || is_array($value) && array_key_exists('from', $value) && !$value['from'] && !$value['to'])
 					{
 						unset($filter[$key]);
 					}
-					if(is_array($value) && array_key_exists('from', $value) && $value['from'])
+					if (is_array($value) && array_key_exists('from', $value) && $value['from'])
 					{
-						$filter[$key]['from'] = Api\DateTime::to($value['from'],'ts');
+						$filter[$key]['from'] = Api\DateTime::to($value['from'], 'ts');
 					}
 					// If user selects an end date, they most likely want entries including that date
-					if(is_array($value) && array_key_exists('to',$value) && $value['to'] )
+					if (is_array($value) && array_key_exists('to', $value) && $value['to'])
 					{
 						// Adjust time to 23:59:59
 						$filter[$key]['to'] = new Api\DateTime($value['to']);
-						$filter[$key]['to']->setTime(23,59,59);
+						$filter[$key]['to']->setTime(23, 59, 59);
 						$filter[$key]['to'] = $filter[$key]['to']->format('ts');
 					}
 				}
@@ -312,19 +312,19 @@ 
 				$_content
 			);
 
-			if(!$definition->plugin_options['selection']) {
-				$response->alert( lang('No records selected'));
+			if (!$definition->plugin_options['selection']) {
+				$response->alert(lang('No records selected'));
 				return;
 			}
 
-			$tmpfname = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'export');
+			$tmpfname = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'export');
 			$file = fopen($tmpfname, "w+");
-			if (! $charset = $definition->plugin_options['charset']) {
+			if (!$charset = $definition->plugin_options['charset']) {
 				$charset = Api\Translation::charset();
 			}
-			if($charset == 'user')
+			if ($charset == 'user')
 			{
-				switch($definition->plugin)
+				switch ($definition->plugin)
 				{
 					case 'addressbook_export_vcard':
 						$charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
@@ -334,9 +334,9 @@ 
 				}
 			}
 			$plugin_object = new $definition->plugin;
-			$result = $plugin_object->export( $file, $definition );
+			$result = $plugin_object->export($file, $definition);
 
-			if(is_object($result) && method_exists($result, 'get_num_of_records'))
+			if (is_object($result) && method_exists($result, 'get_num_of_records'))
 			{
 				$record_count = $result->get_num_of_records();
 			}
@@ -344,7 +344,7 @@ 
 			// Store charset to use in header
 			Api\Cache::setSession('importexport', $tmpfname, $charset, 100);
 
-			if($_content['export'] == 'pressed') {
+			if ($_content['export'] == 'pressed') {
 				fclose($file);
 				$filename = pathinfo($tmpfname, PATHINFO_FILENAME);
 				$link_query = array(
@@ -356,25 +356,25 @@ 
 				);
 
 				// Allow plugins to suggest a file name - return false if they have no suggestion
-				if(method_exists($plugin_object, 'get_filename') && $plugin_filename = $plugin_object->get_filename())
+				if (method_exists($plugin_object, 'get_filename') && $plugin_filename = $plugin_object->get_filename())
 				{
 					$link_query['filename'] = $plugin_filename;
 				}
-				$response->redirect( $GLOBALS['egw']->link('/index.php',$link_query),true);
+				$response->redirect($GLOBALS['egw']->link('/index.php', $link_query), true);
 				Framework::window_close();
 				return;
 			}
-			elseif($_content['preview'] == 'pressed') {
+			elseif ($_content['preview'] == 'pressed') {
 				fseek($file, 0);
 				$item_count = 1;
 				$preview = '';
-				$search = array('[\016]','[\017]',
-								'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-								'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+				$search = array('[\016]', '[\017]',
+								'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+								'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 				$replace = $preview = '';
 
-				while(!feof($file) && $item_count < 30) {
-					$preview .= preg_replace($search,$replace,fgets($file,1024));
+				while (!feof($file) && $item_count < 30) {
+					$preview .= preg_replace($search, $replace, fgets($file, 1024));
 					$item_count++;
 				}
 
@@ -382,12 +382,12 @@ 
 				unlink($tmpfname);
 
 				// Convert back to system charset for display
-				$preview = Api\Translation::convert( $preview,
+				$preview = Api\Translation::convert($preview,
 					$charset,
 					Api\Translation::charset()
 				);
 
-				$preview = "<div class='header'>".lang('Preview') . "<span class='count'>".(int)$record_count."</span></div>".$preview;
+				$preview = "<div class='header'>".lang('Preview')."<span class='count'>".(int)$record_count."</span></div>".$preview;
 
 				$et->setElementAttribute('preview-box', 'value', nl2br($preview));
 				return;
@@ -399,17 +399,17 @@ 
 			$readonlys[$tabs]['selection'] = false;
 		}
 		//error_log(print_r($content,true));
-		return $et->exec(self::_appname. '.importexport_export_ui.export_dialog',$content,$sel_options,$readonlys,$preserv,2);
+		return $et->exec(self::_appname.'.importexport_export_ui.export_dialog', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
-	public function ajax_get_definitions($_appname, xajaxResponse &$response = null) {
-		if(is_null($response)) {
+	public function ajax_get_definitions($_appname, xajaxResponse&$response = null) {
+		if (is_null($response)) {
 			$response = new xajaxResponse();
 		} else {
 			$no_return = true;
 		}
 		if (!$_appname) {
-			$response->jquery('tr.select_definition','hide');
+			$response->jquery('tr.select_definition', 'hide');
 			return $no_return ? '' : $response->getXML();
 		}
 
@@ -431,7 +431,7 @@ 
 				unset($definition);
 		}
 		unset($definitions);
-		$response->addScript("selectbox_add_option('exec[definition]','" . lang('Expert options') . "', 'expert',".($selected_plugin == $title ? 'true' : 'false').");");
+		$response->addScript("selectbox_add_option('exec[definition]','".lang('Expert options')."', 'expert',".($selected_plugin == $title ? 'true' : 'false').");");
 	}
 
 	public function ajax_get_definition_description($_definition) {
@@ -446,7 +446,7 @@ 
 			}
 			unset ($_object);
 		}
-		$_response->assign('importexport-export_dialog_plugin_description','innerHTML',$description);
+		$_response->assign('importexport-export_dialog_plugin_description', 'innerHTML', $description);
 	}
 
 	public function ajax_get_plugin_description($_plugin) {
@@ -456,7 +456,7 @@ 
 		if (is_a($plugin_object, 'importexport_iface_export_plugin')) {
 			$description = $plugin_object->get_description();
 		}
-		$_response->addAssign('importexport-export_dialog_plugin_description','innerHTML',$description);
+		$_response->addAssign('importexport-export_dialog_plugin_description', 'innerHTML', $description);
 
 		unset ($plugin_object);
 	}
@@ -469,7 +469,7 @@ 
 	 */
 	public function download($_tmpfname = '') {
 		$tmpfname = $_tmpfname ? $_tmpfname : $_GET['_filename'];
-		$tmpfname = $GLOBALS['egw_info']['server']['temp_dir'] .'/'. $tmpfname;
+		$tmpfname = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmpfname;
 		if (!is_readable($tmpfname)) die();
 
 		$appname = $_GET['_appname'];
@@ -478,13 +478,13 @@ 
 		// Turn off all output buffering
 		while (@ob_end_clean());
 
-		$file = fopen($tmpfname,'rb');
+		$file = fopen($tmpfname, 'rb');
 
 		// Get charset
 		$charset = Api\Cache::getSession('importexport', $tmpfname);
 
 		Api\Header\Content::type($nicefname.'.'.$_GET['_suffix'],
-			($_GET['_type'] ? $_GET['_type'] : 'application/text') . ($charset ? '; charset='.$charset : ''),
+			($_GET['_type'] ? $_GET['_type'] : 'application/text').($charset ? '; charset='.$charset : ''),
 			filesize($tmpfname));
 		fpassthru($file);
 

Braces +148 added lines, -61 removed lines

@@ -18,7 +18,8 @@ 
  * userinterface for exports
  *
  */
-class importexport_export_ui {
+class importexport_export_ui
+{
 	const _appname = 'importexport';
 
 	public $public_functions = array(
@@ -35,7 +36,8 @@ 
 	 */
 	private $export_plugins;
 
-	public function __construct() {
+	public function __construct()
+	{
 		Framework::includeJS('.','export_dialog','importexport');
 		Framework::includeJS('.','importexport','importexport');
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
@@ -44,7 +46,8 @@ 
 
 	}
 
-	public function export_dialog($_content=array()) {
+	public function export_dialog($_content=array())
+	{
 		$tabs = 'general_tab|selection_tab|options_tab';
 		$sel_options = array();
 		$readonlys = array();
@@ -55,14 +58,22 @@ 
 		$_definition = $_content['definition'] ? $_content['definition'] : $_GET['definition'];
 		$_plugin = $_content['plugin'] ? $_content['plugin'] : $_GET['plugin'];
 		// Select all from context menu, means use all search results, not just selected
-		if($_GET['select_all'] == 'true') $_GET['selection'] = 'search';
+		if($_GET['select_all'] == 'true')
+		{
+			$_GET['selection'] = 'search';
+		}
 		$_selection = $_content['selection'] ? $_content['selection'] : $_GET['selection'];
-		if($_GET['selection'] || $_content['selection_passed']) $content['selection_passed'] = $preserv['selection_passed'] = true;
+		if($_GET['selection'] || $_content['selection_passed'])
+		{
+			$content['selection_passed'] = $preserv['selection_passed'] = true;
+		}
 
 		// Check global setting
-		if(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if(!Api\Storage\Merge::is_export_limit_excepted())
+		{
 			$export_limit = Api\Storage\Merge::getExportLimit($_appname);
-			if($export_limit == 'no') {
+			if($export_limit == 'no')
+			{
 				die(lang('Admin disabled exporting'));
 			}
 		}
@@ -71,12 +82,14 @@ 
 		$readonlys['appname'] = (!empty($_appname) && $GLOBALS['egw']->acl->check('run',1,$_appname));
 		$content['appname'] = $_appname;
 		$preserv['appname'] = $_appname;
-		if(empty($_appname)) {
+		if(empty($_appname))
+		{
 			$et->setElementAttribute('select_definition','disabled',true);
 		}
 
 		// Check for preferred definition
-		if(!$_definition && $_appname) {
+		if(!$_definition && $_appname)
+		{
 			$_definition = $GLOBALS['egw_info']['user']['preferences'][$_appname]['nextmatch-export-definition'];
 		}
 		// fill definitions
@@ -86,25 +99,30 @@ 
 			'application' => isset($content['appname']) ? $content['appname'] : '*',
 			'plugin' => $_plugin ? $_plugin : '*'
 		));
-		foreach ((array)$definitions->get_definitions() as $identifier) {
+		foreach ((array)$definitions->get_definitions() as $identifier)
+		{
 			try {
 				$definition = new importexport_definition($identifier);
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				// permission error
 				continue;
 			}
-			if ($title = $definition->get_title()) {
+			if ($title = $definition->get_title())
+			{
 				$sel_options['definition'][$title] = $title;
 			}
 			unset($definition);
 		}
-		if(count($sel_options['definition']) == 2 && !$content['definition']) {
+		if(count($sel_options['definition']) == 2 && !$content['definition'])
+		{
 			$content['definition'] = end($sel_options['definition']);
 		}
 		unset($definitions);
 		//$sel_options['definition']['expert'] = lang('Expert options');
 
-		if(isset($_definition) && array_key_exists($_definition,$sel_options['definition'])) {
+		if(isset($_definition) && array_key_exists($_definition,$sel_options['definition']))
+		{
 			$content['definition'] = $_definition;
 		}
 
@@ -112,8 +130,10 @@ 
 		$sel_options['plugin'] = $this->export_plugins[$_appname]['export'];
 
 		// show definitions or plugins in ui?
-		if($content['definition'] == 'expert') {
-			if(isset($_plugin) && array_key_exists($_plugin,$sel_options['plugin'])) {
+		if($content['definition'] == 'expert')
+		{
+			if(isset($_plugin) && array_key_exists($_plugin,$sel_options['plugin']))
+			{
 				$content['plugin'] = $_plugin;
 				$selected_plugin = $_plugin;
 			}
@@ -126,12 +146,14 @@ 
 */
 			}
 		}
-		else {
+		else
+		{
 			$readonlys['plugin'] = true;
 			$readonlys['save_definition'] = true;
 
 			$definition = new importexport_definition($content['definition']);
-			if($definition) {
+			if($definition)
+			{
 				$content += (array)$definition->plugin_options;
 				$selected_plugin = $definition->plugin;
 				$content['description'] = $definition->description;
@@ -148,64 +170,90 @@ 
 			'|'	=>	'|',
 			''	=>	lang('Other')
 		);
-		if(!$sel_options['delimiter'][$content['delimiter']]) $sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
+		if(!$sel_options['delimiter'][$content['delimiter']])
+		{
+			$sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
+		}
 		$sel_options['delimiter'][$content['delimiter']] = lang('Use default') . ' "' . $sel_options['delimiter'][$content['delimiter']] . '"';
 
-		if(!$_content['delimiter']) $et->setElementAttribute('other_delimiter','disabled',true);
+		if(!$_content['delimiter'])
+		{
+			$et->setElementAttribute('other_delimiter','disabled',true);
+		}
 
 		// Other delimiter (options)
-		if($_content['other_delimiter']) $_content['delimiter'] = $_content['other_delimiter'];
+		if($_content['other_delimiter'])
+		{
+			$_content['delimiter'] = $_content['other_delimiter'];
+		}
 
 		// handle selector
-		if($selected_plugin) {
+		if($selected_plugin)
+		{
 			$content['plugin'] = $selected_plugin;
 			$plugin_object = new $selected_plugin;
 
 			$content['description'] = $plugin_object->get_description();
 
 			// fill options tab
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+ 			if(method_exists($plugin_object, 'get_selectors_html'))
+ 			{
 				$content['plugin_options_html'] = $plugin_object->get_options_html();
-			} else {
+			}
+			else
+			{
 				$options = $plugin_object->get_options_etpl($definition);
-				if(is_array($options)) {
+				if(is_array($options))
+				{
 					$content['plugin_options_template'] = $options['name'];
 					$content += (array)$options['content'];
 					$sel_options += (array)$options['sel_options'];
 					$readonlys += (array)$options['readonlys'];
 					$preserv += (array)$options['preserv'];
-				} else {
+				}
+				else
+				{
 					$content['plugin_options_template'] = $options;
 				}
 			}
 		}
 
 		// fill selection tab
-		if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) {
+		if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed'])
+		{
 			$_selection = $definition->plugin_options['selection'];
 		}
 
-		if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed'])) {
+		if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed']))
+		{
 			$readonlys[$tabs]['selection_tab'] = true;
 			$content['selection'] = $_selection;
 			$preserv['selection'] = $_selection;
 		}
-		elseif ($plugin_object) {
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+		elseif ($plugin_object)
+		{
+ 			if(method_exists($plugin_object, 'get_selectors_html'))
+ 			{
 				$content['plugin_selectors_html'] = $plugin_object->get_selectors_html();
-			} else {
+			}
+			else
+			{
 				$options = $plugin_object->get_selectors_etpl($definition);
-				if(is_array($options)) {
+				if(is_array($options))
+				{
 					$content += is_array($options['content']) ? $options['content'] : array('selection' => $options['content']);
 					$sel_options += (array)$options['sel_options'];
 					$readonlys['selection'] = (array)$options['readonlys'];
 					$preserv['selection'] = (array)$options['preserv'];
 					$content['plugin_selectors_template'] = $options['name'];
-				} else {
+				}
+				else
+				{
 					$content['plugin_selectors_template'] = $options;
 				}
 			}
-			if(!$content['plugin_selectors_html'] && !$content['plugin_selectors_template']) {
+			if(!$content['plugin_selectors_html'] && !$content['plugin_selectors_template'])
+			{
 				$readonlys[$tabs]['selection_tab'] = true;
 			}
 			$content['filter'] = $definition->filter;
@@ -237,10 +285,17 @@ 
 		unset ($plugin_object);
 		$apps = importexport_helper_functions::get_apps('export');
 		//error_log(__METHOD__.__LINE__.array2string($apps));
-		if (empty($apps)) throw new Exception('Error: no application profiles available for export');
-		if (!is_array($apps) && $apps) $apps = (array)$apps;
+		if (empty($apps))
+		{
+			throw new Exception('Error: no application profiles available for export');
+		}
+		if (!is_array($apps) && $apps)
+		{
+			$apps = (array)$apps;
+		}
 		$sel_options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
-		if(!$_application && !$selected_plugin) {
+		if(!$_application && !$selected_plugin)
+		{
 			$content['plugin_selectors_html'] = $content['plugin_options_html'] =
 			lang('You need to select an app and format first!');
 			$readonlys[$tabs] = array('selection_tab' => true, 'options_tab' => true);
@@ -251,7 +306,8 @@ 
 			//error_log(__LINE__.__FILE__.'$_content: '.print_r($_content,true));
 			$response = Api\Json\Response::get();
 
-			if ($_content['definition'] == 'expert') {
+			if ($_content['definition'] == 'expert')
+			{
 				$definition = new importexport_definition();
 				$definition->definition_id	= $_content['definition_id'] ? $_content['definition_id'] : '';
 				$definition->name		= $_content['name'] ? $_content['name'] : '';
@@ -261,11 +317,13 @@ 
 				$definition->allowed_users	= $_content['allowed_users'] ? $_content['allowed_users'] : $this->user;
 				$definition->owner		= $_content['owner'] ? $_content['owner'] : $this->user;
 			}
-			else {
+			else
+			{
 				$definition = new importexport_definition($_content['definition']);
 			}
 
-			if(!is_array($definition->plugin_options)) {
+			if(!is_array($definition->plugin_options))
+			{
 				$definition->plugin_options = array(
 					'mapping'	=>	array()
 				);
@@ -280,7 +338,10 @@ 
 				foreach($_content['filter'] as $key => $value)
 				{
 					// Handle multiple values
-					if(!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
+					if(!is_array($value) && strpos($value,',') !== false)
+					{
+						$value = explode(',',$value);
+					}
 
 					$filter[$key] = $value;
 
@@ -312,14 +373,16 @@ 
 				$_content
 			);
 
-			if(!$definition->plugin_options['selection']) {
+			if(!$definition->plugin_options['selection'])
+			{
 				$response->alert( lang('No records selected'));
 				return;
 			}
 
 			$tmpfname = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'export');
 			$file = fopen($tmpfname, "w+");
-			if (! $charset = $definition->plugin_options['charset']) {
+			if (! $charset = $definition->plugin_options['charset'])
+			{
 				$charset = Api\Translation::charset();
 			}
 			if($charset == 'user')
@@ -344,7 +407,8 @@ 
 			// Store charset to use in header
 			Api\Cache::setSession('importexport', $tmpfname, $charset, 100);
 
-			if($_content['export'] == 'pressed') {
+			if($_content['export'] == 'pressed')
+			{
 				fclose($file);
 				$filename = pathinfo($tmpfname, PATHINFO_FILENAME);
 				$link_query = array(
@@ -364,7 +428,8 @@ 
 				Framework::window_close();
 				return;
 			}
-			elseif($_content['preview'] == 'pressed') {
+			elseif($_content['preview'] == 'pressed')
+			{
 				fseek($file, 0);
 				$item_count = 1;
 				$preview = '';
@@ -373,7 +438,8 @@ 
 								'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
 				$replace = $preview = '';
 
-				while(!feof($file) && $item_count < 30) {
+				while(!feof($file) && $item_count < 30)
+				{
 					$preview .= preg_replace($search,$replace,fgets($file,1024));
 					$item_count++;
 				}
@@ -394,7 +460,9 @@ 
 			}
 			//nothing else expected!
 			throw new Exception('Error: unexpected submit in export_dialog!');
-		} else {
+		}
+		else
+		{
 			$readonlys[$tabs]['selection'] = true;
 			$readonlys[$tabs]['selection'] = false;
 		}
@@ -402,13 +470,18 @@ 
 		return $et->exec(self::_appname. '.importexport_export_ui.export_dialog',$content,$sel_options,$readonlys,$preserv,2);
 	}
 
-	public function ajax_get_definitions($_appname, xajaxResponse &$response = null) {
-		if(is_null($response)) {
+	public function ajax_get_definitions($_appname, xajaxResponse &$response = null)
+	{
+		if(is_null($response))
+		{
 			$response = new xajaxResponse();
-		} else {
+		}
+		else
+		{
 			$no_return = true;
 		}
-		if (!$_appname) {
+		if (!$_appname)
+		{
 			$response->jquery('tr.select_definition','hide');
 			return $no_return ? '' : $response->getXML();
 		}
@@ -417,15 +490,21 @@ 
 			'type' => 'export',
 			'application' => $_appname
 		));
-		foreach ((array)$definitions->get_definitions() as $identifier) {
+		foreach ((array)$definitions->get_definitions() as $identifier)
+		{
 			try {
 				$definition = new importexport_definition($identifier);
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				// Permission error
 				continue;
 			}
-				if ($title = $definition->get_title()) {
-					if (!$selected_plugin) $selected_plugin = $title;
+				if ($title = $definition->get_title())
+				{
+					if (!$selected_plugin)
+					{
+						$selected_plugin = $title;
+					}
 					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',".($selected_plugin == $title ? 'true' : 'false').");");
 				}
 				unset($definition);
@@ -434,14 +513,16 @@ 
 		$response->addScript("selectbox_add_option('exec[definition]','" . lang('Expert options') . "', 'expert',".($selected_plugin == $title ? 'true' : 'false').");");
 	}
 
-	public function ajax_get_definition_description($_definition) {
+	public function ajax_get_definition_description($_definition)
+	{
 
 		$_response = Api\Json\Response::get();
 		$description = '';
 		if ($_definition)
 		{
 			$_object = new importexport_definition($_definition);
-			if (is_a($_object, 'importexport_definition')) {
+			if (is_a($_object, 'importexport_definition'))
+			{
 				$description = $_object->description;
 			}
 			unset ($_object);
@@ -449,11 +530,13 @@ 
 		$_response->assign('importexport-export_dialog_plugin_description','innerHTML',$description);
 	}
 
-	public function ajax_get_plugin_description($_plugin) {
+	public function ajax_get_plugin_description($_plugin)
+	{
 		$_respone = Api\Json\Response::get();
 
 		$plugin_object = new $_plugin;
-		if (is_a($plugin_object, 'importexport_iface_export_plugin')) {
+		if (is_a($plugin_object, 'importexport_iface_export_plugin'))
+		{
 			$description = $plugin_object->get_description();
 		}
 		$_response->addAssign('importexport-export_dialog_plugin_description','innerHTML',$description);
@@ -467,10 +550,14 @@ 
 	 * @param sting $_tmpfname
 	 * @todo we need a suffix atibute in plugins e.g. .csv
 	 */
-	public function download($_tmpfname = '') {
+	public function download($_tmpfname = '')
+	{
 		$tmpfname = $_tmpfname ? $_tmpfname : $_GET['_filename'];
 		$tmpfname = $GLOBALS['egw_info']['server']['temp_dir'] .'/'. $tmpfname;
-		if (!is_readable($tmpfname)) die();
+		if (!is_readable($tmpfname))
+		{
+			die();
+		}
 
 		$appname = $_GET['_appname'];
 		$nicefname = $_GET['filename'] ? $_GET['filename'] : 'egw_export_'.$appname.'-'.date('Y-m-d');