Index: trunk/core/units/general/helpers/recursive_helper.php
===================================================================
diff -u -N -r6093 -r7391
--- trunk/core/units/general/helpers/recursive_helper.php	(.../recursive_helper.php)	(revision 6093)
+++ trunk/core/units/general/helpers/recursive_helper.php	(.../recursive_helper.php)	(revision 7391)
@@ -1,49 +1,49 @@
 <?php
 
 	class kRecursiveHelper extends kHelper {
-		
-		function DeleteCategory($category_id)
+
+		function DeleteCategory($category_id, $prefix='c')
 		{
-			$id_field = $this->Application->getUnitOption('c', 'IDField');
-			$table_name = $this->Application->getUnitOption('c', 'TableName');
-			
+			$id_field = $this->Application->getUnitOption($prefix, 'IDField');
+			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
+
 			$sql = 'SELECT '.$id_field.'
 					FROM '.$table_name.'
 					WHERE ParentId = '.$category_id;
-			
+
 			$sub_categories = $this->Conn->GetCol($sql);
 			if ($sub_categories) {
 				foreach ($sub_categories as $sub_category_id) {
 					$this->DeleteCategory($sub_category_id);
 				}
 			}
-			
+
 			$ci_table = $this->Application->getUnitOption('ci', 'TableName');
 			// 1. remove category items from this category if it is supplemental (non-primary) category to them
 			$sql = 'DELETE FROM '.$ci_table.'
 					WHERE ('.$id_field.' = '.$category_id.') AND (PrimaryCat = 0)';
 			$this->Conn->Query($sql);
-			
-			$temp_handler =& $this->Application->recallObject('c_TempHandler', 'kTempTablesHandler');
-			
+
+			$temp_handler =& $this->Application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
+
 			// 2. delete items this have this category as primary
 			$delete_ids = $this->getCategoryItems($category_id, true);
-			
+
 			foreach ($delete_ids as $item_prefix => $resource_ids) {
 				if (!$item_prefix) {
 					// not ItemPrefix filled -> old categoryitem linking
 					continue;
 				}
 				$item_ids = $this->GetItemIDs($item_prefix, $resource_ids);
 				$temp_handler->BuildTables($item_prefix, $item_ids);
-				$temp_handler->DeleteItems($item_prefix, '', $item_ids);				
+				$temp_handler->DeleteItems($item_prefix, '', $item_ids);
 			}
-			
+
 			// 3. delete this category
-			$temp_handler->BuildTables('c', Array($category_id));
-			$temp_handler->DeleteItems('c', '', Array($category_id));
+			$temp_handler->BuildTables($prefix, Array($category_id));
+			$temp_handler->DeleteItems($prefix, '', Array($category_id));
 		}
-		
+
 		/**
 		 * Converts resource ids list to id field list for given prefix
 		 *
@@ -56,94 +56,105 @@
 			if (!$resource_ids) {
 				return Array();
 			}
-			
+
 			$id_field = $this->Application->getUnitOption($prefix, 'IDField');
 			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
-			
+
 			$sql = 'SELECT '.$id_field.'
 					FROM '.$table_name.'
 					WHERE ResourceId IN ('.implode(',', $resource_ids).')';
 			return $this->Conn->GetCol($sql);
 		}
-		
+
 		// moves selected categories to destination category
 		function MoveCategories($category_ids, $dest_category_id)
 		{
 			if (!$category_ids) return ;
-			
+
 			$id_field = $this->Application->getUnitOption('c', 'IDField');
 			$table_name = $this->Application->getUnitOption('c', 'TableName');
+
+			// do not move categories into their children
+			$sql = 'SELECT ParentPath
+					FROM '.$table_name.'
+					WHERE '.$id_field.' = '.$dest_category_id;
+			$dest_parent_path = explode('|', substr($this->Conn->GetOne($sql), 1, -1));
 			
-			$sql = 'UPDATE '.$table_name.'
-					SET ParentId = '.$dest_category_id.'
-					WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
-			$this->Conn->Query($sql);
+			$child_categories = array_intersect($dest_parent_path, $category_ids); // get categories, then can't be moved
+			$category_ids = array_diff($category_ids, $child_categories); // remove them from movable categories list
+			
+			if ($category_ids) {
+				$sql = 'UPDATE '.$table_name.'
+						SET ParentId = '.$dest_category_id.'
+						WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
+				$this->Conn->Query($sql);
+			}
 		}
-		
+
 		/**
 		 * Complete cloning or category with subcategories and subitems
 		 *
 		 * @param int $category_id
 		 */
-		function PasteCategory($category_id)
+		function PasteCategory($category_id, $prefix = 'c')
 		{
 			$backup_category_id = $this->Application->GetVar('m_cat_id');
-			
+
 			// 1. clone category
-			$temp_handler =& $this->Application->recallObject('c_TempHandler', 'kTempTablesHandler');
-			$temp_handler->BuildTables('c', Array($category_id));
-			$new_category_id = array_pop( $temp_handler->CloneItems('c', '', Array($category_id)) );
+			$temp_handler =& $this->Application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
+			$temp_handler->BuildTables($prefix, Array($category_id));
+			$new_category_id = array_pop( $temp_handler->CloneItems($prefix, '', Array($category_id)) );
 			$this->Application->SetVar('m_cat_id', $new_category_id);
-			
-			$id_field = $this->Application->getUnitOption('c', 'IDField');
-			$table_name = $this->Application->getUnitOption('c', 'TableName');
-			
+
+			$id_field = $this->Application->getUnitOption($prefix, 'IDField');
+			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
+
 			// 2. assign supplemental items to current category to new category
 			$paste_ids = $this->getCategoryItems($category_id, false);
-			
+
 			foreach ($paste_ids as $item_prefix => $resource_ids) {
 				if (!$item_prefix) {
 					// not ItemPrefix filled -> old categoryitem linking
 					continue;
 				}
-				
+
 				$item_object =& $this->Application->recallObject($item_prefix.'.-item', null, Array('skip_autoload' => true));
 				foreach ($resource_ids as $item_resource_id) {
 					$item_object->Load($item_resource_id, 'ResourceId');
 					$item_object->assignToCategory($new_category_id, false);
 				}
 			}
-			
+
 			// 3. clone items that have current category as primary
 			$paste_ids = $this->getCategoryItems($category_id, true);
-			
+
 			foreach ($paste_ids as $item_prefix => $resource_ids) {
 				if (!$item_prefix) {
 					// not ItemPrefix filled -> old categoryitem linking
 					continue;
 				}
-				
+
 				// 2. clone items from current category (for each prefix separately)
 				$item_ids = $this->GetItemIDs($item_prefix, $resource_ids);
 				$temp_handler->BuildTables($item_prefix, $item_ids);
 				$temp_handler->CloneItems($item_prefix, '', $item_ids);
 			}
-			
+
 			// 4. do same stuff for each subcategory
 			$sql = 'SELECT '.$id_field.'
 					FROM '.$table_name.'
 					WHERE ParentId = '.$category_id;
-			
+
 			$sub_categories = $this->Conn->GetCol($sql);
 			if ($sub_categories) {
 				foreach ($sub_categories as $sub_category_id) {
-					$this->PasteCategory($sub_category_id);
+					$this->PasteCategory($sub_category_id, $prefix);
 				}
 			}
-			
+
 			$this->Application->SetVar('m_cat_id', $backup_category_id);
 		}
-		
+
 		/**
 		 * Returns grouped category items
 		 *
@@ -154,12 +165,12 @@
 		function getCategoryItems($category_id, $item_primary_category = true)
 		{
 			$ci_table = $this->Application->getUnitOption('ci', 'TableName');
-			
+
 			$sql = 'SELECT ItemPrefix, ItemResourceId
 					FROM '.$ci_table.'
 					WHERE (CategoryId = '.$category_id.') AND (PrimaryCat = '.($item_primary_category ? 1 : 0).')';
 			$category_items = $this->Conn->GetCol($sql, 'ItemResourceId');
-			
+
 			$item_ids = Array();
 			foreach ($category_items as $resource_id => $item_prefix) {
 				$item_ids[$item_prefix][] = $resource_id;