Index: trunk/core/admin_templates/head.tpl
===================================================================
diff -u -N -r7391 -r8002
--- trunk/core/admin_templates/head.tpl	(.../head.tpl)	(revision 7391)
+++ trunk/core/admin_templates/head.tpl	(.../head.tpl)	(revision 8002)
@@ -1,6 +1,7 @@
+<inp2:m_Set skip_last_template="1"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
-<inp2:adm_SetConst name="DBG_SKIP_REPORTING" value="1"/>
+<inp2:m_NoDebug/>
 
 <script type="text/javascript">
 	$popup_manager = new AjaxPopupManager('<inp2:m_t t="ajax/popup_manager" pass="m" js_escape="1"/>');
Index: trunk/core/admin_templates/index.tpl
===================================================================
diff -u -N -r8000 -r8002
--- trunk/core/admin_templates/index.tpl	(.../index.tpl)	(revision 8000)
+++ trunk/core/admin_templates/index.tpl	(.../index.tpl)	(revision 8002)
@@ -31,7 +31,7 @@
 	<frameset cols="200,*" border="0">
 			<frame src="<inp2:m_t t="tree" pass="m" m_cat_id="0" m_opener="s" no_pass_through="1"/>" name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0">
 			<inp2:m_DefineElement name="root_node">
-				<frame src="<inp2:m_if check="m_Recall" name="main_admin_t"><inp2:adm_SessionLink var="main_admin_t"/><inp2:m_else/><inp2:m_param name="section_url"/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
+				<frame src="<inp2:m_if check="adm_MainFrameLink"><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name="section_url"/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
 			</inp2:m_DefineElement>
 			<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root"/>
 		</frameset>
