Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r6428 -r6583
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 6428)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 6583)
@@ -129,6 +129,7 @@
 
 		if ($clipboard_data['copy']) {
 			$temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+			$this->Application->SetVar('ResetCatBeforeClone', 1);
 			$temp->CloneItems($event->Prefix, $event->Special, $clipboard_data['copy']);
 		}
 
@@ -460,7 +461,8 @@
 
 		if ($event->Special == 'export' || $event->Special == 'import')
 		{
-			$this->prepareExportColumns($event);
+			$export_helper =& $this->Application->recallObject('CatItemExportHelper');
+			$export_helper->prepareExportColumns($event);
 		}
 	}
 
@@ -1329,17 +1331,6 @@
 /* === RELATED TO IMPORT/EXPORT: BEGIN === */
 
 	/**
-	 * Returns module folder
-	 *
-	 * @param kEvent $event
-	 * @return string
-	 */
-	function getModuleFolder(&$event)
-	{
-		return $this->Application->getUnitOption($event->Prefix, 'ModuleFolder');
-	}
-
-	/**
 	 * Shows export dialog
 	 *
 	 * @param kEvent $event
@@ -1366,7 +1357,8 @@
 		$this->Application->StoreVar($event->Prefix.'_export_ids', $selected_ids ? implode(',', $selected_ids) : '' );
 		$this->Application->StoreVar($event->Prefix.'_export_cats_ids', $selected_cats_ids);
 
-		$event->redirect = $this->getModuleFolder($event).'/export';
+		$export_helper =& $this->Application->recallObject('CatItemExportHelper');
+		$event->redirect = $export_helper->getModuleFolder($event).'/export';
 
 		$redirect_params = Array(	'm_opener' => 'd',
 									$this->Prefix.'.export_event' => 'OnNew',
@@ -1376,181 +1368,6 @@
 	}
 
 	/**
-	 * Export form validation & processing
-	 *
-	 * @param kEvent $event
-	 */
-	function OnExportBegin(&$event)
-	{
-		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-		if (!$items_info)
-		{
-			$items_info = unserialize( $this->Application->RecallVar($event->getPrefixSpecial().'_ItemsInfo') );
-			$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
-		}
-
-		list($item_id, $field_values) = each($items_info);
-
-		$object =& $event->getObject( Array('skip_autoload' => true) );
-		$object->SetFieldsFromHash($field_values);
-		$field_values['ImportFilename'] = $object->GetDBField('ImportFilename'); //if upload formatter has renamed the file during moving !!!
-
-		$object->setID($item_id);
-		$this->setRequiredFields($event);
-
-		$export_object =& $this->Application->recallObject('CatItemExportHelper');
-
-		// save export/import options
-		if ($event->Special == 'export')
-		{
-			$export_ids = $this->Application->RecallVar($event->Prefix.'_export_ids');
-			$export_cats_ids = $this->Application->RecallVar($event->Prefix.'_export_cats_ids');
-
-			// used for multistep export
-			$field_values['export_ids'] = $export_ids ? explode(',', $export_ids) : false;
-			$field_values['export_cats_ids'] = $export_cats_ids ? explode(',', $export_cats_ids) : Array( $this->Application->GetVar('m_cat_id') );
-		}
-
-		$field_values['ExportColumns'] = $field_values['ExportColumns'] ? explode('|', substr($field_values['ExportColumns'], 1, -1) ) : Array();
-		$field_values['start_from'] = 0;
-		$export_object->saveOptions($event, $field_values);
-
-		if( $export_object->verifyOptions($event) )
-		{
-			$event->redirect = $this->getModuleFolder($event).'/'.$event->Special.'_progress';
-
-		}
-		else
-		{
-			// make uploaded file local & change source selection
-			$filename = getArrayValue($field_values, 'ImportFilename');
-			if ($filename) {
-				$this->updateImportFiles($event);
-				$object->SetDBField('ImportSource', 2);
-				$field_values['ImportSource'] = 2;
-				$object->SetDBField('ImportLocalFilename', $filename);
-				$field_values['ImportLocalFilename'] = $filename;
-				$export_object->saveOptions($event, $field_values);
-			}
-
-			$event->status = erFAIL;
-			$event->redirect = false;
-		}
-	}
-
-	/**
-	 * Enter description here...
-	 *
-	 * @param kEvent $event
-	 */
-	function OnExportCancel(&$event)
-	{
-		$this->OnGoBack($event);
-	}
-
-	/**
-	 * Sets correct available & export fields
-	 *
-	 * @param kEvent $event
-	 */
-	function prepareExportColumns(&$event)
-	{
-		$object =& $event->getObject( Array('skip_autoload' => true) );
-
-		$available_columns = Array();
-
-		// category field (mixed)
-		$available_columns['__CATEGORY__CategoryPath'] = 'CategoryPath';
-
-		if ($event->Special == 'import') {
-			// category field (separated fields)
-			$max_level = $this->Application->ConfigValue('MaxImportCategoryLevels');
-			$i = 0;
-			while ($i < $max_level) {
-				$available_columns['__CATEGORY__Category'.($i + 1)] = 'Category'.($i + 1);
-				$i++;
-			}
-		}
-
-		// db fields
-		foreach ($object->Fields as $field_name => $field_options)
-		{
-			if (!$object->SkipField($field_name))
-			{
-				$available_columns[$field_name] = $field_name.(getArrayValue($field_options, 'required') ? '*' : '');
-			}
-		}
-
-		$available_columns = array_merge_recursive2($available_columns, $this->getCustomExportColumns($event));
-
-		// custom fields
-		foreach ($object->customFields as $custom_id => $custom_name)
-		{
-			$available_columns['__CUSTOM__'.$custom_name] = $custom_name;
-		}
-
-		// columns already in use
-		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-		if ($items_info)
-		{
-			list($item_id, $field_values) = each($items_info);
-			$export_keys = $field_values['ExportColumns'];
-			$export_keys = $export_keys ? explode('|', substr($export_keys, 1, -1) ) : Array();
-		}
-		else {
-			$export_keys = Array();
-		}
-
-		$export_columns = Array();
-		foreach ($export_keys as $field_key)
-		{
-			$field_name = $this->getExportField($field_key);
-			$export_columns[$field_key] = $field_name;
-			unset($available_columns[$field_key]);
-		}
-
-		$options = $object->GetFieldOptions('ExportColumns');
-		$options['options'] = $export_columns;
-		$object->SetFieldOptions('ExportColumns', $options);
-
-		$options = $object->GetFieldOptions('AvailableColumns');
-		$options['options'] = $available_columns;
-		$object->SetFieldOptions('AvailableColumns', $options);
-
-		$this->updateImportFiles($event);
-	}
-
-	/**
-	 * Updates uploaded files list
-	 *
-	 * @param kEvent $event
-	 */
-	function updateImportFiles(&$event)
-	{
-		if ($event->Special != 'import') {
-			return false;
-		}
-
-		$object =& $event->getObject();
-
-		$import_filenames = Array();
-
-		if ($folder_handle = opendir(EXPORT_PATH)) {
-			while (false !== ($file = readdir($folder_handle))) {
-				if (is_dir(EXPORT_PATH.'/'.$file) || substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH.'/'.$file) == 0) continue;
-
-				$file_size = formatSize( filesize(EXPORT_PATH.'/'.$file) );
-				$import_filenames[$file] = $file.' ('.$file_size.')';
-			}
-			closedir($folder_handle);
-		}
-
-		$options = $object->GetFieldOptions('ImportLocalFilename');
-		$options['options'] = $import_filenames;
-		$object->SetFieldOptions('ImportLocalFilename', $options);
-	}
-
-	/**
 	 * Returns specific to each item type columns only
 	 *
 	 * @param kEvent $event
@@ -1631,22 +1448,6 @@
 		return preg_match('#(http|https)://(.*)#', $path);
 	}
 
-//	ImportLocalFilename
-
-	function getExportField($field_key)
-	{
-		$prepends = Array('__CUSTOM__', '__CATEGORY__');
-		foreach ($prepends as $prepend)
-		{
-			if (substr($field_key, 0, strlen($prepend) ) == $prepend)
-			{
-				$field_key = substr($field_key, strlen($prepend), strlen($field_key) );
-				break;
-			}
-		}
-		return $field_key;
-	}
-
 	/**
 	 * Prepares item for import/export operations
 	 *
@@ -1657,41 +1458,12 @@
 		parent::OnNew($event);
 
 		if ($event->Special != 'import' && $event->Special != 'export') return ;
-		$this->setRequiredFields($event);
+		$export_helper =& $this->Application->recallObject('CatItemExportHelper');
+		$export_helper->setRequiredFields($event);
 		$this->Application->StoreVar('ImportCategory', 0);
 	}
 
 	/**
-	 * set required fields based on import or export params
-	 *
-	 * @param kEvent $event
-	 */
-	function setRequiredFields(&$event)
-	{
-		$required_fields['common'] = Array('FieldsSeparatedBy', 'LineEndings', 'CategoryFormat');
-
-		$required_fields['export'] = Array('ExportFormat', 'ExportFilename','ExportColumns');
-		$required_fields['import'] = Array('FieldTitles', 'ImportSource', 'CheckDuplicatesMethod'); // ImportFilename, ImportLocalFilename
-
-		$object =& $event->getObject();
-		if ($event->Special == 'import')
-		{
-			$import_source = Array(1 => 'ImportFilename', 2 => 'ImportLocalFilename');
-			$used_field = $import_source[ $object->GetDBField('ImportSource') ];
-
-			$required_fields[$event->Special][] = $used_field;
-			$object->Fields[$used_field]['error_field'] = 'ImportSource';
-
-			if ($object->GetDBField('FieldTitles') == 2) $required_fields[$event->Special][] = 'ExportColumns'; // manual field titles
-		}
-
-		$required_fields = array_merge($required_fields['common'], $required_fields[$event->Special]);
-		foreach ($required_fields as $required_field) {
-			$object->setRequired($required_field, true);
-		}
-	}
-
-	/**
 	 * Process items selected in item_selector
 	 *
 	 * @param kEvent $event
@@ -1871,6 +1643,21 @@
 	}
 
 	/**
+	 * Occures before an item is cloneded
+	 * Id of ORIGINAL item is passed as event' 'id' param
+	 * Do not call object' Update method in this event, just set needed fields!
+	 *
+	 * @param kEvent $event
+	 */
+	function OnBeforeClone(&$event)
+	{
+		if ($this->Application->GetVar('ResetCatBeforeClone')) {
+			$object =& $event->getObject();
+			$object->SetDBField('CategoryId', null);
+		}
+	}
+
+	/**
 	 * Apply same processing to each item beeing selected in grid
 	 *
 	 * @param kEvent $event