in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Thu, Jul 17, 11:35 PM

in-portal
View Options

	Index: trunk/kernel/admin_templates/img/itemicons/icon16_file_primary.gif
	===================================================================
	Cannot display: file marked as a binary type.
	svn:mime-type = application/octet-stream

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

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

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

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

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

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

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

	Property changes on: trunk/kernel/admin_templates/img/toolbar/tool_new_file.gif
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Added: svn:mime-type
	## -0,0 +1 ##
	+application/octet-stream
	\ No newline at end of property
	Index: trunk/kernel/admin/include/toolbar/browse.php
	===================================================================
	--- trunk/kernel/admin/include/toolbar/browse.php (revision 2328)
	+++ trunk/kernel/admin/include/toolbar/browse.php (revision 2329)
	@@ -1,867 +1,865 @@
	<?php
	global $objConfig,$objSections,$section, $rootURL,$adminURL, $admin, $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( isset($_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="";

	$Cat_Paste = "false";
	if($objCatList->ItemsOnClipboard()>0)
	$Cat_Paste = "true";

	$CurrentCat = $objCatList->CurrentCategoryID();
	if($CurrentCat>0)
	{
	$c = $objCatList->GetItem($CurrentCat);
	$CurrentRes = (int)$c->Get("ResourceId");
	}
	else
	$CurrentRes =0;
	$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");

	// View, Sort, Select, Per Page
	$lang_View = language('la_Text_View');
	$lang_Sort = language('la_Text_Sort');
	$lang_PerPage = language('la_prompt_PerPage');
	$lang_Select = language('la_Text_Select');

	print <<<END

	<script language="JavaScript">
	// global usage phrases
	var lang_View = '$lang_View';
	var lang_Sort = '$lang_Sort';
	var lang_PerPage = '$lang_PerPage';
	var lang_Select = '$lang_Select';

	// local usage phrases
	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";
	var Categories_Paste = $Cat_Paste;
	var CurrentCat = $CurrentCat;
	var CurrentRes = $CurrentRes;

	PasteButton = PasteButton \|\| Categories_Paste;

	//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";
	var upURL = "$upURL";


	// 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_prefix = queryTabRegistry('prefix_special', prefix_special, 'tab_id');
	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');
	- set_hidden_field('remove_specials['+prefix_special+']',1);
	-
	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()
	{
	addCommonActions();
	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()
	{
	AddButtonAction('upcat',"get_to_server(upURL,'');");// UP
	AddButtonAction('homecat',"get_to_server(homeURL,'');"); //home
	AddButtonAction('new_cat',"get_to_server('$adminURL/category/addcategory.php',env+'&new=1');"); //new cat
	AddButtonAction('editcat',"edit_current(); "); //edit current
	AddButtonAction('edit',"check_submit('','edit');"); //edit
	AddButtonAction('delete',"check_submit('$admin/browse','delete');"); //delete
	AddButtonAction('approve',"check_submit('$admin/browse','approve');"); //approve
	AddButtonAction('decline',"check_submit('$admin/browse','decline');"); //decline
	AddButtonAction('cut',"check_submit('$admin/browse','cut');"); //cut
	AddButtonAction('copy',"check_submit('$admin/browse','copy');"); //copy
	AddButtonAction('paste',"get_to_server('$adminURL/browse.php',env+'&Action=m_paste');"); //paste
	AddButtonAction('move_up',"check_submit('$admin/browse','move_up');"); //up
	AddButtonAction('move_down',"check_submit('$admin/browse','move_down');"); //down
	AddButtonAction('print',"window.print();"); //print ?
	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',"new_search_submit();");
	}

	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;

	window.location.href=path;
	return true;
	}

	function check_submit(page,actionValue)
	{

	if (actionValue.match(/delete$/)) {
	if (!theMainScript.Confirm(lang_DeleteConfirm)) return;
	}

	var formname = '';
	var action_prefix ='';

	if ((activeTab) && (!isAnyChecked('categories')))
	{
	form_name = activeTab.id;
	action_prefix = activeTab.getAttribute("ActionPrefix");
	if(page.length==0)
	page = activeTab.getAttribute("EditURL");

	if ( action_prefix.match("k4:(.*)") ) {
	act = RegExp.$1;
	act = act.replace('$\$event$$', actionValue);
	act = act.replace('$\$prefix$$', activeTab.getAttribute("PrefixSpecial") );
	eval(act);
	return;
	}
	}
	else
	{
	form_name = 'categories';
	action_prefix = 'm_cat_';
	if(page.length==0)
	page="$admin" + '/category/addcategory';
	}
	var f = document.getElementsByName(form_name+'_form')[0];

	if(f)
	{
	f.Action.value = action_prefix + actionValue;
	f.action = '$rootURL' + page + '.php?'+ env;
	//alert(f.name+ ' is submitting to '+ f.action + ' action=' + f.Action.value);
	f.submit();
	}
	} // check submit

	function edit_current()
	{
	if(CurrentCat==0)
	{
	get_to_server('$adminURL/category/addcategory_permissions.php',env+'&item=0');
	}
	else
	get_to_server('$adminURL/category/addcategory.php',env+'&item=$CurrentRes');
	}

	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();
	}

	\$fw_menus['c_view_menu'] = function()
	{
	// filtering menu
	\$Menus['c_filtring_menu'] = new Menu(lang_View);
	\$Menus['c_filtring_menu'].addMenuItem(lang_All,"config_val('Category_View', 127);",CategoryView==127);
	\$Menus['c_filtring_menu'].addMenuSeparator();
	\$Menus['c_filtring_menu'].addMenuItem(lang_Active,"FlipBit('Category_View',CategoryView,6);",BitStatus(CategoryView,6));
	\$Menus['c_filtring_menu'].addMenuItem(lang_Pending,"FlipBit('Category_View',CategoryView,5);", BitStatus(CategoryView,5));
	\$Menus['c_filtring_menu'].addMenuItem(lang_Disabled,"FlipBit('Category_View',CategoryView,4);",BitStatus(CategoryView,4));
	\$Menus['c_filtring_menu'].addMenuSeparator();
	\$Menus['c_filtring_menu'].addMenuItem(lang_New,"FlipBit('Category_View',CategoryView,3);",BitStatus(CategoryView,3));
	\$Menus['c_filtring_menu'].addMenuItem(lang_EdPick,"FlipBit('Category_View',CategoryView,0);",BitStatus(CategoryView,0));

	// sorting menu
	\$Menus['c_sorting_menu'] = new Menu(lang_Sort);
	\$Menus['c_sorting_menu'].addMenuItem(lang_Asc,"config_val('Category_Sortorder','asc');",RadioIsSelected(Category_Sortorder,'asc'));
	\$Menus['c_sorting_menu'].addMenuItem(lang_Desc,"config_val('Category_Sortorder','desc');",RadioIsSelected(Category_Sortorder,'desc'));
	\$Menus['c_sorting_menu'].addMenuSeparator();
	\$Menus['c_sorting_menu'].addMenuItem(lang_Default,"config_val('Category_Sortfield','Name');","");
	\$Menus['c_sorting_menu'].addMenuItem(lang_Name,"config_val('Category_Sortfield','Name');",RadioIsSelected(Category_Sortfield,'Name'));
	\$Menus['c_sorting_menu'].addMenuItem(lang_Description,"config_val('Category_Sortfield','Description');",RadioIsSelected(Category_Sortfield,'Description'));
	\$Menus['c_sorting_menu'].addMenuItem(lang_CreatedOn,"config_val('Category_Sortfield','CreatedOn');",RadioIsSelected(Category_Sortfield,'CreatedOn'));
	\$Menus['c_sorting_menu'].addMenuItem(lang_SubCats,"config_val('Category_Sortfield','CachedDescendantCatsQty');",RadioIsSelected(Category_Sortfield,'CachedDescendantCatsQty'));

	// perpage menu

	// select menu
	\$Menus['c_select_menu'] = new Menu(lang_Select);
	\$Menus['c_select_menu'].addMenuItem(lang_All,"javascript:selectAllC('categories');","");
	\$Menus['c_select_menu'].addMenuItem(lang_Unselect,"javascript:unselectAll('categories');","");
	\$Menus['c_select_menu'].addMenuItem(lang_Invert,"javascript:invert('categories');","");

	// view menu
	\$Menus['c_view_menu'] = new Menu(lang_Categories);
	\$Menus['c_view_menu'].addMenuItem( \$Menus['c_filtring_menu'] );
	\$Menus['c_view_menu'].addMenuItem( \$Menus['c_sorting_menu'] );
	\$Menus['c_view_menu'].addMenuItem( \$Menus['c_select_menu'] );
	}

	function toggleMenu()
	{
	var \$ViewMenus = new Array();

	// prepare categories menu
	if (document.getElementById('categories').active)
	{
	\$fw_menus['c_view_menu']();
	\$ViewMenus.push('c');
	}

	if (activeTab)
	{
	var prefix_special = activeTab.getAttribute('PrefixSpecial');
	\$fw_menus[prefix_special+'_view_menu']();
	\$ViewMenus.push(prefix_special);
	}

	if(\$ViewMenus.length == 1)
	{
	prefix_special = \$ViewMenus[\$ViewMenus.length-1];
	window.cat_menu = \$Menus[prefix_special+'_view_menu'];
	}
	else
	{
	window.cat_menu = new Menu('ViewMenu_mixed');

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

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

	function toggleCategoriesA(tabHeader, instant)
	{
	var categories = document.getElementById('categories');
	if (!categories) return;
	toggleCategories(instant);

	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 toggleCategoriesB(tabHeader, instant)
	{
	var categories = document.getElementById('categories');
	if (!categories) return;
	toggleCategories(instant);
	var active_str = '$imagesURL'+'/itemtabs/' + (categories.active ? 'tab_active' : 'tab_inactive');
	SetBackground('l_cat', active_str + '_l.gif');
	SetBackground('m_cat', active_str + '.gif');
	SetBackground('m1_cat', active_str + '.gif');
	SetBackground('r_cat', active_str + '_r.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_dn") + ".gif";
	}
	}

	function toggleTabB(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;

	// process all module tabs
	var active_str = '';
	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;
	active_str = (tab.active) ? "tab_active" : "tab_inactive";

	if (TDs[j].getAttribute("tabHeaderOf") == tabId) {
	// module tab is selected
	SetBackground('l_' + tabId, "$imagesURL/itemtabs/" + active_str + "_l.gif");
	SetBackground('m_' + tabId, "$imagesURL/itemtabs/" + active_str + ".gif");
	SetBackground('m1_' + tabId, "$imagesURL/itemtabs/" + active_str + ".gif");
	SetBackground('r_' + tabId, "$imagesURL/itemtabs/" + active_str + "_r.gif");
	}
	else
	{
	// module tab is not selected
	SetBackground('l_' +tabIDs[i], "$imagesURL/itemtabs/" + active_str + "_l.gif");
	SetBackground('m_' + tabIDs[i], "$imagesURL/itemtabs/" + active_str + ".gif");
	SetBackground('m1_' + tabIDs[i], "$imagesURL/itemtabs/" + active_str + ".gif");
	SetBackground('r_' + tabIDs[i], "$imagesURL/itemtabs/" + active_str + "_r.gif");
	}

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

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

	function SetBackground(element_id, img_url)
	{
	// set background image of element specified by id
	var el = document.getElementById(element_id);
	el.style.backgroundImage = 'url('+img_url+')';
	}
	</script>

	END;
	?>

	Property changes on: trunk/kernel/admin/include/toolbar/browse.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.8
	\ No newline at end of property
	Index: trunk/core/kernel/utility/formatters.php
	===================================================================
	--- trunk/core/kernel/utility/formatters.php (revision 2328)
	+++ trunk/core/kernel/utility/formatters.php (revision 2329)
	@@ -1,1036 +1,1046 @@
	<?php

	class kFormatter extends kBase {


	/**
	* Convert's value to match type from config
	*
	* @param mixed $value
	* @param Array $options
	* @return mixed
	* @access protected
	*/
	function TypeCast($value, $options)
	{
	$ret = true;
	if( isset($options['type']) )
	{
	$field_type = $options['type'];
	$type_ok = preg_match('#int\|integer\|double\|float\|real\|numeric\|string#', $field_type);
	if($field_type == 'string') return $value;

	if ($value != '' && $type_ok)
	{
	$ret = is_numeric($value);
	if($ret)
	{
	$f = 'is_'.$field_type;
	settype($value, $field_type);
	$ret = $f($value);
	}
	}
	}

	return $ret ? $value : false;
	}

	//function Format($value, $options, &$errors)
	function Format($value, $field_name, &$object, $format=null)
	{
	if ( is_null($value) ) return '';

	$options = $object->GetFieldOptions($field_name);
	if ( isset($format) ) $options['format'] = $format;
	$tc_value = $this->TypeCast($value,$options);
	if( ($tc_value === false) \|\| ($tc_value != $value) ) return $value; // for leaving badly formatted date on the form

	if (isset($options['format'])) return sprintf($options['format'], $tc_value);

	return $tc_value;
	}

	//function Parse($value, $options, &$errors)
	function Parse($value, $field_name, &$object)
	{
	if ($value == '') return NULL;

	$options = $object->GetFieldOptions($field_name);
	$tc_value = $this->TypeCast($value,$options);
	if($tc_value === false) return $value; // for leaving badly formatted date on the form

	if( isset($options['type']) )
	{
	if( preg_match('#double\|float\|real\|numeric#', $options['type']) ) $tc_value = str_replace(',', '.', $tc_value);
	}

	if( isset($options['regexp']) )
	{
	if( !preg_match($options['regexp'], $value) )
	{
	$object->FieldErrors[$field_name]['pseudo'] = 'invalid_format';
	}
	}

	return $tc_value;
	}

	function HumanFormat($format)
	{
	return $format;
	}


	/**
	* The method is supposed to alter config options or cofigure object in some way based on its usage of formatters
	* The methods is called for every field with formatter defined when configuring item.
	* Could be used for adding additional VirtualFields to an object required by some special Formatter
	*
	* @param string $field_name
	* @param array $field_options
	* @param kDBBase $object
	*/
	function PrepareOptions($field_name, &$field_options, &$object)
	{

	}

	/**
	* Used for split fields like timestamp -> date, time
	* Called from DBItem to update sub fields values after loading item
	*
	* @param unknown_type $field
	* @param unknown_type $value
	* @param unknown_type $options
	* @param unknown_type $object
	*/
	function UpdateSubFields($field, $value, &$options, &$object)
	{

	}

	/**
	* Used for split fields like timestamp -> date, time
	* Called from DBItem Validate (before validation) to get back master field value from its sub_fields
	*
	* @param unknown_type $field
	* @param unknown_type $value
	* @param unknown_type $options
	* @param unknown_type $object
	*/
	function UpdateMasterFields($field, $value, &$options, &$object)
	{

	}

	/* function GetErrorMsg($pseudo_error, $options)
	{
	if ( isset($options['error_msgs'][$pseudo_error]) ) {
	return $options['error_msgs'][$pseudo_error];
	}
	else {
	return $this->ErrorMsgs[$pseudo_error];
	}
	}*/

	function GetSample($field, &$options, &$object)
	{

	}

	}

	class kOptionsFormatter extends kFormatter {

	//function Format($value, $options, &$errors)
	function Format($value, $field_name, &$object, $format=null)
	{
	if ( is_null($value) ) return '';

	$options = $object->GetFieldOptions($field_name);
	if ( isset($format) ) $options['format'] = $format;

	$label = getArrayValue($options['options'], $value);
	if( $label !== false )
	{
	if( getArrayValue($options,'use_phrases') )
	{
	return $this->Application->Phrase($label);
	}
	else
	{
	return $label;
	}
	}
	else
	{
	return $value;
	}
	}
	}

	/**
	* Replacement for kOptionsFormatter in case if options
	* should be selected from database. Use this formatter
	* only in case if formatter attached field is in edit form.
	*
	* For usage in grid just use LEFT JOIN clause to table
	* where requested options are located.
	*/
	class kLEFTFormatter extends kFormatter {

	//function Format($value, $options, &$errors)
	function Format($value, $field_name, &$object, $format=null)
	{
	if ( is_null($value) ) return '';

	$options = $object->GetFieldOptions($field_name);
	if ( isset($format) ) $options['format'] = $format;

	if( !isset($options['options'][$value]) )
	{
	// required option is not defined in config => query for it
	$db =& $this->Application->GetADODBConnection();
	$sql = sprintf($options['left_sql'],$options['left_title_field'],$options['left_key_field'],$value);
	$options['options'][$value] = $db->GetOne($sql);
	}
	return $options['options'][$value];
	}

	//function Parse($value, $options, &$errors)
	function Parse($value, $field_name, &$object)
	{
	if ($value == '') return NULL;

	$options = $object->GetFieldOptions($field_name);
	if( !array_search($value,$options['options']) )
	{
	// required option is not defined in config => query for it
	$db =& $this->Application->GetADODBConnection();
	$sql = sprintf($options['left_sql'],$options['left_key_field'],$options['left_title_field'],$value);
	$found = $db->GetOne($sql);
	if($found !== false) $options['options'][$found] = $value;
	}
	else
	{
	$found = array_search($value,$options['options']);
	}
	if($found === false) $found = $options['default'];
	return $found;
	}
	}


	class kDateFormatter extends kFormatter {

	/* function kDateFormatter()
	{
	parent::kFormatter();
	$this->ErrorMsgs['bad_dformat'] = 'Please use correct date format (%s) ex. (%s)';
	}
	*/

	function PrepareOptions($field_name, &$field_options, &$object)
	{
	$date_format = getArrayValue($field_options, 'date_format');
	$time_format = getArrayValue($field_options, 'time_format');

	$language =& $this->Application->recallObject('lang.current');

	if ($date_format === false) $date_format = $language->GetDBField('DateFormat');
	if ($time_format === false) $time_format = $language->GetDBField('TimeFormat');

	if (!isset($field_options['date_time_separator'])) $field_options['date_time_separator'] = ' ';
	$field_options['format'] = $date_format.$field_options['date_time_separator'].$time_format;
	$field_options['sub_fields'] = Array('date' => $field_name.'_date', 'time' => $field_name.'_time');

	$add_fields = Array();

	$opts = Array('master_field' => $field_name, 'formatter'=>'kDateFormatter', 'format'=>$date_format);
	if ( isset($field_options['default']) ) $opts['default'] = $field_options['default'];
	if ( isset($field_options['required']) ) $opts['required'] = $field_options['required'];

	$add_fields[$field_name.'_date'] = $opts;
	$opts['format'] = $time_format;
	$add_fields[$field_name.'_time'] = $opts;

	if ( !isset($object->VirtualFields[$field_name]) ) {
	// adding caluclated field to format date directly in the query
	if ( !isset($object->CalculatedFields) \|\| !is_array($object->CalculatedFields) ) {
	$object->CalculatedFields = Array();
	}
	$object->CalculatedFields[$field_name.'_formatted'] = 'FROM_UNIXTIME('.'`%1$s`.'.$field_name.', \''.$this->SQLFormat($field_options['format']).'\')';
	$opts['format'] = $field_options['format'];
	$opts['required'] = 0;
	unset($opts['master_field']);
	$add_fields[$field_name.'_formatted'] = $opts;
	}

	$add_fields = array_merge_recursive2($add_fields, $object->VirtualFields);
	$object->setVirtualFields($add_fields);
	}

	function UpdateSubFields($field, $value, &$options, &$object)
	{
	if ( $sub_fields = getArrayValue($options, 'sub_fields') ) {
	if( isset($value) && $value )
	{
	$object->SetDBField( $sub_fields['date'], $value );
	$object->SetDBField( $sub_fields['time'], $value );
	}
	}
	}

	function UpdateMasterFields($field, $value, &$options, &$object)
	{
	// when in master field - set own value from sub_fields
	if ( $sub_fields = getArrayValue($options, 'sub_fields') ) {
	// if date is not empty, but time is empty - set time to 0, otherwise master field fomratter will complain
	// when we have only date field on form, we need time hidden field always empty, don't ask me why!
	if ( $object->GetDBField($sub_fields['date']) != '' && $object->GetDBField($sub_fields['time']) == '' ) {
	$empty_time = getArrayValue($options,'empty_time');
	if($empty_time === false) $empty_time = mktime(0,0,0);
	$object->SetDBField($sub_fields['time'], $empty_time);
	}
	$object->SetField($field, $object->GetField($sub_fields['date']).$options['date_time_separator'].$object->GetField($sub_fields['time']));
	}
	// when in one of sub_fields - call update for master_field to update its value from sub_fields [are you following ? :) ]
	elseif ($master_field = getArrayValue($options, 'master_field') ) {
	$opt =& $object->GetFieldOptions($master_field);
	$this->UpdateMasterFields($master_field, null, $opt, $object);
	}
	}

	//function Format($value, $options, &$errors)
	function Format($value, $field_name, &$object, $format=null)
	{
	if ( is_null($value) ) return '';
	if ( !is_numeric($value) ) return $value; // for leaving badly formatted date on the form
	settype($value, 'int');
	if ( !is_int($value) ) return $value;

	$options = $object->GetFieldOptions($field_name);
	if ( isset($format) ) $options['format'] = $format;

	return date($options['format'], $value);
	}

	function HumanFormat($format)
	{
	$patterns = Array('/m/',
	'/n/',
	'/d/',
	'/j/',
	'/y/',
	'/Y/',
	'/h\|H/',
	'/g\|G/',
	'/i/',
	'/s/',
	'/a\|A/');
	$replace = Array( 'mm',
	'm',
	'dd',
	'd',
	'yy',
	'yyyy',
	'hh',
	'h',
	'mm',
	'ss',
	'AM');
	$res = preg_replace($patterns, $replace, $format);
	return $res;
	}

	function SQLFormat($format)
	{
	$mapping = Array(
	'/%/' => '%%',
	'/(?<!%)a/' => '%p', // Lowercase Ante meridiem and Post meridiem => MySQL provides only uppercase
	'/(?<!%)A/' => '%p', // Uppercase Ante meridiem and Post meridiem
	'/(?<!%)d/' => '%d', // Day of the month, 2 digits with leading zeros
	'/(?<!%)D/' => '%a', // A textual representation of a day, three letters
	'/(?<!%)F/' => '%M', // A full textual representation of a month, such as January or March
	'/(?<!%)g/' => '%l', // 12-hour format of an hour without leading zeros
	'/(?<!%)G/' => '%k', // 24-hour format of an hour without leading zeros
	'/(?<!%)h/' => '%h', // 12-hour format of an hour with leading zeros
	'/(?<!%)H/' => '%H', // 24-hour format of an hour with leading zeros
	'/(?<!%)i/' => '%i', // Minutes with leading zeros
	'/(?<!%)I/' => 'N/A', // Whether or not the date is in daylights savings time

	'/(?<!%)S/' => 'N/A', // English ordinal suffix for the day of the month, 2 characters, see below
	'/jS/' => '%D', // MySQL can't return separate suffix, but could return date with suffix
	'/(?<!%)j/' => '%e', // Day of the month without leading zeros
	'/(?<!%)l/' => '%W', // A full textual representation of the day of the week
	'/(?<!%)L/' => 'N/A', // Whether it's a leap year
	'/(?<!%)m/' => '%m', // Numeric representation of a month, with leading zeros
	'/(?<!%)M/' => '%b', // A short textual representation of a month, three letters
	'/(?<!%)n/' => '%c', // Numeric representation of a month, without leading zeros
	'/(?<!%)O/' => 'N/A', // Difference to Greenwich time (GMT) in hours
	'/(?<!%)r/' => 'N/A', // RFC 2822 formatted date
	'/(?<!%)s/' => '%s', // Seconds, with leading zeros
	// S and jS moved before j - see above
	'/(?<!%)t/' => 'N/A', // Number of days in the given month
	'/(?<!%)T/' => 'N/A', // Timezone setting of this machine
	'/(?<!%)U/' => 'N/A', // Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
	'/(?<!%)w/' => '%w', // Numeric representation of the day of the week
	'/(?<!%)W/' => '%v', // ISO-8601 week number of year, weeks starting on Monday (added in PHP 4.1.0)
	'/(?<!%)Y/' => '%Y', // A full numeric representation of a year, 4 digits
	'/(?<!%)y/' => '%y', // A two digit representation of a year
	'/(?<!%)z/' => 'N/A', // The day of the year (starting from 0) => MySQL starts from 1
	'/(?<!%)Z/' => 'N/A', // Timezone offset in seconds. The offset for timezones west of UTC is always negative, and for those east of UTC is always positive.
	);

	$patterns = array_keys($mapping);
	$replacements = array_values($mapping);

	$res = preg_replace($patterns, $replacements, $format);
	return $res;
	}

	//function Parse($value, $options, &$errors)
	function Parse($value, $field_name, &$object)
	{
	$options = $object->GetFieldOptions($field_name);

	$dt_separator = getArrayValue($options,'date_time_separator');
	if($dt_separator) $value = trim($value, $dt_separator);
	if($value == '') return NULL;
	//return strtotime($value);

	$format = $options['format'];
	if($dt_separator) $format = trim($format, $dt_separator);

	$object->FieldErrors[$field_name]['params'] = Array( $this->HumanFormat($format), date($format) );
	$object->FieldErrors[$field_name]['value'] = $value;

	$hour = 0;
	$minute = 0;
	$second = 0;
	$month = 1;
	$day = 1;
	$year = 1970;

	$patterns['n'] = '([0-9]{1,2})';
	$patterns['m'] = '([0-9]{1,2})';
	$patterns['d'] = '([0-9]{1,2})';
	$patterns['j'] = '([0-9]{1,2})';
	$patterns['Y'] = '([0-9]{4})';
	$patterns['y'] = '([0-9]{2})';
	$patterns['G'] = '([0-9]{1,2})';
	$patterns['g'] = '([0-9]{1,2})';
	$patterns['H'] = '([0-9]{2})';
	$patterns['h'] = '([0-9]{2})';
	$patterns['i'] = '([0-9]{2})';
	$patterns['s'] = '([0-9]{2})';
	$patterns['a'] = '(am\|pm)';
	$patterns['A'] = '(AM\|PM)';

	$holders_mask = eregi_replace('[a-zA-Z]{1}', '([a-zA-Z]{1})', $format);
	if (!ereg($holders_mask, $format, $holders)) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}

	$values_mask = '/^'.str_replace('/','\/',$format).'$/';
	foreach ($patterns as $key => $val) {
	$values_mask = ereg_replace($key, $val, $values_mask);
	}
	// echo " values_mask : $values_mask <br>";

	if (!preg_match($values_mask, $value, $values)) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}

	for ($i = 1; $i < count($holders); $i++) {
	switch ($holders[$i]) {
	case 'n':
	case 'm':
	$month = $values[$i];
	$month = ereg_replace("^0{1}", '', $month);
	break;
	case 'd':
	$day = $values[$i];
	$day = ereg_replace("^0{1}", '', $day);
	break;
	case 'Y':
	$year = $values[$i];
	break;
	case 'y':
	$year = $values[$i] >= 70 ? 1900 + $values[$i] : 2000 + $values[$i];
	break;
	case 'H':
	case 'h':
	case 'G':
	case 'g':
	$hour = $values[$i];
	$hour = ereg_replace("^0{1}", '', $hour);
	break;
	case 'i':
	$minute = $values[$i];
	$minute = ereg_replace("^0{1}", '', $minute);
	break;
	case 's':
	$second = $values[$i];
	$second = ereg_replace("^0{1}", '', $second);
	break;
	case 'a':
	case 'A':
	if ($hour <= 12) { // if AM/PM used with 24-hour - could happen :)
	if ($values[$i] == 'pm' \|\| $values[$i] == 'PM') {
	$hour += 12;
	if ($hour == 24) $hour = 12;
	}
	elseif ($values[$i] == 'am' \|\| $values[$i] == 'AM') {
	if ($hour == 12) $hour = 0;
	}
	}
	break;
	}
	}

	//echo "day: $day, month: $month, year: $year, hour: $hour, minute: $minute<br>";

	/*if (!($year >= 1970 && $year <= 2037)) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}*/

	if (!($month >= 1 && $month <= 12)) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}

	$months_days = Array ( 1 => 31,2 => 28, 3 => 31, 4 => 30,5 => 31,6 => 30, 7 => 31, 8 => 31,9 => 30,10 => 31,11 => 30,12 => 31);
	if ($year % 4 == 0) $months_days[2] = 29;

	if (!($day >=1 && $day <= $months_days[$month])) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}

	if (!($hour >=0 && $hour <= 23)) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}

	if (!($minute >=0 && $minute <= 59)) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}

	if (!($second >=0 && $second <= 59)) {
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_date_format';
	return $value;
	}
	// echo "day: $day, month: $month, year: $year, hour: $hour, minute: $minute<br>";
	return (mktime($hour, $minute, $second, $month, $day, $year));
	}

	function GetSample($field, &$options, &$object)
	{
	return $this->Format( time(), $field, $object);
	}
	}

	class kUploadFormatter extends kFormatter
	{
	var $DestinationPath;
	var $FullPath;

	function kUploadFormatter()
	{
	if ($this->DestinationPath)
	{
	$this->FullPath = DOC_ROOT.BASE_PATH.$this->DestinationPath;
	}
	parent::kBase();
	}


	//function Parse($value, $options, &$errors)
	function Parse($value, $field_name, &$object)
	{
	$ret = '';
	$options = $object->GetFieldOptions($field_name);

	+ if(getArrayValue($options, 'upload_dir'))
	+ {
	+ $this->DestinationPath = $options['upload_dir'];
	+ $this->FullPath = DOC_ROOT.BASE_PATH.$this->DestinationPath;
	+ }
	+
	if (getArrayValue($value, 'upload') && getArrayValue($value, 'error') == UPLOAD_ERR_NO_FILE)
	{
	return getArrayValue($value, 'upload');
	}

	if ( is_array($value) && $value['size'] )
	{
	if ( is_array($value) && $value['error'] === UPLOAD_ERR_OK )
	{
	- if ( !in_array($value['type'], $options['allowed_types']) )
	+ if ( getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types']) )
	{
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_file_format';
	}
	- elseif ( $value['size'] > ($options['max_size'] ? $options['max_size'] : MAX_UPLOAD_SIZE) )
	+ elseif ( $value['size'] > ($options['max_size'] ? $options['max_size'] : MAX_UPLOAD_SIZE) )
	{
	$object->FieldErrors[$field_name]['pseudo'] = 'bad_file_size';
	}
	elseif ( !is_writable($this->FullPath) )
	{
	$object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file';
	}
	else
	{
	$real_name = $this->ValidateFileName($this->FullPath, $value['name']);
	$file_name = $this->FullPath.$real_name;
	if ( !move_uploaded_file($value['tmp_name'], $file_name) )
	{
	$object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file';
	}
	else
	{
	- $ret = $this->DestinationPath.$real_name;
	+ if(getArrayValue($options, 'size_field'))
	+ {
	+ $object->SetDBField($options['size_field'], $value['size']);
	+ }
	+ $ret = getArrayValue($options, 'include_path') ? $this->DestinationPath.$real_name : $real_name;
	}
	}
	}
	else
	{
	$object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file';
	}
	}

	if ($value['error'] && !( $value['error'] == UPLOAD_ERR_NO_FILE ) && !$object->FieldErrors[$field_name]['pseudo'])
	{
	$object->FieldErrors[$field_name]['pseudo'] = 'cant_save_file';
	}

	return $ret;
	}

	function ValidateFileName($path, $name)
	{
	$parts = pathinfo($name);
	$ext = '.'.$parts['extension'];
	$filename = substr($parts['basename'], 0, -strlen($ext));
	$new_name = $filename.$ext;
	while ( file_exists($path.'/'.$new_name) )
	{
	if ( preg_match("/({$filename}_)([0-9]*)($ext)/", $new_name, $regs) ) {
	$new_name = $regs[1].($regs[2]+1).$regs[3];
	}
	else {
	$new_name = $filename.'_1'.$ext;
	}
	}
	return $new_name;
	}

	}

	class kPictureFormatter extends kUploadFormatter
	{

	function kPictureFormatter()
	{
	$this->NakeLookupPath = IMAGES_PATH;
	$this->DestinationPath = IMAGES_PENDING_PATH;
	parent::kUploadFormatter();
	}

	}

	class kMultiLanguage extends kFormatter
	{

	function LangFieldName($field_name)
	{
	$lang = $this->Application->GetVar('m_lang');
	return 'l'.$lang.'_'.$field_name;
	}

	function PrepareOptions($field_name, &$field_options, &$object)
	{
	if (getArrayValue($object->Fields, $field_name, 'master_field')) return;

	$lang_field_name = $this->LangFieldName($field_name);

	//substitude title field
	$title_field = $this->Application->getUnitOption($object->Prefix, 'TitleField');
	if ($title_field == $field_name) {
	$this->Application->setUnitOption($object->Prefix, 'TitleField', $lang_field_name);
	}

	//substitude fields
	$fields = $this->Application->getUnitOption($object->Prefix, 'Fields');
	if ( isset($fields[$field_name]) ) {

	$fields[$lang_field_name] = $fields[$field_name];
	$fields[$lang_field_name]['master_field'] = $field_name;
	$object->Fields[$lang_field_name] = $fields[$lang_field_name];
	$fields[$field_name]['required'] = false;
	$object->Fields[$field_name]['required'] = false;
	$object->VirtualFields[$field_name] = $object->Fields[$field_name];
	}
	$this->Application->setUnitOption($object->Prefix, 'Fields', $fields);

	//substitude virtual fields
	$virtual_fields = $this->Application->getUnitOption($object->Prefix, 'VirtualFields');
	if ( isset($virtual_fields[$field_name]) ) {
	$virtual_fields[$lang_field_name] = $virtual_fields[$field_name];
	$virtual_fields[$lang_field_name]['master_field'] = $field_name;
	$object->VirtualFields[$lang_field_name] = $virtual_fields[$lang_field_name];
	$virtual_fields[$field_name]['required'] = false;
	$object->VirtualFields[$field_name]['required'] = false;
	}
	$this->Application->setUnitOption($object->Prefix, 'VirtualFields', $virtual_fields);

	//substitude grid fields
	$grids = $this->Application->getUnitOption($object->Prefix, 'Grids');
	foreach ($grids as $name => $grid) {
	if ( getArrayValue($grid, 'Fields', $field_name) ) {
	array_rename_key($grids[$name]['Fields'], $field_name, $lang_field_name);
	}
	}
	$this->Application->setUnitOption($object->Prefix, 'Grids', $grids);

	//substitude default sortings
	$sortings = $this->Application->getUnitOption($object->Prefix, 'ListSortings');
	foreach ($sortings as $special => $the_sortings) {
	if (isset($the_sortings['ForcedSorting'])) {
	array_rename_key($sortings[$special]['ForcedSorting'], $field_name, $lang_field_name);
	}
	if (isset($the_sortings['Sorting'])) {
	array_rename_key($sortings[$special]['Sorting'], $field_name, $lang_field_name);
	}
	}
	$this->Application->setUnitOption($object->Prefix, 'ListSortings', $sortings);

	//TODO: substitude possible language-fields sortings after changing language
	}

	/*function UpdateSubFields($field, $value, &$options, &$object)
	{

	}

	function UpdateMasterFields($field, $value, &$options, &$object)
	{

	}*/

	function Format($value, $field_name, &$object, $format=null)
	{
	$master_field = getArrayValue($object->Fields, $field_name, 'master_field');
	if (!$master_field) { // if THIS field is master it does NOT have reference to it's master_field
	$lang = $this->Application->GetVar('m_lang');
	$value = $object->GetDBField('l'.$lang.'_'.$field_name); //getting value of current language
	$master_field = $field_name; // THIS is master_field
	}
	if ( $value == '' && $format != 'no_default') { // try to get default language value
	$def_lang_value = $object->GetDBField('l'.$this->Application->GetDefaultLanguageId().'_'.$master_field);
	if ($def_lang_value == '') return NULL;
	return $def_lang_value; //return value from default language
	}
	return $value;
	}

	function Parse($value, $field_name, &$object)
	{
	$lang = $this->Application->GetVar('m_lang');
	$def_lang = $this->Application->GetDefaultLanguageId();
	$master_field = getArrayValue($object->Fields, $field_name, 'master_field');

	if ( getArrayValue($object->Fields, $field_name, 'required') && ( (string) $value == '' ) ) {
	$object->FieldErrors[$master_field]['pseudo'] = 'required';
	};

	if (!$this->Application->GetVar('allow_translation') && $lang != $def_lang && getArrayValue($object->Fields, $field_name, 'required')) {
	$def_lang_field = 'l'.$def_lang.'_'.$master_field;
	if ( !$object->ValidateRequired($def_lang_field, $object->Fields[$field_name]) ) {
	$object->FieldErrors[$master_field]['pseudo'] = 'primary_lang_required';
	}
	}

	if ($value == '') return NULL;
	return $value;
	}

	}


	class kPasswordFormatter extends kFormatter
	{

	function PrepareOptions($field_name, &$field_options, &$object)
	{
	if( isset( $field_options['verify_field'] ) )
	{
	$add_fields = Array();
	$options = Array('master_field' => $field_name, 'formatter'=>'kPasswordFormatter');
	$add_fields[ $field_options['verify_field'] ] = $options;

	$add_fields[$field_name.'_plain'] = Array('type'=>'string', 'error_field'=>$field_name);
	$add_fields[ $field_options['verify_field'].'_plain' ] = Array('type'=>'string', 'error_field'=>$field_options['verify_field'] );

	$add_fields = array_merge_recursive2($add_fields, $object->VirtualFields);
	$object->setVirtualFields($add_fields);
	}
	}

	function Format($value, $field_name, &$object, $format=null)
	{
	return $value;
	}

	function Parse($value, $field_name, &$object)
	{
	$options = $object->GetFieldOptions($field_name);

	$fields = Array('master_field','verify_field');
	$fields_set = true;
	$flip_count = 0;
	while($flip_count < 2)
	{
	if( getArrayValue($options,$fields[0]) )
	{
	$object->SetDBField($field_name.'_plain', $value);
	if( !getArrayValue($object->Fields[ $options[ $fields[0] ] ], $fields[1].'_set') )
	{
	$object->Fields[ $options[ $fields[0] ] ][$fields[1].'_set'] = true;
	}

	$password_field = $options[ $fields[0] ];
	$verify_field = $field_name;
	}
	$fields = array_reverse($fields);
	$flip_count++;
	}

	if( getArrayValue($object->Fields[$password_field], 'verify_field_set') && getArrayValue($object->Fields[$verify_field], 'master_field_set') )
	{
	$new_password = $object->GetDBField($password_field.'_plain');
	$verify_password = $object->GetDBField($verify_field.'_plain');

	if($new_password == '' && $verify_password == '')
	{
	if( $object->GetDBField($password_field) != $this->EncryptPassword('') )
	{
	return $this->EncryptPassword($value);
	}
	else
	{
	$object->Fields[$password_field.'_plain']['required'] = true;
	$object->Fields[$verify_field.'_plain']['required'] = true;
	return null;
	}
	}

	$min_length = $this->Application->ConfigValue('Min_Password');
	if( strlen($new_password) >= $min_length )
	{
	if($new_password != $verify_password)
	{
	$object->ErrorMsgs['passwords_do_not_match'] = $this->Application->Phrase('lu_passwords_do_not_match');
	$object->FieldErrors[$password_field]['pseudo'] = 'passwords_do_not_match';
	$object->FieldErrors[$verify_field]['pseudo'] = 'passwords_do_not_match';
	}
	}
	else
	{
	$object->ErrorMsgs['passwords_min_length'] = sprintf($this->Application->Phrase('lu_passwords_too_short'), $min_length);
	$object->FieldErrors[$password_field]['pseudo'] = 'passwords_min_length';
	$object->FieldErrors[$verify_field]['pseudo'] = 'passwords_min_length';
	}
	}
	if($value == '') return $object->GetDBField($field_name);
	return $this->EncryptPassword($value);
	}

	function EncryptPassword($value)
	{
	return md5($value);
	}
	}


	/**
	* Credit card expiration date formatter
	*
	*/
	class kCCDateFormatter extends kFormatter
	{
	function PrepareOptions($field_name, &$field_options, &$object)
	{
	$add_fields = Array();

	$i = 1;
	$options = Array('00' => '');
	while($i <= 12)
	{
	$options[ sprintf('%02d',$i) ] = sprintf('%02d',$i);
	$i++;
	}
	$add_fields[ $field_options['month_field'] ] = Array('formatter'=>'kOptionsFormatter', 'options' => $options, 'not_null' => true, 'default' => '00');
	$add_fields[ $field_options['year_field'] ] = Array('type' => 'string', 'default' => '');

	$add_fields = array_merge_recursive2($add_fields, $object->VirtualFields);
	$object->setVirtualFields($add_fields);
	}

	function UpdateSubFields($field, $value, &$options, &$object)
	{
	if(!$value) return false;
	$date = explode('/', $value);
	$object->SetDBField( $options['month_field'], $date[0] );
	$object->SetDBField( $options['year_field'], $date[1] );
	}

	/**
	* Will work in future if we could attach 2 formatters to one field
	*
	* @param string $value
	* @param string $field_name
	* @param kBase $object
	* @return string
	*/
	function Parse($value, $field_name, &$object)
	{
	// if ( is_null($value) ) return '';

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

	$month = $object->GetDirtyField($options['month_field']);
	$year = $object->GetDirtyField($options['year_field']);

	if( !(int)$month && !(int)$year ) return NULL;
	$is_valid = ($month >= 1 && $month <= 12) && ($year >= 0 && $year <= 99);

	if(!$is_valid) $object->FieldErrors[$field_name]['pseudo'] = 'bad_type';
	return $month.'/'.$year;
	}

	}

	class kUnitFormatter extends kFormatter {

	function PrepareOptions($field_name, &$field_options, &$object)
	{
	if( !isset($field_options['master_field']) )
	{
	$regional =& $this->Application->recallObject('lang.current');
	$add_fields = Array();
	$options_a = Array('type' => 'int','error_field' => $field_name,'master_field' => $field_name,'format' => '%d','min_value_inc' => 0 );
	$options_b = Array('type' => 'double','error_field' => $field_name,'master_field' => $field_name,'format' => '%0.1f','min_value_inc' => 0);
	switch( $regional->GetDBField('UnitSystem') )
	{
	case 2: // US/UK
	$field_options_copy = $field_options;
	unset($field_options_copy['min_value_exc']);
	$add_fields[$field_name.'_a'] = array_merge_recursive2($field_options_copy, $options_a);
	$add_fields[$field_name.'_b'] = array_merge_recursive2($field_options_copy, $options_b);
	break;
	default:
	}
	$add_fields = array_merge_recursive2($add_fields, $object->VirtualFields);
	$object->setVirtualFields($add_fields);
	}
	}

	function UpdateMasterFields($field, $value, &$options, &$object)
	{
	if( !isset($options['master_field']) )
	{
	$regional =& $this->Application->recallObject('lang.current');
	switch( $regional->GetDBField('UnitSystem') )
	{
	case 2: // US/UK
	$major = $object->GetDirtyField($field.'_a');
	$minor = $object->GetDirtyField($field.'_b');
	if($major === '' && $minor === '')
	{
	$value = null;
	}
	elseif($major === null && $minor === null)
	{
	unset($object->Fields[$field]);
	return;
	}
	else
	{
	$value = $major / 2 + $minor / 32;
	}
	break;
	default:
	}
	$object->SetDBField($field, $value);
	}
	}

	function UpdateSubFields($field, $value, &$options, &$object)
	{
	if( !isset($options['master_field']) )
	{
	$regional =& $this->Application->recallObject('lang.current');
	switch( $regional->GetDBField('UnitSystem') )
	{
	case 2: // US/UK
	if($value === null)
	{
	$major = null;
	$minor = null;
	}
	else
	{
	$major = floor( $value / 0.5 );
	$minor = ($value - $major * 0.5) * 32;
	}
	$object->SetDBField($field.'_a', $major);
	$object->SetDBField($field.'_b', $minor);
	break;
	default:
	}
	}
	}

	/*function Format($value, $field_name, &$object, $format=null)
	{
	return parent::Format($value, $field_name, $object, $format);
	}*/

	/* function Format($value, $field_name, &$object, $format=null)
	{
	if( isset($field_options['master_field']) )
	{
	$regional =& $this->Application->recallObject('lang.current');
	switch( $regional->GetDBField('UnitSystem') )
	{
	case 2: // US/UK
	$major = floor( $value / 0.5 );
	$minor = $value - $major;
	$major = $object->SetDBField($field_name.'_a', $major);
	$minor = $object->SetDBField($field_name.'_b', $minor);
	break;
	default:
	}
	}
	return parent::Format($value, $field_name, $object);
	}*/

	/*function Parse($value, $field_name, &$object)
	{
	$regional =& $this->Application->recallObject('lang.current');
	switch($regional->GetDBField('UnitSystem'))
	{
	case 1: // metric
	return $object->GetDBField('UnitSystem_a');
	break;
	case 2: // US/UK
	return $object->GetDBField('UnitSystem_a') * 0.5 +
	$object->GetDBField('UnitSystem_b') * 0.5 / 16;
	break;
	default:
	}
	}*/

	}


	?>

	Property changes on: trunk/core/kernel/utility/formatters.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.13
	\ No newline at end of property
	+1.14
	\ No newline at end of property
	Index: trunk/core/kernel/startup.php
	===================================================================
	--- trunk/core/kernel/startup.php (revision 2328)
	+++ trunk/core/kernel/startup.php (revision 2329)
	@@ -1,113 +1,113 @@
	<?php

	define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');

	if (defined('ADMIN') && ADMIN) {
	define('SPECIAL_TEMPLATES_FOLDER', '/kernel/admin_templates');
	}

	define('INPORTAL_ENV', 1);

	if (!isset($_SERVER['DOCUMENT_ROOT']) \|\| !$_SERVER['DOCUMENT_ROOT']) {
	$_SERVER['DOCUMENT_ROOT'] = str_replace('\\', '/', str_replace($_SERVER['PATH_INFO'], '', FULL_PATH));
	}

	$doc_root = rtrim(realpath($_SERVER['DOCUMENT_ROOT']), '/');
	$doc_root = str_replace('\\', '/', $doc_root); // windows hack
	define('DOC_ROOT', $doc_root);

	include_once(KERNEL_PATH.'/globals.php'); // non OOP functions used through kernel, e.g. print_pre

	if( file_exists(FULL_PATH.'/debug.php') )
	{
	k4_include_once(FULL_PATH.'/debug.php');
	if( defined('DEBUG_MODE')&&DEBUG_MODE ) include_once(KERNEL_PATH.'/utility/debugger.php');
	}

	safeDefine('INPORTAL_TAGS', true);

	$reg = '/'.preg_quote (DOC_ROOT, '/').'/i';
	define('BASE_PATH', $base_path = ereg_replace('/admin', '', preg_replace($reg, '', str_replace('\\', '/', FULL_PATH))));

	safeDefine( 'SERVER_NAME', $_SERVER['HTTP_HOST']);
	safeDefine( 'KERNEL_PATH', DOC_ROOT.BASE_PATH.'/kernel4');
	safeDefine( 'PROTOCOL', 'http://');

	$vars = parse_portal_ini(FULL_PATH.'/config.php');

	if ($vars === false) {
	global $rootURL;
	echo 'In-Portal is probably not installed, or configuration file is missing.<br>';
	echo 'Please use the installation script to fix the problem.<br><br>';
	if ( !preg_match('/admin/', __FILE__) ) $ins = '/admin';

	echo '<a href="'.PROTOCOL.SERVER_NAME.BASE_PATH.$ins.'/install.php">Go to installation script</a><br><br>';
	flush();
	exit;
	}

	define('SQL_TYPE', $vars['DBType']);
	define('SQL_SERVER', $vars['DBHost']);
	define('SQL_USER', $vars['DBUser']);
	define('SQL_PASS', $vars['DBUserPassword']);
	define('SQL_DB', $vars['DBName']);
	define('TABLE_PREFIX', $vars['TablePrefix']);

	ini_set('memory_limit', '50M');

	define('MODULES_PATH', DOC_ROOT.BASE_PATH);
	define('EXPORT_PATH', DOC_ROOT.BASE_PATH.'/admin/export');
	define('GW_CLASS_PATH', MODULES_PATH.'/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path


	safeDefine('ENV_VAR_NAME','env');

	k4_include_once(KERNEL_PATH.'/db/db_connection.php');

	safeDefine('IMAGES_PATH', '/kernel/images/');
	safeDefine('IMAGES_PENDING_PATH', IMAGES_PATH.'pending/');
	safeDefine('CUSTOM_UPLOAD_PATH', '/templates/images/custom/');
	-safeDefine('MAX_UPLOAD_SIZE', 500000);
	+safeDefine('MAX_UPLOAD_SIZE', 50000000);

	safeDefine('CACHE_CONFIGS_FILES', 1);
	safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
	safeDefine('SILENT_LOG', 0);

	k4_include_once(KERNEL_PATH."/kbase.php");
	k4_include_once(KERNEL_PATH.'/utility/event.php');
	k4_include_once(KERNEL_PATH."/utility/factory.php");
	k4_include_once(KERNEL_PATH."/languages/phrases_cache.php");

	// We should get rid of these includes:
	k4_include_once(KERNEL_PATH."/db/dblist.php");
	k4_include_once(KERNEL_PATH."/db/dbitem.php");

	k4_include_once(KERNEL_PATH.'/processors/tag_processor.php');
	k4_include_once(KERNEL_PATH."/db/db_tag_processor.php");

	k4_include_once(KERNEL_PATH."/event_handler.php");

	k4_include_once(KERNEL_PATH.'/db/db_event_handler.php');

	k4_include_once(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase
	// up to here

	k4_include_once(KERNEL_PATH.'/application.php');
	k4_include_once(MODULES_PATH.'/kernel/units/general/my_application.php');

	safeDefine('LOGIN_CONTROLLER', 'LoginController');
	safeDefine('USER_MODEL', 'User');


	// global constants
	define('HAVING_FILTER', 1);
	define('WHERE_FILTER', 2);

	define('FLT_TYPE_AND', 'AND');
	define('FLT_TYPE_OR', 'OR');

	safeDefine('STATUS_DISABLED', 0);
	safeDefine('STATUS_ACTIVE', 1);
	safeDefine('STATUS_PENDING', 2);

	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/startup.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.11
	\ No newline at end of property
	+1.12
	\ 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