in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Tue, Jan 13, 8:42 PM

in-portal
View Options

	Index: trunk/kernel/admin/include/toolbar/editcategory_relationselect.php
	===================================================================
	--- trunk/kernel/admin/include/toolbar/editcategory_relationselect.php (revision 5372)
	+++ trunk/kernel/admin/include/toolbar/editcategory_relationselect.php (revision 5373)
	@@ -1,799 +1,799 @@
	<?php
	global $objConfig,$objSections,$section, $rootURL,$adminURL,$imagesURL,$envar,
	$m_var_list_update,$objCatList, $homeURL, $upURL, $objSession,$CatScopeClause,$DefaultTab;

	global $CategoryFilter,$TotalItemCount;

	global $Bit_All,$Bit_Pending,$Bit_Disabled,$Bit_New,$Bit_Pop,$Bit_Hot,$Bit_Ed;

	global $hideSelectAll;


	/* bit place holders for category view menu */
	$Bit_Active=64;
	$Bit_Pending=32;
	$Bit_Disabled=16;
	$Bit_New=8;
	$Bit_Pop=4;
	$Bit_Hot=2;
	$Bit_Ed=1;

	if(strlen($_GET["SetTab"]))
	{
	if($_GET["SetTab"] != "categories")
	{
	$m_tab_CatTab_Hide = 1;
	$DefaultTab = $_GET["SetTab"];
	}
	else
	{
	$DefaultTab="categories";
	$m_tab_CatTab_Hide = 0;
	}
	}
	else
	$m_tab_CatTab_Hide = (int)$objConfig->Get("CatTab_Hide");

	$CategoryView = $objConfig->Get("Category_View");
	if(!is_numeric($CategoryView))
	{
	$CategoryView = 127;
	}

	$Category_Sortfield = $objConfig->Get("Category_Sortfield");
	if(!strlen($Category_Sortfield))
	$Category_Sortfield = "Name";

	$Category_Sortorder = $objConfig->Get("Category_Sortorder");
	if(!strlen($Category_Sortorder))
	$Category_Sortorder = "desc";

	$Perpage_Category = (int)$objConfig->Get("Perpage_Category");
	if(!$Perpage_Category)
	$Perpage_Category="'all'";


	if($CategoryView == 127)
	{
	$Category_ShowAll = 1;
	}
	else
	{
	$Category_ShowAll=0;
	$Status = array();
	$Mod = array();
	if($CategoryView & $Bit_Pending)
	$Status[] = STATUS_PENDING;

	if($CategoryView & $Bit_Active)
	$Status[] = STATUS_ACTIVE;


	if($CategoryView & $Bit_Disabled)
	$Status[] = STATUS_DISABLED;

	if(count($Status))
	{
	$CategoryFilter .= " AND (Status IN (".implode(",",$Status).") ";
	}
	else
	$CategoryFilter .= " AND ((Status=-1) ";

	if($CategoryView & $Bit_Ed)
	{
	$CategoryFilter .= " OR (EditorsPick=1) ";
	}

	if($CategoryView & $Bit_New)
	{
	$cutoff = adodb_date("U") - ($objConfig->Get("Category_DaysNew") * 86400);
	$CategoryFilter .= " OR (CreatedOn > ".$cutoff.") ";
	}
	$CategoryFilter .= ")";
	}

	$list = $objSession->GetVariable("SearchWord");
	if(strlen($list))
	{
	$CatScope = $objSession->GetVariable("SearchScope");
	switch($CatScope)
	{
	case 0 :
	$CatScopeClause = "";
	break;
	case 1:
	$cat = $objCatList->CurrentCategoryID();
	if($cat>0)
	{
	$allcats = $objCatList->AllSubCats($cat);
	if(count($allcats)>0)
	{
	$catlist = implode(",",$allcats);
	$CatScopeClause = " CategoryId IN ($catlist) ";
	}
	}
	break;
	case 2:
	$CatScopeClause = "CategoryId=".$objCatList->CurrentCategoryID();
	break;
	}
	}
	else
	$CatScopeClause="";

	$mnuClearSearch = language("la_SearchMenu_Clear");
	$mnuNewSearch = language("la_SearchMenu_New");
	$mnuSearchCategory = language("la_SearchMenu_Categories");

	$lang_New = language("la_Text_New");
	$lang_Hot = language("la_Text_Hot");
	$lang_EdPick = language("la_prompt_EditorsPick");
	$lang_Pop = language("la_Text_Pop");

	$lang_Rating = language("la_prompt_Rating");
	$lang_Hits = language("la_prompt_Hits");
	$lang_Votes = language("la_prompt_Votes");
	$lang_Name = language("la_prompt_Name");

	$lang_Categories = language("la_ItemTab_Categories");
	$lang_Description = language("la_prompt_Description");
	$lang_MetaKeywords = language("la_prompt_MetaKeywords");
	$lang_SubSearch = language("la_prompt_SubSearch");
	$lang_Within = language("la_Text_Within");
	$lang_Current = language("la_Text_Current");
	$lang_Active = language("la_Text_Active");
	$lang_SubCats = language("la_Text_SubCats");
	$lang_SubItems = language("la_Text_Subitems");

	$selector = isset($_GET['Selector']) ? '&Selector='.$_GET['Selector'] : '';
	$destform = GetVar('destform');
	print <<<END

	<script language="JavaScript">
	var Category_Sortfield = '$Category_Sortfield';
	var Category_Sortorder = '$Category_Sortorder';
	var Category_Perpage = $Perpage_Category;
	var Category_ShowAll = $Category_ShowAll;
	var CategoryView = $CategoryView;
	var default_tab = "$DefaultTab";

	//JS Language variables
	var lang_New = "$lang_New";
	var lang_Hot = "$lang_Hot";
	var lang_EdPick = "$lang_EdPick";

	var lang_Pop = "$lang_Pop";
	var lang_Rating = "$lang_Rating";
	var lang_Hits = "$lang_Hits";
	var lang_Votes = "$lang_Votes";
	var lang_Name = "$lang_Name";
	var lang_Categories = "$lang_Categories";
	var lang_Description = "$lang_Description";
	var lang_MetaKeywords = "$lang_MetaKeywords";
	var lang_SubSearch = "$lang_SubSearch";
	var lang_Within="$lang_Within";
	var lang_Current = "$lang_Current";
	var lang_Active = "$lang_Active";
	var lang_SubCats = "$lang_SubCats";
	var lang_SubItems = "$lang_SubItems";

	var m_tab_CatTab_hide = $m_tab_CatTab_Hide;
	var hostname = '$rootURL';
	var env = '$envar';
	var actionlist = new Array();
	var homeURL = "$homeURL$selector&destform=$destform";
	var upURL = "$upURL$selector&destform=$destform";
	var Categories_Paste = false;

	// K4 code for handling toolbar operations: begin
	var \$TabRegistry = Array();

	function InpGrid(tab)
	{
	this.TabId = tab;
	}

	InpGrid.prototype.ClearSelection = function(force,called_from)
	{
	unselectAll(this.TabId, 1); //1 means don't upate toolbar
	}

	function registerTab(\$tab_id)
	{
	var \$tab = document.getElementById(\$tab_id);
	var \$index = \$TabRegistry.length;

	\$TabRegistry[\$index] = new Array();
	\$TabRegistry[\$index]['tab_id'] = \$tab_id;
	\$TabRegistry[\$index]['prefix_special'] = \$tab.getAttribute('PrefixSpecial');
	\$TabRegistry[\$index]['edit_template'] = \$tab.getAttribute('EditURL');
	}

	function queryTabRegistry(\$search_key, \$search_value, \$return_key)
	{
	var \$i = 0;
	while(\$i < \$TabRegistry.length)
	{
	if(\$TabRegistry[\$i][\$search_key] == \$search_value)
	{
	return \$TabRegistry[\$i][\$return_key];
	break;
	}
	\$i++;
	}
	return '<'+\$search_key+'='+\$search_value+'>';
	}

	function k4_actionHandler(action, prefix_special)
	{
	var k4_action = '';
	switch (action)
	{
	case 'edit':
	k4_action = 'edit_item("'+prefix_special+'")';
	break;
	case 'delete':
	k4_action = 'delete_items("'+prefix_special+'")';
	break;
	case 'unselect':
	k4_action = 'unselect("'+prefix_special+'")';
	break;
	case 'approve':
	k4_action = 'approve_items("'+prefix_special+'")';
	break;
	case 'decline':
	k4_action = 'decine_items("'+prefix_special+'")';
	break;

	case 'copy':
	k4_action = 'copy_items("'+prefix_special+'")';
	break;
	case 'cut':
	k4_action = 'cut_items("'+prefix_special+'")';
	break;
	case 'move_up':
	k4_action = 'move_up("'+prefix_special+'")';
	break;
	case 'move_down':
	k4_action = 'move_down("'+prefix_special+'")';
	break;
	}

	if (k4_action != '')
	{
	\$form_name = queryTabRegistry('prefix_special', prefix_special, 'tab_id') + '_form';
	eval(k4_action);
	}
	else alert(action+' not implemented');

	}

	function approve_items(prefix_special)
	{
	set_hidden_field('remove_specials['+prefix_special+']',1);
	submit_event(prefix_special,'OnMassApprove','')
	}

	function decine_items(prefix_special)
	{
	set_hidden_field('remove_specials['+prefix_special+']',1);
	submit_event(prefix_special,'OnMassDecline','')
	}

	function edit()
	{
	edit_item( queryTabRegistry('tab_id', activeTab.id, 'prefix_special') );
	}

	function edit_item(prefix_special)
	{
	opener_action('d');
	set_hidden_field(prefix_special+'_mode', 't');
	submit_event(prefix_special, 'OnEdit', queryTabRegistry('prefix_special', prefix_special, 'edit_template'), '../../admin/index4.php');
	}

	function delete_items(prefix_special)
	{
	set_hidden_field('remove_specials['+prefix_special+']',1);
	submit_event(prefix_special,'OnMassDelete','')
	}

	function copy_items(prefix_special)
	{
	submit_event(prefix_special,'OnCopy','')
	}

	function cut_items(prefix_special)
	{
	submit_event(prefix_special,'OnCut','')
	}

	function move_up(prefix_special)
	{
	submit_event(prefix_special,'OnMassMoveUp','')
	}

	function move_down(prefix_special)
	{
	submit_event(prefix_special,'OnMassMoveDown','')
	}

	function unselect(prefix_special)
	{
	Grids[prefix_special].ClearSelection(null,'Inp_AdvancedView.Unselect');
	}
	// K4 code for handling toolbar operations: end

	function InitPage()
	{
	- var main_form='popup';
	+ var main_form='kernel_form';
	if('$destform') main_form='$destform';
	addCommonActions(main_form);
	initToolbar('mainToolBar', actionHandler);
	initCheckBoxes();
	//toggleMenu();
	}

	function AddButtonAction(actionname,actionval)
	{
	var item = new Array(actionname,actionval);
	actionlist[actionlist.length] = item;
	}

	function actionHandler(button)
	{
	//alert('a button has been pressed!');
	for(i=0; i<actionlist.length;i++)
	{

	a = actionlist[i];
	if(button.action==a[0])
	{
	//alert('Button action '+a[0]+' is '+a[1]);
	eval(a[1]);
	break;
	}
	}
	}

	function addCommonActions(main_form)
	{
	AddButtonAction('upcat',"get_to_server(upURL,'');");// UP
	AddButtonAction('homecat',"get_to_server(homeURL,'');"); //home
	AddButtonAction('select',"check_submit('"+main_form+"');"); //edit
	AddButtonAction('stop',"window.close();"); //delete
	AddButtonAction('view',"toggleMenu(); window.FW_showMenu(window.cat_menu,getRealLeft(button) - ((document.all) ? 6 : -2),getRealTop(button)+32);");
	//AddButtonAction('search_a',"setSearchMenu(); window.FW_showMenu(window.SearchMenu,getRealLeft(button)-134 - ((document.all) ? 8 : -1),getRealTop(button)+22);");
	AddButtonAction('search_b',"search_submit();");
	AddButtonAction('search_c',"ClearSearch();");
	}

	function AdminCatNav(url)
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	f.action = url;
	new_search_submit();
	}
	}

	function search_submit()
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	//alert('Setting SearchWord to ' + f.value);
	f.Action.value = "m_SearchWord";
	f.submit();
	}
	}
	function new_search_submit()
	{
	var newSearchInput = document.getElementById("NewSearch");
	if (newSearchInput) newSearchInput.value = 1;
	search_submit();
	}

	function ClearSearch()
	{
	//alert('Clearing Search');
	f = document.getElementById("admin_search");
	if(f)
	{
	f.Action.value = "m_ClearSearch";
	f.submit();
	}
	}

	function SetSearchType(value)
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	f.SearchType.value = value;
	}
	}

	function SetSearchScope(value)
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	f.SearchScope.value = value;
	}
	}

	function ToggleNewSearch()
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	value = f.NewSearch.value;
	if(value==1)
	{
	f.NewSearch.value=0;
	}
	else
	f.NewSearch.value=1;
	}
	}
	function isNewSearch()
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	return f.NewSearch.value;
	}
	else return 0;
	}


	function get_to_server(path,attr)
	{
	if(attr.length>0)
	path = path + '?'+attr;

	//alert(path);
	window.location.href=path;
	return true;
	}

	function check_submit(main_form)
	{
	var formname = '';

	if ((activeTab) && (!isAnyChecked('categories')))
	{
	form_name = activeTab.id;
	}
	else
	{
	form_name = 'categories';
	}
	var f = document.getElementsByName(form_name+'_form')[0];
	var bf = window.opener.document.getElementById(main_form);

	if(bf)
	{
	if(typeof(LastCheckedItem.value) != 'undefined')
	{
	try{
	item_id = LastCheckedItem.value;
	item_type = LastCheckedItem.ItemType;
	}
	catch(err)
	{
	}
	bf.TargetId.value = item_id;
	bf.TargetType.value = item_type;
	bf.submit();
	window.close();
	}
	else {
	theMainScript.Alert(lang_Selection_Empty);
	}
	}
	} // check submit

	function flip_current(field_suffix)
	{
	if(activeTab)
	{
	field = activeTab.getAttribute("tabTitle")+field_suffix;
	return flip(eval(field));
	}
	}

	function config_current(field_suffix,value)
	{
	if(activeTab)
	{
	field = activeTab.getAttribute("tabTitle")+field_suffix;
	config_val(field,value);
	}
	}

	function getSType(type,value)
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	if (f.SearchType.value == type) return 2; else return 0;
	} else return 0;

	}

	function getSScope(scope)
	{
	f = document.getElementById("admin_search");
	if(f)
	{
	if (f.SearchScope.value == scope) return 2; else return 0;
	} else return 0;

	}

	// function setSearchMenu()
	// {
	//
	// window.SearchMenu = new Menu("search");
	// SearchMenu.addMenuItem(lang_All,"SetSearchType('all');",getSType('all'));
	// SearchMenu.addMenuSeparator()
	//
	// SearchMenu.addMenuItem(lang_Categories, "SetSearchType('categories');",getSType('categories'));
	// param = "";
	//
	// for (var i = 0; i < tabIDs.length; i++)
	// {
	// d = document.getElementById(tabIDs[i]);
	// if(d)
	// {
	// tabname = d.getAttribute("tabTitle");
	// param = "SetSearchType('"+tabname+"');";
	//
	// SearchMenu.addMenuItem(tabname,param,getSType(tabname));
	// }
	// }
	//
	// SearchMenu.addMenuSeparator();
	// SearchMenu.addMenuItem(lang_All+' '+lang_Categories,"SetSearchScope('0');",getSScope(0));
	// SearchMenu.addMenuItem(lang_SubSearch,"ToggleNewSearch();",isNewSearch());
	// SearchMenu.addMenuItem(lang_Current+' '+lang_Categories,"SetSearchScope('2');",getSScope(2));
	// SearchMenu.addMenuItem(lang_Within+' '+lang_Categories,"SetSearchScope('1');",getSScope(1));
	//
	// SearchMenu.addMenuSeparator();
	//
	// window.SearchMenu.addMenuItem('$mnuClearSearch',"ClearSearch();","");
	// window.triedToWriteMenus = false;
	// window.SearchMenu.writeMenus();
	// }

	function Category_SortMenu(caption)
	{
	menu_sorting = new Menu(caption);

	menu_sorting.addMenuItem(lang_Asc,"config_val('Category_Sortorder','asc');",RadioIsSelected(Category_Sortorder,'asc'));
	menu_sorting.addMenuItem(lang_Desc,"config_val('Category_Sortorder','desc');",RadioIsSelected(Category_Sortorder,'desc'));
	menu_sorting.addMenuSeparator();

	menu_sorting.addMenuItem(lang_Default,"config_val('Category_Sortfield','Name');","");
	menu_sorting.addMenuItem(lang_Name,"config_val('Category_Sortfield','Name');",RadioIsSelected(Category_Sortfield,'Name'));
	menu_sorting.addMenuItem(lang_Description,"config_val('Category_Sortfield','Description');",RadioIsSelected(Category_Sortfield,'Description'));

	menu_sorting.addMenuItem(lang_CreatedOn,"config_val('Category_Sortfield','CreatedOn');",RadioIsSelected(Category_Sortfield,'CreatedOn'));
	menu_sorting.addMenuItem(lang_SubCats,"config_val('Category_Sortfield','CachedDescendantCatsQty');",RadioIsSelected(Category_Sortfield,'CachedDescendantCatsQty'));
	menu_sorting.addMenuItem(lang_SubItems,"config_val('Category_Sortfield','SubItems');",RadioIsSelected(Category_Sortfield,'SubItems'));

	return menu_sorting;

	}


	function Category_FilterMenu(caption)
	{
	menu_filter = new Menu(caption);
	menu_filter.addMenuItem(lang_All,"config_val('Category_View', 127);",CategoryView==127);
	menu_filter.addMenuSeparator();
	menu_filter.addMenuItem(lang_Active,"FlipBit('Category_View',CategoryView,6);",BitStatus(CategoryView,6));
	menu_filter.addMenuItem(lang_Pending,"FlipBit('Category_View',CategoryView,5);", BitStatus(CategoryView,5));
	menu_filter.addMenuItem(lang_Disabled,"FlipBit('Category_View',CategoryView,4);",BitStatus(CategoryView,4));

	menu_filter.addMenuSeparator();
	menu_filter.addMenuItem(lang_New,"FlipBit('Category_View',CategoryView,3);",BitStatus(CategoryView,3));
	menu_filter.addMenuItem(lang_EdPick,"FlipBit('Category_View',CategoryView,0);",BitStatus(CategoryView,0));

	return menu_filter;
	}

	function toggleMenu()
	{
	//var tab_title = GetTabTitle(activeTab.id);
	//alert(tab_title);
	if ((document.getElementById('categories').active) && (activeTab))
	{
	filterfunc = activeTab.getAttribute("tabTitle")+'_FilterMenu();';

	window.cat_menu_filter_sub = Category_FilterMenu(lang_Categories);
	window.sub_menu_filter_sub = eval(filterfunc);

	window.cat_menu_filter = new Menu(lang_View);
	cat_menu_filter.addMenuItem(cat_menu_filter_sub);
	cat_menu_filter.addMenuItem(sub_menu_filter_sub);
	}
	else
	{
	if (document.getElementById('categories').active)
	{
	window.cat_menu_filter = Category_FilterMenu(lang_View);
	}
	if (activeTab)
	{
	filterfunc = activeTab.getAttribute("tabTitle")+'_FilterMenu();';
	window.cat_menu_filter = eval(filterfunc);
	}
	} // Filter

	//Sorting
	if ((document.getElementById('categories').active) && (activeTab))
	{
	//Sort->Categories
	sortfunc = activeTab.getAttribute("tabTitle")+'_SortMenu();';

	window.cat_menu_sorting_sub = Category_SortMenu(lang_Categories);
	window.sub_menu_sorting_sub = eval(sortfunc);

	window.cat_menu_sorting = new Menu(lang_Sort);
	cat_menu_sorting.addMenuItem(cat_menu_sorting_sub);
	cat_menu_sorting.addMenuItem(sub_menu_sorting_sub);
	}
	else
	{
	if (document.getElementById('categories').active)
	{
	window.cat_menu_sorting = Category_SortMenu(lang_Sort);

	} // categories
	if (activeTab)
	{
	window.cat_menu_sorting = Category_SortMenu(lang_Sort);
	}

	} // && Sorting
	if ((document.getElementById('categories').active) && (activeTab))
	{
	window.cat_menu_select_sub = new Menu(lang_Categories);
	cat_menu_select_sub.addMenuItem(lang_All,"javascript:selectAll('categories');","");
	cat_menu_select_sub.addMenuItem(lang_Unselect,"javascript:unselectAll('categories');","");
	cat_menu_select_sub.addMenuItem(lang_Invert,"javascript:invert('categories');","");

	selectfunc = activeTab.getAttribute("tabTitle")+"_SelectMenu();";

	window.sub_menu_select_sub = eval(selectfunc);
	// sub_menu_select_sub.addMenuItem(lang_All,"javascript:selectAll('"+activeTab.id+"');","");
	// sub_menu_select_sub.addMenuItem(lang_Unselect,"javascript:unselectAll('"+activeTab.id+"');","");
	// sub_menu_select_sub.addMenuItem(lang_Invert,"javascript:invert('"+activeTab.id+"');","");

	END;
	if (!$hideSelectAll) {
	echo "
	window.cat_menu_select = new Menu(lang_Select);
	cat_menu_select.addMenuItem(cat_menu_select_sub);
	cat_menu_select.addMenuItem(sub_menu_select_sub);";
	}
	print <<<END
	}
	else
	{
	END;
	if (!$hideSelectAll) {
	echo '
	if (document.getElementById(\'categories\').active)
	{
	window.cat_menu_select = new Menu(lang_Select);
	cat_menu_select.addMenuItem(lang_All,"javascript:selectAll(\'categories\');","");
	cat_menu_select.addMenuItem(lang_Unselect,"javascript:unselectAll(\'categories\');","");
	cat_menu_select.addMenuItem(lang_Invert,"javascript:invert(\'categories\');","");
	} ';

	echo ' if (activeTab)
	{

	window.cat_menu_select = new Menu(lang_Select);
	cat_menu_select.addMenuItem(lang_All,"javascript:selectAllC(\'"+activeTab.id+"\');","");
	cat_menu_select.addMenuItem(lang_Unselect,"javascript:unselectAll(\'"+activeTab.id+"\');","");
	cat_menu_select.addMenuItem(lang_Invert,"javascript:invert(\'"+activeTab.id+"\');","");
	} ';
	}
	print <<<END
	}
	if(activeTab)
	{
	pagefunc = activeTab.getAttribute("tabTitle")+"_PerPageMenu();";
	window.PerPageMenu = eval(pagefunc);
	}
	window.cat_menu = new Menu("root");
	if ((document.getElementById('categories').active) \|\| (activeTab)) window.cat_menu.addMenuItem(cat_menu_filter);
	if ((document.getElementById('categories').active) \|\| (activeTab)) window.cat_menu.addMenuItem(cat_menu_sorting);
	if(activeTab) window.cat_menu.addMenuItem(PerPageMenu);

	END;
	if (!$hideSelectAll) {
	echo '
	if ((document.getElementById(\'categories\').active) \|\| (activeTab)) window.cat_menu.addMenuItem(cat_menu_select);
	';
	}
	print <<<END

	window.triedToWriteMenus = false;
	window.cat_menu.writeMenus();

	}

	function toggleCategoriesA(tabHeader)
	{
	var categories = document.getElementById('categories');
	if (!categories) return;
	toggleCategories();
	tabHeader.setAttribute("background", '$imagesURL'+'/itemtabs/' + ((categories.active) ? "tab_active" : "tab_inactive") + ".gif")
	var images = tabHeader.getElementsByTagName("IMG");
	if (images.length < 1) return;
	images[0].src = '$imagesURL'+'/itemtabs/' + ((categories.active) ? "divider_up" : "divider_dn") + ".gif";
	}

	function toggleTabA(tabId, atm)
	{
	var hl = document.getElementById("hidden_line");
	var activeTabId;
	if (activeTab) activeTabId = activeTab.id;
	if (activeTabId == tabId)
	{
	var devider = document.getElementById("tabsDevider");
	devider.style.display = "";

	unselectAll(tabId);
	var tab = document.getElementById(tabId);
	tab.active = false;
	activeTab = null;
	collapseTab = tab;
	toolbar.setTab(null);
	showTab();
	}

	else
	{
	if (activeTab) toggleTab(tabId, true)
	else toggleTab(tabId, atm)

	if (hl) hl.style.display = "none";
	}
	tab_hdr = document.getElementById('tab_headers');
	if (!tab_hdr) return;
	for (var i = 0; i < tabIDs.length; i++)
	{
	var tabHeader;
	TDs = tab_hdr.getElementsByTagName("TD");
	for (var j = 0; j < TDs.length; j++)
	if (TDs[j].getAttribute("tabHeaderOf") == tabIDs[i])
	{
	tabHeader = TDs[j];
	break;
	}
	if (!tabHeader) continue;

	var tab = document.getElementById(tabIDs[i]);
	if (!tab) continue;

	tabHeader.setAttribute("background", "$imagesURL/itemtabs/" + ((tab.active) ? "tab_active" : "tab_inactive") + ".gif")

	var images = tabHeader.getElementsByTagName("IMG");
	if (images.length < 1) continue;

	images[0].src = "$imagesURL/itemtabs/" + ((tab.active) ? "divider_up" : "divider_empty") + ".gif";
	}
	}

	</script>

	END;
	?>

	Property changes on: trunk/kernel/admin/include/toolbar/editcategory_relationselect.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.6
	\ No newline at end of property
	Index: trunk/kernel/units/categories/categories_config.php
	===================================================================
	--- trunk/kernel/units/categories/categories_config.php (revision 5372)
	+++ trunk/kernel/units/categories/categories_config.php (revision 5373)
	@@ -1,277 +1,284 @@
	<?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'),

	'RegisterClasses' => Array(
	Array('pseudo' => 'kPermCacheUpdater','class' => 'kPermCacheUpdater', 'file' => 'cache_updater.php','build_event'=>''),
	),

	'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='c_item_count'>#c_recordcount#</span>)"),

	'categories_edit' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
	'categories_properties' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!"),
	+ 'categories_relations' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Relations!"),
	'categories_images' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Images!"),
	'categories_permissions'=> Array('prefixes' => Array('c', 'g_List'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Permissions!"),
	'categories_custom' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),

	'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories! <span id='percents_done'></span>"),

	'images_edit' => Array( 'prefixes' => Array('c', 'c-img'),
	'new_status_labels' => Array('c-img'=>'!la_title_Adding_Image!'),
	'edit_status_labels' => Array('c-img'=>'!la_title_Editing_Image!'),
	'new_titlefield' => Array('c-img'=>'!la_title_New_Image!'),
	'format' => "#c_status# '#c_titlefield#' - #c-img_status# '#c-img_titlefield#'",
	),
	-
	+
	+ 'relations_edit' => Array( 'prefixes' => Array('c', 'c-rel'),
	+ 'new_status_labels' => Array('c-rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
	+ 'edit_status_labels' => Array('c-rel'=>'!la_title_Editing_Relationship!'),
	+ 'format' => "#c_status# '#c_titlefield#' - #c-rel_status#",
	+ ),
	+
	'tree_site' => Array('format' => '!la_selecting_categories!'),
	),

	'PermItemPrefix' => 'CATEGORY',

	'PermSection' => Array('main' => 'CATEGORY: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'),
	'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,
	),

	),

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_new'), 'type' => HAVING_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_pick'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1' ),
	'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2' ),
	'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0' ),
	's1' => Array(),
	'show_new' => Array('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ),
	'show_pick' => Array('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '`EditorsPick` != 1' ),
	)
	),

	'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.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId
	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),

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

	'ListSortings' => Array(
	'' => 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', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'Filename' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1),
	'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),
	'EditorsPick' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 2),
	'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', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', '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', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),
	'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', '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('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.47
	\ No newline at end of property
	+1.48
	\ No newline at end of property
	Index: trunk/kernel/units/relationship/relationship_event_handler.php
	===================================================================
	--- trunk/kernel/units/relationship/relationship_event_handler.php (revision 5372)
	+++ trunk/kernel/units/relationship/relationship_event_handler.php (revision 5373)
	@@ -1,194 +1,201 @@
	<?php

	class RelationshipEventHandler extends InpDBEventHandler
	{
	/**
	* Allows to override standart permission mapping
	*
	*/
	function mapPermissions()
	{
	parent::mapPermissions();
	$permissions = Array(
	'OnAddRelation' => Array('subitem' => 'add\|edit'),
	);
	$this->permMapping = array_merge($this->permMapping, $permissions);
	}

	/**
	* Add new relation
	*
	* @param kEvent $event
	*/
	function OnAddRelation(&$event)
	{
	$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
	$object =& $event->getObject();

	$table_info = $object->getLinkedInfo();
	$main_item_type = $this->Application->getUnitOption($table_info['ParentPrefix'],'ItemType');

	$target['id'] = $this->Application->GetVar('TargetId');
	$target['type'] = $this->Application->GetVar('TargetType');


	$object->SetDBField($table_info['ForeignKey'], $table_info['ParentId']);
	$object->SetDBField('SourceType', $main_item_type);
	$object->SetDBField('TargetId', $target['id']);
	$object->SetDBField('TargetType', $target['type']);

	// 1. get item info used in relation
	$configs = $this->extractModulesInfo();
	foreach($configs as $prefix => $config_data)
	{
	if($config_data['ItemType'] == $target['type']) break;
	}

	// this forces prepareOptions of kMultiLanguge formatter to substiture title field (if multilingual) of target item
	// BUT this is not the solution, find out another way to get correct title field here

	$target_object =& $this->Application->recallObject($prefix, null, Array('skip_autoload' => true));
	$title_field = $this->Application->getUnitOption($prefix, 'TitleField');

	$item['name'] = $this->Conn->GetOne('SELECT '.$title_field.' FROM '.$config_data['TableName'].' WHERE ResourceId = '.$target['id']);
	$item['type'] = $this->Application->Phrase($config_data['TitlePhrase']);
	$object->SetDBField('ItemName', $item['name']);
	$object->SetDBField('ItemType', $item['type']);

	$object->setID(0);

	$event->redirect = false;

	// 2. substitute opener
	$opener_stack = $this->Application->RecallVar('opener_stack');
	$opener_stack = $opener_stack ? unserialize($opener_stack) : Array();
	array_pop($opener_stack);

	$return_template = $this->Application->RecallVar('return_template');
	$new_level = 'index4.php\|'.ltrim($this->Application->BuildEnv($return_template, Array('m_opener'=>'u'),'all'),ENV_VAR_NAME.'=');
	array_push($opener_stack,$new_level);
	$this->Application->StoreVar('opener_stack',serialize($opener_stack));

	$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
	}

	/**
	* Creates needed sql query to load list,
	* if no query is defined in config for
	* special requested, then use default
	* query
	*
	* @param kEvent $event
	* @access protected
	*/
	function ListPrepareQuery(&$event)
	{
	return $this->BaseQuery($event,'ListSQLs');
	}

	/**
	* Creates needed sql query to load item,
	* if no query is defined in config for
	* special requested, then use default
	* query
	*
	* @param kEvent $event
	* @access protected
	*/
	function ItemPrepareQuery(&$event)
	{
	return $this->BaseQuery($event,'ItemSQLs');
	}


	/**
	* Get item name & type based on relation type & modules installed
	*
	* @param kEvent $event
	* @param string $sql_field
	*/
	function BaseQuery(&$event, $sql_field)
	{
	$sqls = $this->Application->getUnitOption($event->Prefix,$sql_field);
	$sql = isset($sqls[$event->Special]) ? $sqls[$event->Special] : $sqls[''];

	$configs = $this->extractModulesInfo();

	// 2. build sql based on information queried
	$sql_templates['ItemName'] = 'IFNULL(%s.%s,\' \')';
	$sql_templates['TableJoin'] = 'LEFT JOIN %1$s ON %1$s.ResourceId = rel.TargetId';
	$sql_templates['TargetName'] = 'IF(rel.TargetType = %s, \'%s\', %s)';

	$sql_parts = Array();
	$sql_parts['TargetName'] = "''";
	- foreach($configs as $prefix => $config_data)
	- {
	- $sql_parts['ItemName'][] = sprintf($sql_templates['ItemName'], $config_data['TableName'], $config_data['TitleField']);
	+ foreach ($configs as $prefix => $config_data) {
	+ // convert TitleField field of kMultiLanguage formatter used for it: begin
	+ $title_field = $config_data['TitleField'];
	+ $formatter_class = isset($config_data['Fields'][$title_field]['formatter']) ? $config_data['Fields'][$title_field]['formatter'] : '';
	+ if ($formatter_class == 'kMultiLanguage') {
	+ $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
	+ $title_field = $ml_formatter->LangFieldName($title_field);
	+ }
	+ // convert TitleField field of kMultiLanguage formatter used for it: end
	+
	+ $sql_parts['ItemName'][] = sprintf($sql_templates['ItemName'], $config_data['TableName'], $title_field);
	$sql_parts['TableJoin'][] = sprintf($sql_templates['TableJoin'], $config_data['TableName']);

	$sql_parts['TargetName'] = sprintf( $sql_templates['TargetName'],
	$config_data['ItemType'],
	'!'.$config_data['TitlePhrase'].'!',
	$sql_parts['TargetName']);
	$sql_parts['TargetName'] = str_replace('rel','%1$s',$sql_parts['TargetName']);
	}

	$object =& $event->getObject();

	$vars = Array('#ITEM_NAMES#', '#ITEM_TYPES#');
	$replacements = Array( implode(', ',$sql_parts['ItemName']), $sql_parts['TargetName'] );

	$calculated_fields =& $object->getProperty('CalculatedFields');
	- foreach($calculated_fields as $field_name => $field_expression)
	- {
	- $calculated_fields[$field_name] = str_replace($vars,$replacements,$field_expression);
	+ foreach ($calculated_fields as $field_name => $field_expression) {
	+ $calculated_fields[$field_name] = str_replace($vars, $replacements, $field_expression);
	}

	$object->setProperty('CalculatedFields', $calculated_fields);

	$sql = str_replace('#ITEM_JOIN#', implode(' ',$sql_parts['TableJoin']), $sql);
	$sql = str_replace('rel.','%1$s.',$sql);

	return $sql;
	}

	/**
	* Get configs from modules installed
	*
	* @return Array
	* @access private
	*/
	function extractModulesInfo()
	{
	// get installed modules & their config info
	// maybe we should leave only prefixes, that have "view" permission
	$configs = Array();
	foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
	$prefix = $module_data['Var'];
	$configs[$prefix] = $this->Application->getUnitOptions($prefix);
	if($configs[$prefix] === false) unset($configs[$prefix]);
	}
	return $configs;
	}


	/**
	* Deletes relations to hooked item from other items
	*
	* @param kEvent $event
	*/
	function OnDeleteForeignRelations(&$event)
	{
	$main_object =& $event->MasterEvent->getObject();
	$resource_id = $main_object->GetDBField('ResourceId');

	$table = $this->Application->getUnitOption($event->Prefix,'TableName');
	$sql = 'DELETE FROM '.$table.' WHERE TargetId = '.$resource_id;
	$this->Conn->Query($sql);
	}


	}


	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/relationship/relationship_event_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.4
	\ No newline at end of property
	+1.5
	\ No newline at end of property
	Index: trunk/kernel/units/relationship/relationship_config.php
	===================================================================
	--- trunk/kernel/units/relationship/relationship_config.php (revision 5372)
	+++ trunk/kernel/units/relationship/relationship_config.php (revision 5373)
	@@ -1,106 +1,106 @@
	<?php

	$config = Array(
	'Prefix' => 'rel',

	'Clones' => Array(
	-
	+ 'c-rel' => Array('ParentPrefix' => 'c'),
	'l-rel' => Array('ParentPrefix' => 'l'),
	'n-rel' => Array('ParentPrefix' => 'n'),
	'bb-rel'=> Array('ParentPrefix' => 'bb'),
	/'p-rel' => Array('ParentPrefix' => 'p'),/
	),

	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'RelationshipEventHandler','file'=>'relationship_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => '#PARENT#',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnAfterItemDelete'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnDeleteForeignRelations',
	),
	),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	),
	'IDField' => 'RelationshipId',
	'StatusField' => Array('Enabled','Type'),
	'TableName' => TABLE_PREFIX.'Relationship',
	'ParentTableKey'=> 'ResourceId',
	'ForeignKey' => 'SourceId',
	'ParentPrefix' => 'p',
	'AutoDelete' => true,
	'AutoClone' => true,

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_recip','show_oneway'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ),
	'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ),
	's1' => Array(),
	'show_recip' => Array('label' => 'la_Reciprocal', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ),
	'show_oneway' => Array('label' => 'la_OneWay', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ),
	)
	),

	'CalculatedFields' => Array(
	'' => Array(
	'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))',
	'ItemType' => '#ITEM_TYPES#',
	),
	),

	'ListSQLs' => Array( ''=> 'SELECT %1$s.RelationshipId, %1$s.Priority, %1$s.Type, %1$s.Enabled %2$s
	FROM %1$s #ITEM_JOIN#',
	), // key - special, value - list select sql

	'ListSortings' => Array(
	'' => Array(
	'ForcedSorting' => Array('Priority' => 'desc'),
	'Sorting' => Array('ItemName' => 'asc', 'ItemType' => 'asc'),
	)
	),
	'ItemSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',),

	'Fields' => Array(
	'RelationshipId' => Array(),
	'SourceId' => Array('type'=>'int'),
	'TargetId' => Array('type'=>'int'),
	'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0),
	'TargetType' => Array('type'=>'int','not_null'=>1,'default'=>0),
	'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'),'not_null'=>1,'default'=>0,'use_phrases'=>1),
	'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1),
	'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0),
	),
	'VirtualFields' => Array( 'ItemName' => Array(),
	'ItemType' => Array(),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
	'Fields' => Array(
	'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td'),
	'ItemType' => Array( 'title'=>'la_col_TargetType' ),
	'Type' => Array( 'title'=>'la_col_RelationshipType' ),
	'Enabled' => Array( 'title'=>'la_col_Status' ),
	),

	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/relationship/relationship_config.php
	___________________________________________________________________
	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/category/category_items.tpl
	===================================================================
	--- trunk/kernel/admin_templates/category/category_items.tpl (revision 5372)
	+++ trunk/kernel/admin_templates/category/category_items.tpl (nonexistent)
	@@ -1,11 +0,0 @@
	-<inp2:m_include t="incs/header_mini" form_name="category"/>
	-<input type="hidden" name="Action" value="m_save_custom_data" />
	-<input type="hidden" name="CatEditStatus" value="0" />
	-<script type="text/javascript">
	- $form_name = 'category';
	-</script>
	-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	- <inp2:m_ModuleInclude template="category_items" />
	-</table>
	-
	-<inp2:m_include t="incs/footer_mini"/>
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/category/category_items.tpl
	___________________________________________________________________
	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
	Index: trunk/kernel/admin_templates/categories/relations_edit.tpl
	===================================================================
	--- trunk/kernel/admin_templates/categories/relations_edit.tpl (nonexistent)
	+++ trunk/kernel/admin_templates/categories/relations_edit.tpl (revision 5373)
	@@ -0,0 +1,76 @@
	+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
	+<inp2:m_include t="incs/header" nobody="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_Categories!"/>
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="relations_edit" module="in-portal" icon="icon46_catalog"/>
	+
	+<!-- ToolBar --->
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <script type="text/javascript">
	+ a_toolbar = new ToolBar();
	+ a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	+ submit_event('c-rel','<inp2:c-rel_SaveEvent/>');
	+ }
	+ ) );
	+ a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	+ submit_event('c-rel','OnCancel');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	+
	+ a_toolbar.Render();
	+
	+ <inp2:m_if prefix="c-rel" function="IsSingle"/>
	+ a_toolbar.HideButton('prev');
	+ a_toolbar.HideButton('next');
	+ a_toolbar.HideButton('sep1');
	+ a_toolbar.HideButton('sep2');
	+ <inp2:m_else/>
	+ <inp2:m_if prefix="c-rel" function="IsLast"/>
	+ a_toolbar.DisableButton('next');
	+ <inp2:m_endif/>
	+ <inp2:m_if prefix="c-rel" function="IsFirst"/>
	+ a_toolbar.DisableButton('prev');
	+ <inp2:m_endif/>
	+ <inp2:m_endif/>
	+ </script>
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+
	+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	+ <inp2:m_ParseBlock name="subsection" title="!la_section_Relation!"/>
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="SourceId"/>
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="SourceType"/>
	+
	+ <inp2:m_ParseBlock name="inp_label" prefix="c-rel" field="RelationshipId" title="!la_fld_RelationshipId!"/>
	+
	+ <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	+ <inp2:m_ParseBlock name="inp_edit_field_caption" prefix="c-rel" field_name="TargetId" title="!la_fld_TargetId!"/>
	+ <td valign="top" class="text">
	+ <img src="<inp2:rel_ModulePath />img/itemicons/<inp2:rel_ItemIcon grid="Default"/>"/>
	+ <inp2:c-rel_Field field="ItemName"/> (<inp2:c-rel_Field field="ItemType"/>)
	+
	+ </td>
	+ <td> </td>
	+ </tr>
	+
	+
	+
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="TargetId"/>
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="TargetType"/>
	+
	+ <inp2:m_ParseBlock name="inp_edit_radio" prefix="c-rel" field="Type" title="!la_fld_RelationshipType!"/>
	+ <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-rel" field="Enabled" title="!la_fld_Enabled!"/>
	+ <inp2:m_ParseBlock name="inp_edit_box" prefix="c-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
	+
	+</table>
	+<inp2:m_include t="incs/footer"/>
	+
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/categories/relations_edit.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/categories/categories_edit_relations.tpl
	===================================================================
	--- trunk/kernel/admin_templates/categories/categories_edit_relations.tpl (nonexistent)
	+++ trunk/kernel/admin_templates/categories/categories_edit_relations.tpl (revision 5373)
	@@ -0,0 +1,111 @@
	+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
	+<inp2:m_include t="incs/header" nobody="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_Categories!"/>
	+
	+<inp2:m_include t="categories/categories_tabs"/>
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_relations" module="in-portal" icon="icon46_catalog"/>
	+
	+<!-- ToolBar --->
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <script type="text/javascript">
	+ a_toolbar = new ToolBar();
	+ a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	+ submit_event('c','<inp2:c_SaveEvent/>');
	+ }
	+ ) );
	+ a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	+ submit_event('c','OnCancelEdit');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	+ go_to_id('c', '<inp2:c_PrevId/>');
	+ }
	+ ) );
	+ a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	+ go_to_id('c', '<inp2:c_NextId/>');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	+
	+ //Relations related:
	+ a_toolbar.AddButton( new ToolBarButton('new_relation', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>',
	+ function() {
	+ document.getElementById('events[c-rel]').value = 'OnAddRelation';
	+ document.getElementById('t').value = 'categories/relations_edit';
	+ opener_action('d');
	+ OpenItemSelector('&CatId='+'<inp2:m_get name="m_cat_id"/>'+'&Selector=radio&main_prefix=c&dst_field=&return_template=<inp2:m_get name="t"/>','kernel_form');
	+ } ) );
	+
	+ function edit()
	+ {
	+ std_edit_temp_item('c-rel', 'categories/relations_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-rel')
	+ } ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	+ submit_event('c-rel','OnMassApprove');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	+ submit_event('c-rel','OnMassDecline');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep4') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	+ show_viewmenu(a_toolbar,'view');
	+ }
	+ ) );
	+
	+ a_toolbar.Render();
	+
	+ <inp2:m_if prefix="c" function="IsSingle"/>
	+ a_toolbar.HideButton('prev');
	+ a_toolbar.HideButton('next');
	+ a_toolbar.HideButton('sep1');
	+ //a_toolbar.HideButton('sep2');
	+ <inp2:m_else/>
	+ <inp2:m_if prefix="c" function="IsLast"/>
	+ a_toolbar.DisableButton('next');
	+ <inp2:m_endif/>
	+ <inp2:m_if prefix="c" function="IsFirst"/>
	+ a_toolbar.DisableButton('prev');
	+ <inp2:m_endif/>
	+ <inp2:m_endif/>
	+ </script>
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+
	+<inp2:m_ParseBlock name="grid" PrefixSpecial="c-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>
	+<script type="text/javascript">
	+ Grids['c-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
	+</script>
	+<input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
	+<input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
	+<inp2:m_include t="incs/footer"/>
	+
	+<script type="text/javascript">
	+ var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
	+</script>
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/categories/categories_edit_relations.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/kernel/utility/unit_config_reader.php
	===================================================================
	--- trunk/core/kernel/utility/unit_config_reader.php (revision 5372)
	+++ trunk/core/kernel/utility/unit_config_reader.php (revision 5373)
	@@ -1,633 +1,637 @@
	<?php

	class kUnitConfigReader extends kBase {

	/**
	* Configs readed
	*
	* @var Array
	* @access private
	*/
	var $configData=Array();
	var $configFiles=Array();

	var $CacheExpired = false;

	var $prefixFiles = array();

	var $ProcessAllConfigs = false;
	var $FinalStage = false;
	var $StoreCache = false;
	var $AfterConfigProcessed = array();

	/**
	* Scan kernel and user classes
	* for available configs
	*
	* @access protected
	*/
	function Init($prefix,$special)
	{
	parent::Init($prefix,$special);
	}

	function CacheParsedData()
	{
	$event_manager =& $this->Application->recallObject('EventManager');
	$aggregator =& $this->Application->recallObject('TagsAggregator', 'kArray');

	$config_vars = Array(
	'SessionTimeout',
	'SessionCookieName',
	'SessionReferrerCheck',
	'CookieSessions',
	'UseCronForRegularEvent',
	'User_GuestGroup',
	'User_LoggedInGroup',
	'SessionTimeout',
	'UseModRewrite',
	'AdminDirectory',
	);

	foreach ($config_vars as $var) {
	$this->Application->ConfigValue($var);
	}

	$cache = Array(
	'Factory.Files' => $this->Application->Factory->Files,
	'Factory.realClasses' => $this->Application->Factory->realClasses,
	'Factory.Dependencies' => $this->Application->Factory->Dependencies,
	'ConfigReader.prefixFiles' => $this->prefixFiles,
	'EventManager.buildEvents' => $event_manager->buildEvents,
	'EventManager.beforeRegularEvents' => $event_manager->beforeRegularEvents,
	'EventManager.afterRegularEvents' => $event_manager->afterRegularEvents,
	'EventManager.beforeHooks' => $event_manager->beforeHooks,
	'EventManager.afterHooks' => $event_manager->afterHooks,
	'TagsAggregator.data' => $aggregator->_Array,

	// the following caches should be reset based on admin interaction (adjusting config, enabling modules etc)
	'Application.Caches.ConfigVariables' => $this->Application->Caches['ConfigVariables'],
	'Application.ConfigCacheIds' => $this->Application->ConfigCacheIds,
	'Application.ConfigHash' => $this->Application->ConfigHash,
	'Application.ModuleInfo' => $this->Application->ModuleInfo,
	);

	$conn =& $this->Application->GetADODBConnection();
	$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("configs_parsed", '.$conn->qstr(serialize($cache)).', '.adodb_mktime().')');
	$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("config_files", '.$conn->qstr(serialize($this->configFiles)).', '.adodb_mktime().')');
	unset($this->configFiles);
	}

	function RestoreParsedData()
	{
	$conn =& $this->Application->GetADODBConnection();
	$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "configs_parsed"');
	if ($data && $data['Cached'] > 0 ) {
	$cache = unserialize($data['Data']);
	$this->Application->Factory->Files = $cache['Factory.Files'];
	$this->Application->Factory->realClasses = $cache['Factory.realClasses'];
	$this->Application->Factory->Dependencies = $cache['Factory.Dependencies'];
	$this->prefixFiles = $cache['ConfigReader.prefixFiles'];

	$event_manager =& $this->Application->recallObject('EventManager');
	$event_manager->buildEvents = $cache['EventManager.buildEvents'];
	$event_manager->beforeRegularEvents = $cache['EventManager.beforeRegularEvents'];
	$event_manager->afterRegularEvents = $cache['EventManager.afterRegularEvents'];
	$event_manager->beforeHooks = $cache['EventManager.beforeHooks'];
	$event_manager->afterHooks = $cache['EventManager.afterHooks'];

	$aggregator =& $this->Application->recallObject('TagsAggregator', 'kArray');
	$aggregator->_Array = $cache['TagsAggregator.data'];

	$this->Application->ConfigHash = $cache['Application.ConfigHash'];

	$this->Application->Caches['ConfigVariables'] = $cache['Application.ConfigCacheIds'];
	$this->Application->ConfigCacheIds = $cache['Application.ConfigCacheIds'];

	$this->Application->ModuleInfo = $cache['Application.ModuleInfo'];

	return true;

	}
	else return false;
	}

	function ResetParsedData($include_sections = false)
	{
	$conn =& $this->Application->GetADODBConnection();
	$conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = "configs_parsed"');

	if ($include_sections) {
	$conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = "sections_parsed"');
	}
	}

	function scanModules($folderPath, $cache = true)
	{
	if (defined('IS_INSTALL') && IS_INSTALL) {
	// disable config caching during installation
	$cache = false;
	}

	if ($cache) {
	$restored = $this->RestoreParsedData();
	if ($restored) return;
	}

	$this->ProcessAllConfigs = true;

	$this->includeConfigFiles($folderPath, $cache);
	$this->ParseConfigs();

	// tell AfterConfigRead to store cache if neede
	// can't store it here beacuse AfterConfigRead needs ability to change config data
	$this->StoreCache = $cache;
	}

	function findConfigFiles($folderPath)
	{
	// if FULL_PATH = "/" ensure, that all "/" in $folderPath are not deleted
	$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';
	$folderPath = preg_replace($reg_exp, '', $folderPath, 1); // this make sense, since $folderPath may NOT contain FULL_PATH

	$fh = opendir(FULL_PATH.$folderPath);
	while (($sub_folder = readdir($fh))) {
	$full_path = FULL_PATH.$folderPath.'/'.$sub_folder;
	if ($this->isDir($full_path)) {
	if (file_exists(FULL_PATH.$this->getConfigName($folderPath.'/'.$sub_folder))) {
	$this->configFiles[] = $this->getConfigName($folderPath.'/'.$sub_folder);
	}
	$this->findConfigFiles($full_path);

	// if (filemtime($full_path) > $cached) { }

	}
	}
	}

	function includeConfigFiles($folderPath, $cache = true)
	{
	$this->Application->refreshModuleInfo();

	$conn =& $this->Application->GetADODBConnection();
	$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
	if ($cache && $data) {
	$this->configFiles = unserialize($data['Data']);
	shuffle($this->configFiles);
	$files_cached = $data['Cached'];
	}
	else {
	$this->findConfigFiles($folderPath); // search from base directory
	}

	foreach ($this->configFiles as $filename)
	{
	$prefix = $this->PreloadConfigFile($filename);
	if (!$prefix) {
	trigger_error('Prefix not defined in config file '.$filename, E_USER_ERROR);
	}
	}
	}

	/**
	* Process all read config files - called ONLY when there is no cache!
	*
	*/
	function ParseConfigs()
	{
	foreach ($this->configData as $prefix => $config) {
	$this->parseConfig($prefix);
	}

	foreach ($this->configData as $prefix => $config) {
	$this->ProcessDependencies($prefix);
	$this->postProcessConfig($prefix, 'AggregateConfigs', 'sub_prefix');
	$clones = $this->postProcessConfig($prefix, 'Clones', 'prefix');
	}
	}

	function AfterConfigRead()
	{
	// if (!$this->ProcessAllConfigs) return ;
	$this->FinalStage = true;
	foreach ($this->configData as $prefix => $config) {
	if (in_array($prefix, $this->AfterConfigProcessed)) continue;
	$this->Application->HandleEvent( new kEvent($prefix.':OnAfterConfigRead') );
	$this->AfterConfigProcessed[] = $prefix;
	}
	if ($this->StoreCache) $this->CacheParsedData();
	}

	/**
	* Register nessasary classes
	* This method should only process the data which is cached!
	*
	* @param string $prefix
	* @access private
	*/
	function parseConfig($prefix)
	{
	$config =& $this->configData[$prefix];
	$event_manager =& $this->Application->recallObject('EventManager');

	$register_classes = getArrayValue($config,'RegisterClasses');
	if (!$register_classes) $register_classes = Array();
	$class_params=Array('ItemClass','ListClass','EventHandlerClass','TagProcessorClass');
	foreach($class_params as $param_name)
	{
	if ( !(isset($config[$param_name]) ) ) continue;
	$config[$param_name]['pseudo'] = $this->getPrefixByParamName($param_name,$prefix);
	$register_classes[] = $config[$param_name];
	}

	foreach($register_classes as $class_info)
	{
	$require_classes = getArrayValue($class_info, 'require_classes');
	if ($require_classes) {
	if (!is_array($require_classes)) {
	$require_classes = array($require_classes);
	}
	if (!isset($config['_Dependencies'][$class_info['class']])) {
	$config['_Dependencies'][$class_info['class']] = array();
	}
	$config['_Dependencies'][$class_info['class']] = array_merge($config['_Dependencies'][$class_info['class']], $require_classes);
	}
	$this->Application->registerClass(
	$class_info['class'],
	$config['BasePath'].'/'.$class_info['file'],
	$class_info['pseudo']/*,
	getArrayValue($class_info, 'require_classes')*/
	);
	if (getArrayValue($class_info, 'build_event')) {
	$event_manager->registerBuildEvent($class_info['pseudo'],$class_info['build_event']);
	}
	}

	$regular_events = getArrayValue($config, 'RegularEvents');
	if($regular_events)
	{
	foreach($regular_events as $short_name => $regular_event_info)
	{
	$event_manager->registerRegularEvent( $short_name, $config['Prefix'].':'.$regular_event_info['EventName'], $regular_event_info['RunInterval'], $regular_event_info['Type'] );
	}
	}

	$hooks = getArrayValue($config, 'Hooks');
	if (is_array($hooks) && count($hooks) > 0) {
	foreach ($hooks as $hook) {
	if (isset($config['ParentPrefix']) && $hook['HookToPrefix'] == $config['ParentPrefix']) {
	trigger_error('Depricated Hook Usage [prefix: <b>'.$config['Prefix'].'</b>; do_prefix: <b>'.$hook['DoPrefix'].'</b>] use <b>#PARENT#</b> as <b>HookToPrefix</b> value, where HookToPrefix is same as ParentPrefix', E_USER_NOTICE);
	}

	if ($hook['HookToPrefix'] == '') {
	$hook['HookToPrefix'] = $config['Prefix']; // new: set hooktoprefix to current prefix if not set
	}

	if (isset($config['ParentPrefix'])) {
	// new: allow to set hook to parent prefix what ever it is
	if ($hook['HookToPrefix'] == '#PARENT#') {
	$hook['HookToPrefix'] = $config['ParentPrefix'];
	}

	if ($hook['DoPrefix'] == '#PARENT#') {
	$hook['DoPrefix'] = $config['ParentPrefix'];
	}
	}
	elseif ($hook['HookToPrefix'] == '#PARENT#' \|\| $hook['DoPrefix'] == '#PARENT#') {
	continue; // we need parent prefix but it's not set !
	}

	$do_prefix = $hook['DoPrefix'] == '' ? $config['Prefix'] : $hook['DoPrefix'];

	if ( !is_array($hook['HookToEvent']) ) {
	$hook_events = Array( $hook['HookToEvent'] );
	}
	else {
	$hook_events = $hook['HookToEvent'];
	}
	foreach ($hook_events as $hook_event) {
	$this->Application->registerHook($hook['HookToPrefix'], $hook['HookToSpecial'], $hook_event, $hook['Mode'], $do_prefix, $hook['DoSpecial'], $hook['DoEvent'], $hook['Conditional']);
	}
	}
	}

	if ( is_array(getArrayValue($config, 'AggregateTags')) ) {
	foreach ($config['AggregateTags'] as $aggregate_tag) {
	if (isset($config['ParentPrefix'])) {
	if ($aggregate_tag['AggregateTo'] == $config['ParentPrefix']) {
	trigger_error('Depricated Aggregate Tag Usage [prefix: <b>'.$config['Prefix'].'</b>; AggregateTo: <b>'.$aggregate_tag['AggregateTo'].'</b>] use <b>#PARENT#</b> as <b>AggregateTo</b> value, where AggregateTo is same as ParentPrefix', E_USER_NOTICE);
	}

	if ($aggregate_tag['AggregateTo'] == '#PARENT#') {
	$aggregate_tag['AggregateTo'] = $config['ParentPrefix'];
	}
	}
	$aggregate_tag['LocalPrefix'] = $config['Prefix'];
	$this->Application->registerAggregateTag($aggregate_tag);
	}
	}

	if ( $this->Application->isDebugMode() && constOn('DBG_VALIDATE_CONFIGS') && isset($config['TableName']) )
	{
	global $debugger;
	$tablename = $config['TableName'];

	$conn =& $this->Application->GetADODBConnection();
	$res = $conn->Query("DESCRIBE $tablename");

	foreach ($res as $field) {
	$f_name = $field['Field'];
	if (getArrayValue($config, 'Fields')) {
	if ( !array_key_exists ($f_name, $config['Fields']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Field $f_name exists in the database, but is not defined in config file for prefix <b>".$config['Prefix']."</b>!");
	safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	}
	else {
	$options = $config['Fields'][$f_name];
	if ($field['Null'] == '') {
	if ( $f_name != $config['IDField'] && !isset($options['not_null']) && !isset($options['required']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field $f_name in config for prefix <b>".$config['Prefix']."</b> is NOT NULL in the database, but is not configured as not_null or required!");
	safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	}
	if ( isset($options['not_null']) && !isset($options['default']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field $f_name in config for prefix <b>".$config['Prefix']."</b> is described as NOT NULL, but does not have DEFAULT value!");
	safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	}
	}

	}
	}
	}
	}
	}

	function ProcessDependencies($prefix)
	{
	$config =& $this->configData[$prefix];
	$deps = getArrayValue($config, '_Dependencies');
	if (!$deps) return ;

	foreach ($deps as $real_class => $requires) {
	foreach ($requires as $class) {
	$this->Application->registerDependency($real_class, $class);
	}
	}
	unset($config['_Dependencies']);
	}

	function postProcessConfig($prefix, $config_key, $dst_prefix_var)
	{
	$main_config =& $this->configData[$prefix];
	$sub_configs = getArrayValue($main_config, $config_key);
	if (!$sub_configs) {
	return array();
	}
	unset($main_config[$config_key]);

	$processed = array();
	foreach ($sub_configs as $sub_prefix => $sub_config) {
	if ($config_key == 'AggregateConfigs' && !isset($this->configData[$sub_prefix])) {
	$this->loadConfig($sub_prefix);
	}
	$sub_config['Prefix'] = $sub_prefix;
	$this->configData[$sub_prefix] = array_merge_recursive2($this->configData[$$dst_prefix_var], $sub_config);

	// when merging empty array to non-empty results non-empty array, but empty is required
	foreach ($sub_config as $sub_key => $sub_value) {
	if (!$sub_value) {
	unset($this->configData[$sub_prefix][$sub_key]);
	}
	}
	if ($config_key == 'Clones') {
	$this->prefixFiles[$sub_prefix] = $this->prefixFiles[$prefix];
	}

	$this->postProcessConfig($sub_prefix, $config_key, $dst_prefix_var);
	if ($config_key == 'AggregateConfigs') {
	$processed = array_merge($this->postProcessConfig($sub_prefix, 'Clones', 'prefix'), $processed);
	}
	elseif ($this->ProcessAllConfigs) {
	$this->parseConfig($sub_prefix);
	}
	array_push($processed, $sub_prefix);
	}

	if (!$prefix) {
	// configs, that used only for cloning & not used ifself
	unset($this->configData[$prefix]);
	}
	return array_unique($processed);
	}

	function PreloadConfigFile($filename)
	{
	$config_found = file_exists(FULL_PATH.$filename) && $this->configAllowed($filename);

	if( defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PROFILE_INCLUDES') )
	{
	if ( in_array($filename, get_required_files()) ) return;
	global $debugger;
	if($config_found) {
	$file = FULL_PATH.$filename;
	$debugger->ProfileStart('inc_'.crc32($file), $file);
	include_once($file);
	$debugger->ProfileFinish('inc_'.crc32($file));
	$debugger->profilerAddTotal('includes', 'inc_'.crc32($file));
	}
	}
	else
	{
	if ($config_found) include_once(FULL_PATH.$filename);
	}

	if ($config_found) {
	if (isset($config) && $config) {
	// config file is included for 1st time -> save it's content for future processing
	$prefix = isset($config['Prefix']) ? $config['Prefix'] : '';

	preg_match('/\/(.*)\//U', $filename, $rets);
	$config['ModuleFolder'] = $rets[1];
	$config['BasePath'] = dirname(FULL_PATH.$filename);
	$this->configData[$prefix] = $config;
	$this->prefixFiles[$prefix] = $filename;
	return $prefix;
	}
	elseif ($prefix = array_search($filename, $this->prefixFiles)) {
	// attempt is made to include config file twice or more, but include_once prevents that,
	// but file exists on hdd, then it is already saved to all required arrays, just return it's prefix
	return $prefix;
	}
	}
	return 'dummy';
	}

	function loadConfig($prefix)
	{
	if (!isset($this->prefixFiles[$prefix])) {
	if ($this->Application->isDebugMode()) $this->Application->Debugger->appendTrace();
	trigger_error('Configuration file for prefix <b>'.$prefix.'</b> is unknown', E_USER_ERROR);
	return ;
	}
	$file = $this->prefixFiles[$prefix];
	$prefix = $this->PreloadConfigFile($file);

	$clones = $this->postProcessConfig($prefix, 'AggregateConfigs', 'sub_prefix');
	$clones = array_merge($this->postProcessConfig($prefix, 'Clones', 'prefix'), $clones);

	if ($this->FinalStage) {
	array_unshift($clones, $prefix);
	$clones = array_unique($clones);
	foreach ($clones as $a_prefix) {
	$this->Application->HandleEvent( new kEvent($a_prefix.':OnAfterConfigRead') );
	}
	}
	}

	/**
	* Reads unit (specified by $prefix)
	* option specified by $option
	*
	* @param string $prefix
	* @param string $name
	* @param mixed $default
	* @return string
	* @access public
	*/
	function getUnitOption($prefix, $name, $default = false)
	{
	if (preg_match('/(.)\.(.)/', $prefix, $rets)) {
	if (!isset($this->configData[$rets[1]])) {
	$this->loadConfig($rets[1]);
	}
	$ret = getArrayValue($this->configData, $rets[1], $name, $rets[2]);
	}
	else {
	if (!isset($this->configData[$prefix])) {
	$this->loadConfig($prefix);
	}
	$ret = getArrayValue($this->configData, $prefix, $name);
	}
	return $ret === false ? $default : $ret;
	}

	/**
	* Read all unit with $prefix options
	*
	* @param string $prefix
	* @return Array
	* @access public
	*/
	function getUnitOptions($prefix)
	{
	- return $this->prefixRegistred($prefix) ? $this->configData[$prefix] : false;
	+ if (!isset($this->configData[$prefix])) {
	+ $this->loadConfig($prefix);
	+ }
	+
	+ return $this->configData[$prefix];
	}

	/**
	* Set's new unit option value
	*
	* @param string $prefix
	* @param string $name
	* @param string $value
	* @access public
	*/
	function setUnitOption($prefix, $name, $value)
	{
	if (preg_match('/(.)\.(.)/', $prefix, $rets)) {
	if (!isset($this->configData[$rets[1]])) {
	$this->loadConfig($rets[1]);
	}
	$this->configData[$rets[1]][$name][$rets[2]] = $value;
	}
	else {
	if (!isset($this->configData[$prefix])) {
	$this->loadConfig($prefix);
	}
	$this->configData[$prefix][$name] = $value;
	}

	}

	function getPrefixByParamName($paramName,$prefix)
	{
	$pseudo_class_map=Array(
	'ItemClass'=>'%s',
	'ListClass'=>'%s_List',
	'EventHandlerClass'=>'%s_EventHandler',
	'TagProcessorClass'=>'%s_TagProcessor'
	);
	return sprintf($pseudo_class_map[$paramName],$prefix);
	}

	/**
	* Get's config file name based
	* on folder name supplied
	*
	* @param string $folderPath
	* @return string
	* @access private
	*/
	function getConfigName($folderPath)
	{
	return $folderPath.'/'.basename($folderPath).'_config.php';
	}

	/**
	* is_dir ajustment to work with
	* directory listings too
	*
	* @param string $folderPath
	* @return bool
	* @access private
	*/
	function isDir($folderPath)
	{
	$base_name = basename($folderPath);
	$ret = !( $base_name == '.' \|\| $base_name == '..' );
	return $ret && is_dir($folderPath);
	}

	/**
	* Checks if config file is allowed for includion (if module of config is installed)
	*
	* @param string $config_path relative path from in-portal directory
	*/
	function configAllowed($config_path)
	{
	if (defined('IS_INSTALL') && IS_INSTALL) {
	// at installation start no modules in db and kernel configs could not be read
	return true;
	}

	$module_found = false;
	if (!$this->Application->ModuleInfo) return false;

	foreach($this->Application->ModuleInfo as $module_name => $module_info)
	{
	$module_path = '/'.$module_info['Path'];
	if (preg_match('/^'.preg_quote($module_path, '/').'/', $config_path)) {
	// if (substr($config_path, 0, strlen($module_path)) == $module_path) {
	// config file path starts with module folder path
	$module_found = true;
	break;
	}
	}
	return $module_found;
	}

	/**
	* Returns true if config exists and is allowed for reading
	*
	* @param string $prefix
	* @return bool
	*/
	function prefixRegistred($prefix)
	{
	return isset($this->configData[$prefix]) ? true : false;
	}



	}


	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/utility/unit_config_reader.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/units/categories/categories_config.php
	===================================================================
	--- trunk/core/units/categories/categories_config.php (revision 5372)
	+++ trunk/core/units/categories/categories_config.php (revision 5373)
	@@ -1,277 +1,284 @@
	<?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'),

	'RegisterClasses' => Array(
	Array('pseudo' => 'kPermCacheUpdater','class' => 'kPermCacheUpdater', 'file' => 'cache_updater.php','build_event'=>''),
	),

	'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='c_item_count'>#c_recordcount#</span>)"),

	'categories_edit' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
	'categories_properties' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!"),
	+ 'categories_relations' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Relations!"),
	'categories_images' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Images!"),
	'categories_permissions'=> Array('prefixes' => Array('c', 'g_List'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Permissions!"),
	'categories_custom' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),

	'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories! <span id='percents_done'></span>"),

	'images_edit' => Array( 'prefixes' => Array('c', 'c-img'),
	'new_status_labels' => Array('c-img'=>'!la_title_Adding_Image!'),
	'edit_status_labels' => Array('c-img'=>'!la_title_Editing_Image!'),
	'new_titlefield' => Array('c-img'=>'!la_title_New_Image!'),
	'format' => "#c_status# '#c_titlefield#' - #c-img_status# '#c-img_titlefield#'",
	),
	-
	+
	+ 'relations_edit' => Array( 'prefixes' => Array('c', 'c-rel'),
	+ 'new_status_labels' => Array('c-rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
	+ 'edit_status_labels' => Array('c-rel'=>'!la_title_Editing_Relationship!'),
	+ 'format' => "#c_status# '#c_titlefield#' - #c-rel_status#",
	+ ),
	+
	'tree_site' => Array('format' => '!la_selecting_categories!'),
	),

	'PermItemPrefix' => 'CATEGORY',

	'PermSection' => Array('main' => 'CATEGORY: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'),
	'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,
	),

	),

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_new'), 'type' => HAVING_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_pick'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1' ),
	'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2' ),
	'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0' ),
	's1' => Array(),
	'show_new' => Array('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ),
	'show_pick' => Array('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '`EditorsPick` != 1' ),
	)
	),

	'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.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId
	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),

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

	'ListSortings' => Array(
	'' => 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', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'Filename' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1),
	'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),
	'EditorsPick' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 2),
	'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', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', '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', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),
	'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', '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('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.47
	\ No newline at end of property
	+1.48
	\ No newline at end of property
	Index: trunk/core/units/relationship/relationship_event_handler.php
	===================================================================
	--- trunk/core/units/relationship/relationship_event_handler.php (revision 5372)
	+++ trunk/core/units/relationship/relationship_event_handler.php (revision 5373)
	@@ -1,194 +1,201 @@
	<?php

	class RelationshipEventHandler extends InpDBEventHandler
	{
	/**
	* Allows to override standart permission mapping
	*
	*/
	function mapPermissions()
	{
	parent::mapPermissions();
	$permissions = Array(
	'OnAddRelation' => Array('subitem' => 'add\|edit'),
	);
	$this->permMapping = array_merge($this->permMapping, $permissions);
	}

	/**
	* Add new relation
	*
	* @param kEvent $event
	*/
	function OnAddRelation(&$event)
	{
	$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
	$object =& $event->getObject();

	$table_info = $object->getLinkedInfo();
	$main_item_type = $this->Application->getUnitOption($table_info['ParentPrefix'],'ItemType');

	$target['id'] = $this->Application->GetVar('TargetId');
	$target['type'] = $this->Application->GetVar('TargetType');


	$object->SetDBField($table_info['ForeignKey'], $table_info['ParentId']);
	$object->SetDBField('SourceType', $main_item_type);
	$object->SetDBField('TargetId', $target['id']);
	$object->SetDBField('TargetType', $target['type']);

	// 1. get item info used in relation
	$configs = $this->extractModulesInfo();
	foreach($configs as $prefix => $config_data)
	{
	if($config_data['ItemType'] == $target['type']) break;
	}

	// this forces prepareOptions of kMultiLanguge formatter to substiture title field (if multilingual) of target item
	// BUT this is not the solution, find out another way to get correct title field here

	$target_object =& $this->Application->recallObject($prefix, null, Array('skip_autoload' => true));
	$title_field = $this->Application->getUnitOption($prefix, 'TitleField');

	$item['name'] = $this->Conn->GetOne('SELECT '.$title_field.' FROM '.$config_data['TableName'].' WHERE ResourceId = '.$target['id']);
	$item['type'] = $this->Application->Phrase($config_data['TitlePhrase']);
	$object->SetDBField('ItemName', $item['name']);
	$object->SetDBField('ItemType', $item['type']);

	$object->setID(0);

	$event->redirect = false;

	// 2. substitute opener
	$opener_stack = $this->Application->RecallVar('opener_stack');
	$opener_stack = $opener_stack ? unserialize($opener_stack) : Array();
	array_pop($opener_stack);

	$return_template = $this->Application->RecallVar('return_template');
	$new_level = 'index4.php\|'.ltrim($this->Application->BuildEnv($return_template, Array('m_opener'=>'u'),'all'),ENV_VAR_NAME.'=');
	array_push($opener_stack,$new_level);
	$this->Application->StoreVar('opener_stack',serialize($opener_stack));

	$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
	}

	/**
	* Creates needed sql query to load list,
	* if no query is defined in config for
	* special requested, then use default
	* query
	*
	* @param kEvent $event
	* @access protected
	*/
	function ListPrepareQuery(&$event)
	{
	return $this->BaseQuery($event,'ListSQLs');
	}

	/**
	* Creates needed sql query to load item,
	* if no query is defined in config for
	* special requested, then use default
	* query
	*
	* @param kEvent $event
	* @access protected
	*/
	function ItemPrepareQuery(&$event)
	{
	return $this->BaseQuery($event,'ItemSQLs');
	}


	/**
	* Get item name & type based on relation type & modules installed
	*
	* @param kEvent $event
	* @param string $sql_field
	*/
	function BaseQuery(&$event, $sql_field)
	{
	$sqls = $this->Application->getUnitOption($event->Prefix,$sql_field);
	$sql = isset($sqls[$event->Special]) ? $sqls[$event->Special] : $sqls[''];

	$configs = $this->extractModulesInfo();

	// 2. build sql based on information queried
	$sql_templates['ItemName'] = 'IFNULL(%s.%s,\' \')';
	$sql_templates['TableJoin'] = 'LEFT JOIN %1$s ON %1$s.ResourceId = rel.TargetId';
	$sql_templates['TargetName'] = 'IF(rel.TargetType = %s, \'%s\', %s)';

	$sql_parts = Array();
	$sql_parts['TargetName'] = "''";
	- foreach($configs as $prefix => $config_data)
	- {
	- $sql_parts['ItemName'][] = sprintf($sql_templates['ItemName'], $config_data['TableName'], $config_data['TitleField']);
	+ foreach ($configs as $prefix => $config_data) {
	+ // convert TitleField field of kMultiLanguage formatter used for it: begin
	+ $title_field = $config_data['TitleField'];
	+ $formatter_class = isset($config_data['Fields'][$title_field]['formatter']) ? $config_data['Fields'][$title_field]['formatter'] : '';
	+ if ($formatter_class == 'kMultiLanguage') {
	+ $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
	+ $title_field = $ml_formatter->LangFieldName($title_field);
	+ }
	+ // convert TitleField field of kMultiLanguage formatter used for it: end
	+
	+ $sql_parts['ItemName'][] = sprintf($sql_templates['ItemName'], $config_data['TableName'], $title_field);
	$sql_parts['TableJoin'][] = sprintf($sql_templates['TableJoin'], $config_data['TableName']);

	$sql_parts['TargetName'] = sprintf( $sql_templates['TargetName'],
	$config_data['ItemType'],
	'!'.$config_data['TitlePhrase'].'!',
	$sql_parts['TargetName']);
	$sql_parts['TargetName'] = str_replace('rel','%1$s',$sql_parts['TargetName']);
	}

	$object =& $event->getObject();

	$vars = Array('#ITEM_NAMES#', '#ITEM_TYPES#');
	$replacements = Array( implode(', ',$sql_parts['ItemName']), $sql_parts['TargetName'] );

	$calculated_fields =& $object->getProperty('CalculatedFields');
	- foreach($calculated_fields as $field_name => $field_expression)
	- {
	- $calculated_fields[$field_name] = str_replace($vars,$replacements,$field_expression);
	+ foreach ($calculated_fields as $field_name => $field_expression) {
	+ $calculated_fields[$field_name] = str_replace($vars, $replacements, $field_expression);
	}

	$object->setProperty('CalculatedFields', $calculated_fields);

	$sql = str_replace('#ITEM_JOIN#', implode(' ',$sql_parts['TableJoin']), $sql);
	$sql = str_replace('rel.','%1$s.',$sql);

	return $sql;
	}

	/**
	* Get configs from modules installed
	*
	* @return Array
	* @access private
	*/
	function extractModulesInfo()
	{
	// get installed modules & their config info
	// maybe we should leave only prefixes, that have "view" permission
	$configs = Array();
	foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
	$prefix = $module_data['Var'];
	$configs[$prefix] = $this->Application->getUnitOptions($prefix);
	if($configs[$prefix] === false) unset($configs[$prefix]);
	}
	return $configs;
	}


	/**
	* Deletes relations to hooked item from other items
	*
	* @param kEvent $event
	*/
	function OnDeleteForeignRelations(&$event)
	{
	$main_object =& $event->MasterEvent->getObject();
	$resource_id = $main_object->GetDBField('ResourceId');

	$table = $this->Application->getUnitOption($event->Prefix,'TableName');
	$sql = 'DELETE FROM '.$table.' WHERE TargetId = '.$resource_id;
	$this->Conn->Query($sql);
	}


	}


	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/relationship/relationship_event_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.4
	\ No newline at end of property
	+1.5
	\ No newline at end of property
	Index: trunk/core/units/relationship/relationship_config.php
	===================================================================
	--- trunk/core/units/relationship/relationship_config.php (revision 5372)
	+++ trunk/core/units/relationship/relationship_config.php (revision 5373)
	@@ -1,106 +1,106 @@
	<?php

	$config = Array(
	'Prefix' => 'rel',

	'Clones' => Array(
	-
	+ 'c-rel' => Array('ParentPrefix' => 'c'),
	'l-rel' => Array('ParentPrefix' => 'l'),
	'n-rel' => Array('ParentPrefix' => 'n'),
	'bb-rel'=> Array('ParentPrefix' => 'bb'),
	/'p-rel' => Array('ParentPrefix' => 'p'),/
	),

	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'RelationshipEventHandler','file'=>'relationship_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => '#PARENT#',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnAfterItemDelete'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnDeleteForeignRelations',
	),
	),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	),
	'IDField' => 'RelationshipId',
	'StatusField' => Array('Enabled','Type'),
	'TableName' => TABLE_PREFIX.'Relationship',
	'ParentTableKey'=> 'ResourceId',
	'ForeignKey' => 'SourceId',
	'ParentPrefix' => 'p',
	'AutoDelete' => true,
	'AutoClone' => true,

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_recip','show_oneway'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Enabled != 1' ),
	'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Enabled != 0' ),
	's1' => Array(),
	'show_recip' => Array('label' => 'la_Reciprocal', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ),
	'show_oneway' => Array('label' => 'la_OneWay', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ),
	)
	),

	'CalculatedFields' => Array(
	'' => Array(
	'ItemName' => 'TRIM(CONCAT(#ITEM_NAMES#))',
	'ItemType' => '#ITEM_TYPES#',
	),
	),

	'ListSQLs' => Array( ''=> 'SELECT %1$s.RelationshipId, %1$s.Priority, %1$s.Type, %1$s.Enabled %2$s
	FROM %1$s #ITEM_JOIN#',
	), // key - special, value - list select sql

	'ListSortings' => Array(
	'' => Array(
	'ForcedSorting' => Array('Priority' => 'desc'),
	'Sorting' => Array('ItemName' => 'asc', 'ItemType' => 'asc'),
	)
	),
	'ItemSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s #ITEM_JOIN#',),

	'Fields' => Array(
	'RelationshipId' => Array(),
	'SourceId' => Array('type'=>'int'),
	'TargetId' => Array('type'=>'int'),
	'SourceType' => Array('type'=>'int','not_null'=>1,'default'=>0),
	'TargetType' => Array('type'=>'int','not_null'=>1,'default'=>0),
	'Type' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(1=>'la_Reciprocal',0=>'la_OneWay'),'not_null'=>1,'default'=>0,'use_phrases'=>1),
	'Enabled' => Array('type'=>'int','formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Disabled',1=>'la_Enabled'),'not_null'=>1,'default'=>1,'use_phrases'=>1),
	'Priority' => Array('type'=>'int','not_null'=>1,'default'=>0),
	),
	'VirtualFields' => Array( 'ItemName' => Array(),
	'ItemType' => Array(),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
	'Fields' => Array(
	'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td'),
	'ItemType' => Array( 'title'=>'la_col_TargetType' ),
	'Type' => Array( 'title'=>'la_col_RelationshipType' ),
	'Enabled' => Array( 'title'=>'la_col_Status' ),
	),

	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/relationship/relationship_config.php
	___________________________________________________________________
	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/relations_edit.tpl
	===================================================================
	--- trunk/core/admin_templates/categories/relations_edit.tpl (nonexistent)
	+++ trunk/core/admin_templates/categories/relations_edit.tpl (revision 5373)
	@@ -0,0 +1,76 @@
	+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
	+<inp2:m_include t="incs/header" nobody="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_Categories!"/>
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="relations_edit" module="in-portal" icon="icon46_catalog"/>
	+
	+<!-- ToolBar --->
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <script type="text/javascript">
	+ a_toolbar = new ToolBar();
	+ a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	+ submit_event('c-rel','<inp2:c-rel_SaveEvent/>');
	+ }
	+ ) );
	+ a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	+ submit_event('c-rel','OnCancel');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	+
	+ a_toolbar.Render();
	+
	+ <inp2:m_if prefix="c-rel" function="IsSingle"/>
	+ a_toolbar.HideButton('prev');
	+ a_toolbar.HideButton('next');
	+ a_toolbar.HideButton('sep1');
	+ a_toolbar.HideButton('sep2');
	+ <inp2:m_else/>
	+ <inp2:m_if prefix="c-rel" function="IsLast"/>
	+ a_toolbar.DisableButton('next');
	+ <inp2:m_endif/>
	+ <inp2:m_if prefix="c-rel" function="IsFirst"/>
	+ a_toolbar.DisableButton('prev');
	+ <inp2:m_endif/>
	+ <inp2:m_endif/>
	+ </script>
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+
	+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	+ <inp2:m_ParseBlock name="subsection" title="!la_section_Relation!"/>
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="SourceId"/>
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="SourceType"/>
	+
	+ <inp2:m_ParseBlock name="inp_label" prefix="c-rel" field="RelationshipId" title="!la_fld_RelationshipId!"/>
	+
	+ <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	+ <inp2:m_ParseBlock name="inp_edit_field_caption" prefix="c-rel" field_name="TargetId" title="!la_fld_TargetId!"/>
	+ <td valign="top" class="text">
	+ <img src="<inp2:rel_ModulePath />img/itemicons/<inp2:rel_ItemIcon grid="Default"/>"/>
	+ <inp2:c-rel_Field field="ItemName"/> (<inp2:c-rel_Field field="ItemType"/>)
	+
	+ </td>
	+ <td> </td>
	+ </tr>
	+
	+
	+
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="TargetId"/>
	+ <inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-rel" field="TargetType"/>
	+
	+ <inp2:m_ParseBlock name="inp_edit_radio" prefix="c-rel" field="Type" title="!la_fld_RelationshipType!"/>
	+ <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-rel" field="Enabled" title="!la_fld_Enabled!"/>
	+ <inp2:m_ParseBlock name="inp_edit_box" prefix="c-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
	+
	+</table>
	+<inp2:m_include t="incs/footer"/>
	+
	\ No newline at end of file

	Property changes on: trunk/core/admin_templates/categories/relations_edit.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/categories/categories_edit_relations.tpl
	===================================================================
	--- trunk/core/admin_templates/categories/categories_edit_relations.tpl (nonexistent)
	+++ trunk/core/admin_templates/categories/categories_edit_relations.tpl (revision 5373)
	@@ -0,0 +1,111 @@
	+<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
	+<inp2:m_include t="incs/header" nobody="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_Categories!"/>
	+
	+<inp2:m_include t="categories/categories_tabs"/>
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_relations" module="in-portal" icon="icon46_catalog"/>
	+
	+<!-- ToolBar --->
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <script type="text/javascript">
	+ a_toolbar = new ToolBar();
	+ a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	+ submit_event('c','<inp2:c_SaveEvent/>');
	+ }
	+ ) );
	+ a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	+ submit_event('c','OnCancelEdit');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	+ go_to_id('c', '<inp2:c_PrevId/>');
	+ }
	+ ) );
	+ a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	+ go_to_id('c', '<inp2:c_NextId/>');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	+
	+ //Relations related:
	+ a_toolbar.AddButton( new ToolBarButton('new_relation', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>',
	+ function() {
	+ document.getElementById('events[c-rel]').value = 'OnAddRelation';
	+ document.getElementById('t').value = 'categories/relations_edit';
	+ opener_action('d');
	+ OpenItemSelector('&CatId='+'<inp2:m_get name="m_cat_id"/>'+'&Selector=radio&main_prefix=c&dst_field=&return_template=<inp2:m_get name="t"/>','kernel_form');
	+ } ) );
	+
	+ function edit()
	+ {
	+ std_edit_temp_item('c-rel', 'categories/relations_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-rel')
	+ } ) );
	+
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	+ submit_event('c-rel','OnMassApprove');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	+ submit_event('c-rel','OnMassDecline');
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep4') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	+ show_viewmenu(a_toolbar,'view');
	+ }
	+ ) );
	+
	+ a_toolbar.Render();
	+
	+ <inp2:m_if prefix="c" function="IsSingle"/>
	+ a_toolbar.HideButton('prev');
	+ a_toolbar.HideButton('next');
	+ a_toolbar.HideButton('sep1');
	+ //a_toolbar.HideButton('sep2');
	+ <inp2:m_else/>
	+ <inp2:m_if prefix="c" function="IsLast"/>
	+ a_toolbar.DisableButton('next');
	+ <inp2:m_endif/>
	+ <inp2:m_if prefix="c" function="IsFirst"/>
	+ a_toolbar.DisableButton('prev');
	+ <inp2:m_endif/>
	+ <inp2:m_endif/>
	+ </script>
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+
	+<inp2:m_ParseBlock name="grid" PrefixSpecial="c-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>
	+<script type="text/javascript">
	+ Grids['c-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
	+</script>
	+<input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
	+<input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
	+<inp2:m_include t="incs/footer"/>
	+
	+<script type="text/javascript">
	+ var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
	+</script>
	\ No newline at end of file

	Property changes on: trunk/core/admin_templates/categories/categories_edit_relations.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