Index: branches/5.1.x/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r13545 -r13750
--- branches/5.1.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 13545)
+++ branches/5.1.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: http_query.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: http_query.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -121,7 +121,7 @@
 			foreach ($this->specialsToRemove as $prefix_special => $flag) {
 				if ($flag && strpos($prefix_special, '.') === false) {
 					unset($this->specialsToRemove[$prefix_special]);
-					trigger_error('Incorrect usage of "<strong>remove_specials['.$prefix_special.']</strong>" field (no special found)', E_USER_WARNING);
+					trigger_error('Incorrect usage of "<strong>remove_specials['.$prefix_special.']</strong>" field (no special found)', E_USER_NOTICE);
 				}
 			}
 			$this->_Params = $this->removeSpecials($this->_Params);
Index: branches/5.1.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r13545 -r13750
--- branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 13545)
+++ branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: install_toolkit.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -507,7 +507,7 @@
 		function SaveConfig($silent = false)
 		{
 			if (!is_writable($this->INIFile) && !is_writable(dirname($this->INIFile))) {
-				trigger_error('Cannot write to "' . $this->INIFile . '" file.', $silent ? E_USER_NOTICE : E_USER_ERROR);
+				trigger_error('Cannot write to "' . $this->INIFile . '" file.', $silent ? E_USER_WARNING : E_USER_ERROR);
 				return ;
 			}
 
@@ -834,6 +834,25 @@
 		}
 
 		/**
+		 * Deletes all temp tables (from active sessions too)
+		 *
+		 */
+		function deleteEditTables()
+		{
+			$table_prefix = $this->getSystemConfig('Database', 'TablePrefix');
+
+			$tables = $this->Conn->GetCol('SHOW TABLES');
+			$mask_edit_table = '/' . $table_prefix . 'ses_(.*)_edit_(.*)/';
+			$mask_search_table = '/' . $table_prefix . 'ses_(.*?)_(.*)/';
+
+			foreach ($tables as $table) {
+				if ( preg_match($mask_edit_table, $table, $rets) || preg_match($mask_search_table, $table, $rets) ) {
+					$this->Conn->Query('DROP TABLE IF EXISTS ' . $table);
+				}
+			}
+		}
+
+		/**
 		 * Perform redirect after separate module install
 		 *
 		 * @param string $module_folder
Index: branches/5.1.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r13613 -r13750
--- branches/5.1.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 13613)
+++ branches/5.1.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 13613 2010-05-24 18:56:24Z alex $
+* @version	$Id: db_tag_processor.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -86,7 +86,7 @@
 		$separator = $this->Application->ParseBlock($block_params);
 		$filter_menu = $this->Application->getUnitOption($this->Prefix,'FilterMenu');
 		if (!$filter_menu) {
-			trigger_error('<span class="debug_error">no filters defined</span> for prefix <b>'.$this->Prefix.'</b>, but <b>DrawFilterMenu</b> tag used', E_USER_WARNING);
+			trigger_error('<span class="debug_error">no filters defined</span> for prefix <b>'.$this->Prefix.'</b>, but <b>DrawFilterMenu</b> tag used', E_USER_NOTICE);
 			return '';
 		}
 
@@ -147,7 +147,7 @@
 	{
 		$refresh_intervals = $this->Application->ConfigValue('AutoRefreshIntervals');
 		if (!$refresh_intervals) {
-			trigger_error('<span class="debug_error">no filters defined</span> for prefix <strong>'.$this->Prefix.'</strong>, but <strong>DrawAutoRefreshMenu</strong> tag used', E_USER_WARNING);
+			trigger_error('<span class="debug_error">no refresh intervals defined</span> for prefix <strong>'.$this->Prefix.'</strong>, but <strong>DrawAutoRefreshMenu</strong> tag used', E_USER_NOTICE);
 			return '';
 		}
 
@@ -2652,7 +2652,7 @@
 		$title_presets = $this->Application->getUnitOption($this->Prefix, 'TitlePresets');
 
 		if (!array_key_exists($preset_name, $title_presets)) {
-			trigger_error('Title preset not specified or missing (in tag "<strong>' . $this->getPrefixSpecial() . ':' . __METHOD__ . '</strong>")', E_USER_WARNING);
+			trigger_error('Title preset not specified or missing (in tag "<strong>' . $this->getPrefixSpecial() . ':' . __METHOD__ . '</strong>")', E_USER_NOTICE);
 			return false;
 		}
 
Index: branches/5.1.x/core/units/helpers/file_helper.php
===================================================================
diff -u -N -r13667 -r13750
--- branches/5.1.x/core/units/helpers/file_helper.php	(.../file_helper.php)	(revision 13667)
+++ branches/5.1.x/core/units/helpers/file_helper.php	(.../file_helper.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: file_helper.php 13667 2010-06-01 09:15:35Z alex $
+* @version	$Id: file_helper.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -183,15 +183,27 @@
 
 			if (!$image_count) {
 				// no images found in POST -> create default image fields
-				$image_names = Array ('Primary'.$field_prefix => '');
 				$image_count = $this->Application->ConfigValue($prefix.'_MaxImageCount');
 
-				$created_count = 1;
-				while ($created_count < $image_count) {
-					$image_names[$field_prefix.$created_count] = '';
-					$created_count++;
+				if ($is_image) {
+					$created_count = 1;
+					$image_names = Array ('Primary' . $field_prefix => '');
+
+					while ($created_count < $image_count) {
+						$image_names[$field_prefix . $created_count] = '';
+						$created_count++;
+					}
 				}
+				else {
+					$created_count = 0;
+					$image_names = Array ();
 
+					while ($created_count < $image_count) {
+						$image_names[$field_prefix . ($created_count + 1)] = '';
+						$created_count++;
+					}
+				}
+
 				$this->createUploadFields($prefix, $image_names, $is_image);
 				return ;
 			}
Index: branches/5.1.x/core/units/fck/fck_tp.php
===================================================================
diff -u -N -r13545 -r13750
--- branches/5.1.x/core/units/fck/fck_tp.php	(.../fck_tp.php)	(revision 13545)
+++ branches/5.1.x/core/units/fck/fck_tp.php	(.../fck_tp.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_tp.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: fck_tp.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -50,7 +50,7 @@
 			$fck_helper =& $this->Application->recallObject('FCKHelper');
 			/* @var fck_helper fckFCKHelper*/
 