Index: trunk/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r7635 -r8002
--- trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 7635)
+++ trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 8002)
@@ -131,7 +131,8 @@
 			switch ($current) {
 				case 'G':
 					$this->Get = $this->AddVars($_GET);
-					$this->processQueryString();
+					$vars = $this->processQueryString( $this->Get(ENV_VAR_NAME) );
+					$this->AddParams($vars);
 					break;
 
 				case 'P':
@@ -162,7 +163,8 @@
 	}
 	function AfterInit()
 	{
-//		$this->processQueryString();
+//		$vars = $this->processQueryString($this->Get(ENV_VAR_NAME));
+//		$this->AddParams($vars);
 //		$this->convertPostEvents();
 		//		if ($this->Application->RewriteURLs()) {
 		if ($this->Application->RewriteURLs() || $this->Get('_mod_rw_url_')) {
@@ -278,11 +280,11 @@
 	function convertPostEvents()
 	{
 		$events = $this->Get('events');
-		if( is_array($events) )
-		{
-			foreach ($events as $prefix_special => $event_name)
-			{
-				if($event_name) $this->Set($prefix_special.'_event', $event_name);
+		if (is_array($events)) {
+			foreach ($events as $prefix_special => $event_name) {
+				if ($event_name) {
+					$this->Set($prefix_special.'_event', $event_name);
+				}
 			}
 		}
 	}
@@ -319,31 +321,28 @@
 
 	function extractSIDAndTemplate(&$parts)
 	{
-		if ( defined('INPORTAL_ENV') && INPORTAL_ENV ) // SID-TEMPLATE
-		{
+		$vars = Array ();
+		if (defined('INPORTAL_ENV') && INPORTAL_ENV) { // SID-TEMPLATE
 			$sub_parts = array_shift($parts);
 			list($sid, $t) = explode('-', $sub_parts, 2);
 
 			// Save Session ID
-			if($sid)
-			{
+			if ($sid) {
 				$this->Set('sid', $sid);
-				$this->Get['sid'] = $sid;
+				$vars['sid'] = $sid;
 			}
-
-			// Save Template Name
-			$this->Set('t',  $this->getDefaultTemplate($t) );
 		}
-		else // SID:TEMPLATE
-		{
+		else { // SID:TEMPLATE
 			// Save Session ID
 			$sid = array_shift($parts);
-			if ($sid) $this->Set('sid', $sid);
+			if ($sid) $vars['sid'] = $sid;
 
-			// Save Template Name
 			$t = array_shift($parts);
-			$this->Set('t', $this->getDefaultTemplate($t) );
 		}
+		
+		// Save Template Name
+		$vars['t'] = $this->getDefaultTemplate($t);
+		return $vars;
 	}
 
 	/**
@@ -354,31 +353,31 @@
 	 *
 	 * @access private
 	 */
-	function processQueryString()
+	function processQueryString($env_var)
 	{
 		// env=SID:TEMPLATE:m-1-1-1-1:l0-0-0:n-0-0-0:bb-0-0-1-1-1-0
-
-		$env_var = $this->Get(ENV_VAR_NAME);
+		$vars = Array ();
 		if ($env_var) {
 			// replace escaped ":" symbol not to explode by it
 			$env_var = str_replace('\:','_&+$$+&_', $env_var);	// replace escaped "=" with spec-chars :)
 			$parts = explode(':', $env_var);
 
 			if (!$this->Application->RewriteURLs() || ($this->Application->RewriteURLs() && $this->Get('rewrite') != 'on')) {
-				$this->extractSIDAndTemplate($parts);
+				$vars = $this->extractSIDAndTemplate($parts);
 			}
 
 			if ($parts) {
 				foreach ($parts as $mixed_part) {
-					$this->parseEnvPart($mixed_part);
+					$vars = array_merge_recursive2($vars, $this->parseEnvPart($mixed_part));
 				}
 			}
 		}
-		else
-		{
-			$t=$this->getTemplateName('index');
-			$this->Set('t', $t);
+		else {
+			$t = $this->getTemplateName('index');
+			$vars['t'] = $t;
 		}
+		
+		return $vars;
 	}
 
 	function parseEnvPart($mixed_part)
@@ -398,42 +397,40 @@
 
 		$prefix_special = array_shift($mixed_part); // l.pick, l
 		$query_map = $this->Application->EventManager->setQueryMap($prefix_special);
-		$this->Set('passed', implode(',', array_keys($this->Application->EventManager->queryMaps)));
+		
+		$vars = Array ();
+		$vars['passed'] = implode(',', array_keys($this->Application->EventManager->queryMaps));
 
 		// if config is not defined for prefix in QueryString, then don't process it
 		if ($query_map) {
-			foreach($query_map as $index => $var_name)
-			{
+			foreach ($query_map as $index => $var_name) {
 				// l_id, l_page, l_bla-bla-bla
 				$val = $mixed_part[$index - 1];
 				if ($val == '') $val = false;
-				$this->Set($prefix_special.'_'.$var_name, $val);
+				$vars[$prefix_special.'_'.$var_name] = $val;
 			}
 		}
+		
+		return $vars;
 	}
 
 	/**
-	 * Decides what template name to
-	 * use from $_GET or from $_POST
+	 * Removes tpl part from template name + resolved template ID to name
 	 *
-	 * @param string $querystring_template
+	 * @param string $t
 	 * @return string
 	 * @access private
 	 */
-	function getTemplateName($querystring_template)
+	function getTemplateName($t)
 	{
-		$t_from_post = $this->Get('t');
-		$t = $t_from_post ? $t_from_post : $querystring_template;
-
-		if ( is_numeric($t) )
-		{
-			$t = $this->Conn->GetOne('	SELECT CONCAT(FilePath, \'/\', FileName)
-										FROM '.TABLE_PREFIX.'ThemeFiles
-										WHERE FileId = '.$t);
+		if (is_numeric($t)) {
+			$sql = 'SELECT CONCAT(FilePath, \'/\', FileName)
+					FROM '.TABLE_PREFIX.'ThemeFiles
+					WHERE FileId = '.$t;
+			$t = $this->Conn->GetOne($sql);
 		}
-		$t = preg_replace('/\.tpl$/', '', $t);
 
-		return $t;
+		return preg_replace('/\.tpl$/', '', $t);
 	}
 
 	/**
Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r7997 -r8002
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 7997)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 8002)
@@ -373,22 +373,22 @@
 			return ;
 		}
 		
-		$res = $conn->Query("DESCRIBE $tablename");
-		
+		$res = $conn->Query('DESCRIBE '.$tablename);
 		$config_link = $debugger->getFileLink(FULL_PATH.$this->prefixFiles[$config['Prefix']], 1, $config['Prefix']);
 
 		$error_messages = Array (
 			'field_not_found' => 'Field <strong>%s</strong> exists in the database, but <strong>is not defined</strong> in config',
 			'default_missing' => 'Default value for field <strong>%s</strong> not set in config',
 			'not_null_error1' => 'Field <strong>%s</strong> is NOT NULL in the database, but is not configured as not_null or required',
 			'not_null_error2' => 'Field <strong>%s</strong> is described as NOT NULL in config, but <strong>does not have DEFAULT value</strong>',
-			'invalid_default' => '<strong>Default value</strong> for field %s<strong>%s</strong> (%s) in config differs from default value from field in database (%s)',
+			'invalid_default' => '<strong>Default value</strong> for field %s<strong>%s</strong> not sync. to db (in config = %s, in db = %s)',
 			'type_missing' => '<strong>Type definition</strong> for field <strong>%s</strong> missing in config',
 		);
 		
 		$config_errors = Array ();	
 		foreach ($res as $field) {
 			$f_name = $field['Field'];
+			
 			if (getArrayValue($config, 'Fields')) {
 				if (preg_match('/l[\d]+_[\w]/', $f_name)) {
 					// skip multilingual fields
@@ -399,6 +399,10 @@
 					$config_errors[] = sprintf($error_messages['field_not_found'], $f_name);
 				}
 				else {
+					if (is_numeric($field['Default'])) {
+						$field['Default'] = preg_match('/[\.,]/', $field['Default']) ? (float)$field['Default'] : (int)$field['Default'];
+					}
+					
 					$options = $config['Fields'][$f_name];
 					$default_missing = false;
 					if (!array_key_exists('default', $options)) {
@@ -422,10 +426,10 @@
 					
 					if (!$default_missing) {
 						if ($f_name == $config['IDField'] && $options['default'] !== 0) {
-							$config_errors[] = sprintf($error_messages['invalid_default'], '<span class="debug_error">IDField</span> ', $f_name, var_export($options['default'], true), var_export($field['Default'], true));
+							$config_errors[] = sprintf($error_messages['invalid_default'], '<span class="debug_error">IDField</span> ', $f_name, $this->varDump($options['default']), $this->varDump($field['Default']));
 						}
-						else if ($options['default'] != '#NOW#' && (string)$field['Default'] !== (string)$options['default'] && !in_array($options['type'], $float_types)) {
-							$config_errors[] = sprintf($error_messages['invalid_default'], '', $f_name, var_export($options['default'], true), var_export($field['Default'], true));
+						else if ($options['default'] != '#NOW#' && $field['Default'] !== $options['default'] && !in_array($options['type'], $float_types)) {
+							$config_errors[] = sprintf($error_messages['invalid_default'], '', $f_name, $this->varDump($options['default']), $this->varDump($field['Default']));
 						}
 					}
 				}
@@ -436,13 +440,16 @@
 			$error_prefix = '<strong class="debug_error">Config Error'.(count($config_errors) > 1 ? 's' : '').': </strong> for prefix <strong>'.$config_link.'</strong> in unit config:<br />';
 			$config_errors = $error_prefix.'&nbsp;&nbsp;&nbsp;'.implode('<br />&nbsp;&nbsp;&nbsp;', $config_errors);
 			
-			
-			
 			$debugger->appendHTML($config_errors);
 			safeDefine('DBG_RAISE_ON_WARNINGS', 1);
 		}
 	}
 	
+	function varDump($value)
+	{
+		return var_export($value, true).' of <strong>'.gettype($value).'</strong>';
+	}
+	
 	function ProcessDependencies($prefix)
 	{
 		$config =& $this->configData[$prefix];
Index: trunk/core/kernel/event_manager.php
===================================================================
diff -u -N -r8000 -r8002
--- trunk/core/kernel/event_manager.php	(.../event_manager.php)	(revision 8000)
+++ trunk/core/kernel/event_manager.php	(.../event_manager.php)	(revision 8002)
@@ -335,7 +335,6 @@
 			switch ($opener_action) {
 				case 'r':	// "reset" opener stack
 					$opener_stack = Array();
-					$this->Application->StoreVar('main_admin_t', $this->Application->GetVar('t'));
 					break;
 
 				case 'd':	// "down/push" new template to opener stack, deeplevel++
Index: trunk/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r8000 -r8002
--- trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8000)
+++ trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8002)
@@ -683,17 +683,29 @@
 		}
 		
 		/**
-		 * Builds link to template name from session (session var name as param)
+		 * Builds link to last template in main frame of admin
 		 *
 		 * @param Array $params
 		 * @return string
 		 */
-		function SessionLink($params)
+		function MainFrameLink($params)
 		{
-			$t = $this->Application->RecallVar($this->SelectParam($params, 'name,var'));
-			unset($params['name'], $params['var']);
+			$last_template = $this->Application->RecallVar('last_template');
+			if (!$last_template) {
+				return false;
+			}
 			
-			return $this->Application->HREF($t, '', Array ('pass' => 'm'));
+			$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
+		
+			list($index_file, $env) = explode('|', $last_template);
+			
+			$vars = $this->Application->HttpQuery->processQueryString(preg_replace('/(.*?)&/', '\1', $env));
+			if ($vars['t'] == 'login') {
+				// prevents redirect recursion
+				return false;
+			}
+			
+			return $this->Application->BaseURL('/admin', $ssl).$index_file.'?'.ENV_VAR_NAME.'='.$env;
 		}
 	}
 
Index: trunk/core/units/languages/languages_config.php
===================================================================
diff -u -N -r7855 -r8002
--- trunk/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 7855)
+++ trunk/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 8002)
@@ -146,7 +146,7 @@
 										'LanguageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										'PackName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'LocalName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
-										'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1',  'default' => 1),
+										'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
 										'PrimaryLang' => Array('type' => 'int','not_null' => '1','default' => '0'),
 										'IconURL' => Array('type' => 'string','default' => ''),
 										'DateFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),