Index: branches/5.2.x/core/units/helpers/csv_helper.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/units/helpers/csv_helper.php	(.../csv_helper.php)	(revision 14092)
+++ branches/5.2.x/core/units/helpers/csv_helper.php	(.../csv_helper.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: csv_helper.php 14092 2010-11-26 22:43:15Z alex $
+* @version	$Id: csv_helper.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -14,8 +14,8 @@
 
 	defined('FULL_PATH') or die('restricted access!');
 
-	safeDefine('EXPORT_STEP', 100); // export by 100 items
-	safeDefine('IMPORT_STEP', 10);
+	kUtil::safeDefine('EXPORT_STEP', 100); // export by 100 items
+	kUtil::safeDefine('IMPORT_STEP', 10);
 
 	class kCSVHelper extends kHelper {
 
@@ -94,7 +94,7 @@
 					$header = $use_phrases ? $this->Application->Phrase( $field_data['title'] ) : $field_data['title'];
 					array_push($headers, $header);
 				}
-				$csv_line = getcsvline($headers, $export_data['delimiter'], $export_data['enclosure'], $export_data['record_separator']);
+				$csv_line = kUtil::getcsvline($headers, $export_data['delimiter'], $export_data['enclosure'], $export_data['record_separator']);
 				if($export_data['encoding']) {
 					$csv_line = mb_convert_encoding($csv_line, $export_data['encoding'], $export_data['source_encoding']);
 				}
@@ -116,7 +116,7 @@
 				if($export_data['encoding'] == 'UTF-16LE') {
 					fwrite($file, chr(0xFF).chr(0xFE));
 				}
-				$csv_line = getcsvline($data, $export_data['delimiter'], $export_data['enclosure'], $export_data['record_separator']);
+				$csv_line = kUtil::getcsvline($data, $export_data['delimiter'], $export_data['enclosure'], $export_data['record_separator']);
 				if($export_data['encoding']) {
 					$csv_line = mb_convert_encoding($csv_line, $export_data['encoding'], $export_data['source_encoding']);
 				}
@@ -126,11 +126,11 @@
 			}
 
 			$records_processed = $export_data['page'] * $export_data['step'];
-			$percent_complete = min($records_processed / $list->RecordsCount * 100, 100);
+			$percent_complete = min($records_processed / $list->GetRecordsCount() * 100, 100);
 
 			fclose($file);
 
-			if ($records_processed >= $list->RecordsCount) {
+			if ($records_processed >= $list->GetRecordsCount()) {
 				$this->Application->StoreVar('export_data', serialize($export_data));
 				$this->Application->Redirect($this->Application->GetVar('finish_template'));
 			}
@@ -167,7 +167,7 @@
 
 		function GetCSV()
 		{
-			safeDefine('DBG_SKIP_REPORTING', 1);
+			kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
 
 			$export_data = unserialize($this->Application->RecallVar('export_data'));
 			$filename = preg_replace('/(.*)\.csv$/', '\1', basename($export_data['file_name'])) . '.csv';
@@ -317,18 +317,21 @@
 
 				// 3. validate item and run event
 				$status = $object->Validate();
-				$import_event->status = $status ? erSUCCESS : erFAIL;
+				$import_event->status = $status ? kEvent::erSUCCESS : kEvent::erFAIL;
 				$this->Application->HandleEvent($import_event);
 
-				if($import_event->status == erSUCCESS && $object->$action()) {
+				if($import_event->status == kEvent::erSUCCESS && $object->$action()) {
 					$import_data[ ($action == 'Create') ? 'added' : 'updated' ]++;
 				}
 				else {
 					$msg = '';
-					foreach ($object->FieldErrors as $field => $info) {
+					$errors = $object->GetFieldErrors();
+
+					foreach ($errors as $field => $info) {
 						if (!$info['pseudo']) continue;
 						$msg .= "$field: {$info['pseudo']} ";
 					}
+
 					$import_data['errors'] .= ($i + $import_data['lines_processed'] + 1).": $msg\n";
 					$import_data['not_imported_lines'] .= ','.($i + $import_data['lines_processed'] + 1);
 				}