-			$default_folders = defined('FCK_DEFAULT_FOLDERS') ? FCK_DEFAULT_FOLDERS : Array ('Files', 'Images', 'Flash', 'Documents');
+			$default_folders = defined('FCK_DEFAULT_FOLDERS') ? FCK_DEFAULT_FOLDERS : Array ('Files', 'Images', 'Flash', 'Media', 'Documents');
 
 			foreach ($default_folders as $index => $folder) {
 				if (!$fck_helper->CreateFolder($folder)) {
Index: branches/5.1.x/core/units/helpers/custom_fields_helper.php
===================================================================
diff -u -N -r13545 -r13750
--- branches/5.1.x/core/units/helpers/custom_fields_helper.php	(.../custom_fields_helper.php)	(revision 13545)
+++ branches/5.1.x/core/units/helpers/custom_fields_helper.php	(.../custom_fields_helper.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_helper.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: custom_fields_helper.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -46,7 +46,7 @@
 					$this->Application->Debugger->appendTrace();
 				}
 
-				trigger_error('Invalid symbol in ValueList field [' . substr($values_list, 0, 100) . ' ...]' , E_USER_NOTICE);
+				trigger_error('Invalid symbol in ValueList field [' . substr($values_list, 0, 100) . ' ...]' , E_USER_WARNING);
 				return Array ();
 			}
 
Index: branches/5.1.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r13581 -r13750
--- branches/5.1.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 13581)
+++ branches/5.1.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 13581 2010-05-19 07:33:23Z alex $
+* @version	$Id: languages_event_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -63,8 +63,16 @@
 				$event->status = erSTOP;
 			}
 
-			if (is_object($event->MasterEvent) && $event->MasterEvent->status != erSUCCESS) {
-				return ;
+			if (is_object($event->MasterEvent)) {
+				if ($event->MasterEvent->status != erSUCCESS) {
+					// only rebuild when all fields are validated
+					return ;
+				}
+
+				if (($event->MasterEvent->Name == 'OnSave') && !$this->Application->GetVar('new_language')) {
+					// only rebuild during new language adding
+					return ;
+				}
 			}
 
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
@@ -293,6 +301,26 @@
 			$object->SetDBField('CopyFromLanguage', $primary_lang_id);
 		}
 
