Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r6623 -r6647
--- trunk/core/kernel/application.php	(.../application.php)	(revision 6623)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 6647)
@@ -438,7 +438,6 @@
 	*/
 	function RegisterDefaultClasses()
 	{
-
 		$this->registerClass('kTempTablesHandler', KERNEL_PATH.'/utility/temp_handler.php');
 		$this->registerClass('kEventManager', KERNEL_PATH.'/event_manager.php', 'EventManager');
 		$this->registerClass('kUnitConfigReader', KERNEL_PATH.'/utility/unit_config_reader.php');
@@ -457,20 +456,6 @@
 
 		$this->registerClass('Params', KERNEL_PATH.'/utility/params.php', 'kActions');
 
-		/*$this->registerClass('kFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kOptionsFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kUploadFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kPictureFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kDateFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kLEFTFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kMultiLanguage', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kPasswordFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kCCDateFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kUnitFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kFilesizeFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kSerializedFormatter', KERNEL_PATH.'/utility/formatters.php');*/
-
-
 		$this->registerClass('kMultipleFilter', KERNEL_PATH.'/utility/filters.php');
 		$this->registerClass('kDBList', KERNEL_PATH.'/db/dblist.php');
 		$this->registerClass('kDBItem', KERNEL_PATH.'/db/dbitem.php');
@@ -492,6 +477,25 @@
 		}
 
 		$this->registerClass('FCKeditor', FULL_PATH.'/admin/editor/cmseditor/fckeditor.php'); // need this?
+
+		/* Moved from MyApplication */
+
+		$this->registerClass('Inp1Parser',KERNEL_PATH.'/../units/general/inp1_parser.php','Inp1Parser');
+
+		$this->registerClass('InpSession',KERNEL_PATH.'/../units/general/inp_ses_storage.php','Session');
+		$this->registerClass('InpSessionStorage',KERNEL_PATH.'/../units/general/inp_ses_storage.php','SessionStorage');
+
+		$this->registerClass('kCatDBItem',KERNEL_PATH.'/../units/general/cat_dbitem.php');
+		$this->registerClass('kCatDBItemExportHelper',KERNEL_PATH.'/../units/general/cat_dbitem_export.php', 'CatItemExportHelper');
+		$this->registerClass('kCatDBList',KERNEL_PATH.'/../units/general/cat_dblist.php');
+		$this->registerClass('kCatDBEventHandler',KERNEL_PATH.'/../units/general/cat_event_handler.php');
+		$this->registerClass('kCatDBTagProcessor',KERNEL_PATH.'/../units/general/cat_tag_processor.php');
+
+		// Do not move to config - this helper is used before configs are read
+		$this->registerClass('kModulesHelper', KERNEL_PATH.'/../units/general/helpers/modules.php', 'ModulesHelper');
+
+		/* End moved */
+
 	}
 
 	function RegisterDefaultBuildEvents()
@@ -2209,6 +2213,33 @@
 		exit;
 	}
 
+
+	/* moved from MyApplication */
+
+	function getUserGroups($user_id)
+	{
+		switch($user_id)
+		{
+			case -1:
+				$user_groups = $this->ConfigValue('User_LoggedInGroup');
+				break;
+			case -2:
+				$user_groups = $this->ConfigValue('User_LoggedInGroup');
+				$user_groups .= ','.$this->ConfigValue('User_GuestGroup');
+				break;
+			default:
+				$sql = 'SELECT GroupId FROM '.TABLE_PREFIX.'UserGroup WHERE PortalUserId = '.$user_id;
+				$res = $this->Conn->GetCol($sql);
+				$user_groups = Array( $this->ConfigValue('User_LoggedInGroup') );
+				if(is_array($res))
+				{
+					$user_groups = array_merge($user_groups, $res);
+				}
+				$user_groups = implode(',', $user_groups);
+		}
+		return $user_groups;
+	}
+
 }
 
 ?>
\ No newline at end of file