Index: trunk/core/kernel/application.php
===================================================================
diff -u -r1985 -r2015
--- trunk/core/kernel/application.php	(.../application.php)	(revision 1985)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 2015)
@@ -255,8 +255,8 @@
 		$this->registerClass('kEmailMessage',KERNEL_PATH.'/utility/email.php');
 		$this->registerClass('kSmtpClient',KERNEL_PATH.'/utility/smtp_client.php');
 		
-		if (file_exists(MODULES_PATH.'/in-commerce/units/rates/currency_rates.php')) {
-			$this->registerClass('kCurrencyRates',MODULES_PATH.'/in-commerce/units/rates/currency_rates.php');
+		if (file_exists(MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php')) {
+			$this->registerClass('kCurrencyRates',MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php');
 		}
 		
 		$this->registerClass('FCKeditor', DOC_ROOT.BASE_PATH.'/'.ADMIN_DIR.'/editor/cmseditor/fckeditor.php');
Index: trunk/globals.php
===================================================================
diff -u -r1772 -r2015
--- trunk/globals.php	(.../globals.php)	(revision 1772)
+++ trunk/globals.php	(.../globals.php)	(revision 2015)
@@ -1722,4 +1722,109 @@
 	return $id_part_1.$id_part_2.$id_part_3;
 }
 
+function bracket_comp($elem1, $elem2)
+{
+	if( ($elem1['End']>$elem2['End'] || $elem1['End'] == -1) && $elem2['End'] != -1 )
+	{
+		return 1;
+	}
+	elseif ( ($elem1['End']<$elem2['End'] || $elem2['End'] == -1) && $elem1['End'] != -1 )
+	{
+		return -1;
+	}
+	else 
+	{
+		return 0;
+	}
+}
+
+function bracket_id_sort($first_id, $second_id)
+{
+	$first_abs = abs($first_id);
+	$second_abs = abs($second_id);
+	$first_sign = ($first_id == 0) ? 0 : $first_id / $first_abs;
+	$second_sign = ($second_id == 0) ? 0 : $second_id / $second_abs;
+	if($first_sign != $second_sign)
+	{
+		if($first_id > $second_id) {
+			$bigger =& $first_abs;
+			$smaller =& $second_abs;
+		}
+		else {
+			$bigger =& $second_abs;
+			$smaller =& $first_abs;
+		}
+		$smaller = $bigger + $smaller;
+	}
+	
+	if($first_abs > $second_abs) {
+		return 1;
+	}
+	elseif ($first_abs < $second_abs)
+	{
+		return -1;
+	}
+	else 
+	{
+		return 0;
+	}
+}
+
+function pr_bracket_comp($elem1, $elem2)
+{
+	
+	if ($elem1['MinQty']!="" && $elem1['MaxQty']=="" && $elem2['MinQty']!="" && $elem2['MaxQty']!="")	return 1;
+	if ($elem1['MinQty']!="" && $elem1['MaxQty']=="" && $elem2['MinQty']=="" && $elem2['MaxQty']=="")	return -1;
+
+	
+	if ($elem1['MaxQty']=="" && $elem2['MaxQty']!="")	return 1;
+	if ($elem1['MaxQty']!="" && $elem2['MaxQty']=="")	return -1;
+	
+	
+	if( ($elem1['MaxQty']>$elem2['MaxQty'] && $elem2['MaxQty']!=-1) || ($elem1['MaxQty'] == -1 && $elem2['MaxQty'] != -1 ))
+	{
+		return 1;
+	}
+	elseif ( ($elem1['MaxQty']<$elem2['MaxQty']) || ($elem2['MaxQty'] == -1 && $elem1['MaxQty'] != -1 ))
+	{
+		return -1;
+	}
+	else 
+	{
+		return 0;
+	}
+}
+
+function pr_bracket_id_sort($first_id, $second_id)
+{
+	$first_abs = abs($first_id);
+	$second_abs = abs($second_id);
+	$first_sign = ($first_id == 0) ? 0 : $first_id / $first_abs;
+	$second_sign = ($second_id == 0) ? 0 : $second_id / $second_abs;
+	if($first_sign != $second_sign)
+	{
+		if($first_id > $second_id) {
+			$bigger =& $first_abs;
+			$smaller =& $second_abs;
+		}
+		else {
+			$bigger =& $second_abs;
+			$smaller =& $first_abs;
+		}
+		$smaller = $bigger + $smaller;
+	}
+	
+	if($first_abs > $second_abs) {
+		return 1;
+	}
+	elseif ($first_abs < $second_abs)
+	{
+		return -1;
+	}
+	else 
+	{
+		return 0;
+	}
+}
+
 ?>
Index: trunk/kernel/units/selectors/selectors_event_handler.php
===================================================================
diff -u -r1580 -r2015
--- trunk/kernel/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 1580)
+++ trunk/kernel/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 2015)
@@ -1,5 +1,8 @@
 <?php
-	
+
+safeDefine('STYLE_BASE', 	1);
+safeDefine('STYLE_BLOCK', 	2);
+
 	class SelectorsEventHandler extends InpDBEventHandler 
 	{
 		/**
Index: trunk/core/units/selectors/selectors_config.php
===================================================================
diff -u -r1566 -r2015
--- trunk/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 1566)
+++ trunk/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 2015)
@@ -1,6 +1,4 @@
 <?php
-	define('STYLE_BASE', 	1);
-	define('STYLE_BLOCK', 	2);
 
 	$config	=	Array(
 					'Prefix'			=>	'selectors',
@@ -61,8 +59,8 @@
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
 					
-					'Constrain'			=>	'Type = '.STYLE_BASE,
-					'SubItems'			=>	Array('SAME: Type='.STYLE_BLOCK),
+					'Constrain'			=>	'Type = 1',
+					'SubItems'			=>	Array('SAME: Type=2'),
 					'ForeignKey1'	=>	'ParentId',
 															
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.*
@@ -82,7 +80,7 @@
 										'SelectorName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'SelectorData' => Array('not_null' => '1','default' => ''),
 										'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
-										'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( STYLE_BASE => 'la_BaseSelectors', STYLE_BLOCK => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
+										'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
 										'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'),
 								),
Index: trunk/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -r1580 -r2015
--- trunk/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 1580)
+++ trunk/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 2015)
@@ -1,5 +1,8 @@
 <?php
-	
+
+safeDefine('STYLE_BASE', 	1);
+safeDefine('STYLE_BLOCK', 	2);
+
 	class SelectorsEventHandler extends InpDBEventHandler 
 	{
 		/**
Index: trunk/kernel/units/selectors/selectors_config.php
===================================================================
diff -u -r1566 -r2015
--- trunk/kernel/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 1566)
+++ trunk/kernel/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 2015)
@@ -1,6 +1,4 @@
 <?php
-	define('STYLE_BASE', 	1);
-	define('STYLE_BLOCK', 	2);
 
 	$config	=	Array(
 					'Prefix'			=>	'selectors',
@@ -61,8 +59,8 @@
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
 					
-					'Constrain'			=>	'Type = '.STYLE_BASE,
-					'SubItems'			=>	Array('SAME: Type='.STYLE_BLOCK),
+					'Constrain'			=>	'Type = 1',
+					'SubItems'			=>	Array('SAME: Type=2'),
 					'ForeignKey1'	=>	'ParentId',
 															
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.*
@@ -82,7 +80,7 @@
 										'SelectorName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'SelectorData' => Array('not_null' => '1','default' => ''),
 										'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
-										'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( STYLE_BASE => 'la_BaseSelectors', STYLE_BLOCK => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
+										'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
 										'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'),
 								),