+		/**
+		 * Sets new language mark
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeDeleteFromLive(&$event)
+		{
+			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+
+			$sql = 'SELECT ' . $id_field . '
+					FROM ' . $table_name . '
+					WHERE ' . $id_field . ' = ' . $event->getEventParam('id');
+			$id = $this->Conn->GetOne($sql);
+
+			if (!$id) {
+				$this->Application->SetVar('new_language', 1);
+			}
+		}
+
 		function OnChangeLanguage(&$event)
 		{
 			$language_id = $this->Application->GetVar('language');
Index: branches/5.1.x/core/kernel/utility/temp_handler.php
===================================================================
diff -u -N -r13581 -r13750
--- branches/5.1.x/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 13581)
+++ branches/5.1.x/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: temp_handler.php 13581 2010-05-19 07:33:23Z alex $
+* @version	$Id: temp_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -305,9 +305,7 @@
 					// remember original => clone mapping for dual ForeignKey updating
 					$this->AlreadyProcessed[$master['TableName']][$id] = $object->GetId();
 				}
-				if ($object->mode == 't') {
-					$object->setTempID();
-				}
+
 				if ($mode == 'create') {
 					$this->RaiseEvent('OnAfterClone', $master['Prefix'], $special, Array($object->GetId()), $foreign_key, array('original_id' => $id) );
 					$this->saveID($master['Prefix'], $special, $object->GetID());
Index: branches/5.1.x/core/units/helpers/sections_helper.php
===================================================================
diff -u -N -r13168 -r13750
--- branches/5.1.x/core/units/helpers/sections_helper.php	(.../sections_helper.php)	(revision 13168)
+++ branches/5.1.x/core/units/helpers/sections_helper.php	(.../sections_helper.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: sections_helper.php 13168 2010-02-24 17:26:57Z alex $
+* @version	$Id: sections_helper.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -28,6 +28,20 @@
 		var $Tree = Array();
 
 		/**
+		 * Checks, that we are in debug mode
+		 *
+		 * @var bool
+		 */
+		var $debugMode = false;
+
+		/**
+		 * Checks, that we are in super admin mode
+		 *
+		 * @var bool
+		 */
+		var $superAdminMode = false;
+
+		/**
 		 * Set's prefix and special
 		 *
 		 * @param string $prefix
@@ -37,6 +51,10 @@
 		function Init($prefix, $special, $event_params = null)
 		{
 			parent::Init($prefix, $special, $event_params);
+
+			$this->debugMode = $this->Application->isDebugMode();
+			$this->superAdminMode = $this->Application->RecallVar('super_admin');
+
 			$this->BuildTree();
 		}
 
@@ -236,7 +254,7 @@
 				$current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array();
 
 				if ($current_data) {
-					trigger_error('Section "<strong>' . $section_name . '</strong>" declaration (originally defined in "<strong>' . $current_data['SectionPrefix'] . '</strong>") was overwriten from "<strong>' . $prefix . '</strong>"', E_USER_NOTICE);
+					trigger_error('Section "<strong>' . $section_name . '</strong>" declaration (originally defined in "<strong>' . $current_data['SectionPrefix'] . '</strong>") was overwriten from "<strong>' . $prefix . '</strong>"', E_USER_WARNING);
 				}
 
 				$this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);
@@ -276,11 +294,7 @@
 				// get 1st child
 				ksort($children, SORT_NUMERIC);
 				foreach ($children as $child_priority => $child_section) {
-					$section_data =& $this->getSectionData($child_section);
-
-					$perm_section = $this->getPermSection($child_section);
-					$perm_status = $check_permission ? $this->Application->CheckPermission($perm_section.'.view') : true;
-					if ((isset($section_data['show_mode']) && $section_data['show_mode']) || !$perm_status) {
+					if (!$this->sectionVisible($child_section, $check_permission)) {
 						continue;
 					}
 
@@ -294,6 +308,44 @@
 		}
 
 		/**
+		 * Checks if given section is visible by it's definition and optionally by user permission
+		 *
+		 * @param string $section_name
+		 * @param bool $check_permission
+		 * @return bool
+		 */
+		function sectionVisible($section_name, $check_permission = false)
+		{
+			$section_data =& $this->getSectionData($section_name);
+
+			if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
+				$show_mode = $section_data['show_mode'];
+
+				// if super admin section -> show in super admin mode & debug mode
+				$show_section = $show_mode == smNORMAL || ((($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($this->superAdminMode || $this->debugMode));
+
+				if (!$show_section) {
+					// if section is in debug mode only && debug mode -> show
+					$show_section = (($show_mode & smDEBUG) == smDEBUG) && $this->debugMode;
+				}
+
+				if (!$show_section) {
+					// visibility by section definition
+					return false;
+				}
+			}
+
+			// visibility by section permission
+			if ($check_permission) {
+				$perm_section = $this->getPermSection($section_name);
+
+				return $this->Application->CheckPermission($perm_section.'.view');
+			}
+
+			return true;
+		}
+
+		/**
 		 * Returns section for permission checking based on given section
 		 *
 		 * @param string $section_name
Index: branches/5.1.x/core/units/groups/groups_event_handler.php
===================================================================
diff -u -N -r13086 -r13750
--- branches/5.1.x/core/units/groups/groups_event_handler.php	(.../groups_event_handler.php)	(revision 13086)
+++ branches/5.1.x/core/units/groups/groups_event_handler.php	(.../groups_event_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: groups_event_handler.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: groups_event_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -38,8 +38,11 @@
 								FROM ' . $table_name . '
 								WHERE PortalUserId = ' . (int)$user_id;
 						$group_ids = $this->Conn->GetCol($sql);
-						array_push($group_ids, 14, 15); // Guest & Everyone groups are set dynamically
 
+						// add system groups
+						array_push($group_ids, $this->Application->ConfigValue('User_GuestGroup')); // Guest
+						array_push($group_ids, $this->Application->ConfigValue('User_LoggedInGroup')); // Everyone
+
 						$object->addFilter('already_member_filter', '%1$s.GroupId NOT IN ('.implode(',', $group_ids).')');
 					}
 					break;
Index: branches/5.1.x/core/units/helpers/brackets_helper.php
===================================================================
diff -u -N -r13086 -r13750
--- branches/5.1.x/core/units/helpers/brackets_helper.php	(.../brackets_helper.php)	(revision 13086)
+++ branches/5.1.x/core/units/helpers/brackets_helper.php	(.../brackets_helper.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: brackets_helper.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: brackets_helper.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -291,9 +291,7 @@
 						$object->SetFieldsFromHash($values);
 						$object->SetDBField($linked_info['ForeignKey'], $linked_info['ParentId']);
 
-						if( $object->Create() )
-						{
-							$object->setTempID();
+						if ($object->Create()) {
 							$event->status = erSUCCESS;
 						}
 					}
Index: branches/5.1.x/core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -N -r13086 -r13750
--- branches/5.1.x/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 13086)
+++ branches/5.1.x/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 13750)
@@ -17,22 +17,15 @@
   				Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 
 				Catalog.prototype.AfterInit = function () {
-					Grids['g'].SelectFirst();
+					$('#current_group_id').change();
 				}
 
 				Catalog.prototype.go_to_group = function($group_id) {
-					if (!isset($group_id)) {
-						$group_id = 0; // gets current group
-					}
-					else {
-						set_hidden_field('current_group_id', $group_id);
-					}
-
 					this.switchTab(); // refresh current item tab
 				}
 
   				Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
-					var $group_id = get_hidden_field('current_group_id');
+					var $group_id = $('#current_group_id').val();
 //					alert('refreshTab. GroupID: '+$group_id);
 					var $tab_group_id = document.getElementById($div_id).getAttribute('group_id');
 					if ($group_id != $tab_group_id || $force) {
@@ -121,9 +114,32 @@
 </table>
 
 <inp2:c_SaveWarning name="grid_save_warning"/>
-<inp2:m_RenderElement name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting" grid_height="220" grid_status="0"/>
 
-<br />
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form" style="border-bottom: 1px solid black;">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<td class="label-cell">
+					<inp2:m_Phrase name="la_fld_Group"/>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<select name="current_group_id" id="current_group_id">
+						<inp2:m_DefineElement name="group_element">
+							<option value="<inp2:Field name='GroupId'/>"><inp2:Field name="Name"/></option>
+						</inp2:m_DefineElement>
+
+						<inp2:g_PrintList render_as="group_element" per_page="-1"/>
+					</select>
+				</td>
+			</tr>
+
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<br/>
+
 <!-- item tabs: begin -->
 <inp2:m_DefineElement name="item_tab" title="" special="">
 	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
@@ -147,23 +163,8 @@
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
-	Grids['g'].OnSelect = function ($id) {
-		$PermManager.go_to_group($id);
-	}
+	var $last_group_id = false;
 
-	Grids['g'].OnUnSelect = function ($id) {
-		set_hidden_field('group_id', $id);
-		set_hidden_field('item_prefix', $PermManager.ActivePrefix);
-		$PermManager.submit_event('c', 'OnPreSave', 'categories/permissions_tab');
-	}
-
-	Grids['g'].SelectFirst = function () {
-		for (var $i in this.Items) {
-			this.Items[$i].Select();
-			break;
-		}
-	}
-
 	function update_light(perm_name, value)
 	{
 		document.getElementById('light_'+perm_name).src = 'img/perm_' + (value ? 'green' : 'red') + '.gif';
@@ -183,6 +184,28 @@
 
 	$(document).ready(
 		function() {
+			// last selected group
+			set_hidden_field('group_id', $('#current_group_id').val());
+
+			$('#current_group_id').change(
+				function ($e) {
+					var $group_id = $(this).val();
+
+					if ($last_group_id !== false) {
+						// save permissions from previous selected group
+						set_hidden_field('group_id', $last_group_id);
+						set_hidden_field('item_prefix', $PermManager.ActivePrefix);
+						$PermManager.submit_event('c', 'OnPreSave', 'categories/permissions_tab');
+					}
+
+					// get permissions from new group
+					$PermManager.go_to_group($group_id);
+
+					// remember previous selected group
+					$last_group_id = $group_id;
+				}
+			);
+
 			$PermManager.Init(false);
 		}
 	);
Index: branches/5.1.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r13702 -r13750
--- branches/5.1.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 13702)
+++ branches/5.1.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 13702 2010-06-09 14:51:13Z alex $
+* @version	$Id: unit_config_reader.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -555,7 +555,7 @@
 		if (is_array($hooks) && count($hooks) > 0) {
 			foreach ($hooks as $hook) {
 				if (isset($config['ParentPrefix']) && $hook['HookToPrefix'] == $config['ParentPrefix']) {
-					trigger_error('Depricated Hook Usage [prefix: <b>'.$config['Prefix'].'</b>; do_prefix: <b>'.$hook['DoPrefix'].'</b>] use <b>#PARENT#</b> as <b>HookToPrefix</b> value, where HookToPrefix is same as ParentPrefix', E_USER_NOTICE);
+					trigger_error('Depricated Hook Usage [prefix: <b>'.$config['Prefix'].'</b>; do_prefix: <b>'.$hook['DoPrefix'].'</b>] use <b>#PARENT#</b> as <b>HookToPrefix</b> value, where HookToPrefix is same as ParentPrefix', defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_NOTICE);
 				}
 
 				if ($hook['HookToPrefix'] == '') {
@@ -594,7 +594,7 @@
 			foreach ($config['AggregateTags'] as $aggregate_tag) {
 				if (isset($config['ParentPrefix'])) {
 					if ($aggregate_tag['AggregateTo'] == $config['ParentPrefix']) {
-						trigger_error('Depricated Aggregate Tag Usage [prefix: <b>'.$config['Prefix'].'</b>; AggregateTo: <b>'.$aggregate_tag['AggregateTo'].'</b>] use <b>#PARENT#</b> as <b>AggregateTo</b> value, where AggregateTo is same as ParentPrefix', E_USER_NOTICE);
+						trigger_error('Depricated Aggregate Tag Usage [prefix: <b>'.$config['Prefix'].'</b>; AggregateTo: <b>'.$aggregate_tag['AggregateTo'].'</b>] use <b>#PARENT#</b> as <b>AggregateTo</b> value, where AggregateTo is same as ParentPrefix', defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_NOTICE);
 					}
 
 					if ($aggregate_tag['AggregateTo'] == '#PARENT#') {
Index: branches/5.1.x/core/install/upgrades.sql
===================================================================
diff -u -N -r13682 -r13750
--- branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13682)
+++ branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13750)
@@ -1639,6 +1639,12 @@
 
 # ===== v 5.0.3 =====
 
+# ===== v 5.0.4-B1 =====
+
+# ===== v 5.0.4-B2 =====
+
+# ===== v 5.0.4 =====
+
 # ===== v 5.1.0-B1 =====
 DROP TABLE EmailMessage;
 DELETE FROM PersistantSessionData WHERE VariableName = 'emailevents_columns_.';
Index: branches/5.1.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r13581 -r13750
--- branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13581)
+++ branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 13581 2010-05-19 07:33:23Z alex $
+* @version	$Id: categories_tag_processor.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -117,8 +117,10 @@
 	function ItemCount($params)
 	{
 		$object =& $this->getObject($params);
-		$ci_table = $this->Application->getUnitOption('l-ci', 'TableName');
+		/* @var $object kDBItem */
 
+		$ci_table = $this->Application->getUnitOption('ci', 'TableName');
+
 		$sql = 'SELECT COUNT(*)
 				FROM ' . $object->TableName . ' c
 				LEFT JOIN ' . $ci_table . ' ci ON c.CategoryId = ci.CategoryId
@@ -1465,7 +1467,7 @@
 				$edit_url = $this->Application->HREF('categories/categories_edit', ADMIN_DIRECTORY, $url_params);
 
 				$edit_btn .= '
-					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\''.addslashes($edit_url).'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'c\', \'categories/categories_edit\');">
+					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\'' . addslashes($edit_url) . '\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'c\', \'categories/categories_edit\');">
 						<div class="cms-btn-image">
 							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png" width="15" height="16" alt=""/>
 						</div>
@@ -1503,7 +1505,7 @@
 						</div>
 					</div>
 
-					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\''.addslashes($edit_url).'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'theme\', \'themes/file_edit\');">
+					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\'' . addslashes($edit_url) . '\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'theme\', \'themes/file_edit\');">
 						<div class="cms-btn-image">
 							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png" width="15" height="16" alt=""/>
 						</div>
Index: branches/5.1.x/index.php
===================================================================
diff -u -N -r13749 -r13750
--- branches/5.1.x/index.php	(.../index.php)	(revision 13749)
+++ branches/5.1.x/index.php	(.../index.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: index.php 13749 2010-06-09 17:50:39Z alex $
+* @version	$Id: index.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
Index: branches/5.1.x/admin/system_presets/simple/groups_g.php
===================================================================
diff -u -N -r12657 -r13750
--- branches/5.1.x/admin/system_presets/simple/groups_g.php	(.../groups_g.php)	(revision 12657)
+++ branches/5.1.x/admin/system_presets/simple/groups_g.php	(.../groups_g.php)	(revision 13750)
@@ -21,7 +21,7 @@
 //		'groups_edit' => Array ('select', 'cancel', 'prev', 'next'),
 
 //		edit users when adding/editing group
-//		'groups_edit_users' => Array ('select', 'cancel', 'prev', 'next', 'select_user', 'delete', 'view'),
+//		'groups_edit_users' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'delete', 'view'),
 
 //		edit permission on permissions tab when adding/editing group
 //		'groups_edit_permissions' => Array ('select', 'cancel', 'prev', 'next'),
Index: branches/5.1.x/core/units/permissions/permissions_event_handler.php
===================================================================
diff -u -N -r13161 -r13750
--- branches/5.1.x/core/units/permissions/permissions_event_handler.php	(.../permissions_event_handler.php)	(revision 13161)
+++ branches/5.1.x/core/units/permissions/permissions_event_handler.php	(.../permissions_event_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: permissions_event_handler.php 13161 2010-02-24 13:20:11Z alex $
+* @version	$Id: permissions_event_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -36,7 +36,7 @@
 	 */
 	function OnCategorySavePermissions(&$event)
 	{
-		$group_id = $this->Application->GetVar('current_group_id');
+		$group_id = $this->Application->GetVar('group_id');
 		$category_id = $this->Application->GetVar('c_id');
 		$permissions = $this->Application->GetVar($event->getPrefixSpecial(true));
 
@@ -90,7 +90,7 @@
 		}
 
 		$event->MasterEvent->SetRedirectParam('item_prefix', $this->Application->GetVar('item_prefix'));
-		$event->MasterEvent->SetRedirectParam('group_id', $this->Application->GetVar('group_id'));
+		$event->MasterEvent->SetRedirectParam('group_id', $this->Application->GetVar('current_group_id'));
 	}
 
 	/**
Index: branches/5.1.x/core/kernel/db/db_connection.php
===================================================================
diff -u -N -r13168 -r13750
--- branches/5.1.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 13168)
+++ branches/5.1.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_connection.php 13168 2010-02-24 17:26:57Z alex $
+* @version	$Id: db_connection.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -498,6 +498,11 @@
 				// set 2nd checkpoint: begin
 				if ($profileSQLs) {
 					$first_cell = count($ret) == 1 && count(current($ret)) == 1 ? current(current($ret)) : null;
+
+					if (strlen($first_cell) > 200) {
+					    $first_cell = substr($first_cell, 0, 50) . ' ...';
+					}
+
 					$debugger->profileFinish('sql_'.$queryID, null, null, $this->getAffectedRows(), $first_cell, $this->_queryCount, $this->nextQueryCachable);
 					$debugger->profilerAddTotal('sql', 'sql_'.$queryID);
 					$this->nextQueryCachable = false;
Index: branches/5.1.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r13562 -r13750
--- branches/5.1.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 13562)
+++ branches/5.1.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 13562 2010-05-14 19:12:24Z alex $
+* @version	$Id: main_processor.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -839,9 +839,10 @@
 			$ssl = $ssl_url !== false ? $ssl_url : $this->Application->ConfigValue('SSL_URL');
 		}
 
-		if (!$ssl) {
+		if (!$ssl || ($this->Application->TemplatesCache->forceThemeName !== false)) {
 			// SSL URL is not set - no way to require SSL
-			return;
+			// internal parsing (e.g. "TemplateParser::_parseTemplate") -> don't redirect
+			return ;
 		}
 
 		$require = false;
@@ -859,6 +860,11 @@
 			}
 		}
 
+		if (EDITING_MODE) {
+			// match SSL mode on front-end to one in administrative console, when browse modes are used
+			$require = $this->Application->ConfigValue('Require_AdminSSL');
+		}
+
 		$http_query =& $this->Application->recallObject('HTTPQuery');
 		$pass = $http_query->getRedirectParams();
 		$pass['pass_events'] = 1; // to make sure all events are passed when redirect happens
Index: branches/5.1.x/core/units/modules/modules_event_handler.php
===================================================================
diff -u -N -r13581 -r13750
--- branches/5.1.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 13581)
+++ branches/5.1.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: modules_event_handler.php 13581 2010-05-19 07:33:23Z alex $
+* @version	$Id: modules_event_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -63,38 +63,42 @@
 			}
 
 			$object =& $event->getObject( Array('skip_autoload' => true) );
+			/* @var $object kDBItem */
+
 			$ids = $this->StoreSelectedIDs($event);
 
-
 			if (!$ids) {
-				return true;
+				return ;
 			}
 
-			$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
+			$updated = 0;
+			$status_field = $this->Application->getUnitOption($event->Prefix, 'StatusField');
+			$status_field = array_shift($status_field);
 
 			foreach ($ids as $id) {
-				if (($event->Name == 'OnMassDecline') && ($id == 'In-Portal')) {
-					// don't allow to disable in-portal
-					continue;
-				}
+				$object->Load($id);
 
-				if ($id == 'Core') {
+				if (in_array($id, Array ('In-Portal', 'Core')) || !$object->isLoaded()) {
 					// don't allow any kind of manupulations with kernel
+					// approve/decline on not installed module
 					continue;
 				}
 
-				$object->Load($id);
+				$enabled = $event->Name == 'OnMassApprove' ? 1 : 0;
+				$object->SetDBField($status_field, $enabled);
 
-				$object->SetDBField($status_field, $event->Name == 'OnMassApprove' ? 1 : 0);
+				if (!$object->GetChangedFields()) {
+					// no changes -> skip
+					continue;
+				}
 
 				if ($object->Update()) {
+					$updated++;
+
 					$sql = 'UPDATE ' . TABLE_PREFIX . 'ImportScripts
-								SET Status = ' . ($event->Name == 'OnMassApprove' ? STATUS_ACTIVE : STATUS_DISABLED) . '
- 								WHERE Module = "' . $object->GetDBField('Name') . '"';
+							SET Status = ' . $enabled . '
+ 							WHERE Module = "' . $object->GetDBField('Name') . '"';
  					$this->Conn->Query($sql);
-
- 					$event->status = erSUCCESS;
-					$event->redirect_params = Array('opener' => 's'); //stay!
 				}
 				else {
 					$event->status = erFAIL;
@@ -103,8 +107,13 @@
 				}
 			}
 
-			$this->Application->UnitConfigReader->ResetParsedData(true); //true to reset sections cache also
-			$event->SetRedirectParam('RefreshTree', 1);
+			if ($updated) {
+				$event->status = erSUCCESS;
+				$event->redirect_params = Array ('opener' => 's'); //stay!
+
+				$this->Application->UnitConfigReader->ResetParsedData(true); //true to reset sections cache also
+				$event->SetRedirectParam('RefreshTree', 1);
+			}
 		}
 
 		/**
Index: branches/5.1.x/core/kernel/db/cat_tag_processor.php
===================================================================
diff -u -N -r13581 -r13750
--- branches/5.1.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 13581)
+++ branches/5.1.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_tag_processor.php 13581 2010-05-19 07:33:23Z alex $
+* @version	$Id: cat_tag_processor.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -701,23 +701,27 @@
 			list ($view_perm, $view_filter) = $count_helper->GetPermissionClause('c', 'perm_cache');
 
 			// get category list (permission based)
-		  	$sql = 'SELECT c.'.$title_field.', c.'.$id_field.'
+		  	$sql = 'SELECT c.'.$title_field.' AS CategoryName, c.'.$id_field.', c.l' . $this->Application->GetVar('m_lang') . '_CachedNavbar AS CachedNavbar
 		  			FROM '.$table_name.' c
 		    		INNER JOIN '.TABLE_PREFIX.'PermCache perm_cache ON c.CategoryId = perm_cache.CategoryId
 		    		WHERE (ParentId = '.$category_id.') AND ('.$view_filter.') AND (perm_cache.PermId = '.$view_perm.') AND (c.Status = '.STATUS_ACTIVE.')
 		    		ORDER BY c.'.$title_field.' ASC';
-			$categories = $this->Conn->GetCol($sql, $id_field);
+			$categories = $this->Conn->Query($sql, $id_field);
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 			$block_params['strip_nl'] = 2;
 
 			$ret = '';
-			foreach ($categories as $category_id => $category_name) {
+			foreach ($categories as $category_id => $category_data) {
 				// print category
 				$block_params['separator'] = isset($params['category_id']) ? $params['separator'] : ''; // return original separator, remove separator for top level categories
 				$block_params['category_id'] = $category_id;
-				$block_params['category_name'] = $category_name;
+				$block_params['category_name'] = $category_data['CategoryName'];
+
+				$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $category_data['CachedNavbar']);
+				$block_params['full_path'] = str_replace('&|&', ' > ', $cached_navbar);
+
 				$ret .= $this->Application->ParseBlock($block_params);
 
 				// print it's children
@@ -744,18 +748,22 @@
 			$title_field = $this->Application->getUnitOption('c', 'TitleField');
 			$table_name = $this->Application->getUnitOption('c', 'TableName');
 
-			$sql = 'SELECT '.$title_field.', '.$id_field.'
+			$sql = 'SELECT '.$title_field.' AS CategoryName, '.$id_field.', l' . $this->Application->GetVar('m_lang') . '_CachedNavbar AS CachedNavbar
 					FROM '.$table_name.'
 					WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
-			$categories = $this->Conn->GetCol($sql, $id_field);
+			$categories = $this->Conn->Query($sql, $id_field);
 
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			$ret = '';
-			foreach ($categories as $category_id => $category_name) {
+			foreach ($categories as $category_id => $category_data) {
 				$block_params['category_id'] = $category_id;
-				$block_params['category_name'] = $category_name;
+				$block_params['category_name'] = $category_data['CategoryName'];
+
+				$cached_navbar = preg_replace('/^(Content&\|&|Content)/i', '', $category_data['CachedNavbar']);
+				$block_params['full_path'] = str_replace('&|&', ' > ', $cached_navbar);
+
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
Index: branches/5.1.x/core/kernel/db/dbitem.php
===================================================================
diff -u -N -r13545 -r13750
--- branches/5.1.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 13545)
+++ branches/5.1.x/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dbitem.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: dbitem.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -580,13 +580,19 @@
 	    	return false;
 	    }
 
-		$affected = $this->Conn->getAffectedRows();
-		if (!$system_update && $affected == 1) {
+		$affected_rows = $this->Conn->getAffectedRows();
+
+		if (!$system_update && ($affected_rows > 0)) {
 			$this->setModifiedFlag(clUPDATE);
 		}
 
 		$this->saveCustomFields();
-	    $this->raiseEvent('OnAfterItemUpdate');
+
+		if ($affected_rows > 0) {
+	    	$this->raiseEvent('OnAfterItemUpdate');
+		}
+
+	    $this->OriginalFieldValues = $this->FieldValues;
 	    $this->Loaded = true;
 
 	    if ($this->mode != 't') {
@@ -948,6 +954,8 @@
 			return false;
 		}
 
+		$this->OriginalFieldValues = $this->FieldValues;
+
 		$insert_id = $this->Conn->getInsertID();
 		if ($insert_id == 0) {
 			// insert into temp table (id is not auto-increment field)
@@ -963,6 +971,12 @@
 		if ($this->mode != 't') {
 			$this->Application->resetCounters($this->TableName);
 		}
+
+		if ($this->IsTempTable() && ($this->Application->GetTopmostPrefix($this->Prefix) != $this->Prefix)) {
+			// temp table + subitem = set negative id
+			$this->setTempID();
+		}
+
 		$this->raiseEvent('OnAfterItemCreate');
 		$this->Loaded = true;
 
@@ -1513,15 +1527,7 @@
 			$cdata->SetDBField($ml_formatter->LangFieldName('cust_'.$custom_id, $force_primary), $this->GetDBField('cust_'.$custom_name));
 		}
 
-		if ($cdata->isLoaded()) {
-			$ret = $cdata->Update();
-		}
-		else {
-			 $ret = $cdata->Create();
-			 if ($cdata->mode == 't') $cdata->setTempID();
-		}
-
-		return $ret;
+		return $cdata->isLoaded() ? $cdata->Update() : $cdata->Create();
 	}
 
 	/**
Index: branches/5.1.x/core/units/groups/groups_config.php
===================================================================
diff -u -N -r13159 -r13750
--- branches/5.1.x/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 13159)
+++ branches/5.1.x/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: groups_config.php 13159 2010-02-24 10:45:00Z alex $
+* @version	$Id: groups_config.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -57,7 +57,7 @@
 
 			'groups_edit_users' => Array (
 				'prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users!",
-				'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'select_user', 'delete', 'view'),
+				'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'delete', 'view'),
 				),
 
 			'groups_edit_permissions' => Array (
Index: branches/5.1.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r13635 -r13750
--- branches/5.1.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 13635)
+++ branches/5.1.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 13635 2010-05-25 09:31:29Z alex $
+* @version	$Id: categories_config.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -269,7 +269,7 @@
 		'ListSQLs' => Array (
 			'' => '	SELECT %1$s.* %2$s
 					FROM %1$s
-					LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
+					LEFT JOIN '.TABLE_PREFIX.'%3$sImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
 				 	LEFT JOIN '.TABLE_PREFIX.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId
 				 	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 			'-virtual' => 'SELECT %1$s.* %2$s FROM %1$s',
Index: branches/5.1.x/core/kernel/event_manager.php
===================================================================
diff -u -N -r13581 -r13750
--- branches/5.1.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 13581)
+++ branches/5.1.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event_manager.php 13581 2010-05-19 07:33:23Z alex $
+* @version	$Id: event_manager.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -283,7 +283,7 @@
 				$unit_config_reader->loadConfig($event->Prefix);
 				if( !$this->Application->prefixRegistred($event->Prefix) )
 				{
-					trigger_error('Prefix <b>'.$event->Prefix.'</b> not registred (requested event <b>'.$event->Name.'</b>)', E_USER_NOTICE);
+					trigger_error('Prefix <b>'.$event->Prefix.'</b> not registred (requested event <b>'.$event->Name.'</b>)', E_USER_WARNING);
 					return false;
 				}
 			}
Index: branches/5.1.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r13438 -r13750
--- branches/5.1.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 13438)
+++ branches/5.1.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 13438 2010-04-27 13:23:16Z alex $
+* @version	$Id: dblist.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -570,7 +570,7 @@
 			$debugger->appendTrace();
 		}
 
-		trigger_error('Depricated method <b>kDBList->SetWhereClause</b>. Use <b>kDBList->addFilter</b> instead.', E_USER_ERROR);
+		trigger_error('Depricated method <b>kDBList->SetWhereClause</b>. Use <b>kDBList->addFilter</b> instead.', defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_NOTICE);
 	}
 
 	/**
@@ -655,7 +655,7 @@
 		}
 
 		if (!isset($this->Fields[$field]) && $field != 'RAND()' && !$is_expression) {
-			trigger_error('<span class="debug_error">Incorrect sorting</span> defined (field = <b>'.$field.'</b>; direction = <b>'.$direction.'</b>) in config for prefix <b>'.$this->Prefix.'</b>', E_USER_WARNING);
+			trigger_error('<span class="debug_error">Incorrect sorting</span> defined (field = <b>'.$field.'</b>; direction = <b>'.$direction.'</b>) in config for prefix <b>'.$this->Prefix.'</b>', E_USER_NOTICE);
 		}
 
 		$this->OrderFields[] = Array($field, $direction, $is_expression);
Index: branches/5.1.x/core/units/phrases/phrases_config.php
===================================================================
diff -u -N -r13545 -r13750
--- branches/5.1.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 13545)
+++ branches/5.1.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_config.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: phrases_config.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -114,8 +114,8 @@
 			'PhraseId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
             'Phrase' => Array (
             	'type' => 'string',
-            	'required' => 1, 'unique' => Array (),
-            	'not_null' => 1, 'default' => '',
+            	'formatter' => 'kFormatter', 'regexp' => '/^(la|lu)_[A-Z\d:_\-\.]+$/i', 'unique' => Array (),
+            	'not_null' => 1, 'required' => 1, 'default' => '',
             ),
 			'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
             'Translation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
Index: branches/5.1.x/core/units/helpers/image_helper.php
===================================================================
diff -u -N -r13667 -r13750
--- branches/5.1.x/core/units/helpers/image_helper.php	(.../image_helper.php)	(revision 13667)
+++ branches/5.1.x/core/units/helpers/image_helper.php	(.../image_helper.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: image_helper.php 13667 2010-06-01 09:15:35Z alex $
+* @version	$Id: image_helper.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -94,7 +94,7 @@
 				}
 			}
 
-			if ((!$src_image || !file_exists($src_image)) && array_key_exists('default', $params)) {
+			if ((!$src_image || !file_exists($src_image)) && array_key_exists('default', $params) && !(defined('DBG_IMAGE_RECOVERY') && DBG_IMAGE_RECOVERY)) {
 				$src_image = $params['default'];
 			}
 
@@ -187,7 +187,9 @@
 				if ($src_image_rs) {
 					$dst_image_rs = imagecreatetruecolor($params['target_width'], $params['target_height']); // resize target size
 
-					if (($file_extension == 'gif') || ($file_extension == 'png')) {
+					$preserve_transparency = ($file_extension == 'gif') || ($file_extension == 'png');
+
+					if ($preserve_transparency) {
 						// preserve transparency of PNG and GIF images
 						$dst_image_rs = $this->_preserveTransparency($src_image_rs, $dst_image_rs, $image_info[2]);
 					}
@@ -199,11 +201,11 @@
 
 					if (array_key_exists('crop_x', $params) || array_key_exists('crop_y', $params)) {
 						// 2.1. crop image to given size
-						$dst_image_rs =& $this->_cropImage($dst_image_rs, $params);
+						$dst_image_rs =& $this->_cropImage($dst_image_rs, $params, $preserve_transparency ? $image_info[2] : false);
 						$watermark_size = 'max';
 					} elseif (array_key_exists('fill', $params)) {
 						// 2.2. fill image margins from resize with given color
-						$dst_image_rs =& $this->_applyFill($dst_image_rs, $params);
+						$dst_image_rs =& $this->_applyFill($dst_image_rs, $params, $preserve_transparency ? $image_info[2] : false);
 						$watermark_size = 'max';
 					}
 
@@ -279,16 +281,21 @@
 		 *
 		 * @param resource $src_image_rs resized image resource
 		 * @param Array $params crop parameters
+		 * @param int $image_type
 		 * @return resource
 		 */
-		function &_applyFill(&$src_image_rs, $params)
+		function &_applyFill(&$src_image_rs, $params, $image_type = false)
 		{
 			$x_position = round(($params['max_width'] - $params['target_width']) / 2); // center
 			$y_position = round(($params['max_height'] - $params['target_height']) / 2); // center
 
 			// crop resized image
 			$fill_image_rs = imagecreatetruecolor($params['max_width'], $params['max_height']);
 
+			if ($image_type !== false) {
+				$fill_image_rs = $this->_preserveTransparency($src_image_rs, $fill_image_rs, $image_type);
+			}
+
 			$fill = $params['fill'];
 
 			if (substr($fill, 0, 1) == '#') {
@@ -311,9 +318,10 @@
 		 *
 		 * @param resource $src_image_rs resized image resource
 		 * @param Array $params crop parameters
+		 * @param int $image_type
 		 * @return resource
 		 */
-		function &_cropImage(&$src_image_rs, $params)
+		function &_cropImage(&$src_image_rs, $params, $image_type = false)
 		{
 			if ($params['crop_x'] == 'c') {
 				$x_position = round(($params['max_width'] - $params['target_width']) / 2); // center
@@ -337,8 +345,16 @@
 
 			// crop resized image
 			$crop_image_rs = imagecreatetruecolor($params['max_width'], $params['max_height']);
-			$crop_image_rs =& $this->_applyFill($crop_image_rs, $params);
 
+			if ($image_type !== false) {
+				$crop_image_rs = $this->_preserveTransparency($src_image_rs, $crop_image_rs, $image_type);
+			}
+
+			if (array_key_exists('fill', $params)) {
+				// fill image margins from resize with given color
+				$crop_image_rs =& $this->_applyFill($crop_image_rs, $params, $image_type);
+			}
+
 			imagecopy($crop_image_rs, $src_image_rs, $x_position, $y_position, 0, 0, $params['target_width'], $params['target_height']);
 
 			return $crop_image_rs;
Index: branches/5.1.x/core/units/helpers/controls/edit_picker_helper.php
===================================================================
diff -u -N -r13086 -r13750
--- branches/5.1.x/core/units/helpers/controls/edit_picker_helper.php	(.../edit_picker_helper.php)	(revision 13086)
+++ branches/5.1.x/core/units/helpers/controls/edit_picker_helper.php	(.../edit_picker_helper.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: edit_picker_helper.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: edit_picker_helper.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -154,10 +154,6 @@
 					$object->SetDBField($foreign_key, $main_id);
 					$object->SetDBField($sub_prefix_field, $add_id);
 					$object->Create();
-
-					if ($object->IsTempTable()) {
-						$object->setTempID();
-					}
 				}
 			}
 		}
Index: branches/5.1.x/core/install.php
===================================================================
diff -u -N -r13690 -r13750
--- branches/5.1.x/core/install.php	(.../install.php)	(revision 13690)
+++ branches/5.1.x/core/install.php	(.../install.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 13690 2010-06-09 12:48:58Z alex $
+* @version	$Id: install.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -258,6 +258,8 @@
 						}
 					}
 
+					$this->toolkit->deleteEditTables();
+
 					$this->currentStep = $this->GetNextStep();
 					break;
 
Index: branches/5.1.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r13569 -r13750
--- branches/5.1.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 13569)
+++ branches/5.1.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 13569 2010-05-18 15:25:01Z alex $
+* @version	$Id: admin_tag_processor.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -89,6 +89,8 @@
 			$section_name = $params['section_name'];
 			$params['name'] = $this->SelectParam($params, 'name,render_as,block');
 			$sections_helper =& $this->Application->recallObject('SectionsHelper');
+			/* @var $sections_helper kSectionsHelper */
+
 			$section_data =& $sections_helper->getSectionData($section_name);
 
 			$params['children_count'] = isset($section_data['children']) ? count($section_data['children']) : 0;
@@ -101,24 +103,10 @@
 				return $ret;
 			}
 
-			$debug_mode = $this->Application->isDebugMode();
-			$super_admin_mode = $this->Application->RecallVar('super_admin');
-
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $section_name) {
-				$section_data =& $sections_helper->getSectionData($section_name);
-
-				if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
-					$show_mode = $section_data['show_mode'];
-					// if super admin section -> show in super admin mode & debug mode
-					$show_section = $show_mode == smNORMAL || ((($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($super_admin_mode || $debug_mode));
-					if (!$show_section) {
-						// if section is in debug mode only && debug mode -> show
-						$show_section = (($show_mode & smDEBUG) == smDEBUG) && $debug_mode;
-					}
-					if (!$show_section) {
-						continue;
-					}
+				if (!$sections_helper->sectionVisible($section_name)) {
+					continue;
 				}
 
 				$params['section_name'] = $section_name;
@@ -251,29 +239,17 @@
 				return '';
 			}
 
-			$debug_mode = $this->Application->isDebugMode();
-			$super_admin_mode = $this->Application->RecallVar('super_admin');
-
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $section_name) {
 				$params['section_name'] = $section_name;
 				$section_data =& $sections_helper->getSectionData($section_name);
 
-				$section_data['debug_only'] = 0;
-				if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
+				if (!$sections_helper->sectionVisible($section_name)) {
+					continue;
+				}
+				else {
 					$show_mode = $section_data['show_mode'];
-					// if super admin section -> show in super admin mode & debug mode
-					$show_section = $show_mode == smNORMAL || ((($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($super_admin_mode || $debug_mode));
-					if (!$show_section) {
-						// if section is in debug mode only && debug mode -> show
-						$show_section = (($show_mode & smDEBUG) == smDEBUG) && $debug_mode;
-					}
-					if (!$show_section) {
-						continue;
-					}
-					if ($show_mode == smDEBUG || $show_mode == smSUPER_ADMIN) {
-						$section_data['debug_only'] = 1;
-					}
+					$section_data['debug_only'] = ($show_mode == smDEBUG) || ($show_mode == smSUPER_ADMIN) ? 1 : 0;
 				}
 
 				if (isset($section_data['tabs_only']) && $section_data['tabs_only']) {
Index: branches/5.1.x/core/units/files/files_config.php
===================================================================
diff -u -N -r13581 -r13750
--- branches/5.1.x/core/units/files/files_config.php	(.../files_config.php)	(revision 13581)
+++ branches/5.1.x/core/units/files/files_config.php	(.../files_config.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: files_config.php 13581 2010-05-19 07:33:23Z alex $
+* @version	$Id: files_config.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -78,7 +78,7 @@
 					'video/x-flv', 'video/quicktime', 'video/x-sgi-movie', 'video/mpeg',
 					'video/x-msvideo', 'video/x-msvideo', 'application/x-shockwave-flash', 'video/x-fli',
 					'application/pdf', 'application/msexcel', 'application/vnd.ms-excel', 'application/msword',
-					'application/mspowerpoint', 'application/zip', 'plain/text', 'application/x-gzip',
+					'application/mspowerpoint', 'application/zip', 'text/plain', 'application/x-gzip',
 				),
 				'not_null' => 1, 'required' => 1, 'default' => ''
 			),
Index: branches/5.1.x/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -N -r13086 -r13750
--- branches/5.1.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 13086)
+++ branches/5.1.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_event_handler.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: selectors_event_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -178,18 +178,16 @@
 			if($items_info)
 			{
 				list($id,$field_values) = each($items_info);
-				if($id == 0)
-				{
+				if ($id == 0) {
 					$parent_id = getArrayValue($field_values,'ParentId');
 					if($parent_id) $object->Load($parent_id);
 
 					$object->SetFieldsFromHash($field_values);
 					$object->Create();
-					if( $object->IsTempTable() ) $object->setTempID();
+
 					$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetID() );
 				}
-				else
-				{
+				else {
 					$object->Load($id);
 					$object->SetFieldsFromHash($field_values);
 					$object->Update();
Index: branches/5.1.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r13691 -r13750
--- branches/5.1.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 13691)
+++ branches/5.1.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 13691 2010-06-09 12:50:19Z alex $
+* @version	$Id: db_event_handler.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -485,7 +485,7 @@
 			if ($this->Application->isDebugMode()) {
 				$this->Application->Debugger->appendTrace();
 			}
-			trigger_error('ItemLoad Permission Failed for prefix [' . $event->getPrefixSpecial() . '] in <strong>checkItemStatus</strong>, leading to "404 Not Found"', E_USER_WARNING);
+			trigger_error('ItemLoad Permission Failed for prefix [' . $event->getPrefixSpecial() . '] in <strong>checkItemStatus</strong>, leading to "404 Not Found"', E_USER_NOTICE);
 
 			header('HTTP/1.0 404 Not Found');
 
@@ -555,7 +555,7 @@
 						$this->Application->Debugger->appendTrace();
 					}
 
-					trigger_error('ItemLoad Permission Failed for prefix ['.$event->getPrefixSpecial().'] in <strong>'.($status_checked ? 'checkItemStatus' : 'CheckPermission').'</strong>', E_USER_WARNING);
+					trigger_error('ItemLoad Permission Failed for prefix ['.$event->getPrefixSpecial().'] in <strong>'.($status_checked ? 'checkItemStatus' : 'CheckPermission').'</strong>', E_USER_NOTICE);
 					$template = $this->Application->isAdmin ? 'no_permission' : $this->Application->ConfigValue('NoPermissionTemplate');
 
 					if (MOD_REWRITE) {
@@ -1326,15 +1326,12 @@
 			$this->customProcessing($event,'before');
 
 			//look at kDBItem' Create for ForceCreateId description, it's rarely used and is NOT set by default
-			if( $object->Create($event->getEventParam('ForceCreateId')) )
-			{
-				if( $object->IsTempTable() ) $object->setTempID();
+			if ( $object->Create($event->getEventParam('ForceCreateId')) ) {
 				$this->customProcessing($event,'after');
 				$event->status=erSUCCESS;
 				$event->redirect_params = Array('opener'=>'u');
 			}
-			else
-			{
+			else {
 				$event->status = erFAIL;
 				$event->redirect = false;
 				$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
@@ -2409,9 +2406,6 @@
 
 				if ($is_new) {
 					$object->Create();
-					if (!$is_main && $object->IsTempTable()) {
-						$object->setTempID();
-					}
 				}
 				else {
 					$object->Update();
@@ -2619,9 +2613,17 @@
 				$fname = $id . '_' . $fname;
 			}
 
+			$field_name = $this->Application->GetVar('field');
 			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
-			$upload_dir = $fields[ $this->Application->GetVar('field') ]['upload_dir'];
 
+			if (array_key_exists($field_name, $fields)) {
+				$upload_dir = $fields[$field_name]['upload_dir'];
+			}
+			else {
+				$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields');
+				$upload_dir = $virtual_fields[$field_name]['upload_dir'];
+			}
+
 			if (!is_writable($tmp_path)) {
 				// 500 Internal Server Error
 				// check both temp and live upload directory
Index: branches/5.1.x/core/units/helpers/multilanguage_helper.php
===================================================================
diff -u -N -r13545 -r13750
--- branches/5.1.x/core/units/helpers/multilanguage_helper.php	(.../multilanguage_helper.php)	(revision 13545)
+++ branches/5.1.x/core/units/helpers/multilanguage_helper.php	(.../multilanguage_helper.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: multilanguage_helper.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: multilanguage_helper.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -85,6 +85,10 @@
 		 */
 		function getLanguageCount()
 		{
+			if ($this->languageCount) {
+				return $this->languageCount;
+			}
+
 			$id_field = $this->Application->getUnitOption('lang', 'IDField');
 			$table_name = $this->Application->getUnitOption('lang', 'TableName');