in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sat, Sep 20, 11:42 PM

in-portal
View Options

	Index: trunk/kernel/units/categories/categories_config.php
	===================================================================
	--- trunk/kernel/units/categories/categories_config.php (revision 4995)
	+++ trunk/kernel/units/categories/categories_config.php (revision 4996)
	@@ -1,222 +1,240 @@
	<?php

	$config = Array(
	'Prefix' => 'c',
	'ItemClass' => Array('class'=>'CategoriesItem','file'=>'categories_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'CategoriesEventHandler','file'=>'categories_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'CategoriesTagProcessor','file'=>'categories_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'AggregateTags' => Array(
	Array(
	'AggregateTo' => 'm',
	'AggregatedTagName' => 'CategoryLink',
	'LocalTagName' => 'CategoryLink',
	),
	),
	'IDField' => 'CategoryId',

	'StatusField' => Array('Status'),

	'TitleField' => 'Name', // field, used in bluebar when editing existing item
	'ItemType' => 1, // used for custom fields only

	'StatisticsInfo' => Array(
	'pending' => Array(
	'icon' => 'icon16_cat_pending.gif',
	'label' => 'la_tab_Categories',
	'js_url' => "set_persistant_var('Category_View', 41, 'advanced_view', '#url#')",
	'url' => Array('t' => 'advanced_view', 'index_file' => 'advanced_view.php', 'SetTab' => 'category', 'pass' => 'm'),
	'status' => STATUS_PENDING,
	),
	),

	'TableName' => TABLE_PREFIX.'Category',

	'ViewMenuPhrase' => 'la_text_Categories',

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('c' => '!la_title_Adding_Category!'),
	'edit_status_labels' => Array('c' => '!la_title_Editing_Category!'),
	'new_titlefield' => Array('c' => '!la_title_New_Category!'),
	),
	'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),
	-
	+
	+ 'catalog' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (<span id='category_count'>#c_recordcount#</span>)"),
	+
	'category_items'=> Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"),

	'tree_site' => Array('format' => '!la_selecting_categories!'),
	),

	'PermSection' => Array('main' => 'in-portal:categories', /'search' => 'in-portal:configuration_search',/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),

	'Sections' => Array(
	// "Structure & Data" section
	'in-portal:site' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'struct',
	'label' => 'la_tab_Site_Structure',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	),

	'in-portal:browse' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'catalog',
	'label' => 'la_tab_Browse',
	'url' => Array('index_file' => 'browse.php', 'pass' => 'm'),
	'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	),
	+
	+ 'in-portal:browse_new' => Array(
	+ 'parent' => 'in-portal:site',
	+ 'icon' => 'catalog',
	+ 'label' => 'la_K4_Catalog',
	+ 'url' => Array('t' => 'catalog', 'pass' => 'm'),
	+ 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
	+ 'onclick' => 'checkCatalog(0)',
	+ 'permissions' => Array('view'),
	+ 'priority' => 1.1,
	+ 'type' => stTREE,
	+ ),

	'in-portal:advanced_view' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'advanced_view',
	'label' => 'la_tab_AdvancedView',
	'url' => Array('index_file' => 'advanced_view.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 2,
	'type' => stTREE,
	),

	'in-portal:reviews' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'reviews',
	'label' => 'la_tab_Reviews',
	'url' => Array('index_file' => 'reviews.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 3,
	'type' => stTREE,
	),

	'in-portal:configure_categories' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'cat_settings',
	'label' => 'la_tab_Settings',
	'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 4,
	'type' => stTREE,
	),

	'in-portal:configuration_search' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_search',
	'label' => 'la_tab_ConfigSearch',
	'url' => Array('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 5,
	'type' => stTREE,
	),

	'in-portal:configuration_email' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_email',
	'label' => 'la_tab_ConfigE-mail',
	'url' => Array('t' => 'config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 6,
	'type' => stTREE,
	),

	'in-portal:configuration_custom' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_custom',
	'label' => 'la_tab_ConfigCustom',
	'url' => Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 7,
	'type' => stTREE,
	),

	),

	'ListSQLs' => Array( ''=> ' SELECT %1$s.* %2$s
	FROM %1$s
	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'),

	'ItemSQLs' => Array( ''=> ' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),

	'SubItems' => Array('c-cdata', 'c-perm'),

	'ListSortings' => Array(
	- '' => Array(
	- 'ForcedSorting' => Array("CurrentSort" => 'asc', 'Priority' => 'desc', 'Name' => 'asc'),
	- 'Sorting' => Array('Name' => 'asc'),
	- )
	- ),
	+ '' => Array(
	+ 'ForcedSorting' => Array("CurrentSort" => 'asc', 'Priority' => 'desc', 'Name' => 'asc'),
	+ 'Sorting' => Array('Name' => 'asc'),
	+ )
	+ ),
	+
	'CalculatedFields' => Array(
	'' => Array(
	'CurrentSort' => "REPLACE(ParentPath, CONCAT('\|', ".'%1$s'.".CategoryId, '\|'), '')",
	)
	),

	'Fields' => Array
	(
	'CategoryId' => Array('type' => 'int','not_null' => '1','default' => ''),
	'Type' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'ParentId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Filename' => Array('type' => 'string','not_null' => '1','default' => ''),
	'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '1'),
	'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
	'EditorsPick' => Array('type' => 'int','default' => ''),
	'Status' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Pop' => Array('type' => 'int','default' => ''),
	'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => ''),
	'MetaKeywords' => Array('type' => 'string','default' => ''),
	'CachedDescendantCatsQty' => Array('type' => 'int','default' => ''),
	'CachedNavbar' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CreatedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'ResourceId' => Array('type' => 'int','default' => ''),
	'ParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
	'NamedParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
	'MetaDescription' => Array('type' => 'string','default' => ''),
	'HotItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
	'NewItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
	'PopItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
	'Modified' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'ModifiedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'CategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	'ItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CachedCategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CachedItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	),

	'VirtualFields' => Array(
	'CurrentSort' => Array('type' => 'string', 'default' => ''),
	'IsNew' => Array('type' => 'int', 'default' => 0),
	),

	'Grids' => Array(
	'Default' => Array(
	- 'Icons' => Array('default'=>'icon16_cat.gif'),
	- 'Fields' => Array(
	- 'Name' => Array( 'width'=>150, 'title'=>'la_col_Title', 'data_block'=>'category_td' ),
	- ),
	+ 'Icons' => Array('default'=>'icon16_cat.gif'),
	+ 'Fields' => Array(
	+ 'Name' => Array('title' => 'la_col_Name', 'data_block' => 'category_td'),
	+ 'Description' => Array('title' => 'la_col_Description'),
	+ 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
	+ ),

	- ),
	),
	+ ),
	+
	'ConfigMapping' => Array(
	'PerPage' => 'Perpage_Category',
	'DefaultSorting1Field' => 'Category_Sortfield',
	'DefaultSorting2Field' => 'Category_Sortfield2',
	'DefaultSorting1Dir' => 'Category_Sortorder',
	'DefaultSorting2Dir' => 'Category_Sortorder2',
	),
	);

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/categories/categories_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.31
	\ No newline at end of property
	+1.32
	\ No newline at end of property
	Index: trunk/kernel/units/categories/categories_tag_processor.php
	===================================================================
	--- trunk/kernel/units/categories/categories_tag_processor.php (revision 4995)
	+++ trunk/kernel/units/categories/categories_tag_processor.php (revision 4996)
	@@ -1,290 +1,291 @@
	<?php

	class CategoriesTagProcessor extends kDBTagProcessor {

	function &GetList($params)
	{
	$special = $this->BuildListSpecial($params);

	$prefix_special = $this->Prefix.'.'.$special;
	$this->Special = $special;

	$params['skip_counting'] = true;

	$list =& $this->Application->recallObject( $prefix_special, $this->Prefix.'_List',$params);

	// $list->clearFilters();
	// $list->addFilter('parent_filter', 'ParentId = '.$parent_cat_id, WHERE_FILTER, FLT_SYSTEM);

	//unset($params['skip_counting']);
	// $this->Application->HandleEvent($event, $prefix_special.':SetPagination', $params );

	$list->Query();
	return $list;
	}

	function SubCatCount($params)
	{
	$cat_object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params);
	$sql = ' SELECT COUNT(*) - 1
	FROM '.$cat_object->TableName.'
	WHERE ParentPath LIKE "'.$cat_object->GetDBField('ParentPath').'%"';
	return $this->Conn->GetOne($sql);
	}

	function IsNew($params)
	{
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	$ret = $object->GetDBField('IsNew') ? 1 : 0;
	return $ret;
	}

	function IsPick($params)
	{
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	$ret = $object->GetDBField('EditorsPick') ? 1 : 0;
	return $ret;
	}

	function ItemIcon($params)
	{
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	$status = $object->GetDBField('Status');
	if($status == 1)
	{
	$ret = $object->GetDBField('IsNew') ? 'icon16_cat_new.gif' : 'icon16_cat.gif';
	}
	else
	{
	$ret = $status ? 'icon16_cat_pending.gif' : 'icon16_cat_disabled.gif';
	}
	return $ret;
	}

	function ItemCount($params)
	{
	$cat_object =& $this->getObject($params);
	$ci_table = $this->Application->getUnitOption('l-ci', 'TableName');

	$sql = ' SELECT COUNT(*)
	FROM '.$cat_object->TableName.' c
	LEFT JOIN '.$ci_table.' ci
	ON c.CategoryId=ci.CategoryId
	WHERE c.ParentPath LIKE "'.$cat_object->GetDBField('ParentPath').'%"
	AND NOT (ci.CategoryId IS NULL)';
	return $this->Conn->GetOne($sql);
	}

	function ListCategories($params)
	{
	return $this->PrintList2($params);
	}

	function RootCategoryName($params)
	{
	$root_phrase = $this->Application->ConfigValue('Root_Name');
	$ret = $this->Application->Phrase($root_phrase);
	return $ret;
	}

	function CheckModuleRoot($params)
	{
	$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
	$module =& $this->Application->recallObject('mod.'.$module_name);
	$module_root_cat = $module->GetDBField('RootCat');

	$additional_cats = $this->SelectParam($params, 'add_cats');
	if ($additional_cats) {
	$additional_cats = explode(',', $additional_cats);
	}
	else {
	$additional_cats = array();
	}

	if ($this->Application->GetVar('m_cat_id') == $module_root_cat \|\| in_array($this->Application->GetVar('m_cat_id'), $additional_cats)) {
	$home_template = getArrayValue($params, 'home_template');
	if (!$home_template) return;
	$this->Application->Redirect($home_template, Array('pass'=>'all'));
	};
	}

	function CategoryPath($params)
	{
	$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
	$module =& $this->Application->recallObject('mod.'.$module_name);
	$module_root_cat = $module->GetDBField('RootCat');

	$block_params['current'] = 0;
	$block_params['separator'] = $params['separator'];

	if(!isset($params['cat_id']))
	{
	$params['cat_id'] = getArrayValue($params, 'cat_id') ? $params['cat_id'] : $this->Application->GetVar('m_cat_id');
	$block_params['current'] = 1;
	}
	$product_id = $this->Application->GetVar('p_id');
	if ($product_id) {
	$block_params['current'] = 0;
	}

	$block_params['is_module_root'] = ($params['cat_id'] == $module_root_cat) ? 1 : 0;

	if($params['cat_id'] == 0)
	{
	$block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock');
	return $this->Application->ParseBlock($block_params);
	}
	else
	{
	$block_params['name'] = $this->SelectParam($params,'render_as,block');

	// $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' );
	$sql = 'SELECT CategoryId, ParentId, Name FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').'
	WHERE CategoryId='.$params['cat_id'];
	$res = $this->Conn->GetRow($sql);
	if ($res === false) {
	// in case if category is deleted
	return '';
	}

	$block_params['cat_name'] = $res['Name'];
	$block_params['cat_id'] = $res['CategoryId'];

	$parent_params = $params;
	$parent_params['cat_id'] = $res['ParentId'];

	// which block to parse as current ?
	if ($block_params['is_module_root'] == 1) { // module root
	$block_params['name'] = $this->SelectParam($params, 'module_root_render_as,block_module_root,rootmoduleblock');
	}
	if ($block_params['current'] == 1) { // current cat (label)
	$block_params['name'] = $this->SelectParam($params, 'current_render_as,block_current,currentblock');
	}

	$this->Application->SetVar($this->Prefix.'_id', $res['CategoryId']);
	$current_cat = $this->Application->ParseBlock($block_params, 1);

	$this->Application->SetVar($this->Prefix.'_id', $res['ParentId']);
	$parent_cat = $this->CategoryPath($parent_params);

	return $parent_cat.$current_cat;
	}
	}

	function CurrentCategoryName($params){

	$cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' );
	$cat_id = $this->Application->GetVar("m_cat_id");
	$sql = 'SELECT Name FROM '.$cat_object->TableName.' WHERE CategoryId='.$cat_id;
	return $this->Conn->GetOne($sql);

	}

	function CategoryLink($params)
	{
	// 'p_id'=>'0', ??
	$params = array_merge(array('pass'=>'m'), $params);
	$cat_id = getArrayValue($params,'cat_id');
	if ($cat_id === false) {
	// $cat_id = $this->Application->Parser->GetParam('cat_id');
	$cat_id = $this->Application->GetVar($this->Prefix.'_id');
	}
	if($cat_id == 'Root')
	{
	$object =& $this->Application->recallObject('mod.'.$params['module']);
	$params['m_cat_id'] = $object->GetDBField('RootCat');
	unset($params['module']);
	}
	else{
	$params['m_cat_id'] = $cat_id;
	}
	unset($params['cat_id']);

	$main_processor =& $this->Application->recallObject('m_TagProcessor');
	return $main_processor->T($params);
	}

	function CategoryList($params)
	{
	//$object =& $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
	$object =& $this->GetList($params);


	if ($object->RecordsCount == 0)
	{
	if (isset($params['block_no_cats'])) {
	$params['name'] = $params['block_no_cats'];
	return $this->Application->ParseBlock($params);
	}
	else {
	return '';
	}
	}

	if(isset($params['block']))
	{
	return $this->PrintList($params);
	}
	else
	{
	$params['block'] = $params['block_main'];
	$params['row_start_block'] = $params['block_row_start'];
	$params['row_end_block'] = $params['block_row_end'];
	return $this->PrintList2($params);
	}
	}

	function Meta($params)
	{
	$name = getArrayValue($params, 'name');
	$object =& $this->Application->recallObject($this->Prefix.'.-item');

	$field = $object->GetField('Meta'.$name);
	if ($field) return $field;

	switch ($name) {
	case 'Description':
	$conf = 'Category_MetaDesc';
	break;
	case 'Keywords':
	$conf = 'Category_MetaKey';
	break;
	}

	return $this->Application->ConfigValue($conf);
	}

	function BuildListSpecial($params)
	{
	if ( isset($params['parent_cat_id']) ) {
	$parent_cat_id = $params['parent_cat_id'];
	}
	else {
	$parent_cat_id = $this->Application->GetVar($this->Prefix.'_id');
	if (!$parent_cat_id) {
	$parent_cat_id = $this->Application->GetVar('m_cat_id');
	}
	if (!$parent_cat_id) {
	$parent_cat_id = 0;
	}
	}

	$types = $this->SelectParam($params, 'types');
	$except = $this->SelectParam($params, 'except');

	- if ($types.$except.$parent_cat_id == '') {
	+ $no_special = isset($params['no_special']) && $params['no_special'];
	+ if ($types.$except.$parent_cat_id == '' \|\| $no_special) {
	return parent::BuildListSpecial($params);
	}

	$special = crc32($types.$except.$parent_cat_id);
	return $special;
	}

	function IsCurrent($params)
	{
	return false;
	}
	}


	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/categories/categories_tag_processor.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.18
	\ No newline at end of property
	+1.19
	\ No newline at end of property
	Index: trunk/kernel/units/general/helpers/sections_helper.php
	===================================================================
	--- trunk/kernel/units/general/helpers/sections_helper.php (revision 4995)
	+++ trunk/kernel/units/general/helpers/sections_helper.php (revision 4996)
	@@ -1,109 +1,114 @@
	<?php

	/**
	* Porcesses sections information from configs
	*
	*/
	class kSectionsHelper extends kHelper {

	/**
	* Holds information about all sections
	*
	* @var Array
	*/
	var $Tree = Array();

	/**
	* Set's prefix and special
	*
	* @param string $prefix
	* @param string $special
	* @access public
	*/
	function Init($prefix, $special, $event_params = null)
	{
	parent::Init($prefix, $special, $event_params);
	$this->BuildTree();
	}

	/**
	* Builds xml for tree in left frame in admin
	*
	* @param Array $params
	*/
	function BuildTree()
	{
	$unit_config_reader = false;
	$data = $this->Conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "sections_parsed"');
	if ($data) {
	$this->Tree = unserialize($data['Data']);
	return ;
	}
	$this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH);

	$this->Tree = Array();
	if (!$unit_config_reader) {
	$unit_config_reader =& $this->Application->recallObject('kUnitConfigReader');
	}

	$prefixes = array_keys($unit_config_reader->configData);
	foreach ($prefixes as $prefix) {
	$config =& $unit_config_reader->configData[$prefix];
	$sections = getArrayValue($config, 'Sections');
	if (!$sections) continue;

	// echo 'Prefix: ['.$prefix.'] has ['.count($sections).'] sections<br />';

	foreach ($sections as $section_name => $section_params) {
	// we could also skip not allowed sections here in future
	$section_params['SectionPrefix'] = $prefix;
	$section_params['url']['m_opener'] = 'r';

	$pass_section = getArrayValue($section_params, 'url', 'pass_section');

	if ($pass_section) {
	unset($section_params['url']['pass_section']);
	$section_params['url']['section'] = $section_name;
	if (!isset($section_params['url']['module'])) {
	$module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name');
	$section_params['url']['module'] = $module_name;
	}
	}
	+
	if (!isset($section_params['url']['t'])) {
	$section_params['url']['t'] = 'index';
	}

	+ if (!isset($section_params['onclick'])) {
	+ $section_params['onclick'] = 'checkEditMode()';
	+ }
	+
	$current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array();
	$this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);

	$this->Tree[ $section_params['parent'] ]['children'][ "{$section_params['priority']}" ] = $section_name;

	if ($section_params['type'] == stTAB) {
	// if this is tab, then mark parent section as TabOnly
	$this->Tree[ $section_params['parent'] ]['tabs_only'] = true;
	}
	}
	}

	$this->Conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("sections_parsed", '.$this->Conn->qstr(serialize($this->Tree)).', '.adodb_mktime().')');
	}

	/**
	* Returns details information about section
	*
	* @param string $section_name
	* @return Array
	*/
	function &getSectionData($section_name)
	{
	if (isset($this->Tree[$section_name])) {
	$ret =& $this->Tree[$section_name];
	}
	else {
	$ret = Array();
	}
	return $ret;
	}
	}

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/general/helpers/sections_helper.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.6
	\ No newline at end of property
	+1.7
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/script.js
	===================================================================
	--- trunk/kernel/admin_templates/incs/script.js (revision 4995)
	+++ trunk/kernel/admin_templates/incs/script.js (revision 4996)
	@@ -1,941 +1,947 @@
	if ( !( isset($init_made) && $init_made ) ) {
	var Grids = new Array();
	var Toolbars = new Array();
	var $Menus = new Array();
	var $ViewMenus = new Array();

	var $form_name = 'kernel_form';
	if(!$fw_menus) var $fw_menus = new Array();

	var $env = '';
	var submitted = false;
	var $edit_mode = false;
	var $init_made = true; // in case of double inclusion of script.js :)

	// hook processing
	var hBEFORE = 1; // this is const, but including this twice causes errors
	var hAFTER = 2; // this is const, but including this twice causes errors
	var $hooks = new Array();
	}

	function getArrayValue()
	{
	var $value = arguments[0];
	var $current_key = 0;
	$i = 1;
	while ($i < arguments.length) {
	$current_key = arguments[$i];
	if (isset($value[$current_key])) {
	$value = $value[$current_key];
	}
	else {
	return false;
	}
	$i++;
	}
	return $value;
	}

	function setArrayValue()
	{
	// first argument - array, other arguments - keys (arrays too), last argument - value
	var $array = arguments[0];
	var $current_key = 0;
	$i = 1;
	while ($i < arguments.length - 1) {
	$current_key = arguments[$i];
	if (!isset($array[$current_key])) {
	$array[$current_key] = new Array();
	}
	$array = $array[$current_key];
	$i++;
	}
	$array[$array.length] = arguments[arguments.length - 1];
	}

	function processHooks($function_name, $hook_type, $prefix_special)
	{
	var $i = 0;
	var $local_hooks = getArrayValue($hooks, $function_name, $hook_type);

	while($i < $local_hooks.length) {
	$local_hooks[$i]($function_name, $prefix_special);
	$i++;
	}
	}

	function registerHook($function_name, $hook_type, $hook_body)
	{
	setArrayValue($hooks, $function_name, $hook_type, $hook_body);
	}

	function resort_grid(prefix_special,field,form_action)
	{
	set_hidden_field(prefix_special+'_Sort1', field);
	submit_event(prefix_special,'OnSetSorting',null,form_action);
	}

	function direct_sort_grid($prefix_special,$field,$direction,$field_pos)
	{
	if(!isset($field_pos)) $field_pos = 1;
	set_hidden_field($prefix_special+'_Sort'+$field_pos,$field);
	set_hidden_field($prefix_special+'_Sort'+$field_pos+'_Dir',$direction);
	set_hidden_field($prefix_special+'_SortPos',$field_pos);
	submit_event($prefix_special,'OnSetSortingDirect');
	}

	function reset_sorting($prefix_special)
	{
	submit_event($prefix_special,'OnResetSorting');
	}

	function set_per_page($prefix_special,$per_page)
	{
	set_hidden_field($prefix_special+'_PerPage',$per_page);
	submit_event($prefix_special,'OnSetPerPage');
	}

	function submit_event(prefix_special,event,t,form_action)
	{
	if (isset(event)) {
	set_hidden_field('events['+prefix_special+']', event);
	}

	if(isset(t)) set_hidden_field('t', t);
	if( isset(form_action) )
	{
	var old_env = '';
	if ( !form_action.match(/\?/) ) {
	document.getElementById($form_name).action.match(/.(\?.)/);
	old_env = RegExp.$1;
	}
	document.getElementById($form_name).action = form_action+old_env;
	}
	submit_kernel_form();
	}

	function submit_action($url, $action)
	{
	$form = document.getElementById($form_name);
	$form.action = $url;
	set_hidden_field('Action', $action);
	submit_kernel_form();
	}

	function show_form_data()
	{
	var $kf = document.getElementById($form_name);
	$ret = '';
	for(var i in $kf.elements)
	{
	$elem = $kf.elements[i];
	$ret += $elem.id + ' = ' + $elem.value + "\n";
	}
	alert($ret);
	}

	function submit_kernel_form()
	{
	if (submitted) {
	return;
	}
	submitted = true;

	var $form = document.getElementById($form_name);
	processHooks('SubmitKF', hBEFORE);
	if (typeof $form.onsubmit == "function") {
	$form.onsubmit();
	}

	$form.submit();
	processHooks('SubmitKF', hAFTER);
	$form.target = '';
	$form.t.value = t;

	window.setTimeout(function() {submitted = false}, 500);
	}

	function set_event(prefix_special, event)
	{
	var event_field=document.getElementById('events[' + prefix_special + ']');
	if(isset(event_field))
	{
	event_field.value = event;
	}
	}

	function isset(variable)
	{
	if(variable==null) return false;
	return (typeof(variable)=='undefined')?false:true;
	}

	function in_array(needle, haystack)
	{
	return array_search(needle, haystack) != -1;
	}

	function array_search(needle, haystack)
	{
	for (var i=0; i<haystack.length; i++)
	{
	if (haystack[i] == needle) return i;
	}
	return -1;
	}

	function print_pre(variable, msg)
	{
	if (!isset(msg)) msg = '';
	var s = msg;
	for (prop in variable) {
	s += prop+" => "+variable[prop] + "\n";
	}
	alert(s);
	}

	function go_to_page(prefix_special, page)
	{
	set_hidden_field(prefix_special+'_Page', page);
	submit_event(prefix_special);
	}

	function go_to_list(prefix_special, tab)
	{
	set_hidden_field(prefix_special+'_GoTab', tab);
	submit_event(prefix_special,'OnUpdateAndGoToTab',null);
	}

	function go_to_tab(prefix_special, tab)
	{
	set_hidden_field(prefix_special+'_GoTab', tab);
	submit_event(prefix_special,'OnPreSaveAndGoToTab',null);
	}

	function go_to_id(prefix_special, id)
	{
	set_hidden_field(prefix_special+'_GoId', id);
	submit_event(prefix_special,'OnPreSaveAndGo')
	}

	// in-portal compatibility functions: begin
	function getScriptURL($script_name)
	{
	var $asid = get_hidden_field('sid');
	return base_url+$script_name+'?env='+( isset($env)&&$env?$env:$asid )+'&en=0';
	}

	function OpenEditor(extra_env,TargetForm,TargetField)
	{
	var $url = getScriptURL('admin/editor/editor_new.php');
	$url = $url+'&TargetForm='+TargetForm+'&TargetField='+TargetField+'&destform=popup';
	if(extra_env.length>0) $url += extra_env;
	openwin($url,'html_edit',800,575);
	}

	function OpenUserSelector(extra_env,TargetForm,TargetField)
	{
	var $url = getScriptURL('admin/users/user_select.php');
	$url += '&destform='+TargetForm+'&Selector=radio&destfield='+TargetField+'&IdField=Login';
	if(extra_env.length>0) $url += extra_env;
	openwin($url,'user_select',800,575);
	return false;
	}

	function OpenCatSelector(extra_env)
	{
	var $url = getScriptURL('admin/cat_select.php');
	if(extra_env.length>0) $url += extra_env;
	openwin($url,'catselect',750,400);
	}

	function OpenItemSelector(extra_env,$TargetForm)
	{
	var $url = getScriptURL('admin/relation_select.php') + '&destform='+$TargetForm;
	if(extra_env.length>0) $url += extra_env;
	openwin($url,'groupselect',750,400);
	}

	function OpenUserEdit($user_id, $extra_env)
	{
	var $url = getScriptURL('admin/users/adduser.php') + '&direct_id=' + $user_id;
	if( isset($extra_env) ) $url += $extra_env;
	window.location.href = $url;
	}

	function OpenLinkEdit($link_id, $extra_env)
	{
	var $url = getScriptURL('in-link/admin/addlink.php') + '&item=' + $link_id;
	if( isset($extra_env) ) $url += $extra_env;
	window.location.href = $url;
	}

	function OpenHelp($help_link)
	{

	// $help_link.match('http://(.).lv/in-commerce/admin(.)');
	// alert(RegExp.$2);
	openwin($help_link,'HelpPopup',750,400);
	}

	function openEmailSend($url, $type, $prefix_special)
	{
	var $kf = document.getElementById($form_name);
	var $prev_action = $kf.action;
	var $prev_opener = get_hidden_field('m_opener');

	$kf.action = $url;
	set_hidden_field('m_opener', 'p');
	$kf.target = 'sendmail';
	set_hidden_field('idtype', 'group');
	set_hidden_field('idlist', Grids[$prefix_special].GetSelected().join(',') );
	openwin('','sendmail',750,400);
	submit_kernel_form();

	$kf.action = $prev_action;
	set_hidden_field('m_opener', $prev_opener);
	}
	// in-portal compatibility functions: end

	function PreSaveAndOpenTranslator(prefix,field,t,multi_line,$width,$height)
	{
	var $kf = document.getElementById($form_name);

	if(!isset($window_name)) var $window_name = 'select_'+t.replace(/(\/\|-)/g, '_');
	if(!isset($width)) $width=750;
	if(!isset($height)) $height=400;
	if(!isset(multi_line)) multi_line=0;
	openwin('',$window_name,$width,$height);
	set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done
	set_hidden_field('translator_wnd_name', $window_name);
	set_hidden_field('translator_field', field);
	set_hidden_field('translator_t', t);
	set_hidden_field('translator_prefixes', prefix);
	set_hidden_field('translator_multi_line', multi_line);
	$kf.target = $window_name;

	var split_prefix = prefix.split(',');
	submit_event(split_prefix[0],'OnPreSaveAndOpenTranslator');
	}

	function PreSaveAndOpenTranslatorCV(prefix,field,t,resource_id,multi_line)
	{
	var $kf = document.getElementById($form_name);

	if(!isset($window_name)) var $window_name = 'select_'+t.replace(/(\/\|-)/g, '_');
	if(!isset(multi_line)) multi_line=0;
	openwin('',$window_name,750,400);
	set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done
	set_hidden_field('translator_wnd_name', $window_name);
	set_hidden_field('translator_field', field);
	set_hidden_field('translator_t', t);
	set_hidden_field('translator_prefixes', prefix);
	set_hidden_field('translator_resource_id', resource_id);
	set_hidden_field('translator_multi_line', multi_line);
	$kf.target = $window_name;

	var split_prefix = prefix.split(',');
	submit_event(split_prefix[0],'OnPreSaveAndOpenTranslator');
	}


	function openTranslator(prefix,field,url,wnd)
	{
	var $kf = document.getElementById($form_name);

	set_hidden_field('trans_prefix', prefix);
	set_hidden_field('trans_field', field);
	set_hidden_field('events[trans]', 'OnLoad');

	var $regex = new RegExp('(.)\?env=' + document.getElementById('sid').value + '-(.?):(.*)');
	var $t = $regex.exec(url)[2];
	$kf.target = wnd;
	submit_event(prefix,'',$t,url);
	}

	function openSelector($prefix, $url, $dst_field, $window_size, $event)
	{
	var $kf = document.getElementById($form_name);
	var $regex = new RegExp('(.)\?env=' + document.getElementById('sid').value + '-(.?):(m[^:]+)');
	$regex = $regex.exec($url);

	var $t = $regex[2];
	var $window_name = 'select_'+$t.replace(/(\/\|-)/g, '_');
	set_hidden_field('return_m', $regex[3]);

	if (!isset($window_size)) $window_size = '750x400';

	$window_size = $window_size.split('x');

	if (!isset($event)) $event = '';
	processHooks('openSelector', hBEFORE);

	var $prev_action = $kf.action;
	var $prev_opener = get_hidden_field('m_opener');

	set_hidden_field('m_opener', 'p');
	set_hidden_field('main_prefix', $prefix);
	set_hidden_field('dst_field', $dst_field);
	set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done

	openwin('', $window_name, $window_size[0], $window_size[1]);
	$kf.action = $url;
	$kf.target = $window_name;

	submit_event($prefix, $event, $t);

	processHooks('openSelector', hAFTER);
	$kf.action = $prev_action;
	set_hidden_field('m_opener', $prev_opener);
	}

	function openwin($url,$name,$width,$height)
	{
	var $window_params = 'width='+$width+',height='+$height+',status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no';
	return window.open($url,$name,$window_params);
	}

	function opener_action(new_action)
	{
	set_hidden_field('m_opener', new_action);
	}

	function std_precreate_item(prefix_special, edit_template)
	{
	opener_action('d');
	set_hidden_field(prefix_special+'_mode', 't');
	submit_event(prefix_special,'OnPreCreate', edit_template)
	}

	function std_new_item(prefix_special, edit_template)
	{
	opener_action('d');
	submit_event(prefix_special,'OnNew', edit_template)
	}

	function std_edit_item(prefix_special, edit_template)
	{
	opener_action('d');
	set_hidden_field(prefix_special+'_mode', 't');
	submit_event(prefix_special,'OnEdit',edit_template)
	}

	function std_edit_temp_item(prefix_special, edit_template)
	{
	opener_action('d');
	submit_event(prefix_special,'',edit_template)
	}

	function std_delete_items(prefix_special)
	{
	if (inpConfirm('Are you sure you want to delete selected items?'))
	submit_event(prefix_special,'OnMassDelete')
	}

	// sets hidden field value
	// if the field does not exist - creates it
	function set_hidden_field($field_id, $value)
	-{
	-// alert('form: '+$form_name);
	-
	+{
	var $kf = document.getElementById($form_name);
	var $field = $kf.elements[$field_id];
	- if($field)
	- {
	+ if ($field) {
	$field.value = $value;
	return true;
	}

	$field = document.createElement('INPUT');
	$field.type = 'hidden';
	$field.name = $field_id;
	$field.id = $field_id;
	$field.value = $value;

	$kf.appendChild($field);
	return false;
	}

	+// sets hidden field value
	+// if the field does not exist - creates it
	+function setInnerHTML($field_id, $value)
	+{
	+ var $element = document.getElementById($field_id);
	+ if (!$element) return false;
	+ $element.innerHTML = $value;
	+}
	+
	function get_hidden_field($field)
	{
	var $kf = document.getElementById($form_name);
	return $kf.elements[$field] ? $kf.elements[$field].value : false;
	}

	function search($prefix_special, $grid_name)
	{
	set_hidden_field('grid_name', $grid_name);
	submit_event($prefix_special,'OnSearch');
	}

	function search_reset($prefix_special, $grid_name)
	{
	set_hidden_field('grid_name', $grid_name);
	submit_event($prefix_special,'OnSearchReset');
	}

	function search_keydown($event)
	{
	if(!$event && window.event) $event = window.event;
	if($event.keyCode == 13)
	{
	var $prefix_special = this.getAttribute('PrefixSpecial');
	var $grid = this.getAttribute('Grid');
	search($prefix_special,$grid);
	}
	}

	function getRealLeft(el)
	{
	xPos = el.offsetLeft;
	tempEl = el.offsetParent;
	while (tempEl != null)
	{
	xPos += tempEl.offsetLeft;
	tempEl = tempEl.offsetParent;
	}
	return xPos;
	}

	function getRealTop(el)
	{
	yPos = el.offsetTop;
	tempEl = el.offsetParent;
	while (tempEl != null)
	{
	yPos += tempEl.offsetTop;
	tempEl = tempEl.offsetParent;
	}
	return yPos;
	}

	function show_viewmenu($toolbar, $button_id)
	{
	var $img = $toolbar.GetButtonImage($button_id);
	var $pos_x = getRealLeft($img) - ((document.all) ? 6 : -2);
	var $pos_y = getRealTop($img) + 32;

	var $prefix_special = '';
	window.triedToWriteMenus = false;

	if($ViewMenus.length == 1)
	{
	$prefix_special = $ViewMenus[$ViewMenus.length-1];
	$fw_menus[$prefix_special+'_view_menu']();
	$Menus[$prefix_special+'_view_menu'].writeMenus('MenuContainers['+$prefix_special+']');
	window.FW_showMenu($Menus[$prefix_special+'_view_menu'], $pos_x, $pos_y);
	}
	else
	{
	// prepare menus
	for(var $i in $ViewMenus)
	{
	$prefix_special = $ViewMenus[$i];
	$fw_menus[$prefix_special+'_view_menu']();
	}
	$Menus['mixed'] = new Menu('ViewMenu_mixed');

	// merge menus into new one
	for(var $i in $ViewMenus)
	{
	$prefix_special = $ViewMenus[$i];
	$Menus['mixed'].addMenuItem( $Menus[$prefix_special+'_view_menu'] );
	}

	$Menus['mixed'].writeMenus('MenuContainers[mixed]');
	window.FW_showMenu($Menus['mixed'], $pos_x, $pos_y);
	}
	}

	function set_window_title($title)
	{
	var $window = window;
	if($window.parent) $window = $window.parent;
	$window.document.title = (main_title.length ? main_title + ' - ' : '') + $title;
	}

	function set_filter($prefix_special, $filter_id, $filter_value)
	{
	set_hidden_field('filter_id',$filter_id);
	set_hidden_field('filter_value',$filter_value);
	submit_event($prefix_special,'OnSetFilter');
	}

	function filters_remove_all($prefix_special)
	{
	submit_event($prefix_special,'OnRemoveFilters');
	}

	function filters_apply_all($prefix_special)
	{
	submit_event($prefix_special,'OnApplyFilters');
	}

	function RemoveTranslationLink($string, $escaped)
	{
	if (!isset($escaped)) $escaped = true;

	if ($escaped) {
	return $string.match(/<a href="(.)">(.)<\/a>/) ? RegExp.$2 : $string;
	}
	else {
	return $string.match(/<a href="(.)">(.)<\/a>/) ? RegExp.$2 : $string;
	}
	}

	function redirect($url)
	{
	window.location.href = $url;
	}

	function update_checkbox_options($cb_mask, $hidden_id)
	{
	var $kf = document.getElementById($form_name);
	var $tmp = '';
	for (var i = 0; i < $kf.elements.length; i++)
	{
	if ( $kf.elements[i].id.match($cb_mask) )
	{
	if ($kf.elements[i].checked) $tmp += '\|'+$kf.elements[i].value;
	}
	}
	if($tmp.length > 0) $tmp += '\|';
	document.getElementById($hidden_id).value = $tmp.replace(/,$/, '');
	}

	// related to lists operations (moving)



	function move_selected($from_list, $to_list)
	{
	if (typeof($from_list) != 'object') $from_list = document.getElementById($from_list);
	if (typeof($to_list) != 'object') $to_list = document.getElementById($to_list);

	if (has_selected_options($from_list))
	{
	var $from_array = select_to_array($from_list);
	var $to_array = select_to_array($to_list);
	var $new_from = Array();
	var $cur = null;

	for (var $i = 0; $i < $from_array.length; $i++)
	{
	$cur = $from_array[$i];
	if ($cur[2]) // If selected - add to To array
	{
	$to_array[$to_array.length] = $cur;
	}
	else //Else - keep in new From
	{
	$new_from[$new_from.length] = $cur;
	}
	}

	$from_list = array_to_select($new_from, $from_list);
	$to_list = array_to_select($to_array, $to_list);
	}
	else
	{
	alert('Please select items to perform moving!');
	}
	}

	function select_to_array($aSelect)
	{
	var $an_array = new Array();
	var $cur = null;

	for (var $i = 0; $i < $aSelect.length; $i++)
	{
	$cur = $aSelect.options[$i];
	$an_array[$an_array.length] = new Array($cur.text, $cur.value, $cur.selected);
	}
	return $an_array;
	}

	function array_to_select($anArray, $aSelect)
	{
	var $initial_length = $aSelect.length;
	for (var $i = $initial_length - 1; $i >= 0; $i--)
	{
	$aSelect.options[$i] = null;
	}

	for (var $i = 0; $i < $anArray.length; $i++)
	{
	$cur = $anArray[$i];
	$aSelect.options[$aSelect.length] = new Option($cur[0], $cur[1]);
	}
	}

	function select_compare($a, $b)
	{
	if ($a[0] < $b[0])
	return -1;
	if ($a[0] > $b[0])
	return 1;
	return 0;
	}

	function select_to_string($aSelect)
	{
	var $result = '';
	var $cur = null;

	if (typeof($aSelect) != 'object') $aSelect = document.getElementById($aSelect);

	for (var $i = 0; $i < $aSelect.length; $i++)
	{
	$result += $aSelect.options[$i].value + '\|';
	}

	return $result.length ? '\|' + $result : '';
	}

	function selected_to_string($aSelect)
	{
	var $result = '';
	var $cur = null;

	if (typeof($aSelect) != 'object') $aSelect = document.getElementById($aSelect);

	for (var $i = 0; $i < $aSelect.length; $i++)
	{
	$cur = $aSelect.options[$i];
	if ($cur.selected && $cur.value != '')
	{
	$result += $cur.value + '\|';
	}
	}

	return $result.length ? '\|' + $result : '';
	}

	function string_to_selected($str, $aSelect)
	{
	var $cur = null;
	for (var $i = 0; i < $aSelect.length; $i++)
	{
	$cur = $aSelect.options[$i];
	$aSelect.options[$i].selected = $str.match(',' + $cur.value + ',') ? true : false;
	}
	}

	function set_selected($selected_options, $aSelect)
	{
	if (!$selected_options.length) return false;

	for (var $i = 0; $i < $aSelect.length; $i++)
	{
	for (var $k = 0; $k < $selected_options.length; $k++)
	{
	if ($aSelect.options[$i].value == $selected_options[$k])
	{
	$aSelect.options[$i].selected = true;
	}
	}
	}
	}

	function get_selected_count($theList)
	{
	var $count = 0;
	var $cur = null;
	for (var $i = 0; $i < $theList.length; $i++)
	{
	$cur = $theList.options[$i];
	if ($cur.selected) $count++;
	}
	return $count;
	}

	function get_selected_index($aSelect, $typeIndex)
	{
	var $index = 0;
	for (var $i = 0; $i < $aSelect.length; $i++)
	{
	if ($aSelect.options[$i].selected)
	{
	$index = $i;
	if ($typeIndex == 'firstSelected') break;
	}
	}
	return $index;
	}

	function has_selected_options($theList)
	{
	var $ret = false;
	var $cur = null;

	for (var $i = 0; $i < $theList.length; $i++)
	{
	$cur = $theList.options[$i];
	if ($cur.selected) $ret = true;
	}
	return $ret;
	}

	function select_sort($aSelect)
	{
	if (typeof($aSelect) != 'object') $aSelect = document.getElementById($aSelect);

	var $to_array = select_to_array($aSelect);
	$to_array.sort(select_compare);
	array_to_select($to_array, $aSelect);
	}

	function move_options_up($aSelect, $interval)
	{
	if (typeof($aSelect) != 'object') $aSelect = document.getElementById($aSelect);

	if (has_selected_options($aSelect))
	{
	var $selected_options = Array();
	var $first_selected = get_selected_index($aSelect, 'firstSelected');

	for (var $i = 0; $i < $aSelect.length; $i++)
	{
	if ($aSelect.options[$i].selected && ($first_selected > 0) )
	{
	swap_options($aSelect, $i, $i - $interval);
	$selected_options[$selected_options.length] = $aSelect.options[$i - $interval].value;
	}
	else if ($first_selected == 0)
	{
	//alert('Begin of list');
	break;
	}
	}
	set_selected($selected_options, $aSelect);
	}
	else
	{
	//alert('Check items from moving');
	}
	}

	function move_options_down($aSelect, $interval)
	{
	if (typeof($aSelect) != 'object') $aSelect = document.getElementById($aSelect);

	if (has_selected_options($aSelect))
	{
	var $last_selected = get_selected_index($aSelect, 'lastSelected');
	var $selected_options = Array();

	for (var $i = $aSelect.length - 1; $i >= 0; $i--)
	{
	if ($aSelect.options[$i].selected && ($aSelect.length - ($last_selected + 1) > 0))
	{
	swap_options($aSelect, $i, $i + $interval);
	$selected_options[$selected_options.length] = $aSelect.options[$i + $interval].value;
	}
	else if ($last_selected + 1 == $aSelect.length)
	{
	//alert('End of list');
	break;
	}
	}
	set_selected($selected_options, $aSelect);
	}
	else
	{
	//alert('Check items from moving');
	}
	}

	function swap_options($aSelect, $src_num, $dst_num)
	{
	var $src_html = $aSelect.options[$src_num].innerHTML;
	var $dst_html = $aSelect.options[$dst_num].innerHTML;
	var $src_value = $aSelect.options[$src_num].value;
	var $dst_value = $aSelect.options[$dst_num].value;

	var $src_option = document.createElement('OPTION');
	var $dst_option = document.createElement('OPTION');

	$aSelect.remove($src_num);
	$aSelect.options.add($dst_option, $src_num);
	$dst_option.innerText = $dst_html;
	$dst_option.value = $dst_value;
	$dst_option.innerHTML = $dst_html;

	$aSelect.remove($dst_num);
	$aSelect.options.add($src_option, $dst_num);
	$src_option.innerText = $src_html;
	$src_option.value = $src_value;
	$src_option.innerHTML = $src_html;
	}

	function getXMLHTTPObject(content_type)
	{
	if (!isset(content_type)) content_type = 'text/plain';
	var http_request = false;
	if (window.XMLHttpRequest) { // Mozilla, Safari,...
	http_request = new XMLHttpRequest();
	if (http_request.overrideMimeType) {
	http_request.overrideMimeType(content_type);
	// See note below about this line
	}
	} else if (window.ActiveXObject) { // IE
	try {
	http_request = new ActiveXObject("Msxml2.XMLHTTP");
	} catch (e) {
	try {
	http_request = new ActiveXObject("Microsoft.XMLHTTP");
	} catch (e) {}
	}
	}
	return http_request;
	}

	function str_repeat($symbol, $count)
	{
	var $i = 0;
	var $ret = '';
	while($i < $count) {
	$ret += $symbol;
	$i++;
	}
	return $ret;
	}

	function getDocumentFromXML(xml)
	{
	if (window.ActiveXObject) {
	var doc = new ActiveXObject("Microsoft.XMLDOM");
	doc.async=false;
	doc.loadXML(xml);
	}
	else {
	var parser = new DOMParser();
	var doc = parser.parseFromString(xml,"text/xml");
	}
	return doc;
	}


	function addEvent(el, evname, func) {
	if (is.ie) {
	el.attachEvent("on" + evname, func);
	} else {
	el.addEventListener(evname, func, true);
	}
	};

	function set_persistant_var($var_name, $var_value, $t, $form_action)
	{
	set_hidden_field('field', $var_name);
	set_hidden_field('value', $var_value);
	submit_event('u', 'OnSetPersistantVariable', $t, $form_action);
	}

	/*functionremoveEvent(el, evname, func) {
	if (Calendar.is_ie) {
	el.detachEvent("on" + evname, func);
	} else {
	el.removeEventListener(evname, func, true);
	}
	};*/
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/incs/script.js
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.24
	\ No newline at end of property
	+1.25
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/header.tpl
	===================================================================
	--- trunk/kernel/admin_templates/incs/header.tpl (revision 4995)
	+++ trunk/kernel/admin_templates/incs/header.tpl (revision 4996)
	@@ -1,51 +1,54 @@
	<!--DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">-->
	<html>
	<head>
	<title>In-Portal :: Administration Panel</title>

	<meta http-equiv="content-type" content="text/html; charset=<inp2:lang_GetCharset/>">
	<meta name="keywords" content="...">
	<meta name="description" content="...">
	<meta name="robots" content="all">
	<meta name="copyright" content="Copyright ® 2006 Test, Inc">
	<meta name="author" content="Intechnic Inc.">

	<inp2:m_base_ref/>

	<link rel="icon" href="img/favicon.ico" type="image/x-icon" />
	<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
	<link rel="stylesheet" rev="stylesheet" href="incs/style.css" type="text/css" />

	<script language="javascript" src="incs/is.js"></script>
	<script language="javascript" src="incs/script.js"></script>
	<script language="javascript" src="incs/in-portal.js"></script>
	<script language="javascript" src="incs/toolbar.js"></script>
	<script language="javascript" src="incs/grid.js"></script>
	<script language="javascript" src="incs/tabs.js"></script>
	<script language="javascript">
	var t = '<inp2:m_get param="t"/>';
	var popups = '1';
	var multiple_windows = '1';
	var main_title = '<inp2:m_GetConfig var="Site_Name" escape="1"/>';
	var tpl_changed = 0;
	var base_url = '<inp2:m_BaseURL/>';

	var img_path = "img/";

	</script>
	</head>

	<inp2:m_include t="incs/blocks"/>

	<inp2:m_include t="incs/in-portal"/>

	<inp2:m_if check="m_ParamEquals" name="nobody" value="yes" inverse="inverse">
	<body topmargin="0" leftmargin="0" marginwidth="0" marginheight="0" <inp2:m_get param="body_properties"/>>
	</inp2:m_if>

	-<inp2:m_ParseBlock name="kernel_form"/>
	+<inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
	+ <inp2:m_ParseBlock name="kernel_form"/>
	+</inp2:m_if>
	+
	<inp2:m_if check="m_IsDebugMode">
	<inp2:m_if check="adm_TemplateMatches" templates="head,tree" inverse="inverse">
	<input type="button" class="button" value="Reload Frame" onclick="self.location.reload();" />  <input type="button" class="button" value="Show Debugger" onclick="$Debugger.Toggle();" />
	</inp2:m_if>
	</inp2:m_if>
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/incs/header.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.14
	\ No newline at end of property
	+1.15
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/style.css
	===================================================================
	--- trunk/kernel/admin_templates/incs/style.css (revision 4995)
	+++ trunk/kernel/admin_templates/incs/style.css (revision 4996)
	@@ -1,543 +1,570 @@
	/* --- In-Portal --- */


	.head_version {
	font-family: verdana, arial;
	font-size: 10px;
	font-weight: normal;
	color: white;
	padding-right: 5px;
	text-decoration: none;
	}

	body {
	font-family: Verdana, Arial, Helvetica, Sans-serif;
	font-size: 12px;
	color: #000000;
	scrollbar-3dlight-color: #333333;
	scrollbar-arrow-color: #ffffff;
	scrollbar-track-color: #88d2f8;
	scrollbar-darkshadow-color: #333333;
	scrollbar-highlight-color: #009ffd;
	scrollbar-shadow-color: #009ffd;
	scrollbar-face-color: #009ffd;
	overflow-x: auto; overflow-y: auto;
	}

	A {
	color: #006699;
	text-decoration: none;
	}

	A:hover {
	color: #009ff0;
	text-decoration: none;
	}

	TD {
	font-family: verdana,helvetica;
	font-size: 10pt;
	text-decoration: none;
	}

	form {
	display: inline;
	}

	.text {
	font-family: verdana, arial;
	font-size: 12px;
	font-weight: normal;
	text-decoration: none;
	}

	.tablenav {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	color: #FFFFFF;

	text-decoration: none;
	background-color: #73C4F5;
	background: url(../img/tabnav_back.gif) repeat-x;
	}

	.tablenav_link {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	color: #FFFFFF;
	text-decoration: none;
	}

	.header_left_bg {
	background: url(../img/tabnav_left.gif) no-repeat;
	}

	.tablenav_link:hover {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	color: #ffcc00;
	text-decoration: none;
	}

	.tableborder {
	font-family: arial, helvetica, sans-serif;
	font-size: 10pt;
	border: 1px solid #000000;
	border-top-width: 0px;
	border-collapse: collapse;
	}

	.tableborder_full, .tableborder_full_kernel {
	font-family: Arial, Helvetica, sans-serif;
	font-size: 10pt;
	border: 1px solid #000000;
	}


	.button {
	font-family: arial, verdana;
	font-size: 12px;
	font-weight: normal;
	color: #000000;
	background: url(../img/button_back.gif) #f9eeae repeat-x;
	text-decoration: none;
	}

	.button-disabled {
	font-family: arial, verdana;
	font-size: 12px;
	font-weight: normal;
	color: #676767;
	background: url(../img/button_back_disabled.gif) #f9eeae repeat-x;
	text-decoration: none;
	}

	.hint_red {
	font-family: Arial, Helvetica, sans-serif;
	font-size: 10px;
	font-style: normal;
	color: #FF0000;
	/* background-color: #F0F1EB; */
	}

	.tree_head {
	font-family: verdana, arial;
	font-size: 10px;
	font-weight: bold;
	color: #FFFFFF;
	text-decoration: none;
	}

	.admintitle {
	font-family: verdana, arial;
	font-size: 20px;
	font-weight: bold;
	color: #009FF0;
	text-decoration: none;
	}

	.table_border_notop, .table_border_nobottom {
	background-color: #F0F1EB;
	border: 1px solid #000000;
	}

	.table_border_notop {
	border-top-width: 0px;
	}

	.table_border_nobottom {
	border-bottom-width: 0px;
	}

	.pagination_bar {
	background-color: #D7D7D7;
	border: 1px solid #000000;
	border-top-width: 0px;
	}

	/* Categories */

	.priority {
	color: #FF0000;
	padding-left: 1px;
	padding-right: 1px;
	font-size: 11px;
	}

	.cat_no, .cat_desc, .cat_new, .cat_pick, .cats_stats {
	font-family: arial, verdana, sans-serif;
	}

	.cat_no {
	font-size: 10px;
	color: #707070;
	}

	.cat_desc {
	font-size: 9pt;
	color: #000000;
	}

	.cat_new {
	font-size: 12px;
	vertical-align: super;
	color: blue;
	}

	.cat_pick {
	font-size: 12px;
	vertical-align: super;
	color: #009900;
	}

	.cats_stats {
	font-size: 11px;
	color: #707070;
	}

	/* Links */

	.link, .link:hover, .link_desc, .link_detail {
	font-family: arial, helvetica, sans-serif;
	}

	.link {
	font-size: 9pt;
	color: #1F569A;
	}

	.link:hover {
	font-size: 9pt;
	color: #009FF0;
	}

	.link_desc {
	font-size: 9pt;
	color: #000000;
	}

	.link_detail {
	font-size: 11px;
	color: #707070;
	}

	.link_rate, .link_review, .link_modify, .link_div, .link_new, .link_top, .link_pop, .link_pick {
	font-family: arial, helvetica, sans-serif;
	font-size: 12px;
	}

	.link_rate, .link_review, .link_modify, .link_div {
	text-decoration: none;
	}

	.link_rate { color: #006600; }
	.link_review { color: #A27900; }
	.link_modify { color: #800000; }
	.link_div { color: #000000; }

	.link_new, .link_top, .link_pop, .link_pick {
	vertical-align: super;
	}

	.link_new { color: #0000FF; }
	.link_top { color: #FF0000; }
	.link_pop { color: FFA500; }
	.link_pick { color: #009900; }

	/* ToolBar */

	.divider {
	BACKGROUND-COLOR: #999999
	}

	.toolbar {
	font-family: Arial, Helvetica, sans-serif;
	font-size: 10pt;
	border: 1px solid #000000;
	border-width: 0 1 1 1;
	background-color: #F0F1EB;
	}

	.current_page {
	font-family: verdana;
	font-size: 12px;
	font-weight: bold;
	background-color: #C4C4C4;
	padding-left: 1px;
	padding-right: 1px;
	}

	.nav_url {
	font-family: verdana;
	font-size: 12px;
	font-weight: bold;
	color: #1F569A;
	}

	.nav_arrow {
	font-family: verdana;
	font-size: 12px;
	font-weight: normal;
	color: #1F569A;
	padding-left: 3px;
	padding-right: 3px;
	}

	.nav_current_item {
	font-family: verdana;
	font-size: 12px;
	font-weight: bold;
	color: #666666;
	}

	/* Edit forms */

	.hint {
	font-family: arial, helvetica, sans-serif;
	font-size: 12px;
	font-style: normal;
	color: #666666;
	}

	.table_color1, .table_color2 {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: normal;
	color: #000000;
	text-decoration: none;
	}

	.table_color1 { background-color: #F6F6F6; }
	.table_color2 { background-color: #EBEBEB; }


	.table_white, .table_white_selected {
	font-family: verdana, arial;
	font-weight: normal;
	font-size: 14px;
	color: #000000;
	text-decoration: none;
	padding-top: 0px;
	padding-bottom: 0px;
	}

	.table_white {
	background-color: #FFFFFF;
	}

	.table_white_selected {
	background-color: #C6D6EF;
	}

	.subsectiontitle {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	- color: #FFFFFF;
	background-color: #999999;
	text-decoration: none;
	- height: 24px;
	+
	+ color: #FFFFFF;
	+
	}

	.subsectiontitle:hover {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	- color: #FFCC00;
	background-color: #999999;
	text-decoration: none;
	+
	+ color: #FFCC00;
	}

	.error {
	font-family: arial, helvetica, sans-serif;
	font-weight: bold;
	font-size: 9pt;
	color: #FF0000;
	}

	/* Tabs */

	.tab_border {
	border: 1px solid #000000;
	border-width: 1 0 0 0;
	}

	.tab, .tab:hover {
	font-family: verdana, arial, helvetica;
	font-size: 12px;
	font-weight: bold;
	color: #000000;
	text-decoration: none;
	}

	.tab2, .tab2:hover {
	font-family: verdana, arial, helvetica;
	font-size: 12px;
	font-weight: bold;
	text-decoration: none;
	}

	.tab2 { color: #FFFFFF; }
	.tab2:hover { color: #000000; }

	/* Item DIVS */

	.selected_div { background-color: #C6D6EF; }
	.notselected_div { background-color: #FFFFFF; }

	/* Item tabs */


	.itemtab_active {
	background: url("../img/itemtabs/tab_active.gif") #eee repeat-x;
	}

	.itemtab_inactive {
	background: url("../img/itemtabs/tab_inactive.gif") #F9EEAE repeat-x;
	}


	/* Grids */

	.columntitle, .columntitle:hover {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	background-color: #999999;
	text-decoration: none;
	}

	.columntitle { color: #FFFFFF; }
	.columntitle:hover { color: #FFCC00; }

	.columntitle_small, .columntitle_small:hover {
	font-family: verdana, arial;
	font-size: 12px;
	font-weight: bold;
	background-color: #999999;
	text-decoration: none;
	}

	.columntitle_small { color: #FFFFFF; }
	.columntitle_small:hover { color: #FFCC00; }

	/* ----------------------------- */

	.section_header_bg {
	background: url(../img/logo_bg.gif) no-repeat top right;
	}

	.small {
	font-size: 9px;
	font-family: Verdana, Arial, Helvetica, sans-serif;
	}

	/* order preview & preview_print styles */

	.order_print_defaults TD,
	.order_preview_header,
	.order_preview_header TD,
	.order_print_preview_header TD,
	.order_preview_field_name,
	.order-totals-name,
	.arial2r,
	.orders_print_flat_table TD {
	font-family: Arial;
	font-size: 10pt;
	}

	.order_preview_header, .order_preview_header TD, .order_print_preview_header TD {
	background-color: #C9E9FE;
	font-weight: bold;
	}

	.order_print_preview_header TD {
	background-color: #FFFFFF;
	}

	.order_preview_field_name {
	font-weight: bold;
	padding: 2px 4px 2px 4px;
	}

	.order-totals-name {
	font-style: normal;
	}

	.border1 {
	border: 1px solid #111111;
	}

	.arial2r {
	color: #602830;
	font-weight: bold;
	}

	.orders_flat_table, .orders_print_flat_table {
	border-collapse: collapse;
	margin: 5px;
	}

	.orders_flat_table TD {
	padding: 2px 5px 2px 5px;
	border: 1px solid #444444;
	}

	.orders_print_flat_table TD {
	border: 1px solid #000000;
	padding: 2px 5px 2px 5px;
	}

	.help_box {
	padding: 5px 10px 5px 10px;
	}

	.progress_bar
	{
	background: url(../img/progress_bar_segment.gif);
	}

	.grid_id_cell TD {
	padding-right: 2px;
	}

	.transparent {
	filter: alpha(opacity=50);
	-moz-opacity: .5;
	opacity: .5;
	}

	.none_transparent {

	}

	.subitem_icon {
	vertical-align: top;
	padding-top: 0px;
	text-align: center;
	width: 28px;
	}

	.subitem_description {
	vertical-align: middle;
	}

	.dLink, .dLink:hover {
	display: block;
	margin-bottom: 5px;
	font-family: Verdana;
	font-size: 13px;
	font-weight: bold;
	color: #2C73CB;
	}

	.dLink {
	text-decoration: none;
	}

	.dLink:hover {
	text-decoration: underline;
	}
	+
	+a.config-header, a.config-header:hover {
	+ color: #FFFFFF;
	+ font-size: 11px;
	+}
	+
	+.catalog-tab-left {
	+ background: url(../img/itemtabs/tab_left.gif) top left no-repeat;
	+}
	+
	+.catalog-tab-middle {
	+ background: url(../img/itemtabs/tab_middle.gif) top left repeat-x;
	+}
	+
	+.catalog-tab-right {
	+ background: url(../img/itemtabs/tab_right.gif) top right no-repeat;
	+}
	+
	+.catalog-tab-selected td {
	+ background-color: #E0E0DA;
	+}
	+
	+.catalog-tab-unselected td {
	+ background-color: #F0F1EB;
	+}

	Property changes on: trunk/kernel/admin_templates/incs/style.css
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.12
	\ No newline at end of property
	+1.13
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/footer.tpl
	===================================================================
	--- trunk/kernel/admin_templates/incs/footer.tpl (revision 4995)
	+++ trunk/kernel/admin_templates/incs/footer.tpl (revision 4996)
	@@ -1,9 +1,11 @@
	<inp2:m_if check="adm_TemplateMatches" templates="head,tree" inverse="inverse">
	<br /><br />
	</inp2:m_if>

	<inp2:adm_AfterScript/>

	-<inp2:m_ParseBlock name="kernel_form_end"/>
	+<inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
	+ <inp2:m_ParseBlock name="kernel_form_end"/>
	+</inp2:m_if>
	</body>
	</html>
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/incs/footer.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.6
	\ No newline at end of property
	+1.7
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/ajax.js
	===================================================================
	--- trunk/kernel/admin_templates/incs/ajax.js (nonexistent)
	+++ trunk/kernel/admin_templates/incs/ajax.js (revision 4996)
	@@ -0,0 +1,159 @@
	+function Request() {}
	+
	+Request.timeout = 5000; //5 seconds
	+Request.method = 'GET';
	+Request.params = null;
	+
	+Request.makeRequest = function(p_url, p_busyReq, p_progId, p_successCallBack, p_errorCallBack, p_pass) {
	+ //p_url: the web service url
	+ //p_busyReq: is a request for this object currently in progress?
	+ //p_progId: element id where progress HTML should be shown
	+ //p_successCallBack: callback function for successful response
	+ //p_errorCallBack: callback function for erroneous response
	+ //p_pass: string of params to pass to callback functions
	+ if (p_busyReq) return;
	+ var req = Request.getRequest();
	+ if (req != null) {
	+ p_busyReq = true;
	+ Request.showProgress(p_progId);
	+ req.onreadystatechange = function() {
	+ if (req.readyState == 4) {
	+ p_busyReq = false;
	+ window.clearTimeout(toId);
	+ if (req.status == 200) {
	+ p_successCallBack(req,p_pass);
	+ } else {
	+ p_errorCallBack(req,p_pass);
	+ }
	+ }
	+ }
	+ req.open(Request.method, p_url, true);
	+ if (Request.method == 'POST') {
	+ req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
	+ req.setRequestHeader("referer", p_url);
	+ req.send(Request.params);
	+ Request.method = 'GET'; // restore method back to GET
	+ }
	+ else {
	+ req.setRequestHeader('If-Modified-Since', 'Sat, 1 Jan 2000 00:00:00 GMT');
	+ req.send(null);
	+ }
	+
	+ var toId = window.setTimeout( function() {if (p_busyReq) req.abort();}, Request.timeout );
	+ }
	+}
	+
	+Request.getRequest = function() {
	+ var xmlHttp;
	+ try { xmlHttp = new ActiveXObject('MSXML2.XMLHTTP'); return xmlHttp; } catch (e) {}
	+ try { xmlHttp = new ActiveXObject('Microsoft.XMLHTTP'); return xmlHttp; } catch (e) {}
	+ try { xmlHttp = new XMLHttpRequest(); return xmlHttp; } catch(e) {}
	+ return null;
	+}
	+
	+Request.showProgress = function(p_id) {
	+ if (p_id != "") document.getElementById(p_id).innerHTML = Request.getProgressHtml();
	+}
	+
	+Request.getProgressHtml = function() {
	+ return "<p class='progress'>" + _progressText + "<br /><img src='img/ajax_progress.gif' align='absmiddle' width='100' height='7' alt='" + _progressText + "'/></p>";
	+}
	+
	+Request.getErrorHtml = function(p_req) {
	+ //TODO: implement accepted way to handle request error
	+ return "<p>" + "(" + p_req.status + ") " + p_req.statusText + "</p>"
	+}
	+
	+
	+Request.serializeForm = function(theform) {
	+ if (typeof(theform) == 'string') {
	+ theform = document.getElementById(theform);
	+ }
	+
	+ var els = theform.elements;
	+ var len = els.length;
	+ var queryString = '';
	+
	+ Request.addField = function(name, value) {
	+ if (queryString.length > 0) queryString += '&';
	+ queryString += encodeURIComponent(name) + '=' + encodeURIComponent(value);
	+ };
	+
	+ for (var i = 0; i<len; i++) {
	+ var el = els[i];
	+ if (el.disabled) continue;
	+
	+ switch(el.type) {
	+ case 'text':
	+ case 'password':
	+ case 'hidden':
	+ case 'textarea':
	+ Request.addField(el.name, el.value);
	+ break;
	+
	+ case 'select-one':
	+ if (el.selectedIndex >= 0) {
	+ Request.addField(el.name, el.options[el.selectedIndex].value);
	+ }
	+ break;
	+
	+ case 'select-multiple':
	+ for (var j = 0; j < el.options.length; j++) {
	+ if (!el.options[j].selected) continue;
	+ Request.addField(el.name, el.options[j].value);
	+ }
	+ break;
	+
	+ case 'checkbox':
	+ case 'radio':
	+ if (!el.checked) continue;
	+ Request.addField(el.name,el.value);
	+ break;
	+ }
	+ }
	+ return queryString;
	+};
	+// Catalog Related
	+
	+function Catalog() {}
	+Catalog.BusyRequest = false;
	+
	+Catalog.submit_kernel_form = function($form_name, $result_div) {
	+ var $kf = document.getElementById($form_name);
	+ set_hidden_field('ajax', 'yes');
	+
	+ Request.params = Request.serializeForm($kf);
	+ Request.method = $kf.method.toUpperCase();
	+
	+ Request.makeRequest($kf.action, Catalog.BusyRequest, $result_div, Catalog.successCallback, Catalog.errorCallback, $result_div);
	+};
	+
	+Catalog.successCallback = function($request, $params) {
	+ var $text = $request.responseText;
	+ $params = $params.split(',');
	+ var $js_end = $text.indexOf($separator);
	+ if ($js_end != -1) {
	+ document.getElementById($params[0]).innerHTML = $text.substring($js_end + $separator.length);
	+ eval($text.substring(0, $js_end));
	+
	+ }
	+ else {
	+ document.getElementById($params[0]).innerHTML = $text;
	+ }
	+
	+ if (isset($Debugger)) $Debugger.Clear();
	+}
	+
	+Catalog.errorCallback = function($request, $params) {
	+ alert('AJAX ERROR: ' + Request.getErrorHtml($request));
	+}
	+
	+Catalog.submit_event = function($prefix_special, $event, $t, $result_div, $source_form) {
	+ // set form name first, because set_hidden_field uses it
	+ if (isset($source_form)) $form_name = $source_form;
	+
	+ if (isset($event)) set_hidden_field('events['+$prefix_special+']', $event);
	+ if (isset($t)) set_hidden_field('t', $t);
	+
	+ Catalog.submit_kernel_form($form_name, $result_div);
	+}
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/incs/ajax.js
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
	===================================================================
	--- trunk/kernel/admin_templates/incs/form_blocks.tpl (revision 4995)
	+++ trunk/kernel/admin_templates/incs/form_blocks.tpl (revision 4996)
	@@ -1,318 +1,318 @@
	<inp2:m_block name="section_header"/>
	<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
	<inp2:m_RenderElement name="section_header_new" pass_params="true"/>
	<inp2:m_else />
	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr class="section_header_bg">
	<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
	<img width="46" height="46" src="img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>"> <inp2:adm_GetSectionTitle phrase="$title"/>
	</td>
	</tr>
	</table>
	</inp2:m_if>
	<inp2:m_blockend/>

	<inp2:m_DefineElement name="section_header_new" module="#session#">
	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right;">
	<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
	<img width="46" height="46" src="<inp2:ModulePath/>img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>"> <inp2:adm_GetSectionTitle phrase="$title"/>
	</td>
	</tr>
	</table>
	</inp2:m_DefineElement>

	<inp2:m_block name="blue_bar" module="" icon=""/>
	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
	<tr>
	<td class="header_left_bg" nowrap width="80%" valign="middle">
	<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100"/></span>
	</td>
	<td align="right" class="tablenav" width="20%" valign="middle">
	<script>
	var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
	$help_url = $help_url.replace(/#/g, '%23');
	- set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false) );
	+ set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
	</script>
	<a href="javascript: OpenHelp($help_url);">
	<img src="img/blue_bar_help.gif" border="0">
	</a>
	</td>
	</tr>
	</table>
	<inp2:m_blockend/>

	<inp2:m_block name="subsection"/>
	<tr class="subsectiontitle">
	<td colspan="3"><inp2:m_phrase label="$title"/></td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_field_caption" subfield="" NamePrefix=""/>
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="text">
	<label for="<inp2:m_param name="NamePrefix"/><inp2:$prefix_InputName field="$field" subfield="$subfield"/>">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/></span><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:
	</label>
	</td>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_label" is_last="" as_label="" currency="" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td valign="top"><span class="text"><inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/></span></td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_id_label"/>
	<inp2:m_if prefix="$prefix" function="FieldEquals" field="$field" value="" inverse="inverse"/>
	<inp2:m_ParseBlock name="inp_label" pass_params="true"/>
	<inp2:m_endif/>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" value="<inp2:$prefix_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
	<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_upload" class="" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<input type="file" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_box_ml" class="" size="" maxlength=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td class="text" valign="top">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
	<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator');" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" format="no_default"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_hidden" db=""/>
	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>">
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_date" class="" is_last=""/>
	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
	<script type="text/javascript" src="incs/calendar.js"></script>
	<inp2:m_set calendar_included="1"/>
	</inp2:m_if>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif"> <span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
	<script type="text/javascript">
	initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
	</script>
	<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="">
	</td>
	<td class="error"><inp2:$prefix_Error field="{$field}_date"/> </td>
	</tr>
	<inp2:m_blockend/>


	<inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
	<script type="text/javascript" src="incs/calendar.js"></script>
	<inp2:m_set calendar_included="1"/>
	</inp2:m_if>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<!-- <input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>"> -->
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
	<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
	<script type="text/javascript">
	initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
	</script>
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>"><span class="small"> (<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_textarea" class="" allow_html="allow_html"/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td class="text" valign="top">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
	<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
	<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:$prefix_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	</inp2:m_if>
	</td>
	<td>
	<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:$prefix_Field field="$field"/></textarea>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>



	<inp2:m_block name="inp_edit_textarea_ml" class=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td class="text" valign="top">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
	<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:$prefix_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator', 1);" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:$prefix_Field field="$field"/></textarea>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_user" class="" is_last="" old_style="0" onkeyup=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
	<inp2:m_if check="m_ParamEquals" name="old_style" value="1">
	<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:$prefix_InputName field="$field"/>');">
	<inp2:m_else/>
	<a href="javascript:openSelector('<inp2:m_param name="prefix"/>', '<inp2:m_t t="user_selector" pass="all,$prefix" escape="1"/>', '<inp2:m_param name="field"/>');">
	</inp2:m_if>
	<img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
	</a>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>


	<inp2:m_block name="inp_option_item"/>
	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_option_phrase"/>
	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_options" is_last="" has_empty="0" empty_value=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
	<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
	<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
	<inp2:m_else/>
	<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
	<inp2:m_endif/>
	</select>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_radio_item"/>
	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_radio_phrase"/>
	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="" use_phrases="1"/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
	<inp2:$prefix_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_phrase" selected="checked" onclick="$onclick" onchange="$onchange" />
	<inp2:m_else />
	<inp2:$prefix_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_item" selected="checked" onclick="$onclick" onchange="$onchange" />
	</inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_checkbox" is_last="" field_class="" onchange=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last" NamePrefix="_cb_"/>
	<td>
	<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>">
	<!--<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));" onchange="<inp2:m_param name="onchange"/>">-->
	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onchange="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));<inp2:m_param name="onchange"/>">
	<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>


	<inp2:m_block name="inp_checkbox_item"/>
	<input type="checkbox" <inp2:m_param name="checked"/> id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="update_checkbox_options(/^<inp2:$prefix_InputName field="$field" as_preg="1"/>_([0-9A-Za-z-]+)/, '<inp2:$prefix_InputName field="$field"/>');"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_checkbox_phrase"/>
	<input type="checkbox" <inp2:m_param name="checked"/> id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="update_checkbox_options(/^<inp2:$prefix_InputName field="$field" as_preg="1"/>_([0-9A-Za-z-]+)/, '<inp2:$prefix_InputName field="$field"/>');"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_checkboxes" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
	<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" hint_label="$hint_label" block="inp_checkbox_phrase" selected="checked"/>
	<inp2:m_else/>
	<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" hint_label="$hint_label" block="inp_checkbox_item" selected="checked"/>
	</inp2:m_if>
	<inp2:m_ParseBlock prefix="$prefix" name="inp_edit_hidden" field="$field"/>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_checkbox_allow_html"/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td colspan="2">
	<label for="_cb_<inp2:m_param name="field"/>"><inp2:m_phrase label="la_enable_html"/></label>
	<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>">
	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:$prefix_Field field="$field" checked="checked"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'))">
	<br>
	<span class="hint"><img src="img/smicon7.gif" width="14" height="14" align="absmiddle"><inp2:m_phrase label="la_Warning_Enable_HTML"/></span>

	</td>
	<td> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_weight" subfield="" class="" is_last="" maxlength=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
	<td>
	<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
	<input type="text" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" value="<inp2:$prefix_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	<inp2:m_phrase label="la_kg" />
	</inp2:m_if>
	<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_a" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="{$field}_a" subfield="$subfield"/>" value="<inp2:$prefix_Field field="{$field}_a" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	<inp2:m_phrase label="la_lbs" />
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_b" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="{$field}_b" subfield="$subfield"/>" value="<inp2:$prefix_Field field="{$field}_b" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	<inp2:m_phrase label="la_oz" />
	</inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	</tr>
	<inp2:m_blockend />
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/incs/form_blocks.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.40
	\ No newline at end of property
	+1.41
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/tree.tpl
	===================================================================
	--- trunk/kernel/admin_templates/tree.tpl (revision 4995)
	+++ trunk/kernel/admin_templates/tree.tpl (revision 4996)
	@@ -1,113 +1,124 @@
	<inp2:m_include t="incs/header" nobody="yes"/>

	<inp2:adm_SetConst name="DBG_SKIP_REPORTING" value="1"/>

	<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#DCEBF6">

	<script type="text/javascript">
	function credits(url)
	{
	var width = 200;
	var height = 200;
	var screen_x = (screen.availWidth-width)/2;
	var screen_y = (screen.availHeight-height)/2;
	window.open(url, 'credits', 'width=280,height=520,left='+screen_x+',top='+screen_y);
	}
	</script>

	<script src="incs/tree.js"></script>

	<style type="text/css">
	.tree_head.td, .tree_head, .tree_head:hover {
	font-weight: bold;
	font-size: 10px;
	color: #FFFFFF;
	font-family: Verdana, Arial;
	text-decoration: none;
	}

	.tree {
	padding: 0px;
	border: none;
	border-collapse: collapse;
	}

	.tree tr td {
	padding: 0px;
	margin: 0px;
	font-family: helvetica, arial, verdana,;
	font-size: 11px;
	white-space: nowrap;
	}

	.tree tr td a {
	font-size: 11px;
	color: #000000;
	font-family: Helvetica, Arial, Verdana;
	text-decoration: none;
	}

	.tree tr td a:hover {
	color: #009FF0;
	}
	</style>

	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr style="background: #5291DE url(img/menu_bar.gif) repeat-x left bottom;" class="tree_head">
	<td align="left" width="80%" height="21">
	<a class="tree_head" href="javascript:credits('<inp2:m_Link index_file="help/credits.php" destform="popup"/>');">In-Portal v <inp2:adm_ModuleVersion module="In-Portal"/></a>
	</td>
	<td align="right" width="20%">
	<select name="language" style="width: 62px; border: 0px; background-color: #FFFFFF; font-size: 9px; color: black;" onchange="submit_event('lang', 'OnChangeLanguage', 'index');">
	<inp2:m_DefineElement name="lang_elem">
	<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
	</inp2:m_DefineElement>
	<inp2:lang_ListLanguages render_as="lang_elem" row_start_render_as="html:" row_end_render_as="html:"/>
	</select>
	</td>
	</tr>

	<tr>
	<td colspan="2" style="padding: 5px;">
	<inp2:m_DefineElement name="xml_node">
	<inp2:m_if check="m_ParamEquals" param="children_count" value="0">
	- <item href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif"><inp2:m_phrase name="$label" escape="1"/></item>
	+ <item href="<inp2:m_param name="section_url"/>" onclick="<inp2:m_param name="onclick"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif"><inp2:m_phrase name="$label" escape="1"/></item>
	<inp2:m_else/>
	- <folder href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>"><inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/></folder>
	+ <folder href="<inp2:m_param name="section_url"/>" onclick="<inp2:m_param name="onclick"/>" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>"><inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/></folder>
	</inp2:m_if>
	</inp2:m_DefineElement>

	<table class="tree">
	<tbody id="tree">
	</tbody>
	</table>
	<script type="text/javascript">
	var TREE_ICONS_PATH = 'img/tree'

	<inp2:m_DefineElement name="root_node">
	var the_tree = new TreeFolder('tree', '<inp2:m_param name="label"/>', '<inp2:m_param name="section_url"/>', '<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif');
	</inp2:m_DefineElement>
	<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root"/>
	the_tree.AddFromXML('<tree><inp2:adm_PrintSections render_as="xml_node" section_name="in-portal:root"/></tree>');
	</script>
	</td>
	</tr>
	</table>

	<inp2:m_include t="incs/footer"/>

	<script type="text/javascript">
	// when changing language submit is made to frameset, not the current frame
	var $kf = document.getElementById($form_name);
	$kf.target = 'main_frame';

	+
	+ function checkCatalog($cat_id) {
	+ var $ret = checkEditMode();
	+ var $right_frame = window.parent.getFrame('main');
	+ if ($ret && $right_frame.$is_catalog) {
	+ $right_frame.go_to_cat($cat_id);
	+ return false;
	+ }
	+ return $ret;
	+ }
	+
	function checkEditMode()
	{
	var $phrase = "<inp2:adm_TreeEditWarrning label="la_EditingInProgress" escape="1"/>";
	if (window.parent.getFrame('main').$edit_mode) {
	return confirm($phrase) ? true : false;
	}

	return true;
	}
	</script>
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/tree.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.14
	\ No newline at end of property
	+1.15
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/xml/tree_categories.tpl
	===================================================================
	--- trunk/kernel/admin_templates/xml/tree_categories.tpl (revision 4995)
	+++ trunk/kernel/admin_templates/xml/tree_categories.tpl (revision 4996)
	@@ -1,7 +1,7 @@
	<inp2:m_XMLTemplate/>
	<inp2:m_DefineElement name="category">
	- <folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink index_file="browse.php" template="catalog" pass="m"/>" onclick="checkEditMode()" load_url="<inp2:CategoryLink pass="m"/>"></folder>
	+ <folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog" pass="m"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>)" load_url="<inp2:CategoryLink pass="m"/>"></folder>
	</inp2:m_DefineElement>
	<tree>
	-<inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:"/>
	+<inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
	</tree>

	Property changes on: trunk/kernel/admin_templates/xml/tree_categories.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.2
	\ No newline at end of property
	+1.3
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/xml/categories_list.tpl
	===================================================================
	--- trunk/kernel/admin_templates/xml/categories_list.tpl (nonexistent)
	+++ trunk/kernel/admin_templates/xml/categories_list.tpl (revision 4996)
	@@ -0,0 +1,64 @@
	+<inp2:adm_SetConst name="DBG_SKIP_REPORTING" value="1"/>
	+<inp2:m_include t="incs/blocks"/>
	+<inp2:m_include t="incs/grid_blocks"/>
	+<inp2:c_InitList no_special="1" per_page="-1"/>
	+Grids['c'] = new Grid('table_white_selected', ':original', edit, a_toolbar);
	+Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]');
	+Grids['c'].InitItems();
	+<inp2:c_ViewMenu block="viewmenu_declaration" grid="Default" no_special="1"/>
	+setInnerHTML('category_count', <inp2:c_TotalRecords no_special="1"/>);
	+
	+<inp2:m_DefineElement name="root_cat_caption">
	+ <span class="NAV_CURRENT_ITEM">
	+ <inp2:m_if check="m_ParamEquals" name="current" value="1">
	+ <inp2:c_RootCategoryName />
	+ <inp2:m_else/>
	+ <a class="control_link" href="javascript:go_to_cat(0);"><inp2:c_RootCategoryName /></a>
	+ </inp2:m_if>
	+ </span>
	+</inp2:m_DefineElement>
	+
	+<inp2:m_DefineElement name="category_caption">
	+ <span class="NAV_CURRENT_ITEM">
	+ <inp2:m_param name="separator"/>
	+ <inp2:m_if check="m_ParamEquals" name="current" value="1" inverse="1">
	+ <a class="control_link" href="javascript:go_to_cat(<inp2:m_param name="cat_id"/>);"><inp2:m_param name="cat_name"/></a>
	+ <inp2:m_else/>
	+ <inp2:m_param name="cat_name"/>
	+ </inp2:m_if>
	+ </span>
	+</inp2:m_DefineElement>
	+setInnerHTML('category_path', '<inp2:c_CategoryPath separator=">" rootcatblock="root_cat_caption" rootmoduleblock="category_caption" currentblock="category_caption" block="category_caption" js_escape="1"/>');
	+set_hidden_field('m_cat_id', <inp2:m_get name="m_cat_id"/>);
	+<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0">
	+ a_toolbar.DisableButton('upcat');
	+ a_toolbar.DisableButton('homecat');
	+<inp2:m_else/>
	+ a_toolbar.EnableButton('upcat');
	+ a_toolbar.EnableButton('homecat');
	+</inp2:m_if>
	+
	+#separator#
	+<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
	+<table border="0" width="100%">
	+ <inp2:m_DefineElement name="category_td">
	+ <td valign="top" class="table_white text" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="CategoryId"/>">
	+ <input type="checkbox" name="<inp2:InputName field="$IdField"/>" id="<inp2:InputName field="$IdField"/>">
	+ <img src="<inp2:ModulePath />img/itemicons/<inp2:ItemIcon grid="Default"/>"> <span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse"><sup><inp2:Field field="Priority"/></sup></inp2:m_if></span>
	+ <a class="link" href="javascript:go_to_cat(<inp2:m_get name="c_id"/>);"><b><inp2:Field name="Name"/></b></a><span class="cat_desc">:</span>
	+ <span class="cat_pick"><inp2:m_if check="IsPick">Pick</inp2:m_if></span>
	+ <span class="cat_new"><inp2:m_if check="IsNew">New</inp2:m_if></span>
	+ <span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span><br>
	+ <div style="padding-left: 3px;">
	+ <span class="cat_desc"><inp2:Field field="Description"/></span><br>
	+ <span class="cats_stats">(<inp2:Field field="CreatedOn" format="_regional_DateFormat"/>)</span>
	+ </div>
	+ </td>
	+ </inp2:m_DefineElement>
	+ <inp2:m_if check="c_TotalRecords" no_special="1">
	+ <inp2:c_CategoryList no_special="1" block_main="category_td" per_page="-1" columns="2" direction="V" IdField="CategoryId" />
	+ <inp2:m_else/>
	+ <span class="text"><inp2:m_phrase name="la_text_NoCategories"/></span>
	+ </inp2:m_if>
	+</table></br>
	+<inp2:m_RenderElement name="kernel_form_end"/>
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/xml/categories_list.tpl
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/catalog.tpl
	===================================================================
	--- trunk/kernel/admin_templates/catalog.tpl (nonexistent)
	+++ trunk/kernel/admin_templates/catalog.tpl (revision 4996)
	@@ -0,0 +1,226 @@
	+<inp2:m_include t="incs/header" nobody="yes" noform="yes"/>
	+
	+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
	+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Browse!"/>
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="catalog" module="in-portal"/>
	+
	+<!-- ToolBar --->
	+<inp2:m_RenderElement name="kernel_form"/>
	+
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
	+ <script type="text/javascript" src="incs/ajax.js"></script>
	+ <script type="text/javascript">
	+ var $is_catalog = true;
	+ a_toolbar = new ToolBar();
	+
	+ a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
	+ Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
	+ Catalog.submit_event('c', 'OnGoHome', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
	+ std_precreate_item('c', 'categories/categories_edit');
	+ }
	+ ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', edit) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
	+ function() {
	+ std_delete_items('c')
	+ } ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	+ Catalog.submit_event('c','OnMassApprove', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	+ Catalog.submit_event('c','OnMassDecline', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
	+ alert( Request.serializeForm('categories_form') );
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep4') );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('cut', '<inp2:m_phrase label="la_ToolTip_Cut" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('copy', '<inp2:m_phrase label="la_ToolTip_Copy" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('paste', '<inp2:m_phrase label="la_ToolTip_Paste" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep5') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_Move_Up" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_Move_Down" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep6') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	+ show_viewmenu(a_toolbar,'view');
	+ }
	+ ) );
	+
	+ a_toolbar.Render();
	+
	+ function edit()
	+ {
	+ std_edit_item('c', 'categories/categories_edit');
	+ }
	+
	+ _progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
	+
	+ var $separator = '#separator#';
	+
	+ function go_to_cat($cat_id) {
	+ var $url = '<inp2:m_Link template="xml/categories_list" m_cat_id="#REPLACE#" ajax="yes" no_amp="1"/>';
	+ if (!isset($cat_id)) {
	+ $cat_id = get_hidden_field('m_cat_id');
	+ }
	+
	+ Request.makeRequest($url.replace('#REPLACE#', $cat_id), Catalog.BusyRequest, 'categories_div', Catalog.successCallback, Catalog.errorCallback, 'categories_div');
	+ }
	+ </script>
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+<inp2:m_RenderElement name="kernel_form_end"/>
	+
	+
	+<table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
	+ <tr bgcolor="#e0e0da" height="20">
	+ <td width="100%" valign="middle">
	+ <img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0">
	+ <span id="category_path"></span>
	+ </td>
	+ <td align="right">
	+ <table cellspacing="0" cellpadding="0" border="0">
	+ <tr>
	+ <td>Search: </td>
	+ <td>
	+ <input type="text" id="c_search_keyword" name="c_search_keyword" value="<inp2:c_SearchKeyword no_special="1"/>" PrefixSpecial="c" Grid="Default" style="border: 1px solid grey;">
	+ <inp2:m_recall var="c_search_keyword" no_null="no_null" special="1"/>
	+ </td>
	+ <td>
	+ <script type="text/javascript">
	+ document.getElementById('c_search_keyword').onkeydown = search_keydown;
	+ Toolbars['c_search'] = new ToolBar('icon16_');
	+ Toolbars['c_search'].AddButton( new ToolBarButton('search', 'Search', function() { search('<inp2:c_ListMarker list_name="cats"/>','Default') } ) );
	+ Toolbars['c_search'].AddButton( new ToolBarButton('search_reset', 'Reset', function() { search_reset('<inp2:c_ListMarker list_name="cats"/>') } ) );
	+ Toolbars['c_search'].Render();
	+ </script>
	+ </td>
	+ </tr>
	+ </table>
	+ </td>
	+ </tr>
	+</table>
	+<br />
	+<div id="categories_div"></div>
	+
	+<inp2:m_DefineElement name="item_tab" title="">
	+ <td class="activeTab" nowrap="nowrap" width="200">
	+ <table cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected">
	+ <tr>
	+ <td class="catalog-tab-left">
	+ <img src="img/spacer.gif" height="22" width="9" />
	+ </td>
	+ <td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
	+ <img src="img/itemtabs/divider_empty.gif" align="absmiddle" border="0" width="20" height="20">
	+ <inp2:m_param name="title"/>
	+ </td>
	+ <td class="catalog-tab-right">
	+ <img src="img/spacer.gif" height="22" width="9" />
	+ </td>
	+ </tr>
	+ </table>
	+ </td>
	+
	+ <td>
	+ <img src="img/spacer.gif" height="1" width="5" />
	+ </td>
	+</inp2:m_DefineElement>
	+
	+<!--<span class=cats_stats>(0)</span>-->
	+<!-- item tabs: begin -->
	+<table cellpadding="0" cellspacing="0">
	+ <tr>
	+ <inp2:adm_ListItemTabs type="catalog" render_as="item_tab"/>
	+
	+ <inp2:m_RenderElement name="item_tab" divider="up" selected="selected" title="Links (1/10)"/>
	+ <inp2:m_RenderElement name="item_tab" divider="down" selected="unselected" title="Products (5/11)"/>
	+ <inp2:m_RenderElement name="item_tab" divider="empty" selected="unselected" title="Pages (5)"/>
	+ </tr>
	+</table>
	+<!-- item tabs: end -->
	+
	+
	+<br />
	+
	+<!-- Categories -->
	+<script type="text/javascript" src="incs/fw_menu.js"></script>
	+
	+<!-- Products -->
	+<!--<inp2:m_block name="product_caption_td" />
	+ <td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid"/>
	+ <span class="priority"><inp2:m_if prefix="$PrefixSpecial" function="fieldequals" field="Priority" value="0"/><inp2:m_else/><sup><inp2:$PrefixSpecial_field field="Priority"/></sup><inp2:m_endif/></span></td>
	+<inp2:m_blockend />
	+
	+<inp2:m_ParseBlock name="grid" PrefixSpecial="p" IdField="ResourceId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" no_toolbar="no_toolbar" search="on"/>
	+-->
	+
	+<inp2:m_include t="incs/footer" noform="yes"/>
	+
	+<script type="text/javascript">
	+ $ViewMenus = new Array('<inp2:c_ListMarker list_name="cats"/>');
	+ go_to_cat();
	+</script>
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/catalog.tpl
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/itemtabs/divider_dn.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/itemtabs/divider_dn.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:executable
	## -1 +0,0 ##
	-*
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/itemtabs/tab_active.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/itemtabs/tab_active.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:executable
	## -1 +0,0 ##
	-*
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/itemtabs/tab_inactive.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/itemtabs/tab_inactive.gif
	___________________________________________________________________
	Deleted: cvs2svn:cvs-rev
	## -1 +0,0 ##
	-1.2
	\ No newline at end of property
	Deleted: svn:executable
	## -1 +0,0 ##
	-*
	\ No newline at end of property
	Deleted: svn:mime-type
	## -1 +0,0 ##
	-application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/itemtabs/divider_down.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/itemtabs/divider_down.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/itemtabs/tab_left.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/itemtabs/tab_left.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/itemtabs/tab_right.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/itemtabs/tab_right.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/itemtabs/tab_middle.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/itemtabs/tab_middle.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/toolbar/tool_export_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/toolbar/tool_export_f2.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/toolbar/tool_export_f3.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/toolbar/tool_export_f3.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/toolbar/tool_rebuild_cache_f2.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/toolbar/tool_rebuild_cache_f2.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/toolbar/tool_export.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/toolbar/tool_export.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/toolbar/tool_rebuild_cache.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/toolbar/tool_rebuild_cache.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/img/ajax_progress.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

	Property changes on: trunk/kernel/admin_templates/img/ajax_progress.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/core/kernel/processors/tag_processor.php
	===================================================================
	--- trunk/core/kernel/processors/tag_processor.php (revision 4995)
	+++ trunk/core/kernel/processors/tag_processor.php (revision 4996)
	@@ -1,147 +1,153 @@
	<?php

	class TagProcessor extends kBase {

	/**
	* Processes tag
	*
	* @param Tag $tag
	* @return string
	* @access public
	*/
	function ProcessTag(&$tag)
	{
	return $this->ProcessParsedTag($tag->Tag, $tag->NP, $tag->getPrefixSpecial());

	/*$Method=$tag->Tag;
	if(method_exists($this, $Method))
	{
	//echo htmlspecialchars($tag->GetFullTag()).'<br>';
	return $this->$Method($tag->NP);
	}
	else
	{
	if ($this->Application->hasObject('TagsAggregator')) {
	$aggregator =& $this->Application->recallObject('TagsAggregator');
	$tag_mapping = $aggregator->GetArrayValue($tag->Prefix, $Method);
	if ($tag_mapping) {

	$mapped_tag =& new Tag('', $this->Application->Parser);
	$mapped_tag->CopyFrom($tag);
	$mapped_tag->Processor = $tag_mapping[0];
	$mapped_tag->Tag = $tag_mapping[1];
	$mapped_tag->NP['PrefixSpecial'] = $tag->getPrefixSpecial();
	$mapped_tag->RebuildTagData();
	return $mapped_tag->DoProcessTag();
	}
	}
	trigger_error('Tag '.$Method.' Undefined in '.get_class($this).'[Agregated Tag]:<br><b>'.$tag->RebuildTagData().'</b>',E_USER_WARNING);
	return false;
	}*/
	}

	function ProcessParsedTag($tag, $params, $prefix)
	{
	$Method = $tag;
	if(method_exists($this, $Method))
	{
	if ($this->Application->isDebugMode() && constOn('DBG_SHOW_TAGS')) {
	$this->Application->Debugger->appendHTML('Processing PreParsed Tag '.$Method.' in '.$this->Prefix);
	}

	//echo htmlspecialchars($tag->GetFullTag()).'<br>';
	- return $this->$Method($params);
	+ $ret = $this->$Method($params);
	+ if (isset($params['js_escape']) && $params['js_escape']) {
	+ $ret = str_replace('\'', ''', $ret);
	+ $ret = addslashes($ret);
	+ $ret = str_replace(Array("\r", "\n"), Array('\r', '\n'), $ret);
	+ }
	+ return $ret;
	}
	else
	{
	if ($this->Application->hasObject('TagsAggregator')) {
	$aggregator =& $this->Application->recallObject('TagsAggregator');
	$tmp = $this->Application->processPrefix($prefix);
	$tag_mapping = $aggregator->GetArrayValue($tmp['prefix'], $Method);
	if ($tag_mapping) {
	$tmp = $this->Application->processPrefix($tag_mapping[0]);
	$__tag_processor = $tmp['prefix'].'_TagProcessor';
	$processor =& $this->Application->recallObject($__tag_processor);
	$processor->Prefix = $tmp['prefix'];
	$processor->Special = getArrayValue($tag_mapping, 2) ? $tag_mapping[2] : $tmp['special'];
	$params['PrefixSpecial'] = $prefix;
	return $processor->ProcessParsedTag($tag_mapping[1], $params, $prefix);
	}
	trigger_error('Tag <b>'.$Method.'</b> Undefined in '.get_class($this).'[Agregated Tag]:<br><b>'.$tag.'</b>', E_USER_WARNING);
	}
	trigger_error('Tag Undefined:<br><b>'.$prefix.':'.$tag.'</b>',E_USER_WARNING);
	return false;
	}
	}


	/**
	* Not tag, method for parameter
	* selection from list in this TagProcessor
	*
	* @param Array $params
	* @param string $possible_names
	* @return string
	* @access public
	*/
	function SelectParam($params, $possible_names)
	{
	if (!is_array($params)) return;
	if (!is_array($possible_names))

	$possible_names = explode(',', $possible_names);
	foreach ($possible_names as $name)
	{
	if( isset($params[$name]) ) return $params[$name];
	}
	return false;
	}
	}

	/*class ProcessorsPool {
	var $Processors = Array();
	var $Application;
	var $Prefixes = Array();
	var $S;

	function ProcessorsPool()
	{
	$this->Application =& KernelApplication::Instance();
	$this->S =& $this->Application->Session;
	}

	function RegisterPrefix($prefix, $path, $class)
	{
	// echo " RegisterPrefix $prefix, $path, $class <br>";
	$prefix_item = Array(
	'path' => $path,
	'class' => $class
	);
	$this->Prefixes[$prefix] = $prefix_item;
	}

	function CreateProcessor($prefix, &$tag)
	{
	// echo " prefix : $prefix <br>";
	if (!isset($this->Prefixes[$prefix]))
	die ("<b>Filepath and ClassName for prefix $prefix not defined while processing ".htmlspecialchars($tag->GetFullTag())."!</b>");
	include_once($this->Prefixes[$prefix]['path']);
	$ClassName = $this->Prefixes[$prefix]['class'];
	$a_processor =& new $ClassName($prefix);
	$this->SetProcessor($prefix, $a_processor);
	}

	function SetProcessor($prefix, &$a_processor)
	{
	$this->Processors[$prefix] =& $a_processor;
	}

	function &GetProcessor($prefix, &$tag)
	{
	if (!isset($this->Processors[$prefix]))
	$this->CreateProcessor($prefix, $tag);
	return $this->Processors[$prefix];
	}
	}*/

	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/processors/tag_processor.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.10
	\ No newline at end of property
	+1.11
	\ No newline at end of property
	Index: trunk/core/kernel/utility/debugger/debugger.js
	===================================================================
	--- trunk/core/kernel/utility/debugger/debugger.js (revision 4995)
	+++ trunk/core/kernel/utility/debugger/debugger.js (revision 4996)
	@@ -1,256 +1,273 @@
	function DebugReq() {}

	DebugReq.timeout = 5000; //5 seconds

	DebugReq.makeRequest = function(p_url, p_busyReq, p_progId, p_successCallBack, p_errorCallBack, p_pass) {
	//p_url: the web service url
	//p_busyReq: is a request for this object currently in progress?
	//p_progId: element id where progress HTML should be shown
	//p_successCallBack: callback function for successful response
	//p_errorCallBack: callback function for erroneous response
	//p_pass: string of params to pass to callback functions
	- if (p_busyReq) return;
	+ if (p_busyReq) {
	+ return;
	+ }
	var req = DebugReq.getRequest();
	if (req != null) {
	p_busyReq = true;
	DebugReq.showProgress(p_progId);
	req.onreadystatechange = function() {
	if (req.readyState == 4) {
	p_busyReq = false;
	window.clearTimeout(toId);
	if (req.status == 200) {
	p_successCallBack(req,p_pass);
	} else {
	p_errorCallBack(req,p_pass);
	}
	}
	}
	req.open('GET', p_url, true);
	req.setRequestHeader('If-Modified-Since', 'Sat, 1 Jan 2000 00:00:00 GMT');
	req.send(null);
	var toId = window.setTimeout( function() {if (p_busyReq) req.abort();}, DebugReq.timeout );
	}
	}

	DebugReq.getRequest = function() {
	var xmlHttp;
	try { xmlHttp = new ActiveXObject('MSXML2.XMLHTTP'); return xmlHttp; } catch (e) {}
	try { xmlHttp = new ActiveXObject('Microsoft.XMLHTTP'); return xmlHttp; } catch (e) {}
	try { xmlHttp = new XMLHttpRequest(); return xmlHttp; } catch(e) {}
	return null;
	}

	DebugReq.showProgress = function(p_id) {
	$Debugger.AppendRow(DebugReq.getProgressHtml());
	}

	DebugReq.getProgressHtml = function() {
	return 'Loading ...';
	}

	DebugReq.getErrorHtml = function(p_req) {
	//TODO: implement accepted way to handle request error
	return "<p>" + "(" + p_req.status + ") " + p_req.statusText + "</p>"
	}

	// Debugger
	function Debugger() {
	this.IsQueried = false;
	this.IsVisible = false;
	this.DebuggerDIV = document.getElementById('debug_layer');
	this.DebuggerTable = document.getElementById('debug_table');
	this.RowCount = 0;
	+ this.busyRequest = false;

	// window.$Debugger = this; // this should be uncommented in case if debugger variable is not $Debugger
	window.onscroll = function(ev) { window.$Debugger.Resize(ev); }
	window.onresize = function(ev) { window.$Debugger.Resize(ev); }
	document.onkeydown = function(ev) { window.$Debugger.KeyDown(ev); }
	}

	Debugger.prototype.AppendRow = function($html) {
	this.RowCount++;
	var $tr = document.createElement('TR');
	this.DebuggerTable.appendChild($tr);
	$tr.className = 'debug_row_' + (this.RowCount % 2 ? 'odd' : 'even');
	$tr.id = 'debug_row_' + this.RowCount;
	var $td = document.createElement('TD');
	- $tr.appendChild($td);
	$td.className = 'debug_cell';
	$td.innerHTML = $html;
	+ $tr.appendChild($td);
	+}
	+
	+Debugger.prototype.RemoveRow = function($row_index) {
	+ this.DebuggerTable.deleteRow($row_index);
	+ this.RowCount--;
	+}
	+
	+Debugger.prototype.Clear = function() {
	+ if (!this.IsQueried) return false;
	+
	+ this.IsQueried = false;
	+ while (this.DebuggerTable.rows.length) {
	+ this.RemoveRow(0);
	+ }
	}

	Debugger.prototype.KeyDown = function($e) {
	var $KeyCode = this.GetKeyCode($e);
	if ($KeyCode == 123 \|\| $KeyCode == 27) {// F12 or ESC
	this.Toggle($KeyCode);
	this.StopEvent($e);
	}
	}

	Debugger.prototype.OpenDOMViewer = function() {
	var $value = document.getElementById('dbg_domviewer').value;
	DOMViewerObj = ($value.indexOf('"') != -1) ? document.getElementById( $value.substring(1,$value.length-1) ) : eval($value);
	window.open(this.DOMViewerURL);
	return false;
	}

	Debugger.prototype.GetKeyCode = function($e) {
	$e = ($e) ? $e : event;
	var target = ($e.target) ? $e.target : $e.scrElement;
	var charCode = ($e.charCode) ? $e.charCode : (($e.which) ? $e.which : $e.keyCode);
	return charCode;
	}

	Debugger.prototype.StopEvent = function($e) {
	$e = ($e) ? $e : event;
	$e.cancelBubble = true;
	if ($e.stopPropagation) $e.stopPropagation();
	}

	Debugger.prototype.Toggle = function($KeyCode) {
	if(!this.DebuggerDIV) return false;

	this.IsVisible = this.DebuggerDIV.style.display == 'none' ? false : true;
	if (!this.IsVisible && $KeyCode == 27) {
	return false;
	}

	this.Resize(null);
	if (!this.IsQueried) {
	this.Query();
	}

	this.DebuggerDIV.style.display = this.IsVisible ? 'none' : 'block';
	}

	Debugger.prototype.Query = function() {
	- DebugReq.makeRequest(this.DebugURL, this.busyReq, '', this.successCallback, this.errorCallback, '');
	+ DebugReq.makeRequest(this.DebugURL, this.busyRequest, '', this.successCallback, this.errorCallback, '');
	}

	Debugger.prototype.successCallback = function(p_req, p_pass) {
	var contents = p_req.responseText;

	contents = contents.split($Debugger.RowSeparator);
	if (contents.length == 1) {
	alert('error: '+p_req.responseText);
	$Debugger.IsQueried = true;
	return ;
	}

	for (var $i = 0; $i < contents.length - 1; $i++) {
	$Debugger.AppendRow(contents[$i]);
	}

	$Debugger.Refresh();
	}

	Debugger.prototype.Refresh = function() {
	// progress mether row
	- document.getElementById('debug_row_1').style.display = 'none';
	+ this.RemoveRow(0);
	this.IsQueried = true;
	this.DebuggerDIV.scrollTop = this.IsFatalError ? 10000000 : 0;
	this.DebuggerDIV.scrollLeft = 0;
	}

	Debugger.prototype.errorCallback = function(p_req, p_pass) {
	alert('AJAX ERROR: '+DebugReq.getErrorHtml(p_req));
	$Debugger.Refresh();
	}

	Debugger.prototype.Resize = function($e) {
	if (!this.DebuggerDIV) return false;
	var $pageTop = document.all ? document.body.offsetTop + document.body.scrollTop : window.scrollY;

	this.DebuggerDIV.style.top = $pageTop + 'px';
	this.DebuggerDIV.style.height = GetWindowHeight() + 'px';
	return true;
	}

	function GetWindowHeight() {
	var currWinHeight;
	if (window.innerHeight) {//FireFox with correction for status bar at bottom of window
	currWinHeight = window.innerHeight - 10;
	} else if (document.documentElement.clientHeight) {//IE 7 with correction for address bar
	currWinHeight = document.documentElement.clientHeight - 10;
	} else if (document.body.offsetHeight) {//IE 4+
	currWinHeight = document.body.offsetHeight - 5 + 15 - 10; // + 10
	}
	return currWinHeight;
	}


	/*function GetWinHeight() {
	if (window.innerHeight) return window.innerHeight;
	else if (document.documentElement.clientHeight) return document.documentElement.clientHeight;
	else if (document.body.offsetHeight) return document.body.offsetHeight;
	else return _winHeight;
	}*/

	Debugger.prototype.SetClipboard = function(copyText) {
	if (window.clipboardData) {
	// IE send-to-clipboard method.
	window.clipboardData.setData('Text', copyText);
	}
	else if (window.netscape) {
	// You have to sign the code to enable this or allow the action in about:config by changing user_pref("signed.applets.codebase_principal_support", true);
	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');

	// Store support string in an object.
	var str = Components.classes['@mozilla.org/supports-string;1'].createInstance(Components.interfaces.nsISupportsString);
	if (!str) {
	return false;
	}
	str.data = copyText;

	// Make transferable.
	var trans = Components.classes['@mozilla.org/widget/transferable;1'].createInstance(Components.interfaces.nsITransferable);
	if (!trans) {
	return false;
	}

	// Specify what datatypes we want to obtain, which is text in this case.
	trans.addDataFlavor('text/unicode');
	trans.setTransferData('text/unicode', str, copyText.length * 2);

	var clipid = Components.interfaces.nsIClipboard;
	var clip = Components.classes['@mozilla.org/widget/clipboard;1'].getService(clipid);
	if (!clip) {
	return false;
	}

	clip.setData(trans, null, clipid.kGlobalClipboard);
	}
	}

	Debugger.prototype.ShowProps = function($Obj, $Name) {
	var $ret = '';
	for ($Prop in $Obj) {
	$ret += $Name + '.' + $Prop + ' = ' + $Obj[$Prop] + "\n";
	}
	return alert($ret);
	}

	Debugger.prototype.editFile = function($fileName, $lineNo) {
	if (!document.all) {
	alert('Only works in IE');
	return;
	}

	if (!this.EditorPath) {
	alert('Editor path not defined!');
	return;
	}

	var $launch_object = new ActiveXObject('LaunchinIE.Launch');
	var $editor_path = this.EditorPath;
	$editor_path = $editor_path.replace('%F', $fileName);
	$editor_path = $editor_path.replace('%L',$lineNo);
	$launch_object.LaunchApplication($editor_path);
	}

	Debugger.prototype.ToggleTraceArgs = function($arguments_layer_id) {
	var $arguments_layer = document.getElementById($arguments_layer_id);
	$arguments_layer.style.display = ($arguments_layer.style.display == 'none') ? 'block' : 'none';
	}


	\ No newline at end of file

	Property changes on: trunk/core/kernel/utility/debugger/debugger.js
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.6
	\ No newline at end of property
	Index: trunk/core/kernel/utility/debugger.php
	===================================================================
	--- trunk/core/kernel/utility/debugger.php (revision 4995)
	+++ trunk/core/kernel/utility/debugger.php (revision 4996)
	@@ -1,964 +1,966 @@
	<?php

	if( !class_exists('Debugger') ) {
	class Debugger {

	/**
	* Set to true if fatal error occured
	*
	* @var bool
	*/
	var $IsFatalError = false;

	/**
	* Debugger data for building report
	*
	* @var Array
	*/
	var $Data = Array();

	var $ProfilerData = Array();
	var $ProfilerTotals = Array();
	var $ProfilerTotalCount = Array();

	/**
	* Prevent recursion when processing debug_backtrace() function results
	*
	* @var Array
	*/
	var $RecursionStack = Array();

	var $scrollbarWidth = 0;

	/**
	* Long errors are saved here, because trigger_error doesn't support error messages over 1KB in size
	*
	* @var Array
	*/
	var $longErrors = Array();

	var $IncludesData = Array();
	var $IncludeLevel = 0;

	var $reportDone = false;

	/**
	* Transparent spacer image used in case of none spacer image defined via SPACER_URL contant.
	* Used while drawing progress bars (memory usage, time usage, etc.)
	*
	* @var string
	*/
	var $dummyImage = 'http://www.adamauto.lv/chevrolet/images/spacer.gif';

	/**
	* Temporary files created by debugger will be stored here
	*
	* @var string
	*/
	var $tempFolder = '';

	/**
	* Debug rows will be separated using this string before writing to debug file
	*
	* @var string
	*/
	var $rowSeparator = '@@';

	/**
	* Base URL for debugger includes
	*
	* @var string
	*/
	var $baseURL = '';

	function Debugger()
	{
	global $start;

	$this->InitDebugger();
	$this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start);
	$this->profileStart('script_runtime', 'Script runtime', $start);

	ini_set('display_errors', $this->constOn('DBG_ZEND_PRESENT') ? 0 : 1); // show errors on screen in case if not in Zend Studio debugging

	$this->scrollbarWidth = $this->isGecko() ? 22 : 25; // vertical scrollbar width differs in Firefox and other browsers
	$this->appendRequest();
	}

	/**
	* Set's default values to constants debugger uses
	*
	*/
	function InitDebugger()
	{
	unset($_REQUEST['debug_host'], $_REQUEST['debug_fastfile']); // this var messed up whole detection stuff :(

	// Detect fact, that this session beeing debugged by Zend Studio
	foreach ($_REQUEST as $rq_name => $rq_value) {
	if (substr($rq_name, 0, 6) == 'debug_') {
	$this->safeDefine('DBG_ZEND_PRESENT', 1);
	break;
	}
	}

	$this->safeDefine('DBG_ZEND_PRESENT', 0); // set this constant value to 0 (zero) to debug debugger using Zend Studio

	// set default values for debugger constants
	$dbg_constMap = Array(
	'DBG_USE_HIGHLIGHT' => 1, // highlight output same as php code using "highlight_string" function
	'DBG_WINDOW_WIDTH' => 700, // set width of debugger window (in pixels) for better viewing large amount of debug data
	'DBG_USE_SHUTDOWN_FUNC' => DBG_ZEND_PRESENT ? 0 : 1, // use shutdown function to include debugger code into output
	'DBG_HANDLE_ERRORS' => DBG_ZEND_PRESENT ? 0 : 1, // handle all allowed by php (see php manual) errors instead of default handler
	'DBG_IGNORE_STRICT_ERRORS' => 1, // ignore PHP5 errors about private/public view modified missing in class declarations
	'DBG_DOMVIEWER' => '/temp/domviewer.html', // path to DOMViewer on website
	'DOC_ROOT' => str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
	'DBG_LOCAL_BASE_PATH' => 'w:' // replace DOC_ROOT in filenames (in errors) using this path
	);

	// only for IE, in case if no windows php script editor defined
	if (!defined('DBG_EDITOR')) {
	// $dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\UltraEdit\uedit32.exe %F/%L';
	$dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\Zend\ZendStudio-5.2.0\bin\ZDE.exe %F';
	}

	foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) {
	$this->safeDefine($dbg_constName, $dbg_constValue);
	}
	}

	function constOn($const_name)
	{
	return defined($const_name) && constant($const_name);
	}

	function safeDefine($const_name, $const_value) {
	if (!defined($const_name)) {
	define($const_name, $const_value);
	}
	}

	function InitReport()
	{
	if (!class_exists('kApplication')) return false;

	$application =& kApplication::Instance();

	// string used to separate debugger records while in file (used in debugger dump filename too)
	$this->rowSeparator = '@'.$application->GetSID().'@';

	// include debugger files from this url
	$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';
	$kernel_path = preg_replace($reg_exp, '', KERNEL_PATH, 1);
	$this->baseURL = PROTOCOL.SERVER_NAME.rtrim(BASE_PATH, '/').$kernel_path.'/utility/debugger';

	// save debug output in this folder
	$this->tempFolder = FULL_PATH.'/kernel/cache';
	}

	function mapLongError($msg)
	{
	$key = $this->generateID();
	$this->longErrors[$key] = $msg;
	return $key;
	}

	/**
	* Appends all passed variable values (wihout variable names) to debug output
	*
	*/
	function dumpVars()
	{
	$dumpVars = func_get_args();
	foreach ($dumpVars as $varValue) {
	$this->Data[] = Array('value' => $varValue, 'debug_type' => 'var_dump');
	}
	}

	function prepareHTML($dataIndex)
	{
	$Data =& $this->Data[$dataIndex];
	if ($Data['debug_type'] == 'html') {
	return $Data['html'];
	}

	switch ($Data['debug_type']) {
	case 'error':
	$fileLink = $this->getFileLink($Data['file'], $Data['line']);
	$ret = '<b class="debug_error">'.$this->getErrorNameByCode($Data['no']).'</b>: '.$Data['str'];
	$ret .= ' in <b>'.$fileLink.'</b> on line <b>'.$Data['line'].'</b>';
	return $ret;
	break;

	case 'var_dump':
	return $this->highlightString( print_r($Data['value'], true) );
	break;

	case 'trace':
	ini_set('memory_limit', '500M');
	$trace =& $Data['trace'];

	$i = 0; $traceCount = count($trace);
	$ret = '';
	while ($i < $traceCount) {
	$traceRec =& $trace[$i];
	$argsID = 'trace_args_'.$dataIndex.'_'.$i;

	$has_args = isset($traceRec['args']);

	if (isset($traceRec['file'])) {
	$func_name = isset($traceRec['class']) ? $traceRec['class'].$traceRec['type'].$traceRec['function'] : $traceRec['function'];
	$args_link = $has_args ? '<a href="javascript:$Debugger.ToggleTraceArgs(\''.$argsID.'\');" title="Show/Hide Function Arguments"><b>Function</b></a>' : '<b>Function</b>';

	$ret .= $args_link.': '.$this->getFileLink($traceRec['file'], $traceRec['line'], $func_name);
	$ret .= ' in <b>'.basename($traceRec['file']).'</b> on line <b>'.$traceRec['line'].'</b><br>';
	}
	else {
	$ret .= 'no file information available';
	}

	// ensure parameter value is not longer then 200 symbols
	if ($has_args) {
	$this->processTraceArguments($traceRec['args']);
	$args = $this->highlightString(print_r($traceRec['args'], true));
	$ret .= '<div id="'.$argsID.'" style="display: none;">'.$args.'</div>';
	}
	$i++;
	}
	return $ret;
	break;

	case 'profiler':
	$profileKey = $Data['profile_key'];
	$Data =& $this->ProfilerData[$profileKey];
	$runtime = ($Data['ends'] - $Data['begins']); // in seconds

	$totals_key = getArrayValue($Data, 'totalsKey');
	if ($totals_key) {
	$total_before = $Data['totalsBefore'];
	$total = $this->ProfilerTotals[$totals_key];

	$div_width = Array();
	$total_width = ($this->getWindowWidth()-10);
	$div_width['before'] = round(($total_before / $total) * $total_width);
	$div_width['current'] = round(($runtime / $total) * $total_width);
	$div_width['left'] = round((($total - $total_before - $runtime) / $total) * $total_width);

	$ret = '<b>Name</b>: '.$Data['description'].'<br>';
	$ret .= '<b>Runtime</b>: '.$runtime.'s';
	$ret .= '<div class="dbg_profiler" style="width: '.$div_width['before'].'px; border-right: 0px; background-color: #298DDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
	$ret .= '<div class="dbg_profiler" style="width: '.$div_width['current'].'px; border-left: 0px; border-right: 0px; background-color: #EF4A4A;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
	$ret .= '<div class="dbg_profiler" style="width: '.$div_width['left'].'px; border-left: 0px; background-color: #DFDFDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';

	return $ret;
	}
	else {
	return '<b>Name</b>: '.$Data['description'].'<br><b>Runtime</b>: '.$runtime.'s';
	}
	break;

	default:
	return 'incorrect debug data';
	break;
	}
	}

	function getWindowWidth()
	{
	return DBG_WINDOW_WIDTH - $this->scrollbarWidth - 8;
	}

	/**
	* Tells debugger to skip objects that are heavy in plan of memory usage while printing debug_backtrace results
	*
	* @param Object $object
	* @return bool
	*/
	function IsBigObject(&$object)
	{
	$skip_classes = Array(
	defined('APPLICATION_CLASS') ? APPLICATION_CLASS : 'kApplication',
	'kFactory',
	'TemplateParser',
	);

	foreach ($skip_classes as $class_name) {
	if (strtolower(get_class($object)) == strtolower($class_name)) {
	return true;
	}
	}

	return false;
	}

	function processTraceArguments(&$traceArgs)
	{
	if (!$traceArgs) return '';

	$array_keys = array_keys($traceArgs);
	foreach ($array_keys as $argID) {
	$argValue =& $traceArgs[$argID];

	if (is_array($argValue) \|\| is_object($argValue)) {
	if (is_object($argValue) && !in_array(get_class($argValue), $this->RecursionStack)) {
	array_push($this->RecursionStack, get_class($argValue));

	if ($this->IsBigObject($argValue)) {
	$argValue = null;
	continue;
	}

	// object & not in stack - ok
	settype($argValue, 'array');
	$this->processTraceArguments($argValue);
	array_pop($this->RecursionStack);
	}
	elseif (is_object($argValue) && in_array(get_class($argValue), $this->RecursionStack)) {
	// object & in stack - recursion
	$traceArgs[$argID] = '** RECURSION *';
	}
	else {
	// normal array here
	$this->processTraceArguments($argValue);
	}
	}
	else {
	$traceArgs[$argID] = $this->cutStringForHTML($traceArgs[$argID]);
	}
	}
	}

	/**
	* Returns only first 200 chars of string, this allow to save amount of data sent to browser
	*
	* @param string $string
	* @return string
	*/
	function cutStringForHTML($string)
	{
	if (strlen($string) > 200) {
	$string = substr($string,0,50).' ...';
	}
	return $string;
	}

	/**
	* Format SQL Query using predefined formatting
	* and highlighting techniques
	*
	* @param string $sql
	* @return string
	*/
	function formatSQL($sql)
	{
	$sql = preg_replace('/(\n\|\t\| )+/is', ' ', $sql);
	$sql = preg_replace('/(CREATE TABLE\|DROP TABLE\|SELECT\|UPDATE\|SET\|REPLACE\|INSERT\|DELETE\|VALUES\|FROM\|LEFT JOIN\|INNER JOIN\|LIMIT\|WHERE\|HAVING\|GROUP BY\|ORDER BY) /is', "\n\t$1 ", $sql);
	return $this->highlightString($sql);
	}

	function highlightString($string)
	{
	if (!$this->constOn('DBG_USE_HIGHLIGHT')) {
	return $string;
	}

	$string = str_replace( Array('\\', '/') , Array('_no_match_string_', '_n_m_s_'), $string);
	$string = highlight_string('<?php '.$string.'?>', true);
	$string = str_replace( Array('_no_match_string_', '_n_m_s_'), Array('\\', '/'), $string);
	return preg_replace('/<\?(.)php(.)\?>/Us', '\\2', $string);
	}

	/**
	* Determine by php type of browser used to show debugger
	*
	* @return bool
	*/
	function isGecko()
	{
	return strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'firefox') !== false;
	}

	/**
	* Returns link for editing php file (from error) in external editor
	*
	* @param string $file filename with path from root folder
	* @param int $lineno line number in file where error is found
	* @param string $title text to show on file edit link
	* @return string
	*/
	function getFileLink($file, $lineno = 1, $title = '')
	{
	if (!$title) {
	$title = $file;
	}

	if ($this->isGecko()) {
	return '<a href="file://'.$this->getLocalFile($file).'">'.$title.'</a>';
	}
	else {
	return '<a href="javascript:$Debugger.editFile(\''.$this->getLocalFile($file).'\', '.$lineno.');" title="'.$file.'">'.$title.'</a>';
	}

	}

	/**
	* Converts filepath on server to filepath in mapped DocumentRoot on developer pc
	*
	* @param string $remoteFile
	* @return string
	*/
	function getLocalFile($remoteFile)
	{
	return str_replace(DOC_ROOT, DBG_LOCAL_BASE_PATH, $remoteFile);
	}

	/**
	* Appends call trace till this method call
	*
	*/
	function appendTrace()
	{
	$trace = debug_backtrace();
	array_shift($trace);
	$this->Data[] = Array('trace' => $trace, 'debug_type' => 'trace');
	}

	function appendMemoryUsage($msg, $used = null)
	{
	if (!isset($used)) {
	$used = round(memory_get_usage() / 1024);
	}
	$this->appendHTML('<b>Memory usage</b> '.$msg.' '.$used.'Kb');
	}

	/**
	* Appends HTML code whithout transformations
	*
	* @param string $html
	*/
	function appendHTML($html)
	{
	$this->Data[] = Array('html' => $html, 'debug_type' => 'html');
	}

	/**
	* Change debugger info that was already generated before.
	* Returns true if html was set.
	*
	* @param int $index
	* @param string $html
	* @param string $type = {'append','prepend','replace'}
	* @return bool
	*/
	function setHTMLByIndex($index, $html, $type = 'append')
	{
	if (!isset($this->Data[$index]) \|\| $this->Data[$index]['debug_type'] != 'html') {
	return false;
	}

	switch ($type) {
	case 'append':
	$this->Data[$index]['html'] .= '<br>'.$html;
	break;

	case 'prepend':
	$this->Data[$index]['html'] = $this->Data[$index]['html'].'<br>'.$html;
	break;

	case 'replace':
	$this->Data[$index]['html'] = $html;
	break;
	}
	return true;
	}

	/**
	* Move $debugLineCount lines of input from debug output
	* end to beginning.
	*
	* @param int $debugLineCount
	*/
	function moveToBegin($debugLineCount)
	{
	$lines = array_splice($this->Data,count($this->Data)-$debugLineCount,$debugLineCount);
	$this->Data = array_merge($lines,$this->Data);
	}

	function moveAfterRow($new_row, $debugLineCount)
	{
	$lines = array_splice($this->Data,count($this->Data)-$debugLineCount,$debugLineCount);
	$rows_before = array_splice($this->Data,0,$new_row,$lines);
	$this->Data = array_merge($rows_before,$this->Data);
	}

	function appendRequest()
	{
	if (isset($_SERVER['SCRIPT_FILENAME'])) {
	$script = $_SERVER['SCRIPT_FILENAME'];
	}
	else {
	$script = $_SERVER['DOCUMENT_ROOT'].$_SERVER['PHP_SELF'];
	}

	$this->appendHTML('ScriptName: <b>'.$this->getFileLink($script, 1, basename($script)).'</b> (<b>'.dirname($script).'</b>)');

	$this->appendHTML('<a href="http://www.brainjar.com/dhtml/domviewer/" target="_blank">DomViewer</a>: <input id="dbg_domviewer" type="text" value="window" style="border: 1px solid #000000;"/> <button class="button" onclick="return $Debugger.OpenDOMViewer();">Show</button>');

	ob_start();
	?>
	<table border="0" cellspacing="0" cellpadding="0" class="dbg_flat_table" style="width: <?php echo $this->getWindowWidth(); ?>px;">
	<thead style="font-weight: bold;">
	<td width="20">Src</td><td>Name</td><td>Value</td>
	</thead>
	<?php
	foreach ($_REQUEST as $key => $value) {
	if(!is_array($value) && trim($value) == '') {
	$value = '<b class="debug_error">no value</b>';
	}
	else {
	$value = htmlspecialchars(print_r($value, true));
	}

	$in_cookie = isset($_COOKIE[$key]);
	$src = isset($_GET[$key]) && !$in_cookie ? 'GE' : (isset($_POST[$key]) && !$in_cookie ? 'PO' : ($in_cookie ? 'CO' : '?') );
	echo '<tr><td>'.$src.'</td><td>'.$key.'</td><td>'.$value.'</td></tr>';
	}
	?>
	</table>
	<?php
	$this->appendHTML(ob_get_contents());
	ob_end_clean();
	}

	/**
	* Appends php session content to debugger output
	*
	*/
	function appendSession()
	{
	if (isset($_SESSION) && $_SESSION) {
	$this->appendHTML('PHP Session: [<b>'.ini_get('session.name').'</b>]');
	$this->dumpVars($_SESSION);
	$this->moveToBegin(2);
	}
	}

	function profileStart($key, $description = null, $timeStamp = null)
	{
	if (!isset($timeStamp)) {
	$timeStamp = $this->getMoment();
	}
	$this->ProfilerData[$key] = Array('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data));
	if (isset($description)) {
	$this->ProfilerData[$key]['description'] = $description;
	}

	$this->Data[] = array('profile_key' => $key, 'debug_type' => 'profiler');
	}

	function profileFinish($key, $description = null, $timeStamp = null)
	{
	if (!isset($timeStamp)) {
	$timeStamp = $this->getMoment();
	}
	$this->ProfilerData[$key]['ends'] = $timeStamp;

	if (isset($description)) {
	$this->ProfilerData[$key]['description'] = $description;
	}
	}

	function profilerAddTotal($total_key, $key = null, $value = null)
	{
	if (!isset($this->ProfilerTotals[$total_key])) {
	$this->ProfilerTotals[$total_key] = 0;
	$this->ProfilerTotalCount[$total_key] = 0;
	}

	if (!isset($value)) {
	$value = $this->ProfilerData[$key]['ends'] - $this->ProfilerData[$key]['begins'];
	}

	if (isset($key)) {
	$this->ProfilerData[$key]['totalsKey'] = $total_key;
	$this->ProfilerData[$key]['totalsBefore'] = $this->ProfilerTotals[$total_key];
	}

	$this->ProfilerTotals[$total_key] += $value;
	$this->ProfilerTotalCount[$total_key]++;
	}

	function getMoment()
	{
	list($usec, $sec) = explode(' ', microtime());
	return ((float)$usec + (float)$sec);
	}

	function generateID()
	{
	list($usec, $sec) = explode(' ', microtime());

	$id_part_1 = substr($usec, 4, 4);
	$id_part_2 = mt_rand(1,9);
	$id_part_3 = substr($sec, 6, 4);
	$digit_one = substr($id_part_1, 0, 1);
	if ($digit_one == 0) {
	$digit_one = mt_rand(1,9);
	$id_part_1 = ereg_replace("^0",'',$id_part_1);
	$id_part_1=$digit_one.$id_part_1;
	}
	return $id_part_1.$id_part_2.$id_part_3;
	}


	function getErrorNameByCode($error_code)
	{
	$error_map = Array(
	'Fatal Error' => Array(E_USER_ERROR),
	'Warning' => Array(E_WARNING, E_USER_WARNING),
	'Notice' => Array(E_NOTICE, E_USER_NOTICE),
	);

	if (defined('E_STRICT')) {
	$error_map['PHP5 Strict'] = Array(E_STRICT);
	}

	foreach ($error_map as $error_name => $error_codes) {
	if (in_array($error_code, $error_codes)) {
	return $error_name;
	}
	}

	return '';
	}

	/**
	* Generates report
	*
	*/
	function printReport($returnResult = false, $clean_output_buffer = true)
	{
	$this->profileFinish('script_runtime');

	$this->breakOutofBuffering();
	if ($this->reportDone) {
	// don't print same report twice
	return '';
	}

	- if ($this->constOn('DBG_SKIP_REPORTING') \|\| $this->constOn('DBG_ZEND_PRESENT')) return '';
	-
	$debugger_start = memory_get_usage();

	if (defined('SPACER_URL')) {
	$this->dummyImage = SPACER_URL;
	}

	$this->InitReport(); // set parameters required by AJAX

	// defined here, because user can define this contant while script is running, not event before debugger is started
	$this->safeDefine('DBG_RAISE_ON_WARNINGS', 0);

	$this->appendSession(); // show php session if any

	// ensure, that 1st line of debug output always is this one:
	$this->appendHTML('[<a href="javascript:window.location.reload();">Reload Frame</a>] [<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>] [Current Time: <b>'.date('H:i:s').'</b>]');
	$this->moveToBegin(1);

	if ($this->constOn('DBG_SQL_PROFILE') && isset($this->ProfilerTotals['sql'])) {
	// sql query profiling was enabled -> show totals
	$this->appendHTML('<b>SQL Total time:</b> '.$this->ProfilerTotals['sql'].' <b>Number of queries</b>: '.$this->ProfilerTotalCount['sql']);
	}

	if ($this->constOn('DBG_PROFILE_INCLUDES') && isset($this->ProfilerTotals['includes'])) {
	// included file profiling was enabled -> show totals
	$this->appendHTML('<b>Included Files Total time:</b> '.$this->ProfilerTotals['includes'].' Number of includes: '.$this->ProfilerTotalCount['includes']);
	}

	if ($this->constOn('DBG_PROFILE_MEMORY')) {
	// detailed memory usage reporting by objects was enabled -> show totals
	$this->appendHTML('<b>Memory used by Objects:</b> '.round($this->ProfilerTotals['objects'] / 1024, 2).'Kb');
	}

	/*if ($this->constOn('DBG_INCLUDED_FILES')) {
	$files = get_included_files();
	$this->appendHTML('<b>Included files:</b>');
	foreach ($files as $file) {
	$this->appendHTML($this->getFileLink($this->getLocalFile($file)).' ('.round(filesize($file) / 1024, 2).'Kb)');
	}
	}*/

	/*if ($this->constOn('DBG_PROFILE_INCLUDES')) {
	$this->appendHTML('<b>Included files statistics:</b>'.( $this->constOn('DBG_SORT_INCLUDES_MEM') ? ' (sorted by memory usage)':''));
	$totals = Array( 'mem' => 0, 'time' => 0);
	$totals_configs = Array( 'mem' => 0, 'time' => 0);
	if (is_array($this->IncludesData['mem'])) {
	if ( $this->constOn('DBG_SORT_INCLUDES_MEM') ) {
	array_multisort($this->IncludesData['mem'], SORT_DESC, $this->IncludesData['file'], $this->IncludesData['time'], $this->IncludesData['level']);
	}
	foreach ($this->IncludesData['file'] as $key => $file_name) {
	$this->appendHTML( str_repeat(' -> ', ($this->IncludesData['level'][$key] >= 0 ? $this->IncludesData['level'][$key] : 0)).$file_name.' Mem: '.sprintf("%.4f Kb", $this->IncludesData['mem'][$key]/1024).' Time: '.sprintf("%.4f", $this->IncludesData['time'][$key]));
	if ($this->IncludesData['level'][$key] == 0) {
	$totals['mem'] += $this->IncludesData['mem'][$key];
	$totals['time'] += $this->IncludesData['time'][$key];
	}
	else if ($this->IncludesData['level'][$key] == -1) {
	$totals_configs['mem'] += $this->IncludesData['mem'][$key];
	$totals_configs['time'] += $this->IncludesData['time'][$key];
	}
	}
	$this->appendHTML('<b>Sub-Total classes:</b> '.' Mem: '.sprintf("%.4f Kb", $totals['mem']/1024).' Time: '.sprintf("%.4f", $totals['time']));
	$this->appendHTML('<b>Sub-Total configs:</b> '.' Mem: '.sprintf("%.4f Kb", $totals_configs['mem']/1024).' Time: '.sprintf("%.4f", $totals_configs['time']));
	$this->appendHTML('<span class="error"><b>Grand Total:</b></span> '.' Mem: '.sprintf("%.4f Kb", ($totals['mem']+$totals_configs['mem'])/1024).' Time: '.sprintf("%.4f", $totals['time']+$totals_configs['time']));
	}
	}*/

	$debug_file = $this->tempFolder.'/debug_'.$this->rowSeparator.'.txt';
	if (file_exists($debug_file)) unlink($debug_file);

	$i = 0;
	$fp = fopen($debug_file, 'a');
	$lineCount = count($this->Data);
	while ($i < $lineCount) {
	fwrite($fp, $this->prepareHTML($i).$this->rowSeparator);
	$i++;
	}
	fclose($fp);
	+
	+ // let debugger write report and then don't output anything
	+ if ($this->constOn('DBG_SKIP_REPORTING') \|\| $this->constOn('DBG_ZEND_PRESENT')) return '';
	+
	ob_start();
	?>
	<html><body></body></html>
	<script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js"></script>
	<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css" type="text/css" />
	<div id="debug_layer" class="debug_layer_container" style="display: none; width: <?php echo DBG_WINDOW_WIDTH; ?>px;">
	<div class="debug_layer" style="width: <?php echo $this->getWindowWidth(); ?>px;">
	<table width="100%" cellpadding="0" cellspacing="1" border="0" class="debug_layer_table" style="width: <?php echo $this->getWindowWidth(); ?>px;" align="left">
	<tbody id="debug_table"></tbody>
	</table>
	</div>
	</div>

	<script type="text/javascript">
	var $Debugger = new Debugger();
	$Debugger.IsFatalError = <?php echo $this->IsFatalError ? 'true' : 'false'; ?>;
	$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
	$Debugger.EditorPath = '<?php echo defined('DBG_EDITOR') ? addslashes(DBG_EDITOR) : '' ?>';
	$Debugger.RowSeparator = '<?php echo $this->rowSeparator; ?>';
	$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator; ?>';
	<?php
	if ($this->IsFatalError \|\| DBG_RAISE_ON_WARNINGS) {
	echo '$Debugger.Toggle();';
	}
	?>
	window.focus();
	</script>
	<?php
	if (!isset($this->ProfilerTotals['error_handling'])) {
	$memory_used = $debugger_start;
	$this->ProfilerTotalCount['error_handling'] = 0;
	}
	else {
	$memory_used = $debugger_start - $this->ProfilerTotals['error_handling'];
	}

	if ($returnResult) {
	$ret = ob_get_contents();
	if ($clean_output_buffer) {
	ob_clean();
	}
	$ret .= $this->getShortReport($memory_used);

	$this->reportDone = true;
	return $ret;
	}
	else {
	if (!$this->constOn('DBG_HIDE_FULL_REPORT')) {
	$this->breakOutofBuffering();
	}
	elseif ($clean_output_buffer) {
	ob_clean();
	}
	echo $this->getShortReport($memory_used);

	$this->reportDone = true;
	}
	}

	/**
	* Format's memory usage report by debugger
	*
	* @return string
	* @access private
	*/
	function getShortReport($memory_used)
	{
	$info = Array(
	'Script Runtime' => 'PROFILE:script_runtime',
	'-' => 'SEP:-',
	'Notice / Warning' => 'PROFILE_TC:error_handling',
	'SQLs Count' => 'PROFILE_TC:sql',
	);

	$ret = '<tr><td>Application:</td><td><b>'.$this->formatSize($memory_used).'</b> ('.$memory_used.')</td></tr>';
	foreach ($info as $title => $value_key) {
	list ($record_type, $record_data) = explode(':', $value_key, 2);
	switch ($record_type) {
	case 'PROFILE': // profiler totals value
	$Data =& $this->ProfilerData[$record_data];
	$profile_time = ($Data['ends'] - $Data['begins']); // in seconds
	$ret .= '<tr><td>'.$title.':</td><td><b>'.sprintf('%.5f', $profile_time).' s</b></td></tr>';
	break;

	case 'PROFILE_TC': // profile totals record count
	$ret .= '<tr><td>'.$title.':</td><td><b>'.$this->ProfilerTotalCount[$record_data].'</b></td></tr>';
	break;

	case 'SEP':
	$ret .= '<tr><td colspan="2" style="height: 1px; background-color: #000000; padding: 0px;"><img src="'.$this->dummyImage.'" height="1" alt=""/></td></tr>';
	break;
	}
	}

	return '<br /><table class="dbg_stats_table">'.$ret.'</table>';
	}


	/**
	* User-defined error handler
	*
	* @param int $errno
	* @param string $errstr
	* @param string $errfile
	* @param int $errline
	* @param array $errcontext
	*/
	function saveError($errno, $errstr, $errfile = '', $errline = '', $errcontext = '')
	{
	$this->ProfilerData['error_handling']['begins'] = memory_get_usage();

	$errorType = $this->getErrorNameByCode($errno);
	if (!$errorType) {
	trigger_error('Unknown error type ['.$errno.']', E_USER_ERROR);
	return false;
	}

	if ($this->constOn('DBG_IGNORE_STRICT_ERRORS') && defined('E_STRICT') && ($errno == E_STRICT)) return;

	if (preg_match('/(.*)#([\d]+)$/', $errstr, $rets) ) {
	// replace short message with long one (due triger_error limitations on message size)
	$long_id = $rets[2];
	$errstr = $this->longErrors[$long_id];
	unset($this->longErrors[$long_id]);
	}

	if (strpos($errfile,'eval()\'d code') !== false) {
	$errstr = '[<b>EVAL</b>, line <b>'.$errline.'</b>]: '.$errstr;
	$tmpStr = $errfile;
	$pos = strpos($tmpStr,'(');
	$errfile = substr($tmpStr, 0, $pos);
	$pos++;
	$errline = substr($tmpStr,$pos,strpos($tmpStr,')',$pos)-$pos);
	}

	$this->Data[] = Array('no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline, 'context' => $errcontext, 'debug_type' => 'error');
	$this->ProfilerData['error_handling']['ends'] = memory_get_usage();
	$this->profilerAddTotal('error_handling', 'error_handling');
	if (substr($errorType, 0, 5) == 'Fatal') {
	$this->breakOutofBuffering(false);
	$this->IsFatalError = true;
	if (ob_get_level()) ob_flush();
	if (!$this->constOn('DBG_USE_SHUTDOWN_FUNC')) {
	$this->printReport();
	}
	exit;
	}
	}

	function breakOutofBuffering($flush = true)
	{
	while (ob_get_level()) {
	if ($flush) {
	ob_end_flush();
	}
	else {
	ob_end_clean();
	}
	}
	}

	function saveToFile($msg)
	{
	$fp = fopen($_SERVER['DOCUMENT_ROOT'].'/vb_debug.txt', 'a');
	fwrite($fp, $msg."\n");
	fclose($fp);
	}

	/**
	* Formats file/memory size in nice way
	*
	* @param int $bytes
	* @return string
	* @access public
	*/
	function formatSize($bytes)
	{
	if ($bytes >= 1099511627776) {
	$return = round($bytes / 1024 / 1024 / 1024 / 1024, 2);
	$suffix = "TB";
	} elseif ($bytes >= 1073741824) {
	$return = round($bytes / 1024 / 1024 / 1024, 2);
	$suffix = "GB";
	} elseif ($bytes >= 1048576) {
	$return = round($bytes / 1024 / 1024, 2);
	$suffix = "MB";
	} elseif ($bytes >= 1024) {
	$return = round($bytes / 1024, 2);
	$suffix = "KB";
	} else {
	$return = $bytes;
	$suffix = "Byte";
	}
	$return .= ' '.$suffix;
	return $return;
	}

	function printConstants($constants)
	{
	if (!is_array($constants)) {
	$constants = explode(',', $constants);
	}
	$contant_tpl = '<tr><td>%s</td><td><b>%s</b></td></tr>';
	$ret = '<table class="dbg_flat_table" style="width: '.$this->getWindowWidth().'px;">';
	foreach ($constants as $constant_name) {
	$ret .= sprintf($contant_tpl, $constant_name, constant($constant_name));
	}
	$ret .= '</table>';
	$this->appendHTML($ret);
	}

	function AttachToApplication() {
	if (!$this->constOn('DBG_HANDLE_ERRORS')) return true;

	if (class_exists('kApplication')) {
	restore_error_handler();
	$application =& kApplication::Instance();
	$application->Debugger =& $this;
	$application->errorHandlers[] = Array(&$this, 'saveError');
	}
	else {
	set_error_handler(Array(&$this, 'saveError'));
	}
	}
	}

	if (!function_exists('memory_get_usage')) {
	function memory_get_usage(){ return -1; }
	}

	if (!Debugger::constOn('DBG_ZEND_PRESENT')) {
	$debugger = new Debugger();
	}

	if (Debugger::constOn('DBG_USE_SHUTDOWN_FUNC')) {
	register_shutdown_function( Array(&$debugger, 'printReport') );
	}
	}
	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/utility/debugger.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.56
	\ No newline at end of property
	+1.57
	\ No newline at end of property
	Index: trunk/core/kernel/db/db_tag_processor.php
	===================================================================
	--- trunk/core/kernel/db/db_tag_processor.php (revision 4995)
	+++ trunk/core/kernel/db/db_tag_processor.php (revision 4996)
	@@ -1,1547 +1,1547 @@
	<?php

	class kDBTagProcessor extends TagProcessor {

	/**
	* Description
	*
	* @var kDBConnection
	* @access public
	*/
	var $Conn;

	function kDBTagProcessor()
	{
	parent::kBase();
	$this->Conn =& $this->Application->GetADODBConnection();
	}


	/**
	* Returns true if "new" button was pressed in toolbar
	*
	* @param Array $params
	* @return bool
	*/
	function IsNewMode($params)
	{
	$object =& $this->getObject($params);
	return $object->GetID() <= 0;
	}

	/**
	* Returns view menu name for current prefix
	*
	* @param Array $params
	* @return string
	*/
	function GetItemName($params)
	{
	$item_name = $this->Application->getUnitOption($this->Prefix, 'ViewMenuPhrase');
	return $this->Application->Phrase($item_name);
	}

	function ViewMenu($params)
	{
	$block_params = $params;
	unset($block_params['block']);
	$block_params['name'] = $params['block'];

	$list =& $this->GetList($params);
	$block_params['PrefixSpecial'] = $list->getPrefixSpecial();
	return $this->Application->ParseBlock($block_params);
	}

	function SearchKeyword($params)
	{
	$list =& $this->GetList($params);
	return $this->Application->RecallVar($list->getPrefixSpecial().'_search_keyword');
	}

	/**
	* Draw filter menu content (for ViewMenu) based on filters defined in config
	*
	* @param Array $params
	* @return string
	*/
	function DrawFilterMenu($params)
	{
	$block_params = $this->prepareTagParams($params);
	$block_params['name'] = $params['spearator_block'];
	$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);
	return '';
	}

	// Params: label, filter_action, filter_status
	$block_params['name'] = $params['item_block'];

	$view_filter = $this->Application->RecallVar($this->getPrefixSpecial().'_view_filter');
	if($view_filter === false)
	{
	$event_params = Array('prefix'=>$this->Prefix,'special'=>$this->Special,'name'=>'OnRemoveFilters');
	$this->Application->HandleEvent( new kEvent($event_params) );
	$view_filter = $this->Application->RecallVar($this->getPrefixSpecial().'_view_filter');
	}
	$view_filter = unserialize($view_filter);

	$filters = Array();
	$prefix_special = $this->getPrefixSpecial();

	foreach($filter_menu['Filters'] as $filter_key => $filter_params)
	{
	if(!$filter_params)
	{
	$filters[] = $separator;
	continue;
	}

	$block_params['label'] = addslashes( $this->Application->Phrase($filter_params['label']) );
	if( getArrayValue($view_filter,$filter_key) )
	{
	$submit = 0;
	$status = 1;
	}
	else
	{
	$submit = 1;
	$status = 0;
	}
	$block_params['filter_action'] = 'set_filter("'.$prefix_special.'","'.$filter_key.'","'.$submit.'");';
	$block_params['filter_status'] = $status;
	$filters[] = $this->Application->ParseBlock($block_params);
	}
	return implode('', $filters);
	}

	function IterateGridFields($params)
	{
	$mode = $params['mode'];
	$def_block = $params['block'];

	$grids = $this->Application->getUnitOption($this->Prefix,'Grids');
	$grid_config = $grids[$params['grid']]['Fields'];

	$std_params['pass_params']='true';
	$std_params['PrefixSpecial']=$this->getPrefixSpecial();

	$o = '';
	foreach ($grid_config as $field => $options) {
	$block_params = Array();
	$block_params['name'] = isset($options[$mode.'_block']) ? $options[$mode.'_block'] : $def_block;
	$block_params['field'] = $field;
	$block_params['sort_field'] = isset($options['sort_field']) ? $options['sort_field'] : $field;
	$block_params = array_merge($std_params, $block_params, $options);
	$o.= $this->Application->ParseBlock($block_params, 1);
	}
	return $o;
	}

	function GridFieldsCount($params)
	{
	$grids = $this->Application->getUnitOption($this->Prefix, 'Grids');
	$grid_config = $grids[$params['grid']]['Fields'];

	return count($grid_config);
	}

	/**
	* Prints list content using block specified
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function PrintList($params)
	{
	$list =& $this->GetList($params);
	$id_field = $this->Application->getUnitOption($this->Prefix,'IDField');

	$list->Query();
	$o = '';
	$list->GoFirst();

	$block_params=$this->prepareTagParams($params);
	$block_params['name'] = $this->SelectParam($params, 'render_as,block');
	$block_params['pass_params'] = 'true';

	while (!$list->EOL())
	{
	$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
	$o.= $this->Application->ParseBlock($block_params, 1);
	$list->GoNext();
	}

	$this->Application->SetVar( $this->getPrefixSpecial().'_id', '');
	return $o;
	}

	function InitList($params)
	{
	- $list_name = $params['list_name'];
	+ $list_name = isset($params['list_name']) ? $params['list_name'] : '';

	$names_mapping = $this->Application->GetVar('NamesToSpecialMapping');

	if( !getArrayValue($names_mapping, $this->Prefix, $list_name) )
	{
	$list =& $this->GetList($params);
	}
	}

	function BuildListSpecial($params)
	{
	return $this->Special;
	}

	/**
	* Enter description here...
	*
	* @param Array $params
	* @return kDBList
	*/
	function &GetList($params)
	{
	$list_name = $this->SelectParam($params, 'list_name,name');
	if (!$list_name) {
	$list_name = $this->Application->Parser->GetParam('list_name');
	}

	$requery = getArrayValue($params, 'requery');
	if ($list_name && !$requery){
	$names_mapping = $this->Application->GetVar('NamesToSpecialMapping');

	$special = getArrayValue($names_mapping, $this->Prefix, $list_name);
	if(!$special)
	{
	$special = $this->BuildListSpecial($params);
	}
	}
	else
	{
	$special = $this->BuildListSpecial($params);
	}

	$prefix_special = rtrim($this->Prefix.'.'.$special, '.');
	$params['skip_counting'] = true;
	$list =& $this->Application->recallObject( $prefix_special, $this->Prefix.'_List', $params);
	if ($requery) {
	$this->Application->HandleEvent($an_event, $prefix_special.':OnListBuild', $params);
	}
	$list->Query($requery);
	$this->Special = $special;

	if ($list_name) {
	$names_mapping[$this->Prefix][$list_name] = $special;
	$this->Application->SetVar('NamesToSpecialMapping', $names_mapping);
	}

	return $list;
	}

	function ListMarker($params)
	{
	$list =& $this->GetList($params);
	$ret = $list->getPrefixSpecial();
	if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
	return $ret;
	}

	function SubmitName($params)
	{
	$list =& $this->GetList($params);

	$prefix_special = $list->getPrefixSpecial();

	return 'events['.$prefix_special.']['.$params['event'].']';
	}


	function CombinedSortingDropDownName($params)
	{
	$list =& $this->GetList($params);
	$prefix_special = $list->getPrefixSpecial();

	return $prefix_special.'_CombinedSorting';
	}

	function SortingSelected($params)
	{
	$list =& $this->GetList($params);
	$user_sorting_start = $this->getUserSortIndex();

	$sorting = strtolower($list->GetOrderField($user_sorting_start).'\|'.$list->GetOrderDirection($user_sorting_start));

	if ($sorting == strtolower($params['sorting'])) return $params['selected'];
	}



	/**
	* Prints list content using block specified
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function PrintList2($params)
	{
	$per_page = $this->SelectParam($params, 'per_page,max_items');
	if ($per_page !== false) $params['per_page'] = $per_page;

	$list =& $this->GetList($params);
	$o = '';

	$direction = (isset($params['direction']) && $params['direction']=="H")?"H":"V";
	$columns = (isset($params['columns'])) ? $params['columns'] : 1;

	$id_field = (isset($params['id_field'])) ? $params['id_field'] : $this->Application->getUnitOption($this->Prefix, 'IDField');

	if ($columns>1 && $direction=="V") {
	$list->Records = $this->LinearToVertical($list->Records, $columns, $list->GetPerPage());
	$list->SelectedCount=count($list->Records);
	ksort($list->Records); // this is issued twice, maybe need to be removed
	}

	$list->GoFirst();

	$block_params=$this->prepareTagParams($params);
	$block_params['name']=$this->SelectParam($params, 'render_as,block');
	$block_params['pass_params']='true';
	$block_params['column_width'] = 100 / $columns;
	$block_start_row_params=$this->prepareTagParams($params);
	$block_start_row_params['name'] = $this->SelectParam($params, 'row_start_render_as,block_row_start,row_start_block');

	$block_end_row_params=$this->prepareTagParams($params);
	$block_end_row_params['name'] = $this->SelectParam($params, 'row_end_render_as,block_row_end,row_end_block');

	$block_empty_cell_params = $this->prepareTagParams($params);
	$block_empty_cell_params['name'] = $this->SelectParam($params, 'empty_cell_render_as,block_empty_cell,empty_cell_block');

	$i=0;

	$backup_id=$this->Application->GetVar($this->Prefix."_id");
	$displayed = array();
	$column_number = 1;
	while (!$list->EOL())
	{
	$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
	$this->Application->SetVar( $this->Prefix.'_id', $list->GetDBField($id_field) );

	if ($i % $columns == 0) {
	// record in this iteration is first in row, then open row
	$column_number = 1;
	$o.= $block_start_row_params['name'] ? $this->Application->ParseBlock($block_start_row_params, 1) : '<tr>';
	}
	else {
	$column_number++;
	}

	$block_params['column_number'] = $column_number;
	$o.= $this->Application->ParseBlock($block_params, 1);
	array_push($displayed, $list->GetDBField($id_field));

	if (($i+1) % $columns == 0) {
	// record in next iteration is first in row too, then close this row
	$o.= $block_end_row_params['name'] ? $this->Application->ParseBlock($block_end_row_params, 1) : '</tr>';
	}

	$list->GoNext();
	$i++;
	}

	// append empty cells in place of missing cells in last row
	while ($i % $columns != 0) {
	// until next cell will be in new row append empty cells
	$o .= $block_empty_cell_params['name'] ? $this->Application->ParseBlock($block_empty_cell_params, 1) : '<td> </td>';

	if (($i+1) % $columns == 0) {
	// record in next iteration is first in row too, then close this row
	$o .= $block_end_row_params['name'] ? $this->Application->ParseBlock($block_end_row_params, 1) : '</tr>';
	}
	$i++;
	}

	$cur_displayed = $this->Application->GetVar($this->Prefix.'_displayed_ids');
	if (!$cur_displayed) {
	$cur_displayed = Array();
	}
	else {
	$cur_displayed = explode(',', $cur_displayed);
	}

	$displayed = array_unique(array_merge($displayed, $cur_displayed));
	$this->Application->SetVar($this->Prefix.'_displayed_ids', implode(',',$displayed));

	$this->Application->SetVar( $this->Prefix.'_id', $backup_id);
	$this->Application->SetVar( $this->getPrefixSpecial().'_id', '');

	if (isset($params['more_link_render_as'])) {
	$block_params = $params;
	$params['render_as'] = $params['more_link_render_as'];
	$o .= $this->MoreLink($params);
	}

	return $o;
	}

	function MoreLink($params)
	{
	$per_page = $this->SelectParam($params, 'per_page,max_items');
	if ($per_page !== false) $params['per_page'] = $per_page;
	$list =& $this->GetList($params);
	if ($list->PerPage < $list->RecordsCount) {
	$block_params = array();
	$block_params['name'] = $this->SelectParam($params, 'render_as,block');
	return $this->Application->ParseBlock($block_params, 1);
	}
	}

	function NotLastItem($params)
	{
	$object =& $this->getObject($params); // maybe we should use $this->GetList($params) instead
	return ($object->CurrentIndex < min($object->PerPage, $object->RecordsCount) - 1);
	}

	function PageLink($params)
	{
	$t = isset($params['template']) ? $param['template'] : '';
	if (!$t) $t = $this->Application->GetVar('t');

	if (isset($params['page'])) {
	$this->Application->SetVar($this->getPrefixSpecial().'_Page', $params['page']);
	}

	// $http_query =& $this->Application->recallObject('HTTPQuery');
	// $get = $http_query->getRedirectParams();
	$pass = Array('pass' => 'all,'.$this->getPrefixSpecial());
	// $pass = array_merge($get, $pass);

	return $this->Application->HREF($t, '', $pass);
	}

	function ColumnWidth($params)
	{
	$columns = $this->Application->Parser->GetParam('columns');
	return round(100/$columns).'%';
	}

	/**
	* Append prefix and special to tag
	* params (get them from tagname) like
	* they were really passed as params
	*
	* @param Array $tag_params
	* @return Array
	* @access protected
	*/
	function prepareTagParams($tag_params = Array())
	{
	/*if (isset($tag_params['list_name'])) {
	$list =& $this->GetList($tag_params);
	$this->Init($list->Prefix, $list->Special);
	}*/

	$ret = $tag_params;
	$ret['Prefix'] = $this->Prefix;
	$ret['Special'] = $this->Special;
	$ret['PrefixSpecial'] = $this->getPrefixSpecial();
	return $ret;
	}

	function GetISO($currency)
	{
	if ($currency == 'selected') {
	$iso = $this->Application->RecallVar('curr_iso');
	}
	elseif ($currency == 'primary' \|\| $currency == '') {
	$iso = $this->Application->GetPrimaryCurrency();
	}
	else { //explicit currency
	$iso = $currency;
	}
	return $iso;
	}

	function ConvertCurrency($value, $iso)
	{
	$converter =& $this->Application->recallObject('kCurrencyRates');
	// convery primary currency to selected (if they are the same, converter will just return)
	$value = $converter->Convert($value, 'PRIMARY', $iso);
	return $value;
	}

	function AddCurrencySymbol($value, $iso)
	{
	$this->Application->setUnitOption('curr', 'AutoLoad', false);
	$currency =& $this->Application->recallObject('curr.-'.$iso);
	if( !$currency->isLoaded() ) $currency->Load($iso, 'ISO');

	$symbol = $currency->GetDBField('Symbol');
	if (!$symbol) $symbol = $currency->GetDBField('ISO').' ';
	if ($currency->GetDBField('SymbolPosition') == 0) {
	$value = $symbol.$value;
	}
	if ($currency->GetDBField('SymbolPosition') == 1) {
	$value = $value.$symbol;
	}
	return $value;
	}

	/**
	* Get's requested field value
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function Field($params)
	{
	$field = $this->SelectParam($params, 'name,field');

	if( !$this->Application->IsAdmin() ) $params['no_special'] = 'no_special';

	$object =& $this->getObject($params);

	if ( $this->HasParam($params, 'db') )
	{
	$value = $object->GetDBField($field);
	}
	else
	{
	if( $this->HasParam($params, 'currency') )
	{
	$iso = $this->GetISO($params['currency']);
	$original = $object->GetDBField($field);
	$value = $this->ConvertCurrency($original, $iso);
	$object->SetDBField($field, $value);
	$object->Fields[$field]['converted'] = true;
	}

	$format = getArrayValue($params, 'format');
	if( !$format \|\| $format == '$format' )
	{
	$format = null;
	}
	else
	{
	if(preg_match("/_regional_(.*)/", $format, $regs))
	{
	$lang =& $this->Application->recallObject('lang.current');
	$format = $lang->GetDBField($regs[1]);
	}
	}
	$value = $object->GetField($field, $format);

	if( $this->SelectParam($params, 'negative') )
	{
	if(strpos($value, '-') === 0)
	{
	$value = substr($value, 1);
	}
	else
	{
	$value = '-'.$value;
	}
	}

	if( $this->HasParam($params, 'currency') )
	{
	$value = $this->AddCurrencySymbol($value, $iso);
	$params['no_special'] = 1;
	}
	}

	if( getArrayValue($params,'nl2br' ) ) $value = nl2br($value);
	if( !$this->HasParam($params, 'no_special') ) $value = htmlspecialchars($value);
	if( getArrayValue($params,'checked' ) ) $value = ($value == 1) ? 'checked' : '';
	if( getArrayValue($params,'as_label') ) $value = $this->Application->Phrase($value);

	$first_chars = $this->SelectParam($params,'first_chars,cut_first');
	if($first_chars)
	{
	$needs_cut = strlen($value) > $first_chars;
	$value = substr($value,0,$first_chars);
	if($needs_cut) $value .= ' ...';
	}

	if ($value != '') $this->Application->Parser->DataExists = true;

	if( $this->HasParam($params, 'currency') )
	{
	//restoring value in original currency, for other Field tags to work properly
	$object->SetDBField($field, $original);
	}

	return $value;
	}

	function SetField($params)
	{
	// <inp2:SetField field="Value" src=p:cust_{$custom_name}"/>

	$object =& $this->getObject($params);
	$dst_field = $this->SelectParam($params, 'name,field');

	list($prefix_special, $src_field) = explode(':', $params['src']);
	$src_object =& $this->Application->recallObject($prefix_special);
	$object->SetDBField($dst_field, $src_object->GetDBField($src_field));
	}

	/**
	* Checks if parameter is passed
	* Note: works like Tag and line simple method too
	*
	* @param Array $params
	* @param string $param_name
	* @return bool
	*/
	function HasParam($params, $param_name = null)
	{
	if( !isset($param_name) )
	{
	$param_name = $this->SelectParam($params, 'name');
	$params = $this->Application->Parser->Params;
	}
	$value = getArrayValue($params, $param_name);
	return $value && ($value != '$'.$param_name);
	}

	function PhraseField($params)
	{
	$field_label = $this->Field($params);
	$translation = $this->Application->Phrase( $field_label );
	return $translation;
	}

	function Error($params)
	{
	$field = $params['field'];
	$object =& $this->getObject($params);
	$msg = $object->GetErrorMsg($field, false);
	return $msg;
	}

	function HasError($params)
	{
	if ($params['field'] == 'any')
	{
	$object =& $this->getObject($params);

	$skip_fields = getArrayValue($params, 'except');
	$skip_fields = $skip_fields ? explode(',', $skip_fields) : Array();

	return $object->HasErrors($skip_fields);
	}
	else
	{
	$fields = $this->SelectParam($params, 'field,fields');
	$fields = explode(',', $fields);
	$res = false;
	foreach($fields as $field)
	{
	$params['field'] = $field;
	$res = $res \|\| ($this->Error($params) != '');
	}
	return $res;
	}
	}

	function IsRequired($params)
	{
	$field = $params['field'];
	$object =& $this->getObject($params);;

	$options = $object->GetFieldOptions($field);
	return getArrayValue($options,'required');
	}

	function PredefinedOptions($params)
	{
	$field = $params['field'];
	$object =& $this->getObject($params);

	$value = $object->GetDBField($field);
	$options = $object->GetFieldOptions($field);
	if( $this->HasParam($params,'has_empty') )
	{
	$empty_value = getArrayValue($params, 'empty_value');
	if($empty_value === false) $empty_value = '';
	$options['options'] = array_merge_recursive2( Array($empty_value => ''), $options['options'] );
	}

	$block_params = $this->prepareTagParams($params);

	$block_params['name'] = $this->SelectParam($params, 'render_as,block');
	$block_params['field'] = $params['field'];
	$block_params['pass_params'] = 'true';
	$block_params['field_name'] = $this->InputName($params);
	$block_params['PrefixSpecial'] = $this->getPrefixSpecial();

	$selected_param_name = getArrayValue($params,'selected_param');
	if(!$selected_param_name) $selected_param_name = $params['selected'];
	$selected = $params['selected'];

	$o = '';
	if( $this->HasParam($params,'no_empty') && !getArrayValue($options['options'],'') ) array_shift($options['options']);

	if( strpos($value, '\|') !== false )
	{
	// multiple selection checkboxes
	$value = explode('\|', substr($value, 1, -1) );
	foreach ($options['options'] as $key => $val)
	{
	$block_params['key'] = $key;
	$block_params['option'] = $val;
	$block_params[$selected_param_name] = ( in_array($key, $value) ? ' '.$selected : '');
	$o .= $this->Application->ParseBlock($block_params, 1);
	}
	}
	else
	{
	// single selection radio or checkboxes
	foreach ($options['options'] as $key => $val)
	{
	$block_params['key'] = $key;
	$block_params['option'] = $val;
	$block_params[$selected_param_name] = ( $key == $value ? ' '.$selected : '');
	$o .= $this->Application->ParseBlock($block_params, 1);
	}
	}
	return $o;
	}

	function PredefinedSearchOptions($params)
	{
	$object =& $this->getObject($params);
	$field = $params['field'];
	$saved_value = $object->GetDBField($field);

	$custom_filters = $this->Application->RecallVar( $this->getPrefixSpecial().'_custom_filters');
	if ($custom_filters) {
	$custom_filters = unserialize($custom_filters);
	$append = getArrayValue($params, 'type') ? '_'.$params['type'] : '';
	$object->SetDBField($field, $custom_filters[$field.$append]);
	}
	else {
	$object->SetDBField($field, '');
	}
	$ret = $this->PredefinedOptions($params);
	$object->SetDBField($field, $saved_value);
	return $ret;
	}

	function Format($params)
	{
	$field = $params['field'];
	$object =& $this->getObject($params);

	$options = $object->GetFieldOptions($field);

	$format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ];

	$formatter_class = getArrayValue($options,'formatter');
	if($formatter_class)
	{
	$formatter =& $this->Application->recallObject($formatter_class);
	$human_format = getArrayValue($params,'human');
	$edit_size = getArrayValue($params,'edit_size');
	$sample = getArrayValue($params,'sample');
	if($sample)
	{
	return $formatter->GetSample($field, $options, $object);
	}
	elseif($human_format \|\| $edit_size)
	{
	$format = $formatter->HumanFormat($format);
	return $edit_size ? strlen($format) : $format;
	}
	}

	return $format;
	}

	/**
	* Print grid pagination using
	* block names specified
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function PrintPages($params)
	{
	$list =& $this->GetList($params);
	$prefix_special = $list->getPrefixSpecial();
	$total_pages = $list->GetTotalPages();

	if ($total_pages) $this->Application->Parser->DataExists = true;

	if($total_pages == 0) $total_pages = 1; // display 1st page as selected in case if we have no pages at all
	$o = '';

	// what are these 2 lines for?
	$this->Application->SetVar($prefix_special.'_event','');
	$this->Application->SetVar($prefix_special.'_id','');

	$current_page = $list->Page; // $this->Application->RecallVar($prefix_special.'_Page');

	$block_params = $this->prepareTagParams($params);

	$split = ( isset($params['split'] ) ? $params['split'] : 10 );

	$split_start = $current_page - ceil($split/2);
	if ($split_start < 1){
	$split_start = 1;
	}
	$split_end = $split_start + $split-1;

	if ($split_end > $total_pages) {
	$split_end = $total_pages;
	$split_start = max($split_end - $split + 1, 1);
	}

	if ($current_page > 1){
	$prev_block_params = $this->prepareTagParams();

	if ($total_pages > $split){
	$prev_block_params['page'] = max($current_page-$split, 1);
	$prev_block_params['name'] = $this->SelectParam($params, 'prev_page_split_render_as,prev_page_split_block');
	if ($prev_block_params['name']){
	$o .= $this->Application->ParseBlock($prev_block_params, 1);
	}
	}

	$prev_block_params['name'] = 'page';
	$prev_block_params['page'] = $current_page-1;
	$prev_block_params['name'] = $this->SelectParam($params, 'prev_page_render_as,block_prev_page,prev_page_block');
	if ($prev_block_params['name']) {
	$this->Application->SetVar($this->getPrefixSpecial().'_Page', $current_page-1);
	$o .= $this->Application->ParseBlock($prev_block_params, 1);
	}
	}
	else {
	if ( $no_prev_page_block = $this->SelectParam($params, 'no_prev_page_render_as,block_no_prev_page') ) {
	$block_params['name'] = $no_prev_page_block;
	$o .= $this->Application->ParseBlock($block_params, 1);
	}
	}

	$separator_params['name'] = $this->SelectParam($params, 'separator_render_as,block_separator');
	for ($i = $split_start; $i <= $split_end; $i++)
	{
	if ($i == $current_page) {
	$block = $this->SelectParam($params, 'current_render_as,active_render_as,block_current,active_block');
	}
	else {
	$block = $this->SelectParam($params, 'link_render_as,inactive_render_as,block_link,inactive_block');
	}

	$block_params['name'] = $block;
	$block_params['page'] = $i;
	$this->Application->SetVar($this->getPrefixSpecial().'_Page', $i);
	$o .= $this->Application->ParseBlock($block_params, 1);

	if ($this->SelectParam($params, 'separator_render_as,block_separator')
	&& $i < $split_end)
	{
	$o .= $this->Application->ParseBlock($separator_params, 1);
	}
	}

	if ($current_page < $total_pages){
	$next_block_params = $this->prepareTagParams();
	$next_block_params['page']=$current_page+1;
	$next_block_params['name'] = $this->SelectParam($params, 'next_page_render_as,block_next_page,next_page_block');
	if ($next_block_params['name']){
	$this->Application->SetVar($this->getPrefixSpecial().'_Page', $current_page+1);
	$o .= $this->Application->ParseBlock($next_block_params, 1);
	}
	if ($total_pages > $split){
	$next_block_params['page']=min($current_page+$split, $total_pages);
	$next_block_params['name'] = $this->SelectParam($params, 'next_page_split_render_as,next_page_split_block');
	if ($next_block_params['name']){
	$o .= $this->Application->ParseBlock($next_block_params, 1);
	}
	}
	}

	$this->Application->SetVar($this->getPrefixSpecial().'_Page', $current_page);
	return $o;
	}

	/**
	* Print grid pagination using
	* block names specified
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function PaginationBar($params)
	{
	return $this->PrintPages($params);
	}


	/**
	* Returns field name (processed by kMultiLanguage formatter
	* if required) and item's id from it's IDField or field required
	*
	* @param Array $params
	* @return Array (id,field)
	* @access private
	*/
	function prepareInputName($params)
	{
	$field = $this->SelectParam($params, 'name,field');
	$object =& $this->getObject($params);

	$formatter_class = getArrayValue($object->Fields, $field, 'formatter');
	if ($formatter_class == 'kMultiLanguage')
	{
	$formatter =& $this->Application->recallObject($formatter_class);
	$field = $formatter->LangFieldName($field);
	}

	$id_field = getArrayValue($params, 'IdField');
	$id = $id_field ? $object->GetDBField($id_field) : $object->GetID();

	return Array($id, $field);
	}


	/**
	* Returns input field name to
	* be placed on form (for correct
	* event processing)
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function InputName($params)
	{
	list($id, $field) = $this->prepareInputName($params);

	$ret = $this->getPrefixSpecial().'['.$id.']['.$field.']';
	if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
	return $ret;
	}

	/**
	* Allows to override various field options through hidden fields with specific names in submit.
	* This tag generates this special names
	*
	* @param Array $params
	* @return string
	* @author Alex
	*/
	function FieldModifier($params)
	{
	list($id, $field) = $this->prepareInputName($params);

	$ret = 'field_modifiers['.$this->getPrefixSpecial().']['.$field.']['.$params['type'].']';
	if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
	return $ret;
	}

	/**
	* Returns index where 1st changable sorting field begins
	*
	* @return int
	* @access private
	*/
	function getUserSortIndex()
	{
	$list_sortings = $this->Application->getUnitOption($this->Prefix, 'ListSortings');
	$sorting_prefix = getArrayValue($list_sortings, $this->Special) ? $this->Special : '';

	$user_sorting_start = 0;
	if ( $forced_sorting = getArrayValue($list_sortings, $sorting_prefix, 'ForcedSorting') ) {
	$user_sorting_start = count($forced_sorting);
	}
	return $user_sorting_start;
	}

	/**
	* Returns order direction for given field
	*
	*
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function Order($params)
	{
	$field = $params['field'];
	$user_sorting_start = $this->getUserSortIndex();

	$list =& $this->GetList($params);

	if ($list->GetOrderField($user_sorting_start) == $field)
	{
	return strtolower($list->GetOrderDirection($user_sorting_start));
	}
	elseif($list->GetOrderField($user_sorting_start+1) == $field)
	{
	return '2_'.strtolower($list->GetOrderDirection($user_sorting_start+1));
	}
	else
	{
	return 'no';
	}
	}

	/**
	* Get's information of sorting field at "pos" position,
	* like sorting field name (type="field") or sorting direction (type="direction")
	*
	* @param Array $params
	* @return mixed
	*/
	function OrderInfo($params)
	{
	$user_sorting_start = $this->getUserSortIndex() + --$params['pos'];
	$list =& $this->GetList($params);
	// $object =& $this->Application->recallObject( $this->getPrefixSpecial() );

	if($params['type'] == 'field') return $list->GetOrderField($user_sorting_start);
	if($params['type'] == 'direction') return $list->GetOrderDirection($user_sorting_start);
	}

	/**
	* Checks if sorting field/direction matches passed field/direction parameter
	*
	* @param Array $params
	* @return bool
	*/
	function IsOrder($params)
	{
	$params['type'] = isset($params['field']) ? 'field' : 'direction';
	$value = $this->OrderInfo($params);

	if( isset($params['field']) ) return $params['field'] == $value;
	if( isset($params['direction']) ) return $params['direction'] == $value;
	}

	/**
	* Returns list perpage
	*
	* @param Array $params
	* @return int
	*/
	function PerPage($params)
	{
	$object =& $this->getObject($params);
	return $object->PerPage;
	}

	/**
	* Checks if list perpage matches value specified
	*
	* @param Array $params
	* @return bool
	*/
	function PerPageEquals($params)
	{
	$object =& $this->getObject($params);
	return $object->PerPage == $params['value'];
	}

	function SaveEvent($params)
	{
	// SaveEvent is set during OnItemBuild, but we may need it before any other tag calls OnItemBuild
	$object =& $this->getObject($params);
	return $this->Application->GetVar($this->getPrefixSpecial().'_SaveEvent');
	}

	function NextId($params)
	{
	$object =& $this->getObject($params);
	$ids = explode(',', $this->Application->RecallVar($this->getPrefixSpecial().'_selected_ids'));

	$cur_id = $object->GetID();

	$i = array_search($cur_id, $ids);
	if ($i !== false) {
	return $i < count($ids) - 1 ? $ids[$i + 1] : '';
	}
	return '';
	}

	function PrevId($params)
	{
	$object =& $this->getObject($params);
	$ids = explode(',', $this->Application->RecallVar($this->getPrefixSpecial().'_selected_ids'));

	$cur_id = $object->GetID();

	$i = array_search($cur_id, $ids);
	if ($i !== false) {
	return $i > 0 ? $ids[$i - 1] : '';
	}
	return '';
	}

	function IsSingle($params)
	{
	return ($this->NextId($params) === '' && $this->PrevId($params) === '');
	}

	function IsLast($params)
	{
	return ($this->NextId($params) === '');
	}

	function IsFirst($params)
	{
	return ($this->PrevId($params) === '');
	}

	/**
	* Checks if field value is equal to proposed one
	*
	* @param Array $params
	* @return bool
	*/
	function FieldEquals($params)
	{
	$object =& $this->getObject($params);
	$ret = $object->GetDBField($this->SelectParam($params, 'name,field')) == $params['value'];
	// if( getArrayValue($params,'inverse') ) $ret = !$ret;
	return $ret;
	}

	function ItemIcon($params)
	{
	$object =& $this->getObject($params);

	$grids = $this->Application->getUnitOption($this->Prefix,'Grids');
	$icons =& $grids[ $params['grid'] ]['Icons'];

	$key = '';
	$status_fields = $this->Application->getUnitOption($this->Prefix,'StatusField');
	if(!$status_fields) return $icons['default'];

	foreach($status_fields as $status_field)
	{
	$key .= $object->GetDBField($status_field).'_';
	}
	$key = rtrim($key,'_');
	$value = ($key !== false) ? $key : 'default';

	return isset($icons[$value]) ? $icons[$value] : $icons['default'];
	}

	/**
	* Generates bluebar title + initializes prefixes used on page
	*
	* @param Array $params
	* @return string
	*/
	function SectionTitle($params)
	{
	$preset_name = replaceModuleSection($params['title_preset']);
	$title_presets = $this->Application->getUnitOption($this->Prefix,'TitlePresets');
	$title_info = getArrayValue($title_presets, $preset_name);
	if($title_info === false) return str_replace('#preset_name#', $preset_name, $params['title']);

	if( getArrayValue($title_presets,'default') )
	{
	// use default labels + custom labels specified in preset used
	$title_info = array_merge_recursive2($title_presets['default'], $title_info);
	}

	$title = $title_info['format'];

	// 1. get objects in use for title construction
	$objects = Array();
	$object_status = Array();
	$status_labels = Array();

	$prefixes = getArrayValue($title_info,'prefixes');
	$all_tag_params = getArrayValue($title_info,'tag_params');
	if($prefixes)
	{
	$tag_params = Array();
	foreach($prefixes as $prefix_special)
	{
	$prefix_data = $this->Application->processPrefix($prefix_special);
	$prefix_data['prefix_special'] = rtrim($prefix_data['prefix_special'],'.');

	if($all_tag_params)
	{
	$tag_params = getArrayValue($all_tag_params, $prefix_data['prefix_special']);
	if(!$tag_params) $tag_params = Array();
	}

	$tag_params = array_merge_recursive2($params, $tag_params);
	$objects[ $prefix_data['prefix_special'] ] =& $this->Application->recallObject($prefix_data['prefix_special'], $prefix_data['prefix'], $tag_params);
	$object_status[ $prefix_data['prefix_special'] ] = $objects[ $prefix_data['prefix_special'] ]->GetID() ? 'edit' : 'new';

	// a. set object's status field (adding item/editing item) for each object in title
	if( getArrayValue($title_info[ $object_status[ $prefix_data['prefix_special'] ].'_status_labels' ],$prefix_data['prefix_special']) )
	{
	$status_labels[ $prefix_data['prefix_special'] ] = $title_info[ $object_status[ $prefix_data['prefix_special'] ].'_status_labels' ][ $prefix_data['prefix_special'] ];
	$title = str_replace('#'.$prefix_data['prefix_special'].'_status#', $status_labels[ $prefix_data['prefix_special'] ], $title);
	}

	// b. setting object's titlefield value (in titlebar ONLY) to default in case if object beeing created with no titlefield filled in
	if( $object_status[ $prefix_data['prefix_special'] ] == 'new' )
	{
	$new_value = $this->getInfo( $objects[ $prefix_data['prefix_special'] ], 'titlefield' );
	if(!$new_value && getArrayValue($title_info['new_titlefield'],$prefix_data['prefix_special']) ) $new_value = $this->Application->Phrase($title_info['new_titlefield'][ $prefix_data['prefix_special'] ]);
	$title = str_replace('#'.$prefix_data['prefix_special'].'_titlefield#', $new_value, $title);
	}
	}
	}

	// 2. replace phrases if any found in format string
	$title = $this->Application->ReplaceLanguageTags($title,false);

	// 3. find and replace any replacement vars
	preg_match_all('/#(._.)#/Uis',$title,$rets);
	if($rets[1])
	{
	$replacement_vars = array_keys( array_flip($rets[1]) );
	foreach($replacement_vars as $replacement_var)
	{
	$var_info = explode('_',$replacement_var,2);
	$object =& $objects[ $var_info[0] ];
	$new_value = $this->getInfo($object,$var_info[1]);
	$title = str_replace('#'.$replacement_var.'#', $new_value, $title);
	}
	}

	$cut_first = getArrayValue($params,'cut_first');
	if( $cut_first && strlen($title) > $cut_first && !preg_match('/<a href="(.)">(.)<\/a>/',$title) ) $title = substr($title, 0, $cut_first).' ...';

	return $title;
	}

	function getInfo(&$object, $info_type)
	{
	switch ($info_type)
	{
	case 'titlefield':
	$field = $this->Application->getUnitOption($object->Prefix,'TitleField');
	return $field !== false ? $object->GetField($field) : 'TitleField Missing';
	break;

	case 'recordcount':
	$of_phrase = $this->Application->Phrase('la_of');
	return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' '.$of_phrase.' '.$object->NoFilterCount : $object->RecordsCount;
	break;

	default:
	break;
	}
	}

	/**
	* Parses block depending on its element type.
	* For radio and select elements values are taken from 'value_list_field' in key1=value1,key2=value2
	* format. key=value can be substituted by <SQL>SELECT f1 AS OptionName, f2 AS OptionValue... FROM <PREFIX>TableName </SQL>
	* where prefix is TABLE_PREFIX
	*
	* @param Array $params
	* @return string
	*/
	function ConfigFormElement($params)
	{
	$object =& $this->getObject($params);
	$field = $params['field'];

	$helper =& $this->Application->recallObject('InpCustomFieldsHelper');

	$element_type = $object->GetDBField($params['element_type_field']);

	if($element_type == 'label') $element_type = 'text';
	$params['name'] = $params['blocks_prefix'].$element_type;

	switch ($element_type) {
	case 'select':
	case 'radio':
	$field_options = $object->GetFieldOptions($field, 'options');
	$field_options['options'] = $helper->GetValuesHash( $object->GetDBField($params['value_list_field']) );
	$object->SetFieldOptions($field, $field_options);
	break;

	case 'textarea':
	$params['field_params'] = $helper->ParseConfigSQL($object->GetDBField($params['value_list_field']));
	break;

	case 'password':
	case 'text':
	case 'checkbox':
	default:
	break;
	}
	return $this->Application->ParseBlock($params, 1);
	}

	/**
	* Get's requested custom field value
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function CustomField($params)
	{
	$params['name'] = 'cust_'.$this->SelectParam($params, 'name,field');
	return $this->Field($params);
	}

	function CustomFieldLabel($params)
	{
	$object =& $this->getObject($params);

	$field = $this->SelectParam($params, 'name,field');

	$sql = 'SELECT FieldLabel
	FROM '.$this->Application->getUnitOption('cf', 'TableName').'
	WHERE FieldName = '.$this->Conn->qstr($field);
	return $this->Application->Phrase($this->Conn->GetOne($sql));
	}

	/**
	* transposes 1-dimensional array elements for vertical alignment according to given columns and per_page parameters
	*
	* @param array $arr
	* @param int $columns
	* @param int $per_page
	* @return array
	*/
	function LinearToVertical(&$arr, $columns, $per_page)
	{
	$rows = $columns;
	// in case if after applying per_page limit record count less then
	// can fill requrested column count, then fill as much as we can
	$cols = min(ceil($per_page / $columns), ceil(count($arr) / $columns));
	$imatrix = array();
	for ($row = 0; $row < $rows; $row++) {
	for ($col = 0; $col < $cols; $col++) {
	$source_index = $row * $cols + $col;
	if (!isset($arr[$source_index])) {
	// in case if source array element count is less then element count in one row
	continue;
	}
	$imatrix[$col * $rows + $row] = $arr[$source_index];
	}
	}

	ksort($imatrix);
	reset($imatrix);
	return $imatrix;
	}

	/**
	* If data was modfied & is in TempTables mode, then parse block with name passed;
	* remove modification mark if not in TempTables mode
	*
	* @param Array $params
	* @return string
	* @access public
	* @author Alexey
	*/
	function SaveWarning($params)
	{
	$main_prefix = getArrayValue($params, 'main_prefix');
	if ($main_prefix && $main_prefix != '$main_prefix') {
	$top_prefix = $main_prefix;
	}
	else {
	$top_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
	}

	$temp_tables = $this->Application->GetVar($top_prefix.'_mode') == 't';
	$modified = $this->Application->RecallVar($top_prefix.'_modified');

	if ($temp_tables && $modified) {
	$block_params = $this->prepareTagParams($params);
	$block_params['name'] = $this->SelectParam($params, 'render_as,name');
	$block_params['edit_mode'] = $temp_tables ? 1 : 0;
	return $this->Application->ParseBlock($block_params);
	}
	$this->Application->RemoveVar($top_prefix.'_modified');
	return '';
	}

	/**
	* Returns list record count queries (on all pages)
	*
	* @param Array $params
	* @return int
	*/
	function TotalRecords($params)
	{
	$list =& $this->GetList($params);
	if (!$list->Counted) $list->CountRecs();
	return $list->RecordsCount;
	}

	/**
	* Range filter field name
	*
	* @param Array $params
	* @return string
	*/
	function SearchInputName($params)
	{
	$field = $this->SelectParam($params, 'field,name');
	$append = getArrayValue($params, 'type') ? '_'.$params['type'] : '';

	return 'custom_filters['.$this->getPrefixSpecial().']['.$field.$append.']';
	}

	/**
	* Return range filter field value
	*
	* @param Array $params
	* @return string
	*/
	function SearchField($params) // RangeValue
	{
	$field = $this->SelectParam($params, 'field,name');

	$custom_filters = $this->Application->RecallVar($this->getPrefixSpecial().'_custom_filters');
	$custom_filters = $custom_filters ? unserialize($custom_filters) : Array();

	$append = getArrayValue($params, 'type');

	return getArrayValue($custom_filters, $field.( $append ? '_'.$append : '') );
	}

	function SearchFormat($params)
	{
	$field = $params['field'];
	$object =& $this->GetList($params);

	$options = $object->GetFieldOptions($field);

	$format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ];

	$formatter_class = getArrayValue($options,'formatter');
	if($formatter_class)
	{
	$formatter =& $this->Application->recallObject($formatter_class);
	$human_format = getArrayValue($params,'human');
	$edit_size = getArrayValue($params,'edit_size');
	$sample = getArrayValue($params,'sample');
	if($sample)
	{
	return $formatter->GetSample($field, $options, $object);
	}
	elseif($human_format \|\| $edit_size)
	{
	$format = $formatter->HumanFormat($format);
	return $edit_size ? strlen($format) : $format;
	}
	}

	return $format;
	}

	/**
	* Returns error of range field
	*
	* @param unknown_type $params
	* @return unknown
	*/
	function SearchError($params)
	{
	$field = $this->SelectParam($params, 'field,name');



	$error_var_name = $this->getPrefixSpecial().'_'.$field.'_'.$params['type'].'_error';
	$error_msg = $this->Application->RecallVar($error_var_name);
	if($error_msg)
	{
	$this->Application->StoreVar($error_var_name, '');
	}

	$object =& $this->Application->recallObject($this->Prefix.'.'.$this->Special.'-item', null, Array('skip_autoload' => true));
	return $object->ErrorMsgs[$error_msg];
	}

	/**
	* Returns templates path for module, which is gathered from prefix module
	*
	* @param Array $params
	* @return string
	* @author Alex
	*/
	function ModulePath($params)
	{
	$force_module = getArrayValue($params, 'module');
	if ($force_module) {
	if ($force_module == '#session#') {
	$force_module = $this->Application->RecallVar('module');
	}
	else {
	$force_module = strtolower($force_module);
	}

	$module_folder = trim( $this->Conn->GetOne('SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name) = '.$this->Conn->qstr($force_module) ), '/');
	}
	else {
	$module_folder = $this->Application->getUnitOption($this->Prefix, 'ModuleFolder');
	}
	return '../../'.$module_folder.'/admin_templates/';
	}

	/**
	* Returns object used in tag processor
	*
	* @access public
	* @return kDBBase
	*/
	function &getObject($params = Array())
	{
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	return $object;
	}

	/**
	* Checks if object propery value matches value passed
	*
	* @param Array $params
	* @return bool
	*/
	function PropertyEquals($params)
	{
	$object =& $this->getObject($params);
	$property_name = $this->SelectParam($params, 'name,var,property');
	return $object->$property_name == $params['value'];
	}

	/**
	* Group list records by header, saves internal order in group
	*
	* @param Array $records
	* @param string $heading_field
	*/
	function groupRecords(&$records, $heading_field)
	{
	$sorted = Array();
	$i = 0; $record_count = count($records);
	while ($i < $record_count) {
	$sorted[ $records[$i][$heading_field] ][] = $records[$i];
	$i++;
	}

	$records = Array();
	foreach ($sorted as $heading => $heading_records) {
	$records = array_merge_recursive($records, $heading_records);
	}
	}

	}

	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/db/db_tag_processor.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.57
	\ No newline at end of property
	+1.58
	\ No newline at end of property
	Index: trunk/core/units/categories/categories_config.php
	===================================================================
	--- trunk/core/units/categories/categories_config.php (revision 4995)
	+++ trunk/core/units/categories/categories_config.php (revision 4996)
	@@ -1,222 +1,240 @@
	<?php

	$config = Array(
	'Prefix' => 'c',
	'ItemClass' => Array('class'=>'CategoriesItem','file'=>'categories_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'CategoriesEventHandler','file'=>'categories_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'CategoriesTagProcessor','file'=>'categories_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'AggregateTags' => Array(
	Array(
	'AggregateTo' => 'm',
	'AggregatedTagName' => 'CategoryLink',
	'LocalTagName' => 'CategoryLink',
	),
	),
	'IDField' => 'CategoryId',

	'StatusField' => Array('Status'),

	'TitleField' => 'Name', // field, used in bluebar when editing existing item
	'ItemType' => 1, // used for custom fields only

	'StatisticsInfo' => Array(
	'pending' => Array(
	'icon' => 'icon16_cat_pending.gif',
	'label' => 'la_tab_Categories',
	'js_url' => "set_persistant_var('Category_View', 41, 'advanced_view', '#url#')",
	'url' => Array('t' => 'advanced_view', 'index_file' => 'advanced_view.php', 'SetTab' => 'category', 'pass' => 'm'),
	'status' => STATUS_PENDING,
	),
	),

	'TableName' => TABLE_PREFIX.'Category',

	'ViewMenuPhrase' => 'la_text_Categories',

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('c' => '!la_title_Adding_Category!'),
	'edit_status_labels' => Array('c' => '!la_title_Editing_Category!'),
	'new_titlefield' => Array('c' => '!la_title_New_Category!'),
	),
	'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),
	-
	+
	+ 'catalog' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (<span id='category_count'>#c_recordcount#</span>)"),
	+
	'category_items'=> Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"),

	'tree_site' => Array('format' => '!la_selecting_categories!'),
	),

	'PermSection' => Array('main' => 'in-portal:categories', /'search' => 'in-portal:configuration_search',/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),

	'Sections' => Array(
	// "Structure & Data" section
	'in-portal:site' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'struct',
	'label' => 'la_tab_Site_Structure',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	),

	'in-portal:browse' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'catalog',
	'label' => 'la_tab_Browse',
	'url' => Array('index_file' => 'browse.php', 'pass' => 'm'),
	'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	),
	+
	+ 'in-portal:browse_new' => Array(
	+ 'parent' => 'in-portal:site',
	+ 'icon' => 'catalog',
	+ 'label' => 'la_K4_Catalog',
	+ 'url' => Array('t' => 'catalog', 'pass' => 'm'),
	+ 'late_load' => Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
	+ 'onclick' => 'checkCatalog(0)',
	+ 'permissions' => Array('view'),
	+ 'priority' => 1.1,
	+ 'type' => stTREE,
	+ ),

	'in-portal:advanced_view' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'advanced_view',
	'label' => 'la_tab_AdvancedView',
	'url' => Array('index_file' => 'advanced_view.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 2,
	'type' => stTREE,
	),

	'in-portal:reviews' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'reviews',
	'label' => 'la_tab_Reviews',
	'url' => Array('index_file' => 'reviews.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 3,
	'type' => stTREE,
	),

	'in-portal:configure_categories' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'cat_settings',
	'label' => 'la_tab_Settings',
	'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 4,
	'type' => stTREE,
	),

	'in-portal:configuration_search' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_search',
	'label' => 'la_tab_ConfigSearch',
	'url' => Array('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 5,
	'type' => stTREE,
	),

	'in-portal:configuration_email' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_email',
	'label' => 'la_tab_ConfigE-mail',
	'url' => Array('t' => 'config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 6,
	'type' => stTREE,
	),

	'in-portal:configuration_custom' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_custom',
	'label' => 'la_tab_ConfigCustom',
	'url' => Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 7,
	'type' => stTREE,
	),

	),

	'ListSQLs' => Array( ''=> ' SELECT %1$s.* %2$s
	FROM %1$s
	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'),

	'ItemSQLs' => Array( ''=> ' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),

	'SubItems' => Array('c-cdata', 'c-perm'),

	'ListSortings' => Array(
	- '' => Array(
	- 'ForcedSorting' => Array("CurrentSort" => 'asc', 'Priority' => 'desc', 'Name' => 'asc'),
	- 'Sorting' => Array('Name' => 'asc'),
	- )
	- ),
	+ '' => Array(
	+ 'ForcedSorting' => Array("CurrentSort" => 'asc', 'Priority' => 'desc', 'Name' => 'asc'),
	+ 'Sorting' => Array('Name' => 'asc'),
	+ )
	+ ),
	+
	'CalculatedFields' => Array(
	'' => Array(
	'CurrentSort' => "REPLACE(ParentPath, CONCAT('\|', ".'%1$s'.".CategoryId, '\|'), '')",
	)
	),

	'Fields' => Array
	(
	'CategoryId' => Array('type' => 'int','not_null' => '1','default' => ''),
	'Type' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'ParentId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Filename' => Array('type' => 'string','not_null' => '1','default' => ''),
	'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '1'),
	'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
	'EditorsPick' => Array('type' => 'int','default' => ''),
	'Status' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Pop' => Array('type' => 'int','default' => ''),
	'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => ''),
	'MetaKeywords' => Array('type' => 'string','default' => ''),
	'CachedDescendantCatsQty' => Array('type' => 'int','default' => ''),
	'CachedNavbar' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CreatedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'ResourceId' => Array('type' => 'int','default' => ''),
	'ParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
	'NamedParentPath' => Array('type' => 'string','not_null' => '1','default' => ''),
	'MetaDescription' => Array('type' => 'string','default' => ''),
	'HotItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
	'NewItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
	'PopItem' => Array('type' => 'int','not_null' => '1','default' => '2'),
	'Modified' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'ModifiedById' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'CategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	'ItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CachedCategoryTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	'CachedItemTemplate' => Array('type' => 'string','not_null' => '1','default' => ''),
	),

	'VirtualFields' => Array(
	'CurrentSort' => Array('type' => 'string', 'default' => ''),
	'IsNew' => Array('type' => 'int', 'default' => 0),
	),

	'Grids' => Array(
	'Default' => Array(
	- 'Icons' => Array('default'=>'icon16_cat.gif'),
	- 'Fields' => Array(
	- 'Name' => Array( 'width'=>150, 'title'=>'la_col_Title', 'data_block'=>'category_td' ),
	- ),
	+ 'Icons' => Array('default'=>'icon16_cat.gif'),
	+ 'Fields' => Array(
	+ 'Name' => Array('title' => 'la_col_Name', 'data_block' => 'category_td'),
	+ 'Description' => Array('title' => 'la_col_Description'),
	+ 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
	+ ),

	- ),
	),
	+ ),
	+
	'ConfigMapping' => Array(
	'PerPage' => 'Perpage_Category',
	'DefaultSorting1Field' => 'Category_Sortfield',
	'DefaultSorting2Field' => 'Category_Sortfield2',
	'DefaultSorting1Dir' => 'Category_Sortorder',
	'DefaultSorting2Dir' => 'Category_Sortorder2',
	),
	);

	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/categories/categories_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.31
	\ No newline at end of property
	+1.32
	\ No newline at end of property
	Index: trunk/core/units/categories/categories_tag_processor.php
	===================================================================
	--- trunk/core/units/categories/categories_tag_processor.php (revision 4995)
	+++ trunk/core/units/categories/categories_tag_processor.php (revision 4996)
	@@ -1,290 +1,291 @@
	<?php

	class CategoriesTagProcessor extends kDBTagProcessor {

	function &GetList($params)
	{
	$special = $this->BuildListSpecial($params);

	$prefix_special = $this->Prefix.'.'.$special;
	$this->Special = $special;

	$params['skip_counting'] = true;

	$list =& $this->Application->recallObject( $prefix_special, $this->Prefix.'_List',$params);

	// $list->clearFilters();
	// $list->addFilter('parent_filter', 'ParentId = '.$parent_cat_id, WHERE_FILTER, FLT_SYSTEM);

	//unset($params['skip_counting']);
	// $this->Application->HandleEvent($event, $prefix_special.':SetPagination', $params );

	$list->Query();
	return $list;
	}

	function SubCatCount($params)
	{
	$cat_object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params);
	$sql = ' SELECT COUNT(*) - 1
	FROM '.$cat_object->TableName.'
	WHERE ParentPath LIKE "'.$cat_object->GetDBField('ParentPath').'%"';
	return $this->Conn->GetOne($sql);
	}

	function IsNew($params)
	{
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	$ret = $object->GetDBField('IsNew') ? 1 : 0;
	return $ret;
	}

	function IsPick($params)
	{
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	$ret = $object->GetDBField('EditorsPick') ? 1 : 0;
	return $ret;
	}

	function ItemIcon($params)
	{
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	$status = $object->GetDBField('Status');
	if($status == 1)
	{
	$ret = $object->GetDBField('IsNew') ? 'icon16_cat_new.gif' : 'icon16_cat.gif';
	}
	else
	{
	$ret = $status ? 'icon16_cat_pending.gif' : 'icon16_cat_disabled.gif';
	}
	return $ret;
	}

	function ItemCount($params)
	{
	$cat_object =& $this->getObject($params);
	$ci_table = $this->Application->getUnitOption('l-ci', 'TableName');

	$sql = ' SELECT COUNT(*)
	FROM '.$cat_object->TableName.' c
	LEFT JOIN '.$ci_table.' ci
	ON c.CategoryId=ci.CategoryId
	WHERE c.ParentPath LIKE "'.$cat_object->GetDBField('ParentPath').'%"
	AND NOT (ci.CategoryId IS NULL)';
	return $this->Conn->GetOne($sql);
	}

	function ListCategories($params)
	{
	return $this->PrintList2($params);
	}

	function RootCategoryName($params)
	{
	$root_phrase = $this->Application->ConfigValue('Root_Name');
	$ret = $this->Application->Phrase($root_phrase);
	return $ret;
	}

	function CheckModuleRoot($params)
	{
	$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
	$module =& $this->Application->recallObject('mod.'.$module_name);
	$module_root_cat = $module->GetDBField('RootCat');

	$additional_cats = $this->SelectParam($params, 'add_cats');
	if ($additional_cats) {
	$additional_cats = explode(',', $additional_cats);
	}
	else {
	$additional_cats = array();
	}

	if ($this->Application->GetVar('m_cat_id') == $module_root_cat \|\| in_array($this->Application->GetVar('m_cat_id'), $additional_cats)) {
	$home_template = getArrayValue($params, 'home_template');
	if (!$home_template) return;
	$this->Application->Redirect($home_template, Array('pass'=>'all'));
	};
	}

	function CategoryPath($params)
	{
	$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
	$module =& $this->Application->recallObject('mod.'.$module_name);
	$module_root_cat = $module->GetDBField('RootCat');

	$block_params['current'] = 0;
	$block_params['separator'] = $params['separator'];

	if(!isset($params['cat_id']))
	{
	$params['cat_id'] = getArrayValue($params, 'cat_id') ? $params['cat_id'] : $this->Application->GetVar('m_cat_id');
	$block_params['current'] = 1;
	}
	$product_id = $this->Application->GetVar('p_id');
	if ($product_id) {
	$block_params['current'] = 0;
	}

	$block_params['is_module_root'] = ($params['cat_id'] == $module_root_cat) ? 1 : 0;

	if($params['cat_id'] == 0)
	{
	$block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock');
	return $this->Application->ParseBlock($block_params);
	}
	else
	{
	$block_params['name'] = $this->SelectParam($params,'render_as,block');

	// $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' );
	$sql = 'SELECT CategoryId, ParentId, Name FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').'
	WHERE CategoryId='.$params['cat_id'];
	$res = $this->Conn->GetRow($sql);
	if ($res === false) {
	// in case if category is deleted
	return '';
	}

	$block_params['cat_name'] = $res['Name'];
	$block_params['cat_id'] = $res['CategoryId'];

	$parent_params = $params;
	$parent_params['cat_id'] = $res['ParentId'];

	// which block to parse as current ?
	if ($block_params['is_module_root'] == 1) { // module root
	$block_params['name'] = $this->SelectParam($params, 'module_root_render_as,block_module_root,rootmoduleblock');
	}
	if ($block_params['current'] == 1) { // current cat (label)
	$block_params['name'] = $this->SelectParam($params, 'current_render_as,block_current,currentblock');
	}

	$this->Application->SetVar($this->Prefix.'_id', $res['CategoryId']);
	$current_cat = $this->Application->ParseBlock($block_params, 1);

	$this->Application->SetVar($this->Prefix.'_id', $res['ParentId']);
	$parent_cat = $this->CategoryPath($parent_params);

	return $parent_cat.$current_cat;
	}
	}

	function CurrentCategoryName($params){

	$cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' );
	$cat_id = $this->Application->GetVar("m_cat_id");
	$sql = 'SELECT Name FROM '.$cat_object->TableName.' WHERE CategoryId='.$cat_id;
	return $this->Conn->GetOne($sql);

	}

	function CategoryLink($params)
	{
	// 'p_id'=>'0', ??
	$params = array_merge(array('pass'=>'m'), $params);
	$cat_id = getArrayValue($params,'cat_id');
	if ($cat_id === false) {
	// $cat_id = $this->Application->Parser->GetParam('cat_id');
	$cat_id = $this->Application->GetVar($this->Prefix.'_id');
	}
	if($cat_id == 'Root')
	{
	$object =& $this->Application->recallObject('mod.'.$params['module']);
	$params['m_cat_id'] = $object->GetDBField('RootCat');
	unset($params['module']);
	}
	else{
	$params['m_cat_id'] = $cat_id;
	}
	unset($params['cat_id']);

	$main_processor =& $this->Application->recallObject('m_TagProcessor');
	return $main_processor->T($params);
	}

	function CategoryList($params)
	{
	//$object =& $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
	$object =& $this->GetList($params);


	if ($object->RecordsCount == 0)
	{
	if (isset($params['block_no_cats'])) {
	$params['name'] = $params['block_no_cats'];
	return $this->Application->ParseBlock($params);
	}
	else {
	return '';
	}
	}

	if(isset($params['block']))
	{
	return $this->PrintList($params);
	}
	else
	{
	$params['block'] = $params['block_main'];
	$params['row_start_block'] = $params['block_row_start'];
	$params['row_end_block'] = $params['block_row_end'];
	return $this->PrintList2($params);
	}
	}

	function Meta($params)
	{
	$name = getArrayValue($params, 'name');
	$object =& $this->Application->recallObject($this->Prefix.'.-item');

	$field = $object->GetField('Meta'.$name);
	if ($field) return $field;

	switch ($name) {
	case 'Description':
	$conf = 'Category_MetaDesc';
	break;
	case 'Keywords':
	$conf = 'Category_MetaKey';
	break;
	}

	return $this->Application->ConfigValue($conf);
	}

	function BuildListSpecial($params)
	{
	if ( isset($params['parent_cat_id']) ) {
	$parent_cat_id = $params['parent_cat_id'];
	}
	else {
	$parent_cat_id = $this->Application->GetVar($this->Prefix.'_id');
	if (!$parent_cat_id) {
	$parent_cat_id = $this->Application->GetVar('m_cat_id');
	}
	if (!$parent_cat_id) {
	$parent_cat_id = 0;
	}
	}

	$types = $this->SelectParam($params, 'types');
	$except = $this->SelectParam($params, 'except');

	- if ($types.$except.$parent_cat_id == '') {
	+ $no_special = isset($params['no_special']) && $params['no_special'];
	+ if ($types.$except.$parent_cat_id == '' \|\| $no_special) {
	return parent::BuildListSpecial($params);
	}

	$special = crc32($types.$except.$parent_cat_id);
	return $special;
	}

	function IsCurrent($params)
	{
	return false;
	}
	}


	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/categories/categories_tag_processor.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.18
	\ No newline at end of property
	+1.19
	\ No newline at end of property
	Index: trunk/core/units/general/helpers/sections_helper.php
	===================================================================
	--- trunk/core/units/general/helpers/sections_helper.php (revision 4995)
	+++ trunk/core/units/general/helpers/sections_helper.php (revision 4996)
	@@ -1,109 +1,114 @@
	<?php

	/**
	* Porcesses sections information from configs
	*
	*/
	class kSectionsHelper extends kHelper {

	/**
	* Holds information about all sections
	*
	* @var Array
	*/
	var $Tree = Array();

	/**
	* Set's prefix and special
	*
	* @param string $prefix
	* @param string $special
	* @access public
	*/
	function Init($prefix, $special, $event_params = null)
	{
	parent::Init($prefix, $special, $event_params);
	$this->BuildTree();
	}

	/**
	* Builds xml for tree in left frame in admin
	*
	* @param Array $params
	*/
	function BuildTree()
	{
	$unit_config_reader = false;
	$data = $this->Conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "sections_parsed"');
	if ($data) {
	$this->Tree = unserialize($data['Data']);
	return ;
	}
	$this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH);

	$this->Tree = Array();
	if (!$unit_config_reader) {
	$unit_config_reader =& $this->Application->recallObject('kUnitConfigReader');
	}

	$prefixes = array_keys($unit_config_reader->configData);
	foreach ($prefixes as $prefix) {
	$config =& $unit_config_reader->configData[$prefix];
	$sections = getArrayValue($config, 'Sections');
	if (!$sections) continue;

	// echo 'Prefix: ['.$prefix.'] has ['.count($sections).'] sections<br />';

	foreach ($sections as $section_name => $section_params) {
	// we could also skip not allowed sections here in future
	$section_params['SectionPrefix'] = $prefix;
	$section_params['url']['m_opener'] = 'r';

	$pass_section = getArrayValue($section_params, 'url', 'pass_section');

	if ($pass_section) {
	unset($section_params['url']['pass_section']);
	$section_params['url']['section'] = $section_name;
	if (!isset($section_params['url']['module'])) {
	$module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name');
	$section_params['url']['module'] = $module_name;
	}
	}
	+
	if (!isset($section_params['url']['t'])) {
	$section_params['url']['t'] = 'index';
	}

	+ if (!isset($section_params['onclick'])) {
	+ $section_params['onclick'] = 'checkEditMode()';
	+ }
	+
	$current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array();
	$this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);

	$this->Tree[ $section_params['parent'] ]['children'][ "{$section_params['priority']}" ] = $section_name;

	if ($section_params['type'] == stTAB) {
	// if this is tab, then mark parent section as TabOnly
	$this->Tree[ $section_params['parent'] ]['tabs_only'] = true;
	}
	}
	}

	$this->Conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("sections_parsed", '.$this->Conn->qstr(serialize($this->Tree)).', '.adodb_mktime().')');
	}

	/**
	* Returns details information about section
	*
	* @param string $section_name
	* @return Array
	*/
	function &getSectionData($section_name)
	{
	if (isset($this->Tree[$section_name])) {
	$ret =& $this->Tree[$section_name];
	}
	else {
	$ret = Array();
	}
	return $ret;
	}
	}

	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/general/helpers/sections_helper.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.6
	\ No newline at end of property
	+1.7
	\ No newline at end of property
	Index: trunk/core/admin_templates/categories/xml/tree_categories.tpl
	===================================================================
	--- trunk/core/admin_templates/categories/xml/tree_categories.tpl (revision 4995)
	+++ trunk/core/admin_templates/categories/xml/tree_categories.tpl (revision 4996)
	@@ -1,7 +1,7 @@
	<inp2:m_XMLTemplate/>
	<inp2:m_DefineElement name="category">
	- <folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink index_file="browse.php" template="catalog" pass="m"/>" onclick="checkEditMode()" load_url="<inp2:CategoryLink pass="m"/>"></folder>
	+ <folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog" pass="m"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>)" load_url="<inp2:CategoryLink pass="m"/>"></folder>
	</inp2:m_DefineElement>
	<tree>
	-<inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:"/>
	+<inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
	</tree>

	Property changes on: trunk/core/admin_templates/categories/xml/tree_categories.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.2
	\ No newline at end of property
	+1.3
	\ No newline at end of property
	Index: trunk/core/admin_templates/categories/xml/categories_list.tpl
	===================================================================
	--- trunk/core/admin_templates/categories/xml/categories_list.tpl (nonexistent)
	+++ trunk/core/admin_templates/categories/xml/categories_list.tpl (revision 4996)
	@@ -0,0 +1,64 @@
	+<inp2:adm_SetConst name="DBG_SKIP_REPORTING" value="1"/>
	+<inp2:m_include t="incs/blocks"/>
	+<inp2:m_include t="incs/grid_blocks"/>
	+<inp2:c_InitList no_special="1" per_page="-1"/>
	+Grids['c'] = new Grid('table_white_selected', ':original', edit, a_toolbar);
	+Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]');
	+Grids['c'].InitItems();
	+<inp2:c_ViewMenu block="viewmenu_declaration" grid="Default" no_special="1"/>
	+setInnerHTML('category_count', <inp2:c_TotalRecords no_special="1"/>);
	+
	+<inp2:m_DefineElement name="root_cat_caption">
	+ <span class="NAV_CURRENT_ITEM">
	+ <inp2:m_if check="m_ParamEquals" name="current" value="1">
	+ <inp2:c_RootCategoryName />
	+ <inp2:m_else/>
	+ <a class="control_link" href="javascript:go_to_cat(0);"><inp2:c_RootCategoryName /></a>
	+ </inp2:m_if>
	+ </span>
	+</inp2:m_DefineElement>
	+
	+<inp2:m_DefineElement name="category_caption">
	+ <span class="NAV_CURRENT_ITEM">
	+ <inp2:m_param name="separator"/>
	+ <inp2:m_if check="m_ParamEquals" name="current" value="1" inverse="1">
	+ <a class="control_link" href="javascript:go_to_cat(<inp2:m_param name="cat_id"/>);"><inp2:m_param name="cat_name"/></a>
	+ <inp2:m_else/>
	+ <inp2:m_param name="cat_name"/>
	+ </inp2:m_if>
	+ </span>
	+</inp2:m_DefineElement>
	+setInnerHTML('category_path', '<inp2:c_CategoryPath separator=">" rootcatblock="root_cat_caption" rootmoduleblock="category_caption" currentblock="category_caption" block="category_caption" js_escape="1"/>');
	+set_hidden_field('m_cat_id', <inp2:m_get name="m_cat_id"/>);
	+<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0">
	+ a_toolbar.DisableButton('upcat');
	+ a_toolbar.DisableButton('homecat');
	+<inp2:m_else/>
	+ a_toolbar.EnableButton('upcat');
	+ a_toolbar.EnableButton('homecat');
	+</inp2:m_if>
	+
	+#separator#
	+<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
	+<table border="0" width="100%">
	+ <inp2:m_DefineElement name="category_td">
	+ <td valign="top" class="table_white text" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="CategoryId"/>">
	+ <input type="checkbox" name="<inp2:InputName field="$IdField"/>" id="<inp2:InputName field="$IdField"/>">
	+ <img src="<inp2:ModulePath />img/itemicons/<inp2:ItemIcon grid="Default"/>"> <span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse"><sup><inp2:Field field="Priority"/></sup></inp2:m_if></span>
	+ <a class="link" href="javascript:go_to_cat(<inp2:m_get name="c_id"/>);"><b><inp2:Field name="Name"/></b></a><span class="cat_desc">:</span>
	+ <span class="cat_pick"><inp2:m_if check="IsPick">Pick</inp2:m_if></span>
	+ <span class="cat_new"><inp2:m_if check="IsNew">New</inp2:m_if></span>
	+ <span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span><br>
	+ <div style="padding-left: 3px;">
	+ <span class="cat_desc"><inp2:Field field="Description"/></span><br>
	+ <span class="cats_stats">(<inp2:Field field="CreatedOn" format="_regional_DateFormat"/>)</span>
	+ </div>
	+ </td>
	+ </inp2:m_DefineElement>
	+ <inp2:m_if check="c_TotalRecords" no_special="1">
	+ <inp2:c_CategoryList no_special="1" block_main="category_td" per_page="-1" columns="2" direction="V" IdField="CategoryId" />
	+ <inp2:m_else/>
	+ <span class="text"><inp2:m_phrase name="la_text_NoCategories"/></span>
	+ </inp2:m_if>
	+</table></br>
	+<inp2:m_RenderElement name="kernel_form_end"/>
	\ No newline at end of file

	Property changes on: trunk/core/admin_templates/categories/xml/categories_list.tpl
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: trunk/core/admin_templates/catalog/catalog.tpl
	===================================================================
	--- trunk/core/admin_templates/catalog/catalog.tpl (nonexistent)
	+++ trunk/core/admin_templates/catalog/catalog.tpl (revision 4996)
	@@ -0,0 +1,226 @@
	+<inp2:m_include t="incs/header" nobody="yes" noform="yes"/>
	+
	+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
	+<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Browse!"/>
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="catalog" module="in-portal"/>
	+
	+<!-- ToolBar --->
	+<inp2:m_RenderElement name="kernel_form"/>
	+
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
	+ <script type="text/javascript" src="incs/ajax.js"></script>
	+ <script type="text/javascript">
	+ var $is_catalog = true;
	+ a_toolbar = new ToolBar();
	+
	+ a_toolbar.AddButton( new ToolBarButton('upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
	+ Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
	+ Catalog.submit_event('c', 'OnGoHome', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
	+ std_precreate_item('c', 'categories/categories_edit');
	+ }
	+ ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', edit) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
	+ function() {
	+ std_delete_items('c')
	+ } ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	+ Catalog.submit_event('c','OnMassApprove', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	+ Catalog.submit_event('c','OnMassDecline', null, 'categories_div', 'categories_form');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
	+ alert( Request.serializeForm('categories_form') );
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep4') );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('cut', '<inp2:m_phrase label="la_ToolTip_Cut" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('copy', '<inp2:m_phrase label="la_ToolTip_Copy" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('paste', '<inp2:m_phrase label="la_ToolTip_Paste" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep5') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_Move_Up" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_Move_Down" escape="1"/>', function() {
	+
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep6') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	+ show_viewmenu(a_toolbar,'view');
	+ }
	+ ) );
	+
	+ a_toolbar.Render();
	+
	+ function edit()
	+ {
	+ std_edit_item('c', 'categories/categories_edit');
	+ }
	+
	+ _progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
	+
	+ var $separator = '#separator#';
	+
	+ function go_to_cat($cat_id) {
	+ var $url = '<inp2:m_Link template="xml/categories_list" m_cat_id="#REPLACE#" ajax="yes" no_amp="1"/>';
	+ if (!isset($cat_id)) {
	+ $cat_id = get_hidden_field('m_cat_id');
	+ }
	+
	+ Request.makeRequest($url.replace('#REPLACE#', $cat_id), Catalog.BusyRequest, 'categories_div', Catalog.successCallback, Catalog.errorCallback, 'categories_div');
	+ }
	+ </script>
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+<inp2:m_RenderElement name="kernel_form_end"/>
	+
	+
	+<table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
	+ <tr bgcolor="#e0e0da" height="20">
	+ <td width="100%" valign="middle">
	+ <img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0">
	+ <span id="category_path"></span>
	+ </td>
	+ <td align="right">
	+ <table cellspacing="0" cellpadding="0" border="0">
	+ <tr>
	+ <td>Search: </td>
	+ <td>
	+ <input type="text" id="c_search_keyword" name="c_search_keyword" value="<inp2:c_SearchKeyword no_special="1"/>" PrefixSpecial="c" Grid="Default" style="border: 1px solid grey;">
	+ <inp2:m_recall var="c_search_keyword" no_null="no_null" special="1"/>
	+ </td>
	+ <td>
	+ <script type="text/javascript">
	+ document.getElementById('c_search_keyword').onkeydown = search_keydown;
	+ Toolbars['c_search'] = new ToolBar('icon16_');
	+ Toolbars['c_search'].AddButton( new ToolBarButton('search', 'Search', function() { search('<inp2:c_ListMarker list_name="cats"/>','Default') } ) );
	+ Toolbars['c_search'].AddButton( new ToolBarButton('search_reset', 'Reset', function() { search_reset('<inp2:c_ListMarker list_name="cats"/>') } ) );
	+ Toolbars['c_search'].Render();
	+ </script>
	+ </td>
	+ </tr>
	+ </table>
	+ </td>
	+ </tr>
	+</table>
	+<br />
	+<div id="categories_div"></div>
	+
	+<inp2:m_DefineElement name="item_tab" title="">
	+ <td class="activeTab" nowrap="nowrap" width="200">
	+ <table cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected">
	+ <tr>
	+ <td class="catalog-tab-left">
	+ <img src="img/spacer.gif" height="22" width="9" />
	+ </td>
	+ <td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
	+ <img src="img/itemtabs/divider_empty.gif" align="absmiddle" border="0" width="20" height="20">
	+ <inp2:m_param name="title"/>
	+ </td>
	+ <td class="catalog-tab-right">
	+ <img src="img/spacer.gif" height="22" width="9" />
	+ </td>
	+ </tr>
	+ </table>
	+ </td>
	+
	+ <td>
	+ <img src="img/spacer.gif" height="1" width="5" />
	+ </td>
	+</inp2:m_DefineElement>
	+
	+<!--<span class=cats_stats>(0)</span>-->
	+<!-- item tabs: begin -->
	+<table cellpadding="0" cellspacing="0">
	+ <tr>
	+ <inp2:adm_ListItemTabs type="catalog" render_as="item_tab"/>
	+
	+ <inp2:m_RenderElement name="item_tab" divider="up" selected="selected" title="Links (1/10)"/>
	+ <inp2:m_RenderElement name="item_tab" divider="down" selected="unselected" title="Products (5/11)"/>
	+ <inp2:m_RenderElement name="item_tab" divider="empty" selected="unselected" title="Pages (5)"/>
	+ </tr>
	+</table>
	+<!-- item tabs: end -->
	+
	+
	+<br />
	+
	+<!-- Categories -->
	+<script type="text/javascript" src="incs/fw_menu.js"></script>
	+
	+<!-- Products -->
	+<!--<inp2:m_block name="product_caption_td" />
	+ <td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid"/>
	+ <span class="priority"><inp2:m_if prefix="$PrefixSpecial" function="fieldequals" field="Priority" value="0"/><inp2:m_else/><sup><inp2:$PrefixSpecial_field field="Priority"/></sup><inp2:m_endif/></span></td>
	+<inp2:m_blockend />
	+
	+<inp2:m_ParseBlock name="grid" PrefixSpecial="p" IdField="ResourceId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" no_toolbar="no_toolbar" search="on"/>
	+-->
	+
	+<inp2:m_include t="incs/footer" noform="yes"/>
	+
	+<script type="text/javascript">
	+ $ViewMenus = new Array('<inp2:c_ListMarker list_name="cats"/>');
	+ go_to_cat();
	+</script>
	\ No newline at end of file

	Property changes on: trunk/core/admin_templates/catalog/catalog.tpl
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property

in-portalNo OneTemporaryActions

File Metadata

in-portalView Options

Event Timeline

in-portal
No OneTemporary
Actions

in-portal
View Options