Index: branches/RC/core/units/admin/admin_config.php
===================================================================
diff -u -r9639 -r10665
--- branches/RC/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 9639)
+++ branches/RC/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 10665)
@@ -56,13 +56,16 @@
 
 					'Fields' => Array(), // we need empty array because kernel doesn't use virtual fields else
 					'VirtualFields' => Array (
-						'ImportFile' => Array(
-							'type'=>'string', 'formatter'=>'kUploadFormatter',
-							'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
-							'file_types'=>'*.csv', 'files_description'=>'!la_CSVFiles!',
-							'upload_dir'=>'/system/import/', // relative to project's home
-							'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
-							'direct_links'=>false, // use direct file urls or send files through wrapper (requires mod_mime_magic)
+						'ImportFile' => Array (
+							'type' => 'string',
+							'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, // in Bytes !
+							'error_msgs' => Array (
+								'cant_open_file' => '!la_error_CantOpenFile!',
+								'no_matching_columns' => '!la_error_NoMatchingColumns!',
+							),
+							'file_types' => '*.csv', 'files_description' => '!la_CSVFiles!',
+							'upload_dir' => '/system/import/', // relative to project's home
+							'multiple' => false, 'direct_links' => false,
 							'default' => null,
 						),
 					),
Index: branches/RC/core/admin_templates/import/import_start.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/import/import_start.tpl	(revision 0)
+++ branches/RC/core/admin_templates/import/import_start.tpl	(revision 10665)
@@ -0,0 +1,55 @@
+<inp2:adm_SetPopupSize width="500" height="270"/>
+<inp2:m_include t="incs/header"/>
+<inp2:m_ParseBlock name="section_header" icon="icon46_conf_regional" title="!la_title_Import!"/>
+
+<inp2:m_set adm_id="0" />
+
+<inp2:m_Get var="PrefixSpecial" result_to_var="importprefix" />
+<inp2:{$importprefix}_PermSection section="main" result_to_var="permsection" />
+<inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_import"/>
+
+<!--<inp2:m_RenderElement name="combined_header" section="in-portal:root" prefix="adm" title_preset="csv_import"/>-->
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
+							submit_event('adm','OnCSVImportBegin');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							window.close();
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+
+			<script src="js/swfobject.js" type="text/javascript"></script>
+			<script type="text/javascript" src="js/uploader.js"></script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:adm_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
+	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
+
+	<inp2:m_ParseBlock name="inp_edit_swf_upload" prefix="adm" field="ImportFile" title="!la_fld_ImportFile!"/>
+	<inp2:m_ParseBlock name="inp_edit_filler"/>
+	<!--<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="phrases.import" field="ImportOverwrite" hint_label="la_importlang_phrasewarning" title="la_prompt_overwritephrases"/>-->
+</table>
+</div>
+
+<input type="hidden" name="next_template" value="import/import_progress" />
+<input type="hidden" name="PrefixSpecial" value="<inp2:m_Get var="PrefixSpecial" />" />
+<input type="hidden" name="grid" value="<inp2:m_Get var="grid" />" />
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/export/export_complete.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/export/export_complete.tpl	(revision 0)
+++ branches/RC/core/admin_templates/export/export_complete.tpl	(revision 10665)
@@ -0,0 +1,23 @@
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="window.location.href='<inp2:m_t template="index" adm_event="OnGetCSV" pass="m,adm" no_amp="1"/>';">
+
+<inp2:adm_ExportData var="prefix" result_to_var="exportprefix" />
+<inp2:{$exportprefix}_PermSection section="main" result_to_var="permsection" />
+<inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_export"/>
+
+	<table class="edit-form">
+	<inp2:m_RenderElement name="subsection" title="la_prompt_ExportCompleteMessage"/>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td colspan="3" align="center">
+			<a href="<inp2:m_t template="index" adm_event="OnGetCSV" pass="m,adm"/>"><inp2:m_phrase name="la_DownloadCSV"/></a>
+		</td>
+	</tr>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td colspan="3" align="center">
+			<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="window.close();"/>
+		</td>
+	</tr>
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/import/import_complete.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/import/import_complete.tpl	(revision 0)
+++ branches/RC/core/admin_templates/import/import_complete.tpl	(revision 10665)
@@ -0,0 +1,37 @@
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:adm_ImportData var="prefix" result_to_var="importprefix" />
+<inp2:{$importprefix}_PermSection section="main" result_to_var="permsection" />
+<inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_import"/>
+
+	<table class="edit-form">
+	<inp2:m_RenderElement name="subsection" title="la_prompt_ImportCompleteMessage"/>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td colspan="3" align="center">
+			<inp2:m_Phrase label="la_ImportComplete" />:
+			<inp2:adm_ImportData var="updated" /> <inp2:m_Phrase label="la_RecordsUpdated" />,
+			<inp2:adm_ImportData var="added" /> <inp2:m_Phrase label="la_RecordsAdded" />
+		</td>
+	</tr>
+	<inp2:m_if check="adm_ImportData" var="not_imported_lines">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<td colspan="3" align="center">
+				<inp2:m_Phrase label="la_FollowingLinesWereNotImported" />:
+			</td>
+		</tr>
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<td colspan="3" align="center">
+				<textarea readonly cols="80" rows="13" wrap="off"><inp2:adm_PrintCSVNotImportedLines /></textarea>
+			</td>
+		</tr>
+	</inp2:m_if>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td colspan="3" align="center">
+			<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="window.location.href='<inp2:m_Link template="incs/close_popup" no_amp="1" />';"/>
+		</td>
+	</tr>
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/export/export_progress.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/export/export_progress.tpl	(revision 0)
+++ branches/RC/core/admin_templates/export/export_progress.tpl	(revision 10665)
@@ -0,0 +1,38 @@
+<inp2:adm_SetPopupSize width="515" height="194"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_Get var="PrefixSpecial" result_to_var="exportprefix" />
+<inp2:{$exportprefix}_PermSection section="main" result_to_var="permsection" />
+<inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_export"/>
+
+	<script type="text/javascript" src="js/ajax.js"></script>
+	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+	<script type="text/javascript">
+		function cancel_action() {
+			redirect('<inp2:m_Link template="export/export_complete"/>');
+		}
+
+		function rand(n)
+		{
+			return (Math.floor(Math.random() * n + 1));
+		}
+		
+		var PrefixSpecial = '<inp2:m_Get var="PrefixSpecial" js_escape="1" />';
+		var grid = '<inp2:m_Get var="grid" js_escape="1" />';
+		var export_rand = '';
+		for(var i=0; i<10; i++) {
+			export_rand += (rand(10) - 1);
+		}
+		var action_url = '<inp2:m_t template="index" adm_event="OnExportCSV" type="return_progress" finish_template="export/export_complete" PrefixSpecial="#PrefixSpecial#" grid="#grid#" export_rand="#export_rand#" pass="m,adm" no_amp="1"/>';
+		action_url = action_url.replace('#PrefixSpecial#', PrefixSpecial);
+		action_url = action_url.replace('#grid#', grid);
+		action_url = action_url.replace('#export_rand#', export_rand);
+		
+	//	window.open(action_url);
+		
+		$QueueProcessor = new AjaxProgressBar(action_url);
+	</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/import/import_progress.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/import/import_progress.tpl	(revision 0)
+++ branches/RC/core/admin_templates/import/import_progress.tpl	(revision 10665)
@@ -0,0 +1,27 @@
+<inp2:adm_SetPopupSize width="515" height="194"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:adm_ImportData var="prefix" result_to_var="importprefix" />
+<inp2:{$importprefix}_PermSection section="main" result_to_var="permsection" />
+<inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_import"/>
+
+	<script type="text/javascript" src="js/ajax.js"></script>
+	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+	<script type="text/javascript">
+		function cancel_action() {
+			redirect('<inp2:m_Link template="import/import_complete"/>');
+		}
+		
+		var PrefixSpecial = '<inp2:m_Get var="PrefixSpecial" js_escape="1" />';
+		var grid = '<inp2:m_Get var="grid" js_escape="1" />';
+		var action_url = '<inp2:m_t template="index" adm_event="OnCSVImportStep" type="return_progress" finish_template="import/import_complete" PrefixSpecial="#PrefixSpecial#" grid="#grid#" pass="m,adm" no_amp="1"/>';
+		action_url = action_url.replace('#PrefixSpecial#', PrefixSpecial);
+		action_url = action_url.replace('#grid#', grid);
+	//	window.open(action_url);
+		
+		$QueueProcessor = new AjaxProgressBar(action_url);
+	</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -r10579 -r10665
--- branches/RC/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 10579)
+++ branches/RC/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 10665)
@@ -25,11 +25,10 @@
 	 */
 	function Parse($value, $field_name, &$object)
 	{
-		$ret = '';
+		$ret = !is_array($value) ? $value : '';
 		$options = $object->GetFieldOptions($field_name);
 
-		if(getArrayValue($options, 'upload_dir'))
-		{
+		if (getArrayValue($options, 'upload_dir')) {
 			$this->DestinationPath = $options['upload_dir'];
 			$this->FullPath = FULL_PATH.$this->DestinationPath;
 		}
@@ -49,6 +48,7 @@
 				$value['upload'] = implode('|', $n_upload);
 //				$value['tmp_ids'] = implode('|', $n_ids);
 			}
+
 			if (!$value['tmp_ids']) {
 				$uploaded_files = getArrayValue($value, 'upload');
 				if (!$uploaded_files && getArrayValue($options, 'required')) {
@@ -149,7 +149,9 @@
 			}
 		}
 		else {
-			if (getArrayValue($options, 'required')) {
+			$required_error = is_array($value) || (!is_array($value) && !$value); // input type="file" OR just setting filename (during CSV import)
+
+			if ($required_error && getArrayValue($options, 'required')) {
 				$object->SetError($field_name, 'required');
 			}
 		}
@@ -166,6 +168,7 @@
 	{
 		$single_mapping = Array (
 			'file_urls' => 'full_url',
+			'file_paths' => 'full_path',
 			'file_sizes' => 'file_size',
 			'files_resized' => 'resize',
 			'wms' => 'wm',
@@ -194,7 +197,7 @@
 			$format = isset($options['format']) ? $options['format'] : false;
 		}
 
-		if ($format && preg_match('/(file_urls|file_names|file_sizes|files_resized|wms)(.*)/', $format, $regs)) {
+		if ($format && preg_match('/(file_urls|file_paths|file_names|file_sizes|files_resized|wms)(.*)/', $format, $regs)) {
 			if (!$value || $format == 'file_names') {
 				// storage format matches display format OR no value
 				return $value;