in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Mon, Aug 25, 10:50 AM

in-portal
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt
	===================================================================
	--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (nonexistent)
	+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (revision 7287)
	@@ -0,0 +1,5 @@
	+
	+
	+Changes in phrases and events:
	+
	+

	Property changes on: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1.2.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/stylesheets/stylesheets_edit.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/stylesheets/stylesheets_edit.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/stylesheets/stylesheets_edit.tpl (revision 7287)
	@@ -1,70 +1,69 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
	+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="stylesheets_edit" module="in-portal" icon="icon46_style"/>

	<!-- 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('css','<inp2:css_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('css','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('css', '<inp2:css_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('css', '<inp2:css_NextId/>');
	}
	) );
	-
	+
	a_toolbar.Render();
	-
	+
	<inp2:m_if prefix="css" function="IsSingle"/>
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	- <inp2:m_else/>
	+ <inp2:m_else/>
	<inp2:m_if prefix="css" function="IsLast"/>
	a_toolbar.DisableButton('next');
	<inp2:m_endif/>
	<inp2:m_if prefix="css" function="IsFirst"/>
	a_toolbar.DisableButton('prev');
	<inp2:m_endif/>
	<inp2:m_endif/>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:css_SaveWarning name="grid_save_warning"/>
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	- <inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	-
	+ <inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	+
	<inp2:m_ParseBlock name="inp_id_label" prefix="css" field="StylesheetId" title="!la_fld_StylesheetId!"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="css" field="Name" title="!la_fld_Name!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
	- <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>
	-</table>
	+ <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>
	+</table>

	<inp2:m_include t="incs/footer"/>
	-
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/stylesheets/stylesheets_edit.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.5.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/stylesheets/stylesheets_edit.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.5.2/core/admin_templates/stylesheets/stylesheets_edit.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.5.2/core/admin_templates/stylesheets/stylesheets_edit.tpl (revision 7287)
	@@ -1,70 +1,69 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
	+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="stylesheets_edit" module="in-portal" icon="icon46_style"/>

	<!-- 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('css','<inp2:css_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('css','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('css', '<inp2:css_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('css', '<inp2:css_NextId/>');
	}
	) );
	-
	+
	a_toolbar.Render();
	-
	+
	<inp2:m_if prefix="css" function="IsSingle"/>
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	- <inp2:m_else/>
	+ <inp2:m_else/>
	<inp2:m_if prefix="css" function="IsLast"/>
	a_toolbar.DisableButton('next');
	<inp2:m_endif/>
	<inp2:m_if prefix="css" function="IsFirst"/>
	a_toolbar.DisableButton('prev');
	<inp2:m_endif/>
	<inp2:m_endif/>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:css_SaveWarning name="grid_save_warning"/>
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	- <inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	-
	+ <inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	+
	<inp2:m_ParseBlock name="inp_id_label" prefix="css" field="StylesheetId" title="!la_fld_StylesheetId!"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="css" field="Name" title="!la_fld_Name!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
	- <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>
	-</table>
	+ <inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>
	+</table>

	<inp2:m_include t="incs/footer"/>
	-
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/stylesheets/stylesheets_edit.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.5.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.9.2/kernel/units/stylesheets/stylesheets_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.9.2/kernel/units/stylesheets/stylesheets_config.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.9.2/kernel/units/stylesheets/stylesheets_config.php (revision 7287)
	@@ -1,129 +1,129 @@
	<?php
	-
	+
	$config = Array(
	'Prefix' => 'css',
	'ItemClass' => Array('class'=>'StylesheetsItem','file'=>'stylesheets_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'StylesheetsEventHandler','file'=>'stylesheets_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	- 'Hooks' => Array(
	+ 'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'css',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnCompileStylesheet',
	),
	),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'IDField' => 'StylesheetId',
	-
	+
	'StatusField' => Array('Enabled'),
	-
	+
	'TitleField' => 'Name',
	-
	+
	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('css'=>'!la_title_Adding_Stylesheet!'),
	'edit_status_labels' => Array('css'=>'!la_title_Editing_Stylesheet!'),
	'new_titlefield' => Array('css'=>'!la_title_New_Stylesheet!'),
	),
	-
	+
	'styles_list' => Array('prefixes' => Array('css_List'), 'format' => "!la_title_Stylesheets! (#css_recordcount#)"),
	-
	+
	'stylesheets_edit' => Array('prefixes' => Array('css'), 'format' => "#css_status# '#css_titlefield#' - !la_title_General!"),
	-
	+
	'base_styles' => Array('prefixes' => Array('css','selectors.base_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BaseStyles! (#selectors.base_recordcount#)"),
	-
	+
	'block_styles' => Array('prefixes' => Array('css','selectors.block_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BlockStyles! (#selectors.block_recordcount#)"),
	-
	+
	'base_style_edit' => Array( 'prefixes' => Array('css','selectors'),
	'new_status_labels' => Array('selectors'=>'!la_title_Adding_BaseStyle!'),
	'edit_status_labels' => Array('selectors'=>'!la_title_Editing_BaseStyle!'),
	'new_titlefield' => Array('selectors'=>'!la_title_New_BaseStyle!'),
	'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
	-
	+
	'block_style_edit' => Array( 'prefixes' => Array('css','selectors'),
	'new_status_labels' => Array('selectors'=>'!la_title_Adding_BlockStyle!'),
	'edit_status_labels' => Array('selectors'=>'!la_title_Editing_BlockStyle!'),
	'new_titlefield' => Array('selectors'=>'!la_title_New_BlockStyle!'),
	'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
	-
	+
	'style_edit' => Array('prefixes' => Array('selectors'), 'format' => "!la_title_EditingStyle! '#selectors_titlefield#'"),
	),
	-
	+
	'PermSection' => Array('main' => 'in-portal:configure_styles'),
	-
	+
	'Sections' => Array(
	'in-portal:configure_styles' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'style',
	'label' => 'la_tab_Stylesheets',
	- 'url' => Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'),
	+ 'url' => Array('t' => 'in-portal/stylesheets/stylesheets_list', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 4,
	'type' => stTREE,
	),
	-
	- ),
	-
	+
	+ ),
	+
	'TableName' => TABLE_PREFIX.'Stylesheets',
	'SubItems' => Array('selectorsbase', 'selectorsblock'),
	-
	+
	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),
	),
	-
	+
	'Filters' => Array(
	0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
	1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),
	)
	),
	-
	+
	'AutoDelete' => true,
	'AutoClone' => true,
	-
	+
	'ListSQLs' => Array( ''=>'SELECT * FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	- 'ListSortings' => Array(
	+ 'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Name' => 'asc'),
	)
	- ),
	+ ),
	'Fields' => Array(
	'StylesheetId' => Array(),
	'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
	'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
	'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => '0'),
	'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0),
	),

	'VirtualFields' => Array(),
	-
	+
	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif',0=>'icon16_style_disabled.gif',1=>'icon16_style.gif'),
	'Fields' => Array(
	'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ),
	'Enabled' => Array( 'title'=>'la_col_Status' ),
	'LastCompiled' => Array('title' => 'la_col_LastCompiled'),
	),
	-
	+
	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.9.2/kernel/units/stylesheets/stylesheets_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.9
	\ No newline at end of property
	+1.9.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.9.2/core/units/stylesheets/stylesheets_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.9.2/core/units/stylesheets/stylesheets_config.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.9.2/core/units/stylesheets/stylesheets_config.php (revision 7287)
	@@ -1,129 +1,129 @@
	<?php
	-
	+
	$config = Array(
	'Prefix' => 'css',
	'ItemClass' => Array('class'=>'StylesheetsItem','file'=>'stylesheets_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'StylesheetsEventHandler','file'=>'stylesheets_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	- 'Hooks' => Array(
	+ 'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'css',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnCompileStylesheet',
	),
	),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'IDField' => 'StylesheetId',
	-
	+
	'StatusField' => Array('Enabled'),
	-
	+
	'TitleField' => 'Name',
	-
	+
	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('css'=>'!la_title_Adding_Stylesheet!'),
	'edit_status_labels' => Array('css'=>'!la_title_Editing_Stylesheet!'),
	'new_titlefield' => Array('css'=>'!la_title_New_Stylesheet!'),
	),
	-
	+
	'styles_list' => Array('prefixes' => Array('css_List'), 'format' => "!la_title_Stylesheets! (#css_recordcount#)"),
	-
	+
	'stylesheets_edit' => Array('prefixes' => Array('css'), 'format' => "#css_status# '#css_titlefield#' - !la_title_General!"),
	-
	+
	'base_styles' => Array('prefixes' => Array('css','selectors.base_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BaseStyles! (#selectors.base_recordcount#)"),
	-
	+
	'block_styles' => Array('prefixes' => Array('css','selectors.block_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BlockStyles! (#selectors.block_recordcount#)"),
	-
	+
	'base_style_edit' => Array( 'prefixes' => Array('css','selectors'),
	'new_status_labels' => Array('selectors'=>'!la_title_Adding_BaseStyle!'),
	'edit_status_labels' => Array('selectors'=>'!la_title_Editing_BaseStyle!'),
	'new_titlefield' => Array('selectors'=>'!la_title_New_BaseStyle!'),
	'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
	-
	+
	'block_style_edit' => Array( 'prefixes' => Array('css','selectors'),
	'new_status_labels' => Array('selectors'=>'!la_title_Adding_BlockStyle!'),
	'edit_status_labels' => Array('selectors'=>'!la_title_Editing_BlockStyle!'),
	'new_titlefield' => Array('selectors'=>'!la_title_New_BlockStyle!'),
	'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
	-
	+
	'style_edit' => Array('prefixes' => Array('selectors'), 'format' => "!la_title_EditingStyle! '#selectors_titlefield#'"),
	),
	-
	+
	'PermSection' => Array('main' => 'in-portal:configure_styles'),
	-
	+
	'Sections' => Array(
	'in-portal:configure_styles' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'style',
	'label' => 'la_tab_Stylesheets',
	- 'url' => Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'),
	+ 'url' => Array('t' => 'in-portal/stylesheets/stylesheets_list', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 4,
	'type' => stTREE,
	),
	-
	- ),
	-
	+
	+ ),
	+
	'TableName' => TABLE_PREFIX.'Stylesheets',
	'SubItems' => Array('selectorsbase', 'selectorsblock'),
	-
	+
	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),
	),
	-
	+
	'Filters' => Array(
	0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
	1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),
	)
	),
	-
	+
	'AutoDelete' => true,
	'AutoClone' => true,
	-
	+
	'ListSQLs' => Array( ''=>'SELECT * FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	- 'ListSortings' => Array(
	+ 'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Name' => 'asc'),
	)
	- ),
	+ ),
	'Fields' => Array(
	'StylesheetId' => Array(),
	'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
	'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
	'LastCompiled' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => '0'),
	'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0),
	),

	'VirtualFields' => Array(),
	-
	+
	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif',0=>'icon16_style_disabled.gif',1=>'icon16_style.gif'),
	'Fields' => Array(
	'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ),
	'Enabled' => Array( 'title'=>'la_col_Status' ),
	'LastCompiled' => Array('title' => 'la_col_LastCompiled'),
	),
	-
	+
	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.9.2/core/units/stylesheets/stylesheets_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.9
	\ No newline at end of property
	+1.9.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.13.2/tools/debug_sample.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.13.2/tools/debug_sample.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.13.2/tools/debug_sample.php (revision 7287)
	@@ -1,68 +1,69 @@
	<?php

	// define('SILENT_LOG', 1); // Log all php errors on site to separate file (/silent_log.txt)
	// define('DBG_REQUREST_LOG', '/path/to/file');// Log all user requests to site into filename specified
	// define('DBG_SITE_PATH', '/relative_path/'); // set alternative BASE_PATH for old in-portal parts (where no K4 included)
	-// define('DBG_ZEND_PRESENT',0); // Set to 0 to debug debugger (because debugger automatically got disabled during zend debug sessions)
	+// define('DBG_ZEND_PRESENT',0); // Set to 0 to debug debugger (because debugger automatically got disabled during zend debug sessions)

	$dbg_options = Array (
	+ // !!! DEBUG MODE will be off if IP does not match !!!
	'DBG_IP' => '193.68.72.64/26', // !!!REQUIRED!!! Define IP addreses, which are allowed to use debugger (semicolon separated)
	'DEBUG_MODE' => 1, // Debug mode is allowed/disabled (note: set DBG_IP to use this one)
	// 'DBG_LOCAL_BASE_PATH' => 'w:', // Folder name on mapped drive, where site resides
	// 'DBG_TOOLBAR_BUTTONS' => 1, // Show "Show Debugger" & "Refresh Frame" buttons (on front)
	-
	+
	// 'DBG_USE_HIGHLIGHT' => 0, // Use "highlight_string" php function for debugger output formatting
	// 'DBG_RAISE_ON_WARNINGS' => 1, // Show debugger output in case of any non-fatal error
	'DBG_SQL_PROFILE' => 1, // Profile SQL queries
	'DBG_SQL_FAILURE' => defined('IS_INSTALL') && IS_INSTALL ? 0 : 1, // treat sql errors as fatal errors except for installation process
	-
	+
	'DBG_SHOW_HTTPQUERY' => 1, // Show http query content (parsed user submit, GPC)
	'DBG_SHOW_SESSIONDATA' => 1, // Show session data (at script finish)
	-
	+
	'DBG_EDIT_HELP' => 1, // Show help filename on help screen
	// 'DBG_HELP' => 1, // Show FCK editor when viewing help screen
	-
	+
	// 'DBG_FORCE_THEME' => 1, // Use this theme_id instead of one in url
	'DBG_PHRASES' => 1, // Add ability to translate phrases on the fly (K4 templates only)
	// 'DBG_WINDOW_WIDTH' => 700, // Set custom debugger layer width (in pixels)
	-
	+
	// 'DBG_REDIRECT' => 1, // Show links with redirect url instead of performing it (useful in events debugging)

	// 'DBG_VALIDATE_CONFIGS' => 1, // Check that config fields match ones from database
	// 'DBG_SHOW_TAGS' => 1, // Show tags beeing processed
	);
	-
	-
	+
	+
	// for ADODB to work: begin
	define('ADODB_OUTP', 'dbg_SQLLog');
	function dbg_SQLLog($msg, $new_line = false) { }
	// for ADODB to work: end
	-
	+

	function isSkipTable($sql)
	{
	// return false;
	-
	+
	// don't show sqls that use one or more tables from list below
	static $skipTables = Array( 'PermissionConfig','SessionData','Permissions',
	'Phrase','Cache','Modules','Events',
	'PersistantSessionData','EmailQueue','UserSession',
	'ThemeFiles', 'Language','ConfigurationValues');
	-
	+
	foreach ($skipTables as $table) {
	if( dbg_tableMatch($table, $sql) ) {
	return true;
	}
	}
	-
	+
	return false;
	}

	function dbg_tableMatch($table_name,$sql)
	{
	static $prefix = '';
	$prefix = defined('TABLE_PREFIX')?TABLE_PREFIX:GetTablePrefix();
	return strpos($sql,$prefix.$table_name)!==false;
	}
	-
	+
	?>

	Property changes on: branches/unlabeled/unlabeled-1.13.2/tools/debug_sample.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.13.2.2
	\ No newline at end of property
	+1.13.2.3
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.26.2/admin/users/adduser.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.26.2/admin/users/adduser.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.26.2/admin/users/adduser.php (revision 7287)
	@@ -1,374 +1,376 @@
	-<?php
	+<?php
	##############################################################
	##In-portal ##
	##############################################################
	## In-portal ##
	## Intechnic Corporation ##
	## All Rights Reserved, 1998-2002 ##
	-## ##
	-## No portion of this code may be copied, reproduced or ##
	+## ##
	+## No portion of this code may be copied, reproduced or ##
	## otherwise redistributed without proper written ##
	## consent of Intechnic Corporation. Violation will ##
	## result in revocation of the license and support ##
	## privileges along maximum prosecution allowed by law. ##
	##############################################################

	// new startup: begin
	define('REL_PATH', 'admin/users');
	$relation_level = count( explode('/', REL_PATH) );
	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
	require_once FULL_PATH.'/kernel/startup.php';
	// new startup: end
	checkViewPermission('in-portal:user_list');

	-require_once ($pathtoroot.$admin."/include/elements.php");
	-require_once ($pathtoroot."kernel/admin/include/navmenu.php");
	-//require_once ($pathtolocal."admin/include/navmenu.php");
	+require_once ($pathtoroot.$admin."/include/elements.php");
	+require_once ($pathtoroot."kernel/admin/include/navmenu.php");
	+//require_once ($pathtolocal."admin/include/navmenu.php");
	require_once($pathtoroot.$admin."/toolbar.php");

	unset($objEditItems);
	$objEditItems = new clsUserManager();
	$objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
	$objEditItems->EnablePaging = FALSE;
	$application->SetVar('u_mode', 't');
	$objCustomFields = new clsCustomFieldList(6);
	$objRelList = new clsRelationshipList();
	$objImages = new clsImageList();
	$objUserGroupsList = new clsUserGroupList();

	//Multiedit init
	if ( GetVar('new') == 1)
	{
	$c = new clsPortalUser(NULL);
	$c->Set("CreatedOn", adodb_mktime());
	$c->Set("Status", 2);
	$en = 0;
	$action = "m_add_user";
	$objUsers->CreateEmptyEditTable("PortalUserId");
	$objRelList->CreateEmptyEditTable("RelationshipId");
	$objCustomDataList->CreateEmptyEditTable('u');
	- $objImages->CreateEmptyEditTable("ResourceId");
	+ $objImages->CreateEmptyEditTable("ResourceId");
	$objUserGroupsList->CreateEmptyEditTable("PortalUserId");
	-
	+
	$objItemTypes->BuildUserItemTable(-1, 1); // 0 - user_id, 1 - clear table
	}
	else
	-{
	+{
	$direct_id = GetVar('direct_id');
	if($direct_id) $_POST['itemlist'] = Array($direct_id);
	-
	+
	$en = GetVar('en');
	if (isset($_POST["itemlist"]))
	- {
	- $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);
	- }
	+ {
	+ $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);
	+ }
	$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
	$first=1;
	foreach($objEditItems->Items as $u)
	{
	- $objItemTypes->BuildUserItemTable($u->Get("PortalUserId"),$first);
	- $first=0;
	+ $objItemTypes->BuildUserItemTable($u->Get("PortalUserId"),$first);
	+ $first=0;
	}

	if(isset($_POST["itemlist"]))
	{
	/* make a copy of the relationship records */
	$user_ids = Array();
	$user_ids[] = $u->Get("PortalUserId");
	$ids = $objEditItems->GetResourceIDList();
	$objRelList->CopyToEditTable("SourceId",$ids);
	$objCustomDataList->CopyToEditTable('u', $ids);
	$objImages->CopyToEditTable("ResourceId",$ids);
	$objUserGroupsList->CopyToEditTable("PortalUserId", $user_ids);
	}

	$itemcount=$objEditItems->NumItems();
	$c = $objEditItems->GetItemByIndex($en);

	if($itemcount>1)
	- {
	+ {
	if ($en+1 == $itemcount)
	$en_next = -1;
	else
	$en_next = $en+1;
	-
	+
	if ($en == 0)
	$en_prev = -1;
	else
	- $en_prev = $en-1;
	+ $en_prev = $en-1;
	}
	$action = "m_edit_user";
	}

	$envar = "env=" . BuildEnv() . "&en=$en";
	-
	-$section = 'in-portal:edituser_general';
	+
	+$section = 'in-portal:edituser_general';

	if (strlen($c->Get("Login")))
	$editing_title = "'".$c->Get("Login")."' ";
	else
	$editing_title = "";


	$title = GetTitle("la_Text_User", "la_Text_General", $c->Get('PortalUserId'), $c->Get('Login'));
	$c->Data=inp_htmlize($c->Data);

	$saveURL = $admin."/".$objSession->GetVariable('ReturnScript');

	//Display header
	$sec = $objSections->GetSection($section);
	$objCatToolBar = new clsToolBar();
	$objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('edituser','UserEditStatus','".$saveURL."',1);","tool_select.gif");
	$objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('edituser','UserEditStatus','".$saveURL."',2);","tool_cancel.gif");

	if ( isset($en_prev) \|\| isset($en_next) )
	{
	- $url = $RootUrl.$admin."/users/adduser.php";
	+ $url = $RootUrl.$admin."/users/adduser.php";
	$StatusField = "UserEditStatus";
	$form = "edituser";
	- MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');
	+ MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');
	}

	int_header($objCatToolBar,NULL,$title);

	if ($objSession->GetVariable("HasChanges") == 1) {
	?>
	<table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolbar">
	<tr>
	<td valign="top">
	<?php int_hint_red(admin_language("la_Warning_Save_Item")); ?>
	</td>
	</tr>
	</table>
	-<?php } ?>
	+<?php } ?>
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	-<form ID="edituser" name="edituser" action="" method=POST>
	-
	+<form ID="edituser" name="edituser" action="" method=POST>
	+
	<?php int_subsection_title(prompt_language("la_Text_User")); ?>

	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_user_login" class="text"><?php echo prompt_language("la_prompt_Usermame"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" tabindex="1" name="user_login" ID="user_login" class="text" ValidationType="exists" size="20" value="<?php echo isset($dupe_user) && $dupe_user ? $dupe_user : $c->parsetag("user_login"); ?>">
	<span class="validation_error"><?php if( isset($dupe_user) && $dupe_user ) echo admin_language($lvErrorString); ?></span>
	</td>
	<td></td>
	</tr>
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span ID="prompt_password" class="text"><?php echo prompt_language("la_prompt_Password"); ?></span></td>
	- <td>
	+ <td>
	<input type="password" id="password" tabindex="2" name="password" class="text" ValidationType="password" size="20" value="">
	<?php if( !GetVar('new') ) echo prompt_language("la_password_info"); ?>
	- </td>
	+ </td>
	<td></td>
	</tr>
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span ID="prompt_password_verify" class="text"><?php echo prompt_language("la_prompt_PasswordRepeat"); ?></span></td>
	- <td>
	+ <td>
	<input type="password" id="password_verify" tabindex="4" name="password_verify" class="text" size="20" value="">
	</td>
	<td></td>
	</tr>

	<?php int_subsection_title(prompt_language("la_prompt_PersonalInfo")); ?>

	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_user_firstname" class="text"><?php echo prompt_language("la_prompt_FirstName"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" name="user_firstname" class="text" tabindex="5" size="30" value="<?php echo $c->parsetag("user_firstname"); ?>">
	</td>
	<td></td>
	</tr>
	-
	- <tr <?php int_table_color(); ?>>
	+
	+ <tr <?php int_table_color(); ?>>
	<td valign="top">
	<span id="prompt_user_lastname" class="text"><?php echo prompt_language("la_prompt_LastName"); ?></span>
	</td>
	- <td>
	+ <td>
	<input type="text" name="user_lastname" class="text" tabindex="6" size="30" value="<?php echo $c->parsetag("user_lastname"); ?>">
	</td>
	<td></td>
	</tr>
	-
	- <tr <?php int_table_color(); ?>>
	+
	+ <tr <?php int_table_color(); ?>>
	<td valign="top">
	<span id="prompt_user_company" class="text"><?php echo prompt_language("la_fld_Company"); ?></span>
	</td>
	- <td>
	+ <td>
	<input type="text" name="user_company" class="text" tabindex="7" size="30" value="<?php echo inp_htmlize($c->Get('Company')); ?>">
	</td>
	<td></td>
	</tr>

	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span ID="prompt_user_email" class="text"><?php echo prompt_language("la_prompt_Email"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" ValidationType="exists" name="user_email" tabindex="8" ID="user_email" class="text" size="30" value="<?php echo $c->parsetag("user_email"); ?>">
	</td>
	<td><span class="text"> </span></td>
	</tr>
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><SPAN id="prompt_user_dob" class="text"><?php echo prompt_language("la_prompt_birthday"); ?></SPAN></td>
	- <td>
	- <input type="text" ValidationType="date,exists" tabindex="9" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">
	+ <td>
	+ <input type="text" ValidationType="date,exists" tabindex="9" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">
	<span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
	<td></td>
	</tr>

	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_user_phone" class="text"><?php echo prompt_language("la_prompt_Phone"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" name="user_phone" tabindex="10" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Phone')); ?>">
	</td>
	<td><span class="text"> </span></td>
	</tr>
	-
	- <tr <?php int_table_color(); ?>>
	+
	+ <tr <?php int_table_color(); ?>>
	<td valign="top">
	<span id="prompt_user_fax" class="text"><?php echo prompt_language("la_fld_Fax"); ?></span>
	</td>
	- <td>
	+ <td>
	<input type="text" name="user_fax" tabindex="11" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Fax')); ?>">
	</td>
	<td>
	<span class="text"> </span>
	</td>
	</tr>

	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top">
	<span id="prompt_user_street" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 1</span>
	</td>
	- <td>
	+ <td>
	<input type="text" name="user_street" tabindex="12" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street')); ?>">
	</td>
	<td>
	<span class="text"> </span>
	</td>
	</tr>
	-
	- <tr <?php int_table_color(); ?>>
	+
	+ <tr <?php int_table_color(); ?>>
	<td valign="top">
	<span id="prompt_user_street2" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 2</span>
	</td>
	- <td>
	+ <td>
	<input type="text" name="user_street2" tabindex="13" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street2')); ?>">
	</td>
	<td>
	<span class="text"> </span>
	</td>
	</tr>
	-
	- <tr <?php int_table_color(); ?>>
	+
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_user_city" class="text"><?php echo prompt_language("la_prompt_City"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" name="user_city" class="text" tabindex="14" size="30" value="<?php echo $c->parsetag("user_city"); ?>">
	</td>
	<td><span class="text"> </span></td>
	</tr>
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_user_state" class="text"><?php echo prompt_language("la_prompt_State"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" name="user_state" class="text" tabindex="15" size="20" value="<?php echo $c->parsetag("user_state"); ?>">
	</td>
	<td><span class="text"> </span></td>
	</tr>
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_user_zip" class="text"><?php echo prompt_language("la_prompt_Zip"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" name="user_zip" class="text" size="6" tabindex="16" value="<?php echo $c->parsetag("user_zip"); ?>">
	</td>
	<td><span class="text"> </span></td>
	</tr>
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_user_country" class="text"><?php echo prompt_language("la_prompt_Country"); ?></span></td>
	- <td>
	+ <td>
	<input type="text" name="user_country" class="text" tabindex="17" size="30" value="<?php echo $c->parsetag("user_country"); ?>">
	</td>
	<td><span class="text"> </span></td>
	</tr>
	<?php int_subsection_title(prompt_language("la_prompt_Properties")); ?>
	<tr <?php int_table_color(); ?>>
	<td valign="top"><span id="prompt_status" class="text"><?php echo prompt_language("la_prompt_Status"); ?></span></td>
	<td>
	<input type="radio" name="status" class="text" tabindex="18" value="1" <?php if($c->Get("Status") == 1) echo "checked"; ?>><?php echo prompt_language("la_val_Active"); ?>
	<input type="radio" name="status" class="text" tabindex="18" value="2" <?php if($c->Get("Status") == 2) echo "checked"; ?>><?php echo prompt_language("la_val_Pending"); ?>
	<input type="radio" name="status" class="text" tabindex="18" value="0" <?php if($c->Get("Status") == 0) echo "checked"; ?>><?php echo prompt_language("la_val_Disabled"); ?>
	</td>
	<td class="text"> </td>
	</tr>
	+
	+
	<!-- User: CreatedOn: begin -->
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><SPAN id="prompt_user_date" class="text"><?php echo prompt_language("la_prompt_CreatedOn"); ?></SPAN></td>
	- <td>
	- <input type="text" name="user_date" id="user_date_selector" tabindex="19" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">
	+ <td>
	+ <input type="text" name="user_date" id="user_date_selector" tabindex="19" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">
	<span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
	<td></td>
	</tr>
	- <tr <?php int_table_color(); ?>>
	+ <tr <?php int_table_color(); ?>>
	<td valign="top"><SPAN id="prompt_user_time" class="text"><?php echo prompt_language("la_prompt_CreatedOn_Time"); ?></SPAN></td>
	- <td>
	+ <td>
	<input type="text" name="user_time" tabindex="20" class="text" size="20" value="<?php echo $c->parsetag("user_time"); ?>">
	<span class="small"><?php echo prompt_language("la_prompt_TimeFormat"); ?></span></td>
	<td></td>
	</tr>
	<!-- User: CreatedOn: end -->
	-
	+
	<?php

	$CustomFieldUI = $objCustomFields->GetFieldUIList(TRUE); // get custom fields to show on general tab
	if($CustomFieldUI->NumItems()>0)
	{
	$objCustomDataList->SetTable('edit');
	-
	+
	if((int)$c->Get("ResourceId")>0)
	$objCustomDataList->LoadResource($c->Get("ResourceId"));
	-
	+
	$headings = $CustomFieldUI->GetHeadingList();
	// draw headings
	for($i = 0; $i < count($headings); $i++)
	{
	$h = $headings[$i];
	if(strlen($h))
	{
	int_subsection_title(prompt_language($h));
	$Items = $CustomFieldUI->GetHeadingItems($h);
	foreach($Items as $f)
	{
	$n = substr($f->name,1); // TabIndex
	$cfield = $objCustomFields->GetItemByField('FieldName',$n,FALSE);
	if (is_object($cfield)) {
	$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
	}
	- print "<tr ".int_table_color_ret().">\n";
	+ print "<tr ".int_table_color_ret().">\n";
	print " <td valign=\"top\"><span class=\"text\">".$f->GetPrompt()."</span></td>\n";
	-
	- print " <td nowrap>".$f->ItemFormElement(17)."</TD>";
	+
	+ print " <td nowrap>".$f->ItemFormElement(17)."</TD>";
	if (is_object($f->NextItem)) {
	$n = $f->NextItem;
	- print " <td>".$n->ItemFormElement(17)."</TD>";
	+ print " <td>".$n->ItemFormElement(17)."</TD>";
	}
	else {
	print " <td><span class=\"text\"> </span></td>\n";
	}
	print "</tr>\n";
	}
	}
	}
	$objCustomDataList->SetTable('live');
	}
	?>
	</table>
	<input type="hidden" name="Action" value="<?php echo $action; ?>">
	<input type="hidden" name="user_id" value="<?php echo $c->Get("PortalUserId"); ?>">
	<input type="hidden" name="UserEditStatus" VALUE="0">
	</form>
	<script src="<?php echo $adminURL; ?>/include/calendar.js"></script>
	<SCRIPT language="JavaScript">
	initCalendar("user_date_selector", CalDateFormat);
	initCalendar("user_dob_selector", CalDateFormat);
	-</SCRIPT>
	-<?php
	+</SCRIPT>
	+<?php
	MarkFields('edituser');
	- int_footer();
	+ int_footer();
	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.26.2/admin/users/adduser.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.26
	\ No newline at end of property
	+1.26.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.2.2/admin/install/upgrades/changelog_1_3_0.txt
	===================================================================
	--- branches/unlabeled/unlabeled-1.2.2/admin/install/upgrades/changelog_1_3_0.txt (revision 7286)
	+++ branches/unlabeled/unlabeled-1.2.2/admin/install/upgrades/changelog_1_3_0.txt (revision 7287)
	@@ -1,82 +1,624 @@
	-File in-portal/index.php changed
	-File in-portal/admin/advanced_view.php is removed; release_1_2_1 revision 1.25
	-File in-portal/admin/browse.php is removed; release_1_2_1 revision 1.35
	-File in-portal/admin/install.php changed
	-File in-portal/admin/category/addcategory.php is removed; release_1_2_1 revision 1.20
	-File in-portal/admin/category/addcategory_custom.php is removed; release_1_2_1 revision 1.14
	-File in-portal/admin/category/addcategory_customfields.php is removed; release_1_2_1 revision 1.5
	-File in-portal/admin/category/addcategory_images.php is removed; release_1_2_1 revision 1.9
	-File in-portal/admin/category/addcategory_permissions.php is removed; release_1_2_1 revision 1.11
	-File in-portal/admin/category/addcategory_relations.php is removed; release_1_2_1 revision 1.8
	-File in-portal/admin/category/addimage.php is removed; release_1_2_1 revision 1.9
	-File in-portal/admin/category/addpermission.php is removed; release_1_2_1 revision 1.9
	-File in-portal/admin/category/addpermission_modules.php is removed; release_1_2_1 revision 1.10
	-File in-portal/admin/category/addrelation.php is removed; release_1_2_1 revision 1.8
	-File in-portal/admin/category/category_items.php is removed; release_1_2_1 revision 1.4
	-File in-portal/admin/category/category_maint.php is removed; release_1_2_1 revision 1.23.32.1
	-File in-portal/admin/category/permcacheupdate.php is removed; release_1_2_1 revision 1.10
	-File in-portal/admin/category/images/ddarrow.gif is removed; release_1_2_1 revision 1.1
	-File in-portal/admin/category/images/ddarrow_active.gif is removed; release_1_2_1 revision 1.1
	-File in-portal/admin/category/images/ddarrow_over.gif is removed; release_1_2_1 revision 1.1
	-File in-portal/admin/category/js/core.js is removed; release_1_2_1 revision 1.1
	-File in-portal/admin/category/js/lang.js is removed; release_1_2_1 revision 1.1
	-File in-portal/admin/category/js/main.js is removed; release_1_2_1 revision 1.1
	-File in-portal/admin/help/manual.pdf changed
	-File in-portal/admin/install/inportal_data.sql changed
	-File in-portal/admin/install/inportal_remove.sql changed
	-File in-portal/admin/install/install_lib.php changed
	-File in-portal/admin/install/langpacks/english.lang changed
	-File in-portal/admin/install/upgrades/changelog_1_3_0.txt is new; release_1_3_0 revision 1.1.2.12
	-File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.0.sql is new; release_1_3_0 revision 1.1.2.1
	-File in-portal/admin/install/upgrades/readme_1_3_0.txt is new; release_1_3_0 revision 1.1.2.2
	-File in-portal/kernel/parser.php changed
	-File in-portal/kernel/admin/advanced_view.php is removed; release_1_2_1 revision 1.4
	-File in-portal/kernel/admin/include/toolbar/advanced_view.php is removed; release_1_2_1 revision 1.11.2.1
	-File in-portal/kernel/admin/include/toolbar/browse.php is removed; release_1_2_1 revision 1.17.2.1
	-File in-portal/kernel/admin/include/toolbar/editcategory_permissions.php is removed; release_1_2_1 revision 1.1
	-File in-portal/kernel/admin/include/toolbar/editcategory_relations.php is removed; release_1_2_1 revision 1.2
	-File in-portal/kernel/admin/include/toolbar/editcategory_relationselect.php is removed; release_1_2_1 revision 1.6.2.1
	-File in-portal/kernel/admin/include/toolbar/editgroup_permissions.php is removed; release_1_2_1 revision 1.1
	-File in-portal/kernel/admin/include/toolbar/editgroup_users.php is removed; release_1_2_1 revision 1.1
	-File in-portal/kernel/admin_templates/incs/config_blocks.tpl changed
	-File in-portal/kernel/admin_templates/incs/form_blocks.tpl changed
	-File in-portal/kernel/admin_templates/incs/grid_blocks.tpl changed
	-File in-portal/kernel/admin_templates/incs/script.js changed
	-File in-portal/kernel/admin_templates/regional/phrases_edit.tpl changed
	-File in-portal/kernel/admin_templates/tools/system_tools.tpl changed
	-File in-portal/kernel/include/emailmessage.php changed
	-File in-portal/kernel/include/image.php changed
	-File in-portal/kernel/include/modules.php changed
	-File in-portal/kernel/units/admin/admin_config.php changed
	-File in-portal/kernel/units/categories/categories_tag_processor.php changed
	-File in-portal/kernel/units/configuration/configuration_event_handler.php changed
	-File in-portal/kernel/units/email_events/email_events_event_handler.php changed
	-File in-portal/kernel/units/general/cat_event_handler.php changed
	-File in-portal/kernel/units/general/cat_tag_processor.php changed
	-File in-portal/kernel/units/general/inp_ses_storage.php changed
	-File in-portal/kernel/units/general/main_event_handler.php changed
	-File in-portal/kernel/units/general/helpers/mod_rewrite_helper.php changed
	-File in-portal/kernel/units/general/helpers/permissions_helper.php changed
	-File in-portal/kernel/units/users/users_event_handler.php changed
	-File in-portal/themes/default/search_results.tpl changed
	-File in-portal/themes/default/common/head.tpl changed
	-File in-portal/themes/default/common/pagetop.tpl changed
	-File kernel4_dev/kernel4/application.php changed
	-File kernel4_dev/kernel4/event_manager.php changed
	-File kernel4_dev/kernel4/startup.php changed
	-File kernel4_dev/kernel4/db/db_event_handler.php changed
	-File kernel4_dev/kernel4/db/db_tag_processor.php changed
	-File kernel4_dev/kernel4/db/dblist.php changed
	-File kernel4_dev/kernel4/parser/template_parser.php changed
	-File kernel4_dev/kernel4/processors/main_processor.php changed
	-File kernel4_dev/kernel4/session/session.php changed
	-File kernel4_dev/kernel4/utility/debugger.php changed
	-File kernel4_dev/kernel4/utility/email.php changed
	-File kernel4_dev/kernel4/utility/formatters/password_formatter.php changed
	-File cmseditor/fckeditor.js changed
	-File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed
	-
	+File in-portal/.cvsignore is removed; release_1_3_1 revision 1.5
	+File in-portal/compat.php is removed; release_1_3_1 revision 1.2
	+File in-portal/globals.php is removed; release_1_3_1 revision 1.109
	+File in-portal/html_parse.php is removed; release_1_3_1 revision 1.1
	+File in-portal/index.php is removed; release_1_3_1 revision 1.22
	+File in-portal/new_phrases.txt is removed; release_1_3_1 revision 1.11
	+File in-portal/obscure.php is removed; release_1_3_1 revision 1.8
	+File in-portal/png_replace.php is removed; release_1_3_1 revision 1.1
	+File in-portal/robots_list.txt is removed; release_1_3_1 revision 1.1
	+File in-portal/root.flg is removed; release_1_3_1 revision 1.1
	+File in-portal/sql.error is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/.cvsignore is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/addreview_direct.php is removed; release_1_3_1 revision 1.5
	+File in-portal/admin/cat_select.php is removed; release_1_3_1 revision 1.12
	+File in-portal/admin/confirm.php is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/index.php is removed; release_1_3_1 revision 1.24
	+File in-portal/admin/index4.php is removed; release_1_3_1 revision 1.10
	+File in-portal/admin/index4_direct.php is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/install.php is removed; release_1_3_1 revision 1.108.2.2
	+File in-portal/admin/main.php is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/relation_select.php is removed; release_1_3_1 revision 1.16
	+File in-portal/admin/reviews.php is removed; release_1_3_1 revision 1.13
	+File in-portal/admin/save_redirect.php is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/subitems.php is removed; release_1_3_1 revision 1.14
	+File in-portal/admin/tag_listing.php is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/toolbar.php is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/backup/backup1.php is removed; release_1_3_1 revision 1.10
	+File in-portal/admin/backup/backup2.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/backup/backup3.php is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/backup/restore1.php is removed; release_1_3_1 revision 1.7
	+File in-portal/admin/backup/restore2.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/backup/restore3.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/backup/restore4.php is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/backupdata/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/backupdata/dummy is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/browse/checkboxes.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/browse/checkboxes_002.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/browse/checkboxes_new.js is removed; release_1_3_1 revision 1.5
	+File in-portal/admin/browse/checkboxes_old.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/browse/common.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/browse/fw_menu.js is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/browse/toolbar.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/browse/toolbar.js is removed; release_1_3_1 revision 1.5
	+File in-portal/admin/browse/toolbar.php is removed; release_1_3_1 revision 1.3
	+File in-portal/admin/browse/toolbar_002.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/browse/utility.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/config/addtheme.php is removed; release_1_3_1 revision 1.15
	+File in-portal/admin/config/addtheme_templates.php is removed; release_1_3_1 revision 1.12
	+File in-portal/admin/config/config_theme.php is removed; release_1_3_1 revision 1.13
	+File in-portal/admin/config/edit_banlist.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/config/edit_label.php is removed; release_1_3_1 revision 1.15
	+File in-portal/admin/config/edit_template.php is removed; release_1_3_1 revision 1.9
	+File in-portal/admin/config/email_edit.php is removed; release_1_3_1 revision 1.10
	+File in-portal/admin/config/missing_label_edit.php is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/config/missing_label_search.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/editor/editor.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/editor.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/editor/editor_new.php is removed; release_1_3_1 revision 1.10
	+File in-portal/admin/editor/inp_fckconfig.js is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/editor/inp_styles.xml is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/editor/FCKeditor/fckeditor.htc is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/fckeditor.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/fckeditor.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/fckeditor.php is removed; release_1_3_1 revision 1.6
	+File in-portal/admin/editor/FCKeditor/license.txt is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/css/fck_dialog.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/css/fck_editor.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/css/fck_editorarea.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/css/fck_editorarea.php is removed; release_1_3_1 revision 1.5
	+File in-portal/admin/editor/FCKeditor/dialog/fck_about.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_flash.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_image.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_link.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_selcolor.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_smiley.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_specialchar.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_table.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_tablecell.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fckeditor_1.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fckeditor_2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fredck.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fredck_bottom.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fredck_top.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/dialog/fck_about/spacer.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/filemanager/upload/php/upload.php is removed; release_1_3_1 revision 1.5
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/angel_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/angry_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/broken_heart.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/cake.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/confused_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/cry_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/devil_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/embaressed_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/envelope.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/heart.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/kiss.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/lightbulb.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/omg_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/regular_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/sad_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/shades_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/teeth_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/thumbs_down.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/thumbs_up.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/tounge_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/whatchutalkingabout_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/smiley/msn/wink_smile.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.about.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.bgcolor.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.bold.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.copy.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.cut.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.find.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.flash.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.image.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.indent.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.insertorderedlist.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.insertunorderedlist.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.italic.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifycenter.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifyfull.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifyleft.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifyright.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.link.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.outdent.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.paste.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.pastetext.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.pasteword.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.print.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.redo.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.removeformat.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.rule.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.selectall.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.showdetails.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.showtableborders.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.smiley.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.specialchar.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.spellcheck.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.strikethrough.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.subscript.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.superscript.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.table.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.textcolor.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.underline.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.undo.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/button.unlink.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/images/toolbar/separator.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/dhtmled.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_actions.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_config.js is removed; release_1_3_1 revision 1.3
	+File in-portal/admin/editor/FCKeditor/js/fck_contextmenu.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_displaychange.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_editor.js is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/editor/FCKeditor/js/fck_events.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_init.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_lang.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_toolbar.js is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/editor/FCKeditor/js/fck_toolbaritems.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/js/fck_xhtml.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/editor/FCKeditor/lang/en.js is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/email/do_send.php is removed; release_1_3_1 revision 1.15
	+File in-portal/admin/email/log.txt is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/email/sendmail.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/export/.cvsignore is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/export/dummy is removed; release_1_3_1 revision 1.3
	+File in-portal/admin/help/blank.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/help/credits.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/help/credits.txt is removed; release_1_3_1 revision 1.4
	+File in-portal/admin/help/help.php is removed; release_1_3_1 revision 1.15
	+File in-portal/admin/help/help_styles.css is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/help/install_help.php is removed; release_1_3_1 revision 1.8
	+File in-portal/admin/help/legal_warning.txt is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/help/manual.pdf is removed; release_1_3_1 revision 1.25.2.1
	+File in-portal/admin/help/topics/download.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/help/topics/introdution.html is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_banlist.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_cat_settings.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_catalog.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_catsearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_community.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_conf.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_conf_general.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_conf_regional.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_conf_security.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_conf_themes.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_email_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_general.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_help.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_in-portal.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_itemsearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_link_editor.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_lock.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_lock_login.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_logs_reports.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_mailinglist.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_modules.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_navigate.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_search_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_searchgroups.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_searchusers.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_sessions_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_settings_custom.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_settings_email.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_settings_general.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_settings_output.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_settings_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_site.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_stats.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_struct.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_summary.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_summary_logs.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_tool_backup.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_tool_export.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_tool_import.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_tool_restore.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_tools.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_usergroups.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_users.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_users_primary_group.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon24_users_settings.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_advanced_view.gif is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/icons/icon46_banlist.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_catalog.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_catsearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_community.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_conf.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_conf_general.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_conf_regional.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_conf_security.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_conf_themes.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_email_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_foldersearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_groupsearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_help.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_itemsearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_advanced_view.gif is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/icons/icon46_list_banlist.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_cat_settings.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_catalog.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_community.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_conf.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_conf_general.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_conf_regional.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_conf_themes.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_help.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_modules.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_products.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_reviews.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_search_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_sessions_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_struct.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_summary.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_summary_logs.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_tool_backup.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_tool_export.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_tool_import.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_tool_restore.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_tools.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_usergroups.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_users.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_users_settings.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_list_usersearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_logs_reports.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_mailinglist.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_modules.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_navigate.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_products.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_reviews.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_search_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_server_info.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_sessions_log.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_censor.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_custom.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_email.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_general.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_in-bulletin.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_in-link.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_in-newz.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_output.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_settings_smiley.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_site.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_stats.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_struct.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_summary.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_summary_logs.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_tool_backup.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_tool_export.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_tool_import.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_tool_restore.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_tools.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_usergroups.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_users.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_users_settings.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_usersearch.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/icon46_validate.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/logout.png is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/Leftover/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/Leftover/icon24_products.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/Leftover/icon24_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/icons/Leftover/icon46_list_conf_security.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/about.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/about.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/arrow.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/arrow16.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/arrow16_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/arrow_down.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/arrows.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/bg_install_menu.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/blocks.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/blocks2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/blue_bar_help.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/blue_bar_logout.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/box.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/button_back.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/check.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/check_on.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/cros.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/ddarrow.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/divider_dn.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/divider_left_sel.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/divider_right.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/divider_sel_right.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/divider_up.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/folder.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/globe.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/help.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon16_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon16_search_reset.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon24_link_cat.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon24_link_date.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon24_link_editor.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon24_link_user.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_browse.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_error.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_install.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_question.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_question_sm.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_user_sm.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_users_sm.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/icon_warning.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/list_arrow_dn.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/list_arrow_rt.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/list_arrow_up.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/logo.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/logo_bg.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/logo_bg_in-bulletin.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/logo_bg_in-link.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/logo_bg_in-news.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/max_rate.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/menu_arrow.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/menu_bar.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/menu_dot.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/perm_green.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/perm_red.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/progress_bar_segment.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/smicon1.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/smicon2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/smicon3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/smicon4.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/smicon5.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/smicon6.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/smicon7.gif is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/images/spacer.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/status_cancel.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/status_check.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_active_back.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_active_back2.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_active_back3.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_active_left.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_active_right.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_back.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_back.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_left.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_middle.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tab_right.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tabnav_back.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tabnav_dots.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/tabnav_left.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar_divider.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar_start.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/version_bg.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_attn.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_deleted.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_denied.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_hot.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_new.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_pending.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_pick.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_cat_top.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_custom.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_custom_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_image.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_image_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_language.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_language_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_language_primary.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_language_var.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_permission.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_relation_one-way.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_relation_one-way_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_relation_reciprocal.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_relation_reciprocal_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_review.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_review_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_review_pending.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_search_dropdown.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_search_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_search_reset.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_search_reset_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_template.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_theme.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_theme_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_theme_primary.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_user.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_user_attn.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_user_deleted.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_user_denied.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_user_disabled.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icon16_user_pending.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/icons16_permissions_inherited.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemicons/.xvpics/icon16_search_dropdown.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/divider_dn.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/divider_empty.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/divider_up.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/tab_active.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/tab_active_l.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/tab_active_r.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/tab_inactive.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/tab_inactive_l.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/itemtabs/tab_inactive_r.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/overviewbox_bg.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/overviewbox_cl.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/overviewbox_ex.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/overviewbox_header.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/searchbox_bg.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/searchbox_cl.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/searchbox_ex.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/searchbox_header.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/searchbox_header.jpg is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/usersbox_bg.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/usersbox_cl.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/usersbox_ex.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/summary/usersbox_header.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/.cvsignore is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/arrow16.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/arrow16_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/icon16_search.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/icon16_search_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/icon16_search_reset.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/icon16_search_reset_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_apply_rules.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_apply_rules_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_apply_rules_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_approve.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_approve_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_approve_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_ban_user.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_ban_user_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_ban_user_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_cancel.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_cancel_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_cancel_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_clear_selected.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_clear_selected_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_clear_selected_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_copy.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_copy_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_copy_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_cut.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_cut_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_cut_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_decline.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_decline_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_decline_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_delete.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_delete_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_delete_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_deny.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_deny_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_deny_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_disconnect.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_disconnect_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_disconnect_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_divider.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_e-mail.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_e-mail_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_e-mail_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_edit.gif is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/images/toolbar/tool_edit_f2.gif is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/images/toolbar/tool_edit_f3.gif is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/images/toolbar/tool_editcat.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_editcat_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_editcat_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_export.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_export_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_export_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_export_language.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_export_language_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_export_language_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_forum_new_custom.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_forum_new_custom_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_forum_new_custom_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_frontend_mail.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_frontend_mail_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_frontend_mail_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_homecat.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_homecat_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_homecat_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_import.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_import_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_import_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_import_language.gif is removed; release_1_3_1 revision 1.3
	+File in-portal/admin/images/toolbar/tool_import_language_f2.gif is removed; release_1_3_1 revision 1.3
	+File in-portal/admin/images/toolbar/tool_import_language_f3.gif is removed; release_1_3_1 revision 1.3
	+File in-portal/admin/images/toolbar/tool_move_down.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_move_down_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_move_down_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_move_up.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_move_up_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_move_up_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_cat.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_cat_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_cat_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_group.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_group_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_group_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_image.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_image_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_image_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_item.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_item_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_item_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_language.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_language_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_language_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_language_var.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_language_var_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_language_var_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_permission.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_permission_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_permission_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_relation.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_relation_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_relation_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_review.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_review_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_review_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_rule.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_rule_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_rule_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_template.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_template_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_template_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_theme.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_theme_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_theme_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_user.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_user_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_new_user_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_next.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_next_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_next_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_paste.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_paste_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_paste_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_prev.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_prev_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_prev_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_language.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_language_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_language_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_template.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_template_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_template_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_theme.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_theme_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_preview_theme_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_cat.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_cat_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_cat_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_group.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_group_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_group_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_image.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_image_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_image_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_language.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_language_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_language_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_theme.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_theme_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_theme_f3.gif is removed; release_1_3_1 revision 1.2
	+File in-portal/admin/images/toolbar/tool_primary_user_group.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_user_group_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_primary_user_group_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_print.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_print_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_print_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_rebuild_cache.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_rebuild_cache_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_refresh.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_refresh_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_refresh_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_rescan_themes.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_rescan_themes_f2.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/images/toolbar/tool_rescan_themes_f3.gif is removed; release_1_3_1 revision 1.1
	+File in-portal/admin/im

	Changes in phrases and events:



	Property changes on: branches/unlabeled/unlabeled-1.2.2/admin/install/upgrades/changelog_1_3_0.txt
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.2
	\ No newline at end of property
	+1.2.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (revision 7287)
	@@ -1,103 +1,103 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
	+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="base_styles" module="in-portal" icon="icon46_style"/>

	<!-- 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('css','<inp2:css_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('css','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('css', '<inp2:css_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('css', '<inp2:css_NextId/>');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBaseStyle" escape="1"/>',
	function() {
	set_hidden_field('remove_specials[selectors.base]',1);
	- std_new_item('selectors.base', 'stylesheets/base_style_edit')
	+ std_new_item('selectors.base', 'in-portal/stylesheets/base_style_edit')
	} ) );
	-
	+
	function edit()
	{
	set_hidden_field('remove_specials[selectors.base]',1);
	- std_edit_temp_item('selectors.base', 'stylesheets/base_style_edit');
	+ std_edit_temp_item('selectors.base', 'in-portal/stylesheets/base_style_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('selectors.base')
	} ) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
	set_hidden_field('remove_specials[selectors.base]',1);
	submit_event('selectors.base','OnMassClone');
	}
	) );
	-
	+
	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="css" function="IsSingle"/>
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	//a_toolbar.HideButton('sep2');
	- <inp2:m_else/>
	+ <inp2:m_else/>
	<inp2:m_if prefix="css" function="IsLast"/>
	a_toolbar.DisableButton('next');
	<inp2:m_endif/>
	<inp2:m_if prefix="css" function="IsFirst"/>
	a_toolbar.DisableButton('prev');
	<inp2:m_endif/>
	<inp2:m_endif/>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_block name="grid_description_td" />
	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/></td>
	<inp2:m_blockend />

	<inp2:m_ParseBlock name="grid" PrefixSpecial="selectors.base" IdField="SelectorId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
	<script type="text/javascript">
	Grids['selectors.base'].SetDependantToolbarButtons( new Array('edit','delete','clone') );
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.6
	\ No newline at end of property
	+1.6.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.6.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.6.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.6.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (revision 7287)
	@@ -1,103 +1,103 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
	+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="base_styles" module="in-portal" icon="icon46_style"/>

	<!-- 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('css','<inp2:css_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('css','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('css', '<inp2:css_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('css', '<inp2:css_NextId/>');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBaseStyle" escape="1"/>',
	function() {
	set_hidden_field('remove_specials[selectors.base]',1);
	- std_new_item('selectors.base', 'stylesheets/base_style_edit')
	+ std_new_item('selectors.base', 'in-portal/stylesheets/base_style_edit')
	} ) );
	-
	+
	function edit()
	{
	set_hidden_field('remove_specials[selectors.base]',1);
	- std_edit_temp_item('selectors.base', 'stylesheets/base_style_edit');
	+ std_edit_temp_item('selectors.base', 'in-portal/stylesheets/base_style_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('selectors.base')
	} ) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
	set_hidden_field('remove_specials[selectors.base]',1);
	submit_event('selectors.base','OnMassClone');
	}
	) );
	-
	+
	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="css" function="IsSingle"/>
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	//a_toolbar.HideButton('sep2');
	- <inp2:m_else/>
	+ <inp2:m_else/>
	<inp2:m_if prefix="css" function="IsLast"/>
	a_toolbar.DisableButton('next');
	<inp2:m_endif/>
	<inp2:m_if prefix="css" function="IsFirst"/>
	a_toolbar.DisableButton('prev');
	<inp2:m_endif/>
	<inp2:m_endif/>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_block name="grid_description_td" />
	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/></td>
	<inp2:m_blockend />

	<inp2:m_ParseBlock name="grid" PrefixSpecial="selectors.base" IdField="SelectorId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
	<script type="text/javascript">
	Grids['selectors.base'].SetDependantToolbarButtons( new Array('edit','delete','clone') );
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.6.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.6
	\ No newline at end of property
	+1.6.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php (revision 7287)
	@@ -1,510 +1,510 @@
	<?php

	class CategoriesTagProcessor extends kDBTagProcessor {

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

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

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

	function ItemIcon($params)
	{
	// only for categories, not structure
	if ($this->Prefix != 'c') {
	return parent::ItemIcon($params);
	}
	-
	+
	$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
	$status = $object->GetDBField('Status');
	if($status == 1)
	{
	$ret = $object->GetDBField('IsNew') ? 'icon16_cat_new.gif' : 'icon16_cat.gif';
	}
	else
	{
	$ret = $status ? 'icon16_cat_pending.gif' : 'icon16_cat_disabled.gif';
	}
	return $ret;
	}

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

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

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

	function RootCategoryName($params)
	{
	return $this->Application->ProcessParsedTag('m', 'RootCategoryName', $params);
	}

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

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

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

	function CategoryPath($params)
	{
	$module_name = getArrayValue($params, 'module') ? $params['module'] : 'In-Commerce';
	$module_category_id = $this->Application->findModule('Name', $module_name, 'RootCat');
	$module_item_id = $this->Application->GetVar($this->Application->findModule('Name', $module_name, 'Var').'_id');

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

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

	if ($params['cat_id'] == 0) {
	$block_params['current'] = 1;
	$block_params['cat_id'] = 0;
	$block_params['cat_name'] = $this->Application->ProcessParsedTag('m', 'RootCategoryName', $params);
	$block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock,render_as');
	return $this->Application->ParseBlock($block_params);
	}
	else {
	$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
	$navbar_field = $ml_formatter->LangFieldName('CachedNavBar');

	$id_field = $this->Application->getUnitOption($this->Prefix, 'IDField');
	$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
	$sql = 'SELECT '.$navbar_field.', ParentPath
	FROM '.$table_name.'
	WHERE '.$id_field.' = '.$params['cat_id'];
	$category_data = $this->Conn->GetRow($sql);
	$ret = '';
	if ($category_data) {
	$category_names = explode('&\|&', $category_data[$navbar_field]);
	$category_ids = explode('\|', substr($category_data['ParentPath'], 1, -1));

	// add "Home" category at beginning of path
	array_unshift($category_names, $this->Application->ProcessParsedTag('m', 'RootCategoryName', $params));
	array_unshift($category_ids, 0);

	foreach ($category_ids as $category_pos => $category_id) {
	$block_params['cat_id'] = $category_id;
	$block_params['cat_name'] = $category_names[$category_pos];
	$block_params['current'] = ($params['cat_id'] == $category_id) && !$module_item_id ? 1 : 0;
	$block_params['is_module_root'] = $category_id == $module_category_id ? 1 : 0;
	$block_params['name'] = $this->SelectParam($params, 'render_as,block');

	// which block to parse as current ?
	if ($category_id == 0) {
	$block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock,render_as,block');
	}

	if ($block_params['is_module_root'] == 1) { // module root
	$block_params['name'] = $this->SelectParam($params, 'module_root_render_as,block_module_root,rootmoduleblock,render_as,block');
	}

	if ($block_params['current'] == 1) { // current cat (label)
	$block_params['name'] = $this->SelectParam($params, 'current_render_as,block_current,currentblock,render_as,block');
	}

	$this->Application->SetVar($this->Prefix.'_id', $category_id);
	$ret .= $this->Application->ParseBlock($block_params, 1);
	}
	}

	return $ret;
	}
	}

	function CurrentCategoryName($params)
	{
	$cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List');
	$sql = 'SELECT '.$this->getTitleField().'
	FROM '.$cat_object->TableName.'
	WHERE CategoryId = '.$this->Application->GetVar('m_cat_id');
	return $this->Conn->GetOne($sql);
	}

	function getTitleField()
	{
	$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
	return $ml_formatter->LangFieldName('Name');
	}

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

	$params['pass_category'] = 1;

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

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


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

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

	if (isset($params['block_row_end'])) {
	$params['row_end_block'] = $params['block_row_end'];
	}
	return $this->PrintList2($params);
	}
	}

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

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

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

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

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

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

	$no_special = isset($params['no_special']) && $params['no_special'];
	if ($no_special) return $this->Special;

	if ($types.$except.$parent_cat_id == '') {
	return parent::BuildListSpecial($params);
	}

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

	function IsCurrent($params)
	{
	$object =& $this->getObject($params);
	if ($object->GetID() == $this->Application->GetVar('m_cat_id')) {
	return true;
	}
	else {
	return false;
	- }
	+ }
	}

	/**
	* Substitutes category in last template base on current category
	*
	* @param Array $params
	*/
	function UpdateLastTemplate($params)
	{
	$category_id = $this->Application->GetVar('m_cat_id');

	list($index_file, $env) = explode('\|', $this->Application->RecallVar('last_template'), 2);
	$this->Application->SetVar(ENV_VAR_NAME, str_replace('%5C', '\\', $env));
	$this->Application->HttpQuery->processQueryString();

	// update required fields
	$this->Application->SetVar('m_cat_id', $category_id);
	$this->Application->Session->SaveLastTemplate($params['template']);
	}

	function GetParentCategory($params)
	{
	$parent_id = 0;
	$id_field = $this->Application->getUnitOption($this->Prefix, 'IDField');
	$table = $this->Application->getUnitOption($this->Prefix,'TableName');
	$cat_id = $this->Application->GetVar('m_cat_id');
	if ($cat_id > 0) {
	$sql = 'SELECT ParentId
	FROM '.$table.'
	WHERE '.$id_field.' = '.$cat_id;
	$parent_id = $this->Conn->GetOne($sql);
	}
	return $parent_id;
	}

	function InitCacheUpdater($params)
	{
	safeDefine('CACHE_PERM_CHUNK_SIZE', 30);

	$continue = $this->Application->GetVar('continue');
	$total_cats = (int) $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Category');

	if ($continue === false && $total_cats > CACHE_PERM_CHUNK_SIZE) {
	// first step, if category count > CACHE_PERM_CHUNK_SIZE, then ask for cache update
	return true;
	}

	if ($continue === false) {
	// if we don't have to ask, then assume user selected "Yes" in permcache update dialog
	$continue = 1;
	}

	$updater =& $this->Application->recallObject('kPermCacheUpdater', null, Array('continue' => $continue));
	if ($continue === '0') { // No in dialog
	$updater->clearData();
	$this->Application->Redirect($params['destination_template']);
	}

	$ret = false; // don't ask for update
	if ($continue == 1) { // Initial run
	$updater->setData();
	}
	if ($continue == 2) { // Continuing
	// called from AJAX request => returns percent
	$needs_more = true;
	while ($needs_more && $updater->iteration <= CACHE_PERM_CHUNK_SIZE) {
	// until proceeeded in this step category count exceeds category per step limit
	$needs_more = $updater->DoTheJob();
	}

	if ($needs_more) {
	// still some categories are left for next step
	$updater->setData();
	}
	else {
	// all done -> redirect
	$updater->clearData();
	$this->Application->RemoveVar('PermCache_UpdateRequired');
	$this->Application->Redirect($params['destination_template']);
	}

	$ret = $updater->getDonePercent();
	}
	return $ret;
	}

	/**
	* Parses warning block, but with style="display: none;". Used during permissions saving from AJAX
	*
	* @param Array $params
	* @return string
	*/
	function SaveWarning($params)
	{
	if ($this->Prefix != 'c') {
	// don't use this method for other prefixes then Category, that use this tag processor
	parent::SaveWarning($params);
	return ;
	}
	-
	+
	$main_prefix = getArrayValue($params, 'main_prefix');
	if ($main_prefix && $main_prefix != '$main_prefix') {
	$top_prefix = $main_prefix;
	}
	else {
	$top_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
	}

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

	if (!$temp_tables) {
	$this->Application->RemoveVar($top_prefix.'_modified');
	return '';
	}

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

	/**
	* Allows to detect if this prefix has something in clipboard
	*
	* @param Array $params
	* @return bool
	*/
	function HasClipboard($params)
	{
	$clipboard = $this->Application->RecallVar('clipboard');
	if ($clipboard) {
	$clipboard = unserialize($clipboard);
	foreach ($clipboard as $prefix => $clipboard_data) {
	foreach ($clipboard_data as $mode => $ids) {
	if (count($ids)) return 1;
	}
	}
	}
	return 0;
	}

	/**
	* Allows to detect if root category being edited
	*
	* @param Array $params
	*/
	function IsRootCategory($params)
	{
	$object =& $this->getObject($params);
	return $object->IsRoot();
	}

	function CatalogItemCount($params)
	{
	$object =& $this->GetList($params);
	if (!$object->Counted) {
	$object->CountRecs();
	}
	return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount;
	}

	/**
	* Print grid pagination using
	* block names specified
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function PrintPages($params)
	{
	if ($this->Application->Parser->GetParam('no_special')) {
	$params['no_special'] = $this->Application->Parser->GetParam('no_special');
	}
	return parent::PrintPages($params);
	}

	function InitCatalog($params)
	{
	$tab_prefixes = $this->Application->GetVar('tp'); // {all, <prefixes_list>, none}
	if ($tab_prefixes === false) $tab_prefixes = 'all';
	$skip_prefixes = isset($params['skip_prefixes']) && $params['skip_prefixes'] ? explode(',', $params['skip_prefixes']) : Array();

	// get all prefixes available
	$prefixes = Array();
	foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
	if ($module_data['Var'] == 'm') continue;
	$prefixes[] = $module_data['Var'];
	}

	if ($tab_prefixes == 'none') {
	$skip_prefixes = array_unique(array_merge($skip_prefixes, $prefixes));
	}
	elseif ($tab_prefixes != 'all') {
	// prefix list here
	$tab_prefixes = explode(',', $tab_prefixes); // list of prefixes that should stay
	$skip_prefixes = array_unique(array_merge($skip_prefixes, array_diff($prefixes, $tab_prefixes)));
	}

	$params['name'] = $params['render_as'];
	$params['skip_prefixes'] = implode(',', $skip_prefixes);
	return $this->Application->ParseBlock($params, 1);
	}
	}


	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.31.2.3
	\ No newline at end of property
	+1.31.2.4
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.73.2/admin/install/inportal_data.sql
	===================================================================
	--- branches/unlabeled/unlabeled-1.73.2/admin/install/inportal_data.sql (revision 7286)
	+++ branches/unlabeled/unlabeled-1.73.2/admin/install/inportal_data.sql (revision 7287)
	@@ -1,229 +1,229 @@
	INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category');
	INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');

	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.DELETE', 'lu_PermName_Category.Delete_desc', 'lu_PermName_Category.Delete_error', 'In-Portal');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.ADD.PENDING', 'lu_PermName_Category.AddPending_desc', 'lu_PermName_Category.AddPending_error', 'In-Portal');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('CATEGORY.MODIFY', 'lu_PermName_Category.Modify_desc', 'lu_PermName_Category.Modify_error', 'In-Portal');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('ADMIN', 'lu_PermName_Admin_desc', 'lu_PermName_Admin_error', 'Admin');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('LOGIN', 'lu_PermName_Login_desc', 'lu_PermName_Admin_error', 'Front');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('DEBUG.ITEM', 'lu_PermName_Debug.Item_desc', '', 'Admin');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('DEBUG.LIST', 'lu_PermName_Debug.List_desc', '', 'Admin');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('DEBUG.INFO', 'lu_PermName_Debug.Info_desc', '', 'Admin');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('PROFILE.MODIFY', 'lu_PermName_Profile.Modify_desc', '', 'Admin');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('SHOWLANG', 'lu_PermName_ShowLang_desc', '', 'Admin');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('FAVORITES', 'lu_PermName_favorites_desc', 'lu_PermName_favorites_error', 'In-Portal');
	INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin');

	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('LOGIN', 12, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.VIEW', 11, 1, 0, 0);

	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:site.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:browse.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:advanced_view.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:reviews.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_categories.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_categories.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_search.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_search.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_email.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_email.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.add', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configuration_custom.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:users.view', 11, 1, 1, 0);

	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_list.advanced:ban', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_list.advanced:send_email', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.add', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.advanced:send_email', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_groups.advanced:manage_permissions', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_users.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_users.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_email.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_email.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.add', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_custom.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.add', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:user_banlist.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:reports.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:log_summary.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:searchlog.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:searchlog.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sessionlog.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sessionlog.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:emaillog.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:emaillog.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:visits.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:visits.delete', 11, 1, 1, 0);

	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_general.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_general.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:modules.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.advanced:approve', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:mod_status.advanced:decline', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:addmodule.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:addmodule.add', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:addmodule.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:tag_library.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.add', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_themes.delete', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.add', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_styles.delete', 11, 1, 1, 0);

	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_lang.advanced:set_primary', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_lang.advanced:import', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:configure_lang.advanced:export', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:tools.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:backup.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:restore.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:export.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:main_import.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sql_query.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:sql_query.edit', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:server_info.view', 11, 1, 1, 0);
	INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:help.view', 11, 1, 1, 0);

	INSERT INTO SearchConfig VALUES ('Category', 'NewItem', 0, 1, 'lu_fielddesc_category_newitem', 'lu_field_newitem', 'In-Portal', 'la_text_category', 18, 80, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'PopItem', 0, 1, 'lu_fielddesc_category_popitem', 'lu_field_popitem', 'In-Portal', 'la_text_category', 19, 81, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'HotItem', 0, 1, 'lu_fielddesc_category_hotitem', 'lu_field_hotitem', 'In-Portal', 'la_text_category', 17, 79, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'MetaDescription', 0, 1, 'lu_fielddesc_category_metadescription', 'lu_field_metadescription', 'In-Portal', 'la_text_category', 16, 78, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'ParentPath', 0, 1, 'lu_fielddesc_category_parentpath', 'lu_field_parentpath', 'In-Portal', 'la_text_category', 15, 77, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'ResourceId', 0, 1, 'lu_fielddesc_category_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_category', 14, 76, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'CreatedById', 0, 1, 'lu_fielddesc_category_createdbyid', 'lu_field_createdbyid', 'In-Portal', 'la_text_category', 13, 75, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'CachedNavbar', 0, 1, 'lu_fielddesc_category_cachednavbar', 'lu_field_cachednavbar', 'In-Portal', 'la_text_category', 12, 74, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'CachedDescendantCatsQty', 0, 1, 'lu_fielddesc_category_cacheddescendantcatsqty', 'lu_field_cacheddescendantcatsqty', 'In-Portal', 'la_text_category', 11, 73, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'MetaKeywords', 0, 1, 'lu_fielddesc_category_metakeywords', 'lu_field_metakeywords', 'In-Portal', 'la_text_category', 10, 72, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'Priority', 0, 1, 'lu_fielddesc_category_priority', 'lu_field_priority', 'In-Portal', 'la_text_category', 9, 71, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'Status', 0, 1, 'lu_fielddesc_category_status', 'lu_field_status', 'In-Portal', 'la_text_category', 7, 69, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'EditorsPick', 0, 1, 'lu_fielddesc_category_editorspick', 'lu_field_editorspick', 'In-Portal', 'la_text_category', 6, 68, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'CreatedOn', 0, 1, 'lu_fielddesc_category_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_category', 5, 67, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'Description', 1, 1, 'lu_fielddesc_category_description', 'lu_field_description', 'In-Portal', 'la_text_category', 4, 66, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'Name', 1, 1, 'lu_fielddesc_category_name', 'lu_field_name', 'In-Portal', 'la_text_category', 3, 65, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'ParentId', 0, 1, 'lu_fielddesc_category_parentid', 'lu_field_parentid', 'In-Portal', 'la_text_category', 2, 64, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'CategoryId', 0, 1, 'lu_fielddesc_category_categoryid', 'lu_field_categoryid', 'In-Portal', 'la_text_category', 0, 62, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'Modified', 0, 1, 'lu_fielddesc_category_modified', 'lu_field_modified', 'In-Portal', 'la_text_category', 20, 82, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('Category', 'ModifiedById', 0, 1, 'lu_fielddesc_category_modifiedbyid', 'lu_field_modifiedbyid', 'In-Portal', 'la_text_category', 21, 83, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);

	INSERT INTO SearchConfig VALUES ('PortalUser', 'PortalUserId', -1, 0, 'lu_fielddesc_user_portaluserid', 'lu_field_portaluserid', 'In-Portal', 'la_text_user', 0, 173, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Login', -1, 0, 'lu_fielddesc_user_login', 'lu_field_login', 'In-Portal', 'la_text_user', 1, 174, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Password', -1, 0, 'lu_fielddesc_user_password', 'lu_field_password', 'In-Portal', 'la_text_user', 2, 175, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'tz', -1, 0, 'lu_fielddesc_user_tz', 'lu_field_tz', 'In-Portal', 'la_text_user', 17, 190, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'dob', -1, 0, 'lu_fielddesc_user_dob', 'lu_field_dob', 'In-Portal', 'la_text_user', 16, 189, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Modified', -1, 0, 'lu_fielddesc_user_modified', 'lu_field_modified', 'In-Portal', 'la_text_user', 15, 188, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Status', -1, 0, 'lu_fielddesc_user_status', 'lu_field_status', 'In-Portal', 'la_text_user', 14, 187, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'ResourceId', -1, 0, 'lu_fielddesc_user_resourceid', 'lu_field_resourceid', 'In-Portal', 'la_text_user', 13, 186, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Country', -1, 0, 'lu_fielddesc_user_country', 'lu_field_country', 'In-Portal', 'la_text_user', 12, 185, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Zip', -1, 0, 'lu_fielddesc_user_zip', 'lu_field_zip', 'In-Portal', 'la_text_user', 11, 184, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'State', -1, 0, 'lu_fielddesc_user_state', 'lu_field_state', 'In-Portal', 'la_text_user', 10, 183, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'City', -1, 0, 'lu_fielddesc_user_city', 'lu_field_city', 'In-Portal', 'la_text_user', 9, 182, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Street', -1, 0, 'lu_fielddesc_user_street', 'lu_field_street', 'In-Portal', 'la_text_user', 8, 181, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Phone', -1, 0, 'lu_fielddesc_user_phone', 'lu_field_phone', 'In-Portal', 'la_text_user', 7, 180, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'CreatedOn', -1, 0, 'lu_fielddesc_user_createdon', 'lu_field_createdon', 'In-Portal', 'la_text_user', 6, 179, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'Email', -1, 0, 'lu_fielddesc_user_email', 'lu_field_email', 'In-Portal', 'la_text_user', 5, 178, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'LastName', -1, 0, 'lu_fielddesc_user_lastname', 'lu_field_lastname', 'In-Portal', 'la_text_user', 4, 177, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
	INSERT INTO SearchConfig VALUES ('PortalUser', 'FirstName', -1, 0, 'lu_fielddesc_user_firstname', 'lu_field_firstname', 'In-Portal', 'la_text_user', 3, 176, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);

	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT count(*) FROM <%prefix%>Category WHERE Status=1 ', NULL, 'la_prompt_ActiveCategories', '0', '1');
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT count(*) FROM <%prefix%>PortalUser WHERE Status=1 ', NULL, 'la_prompt_ActiveUsers', '0', '1');
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT count(*) FROM <%prefix%>UserSession', NULL, 'la_prompt_CurrentSessions', '0', '1');
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) as CategoryCount FROM <%prefix%>Category', NULL, 'la_prompt_TotalCategories', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS ActiveCategories FROM <%prefix%>Category WHERE Status = 1', NULL, 'la_prompt_ActiveCategories', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS PendingCategories FROM <%prefix%>Category WHERE Status = 2', NULL, 'la_prompt_PendingCategories', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS DisabledCategories FROM <%prefix%>Category WHERE Status = 0', NULL, 'la_prompt_DisabledCategories', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT() AS NewCategories FROM <%prefix%>Category WHERE (NewItem = 1) OR ( (UNIX_TIMESTAMP() - CreatedOn) <= <%m:config name="Category_DaysNew"%>86400 AND (NewItem = 2) )', NULL, 'la_prompt_NewCategories', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) FROM <%prefix%>Category WHERE EditorsPick = 1', NULL, 'la_prompt_CategoryEditorsPick', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>Category', NULL, 'la_prompt_NewestCategoryDate', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT <%m:post_format field="MAX(Modified)" type="date"%> FROM <%prefix%>Category', NULL, 'la_prompt_LastCategoryUpdate', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS TotalUsers FROM <%prefix%>PortalUser', NULL, 'la_prompt_TopicsUsers', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS ActiveUsers FROM <%prefix%>PortalUser WHERE Status = 1', NULL, 'la_prompt_UsersActive', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS PendingUsers FROM <%prefix%>PortalUser WHERE Status = 2', NULL, 'la_prompt_UsersPending', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS DisabledUsers FROM <%prefix%>PortalUser WHERE Status = 0', NULL, 'la_prompt_UsersDisabled', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>PortalUser', NULL, 'la_prompt_NewestUserDate', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( Country ) ) FROM <%prefix%>PortalUser WHERE LENGTH(Country) > 0', NULL, 'la_prompt_UsersUniqueCountries', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT( DISTINCT LOWER( State ) ) FROM <%prefix%>PortalUser WHERE LENGTH(State) > 0', NULL, 'la_prompt_UsersUniqueStates', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS TotalUserGroups FROM <%prefix%>PortalGroup', NULL, 'la_prompt_TotalUserGroups', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS BannedUsers FROM <%prefix%>PortalUser WHERE IsBanned = 1', NULL, 'la_prompt_BannedUsers', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS NonExipedSessions FROM <%prefix%>UserSession WHERE Status = 1', NULL, 'la_prompt_NonExpiredSessions', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS ThemeCount FROM <%prefix%>Theme', NULL, 'la_prompt_ThemeCount', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', 'SELECT COUNT(*) AS RegionsCount FROM <%prefix%>Language', NULL, 'la_prompt_RegionsCount', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:sql_action sql="SHOW+TABLES" action="COUNT" field="*"%>', NULL, 'la_prompt_TablesCount', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:sql_action sql="SHOW+TABLE+STATUS" action="SUM" field="Rows"%>', NULL, 'la_prompt_RecordsCount', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:custom_action sql="empty" action="SysFileSize"%>', NULL, 'la_prompt_SystemFileSize', 0, 2);
	INSERT INTO StatItem VALUES (0, 'In-Portal', '<%m:sql_action sql="SHOW+TABLE+STATUS" action="SUM" format_as="file" field="Data_length"%>', NULL, 'la_prompt_DataSize', 0, 2);

	INSERT INTO StylesheetSelectors VALUES (169, 8, 'Calendar''s selected days', '.calendar tbody .selected', 'a:0:{}', '', 1, 'font-weight: bold;\r\nbackground-color: #9ED7ED;\r\nborder: 1px solid #83B2C5;', 0);
	INSERT INTO StylesheetSelectors VALUES (118, 8, 'Data grid row', 'td.block-data-row', 'a:0:{}', '', 2, 'border-bottom: 1px solid #cccccc;', 48);
	INSERT INTO StylesheetSelectors VALUES (81, 8, '"More" link', 'a.link-more', 'a:0:{}', '', 2, 'text-decoration: underline;', 64);
	INSERT INTO StylesheetSelectors VALUES (88, 8, 'Block data, separated rows', 'td.block-data-grid', 'a:0:{}', '', 2, 'border: 1px solid #cccccc;', 48);
	INSERT INTO StylesheetSelectors VALUES (42, 8, 'Block Header', 'td.block-header', 'a:4:{s:5:"color";s:16:"rgb(0, 159, 240)";s:9:"font-size";s:4:"20px";s:11:"font-weight";s:6:"normal";s:7:"padding";s:3:"5px";}', 'Block Header', 1, 'font-family: Verdana, Helvetica, sans-serif;', 0);
	INSERT INTO StylesheetSelectors VALUES (76, 8, 'Navigation bar menu', 'tr.head-nav td', 'a:0:{}', '', 1, 'vertical-align: middle;', 0);
	INSERT INTO StylesheetSelectors VALUES (48, 8, 'Block data', 'td.block-data', 'a:2:{s:9:"font-size";s:5:"12px;";s:7:"padding";s:3:"5px";}', '', 1, '', 0);
	INSERT INTO StylesheetSelectors VALUES (78, 8, 'Body main style', 'body', 'a:0:{}', '', 1, 'padding: 0px; \r\nbackground-color: #ffffff; \r\nfont-family: arial, verdana, helvetica; \r\nfont-size: small;\r\nwidth: auto;\r\nmargin: 0px;', 0);
	INSERT INTO StylesheetSelectors VALUES (58, 8, 'Main table', 'table.main-table', 'a:0:{}', '', 1, 'width: 770px;\r\nmargin: 0px;\r\n/table-layout: fixed;/', 0);
	INSERT INTO StylesheetSelectors VALUES (79, 8, 'Block: header of data block', 'span.block-data-grid-header', 'a:0:{}', '', 1, 'font-family: Arial, Helvetica, sans-serif;\r\ncolor: #009DF6;\r\nfont-size: 12px;\r\nfont-weight: bold;\r\nbackground-color: #E6EEFF;\r\npadding: 6px;\r\nwhite-space: nowrap;', 0);
	INSERT INTO StylesheetSelectors VALUES (64, 8, 'Link', 'a', 'a:0:{}', '', 1, '', 0);
	INSERT INTO StylesheetSelectors VALUES (46, 8, 'Product title link', 'a.link-product1', 'a:0:{}', 'Product title link', 1, 'color: #62A1DE;\r\nfont-size: 14px;\r\nfont-weight: bold;\r\nline-height: 20px;\r\npadding-bottom: 10px;', 0);
	INSERT INTO StylesheetSelectors VALUES (75, 8, 'Copy of Main path link', 'table.main-path td a:hover', 'a:0:{}', '', 1, 'color: #ffffff;', 0);
	INSERT INTO StylesheetSelectors VALUES (160, 8, 'Current item in navigation bar', '.checkout-step-current', 'a:0:{}', '', 1, 'color: #A20303;\r\nfont-weight: bold;', 0);
	INSERT INTO StylesheetSelectors VALUES (51, 8, 'Right block data', 'td.right-block-data', 'a:1:{s:9:"font-size";s:4:"11px";}', '', 2, 'padding: 7px;\r\nbackground: #e3edf6 url("/in-commerce4/themes/default/img/bgr_login.jpg") repeat-y scroll left top;\r\nborder-bottom: 1px solid #64a1df;', 48);
	INSERT INTO StylesheetSelectors VALUES (67, 8, 'Pagination bar: text', 'table.block-pagination td', 'a:3:{s:5:"color";s:7:"#8B898B";s:9:"font-size";s:4:"12px";s:11:"font-weight";s:6:"normal";}', '', 1, '', 0);
	INSERT INTO StylesheetSelectors VALUES (45, 8, 'Category link', 'a.subcat', 'a:0:{}', 'Category link', 1, 'color: #2069A4', 0);
	INSERT INTO StylesheetSelectors VALUES (68, 8, 'Pagination bar: link', 'table.block-pagination td a', 'a:3:{s:5:"color";s:7:"#8B898B";s:9:"font-size";s:5:"12px;";s:11:"font-weight";s:6:"normal";}', '', 1, '', 0);
	INSERT INTO StylesheetSelectors VALUES (69, 8, 'Product description in product list', '.product-list-description', 'a:2:{s:5:"color";s:7:"#8B898B";s:9:"font-size";s:4:"12px";}', '', 1, '', 0);
	INSERT INTO StylesheetSelectors VALUES (73, 8, 'Main path link', 'table.main-path td a', 'a:0:{}', '', 1, 'color: #d5e231;', 0);
	INSERT INTO StylesheetSelectors VALUES (83, 8, 'Product title link in list (shopping cart)', 'a.link-product-cart', 'a:0:{}', 'Product title link', 1, 'color: #18559C;\r\nfont-size: 12px;\r\nfont-weight: bold;\r\ntext-decoration: none;\r\n\r\n', 0);
	INSERT INTO StylesheetSelectors VALUES (72, 8, 'Main path block text', 'table.main-path td', 'a:0:{}', '', 1, 'color: #ffffff;\r\nfont-size: 10px;\r\nfont-weight: normal;\r\npadding: 1px;\r\n', 0);
	INSERT INTO StylesheetSelectors VALUES (61, 8, 'Block: header of data table', 'td.block-data-grid-header', 'a:6:{s:4:"font";s:28:"Arial, Helvetica, sans-serif";s:5:"color";s:7:"#009DF6";s:9:"font-size";s:4:"12px";s:11:"font-weight";s:4:"bold";s:16:"background-color";s:7:"#E6EEFF";s:7:"padding";s:3:"6px";}', '', 1, 'white-space: nowrap;\r\npadding-left: 10px;\r\n/\r\nbackground-image: url(/in-commerce4/themes/default/img/bullet1.gif);\r\nbackground-position: 10px 12px;\r\nbackground-repeat: no-repeat;\r\n/', 0);
	INSERT INTO StylesheetSelectors VALUES (65, 8, 'Link in product list additional row', 'td.product-list-additional a', 'a:1:{s:5:"color";s:7:"#8B898B";}', '', 2, '', 64);
	INSERT INTO StylesheetSelectors VALUES (55, 8, 'Main table, left column', 'td.main-column-left', 'a:0:{}', '', 1, 'width:180px;\r\nborder: 1px solid #62A1DE;\r\nborder-top: 0px;', 0);
	INSERT INTO StylesheetSelectors VALUES (70, 8, 'Product title link in list (category)', 'a.link-product-category', 'a:0:{}', 'Product title link', 1, 'color: #18559C;\r\nfont-size: 12px;\r\nfont-weight: bold;\r\ntext-decoration: none;\r\n\r\n', 0);
	INSERT INTO StylesheetSelectors VALUES (66, 8, 'Pagination bar block', 'table.block-pagination', 'a:0:{}', '', 1, '', 0);
	INSERT INTO StylesheetSelectors VALUES (49, 8, 'Bulleted list inside block', 'td.block-data ul li', 'a:0:{}', '', 1, ' list-style-image: url(/in-commerce4/themes/default/img/bullet2.gif);\r\n margin-bottom: 10px;\r\n font-size: 11px;', 0);
	INSERT INTO StylesheetSelectors VALUES (87, 8, 'Cart item input form element', 'td.cart-item-atributes input', 'a:0:{}', '', 1, 'border: 1px solid #7BB2E6;', 0);
	INSERT INTO StylesheetSelectors VALUES (119, 8, 'Data grid row header', 'td.block-data-row-hdr', 'a:0:{}', 'Used in order preview', 2, 'background-color: #eeeeee;\r\nborder-bottom: 1px solid #dddddd;\r\nborder-top: 1px solid #cccccc;\r\nfont-weight: bold;', 48);
	INSERT INTO StylesheetSelectors VALUES (82, 8, '"More" link image', 'a.link-more img', 'a:0:{}', '', 2, 'text-decoration: none;\r\npadding-left: 5px;', 64);
	INSERT INTO StylesheetSelectors VALUES (63, 8, 'Additional info under product description in list', 'td.product-list-additional', 'a:5:{s:5:"color";s:7:"#8B898B";s:9:"font-size";s:4:"11px";s:11:"font-weight";s:6:"normal";s:10:"border-top";s:18:"1px dashed #8B898B";s:13:"border-bottom";s:18:"1px dashed #8B898B";}', '', 2, '', 48);
	INSERT INTO StylesheetSelectors VALUES (43, 8, 'Block', 'table.block', 'a:2:{s:16:"background-color";s:7:"#E3EEF9";s:6:"border";s:17:"1px solid #64A1DF";}', 'Block', 1, 'border: 0; \r\nmargin-bottom: 1px;\r\nwidth: 100%;', 0);
	INSERT INTO StylesheetSelectors VALUES (84, 8, 'Cart item cell', 'td.cart-item', 'a:0:{}', '', 1, 'background-color: #F6FAFF;\r\nborder-left: 1px solid #ffffff;\r\nborder-bottom: 1px solid #ffffff;\r\npadding: 4px;', 0);
	INSERT INTO StylesheetSelectors VALUES (57, 8, 'Main table, right column', 'td.main-column-right', 'a:0:{}', '', 1, 'width:220px;\r\nborder: 1px solid #62A1DE;\r\nborder-top: 0px;', 0);
	INSERT INTO StylesheetSelectors VALUES (161, 8, 'Block for sub categories', 'td.block-data-subcats', 'a:0:{}', '', 2, ' background: #FFFFFF\r\nurl(/in-commerce4/themes/default/in-commerce/img/bgr_categories.jpg);\r\n background-repeat: no-repeat;\r\n background-position: top right;\r\nborder-bottom: 5px solid #DEEAFF;\r\npadding-left: 10px;', 48);
	INSERT INTO StylesheetSelectors VALUES (77, 8, 'Left block header', 'td.left-block-header', 'a:0:{}', '', 2, 'font-family : verdana, helvetica, sans-serif;\r\ncolor : #ffffff;\r\nfont-size : 12px;\r\nfont-weight : bold;\r\ntext-decoration : none;\r\nbackground-color: #64a1df;\r\npadding: 5px;\r\npadding-left: 7px;', 42);
	INSERT INTO StylesheetSelectors VALUES (80, 8, 'Right block data - text', 'td.right-block-data td', 'a:1:{s:9:"font-size";s:5:"11px;";}', '', 2, '', 48);
	INSERT INTO StylesheetSelectors VALUES (53, 8, 'Right block header', 'td.right-block-header', 'a:0:{}', '', 2, 'font-family : verdana, helvetica, sans-serif;\r\ncolor : #ffffff;\r\nfont-size : 12px;\r\nfont-weight : bold;\r\ntext-decoration : none;\r\nbackground-color: #64a1df;\r\npadding: 5px;\r\npadding-left: 7px;', 42);
	INSERT INTO StylesheetSelectors VALUES (85, 8, 'Cart item cell with attributes', 'td.cart-item-attributes', 'a:0:{}', '', 1, 'background-color: #E6EEFF;\r\nborder-left: 1px solid #ffffff;\r\nborder-bottom: 1px solid #ffffff;\r\npadding: 4px;\r\ntext-align: center;\r\nvertical-align: middle;\r\nfont-size: 12px;\r\nfont-weight: normal;', 0);
	INSERT INTO StylesheetSelectors VALUES (86, 8, 'Cart item cell with name', 'td.cart-item-name', 'a:0:{}', '', 1, 'background-color: #F6FAFF;\r\nborder-left: 1px solid #ffffff;\r\nborder-bottom: 1px solid #ffffff;\r\npadding: 3px;', 0);
	INSERT INTO StylesheetSelectors VALUES (47, 8, 'Block content of featured product', 'td.featured-block-data', 'a:0:{}', '', 1, 'font-family: Arial,Helvetica,sans-serif;\r\nfont-size: 12px;', 0);
	INSERT INTO StylesheetSelectors VALUES (56, 8, 'Main table, middle column', 'td.main-column-center', 'a:0:{}', '', 1, '\r\n', 0);
	INSERT INTO StylesheetSelectors VALUES (50, 8, 'Product title link in list', 'a.link-product2', 'a:0:{}', 'Product title link', 1, 'color: #62A1DE;\r\nfont-size: 12px;\r\nfont-weight: bold;\r\ntext-decoration: none;\r\n\r\n', 0);
	INSERT INTO StylesheetSelectors VALUES (71, 8, 'Main path block', 'table.main-path', 'a:0:{}', '', 1, 'background: #61b0ec url("/in-commerce4/themes/default/img/bgr_path.jpg") repeat-y scroll left top;\r\nwidth: 100%;\r\nmargin-bottom: 1px;\r\nmargin-right: 1px; \r\nmargin-left: 1px;', 0);
	INSERT INTO StylesheetSelectors VALUES (62, 8, 'Block: columns header for data table', 'table.block-no-border th', 'a:6:{s:4:"font";s:28:"Arial, Helvetica, sans-serif";s:5:"color";s:7:"#18559C";s:9:"font-size";s:4:"11px";s:11:"font-weight";s:4:"bold";s:16:"background-color";s:7:"#B4D2EE";s:7:"padding";s:3:"6px";}', '', 1, 'text-align: left;', 0);
	INSERT INTO StylesheetSelectors VALUES (59, 8, 'Block without border', 'table.block-no-border', 'a:0:{}', '', 1, 'border: 0px; \r\nmargin-bottom: 10px;\r\nwidth: 100%;', 0);
	INSERT INTO StylesheetSelectors VALUES (74, 8, 'Main path language selector cell', 'td.main-path-language', 'a:0:{}', '', 1, 'vertical-align: middle;\r\ntext-align: right;\r\npadding-right: 6px;', 0);
	INSERT INTO StylesheetSelectors VALUES (171, 8, 'Calendar''s highlighted day', '.calendar tbody .hilite', 'a:0:{}', '', 1, 'background-color: #f6f6f6;\r\nborder: 1px solid #83B2C5 !important;', 0);
	INSERT INTO StylesheetSelectors VALUES (175, 8, 'Calendar''s days', '.calendar tbody .day', 'a:0:{}', '', 1, 'text-align: right;\r\npadding: 2px 4px 2px 2px;\r\nwidth: 2em;\r\nborder: 1px solid #fefefe;', 0);
	INSERT INTO StylesheetSelectors VALUES (170, 8, 'Calendar''s weekends', '.calendar .weekend', 'a:0:{}', '', 1, 'color: #990000;', 0);
	INSERT INTO StylesheetSelectors VALUES (173, 8, 'Calendar''s control buttons', '.calendar .calendar_button', 'a:0:{}', '', 1, 'color: black;\r\nfont-size: 12px;\r\nbackground-color: #eeeeee;', 0);
	INSERT INTO StylesheetSelectors VALUES (174, 8, 'Calendar''s day names', '.calendar thead .name', 'a:0:{}', '', 1, 'background-color: #DEEEF6;\r\nborder-bottom: 1px solid #000000;', 0);
	INSERT INTO StylesheetSelectors VALUES (172, 8, 'Calendar''s top and bottom titles', '.calendar .title', 'a:0:{}', '', 1, 'color: #FFFFFF;\r\nbackground-color: #62A1DE;\r\nborder: 1px solid #107DC5;\r\nborder-top: 0px;\r\npadding: 1px;', 0);
	INSERT INTO StylesheetSelectors VALUES (60, 8, 'Block header for featured product', 'td.featured-block-header', 'a:0:{}', '', 2, '\r\n', 42);
	INSERT INTO StylesheetSelectors VALUES (54, 8, 'Right block', 'table.right-block', 'a:0:{}', '', 2, 'background-color: #E3EEF9;\r\nborder: 0px;\r\nwidth: 100%;', 43);
	INSERT INTO StylesheetSelectors VALUES (44, 8, 'Block content', 'td.block-data-big', 'a:0:{}', 'Block content', 1, ' background: #DEEEF6\r\nurl(/in-commerce4/themes/default/img/menu_bg.gif);\r\n background-repeat: no-repeat;\r\n background-position: top right;\r\n', 0);

	INSERT INTO Stylesheets VALUES (8, 'Default', 'In-Portal Default Theme', '', 1124952555, 1);

	-INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.3.2', 1, 0, '', 0, '1054738405');
	\ No newline at end of file
	+INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.4.0', 1, 0, '', 0, '1054738405');
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.73.2/admin/install/inportal_data.sql
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.73.2.4
	\ No newline at end of property
	+1.73.2.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.124.2/kernel/action.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.124.2/kernel/action.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.124.2/kernel/action.php (revision 7287)
	@@ -1,2060 +1,2066 @@
	<?php

	$ro_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");
	-
	+
	// ====== Debugger related: begin ======
	$script = basename($_SERVER['PHP_SELF']);
	$skipDebug = Array('index.php', 'credits.php');
	if (admin_login() && !in_array($script, $skipDebug)) {
	if (IsDebugMode() && $Action) {
	$debugger->setHTMLByIndex(1, 'Kernel Action: <b>'.$Action.'</b>', 'append');
	}
	}
	unset($script, $skipDebug);
	// ====== Debugger related: end ======

	require_login( !admin_login() && $Action, 'expired=1', true );

	// permission checking: begin
	$action_mapping = Array(
	'm_add_user' => 'in-portal:user_list.add',
	'm_edit_user' => 'in-portal:user_list.edit',
	'm_delete_user' => 'in-portal:user_list.delete',
	'm_user_primarygroup' => 'in-portal:user_list.add\|in-portal:user_list.edit',
	'm_approve_user' => 'in-portal:user_list.add\|in-portal:user_list.edit',
	'm_deny_user' => 'in-portal:user_list.add\|in-portal:user_list.edit',
	'm_clear_searchlog' => 'in-portal:searchlog.delete',
	'm_keyword_reset' => 'in-portal:searchlog.delete',
	'm_themes_rescan' => 'in-portal:configure_themes.add\|in-portal:configure_themes.edit',
	'm_theme_primary' => 'in-portal:configure_themes.add\|in-portal:configure_themes.edit',
	'm_theme_add' => 'in-portal:configure_themes.add',
	'm_theme_edit' => 'in-portal:configure_themes.edit',
	'm_theme_delete' => 'in-portal:configure_themes.delete',
	'm_sql_query' => 'in-portal:sql_query.edit',
	'm_purge_email_log' => 'in-portal:emaillog.delete',
	'm_session_delete' => 'in-portal:sessionlog.delete',
	'm_add_rule' => 'in-portal:user_banlist.add',
	'm_edit_rule' => 'in-portal:user_banlist.edit',
	'm_rule_move_up' => 'in-portal:user_banlist.add\|in-portal:user_banlist.edit',
	'm_rule_move_down' => 'in-portal:user_banlist.add\|in-portal:user_banlist.edit',
	'm_rule_delete' => 'in-portal:user_banlist.delete',
	'm_ban_user' => 'in-portal:user_list.add\|in-portal:user_list.edit',
	);
	checkActionPermission($action_mapping, $Action, 1);
	// permission checking: end
	-
	+
	switch($Action)
	{
	case "m_save_import_config":
	// Set New Import Category
	if( GetVar('categorylist', true) !== false )
	{
	$cat_id = $_POST['categorylist'];
	$objSession->SetVariable('categoryid', $cat_id);

	if($cat_id > 0)
	{
	$cat = $objCatList->GetByResource($cat_id);
	if(is_object($cat))
	{
	$ml_formatter =& $application->recallObject('kMultiLanguage');
	$navbar = $cat->Get( $ml_formatter->LangFieldName('CachedNavbar') );
	$objSession->SetVariable('catnavbar', $navbar);
	$objSession->SetVariable('import_category_id', $cat->UniqueId() );
	}
	}elseif($cat_id == 0)
	{
	global $objConfig;
	$objSession->SetVariable('import_category_id', 0);
	}

	$objSession->SetVariable('categorylist', $_POST['categorylist']);
	}

	// Set Import Admin Group
	if( GetVar('grouplist1', true) )
	{
	$group_id = $_POST['grouplist1'];
	$group = $objGroups->GetItemByField('ResourceId',$group_id);
	$objSession->SetVariable('user_admin_names', $group->Get('Name'));
	$objSession->SetVariable('user_admin_values', $group->Get('GroupId'));
	$objSession->SetVariable('grouplist1', $_POST['grouplist1']);
	}

	// Set Import User Group
	if( GetVar('grouplist2', true) )
	{
	$group_id = $_POST['grouplist2'];
	$group = $objGroups->GetItemByField('ResourceId', $group_id);
	$objSession->SetVariable('user_regular_names', $group->Get('Name'));
	$objSession->SetVariable('user_regular_values', $group->Get('GroupId'));
	$objSession->SetVariable('grouplist2', $_POST['grouplist2']);
	}
	break;

	case "m_add_user":
	$application =& kApplication::Instance();
	$application->SetVar('u_mode', 't');
	$dupe_user = '';
	//$user_pending = (int)$_POST["user_pending"];
	//$user_enabled = (int)$_POST["user_enabled"];
	$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat(0, true));
	$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);

	$dob = DateTimestamp($_POST["user_dob"],GetDateFormat(0, true));

	$objEditItems = new clsUserManager();
	$objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");

	if(strlen($_POST["user_login"]))
	{
	if (strtolower($_POST["user_login"]) == "root")
	$id = 1;
	else
	$id = $objUsers->GetUserId($_POST["user_login"]);
	}
	else
	$dob = 0;

	if(!empty($id))
	{
	$lvErrorString = language('la_error_duplicate_username');
	$dupe_user = $_POST["user_login"];
	$_POST["user_login"] = '';
	}
	else
	{
	$fields_hash = Array( 'Login' => $_POST['user_login'],
	'Password' => md5($_POST['password']),
	'FirstName' => $_POST['user_firstname'],
	'LastName' => $_POST['user_lastname'],
	'Company' => $_POST['user_company'],
	'Email' => $_POST['user_email'],
	'Phone' => $_POST['user_phone'],
	'Fax' => $_POST['user_fax'],
	'Street' => $_POST['user_street'],
	'Street2' => $_POST['user_street2'],
	'City' => $_POST['user_city'],
	'State' => $_POST['user_state'],
	'Country' => $_POST['user_country'],
	'Zip' => $_POST['user_zip'],
	'Status' => $_POST['status'],
	'CreatedOn' => $CreatedOn,
	- 'dob' => $dob
	+ 'dob' => $dob,
	+
	+ // customizaton Vana
	+ // 'Accredited' => $_POST['accredited_status'],
	);

	$u =& $objEditItems->Add_User_NEW($fields_hash);
	saveCustomFields('u', $u->Get('ResourceId'), 6);
	}

	break;

	case "m_edit_user":
	$application =& kApplication::Instance();
	$application->SetVar('u_mode', 't');
	//$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat(0, true));
	//$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
	$dob = DateTimestamp($_POST["user_dob"],GetDateFormat(0, true));
	$objEditItems = new clsUserManager();
	$objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
	//$user_pending = (int)$_POST["user_pending"];
	//$user_enabled = (int)$_POST["user_enabled"];
	$UserId = (int)$_POST["user_id"];
	//echo $UserId."<br>\n";
	if (!GetVar('user_login')) {
	$dob = 0;
	}

	$fields_hash = Array( 'Login' => $_POST['user_login'],
	'Password' => GetVar('password') ? md5(GetVar('password')) : '',
	'FirstName' => $_POST['user_firstname'],
	'LastName' => $_POST['user_lastname'],
	'Company' => $_POST['user_company'],
	'Email' => $_POST['user_email'],
	'Street' => $_POST['user_street'],
	'Street2' => $_POST['user_street2'],
	'City' => $_POST['user_city'],
	'State' => $_POST['user_state'],
	'Country' => $_POST['user_country'], // note: should issue some conversion from name to ISO code
	'Zip' => $_POST['user_zip'],
	'Phone' => $_POST['user_phone'],
	'Fax' => $_POST['user_fax'],
	'Status' => $_POST['status'],
	'dob' => $dob,
	+
	+ // customizaton Vana
	+ //'Accredited' => $_POST['accredited_status'],
	);
	$u =& $objEditItems->Edit_User_NEW($UserId, $fields_hash);
	saveCustomFields('u', $u->Get('ResourceId'), 6);
	break;

	case "m_user_primarygroup":
	if($ro_perm) break;
	$users = explode(',', $_POST["userlist"]);
	$GroupResourceId = $_POST['grouplist'];
	$g = $objGroups->GetItemByField("ResourceId", $GroupResourceId);
	$GroupId = $g->UniqueId();

	if( is_array($users) )
	foreach($users as $user_id)
	{
	$u = $objUsers->GetItemByField("ResourceId", $user_id);
	$g->AddUser($u->Get("PortalUserId"),1,false);
	}
	break;

	case 'm_group_edit': // when editing user membership in group
	$membership_expires = DateTimestamp( $_POST['membership_expires_date'], GetDateFormat(0, true) );
	$membership_expires += SecondsSinceMidnight( $_POST['membership_expires_time'] );

	$objEditItems = new clsUserGroupList();
	$objEditItems->SourceTable = $objSession->GetEditTable('UserGroup');
	$objEditItems->Edit_UserGroup($_POST['GroupId'], $_POST['PortalUserId'], $membership_expires);
	break;

	case "m_user_sysperm":
	if($ro_perm) break;
	if($_POST["UserEditStatus"]==0)
	{
	$UserId = $_POST["ItemId"];
	if($UserId)
	{
	$objEditItems = new clsUserManager();
	$objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
	$u = $objEditItems->GetItemByField("ResourceId",$UserId);
	unset($g);
	if(is_object($u))
	{
	$objSession->ResetSysPermCache();
	$g = $u->GetPersonalGroup(FALSE);
	$PermList = explode(",",$_POST["PermList"]);
	for($i=0;$i<count($PermList);$i++)
	{
	if(!@in_array($PermList[$i],$_POST["inherit"]))
	{
	if(!is_object($g))
	$g = $u->GetPersonalGroup(TRUE);

	$value = 0;
	if(is_array($_POST["permvalue"]))
	{
	if(in_array($PermList[$i],$_POST["permvalue"]))
	$value =1;
	$g->SetSystemPermission($PermList[$i],$value);
	}
	else {
	$g->SetSystemPermission($PermList[$i], 0);
	}
	}
	else
	{
	if(is_object($g))
	$g->SetSystemPermission($PermList[$i],-1);
	}
	}
	}
	}
	}
	break;

	case "m_approve_user":
	if($ro_perm) break;
	foreach($_POST["itemlist"] as $userid)
	{
	$user = $objUsers->GetItemByField("ResourceId",$userid);
	$user->Approve();
	}
	$objUsers->Clear();
	break;

	case "m_deny_user":
	if($ro_perm) break;
	foreach($_POST["itemlist"] as $userid)
	{
	$user = $objUsers->GetItemByField("ResourceId",$userid);
	$user->Deny();
	}
	$objUsers->Clear();
	break;

	case "m_delete_user":
	if($ro_perm) break;
	foreach($_POST["itemlist"] as $userid)
	$objUsers->Delete_User($userid);
	break;

	case "m_user_assign": // not sure if action is used anywhere
	if($ro_perm) break;
	$useridlist = implode("-", $userlist);
	$objSession->SetUserStatus($useridlist, "g_usergroup_status");
	$g_usergroup_status = $useridlist;
	break;

	case "m_group_assign": // not sure if action is used anywhere
	if($ro_perm) break;
	foreach($grouplist as $group) $objGroups->Add_Users_To_Group($group);
	break;

	case "m_remove_group":
	if($ro_perm) break;
	$adodbConnection = &GetADODBConnection();
	$adodbConnection->Execute("DELETE FROM UserGroup where UserId='$UserId' AND GroupId='$GroupId'");
	break;

	case "m_SetVariable":
	$objSession->SetPersistantVariable($_POST["fieldname"], $_POST["varvalue"]);
	break;

	case "m_SetSessionVariable":
	$objSession->SetVariable($_POST["fieldname"], $_POST["varvalue"]);
	//echo "Setting $fieldname to $varvalue<br>\n";
	if($_POST["fieldname"]=="SearchType")
	$objSession->SetVariable("SearchWord","");
	break;

	case "m_edit_permissions":
	if($ro_perm) break;

	if($_POST["CatEditStatus"] != -1)
	{
	$objSession->SetVariable('PermCache_UpdateRequired', 1);
	$GroupId = $_POST["GroupId"];
	$CatId = $_POST["CategoryId"];
	$Module = $_POST["Module"];
	$ado = &GetADODBConnection();
	$sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig WHERE ModuleId='$Module'";
	$rs = $ado->Execute($sql);
	$PermNames = array();
	while($rs && !$rs->EOF)
	{
	$data = $rs->fields;
	$PermNames[] = $data["PermissionName"];
	$rs->MoveNext();
	}

	$inherit = array();
	if(is_array($_POST["inherit"]))
	{
	foreach($_POST["inherit"] as $perm)
	{
	$inherit[$perm] = 1;
	}
	}
	$access = array();
	if(is_array($_POST["permvalue"]))
	{
	foreach($_POST["permvalue"] as $perm)
	{
	$access[$perm] = 1;
	}
	}
	$objPermList = new clsPermList($CatId,$GroupId);
	$objPermList->LoadCategory($CatId);

	for($i=0;$i<count($PermNames);$i++)
	{
	if(!array_key_exists($PermNames[$i],$inherit))
	{
	$PermValue = (int)$access[$PermNames[$i]];

	$Perm = $objPermList->GetPermByName($PermNames[$i]);
	if($Perm)
	{
	$Id = $Perm->Get("PermissionId");
	//echo "Editing $Id<br>\n";
	$objPermList->Edit_Permission($Id,$CatId,$GroupId,$PermNames[$i],$PermValue,0);
	}
	else
	{
	//echo "Adding ".$PermNames[$i];
	$objPermList->Add_Permission($CatId,$GroupId,$PermNames[$i],$PermValue,0);
	}
	}
	else
	{
	$Perm = $objPermList->GetPermByName($PermNames[$i]);
	if($Perm)
	{
	$Id = $Perm->Get("PermissionId");
	$objPermList->Delete_Permission($Id);
	}
	}
	}
	//$c = $objCatList->GetItem($CatId);
	//$glist = $objGroups->GetAllGroupList();
	//$ViewList = $objPermList->GetGroupPermList($c,"CATEGORY.VIEW",$glist );
	//$c->SetViewPerms("CATEGORY.VIEW",$ViewList,$glist);
	//$c->Update();
	}
	break;
	case "m_perm_delete_group":
	if($ro_perm) break;
	$ado = &GetADODBConnection();
	$CatId = $_POST["CategoryId"];
	foreach($_POST["itemlist"] as $groupid)
	{
	$g = $objGroups->GetItemByField("ResourceId",$groupid);
	if(is_object($g))
	{
	$sql = "DELETE FROM ".GetTablePrefix()."Permissions WHERE CatId=$CatId AND GroupId=".$g->Get("GroupId");
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo $sql."<br>\n";
	$ado->Execute($sql);
	}
	}
	break;

	case "m_user_addto_group":
	if($ro_perm) break;
	$objSession->SetVariable("HasChanges", 1);
	$user = $_POST["UserId"];
	if(is_numeric($user))
	{
	if(strlen($_POST["grouplist"]))
	{
	$groups = explode(",",$_POST["grouplist"]);
	if(is_array($groups))
	{
	for($i=0; $i<count($groups);$i++)
	{
	$g = $objGroups->GetItemByField("ResourceId",$groups[$i]);
	$g->AddUser($user);
	}
	}
	else
	{
	$g = $objGroups->GetItem($groups);
	$g->AddUser($user);
	}
	}
	}
	break;
	-
	+
	case "m_group_removeuser":
	if($ro_perm) break;
	$objSession->SetVariable("HasChanges", 1);
	$group = $_POST["GroupId"];
	$g = $objGroups->GetItem($group);
	//if($group>0)
	//{
	foreach($_POST["itemlist"] as $user_id)
	{
	$u = $objUsers->GetItemByField("ResourceId",$user_id);
	$g->DeleteUser($u->Get("PortalUserId"));
	}
	//}
	break;
	case "m_user_removegroup":
	if($ro_perm) break;
	$objSession->SetVariable("HasChanges", 1);
	$user = $_POST["UserId"];
	//if($user>0)
	//{
	foreach($_POST["itemlist"] as $groupid)
	{
	$g = $objGroups->GetItem($groupid);
	$g->DeleteUser($user);
	}
	//}
	break;
	case "m_sendmail":
	if($ro_perm) break;
	$idlist = explode(",",$_POST["idlist"]);
	$html = (int)$_POST["html_enable"];
	$body = inp_escape($_POST["email_body"],$html);
	$subject = inp_escape($_POST["email_body"],$html);
	$Email = new clsEmailMessage();
	$Email->Set("Subject",$subject);
	$Email->Set("Template",$body);
	if($html)
	$Email->Set("MessageType","HTML");
	if(count($idlist)>0)
	{
	switch($_POST["IdType"])
	{
	case "group":
	foreach($idlist as $id)
	$Email->SendToGroup($id);
	break;
	case "user":
	foreach($idlist as $id)
	$Email->SendToUser($id);
	break;
	}/switch/
	}
	break;

	// not used anywhere
	/* case "m_item_recount":
	if($ro_perm) break;
	RunDown($m_var_list["cat"],"UpdateCacheCounts");
	break; */

	case "m_cat_delete":
	if($ro_perm) break;
	if(isset($_POST["catlist"]))
	{
	if(is_array($_POST["catlist"]))
	foreach ($_POST["catlist"] as $catid) {
	$objCatList->Delete_Category($catid, true);
	}
	$application->StoreVar('refresh_tree', 1);
	}
	break;
	-
	+
	case "m_cat_cut":
	if($ro_perm) break;
	if(isset($_POST["catlist"]))
	{
	if($objSession->HasCatPermission("CATEGORY.DELETE",$catid))
	{
	$objCatList->CopyToClipboard("CUT","CategoryId",$_POST["catlist"]);
	}
	else
	$objCatList->CopyToClipboard("COPY","CategoryId",$_POST["catlist"]);
	}
	break;

	case "m_cat_copy":
	if($ro_perm) break;
	if(isset($_POST["catlist"]))
	{
	$objCatList->CopyToClipboard("COPY","CategoryId",$_POST["catlist"]);
	}
	break;

	case "m_paste":
	if($ro_perm) break;
	if($objCatList->ItemsOnClipboard()>0)
	{
	/* category's paste function populates a sparse array where array[old_id]=new_id */
	$PastedCatIds = array();
	$objCatList->PasteFromClipboard($objCatList->CurrentCategoryID(), $objCatList->TitleField);
	}
	else
	{
	$clip = $objSession->GetVariable("ClipBoard");
	if(strlen($clip))
	{
	$ClipBoard = ParseClipboard($clip);
	$Action= strtolower($ClipBoard["table"])."_paste";
	}
	}
	break;

	case "m_cat_move_up":
	if($ro_perm) break;
	if (isset($_POST["catlist"]))
	{
	foreach($_POST["catlist"] as $catid)
	{
	$cat =& $objCatList->GetCategory($catid);
	$cat->MoveUp();
	}
	}
	break;

	case "m_cat_move_down":
	if($ro_perm) break;
	if (isset($_POST["catlist"]))
	{
	$catlist=array_reverse($_POST["catlist"]);
	foreach($catlist as $catid)
	{
	$cat =& $objCatList->GetCategory($catid);
	$cat->MoveDown();
	}
	}
	break;
	case "m_cat_approve":
	if($ro_perm) break;
	if (isset($_POST["catlist"]))
	{
	foreach($_POST["catlist"] as $catid)
	{
	$cat =& $objCatList->GetCategory($catid);
	$cat->Approve();
	}
	}
	break;
	case "m_cat_decline":
	if($ro_perm) break;
	if (isset($_POST["catlist"]))
	{
	foreach($_POST["catlist"] as $catid)
	{
	$cat =& $objCatList->GetCategory($catid);
	//$cat->Deny();
	RunDown($catid,"Deny");
	}
	}
	break;

	case "m_rel_delete":
	$adodbConnection= &GetADODBConnection();
	$table = $objSession->GetEditTable("Relationship");
	if(isset($_POST["itemlist"]))
	{
	if(is_array($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	$sql = "DELETE FROM ".$table." WHERE RelationshipId=".$id;
	$adodbConnection->Execute($sql);
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo $sql."<br>\n";
	}
	}
	else
	{
	$sql = "DELETE FROM ".$table." WHERE RelationshipId=".$_POST["itemlist"];
	$adodbConnection->Execute($sql);
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo $sql."<br>\n";
	}
	}
	break;
	case "m_add_relation":
	$RelList = new clsRelationshipList();
	$RelList->SourceTable = $objSession->GetEditTable("Relationship");

	//$r = $RelList->Add($_POST["SourceId"],$_POST["SourceType"],$_POST["TargetId"],$_POST["TargetType"],
	// 0,(int)$_POST["Enabled"],$_POST["RelType"], $Rel);
	$ado = &GetADODBConnection();
	$NewId = intval($ado->GetOne('SELECT MIN(RelationshipId) as MinValue FROM '.$RelList->SourceTable));
	if($NewId > 0) $NewId = 0;
	$NewId--;

	$priority = (int)GetVar('priority');
	$r = $RelList->Add($_POST["SourceId"],$_POST["SourceType"],$_POST["TargetId"],$_POST["TargetType"],
	$priority,(int)$_POST["Enabled"],$_POST["RelType"], $NewId);

	$sql = "UPDATE ".$RelList->SourceTable." SET RelationshipId=".$NewId." WHERE RelationshipId=".$r->Get("RelationshipId");
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo $sql."<br>\n";
	$ado->Execute($sql);

	break;
	case "m_edit_relation":
	if($_POST["CatEditStatus"]==0)
	{
	$RelList = new clsRelationshipList();
	$RelList->SourceTable = $objSession->GetEditTable("Relationship");

	$r = $RelList->GetItem($_POST["RelationshipId"]);
	if(is_object($r))
	{
	$r->Set("Enabled",(int)$_POST["Enabled"]);
	$r->Set("Type",(int)$_POST["RelType"]);
	$r->Set("Priority",(int)$_POST["priority"]);
	$r->Update();
	}
	}
	break;
	case "m_rel_move_up":
	$objRelList = new clsRelationshipList();
	$objRelList->SourceTable = $objSession->GetEditTable("Relationship");
	if (isset($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	$r = $objRelList->GetItem($id);
	$r->MoveUp($_POST["SourceId"]);
	}
	}
	break;
	case "m_rel_move_down":
	$objRelList = new clsRelationshipList();
	$objRelList->SourceTable = $objSession->GetEditTable("Relationship");
	if (isset($_POST["itemlist"]))
	{
	$itemlist=array_reverse($_POST["itemlist"]);
	foreach($itemlist as $id)
	{
	$r = $objRelList->GetItem($id);
	$r->MoveDown($_POST["SourceId"]);
	}
	}
	break;


	case "m_add_category":
	$application =& kApplication::Instance();
	$application->SetVar('c_mode', 't');
	-
	+
	$created_on = GetVar('cat_date');
	if (ValidDate($created_on, GetDateFormat(0, true))) {
	$created_on = DateTimestamp($created_on, GetDateFormat(0, true));
	}
	else {
	$created_on = adodb_mktime();
	}

	$objEditItems = new clsCatList();
	$objEditItems->SourceTable = $objSession->GetEditTable("Category");
	-
	+
	$fields_hash = Array( 'ParentId' => GetVar('ParentId'),
	$objCatList->TitleField => inp_escape(GetVar('cat_name'), (int)GetVar('html_enable')),
	$objCatList->DescriptionField => inp_escape(GetVar('cat_desc'), (int)GetVar('html_enable')),
	'CreatedOn' => $created_on,
	'EditorsPick' => GetVar('cat_pick'),
	'Status' => (int)GetVar('status'),
	// 'HotItem' => (int)GetVar('itemhot'),
	'NewItem' => (int)GetVar('itemnew'),
	// 'PopItem' => (int)GetVar('itempop'),
	'Priority' => GetVar('Priority'),
	'MetaKeywords' => GetVar('meta_keywords'),
	'MetaDescription' => GetVar('meta_desc'),
	'AutomaticFilename' => GetVar('auto_filename'),
	'Filename' => GetVar('filename'),
	'CategoryTemplate' => GetVar('category_template'),
	'ItemTemplate' => GetVar('item_template'),
	);
	-
	- $objSession->SetVariable('PermCache_UpdateRequired', 1);
	+
	+ $objSession->SetVariable('PermCache_UpdateRequired', 1);
	$cat =& $objEditItems->Add_NEW($fields_hash);
	saveCustomFields('c', $cat->Get('ResourceId'), 1);
	break;

	case 'm_edit_category':
	$application =& kApplication::Instance();
	$application->SetVar('c_mode', 't');
	-
	+
	$objEditItems = new clsCatList();
	$objEditItems->SourceTable = $objSession->GetEditTable('Category');

	// check if name of cat isn't changed: begin
	if (GetVar('CategoryId') > 0) {
	$original_cats = new clsCatList();
	$original_cat = $original_cats->GetItemByField('CategoryId', GetVar('CategoryId'));

	$match_fields = Array( $objCatList->TitleField => 'cat_name',
	'Filename' => 'filename',
	'CategoryTemplate' => 'category_template',
	'ItemTemplate' => 'item_template');
	-
	+
	foreach ($match_fields as $db_field => $submit_field) {
	if ($original_cat->Get($db_field) != stripslashes( GetVar($submit_field) )) {
	$objSession->SetVariable('PermCache_UpdateRequired', 1);
	break;
	}
	}
	unset($original_cat, $original_cats);
	}
	else {
	$objSession->SetVariable('PermCache_UpdateRequired', 1);
	}
	// check if name of cat isn't changed: end
	-
	+
	$fields_hash = Array( $objCatList->TitleField => inp_escape(GetVar('cat_name'), (int)GetVar('html_enable')),
	$objCatList->DescriptionField => inp_escape(GetVar('cat_desc'), (int)GetVar('html_enable')),
	'CreatedOn' => DateTimestamp(GetVar('cat_date'), GetDateFormat(0, true)),
	'EditorsPick' => GetVar('cat_pick'),
	'Status' => (int)GetVar('status'),
	// 'HotItem' => (int)GetVar('itemhot'),
	'NewItem' => (int)GetVar('itemnew'),
	// 'PopItem' => (int)GetVar('itempop'),
	'Priority' => GetVar('Priority'),
	'MetaKeywords' => GetVar('meta_keywords'),
	'MetaDescription' => GetVar('meta_desc'),
	'AutomaticFilename' => GetVar('auto_filename'),
	'Filename' => GetVar('filename'),
	'CategoryTemplate' => GetVar('category_template'),
	'ItemTemplate' => GetVar('item_template'),
	);
	-
	+
	$cat =& $objEditItems->Edit_Category(GetVar('CategoryId'), $fields_hash);
	saveCustomFields('c', $cat->Get('ResourceId'), 1);
	break;
	-
	+
	case "m_edit_custom_data":
	$resource_id = $_POST['ItemId'];
	$db =& GetADODBConnection(true);
	$sql = 'SELECT Prefix
	FROM '.TABLE_PREFIX.'ItemTypes
	WHERE ItemType = '.GetVar('CustomType');
	$main_prefix = $db->GetOne($sql);
	$application->SetVar($main_prefix.'_mode', 't');
	-
	+
	saveCustomFields($main_prefix, $resource_id, $_POST['CustomType']);
	break;

	-
	+
	case 'm_save_custom_data':
	$main_prefix = $application->GetVar('prefix');
	$application->SetVar($main_prefix.'_mode', 't');
	$event = new kEvent($main_prefix.':OnUpdate');
	$application->HandleEvent($event);
	break;
	-
	+
	case "m_keyword_reset":
	if($ro_perm) break;
	$objSearchList = new clsSearchLogList();
	foreach($_POST["itemlist"] as $k)
	{
	$c = $objSearchList->GetItem($k);
	$c->Delete();
	}
	break;

	case 'm_clear_searchlog':
	if($ro_perm) break;
	$objSearchList = new clsSearchLogList();
	$db =& GetADODBConnection();
	$db->Execute('DELETE FROM '.$objSearchList->SourceTable );
	break;

	case "m_review_add":
	$post_info = GetSubmitVariable($_POST, 'EditStatus');
	if($post_info['variable'] > -1)
	{
	$objReviews = new clsItemReviewList();
	$objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
	$Pending = (int)$_POST["review_pending"];
	$Enabled = (int)$_POST["review_enabled"];
	$Status = (int)$_POST["status"];
	$CreatedOn = DateTimestamp($_POST["review_date"],GetDateFormat(0, true));
	$CreatedOn += SecondsSinceMidnight($_POST["review_time"]);
	$html = (int)$_POST["html_enable"];
	$ReviewText = inp_escape($_POST["review_body"],1);

	$CreatedById = 0;
	if(strlen($_POST["createdby"])>0)
	{
	if(strtolower($_POST["createdby"])=="root")
	{
	$CreatedById = -1;
	}
	else
	{
	$u = $objUsers->GetItemByField("Login",$_POST["createdby"]);
	if(is_object($u))
	{
	$CreatedById = $u->Get("PortalUserId");
	if($CreatedById<1)
	{
	$CreatedById = $objSession->Get("PortalUserId");
	}
	}
	else
	$CreatedById = $objSession->Get("PortalUserId");
	}
	}
	else
	$CreatedById = $objSession->Get("PortalUserId");

	$r = $objReviews->AddReview($CreatedOn,$ReviewText,$Status, $IPAddress,
	(int)$_POST["review_priority"], $_POST["ItemId"],$_POST["ItemType"],
	$CreatedById,$html, $post_info['Module']);
	$ado = &GetADODBConnection();
	$rs = $ado->Execute("SELECT MIN(ReviewId) as MinValue FROM ".$objReviews->SourceTable);
	$NewId = $rs->fields["MinValue"]-1;
	$sql = "UPDATE ".$objReviews->SourceTable." SET ReviewId=".$NewId." WHERE ReviewId=".(int)$r->Get("ReviewId");
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo $sql."<br>\n";
	$ado->Execute($sql);
	}
	break;
	case "m_review_edit":
	case 'm_review_direct_edit';
	$post_info = GetSubmitVariable($_POST, 'EditStatus');
	if($post_info['variable'] > -1)
	{
	$objReviews = new clsItemReviewList();
	$objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
	$Status = (int)$_POST["status"];
	$CreatedOn = DateTimestamp($_POST["review_date"],GetDateFormat(0, true));
	$CreatedOn += SecondsSinceMidnight($_POST["review_time"]);
	$html = (int)$_POST["html_enable"];
	$ReviewText = inp_escape($_POST["review_body"],1);
	$ReviewId = $_POST["ReviewId"];
	$CreatedById = 0;
	if(strlen($_POST["createdby"])>0)
	{
	if(strtolower($_POST["createdby"])=="root")
	{
	$CreatedById = -1;
	}
	else
	{
	$u = $objUsers->GetItemByField("Login",$_POST["createdby"]);
	if(is_object($u))
	{
	$CreatedById = $u->Get("PortalUserId");
	if($CreatedById<1)
	{
	$CreatedById = $objSession->Get("PortalUserId");
	}
	}
	else
	$CreatedById = $objSession->Get("PortalUserId");
	}
	}
	$r = $objReviews->EditReview($ReviewId,$CreatedOn,$ReviewText,$Status, $IPAddress,
	(int)$_POST["review_priority"],$_POST["ItemId"],$_POST["ItemType"],
	$CreatedById,$html);
	}
	break;




	case "m_review_delete":
	$objReviews = new clsItemReviewList();
	$objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
	foreach($_POST["itemlist"] as $id)
	{
	$objReviews->DeleteReview($id);
	}
	break;


	case 'm_review_direct_delete':
	$objReviews = new clsItemReviewList();
	foreach($_POST['reviewlist'] as $id)
	{
	$objReviews->DeleteReview($id);
	}
	break;


	case "m_review_approve":
	if (isset($_POST["itemlist"]))
	{
	$objReviews = new clsItemReviewList();
	$objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
	foreach($_POST["itemlist"] as $id)
	{
	$i = $objReviews->GetItem($id);
	$i->Set("Status",1);
	$i->Update();
	}
	}
	break;

	case 'm_review_direct_approve':
	if(isset($_POST["reviewlist"]))
	{
	$objReviews = new clsItemReviewList();
	foreach($_POST["reviewlist"] as $id)
	{
	$i = $objReviews->GetItem($id);
	$i->Set("Status",1);
	$i->Update();
	}
	}
	break;

	case "m_review_deny":
	if (isset($_POST["itemlist"]))
	{
	$objReviews = new clsItemReviewList();
	$objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
	foreach($_POST["itemlist"] as $id)
	{
	$i = $objReviews->GetItem($id);
	$i->Set("Status",0);
	$i->Update();
	}
	}
	break;

	case 'm_review_direct_decline':
	if (isset($_POST["reviewlist"]))
	{
	$objReviews = new clsItemReviewList();
	foreach($_POST["reviewlist"] as $id)
	{
	$i = $objReviews->GetItem($id);
	$i->Set("Status",0);
	$i->Update();
	}
	}
	break;

	case "m_review_move_up":
	if (isset($_POST["itemlist"]))
	{
	$objReviews = new clsItemReviewList();
	$objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
	foreach($_POST["itemlist"] as $id)
	{
	$i = $objReviews->GetItem($id);
	$i->MoveUp();
	}
	}
	break;
	case "m_review_move_down":
	if (isset($_POST["itemlist"]))
	{
	$objReviews = new clsItemReviewList();
	$objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
	$itemlist=array_reverse($_POST["itemlist"]);
	foreach($itemlist as $id)
	{
	$i = $objReviews->GetItem($id);
	$i->MoveDown();
	}
	}
	break;

	case 'm_themes_rescan':
	$objThemes->CreateMissingThemes();
	if (!$objThemes->Items)
	{
	$objThemes->Query_Item('SELECT * FROM '.$objThemes->SourceTable);
	}

	$keys = array_keys($objThemes->Items);
	foreach ($keys as $theme_index)
	{
	$theme =& $objThemes->Items[$theme_index];
	$theme->VerifyTemplates();
	}

	break;

	case "m_theme_add":
	$ado = &GetADODBConnection();
	$rs = $ado->Execute("SELECT COUNT(*) as c FROM ".GetTablePrefix().'Theme WHERE Name="'.$_POST["name"].'"');
	if(!$rs->fields["c"])
	{
	$objEditItems = new clsThemeList();
	$objEditItems->SourceTable = $objSession->GetEditTable("Theme");
	$Primary = (int)$_POST["primary"];
	if(!(int)$_POST["enabled"])
	$Primary = 0;
	$t = $objEditItems->AddTheme($_POST["name"],$_POST["description"],(int)$_POST["enabled"],$Primary,
	(int)$_POST["CacheTimeout"],GetVar('StylesheetId'));
	$t->Files->ThemeId=$t->Get("ThemeId");

	$rs = $ado->Execute("SELECT MIN(ThemeId) as MinValue FROM ".$objEditItems->SourceTable);
	$NewId = $rs->fields["MinValue"]-1;
	$sql = "UPDATE ".$objEditItems->SourceTable." SET ThemeId=".$NewId." WHERE ThemeId=".$t->Get("ThemeId");
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo $sql."<br>\n";
	$ado->Execute($sql);
	// $t->Files->FindMissingFiles(strtolower($t->Get('name')));
	}
	break;
	case "m_theme_edit":
	$objEditItems = new clsThemeList();
	$objEditItems->SourceTable = $objSession->GetEditTable("Theme");
	$Primary = (int)$_POST["primary"];
	if(!(int)$_POST["enabled"])
	$Primary = 0;

	$objEditItems->EditTheme($_POST["ThemeId"],$_POST["name"],$_POST["description"],
	(int)$_POST["enabled"],$Primary,(int)$_POST["CacheTimeout"], GetVar('StylesheetId'));
	// if ($Primary==1)
	// {
	// $objEditItems->SetPrimaryTheme($_POST["ThemeId"]);
	// }

	break;
	case "m_theme_delete":
	if($ro_perm) break;
	if (isset($_POST["itemlist"]))
	{
	$Themes = new clsThemeList();
	foreach($_POST["itemlist"] as $id)
	{
	$deleting_primary = (!$Themes->DeleteTheme($id));
	}
	}
	break;
	case "m_theme_primary":
	if($ro_perm) break;
	if( count($_POST['itemlist']) )
	{
	$ThemeId = array_shift( $_POST['itemlist'] );
	$t = new clsThemeList();
	$t->SetPrimaryTheme($ThemeId);
	}
	break;

	case "m_template_edit":
	if($ro_perm) break;
	$objSession->SetVariable("HasChanges", 1);
	$ThemeId = $_POST["ThemeId"];
	$FileId = $_POST["FileId"];
	$f = new clsThemeFile($FileId);

	$f->Set("Description", $_POST["Description"] );
	$f->Update();
	$c = stripslashes($_POST["contents"]);
	$f->SaveFileContents($c);
	break;
	case "m_template_add":
	if($ro_perm) break;
	$objSession->SetVariable("HasChanges", 1);
	$ThemeId = $_POST["ThemeId"];
	if( !is_object($f) ) $f = new clsThemeFile();

	$FilePath = $_POST['name'];

	if(!$FilePath)
	{
	$f->SetError('Template Name is required',3);
	break;
	}
	else
	{
	if( substr($FilePath,1) != '/' ) $FilePath = '/'.$FilePath;
	if( substr($FilePath,-3) != '.tpl' ) $FilePath .= '.tpl';
	$FileName = basename($FilePath);
	$FilePath = dirname($FilePath);

	// test if such file not already created

	$f->LoadFromDataBase( Array($FilePath,$FileName), Array('FilePath','FileName') );
	if( !$f->Get('FileId') )
	{
	$f->Set( Array('FilePath','FileName','ThemeId', 'Description'),
	Array($FilePath, $FileName,$_POST['ThemeId'], $_POST["Description"])
	);

	if( $f->IsWriteablePath(true) )
	{
	$f->Create();
	$c = stripslashes($_POST["contents"]);
	$f->SaveFileContents($c, true);
	}
	}
	else
	$f->SetError('Template with this name already exists',4);
	}
	break;
	case "m_template_delete":
	if($ro_perm) break;
	$objSession->SetVariable("HasChanges", 1);
	$dummy = new clsThemeFile();
	foreach($_POST["itemlist"] as $FileId)
	{
	$dummy->LoadFromDatabase($FileId);
	$dummy->Delete();
	}
	break;
	-
	+
	case "m_lang_select":
	if($ro_perm) break;
	$LangId = (int)$_POST["langselect"];
	if($LangId)
	{
	if($objSession->Get("PortalUserId")>0)
	{
	//echo "$LangId";
	$objSession->SetPersistantVariable("Language",$LangId);
	}
	$objSession->Set("Language",$LangId);
	$objSession->Update();
	$m_var_list_update["lang"] = $LangId;
	$m_var_list["lang"] = $LangId;
	}
	break;

	case "m_phrase_edit":
	if( !GetVar('direct') ) $objSession->SetVariable("HasChanges", 1);
	$objPhraseList = new clsPhraseList();
	if((int)$_POST["direct"] != 1)
	$objPhraseList->SourceTable = $objSession->GetEditTable("Phrase");
	$Phrases = $_POST["name"];
	foreach($Phrases as $PhraseId =>$name)
	{
	if($PhraseId>0)
	{
	$objPhraseList->EditPhrase($PhraseId,$_POST["name"][$PhraseId],$_POST["LanguageId"],$_POST["translation"][$PhraseId],$_POST["phrasetype"][$PhraseId]);
	}
	}

	if(strlen($_POST["name"][0]) && strlen($_POST["translation"][0]) && $_POST['Action1'] == "new")
	{
	$r = $objPhraseList->AddPhrase($_POST["name"][0],$_POST["LanguageId"],$_POST["translation"][0],$_POST["phrasetype"][0]);
	if ($r != "Error") {
	$ado = &GetADODBConnection();
	$rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objPhraseList->SourceTable);
	$NewId = $rs->fields["MinValue"]-1;
	$sql = "UPDATE ".$objPhraseList->SourceTable." SET PhraseId=".$NewId." WHERE PhraseId=$PhraseId";
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo $sql."<br>\n";
	$ado->Execute($sql);
	}
	else {
	$add_error = "Language tag with the same name already exists!";
	}
	}
	else if ($_POST['Action1'] == "new") {
	$add_error = "Fields name and translation are required!";
	}
	unset($objPhraseList);
	break;
	case "m_config_missing_phrase":
	if($ro_perm) break;
	$LangId = $_POST["LangId"];
	$ThemeId = $_POST["ThemeId"];
	if(is_array($_POST["Phrase"]))
	{
	$objPhraseList = new clsPhraseList();
	$objPhraseList->SourceTable = $objSession->GetSessionKey()."_".$ThemeId."_labels";

	foreach($_POST["Phrase"] as $p => $value)
	{
	if(strlen($value))
	{
	$obj = $objPhraseList->GetItemByField("Phrase",$p,TRUE);
	if(is_object($obj))
	{
	if($obj->Get("Phrase")==$p)
	{
	$obj->Set("Translation",$value);
	$obj->Update();
	}
	else
	$objPhraseList->AddPhrase($p,$LangId,$value,1);
	}
	else
	$objPhraseList->AddPhrase($p,$LangId,$value,1);
	}
	}
	}
	break;
	case "m_phrase_delete":
	$objSession->SetVariable("HasChanges", 1);
	if (isset($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	$sql = "UPDATE ".$objSession->GetEditTable("Phrase")." SET LanguageId = 0 WHERE PhraseId = ".$id;
	$ado = &GetADODBConnection();
	$ado->Execute($sql);
	}
	}
	unset($objPhraseList);
	break;
	-
	+
	case "m_dlid":
	echo $Action.":".$DownloadId;
	die();
	break;
	-
	+
	case "m_emailevent_user":
	if($ro_perm) break;
	$objEvents = new clsEventList();
	//phpinfo(INFO_VARIABLES);
	//$objEvents->SourceTable = $objSession->GetEditTable("Events");
	$ids = $_POST["EventId"];
	$ids = str_replace("[","",$ids);
	$ids = str_replace("]","",$ids);
	$ids = str_replace("\"","",$ids);
	$ids = str_replace("\\","",$ids);


	$idlist = explode(",",$ids);
	foreach($idlist as $EventId)
	{
	$id = (int)stripslashes($EventId);
	$e =& $objEvents->GetItem((int)$EventId);
	$e->Set("FromUserId", $_POST["FromUserId"]);
	$e->Update();
	}
	$objEvents->Clear();
	unset($objEvents);
	break;
	case "m_emailevent_edit":
	$Template = $_POST["headers"];
	if(strlen($Template))
	{
	$Template .= "\n";
	}
	$Template = str_replace("\n\n","",$Template);
	$Template .= "Subject: "._unhtmlentities($_POST['subject'])."\n\n";
	$Template .= $_POST["messageBody"];
	$objMessages = new clsEmailMessageList();
	$objMessages->SourceTable = $objSession->GetEditTable("EmailMessage");
	$m =& $objMessages->GetItem($_POST["MessageId"]);
	if(is_object($m))
	{
	if($_POST["sendhtml"]==1)
	{
	$m->Set("MessageType","html");
	}
	else
	$m->Set("MessageType","text");

	$m->Set("Template",$Template);
	$m->Update();
	}
	break;
	-
	+
	case "m_mod_enable":
	if($ro_perm) break;
	if (isset($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	$m =& $objModules->GetItemByField("Name",$id);
	if(is_object($m))
	{
	$m->Set("Loaded",1);
	$m->Update();
	}
	}
	$_GET["Refresh"] = 1;
	}
	break;
	case "m_mod_disable":
	if($ro_perm) break;
	if (isset($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	if($id != "In-Portal")
	{
	$m =& $objModules->GetItemByField("Name",$id);
	if(is_object($m))
	{
	$m->Set("Loaded",0);
	$m->Update();
	}
	}
	}
	$_GET["Refresh"] = 1;
	}
	break;

	case "m_img_add":
	$objImageList = new clsImageList();
	$objImageList->SourceTable = $objSession->GetEditTable("Images");
	$LocalImage=0;
	$LocalThumb=0;
	$DestDir = 'kernel/images/';

	$UserThumbSource = (int)$_POST["imgLocalThumb"];
	$LocalThumb = $UserThumbSource;

	$thumb_url = !$LocalThumb? $_POST["imgThumbUrl"] : "";

	if($_POST["imgSameImages"])
	{
	$LocalImage = $LocalThumb;
	$full_url = $thumb_url;
	}
	else
	{
	$LocalImage = (int)$_POST["imgLocalFull"];
	$file = $_FILES["imgFullFile"];
	$full_url = $LocalImage? "" : $_POST["imgFullUrl"];
	}

	if((!strlen($thumb_url) && !$LocalThumb) \|\| (!strlen($full_url) && !$LocalImage))
	{
	break;
	}

	$ado = &GetADODBConnection();
	$NewId = $ado->GetOne('SELECT MIN(ImageId) as MinValue FROM '.$objImageList->SourceTable);
	if($NewId > 0) $NewId = 0;
	$NewId--;
	$img = $objImageList->Add($_POST["imgName"], $_POST["imgAlt"], $_POST["ResourceId"], $LocalImage, $LocalThumb, $full_url, $thumb_url, (int)$_POST["imgEnabled"], 0, (int)$_POST["imgDefault"], 0,(int)$_POST["imgSameImages"], $NewId);
	$img->Set("ImageId", $NewId);

	// $img->debuglevel=1;

	/*
	$sql = "UPDATE ".$objImageList->SourceTable." SET ImageId=".$NewId." WHERE ImageId=0";
	$ado->Execute($sql);

	// $img->Update();
	*/
	// echo "SL: $sql $NewId<BR>";

	// $img->debuglevel=1;

	$img->Pending = true;
	if($LocalImage)
	{
	$file = $_FILES["imgFullFile"];
	if(is_array($file))
	{
	if($file["size"]>0)
	{
	$img->Set("LocalPath",$img->StoreUploadedImage($file,1, $DestDir,0));
	$uploaded=1;
	}
	}
	}

	if($LocalThumb)
	{
	$thumb = $_FILES["imgThumbFile"];
	if(is_array($thumb))
	{
	if($thumb["size"]>0)
	{
	$img->Set("ThumbPath",$img->StoreUploadedImage($thumb,1, $DestDir,1));
	$uploaded=1;
	}
	}
	}
	if($uploaded==1)
	$img->Update();

	break;

	case "m_img_edit":

	$objImageList = new clsImageList();
	$objImageList->SourceTable = $objSession->GetEditTable("Images");

	// $img->debuglevel=1;

	$img = $objImageList->GetItem($_POST["ImageId"]);

	## Get original values
	$LocalImage = $img->Get("LocalImage");
	$LocalThumb = $img->Get("LocalThumb");
	$SameImages = $img->Get("SameImages");
	$ThumbPath = $img->Get("ThumbPath");

	## New values
	$LocalThumbN = (int)$_POST["imgLocalThumb"];
	$LocalImageN = (int)$_POST["imgLocalFull"];

	$FULLFile = $_FILES["imgFullFile"];
	$THFile = $_FILES["imgThumbFile"];

	$DestDir = 'kernel/images/';
	$img->Pending = FALSE;

	$SameImagesN = 0;
	$uploaded = 0;

	## Images were the same, but not any more
	if ($SameImages && !$_POST["imgSameImages"])
	{
	## TH was a local file
	if ($LocalThumb)
	{
	## TH image
	{
	## Try to Delete OLD FULL
	$img->DeleteLocalImage(FALSE, TRUE);

	## FULL image select, but field EMPTY - make a copy of old TH as FULL
	if ($LocalImageN && !(int)$FULLFile["size"])
	{
	// echo $pathToPending = $img->GetImageDir();
	if (!eregi("pending/$", $pathToPending))
	$pathToPending.= "pending/";

	$LocalThumb_File = $img->GetFileName(1);

	// echo "<b>CAN'T FIND FILE:</b> ".$pathToPending.$LocalThumb_File."<BR>";

	if (file_exists($pathToPending.$LocalThumb_File))
	{
	$LocalThumb_FileN = eregi_replace("^th_", "", $LocalThumb_File);
	$LocalThumb_FullFileN = $pathToPending.$LocalThumb_FileN;
	@unlink($LocalThumb_FullFileN);
	@copy($pathToPending.$LocalThumb_File, $LocalThumb_FullFileN);

	$uploaded = 1;
	$copied = 1;
	// echo "COPING: ".$DestDir."pending/".$LocalThumb_FileN." <BR>";
	}
	else
	{
	// echo "CAN'T FIND FILE: ".$pathToPending.$LocalThumb_File."<BR>";
	}
	}
	## Upload new FULL image
	elseif ($LocalImageN && (int)$FULLFile['size'])
	{
	$FULL_FileToUpload = $FULLFile;
	$FULL_URL = "";

	// echo " Upload new FULL image";
	}
	## Full is URL
	elseif (!$LocalImageN)
	{
	$img->DeleteLocalImage(FALSE, TRUE);
	$FULL_URL = $_POST['imgFullUrl'];
	$FULL_FileToUpload = "";
	}
	else
	{
	// echo " ## Unknow condition";
	}

	## Take care of Thumbnail here
	if ($LocalThumbN)
	{
	## Delete old if NEW TH image selected
	if ((int)$THFile['size'])
	{
	$img->DeleteLocalImage(TRUE, FALSE);
	$TH_FileToUpload = $THFile;
	}
	else
	$TH_FileToUpload = "";
	}
	else
	{
	$img->DeleteLocalImage(TRUE, FALSE);
	$TH_FileToUpload = "";
	$TH_URL = $_POST['imgThumbUrl'];
	}
	}
	}
	## TH was URL
	else
	{
	## Take care of FULL image here
	if ($LocalImageN && (int)$FULLFile["size"])
	{
	$FULL_FileToUpload = $FULLFile;
	$FULL_URL = "";
	}
	## Full is URL (or image size 0)
	else
	{
	$FULL_FileToUpload = "";
	$FULL_URL = $_POST['imgFullUrl'];
	}

	## Take care of Thumbnail here
	if ($LocalThumbN)
	{
	$TH_FileToUpload = (int)$THFile['size']? $THFile : "";
	$TH_URL = "";
	}
	else
	{
	$TH_FileToUpload = "";
	$TH_URL = $_POST['imgThumbUrl'];
	}
	}
	}
	## Images were the same, and still the same
	elseif ($SameImages && $_POST['imgSameImages'])
	{
	## Take care of Thumbnail & FULL here
	if ($LocalThumbN)
	{
	if ((int)$THFile['size'])
	{
	$img->DeleteLocalImage(TRUE, FALSE);
	$TH_FileToUpload = $THFile;
	}
	else
	$TH_FileToUpload = "";

	$FULL_URL = $TH_URL = "";
	}
	else
	{
	$TH_FileToUpload = $FULL_FileToUpload = "";
	$FULL_URL = $TH_URL = $_POST['imgThumbUrl'];
	}

	## Delete old FULL image
	$img->DeleteLocalImage(FALSE,TRUE);

	$SameImagesN = 1;
	}
	## Images were NOT the same, and selected as the same now
	elseif (!$SameImages && $_POST["imgSameImages"])
	{
	## Take care of Thumbnail & FULL here
	if ($LocalThumbN)
	{
	if ((int)$THFile['size'])
	{
	$img->DeleteLocalImage(TRUE, FALSE);
	$TH_FileToUpload = $THFile;
	}
	else
	$TH_FileToUpload = "";


	$FULL_URL = $TH_URL = "";
	}
	else
	{
	$img->DeleteLocalImage(TRUE, FALSE);
	$TH_FileToUpload = $FULL_FileToUpload = "";
	$FULL_URL = $TH_URL = $_POST['imgThumbUrl'];
	}

	## Clean up FULL image
	$img->DeleteLocalImage(FALSE, TRUE);

	$SameImagesN = 1;
	}
	## Images were NOT the same, and selected as NOT the same
	elseif (!$SameImages && !$_POST["imgSameImages"])
	{
	## Take care of Thumbnail
	if ($LocalThumbN)
	{
	if ((int)$THFile['size'])
	{
	$img->DeleteLocalImage(TRUE, FALSE);
	$TH_FileToUpload = $THFile;
	}
	else
	$TH_FileToUpload = "";

	$TH_URL = "";
	}
	else
	{
	$img->DeleteLocalImage(TRUE, FALSE);
	$TH_FileToUpload = "";
	$TH_URL = $_POST['imgThumbUrl'];
	}

	## Take care of FULL here
	if ($LocalImageN)
	{
	if ((int)$FULLFile['size'])
	{
	$img->DeleteLocalImage(FALSE, TRUE);
	$FULL_FileToUpload = $FULLFile;
	}
	else
	$FULL_FileToUpload = "";

	$FULL_URL = "";
	}
	else
	{
	$img->DeleteLocalImage(FALSE, TRUE);
	$FULL_FileToUpload = "";
	$FULL_URL = $_POST['imgFullUrl'];
	}
	}
	## Unknow condition
	else
	{
	;
	}

	$img = $objImageList->Edit($_POST["ImageId"],$_POST["imgName"], $_POST["imgAlt"], $_POST["ResourceId"], $LocalImageN, $LocalThumbN, $FULL_URL, $TH_URL, (int)$_POST["imgEnabled"], (int)$_POST["imgPriority"], (int)$_POST["imgDefault"], 0, $SameImagesN);

	// echo "<B>DATA:</B> <BR> LocalImageN: $LocalImageN, LocalThumbN: $LocalThumbN, FULL_URL: $FULL_URL, TH_URL: $TH_URL, SameImagesN: $SameImagesN <BR>";


	$img->Pending = TRUE;

	if (!empty($FULL_FileToUpload))
	{
	$img->Set("LocalPath",$img->StoreUploadedImage($FULL_FileToUpload, 1, $DestDir, 0));
	$uploaded = 1;
	}
	/*
	elseif (!$LocalImageN)
	{
	$img->Set("LocalPath", "");
	$uploaded = 1;
	}
	*/

	if (!empty($TH_FileToUpload))
	{
	$img->Set("ThumbPath", $img->StoreUploadedImage($TH_FileToUpload, 1, $DestDir, 1));
	$uploaded = 1;
	}

	if ($copied)
	{
	$img->Set("LocalPath", $DestDir."pending/".$LocalThumb_FileN);
	$uploaded = 1;
	}

	if($uploaded==1)
	$img->Update();

	break;
	case "m_img_move_up":
	if (isset($_POST["itemlist"]))
	{
	$objImageList = new clsImageList();
	$objImageList->SourceTable = $objSession->GetEditTable("Images");
	foreach($_POST["itemlist"] as $id)
	{
	$img = $objImageList->GetItem($id);
	$img->MoveUp();
	}
	}
	break;
	case "m_img_move_down":
	if (isset($_POST["itemlist"]))
	{
	$objImageList = new clsImageList();
	$objImageList->SourceTable = $objSession->GetEditTable("Images");
	$itemlist=array_reverse($_POST["itemlist"]);
	foreach($itemlist as $id)
	{
	$img = $objImageList->GetItem($id);
	$img->MoveDown();
	}
	}
	break;

	case "m_img_delete":
	if(isset($_POST["itemlist"]))
	{
	$objImageList = new clsImageList();
	$objImageList->SourceTable = $objSession->GetEditTable("Images");
	foreach($_POST["itemlist"] as $id)
	{
	$img = $objImageList->GetItem($id);
	$img->Set("ResourceId", 0);
	$img->Update();
	//$img->Delete();
	}
	}
	break;
	case "m_restore_delete":
	if($ro_perm) break;
	$bdate = $_POST["backupdate"];
	if($bdate>0)
	{
	$BackupFile = $objConfig->Get("Backup_Path")."/dump".$bdate.".txt";
	if(file_exists($BackupFile))
	unlink($BackupFile);
	}
	break;

	case "m_taglib":
	include($pathtoroot."kernel/include/tag-class.php");
	ParseTagLibrary();
	break;

	case "m_sql_query":
	if($ro_perm) break;
	$sql_query = $application->GetVar('sql');
	$ado =& GetADODBConnection();
	if ($sql_query) {
	$SqlResult = $ado->Execute($sql_query);
	$SqlError = $ado->ErrorMsg();
	$SqlErrorNum = $ado->ErrorNo();
	}
	break;
	-
	+
	case 'm_purge_email_log':
	$conn =& $application->GetADODBConnection();
	$conn->Query('DELETE FROM '.TABLE_PREFIX.'EmailLog');
	break;
	-
	+
	case "m_session_delete":
	if($ro_perm) break;
	$ado = &GetADODBConnection();
	if (count($_POST['itemlist']) > 0) {
	foreach($_POST["itemlist"] as $id)
	{
	$sql = "DELETE FROM ".GetTablePrefix()."UserSession WHERE SessionKey='$id'";
	$ado->Execute($sql);
	$sql = "DELETE FROM ".GetTablePrefix()."SessionData WHERE SessionKey = '$id'";
	$ado->Execute($sql);
	}
	}
	else {
	$sql = "DELETE FROM ".GetTablePrefix()."UserSession WHERE Status='0'";
	$ado->Execute($sql);
	}
	break;
	-
	+
	case "m_add_rule":
	$objEditItems = new clsBanRuleList();
	$objEditItems->SourceTable = $objSession->GetEditTable("BanRules");
	//$ItemType,$RuleType,$ItemField,$ItemVerb,$ItemValue,$Priority,$Status;
	$objEditItems->AddRule($_POST["rule_itemtype"],$_POST["rule_type"],$_POST["rule_field"],
	$_POST["rule_verb"],$_POST["rule_value"],(int)$_POST["rule_priority"],
	(int)$_POST["rule_status"], $_POST['rule_error']);
	break;
	case "m_edit_rule":
	$objEditItems = new clsBanRuleList();
	$objEditItems->SourceTable = $objSession->GetEditTable("BanRules");
	//$ItemType,$RuleType,$ItemField,$ItemVerb,$ItemValue,$Priority,$Status;
	$objEditItems->EditRule($_POST["rule_id"],$_POST["rule_itemtype"],$_POST["rule_type"],$_POST["rule_field"],
	$_POST["rule_verb"],$_POST["rule_value"],(int)$_POST["rule_priority"],
	(int)$_POST["rule_status"], $_POST['rule_error']);
	break;
	case "m_rule_move_up":
	if($ro_perm) break;
	if(isset($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	$i = $objBanList->GetItem($id);
	$i->Increment("Priority");
	}
	}
	break;
	case "m_rule_move_down":
	if($ro_perm) break;
	if(isset($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	$i = $objBanList->GetItem($id);
	$i->Decrement("Priority");
	}
	}
	break;

	case "m_rule_delete":
	if($ro_perm) break;
	if(isset($_POST["itemlist"]))
	{
	foreach($_POST["itemlist"] as $id)
	{
	$i = $objBanList->GetItem($id);
	$i->Delete();
	}
	}
	break;
	case "m_ban_user":
	if($ro_perm) break;
	if($_POST["UserEditStatus"]==1)
	{
	$UserId = $_POST["user_id"];
	$objUsers->SetTable('edit');
	$u = $objUsers->GetItem($UserId);
	if(is_object($u))
	{
	if((int)$_POST["ban_login"])
	{
	if(strlen($_POST["user_login"]))
	$objBanList->AddRule(6,0,"Login",3,$_POST["user_login"],0,1);
	}
	if((int)$_POST["ban_email"])
	{
	if(strlen($_POST["user_email"]))
	$objBanList->AddRule(6,0,"Email",3,$_POST["user_email"],0,1);
	}
	if((int)$_POST["ban_ip"])
	{
	if(strlen($_POST["user_ip"]))
	$objBanList->AddRule(6,0,"ip",3,$_POST["user_ip"],0,1);
	}
	$u->Deny();
	}
	$objUsers->SetTable('restore');
	}
	break;


	case 'm_rebuild_cache':
	$objSession->SetVariable('PermCache_UpdateRequired', 1);
	break;

	}

	/* image upload management */
	if( isset($_POST['img']) && $_POST['img'] == 1 )
	{
	foreach($_FILES as $img => $FILE)
	{
	$name = $_POST["img_Name_$img"];
	$alt = $_POST["img_Alt_$img"];
	$url = $_POST["img_Url_$img"];
	$res_id = $_POST["img_Res_$img"];
	$relvalue = $_POST["img_Rel_$img"];
	$thumb = (int)$_POST["img_Thumb_$img"];
	$dest = AddSlash($_POST["img_DestDir_$img"]);
	if($_POST["img_Del_$img"]=="Delete")
	{
	$img = $objImageList->GetImageByResource($res_id,$relvalue);
	$img->Delete();
	unset($img);
	$objImageList->Clear();
	}
	else
	{
	if($FILE["size"]>0)
	{
	/* an image was uploaded */
	$objImageList->HandleImageUpload($FILE,$res_id,$relvalue,$dest, $name,$alt,$thumb);
	}
	else
	{ /* remote images handled here */
	if(strlen($url)>0)
	{
	if($relvalue>0)
	{
	$img = $objImageList->GetImageByResource($res_id,$relvalue);
	$img->Set("Name",$name);
	$img->Set("AltName", $alt);
	$img->Set("IsThumbnail",$thumb);
	$img->Set("Url",$url);
	$img->Update();
	}
	else
	{
	$relvalue = $objImageList->GetNextRelateValue($res_id);
	$objImageList->NewRemoteImage($url,$res_id,$relvalue, $name, $alt, $thumb);
	}
	}
	}
	}
	}
	}

	// ALL Saving Stuff From Temp Tables Heppens Here

	//echo "==== BEGIN ==== <br>";
	$has_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");

	if (!$has_perm) {
	if( GetVar('ReviewEditStatus') == 1 )
	{
	$objReviews=new clsItemReviewList();
	$objReviews->CopyFromEditTable_Direct();
	}

	if( GetVar('ReviewEditStatus') == -1 )
	{
	$objReviews=new clsItemReviewList();
	$objReviews->PurgeEditTable();
	}

	/* category Edit */
	if( GetVar('CatEditStatus') == 1 )
	{
	$adodbConnection = &GetADODBConnection();
	// $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0";
	$category_table = $objSession->GetVariable('IsHomeCategory') ? TABLE_PREFIX.'Category' : $objSession->GetEditTable('Category');
	$sql = 'SELECT ParentId
	FROM '.$category_table.'
	WHERE CategoryId = -1';

	$rs = $adodbConnection->Execute($sql);
	while ($rs && !$rs->EOF)
	{
	if($rs->fields["ParentId"] > 0) RunUp($rs->fields["ParentId"],"Increment_Count");
	$rs->MoveNext();
	}

	if (!$objSession->GetVariable('IsHomeCategory')) {
	$cat_ids = $objCatList->CopyFromEditTable("CategoryId");
	if ($cat_ids) {
	$objCustomDataList->CopyFromEditTable('c');
	}
	$objCatList->Clear();
	-
	+
	$objImages = new clsImageList();
	$objImages->CopyFromEditTable("ImageId");
	}
	else {
	$objCatList->Clear();
	}
	}

	if( GetVar('CatEditStatus') == 2 )
	{
	$objCatList->PurgeEditTable("CategoryId");
	$objCustomDataList->PurgeEditTable('c');
	if($_REQUEST['CategoryId'] > 0) // not root category is updated
	{
	$objImages = new clsImageList();
	//$objImages->CopyFromEditTable("ImageId");
	$objImages->PurgeEditTable("ImageId");
	}
	$objCatList->Clear();
	}

	/* User Edit */
	if( GetVar('UserEditStatus') == 1 )
	{
	$objUserGroupsList = new clsUserGroupList();
	$objUserGroupsList->CopyFromEditTable("PortalUserId");

	$user_ids = $objUsers->CopyFromEditTable("PortalUserId");
	if ($user_ids) {
	$objCustomDataList->CopyFromEditTable('u');
	}

	$objGroups->Clear();
	$objImages = new clsImageList();
	$objImages->CopyFromEditTable("ImageId");
	}
	if( GetVar('UserEditStatus') == 2 )
	{
	$objUserGroupsList = new clsUserGroupList();
	$objGroups->PurgeEditTable("PortalUserId");
	$objUserGroupsList->PurgeEditTable("PortalUserId");
	$objCustomDataList->PurgeEditTable('u');
	$objGroups->Clear();
	}

	/* Theme Edit */
	if( GetVar('ThemeEditStatus') == 1 )
	{
	$objThemes->CopyFromEditTable();
	$objThemes->Clear();
	}

	if( GetVar('ThemeEditStatus') == 2 )
	{
	$objThemes->PurgeEditTable();
	$objThemes->Clear();
	}

	if( GetVar('MissingLangEditStatus') == 1 )
	{
	$objPhraseList = new clsPhraseList();
	$objPhraseList->SourceTable = $objSession->GetSessionKey()."_".$ThemeId."_labels";

	$objEditList = new clsPhraseList();
	$objEditList->SourceTable = $objSession->GetEditTable("Phrase");

	$ado = &GetADODBConnection();
	$rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objEditList->SourceTable);
	$NewId = $rs->fields["MinValue"]-1;

	$objPhraseList->Query_Item("SELECT * FROM ".$objPhraseList->SourceTable);
	foreach($objPhraseList->Items as $p)
	{
	if(strlen($p->Get("Translation"))>0)
	{
	$p->tablename = $objEditList->SourceTable;
	$p->Dirty();
	$p->UnsetIDField();
	$p->Set("PhraseId",$NewId);
	$NewId--;
	$p->Create();
	}
	}
	$ado->Execute("DROP TABLE IF EXISTS ".$objPhraseList->SourceTable);
	}

	if( GetVar('MissingLangEditStatus') == 2 )
	{
	$table = $objSession->GetSessionKey()."_".$ThemeId."_labels";
	$ado = &GetADODBConnection();
	$ado->Execute("DROP TABLE IF EXISTS ".$table);
	}

	/* Ban Rule Edit */
	if( GetVar('RuleEditStatus') == 1 )
	{
	$objBanList->CopyFromEditTable("RuleId");
	$objBanList->Clear();
	}
	if( GetVar('RuleEditStatus') == 2 )
	{
	$objBanList->PurgeEditTable("RuleId");
	$objBanList->Clear();
	}
	}
	elseif( defined('DEBUG_ACTIONS') )
	{
	if( isset($_REQUEST['Action']) && $_REQUEST['Action'] )
	echo "<b>USER HAS RO-ACCESS</b> on action [<b>".$_REQUEST['Action']."</b>]<br>";
	}

	//echo "==== END ==== <br>";

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.124.2/kernel/action.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.124
	\ No newline at end of property
	+1.124.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php (revision 7287)
	@@ -1,2348 +1,2376 @@
	<?php

	/**
	* Basic class for Kernel3-based Application
	*
	* This class is a Facade for any other class which needs to deal with Kernel3 framework.<br>
	* The class incapsulates the main run-cycle of the script, provide access to all other objects in the framework.<br>
	* <br>
	* The class is a singleton, which means that there could be only one instance of KernelApplication in the script.<br>
	* This could be guranteed by NOT calling the class constuctor directly, but rather calling KernelApplication::Instance() method,
	* which returns an instance of the application. The method gurantees that it will return exactly the same instance for any call.<br>
	* See singleton pattern by GOF.
	* @package kernel4
	*/

	class kApplication {

	/**
	* Is true, when Init method was called already, prevents double initialization
	*
	* @var bool
	*/
	var $InitDone = false;

	/**
	* Holds internal TemplateParser object
	* @access private
	* @var TemplateParser
	*/
	var $Parser;

	/**
	* Holds parser output buffer
	* @access private
	* @var string
	*/
	var $HTML;

	/**
	* Prevents request from beeing proceeded twice in case if application init is called mere then one time
	*
	* @var bool
	* @todo This is not good anyway (by Alex)
	*/
	var $RequestProcessed = false;

	/**
	* The main Factory used to create
	* almost any class of kernel and
	* modules
	*
	* @access private
	* @var kFactory
	*/
	var $Factory;

	/**
	* All ConfigurationValues table content (hash) here
	*
	* @var Array
	* @access private
	*/
	var $ConfigHash = Array();

	/**
	* Ids of config variables used in current run (for caching)
	*
	* @var Array
	* @access private
	*/
	var $ConfigCacheIds = array();

	/**
	* Template names, that will be used instead of regular templates
	*
	* @var Array
	*/
	var $ReplacementTemplates = Array ();

	/**
	* Reference to debugger
	*
	* @var Debugger
	*/
	var $Debugger = null;

	/**
	* Holds all phrases used
	* in code and template
	*
	* @var PhrasesCache
	*/
	var $Phrases;

	/**
	* Modules table content, key - module name
	*
	* @var Array
	*/
	var $ModuleInfo = Array();

	/**
	* Holds DBConnection
	*
	* @var kDBConnection
	*/
	var $Conn = null;

	/**
	* Maintains list of user-defined error handlers
	*
	* @var Array
	*/
	var $errorHandlers = Array();


	// performance needs:
	/**
	* Holds a refererence to httpquery
	*
	* @var kHttpQuery
	*/
	var $HttpQuery = null;

	/**
	* Holds a reference to UnitConfigReader
	*
	* @var kUnitConfigReader
	*/
	var $UnitConfigReader = null;

	/**
	* Holds a reference to Session
	*
	* @var Session
	*/
	var $Session = null;

	/**
	* Holds a ref to kEventManager
	*
	* @var kEventManager
	*/
	var $EventManager = null;

	/**
	* Ref to itself, needed because everybody used to write $this->Application, even inside kApplication
	*
	* @var kApplication
	*/
	var $Application = null;

	/**
	* Ref for TemplatesChache
	*
	* @var TemplatesCache
	*/
	var $TemplatesCache = null;

	var $CompilationCache = array(); //used when compiling templates
	var $CachedProcessors = array(); //used when running compiled templates

	/**
	* Returns kApplication instance anywhere in the script.
	*
	* This method should be used to get single kApplication object instance anywhere in the
	* Kernel-based application. The method is guranteed to return the SAME instance of kApplication.
	* Anywhere in the script you could write:
	* <code>
	* $application =& kApplication::Instance();
	* </code>
	* or in an object:
	* <code>
	* $this->Application =& kApplication::Instance();
	* </code>
	* to get the instance of kApplication. Note that we call the Instance method as STATIC - directly from the class.
	* To use descendand of standard kApplication class in your project you would need to define APPLICATION_CLASS constant
	* BEFORE calling kApplication::Instance() for the first time. If APPLICATION_CLASS is not defined the method would
	* create and return default KernelApplication instance.
	* @static
	* @access public
	* @return kApplication
	*/
	function &Instance()
	{
	static $instance = false;

	if(!$instance)
	{
	safeDefine('APPLICATION_CLASS', 'kApplication');
	$class = APPLICATION_CLASS;
	$instance = new $class();
	$instance->Application =& $instance;
	}
	return $instance;
	}

	/**
	* Initializes the Application
	*
	* @access public
	* @see kHTTPQuery
	* @see Session
	* @see TemplatesCache
	* @return bool Was Init actually made now or before
	*/
	function Init()
	{
	if($this->InitDone) return false;

	if (!constOn('SKIP_OUT_COMPRESSION')) {
	ob_start(); // collect any output from method (other then tags) into buffer
	}

	if(defined('DEBUG_MODE') && $this->isDebugMode() && constOn('DBG_PROFILE_MEMORY')) {
	$this->Debugger->appendMemoryUsage('Application before Init:');
	}
	if (!$this->isDebugMode() && !constOn('DBG_ZEND_PRESENT')) {
	error_reporting(0);
	ini_set('display_errors', 0);
	}
	if (!constOn('DBG_ZEND_PRESENT')) {
	$error_handler = set_error_handler( Array(&$this,'handleError') );
	if ($error_handler) $this->errorHandlers[] = $error_handler;
	}

	$this->Conn = new kDBConnection(SQL_TYPE, Array(&$this, 'handleSQLError') );
	$this->Conn->Connect(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB);
	$this->Conn->debugMode = $this->isDebugMode();

	$this->Factory = new kFactory();
	$this->registerDefaultClasses();
	$this->Phrases = new PhrasesCache();
	$this->EventManager =& $this->Factory->makeClass('EventManager');
	$this->Factory->Storage['EventManager'] =& $this->EventManager;
	$this->RegisterDefaultBuildEvents();
	$this->SetDefaultConstants();

	$this->UnitConfigReader =& $this->recallObject('kUnitConfigReader');
	$this->UnitConfigReader->scanModules(MODULES_PATH);
	$this->registerModuleConstants();

	$rewrite_on = $this->ConfigValue('UseModRewrite');
	// admin=1 - when front is browsed using admin session
	$admin_on = getArrayValue($_REQUEST, 'admin') \|\| $this->IsAdmin();
	define('MOD_REWRITE', $rewrite_on && !$admin_on ? 1 : 0);

	$this->HttpQuery =& $this->recallObject('HTTPQuery');
	$this->Session =& $this->recallObject('Session');

	$this->HttpQuery->AfterInit();

	$this->LoadCache();
	$this->InitConfig();

	$this->Phrases->Init('phrases');

	$this->UnitConfigReader->AfterConfigRead();


	/*// Module items are recalled during url parsing & PhrasesCache is needed already there,
	// because it's used in their build events. That's why phrases cache initialization is
	// called from kHTTPQuery in case when mod_rewrite is used
	if (!$this->RewriteURLs()) {
	$this->Phrases = new PhrasesCache();
	}*/

	if(!$this->RecallVar('UserGroups')) {
	$session =& $this->recallObject('Session');
	$user_groups = trim($session->GetField('GroupList'), ',');
	if (!$user_groups) $user_groups = $this->ConfigValue('User_GuestGroup');
	$this->StoreVar('UserGroups', $user_groups);
	}

	if ($this->GetVar('m_cat_id') === false) $this->SetVar('m_cat_id', 0);
	if( !$this->RecallVar('curr_iso') ) $this->StoreVar('curr_iso', $this->GetPrimaryCurrency() );

	$this->SetVar('visits_id', $this->RecallVar('visit_id') );

	$language =& $this->recallObject( 'lang.current', null, Array('live_table' => true) );

	$this->ValidateLogin();

	if($this->isDebugMode()) {
	$this->Debugger->profileFinish('kernel4_startup');
	}

	$this->InitDone = true;

	$this->HandleEvent( new kEvent('adm:OnStartup') );

	return true;
	}

	/**
	* Returns module information. Searches module by requested field
	*
	* @param string $field
	* @param mixed $value
	* @param string field value to returns, if not specified, then return all fields
	* @param string field to return
	* @return Array
	*/
	function findModule($field, $value, $return_field = null)
	{
	$found = false;
	foreach ($this->ModuleInfo as $module_name => $module_info) {
	if (strtolower($module_info[$field]) == strtolower($value)) {
	$found = true;
	break;
	}
	}

	if ($found) {
	return isset($return_field) ? $module_info[$return_field] : $module_info;
	}

	return false;
	}

	function refreshModuleInfo()
	{
	$modules_helper =& $this->recallObject('ModulesHelper');
	$sql = 'SELECT *
	FROM '.TABLE_PREFIX.'Modules
	WHERE '.$modules_helper->getWhereClause().'
	ORDER BY LoadOrder';

	$this->ModuleInfo = $this->Conn->Query($sql, 'Name');
	$this->registerModuleConstants();
	}

	/**
	* Checks if passed language id if valid and sets it to primary otherwise
	*
	*/
	function VerifyLanguageId()
	{
	$language_id = $this->GetVar('m_lang');
	if (!$language_id) {
	$language_id = 'default';
	}
	$this->SetVar('lang.current_id', $language_id );
	$this->SetVar('m_lang', $language_id );

	$lang_mode = $this->GetVar('lang_mode');
	$this->SetVar('lang_mode', '');
	$lang =& $this->recallObject('lang.current');
	if ( !$lang->IsLoaded() \|\| (!$this->Application->IsAdmin() && !$lang->GetDBField('Enabled')) ) {
	if (!defined('IS_INSTALL')) $this->ApplicationDie('Unknown or disabled language');
	}
	$this->SetVar('lang_mode',$lang_mode);
	}

	/**
	* Checks if passed theme id if valid and sets it to primary otherwise
	*
	*/
	function VerifyThemeId()
	{
	if ($this->Application->IsAdmin()) {
	safeDefine('THEMES_PATH', '/core/admin_templates');
	return;
	}

	$theme_id = $this->GetVar('m_theme');
	if (!$theme_id) {
	$theme_id = $this->GetDefaultThemeId();
	if (!$theme_id) {
	if (!defined('IS_INSTALL')) $this->ApplicationDie('No Primary Theme Selected');
	}
	}
	$this->SetVar('m_theme', $theme_id);
	$this->SetVar('theme.current_id', $theme_id ); // KOSTJA: this is to fool theme' getPassedId
	$theme =& $this->recallObject('theme.current');
	if (!$theme->IsLoaded() \|\| !$theme->GetDBField('Enabled')) {
	if (!defined('IS_INSTALL')) $this->ApplicationDie('Unknown or disabled theme');
	}
	safeDefine('THEMES_PATH', '/themes/'.$theme->GetDBField('Name'));
	}

	function GetDefaultLanguageId()
	{
	static $language_id = 0;

	if ($language_id > 0) return $language_id;

	$table = $this->getUnitOption('lang','TableName');
	$id_field = $this->getUnitOption('lang','IDField');
	$sql = 'SELECT '.$id_field.'
	FROM '.$table.'
	WHERE (PrimaryLang = 1) AND (Enabled = 1)';
	$language_id = $this->Conn->GetOne($sql);

	if (!$language_id && defined('IS_INSTALL') && IS_INSTALL) {
	$language_id = 1;
	}

	return $language_id;
	}

	function GetDefaultThemeId()
	{
	static $theme_id = 0;

	if($theme_id > 0) return $theme_id;

	if (constOn('DBG_FORCE_THEME')) {
	$theme_id = DBG_FORCE_THEME;
	}
	elseif ($this->IsAdmin()) {
	$theme_id = 999;
	}
	else {
	$table = $this->getUnitOption('theme','TableName');
	$id_field = $this->getUnitOption('theme','IDField');
	$sql = 'SELECT '.$id_field.'
	FROM '.$table.'
	WHERE (PrimaryTheme = 1) AND (Enabled = 1)';
	$theme_id = $this->Conn->GetOne($sql);
	}
	return $theme_id;
	}

	function GetPrimaryCurrency()
	{
	if ($this->isModuleEnabled('In-Commerce')) {
	$table = $this->getUnitOption('curr', 'TableName');
	return $this->Conn->GetOne('SELECT ISO FROM '.$table.' WHERE IsPrimary = 1');
	}
	else {
	return 'USD';
	}
	}

	/**
	* Registers default classes such as ItemController, GridController and LoginController
	*
	* Called automatically while initializing Application
	* @access private
	* @return void
	*/
	function RegisterDefaultClasses()
	{
	$this->registerClass('kTempTablesHandler', KERNEL_PATH.'/utility/temp_handler.php');
	$this->registerClass('kEventManager', KERNEL_PATH.'/event_manager.php', 'EventManager');
	$this->registerClass('kUnitConfigReader', KERNEL_PATH.'/utility/unit_config_reader.php');

	$this->registerClass('kArray', KERNEL_PATH.'/utility/params.php');
	$this->registerClass('Params', KERNEL_PATH.'/utility/params.php');
	$this->registerClass('kHelper', KERNEL_PATH.'/kbase.php');

	$this->registerClass('kCache', KERNEL_PATH.'/utility/cache.php', 'Cache', Array('Params'));
	$this->registerClass('kHTTPQuery', KERNEL_PATH.'/utility/http_query.php', 'HTTPQuery', Array('Params') );

	$this->registerClass('Session', KERNEL_PATH.'/session/session.php');
	$this->registerClass('SessionStorage', KERNEL_PATH.'/session/session.php');



	$this->registerClass('Params', KERNEL_PATH.'/utility/params.php', 'kActions');

	$this->registerClass('kMultipleFilter', KERNEL_PATH.'/utility/filters.php');
	$this->registerClass('kDBList', KERNEL_PATH.'/db/dblist.php');
	$this->registerClass('kDBItem', KERNEL_PATH.'/db/dbitem.php');
	$this->registerClass('kDBEventHandler', KERNEL_PATH.'/db/db_event_handler.php');

	$this->registerClass('kTagProcessor', KERNEL_PATH.'/processors/tag_processor.php');
	$this->registerClass('kMainTagProcessor', KERNEL_PATH.'/processors/main_processor.php','m_TagProcessor', 'kTagProcessor');
	$this->registerClass('kDBTagProcessor', KERNEL_PATH.'/db/db_tag_processor.php', null, 'kTagProcessor');

	$this->registerClass('TemplatesCache', KERNEL_PATH.'/parser/template.php');
	$this->registerClass('Template', KERNEL_PATH.'/parser/template.php');
	$this->registerClass('TemplateParser', KERNEL_PATH.'/parser/template_parser.php',null, 'kDBTagProcessor');

	$this->registerClass('kEmailMessage', KERNEL_PATH.'/utility/email.php');
	$this->registerClass('kSmtpClient', KERNEL_PATH.'/utility/smtp_client.php');

	if (file_exists(MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php')) {
	$this->registerClass('kCurrencyRates', MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php');
	}

	$this->registerClass('FCKeditor', FULL_PATH.'/admin/editor/cmseditor/fckeditor.php'); // need this?

	/* Moved from MyApplication */

	$this->registerClass('Inp1Parser',KERNEL_PATH.'/../units/general/inp1_parser.php','Inp1Parser');

	$this->registerClass('InpSession',KERNEL_PATH.'/../units/general/inp_ses_storage.php','Session');
	$this->registerClass('InpSessionStorage',KERNEL_PATH.'/../units/general/inp_ses_storage.php','SessionStorage');

	$this->registerClass('kCatDBItem',KERNEL_PATH.'/../units/general/cat_dbitem.php');
	$this->registerClass('kCatDBItemExportHelper',KERNEL_PATH.'/../units/general/cat_dbitem_export.php', 'CatItemExportHelper');
	$this->registerClass('kCatDBList',KERNEL_PATH.'/../units/general/cat_dblist.php');
	$this->registerClass('kCatDBEventHandler',KERNEL_PATH.'/../units/general/cat_event_handler.php');
	$this->registerClass('kCatDBTagProcessor',KERNEL_PATH.'/../units/general/cat_tag_processor.php');

	// Do not move to config - this helper is used before configs are read
	$this->registerClass('kModulesHelper', KERNEL_PATH.'/../units/general/helpers/modules.php', 'ModulesHelper');

	/* End moved */

	}

	function RegisterDefaultBuildEvents()
	{
	$event_manager =& $this->recallObject('EventManager');
	$event_manager->registerBuildEvent('kTempTablesHandler', 'OnTempHandlerBuild');
	}

	/**
	* Returns item's filename that corresponds id passed. If possible, then get it from cache
	*
	* @param string $prefix
	* @param int $id
	* @return string
	*/
	function getFilename($prefix, $id, $category_id=null)
	{
	$filename = $this->getCache('filenames', $prefix.'_'.$id);
	if ($filename === false) {
	$table = $this->getUnitOption($prefix, 'TableName');
	$id_field = $this->getUnitOption($prefix, 'IDField');

	if ($prefix == 'c') {
	if(!$id) {
	$this->setCache('filenames', $prefix.'_'.$id, '');
	return '';
	}

	// this allows to save 2 sql queries for each category
	$sql = 'SELECT NamedParentPath, CachedCategoryTemplate
	FROM '.$table.'
	WHERE '.$id_field.' = '.$this->Conn->qstr($id);
	$category_data = $this->Conn->GetRow($sql);
	$filename = $category_data['NamedParentPath'];
	$this->setCache('category_templates', $id, $category_data['CachedCategoryTemplate']);
	// $this->setCache('item_templates', $id, $category_data['CachedItemTemplate']);
	}
	else {
	$resource_id = $this->Conn->GetOne('SELECT ResourceId FROM '.$table.' WHERE '.$id_field.' = '.$this->Conn->qstr($id));
	if (is_null($category_id)) $category_id = $this->GetVar('m_cat_id');
	$sql = 'SELECT Filename FROM '.TABLE_PREFIX.'CategoryItems WHERE ItemResourceId = '.$resource_id.' AND CategoryId = '.$category_id;
	$filename = $this->Conn->GetOne($sql);

	/*if (!$filename) {
	$sql = 'SELECT Filename FROM '.TABLE_PREFIX.'CategoryItems WHERE ItemResourceId = '.$resource_id.' AND PrimaryCat = 1';
	$filename = $this->Conn->GetOne($sql);
	}*/

	/*$sql = 'SELECT Filename
	FROM '.$table.'
	WHERE '.$id_field.' = '.$this->Conn->qstr($id);
	$filename = $this->Conn->GetOne($sql);*/
	}
	$this->setCache('filenames', $prefix.'_'.$id, $filename);
	}
	return $filename;
	}


	/**
	* Adds new value to cache $cache_name and identified by key $key
	*
	* @param string $cache_name cache name
	* @param int $key key name to add to cache
	* @param mixed $value value of chached record
	*/
	function setCache($cache_name, $key, $value)
	{
	$cache =& $this->recallObject('Cache');
	$cache->setCache($cache_name, $key, $value);
	}

	/**
	* Returns cached $key value from cache named $cache_name
	*
	* @param string $cache_name cache name
	* @param int $key key name from cache
	* @return mixed
	*/
	function getCache($cache_name, $key)
	{
	$cache =& $this->recallObject('Cache');
	return $cache->getCache($cache_name, $key);
	}

	/**
	* Defines default constants if it's not defined before - in config.php
	*
	* @access private
	*/
	function SetDefaultConstants()
	{
	safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST']);
	}

	/**
	* Registers each module specific constants if any found
	*
	*/
	function registerModuleConstants()
	{
	if (file_exists(KERNEL_PATH.'/constants.php')) {
	k4_include_once(KERNEL_PATH.'/constants.php');
	}

	if (!$this->ModuleInfo) return false;
	foreach($this->ModuleInfo as $module_name => $module_info)
	{
	$module_path = '/'.$module_info['Path'];
	$contants_file = FULL_PATH.$module_path.'constants.php';
	if( file_exists($contants_file) ) k4_include_once($contants_file);
	}
	return true;
	}

	function ProcessRequest()
	{
	$event_manager =& $this->recallObject('EventManager');

	if($this->isDebugMode() && constOn('DBG_SHOW_HTTPQUERY')) {
	$this->Debugger->appendHTML('HTTPQuery:');
	$this->Debugger->dumpVars($this->HttpQuery->_Params);
	}

	$event_manager->ProcessRequest();
	$event_manager->RunRegularEvents(reBEFORE);
	$this->RequestProcessed = true;
	}

	/**
	* Actually runs the parser against current template and stores parsing result
	*
	* This method gets t variable passed to the script, loads the template given in t variable and
	* parses it. The result is store in {@link $this->HTML} property.
	* @access public
	* @return void
	*/
	function Run()
	{
	if($this->isDebugMode() && constOn('DBG_PROFILE_MEMORY')) {
	$this->Debugger->appendMemoryUsage('Application before Run:');
	}

	if ($this->IsAdmin()) {
	// for permission checking in events & templates
	$this->LinkVar('module'); // for common configuration templates
	$this->LinkVar('section'); // for common configuration templates

	if ($this->GetVar('m_opener') == 'p') {
	$this->LinkVar('main_prefix'); // window prefix, that opened selector
	$this->LinkVar('dst_field'); // field to set value choosed in selector
	// $this->LinkVar('return_template'); // template to go, when something was coosen from popup (from finalizePopup)
	// $this->LinkVar('return_m'); // main env part to restore after popup will be closed (from finalizePopup)
	}

	if ($this->GetVar('ajax') == 'yes') {
	// hide debug output from ajax requests automatically
	define('DBG_SKIP_REPORTING', 1);
	}
	}

	if (!$this->RequestProcessed) $this->ProcessRequest();

	$this->InitParser();
	$t = $this->GetVar('t');

	if ($this->isModuleEnabled('In-Edit')) {
	$cms_handler =& $this->recallObject('cms_EventHandler');
	if (!$this->TemplatesCache->TemplateExists($t) && !$this->IsAdmin()) {
	$t = $cms_handler->GetDesignTemplate();
	}
	/*else {
	$cms_handler->SetCatByTemplate();
	}*/
	}

	if ($this->isModuleEnabled('Proj-CMS')) {
	$cms_handler =& $this->recallObject('st_EventHandler');
	if (!$this->TemplatesCache->TemplateExists($t) && !$this->IsAdmin()) {
	$t = $cms_handler->GetDesignTemplate();
	}
	/*else {
	$cms_handler->SetCatByTemplate();
	}*/
	}


	if($this->isDebugMode() && constOn('DBG_PROFILE_MEMORY')) {
	$this->Debugger->appendMemoryUsage('Application before Parsing:');
	}

	$this->HTML = $this->Parser->ParseTemplate( $t );

	if ($this->isDebugMode() && constOn('DBG_PROFILE_MEMORY')) {
	$this->Debugger->appendMemoryUsage('Application after Parsing:');
	}
	}

	function InitParser()
	{
	if( !is_object($this->Parser) ) {
	$this->Parser =& $this->recallObject('TemplateParser');
	$this->TemplatesCache =& $this->recallObject('TemplatesCache');
	}
	}

	/**
	* Send the parser results to browser
	*
	* Actually send everything stored in {@link $this->HTML}, to the browser by echoing it.
	* @access public
	* @return void
	*/
	function Done()
	{
	if ($this->isDebugMode() && constOn('DBG_PROFILE_MEMORY')) {
	$this->Debugger->appendMemoryUsage('Application before Done:');
	}

	if ($this->GetVar('admin')) {
	$reg = '/('.preg_quote(BASE_PATH, '/').'.\.html)(#.){0,1}(")/sU';
	$this->HTML = preg_replace($reg, "$1?admin=1$2$3", $this->HTML);
	}

	//eval("?".">".$this->HTML);

	if ($this->isDebugMode()) {
	$this->EventManager->RunRegularEvents(reAFTER);
	$this->Session->SaveData();

	$this->HTML = ob_get_clean() . $this->HTML . $this->Debugger->printReport(true);
	}
	else {
	$this->HTML = ob_get_clean().$this->HTML;
	}

	if ($this->UseOutputCompression()) {
	header('Content-Encoding: gzip');
	$compression_level = $this->ConfigValue('OutputCompressionLevel');
	if ($compression_level < 0 \|\| $compression_level > 9) $compression_level = 7;
	echo gzencode($this->HTML, $compression_level);
	}
	else {
	echo $this->HTML;
	}

	$this->UpdateCache();

	flush();

	if ($this->isDebugMode() && constOn('DBG_CACHE')) {
	$cache =& $this->recallObject('Cache');
	$cache->printStatistics();
	}

	$this->EventManager->RunRegularEvents(reAFTER);
	$this->Session->SaveData();
	}

	/**
	* Checks if output compression options is available
	*
	* @return string
	*/
	function UseOutputCompression()
	{
	if (constOn('IS_INSTALL') \|\| constOn('DBG_ZEND_PRESENT') \|\| constOn('SKIP_OUT_COMPRESSION')) return false;
	return $this->ConfigValue('UseOutputCompression') && function_exists('gzencode') && strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
	}

	// Facade

	/**
	* Returns current session id (SID)
	* @access public
	* @return longint
	*/
	function GetSID()
	{
	$session =& $this->recallObject('Session');
	return $session->GetID();
	}

	function DestroySession()
	{
	$session =& $this->recallObject('Session');
	$session->Destroy();
	}

	/**
	* Returns variable passed to the script as GET/POST/COOKIE
	*
	* @access public
	* @param string $name Name of variable to retrieve
	* @param int $default default value returned in case if varible not present
	* @return mixed
	*/
	function GetVar($name, $default = false)
	{
	// $http_query =& $this->recallObject('HTTPQuery');
	return isset($this->HttpQuery->_Params[$name]) ? $this->HttpQuery->_Params[$name] : $default;
	}

	/**
	* Returns ALL variables passed to the script as GET/POST/COOKIE
	*
	* @access public
	* @return array
	*/
	function GetVars()
	{
	return $this->HttpQuery->GetParams();
	}

	/**
	* Set the variable 'as it was passed to the script through GET/POST/COOKIE'
	*
	* This could be useful to set the variable when you know that
	* other objects would relay on variable passed from GET/POST/COOKIE
	* or you could use SetVar() / GetVar() pairs to pass the values between different objects.<br>
	*
	* This method is formerly known as $this->Session->SetProperty.
	* @param string $var Variable name to set
	* @param mixed $val Variable value
	* @access public
	* @return void
	*/
	function SetVar($var,$val)
	{
	// $http_query =& $this->recallObject('HTTPQuery');
	return $this->HttpQuery->Set($var,$val);
	}

	/**
	* Deletes kHTTPQuery variable
	*
	* @param string $var
	* @todo think about method name
	*/
	function DeleteVar($var)
	{
	return $this->HttpQuery->Remove($var);
	}

	/**
	* Deletes Session variable
	*
	* @param string $var
	*/
	function RemoveVar($var)
	{
	return $this->Session->RemoveVar($var);
	}

	function RemovePersistentVar($var)
	{
	return $this->Session->RemovePersistentVar($var);
	}

	/**
	* Restores Session variable to it's db version
	*
	* @param string $var
	*/
	function RestoreVar($var)
	{
	return $this->Session->RestoreVar($var);
	}

	/**
	* Returns session variable value
	*
	* Return value of $var variable stored in Session. An optional default value could be passed as second parameter.
	*
	* @see SimpleSession
	* @access public
	* @param string $var Variable name
	* @param mixed $default Default value to return if no $var variable found in session
	* @return mixed
	*/
	function RecallVar($var,$default=false)
	{
	return $this->Session->RecallVar($var,$default);
	}

	function RecallPersistentVar($var, $default = false)
	{
	return $this->Session->RecallPersistentVar($var, $default);
	}

	/**
	* Stores variable $val in session under name $var
	*
	* Use this method to store variable in session. Later this variable could be recalled.
	* @see RecallVar
	* @access public
	* @param string $var Variable name
	* @param mixed $val Variable value
	*/
	function StoreVar($var, $val)
	{
	$session =& $this->recallObject('Session');
	$this->Session->StoreVar($var, $val);
	}

	function StorePersistentVar($var, $val)
	{
	$this->Session->StorePersistentVar($var, $val);
	}

	function StoreVarDefault($var, $val)
	{
	$session =& $this->recallObject('Session');
	$this->Session->StoreVarDefault($var, $val);
	}

	/**
	* Links HTTP Query variable with session variable
	*
	* If variable $var is passed in HTTP Query it is stored in session for later use. If it's not passed it's recalled from session.
	* This method could be used for making sure that GetVar will return query or session value for given
	* variable, when query variable should overwrite session (and be stored there for later use).<br>
	* This could be used for passing item's ID into popup with multiple tab -
	* in popup script you just need to call LinkVar('id', 'current_id') before first use of GetVar('id').
	* After that you can be sure that GetVar('id') will return passed id or id passed earlier and stored in session
	* @access public
	* @param string $var HTTP Query (GPC) variable name
	* @param mixed $ses_var Session variable name
	* @param mixed $default Default variable value
	*/
	function LinkVar($var, $ses_var = null, $default = '')
	{
	if (!isset($ses_var)) $ses_var = $var;
	if ($this->GetVar($var) !== false) {
	$this->StoreVar($ses_var, $this->GetVar($var));
	}
	else {
	$this->SetVar($var, $this->RecallVar($ses_var, $default));
	}
	}

	/**
	* Returns variable from HTTP Query, or from session if not passed in HTTP Query
	*
	* The same as LinkVar, but also returns the variable value taken from HTTP Query if passed, or from session if not passed.
	* Returns the default value if variable does not exist in session and was not passed in HTTP Query
	*
	* @see LinkVar
	* @access public
	* @param string $var HTTP Query (GPC) variable name
	* @param mixed $ses_var Session variable name
	* @param mixed $default Default variable value
	* @return mixed
	*/
	function GetLinkedVar($var, $ses_var = null, $default = '')
	{
	$this->LinkVar($var, $ses_var, $default);
	return $this->GetVar($var);
	}

	function AddBlock($name, $tpl)
	{
	$this->cache[$name] = $tpl;
	}

	/* Seems to be not used anywhere... /Kostja

	function SetTemplateBody($title,$body)
	{
	$templates_cache =& $this->recallObject('TemplatesCache');
	$templates_cache->SetTemplateBody($title,$body);
	}*/

	function ProcessTag($tag_data)
	{
	$a_tag = new Tag($tag_data,$this->Parser);
	return $a_tag->DoProcessTag();
	}

	function ProcessParsedTag($prefix, $tag, $params)
	{
	$a_tag = new Tag('',$this->Parser);
	$a_tag->Tag = $tag;
	$tmp=$this->Application->processPrefix($prefix);
	$a_tag->Processor = $tmp['prefix'];
	$a_tag->Special = $tmp['special'];
	$a_tag->NamedParams = $params;
	return $a_tag->DoProcessTag();
	}

	/**
	* Return ADODB Connection object
	*
	* Returns ADODB Connection object already connected to the project database, configurable in config.php
	* @access public
	* @return kDBConnection
	*/
	function &GetADODBConnection()
	{
	return $this->Conn;
	}

	function ParseBlock($params,$pass_params=0,$as_template=false)
	{
	if (substr($params['name'], 0, 5) == 'html:') return substr($params['name'], 6);
	return $this->Parser->ParseBlock($params, $pass_params, $as_template);
	}

	/**
	* Returns index file, that could be passed as parameter to method, as parameter to tag and as constant or not passed at all
	*
	* @param string $prefix
	* @param string $index_file
	* @param Array $params
	* @return string
	*/
	function getIndexFile($prefix, $index_file, &$params)
	{
	if (isset($params['index_file'])) {
	$index_file = $params['index_file'];
	unset($params['index_file']);
	return $index_file;
	}

	if (isset($index_file)) {
	return $index_file;
	}

	if (defined('INDEX_FILE')) {
	return INDEX_FILE;
	}

	$cut_prefix = trim(BASE_PATH, '/').'/'.trim($prefix, '/');
	return trim(preg_replace('/'.preg_quote($cut_prefix, '/').'(.*)/', '\\1', $_SERVER['PHP_SELF']), '/');
	}

	/**
	* Return href for template
	*
	* @access public
	* @param string $t Template path
	* @var string $prefix index.php prefix - could be blank, 'admin'
	*/
	function HREF($t, $prefix='', $params=null, $index_file=null)
	{
	if(!$t) $t = $this->GetVar('t'); // moved from kMainTagProcessor->T()

	if ($this->isModuleEnabled('Proj-CMS')) {
	$t = preg_replace('/^Content\//', '', $t);
	}

	/*if ($this->GetVar('skip_last_template')) {
	$params['opener'] = 'p';
	$this->SetVar('m_opener', 'p');
	}

	if ($t == 'incs/close_popup') {
	// because this template closes the popup and we don't need popup mark here anymore
	$params['m_opener'] = 's';
	}*/

	if( substr($t, -4) == '.tpl' ) $t = substr($t, 0, strlen($t) - 4 );

	if ( $this->IsAdmin() && $prefix == '') $prefix = '/admin';
	if ( $this->IsAdmin() && $prefix == '_FRONT_END_') $prefix = '';

	$index_file = $this->getIndexFile($prefix, $index_file, $params);

	if (isset($params['_auto_prefix_'])) {
	unset($params['_auto_prefix_']); // this is parser-related param, do not need to pass it here
	}

	$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
	if ($ssl !== null) {
	$session =& $this->recallObject('Session');
	$cookie_url = trim($session->CookieDomain.$session->CookiePath, '/.');
	if ($ssl) {
	$target_url = $this->ConfigValue('SSL_URL');
	}
	else {
	$target_url = 'http://'.DOMAIN.$this->ConfigValue('Site_Path');
	}

	if (!preg_match('#'.preg_quote($cookie_url).'#', $target_url)) {
	$session->SetMode(smGET_ONLY);
	}
	}

	if (getArrayValue($params, 'opener') == 'u') {
	$wid = $this->Application->GetVar('m_wid');
	$stack_name = rtrim('opener_stack_'.$wid, '_');
	$opener_stack = $this->RecallVar($stack_name);

	if ($opener_stack && $opener_stack != serialize(Array())) {
	$opener_stack = unserialize($opener_stack);
	list($index_file, $env) = explode('\|', $opener_stack[count($opener_stack) - 1]);
	$ret = $this->BaseURL($prefix, $ssl).$index_file.'?'.ENV_VAR_NAME.'='.$env;
	if ( getArrayValue($params,'escape') ) $ret = addslashes($ret);

	if (isset($params['m_opener']) && $params['m_opener'] == 'u') {
	array_pop($opener_stack);
	if (!$opener_stack) {
	$this->RemoveVar($stack_name);
	// remove popups last templates, because popup is closing now
	$this->RemoveVar('last_template_'.$wid);
	$this->RemoveVar('last_template_popup_'.$wid);

	// don't save popups last templates again :)
	$this->SetVar('skip_last_template', 1);
	}
	else {
	$this->StoreVar($stack_name, serialize($opener_stack));
	}
	}
	return $ret;
	}
	else {
	//define('DBG_REDIRECT', 1);
	$t = $this->GetVar('t');
	}
	}

	$pass = isset($params['pass']) ? $params['pass'] : '';
	$pass_events = isset($params['pass_events']) ? $params['pass_events'] : false; // pass events with url

	$map_link = '';
	if( isset($params['anchor']) )
	{
	$map_link = '#'.$params['anchor'];
	unset($params['anchor']);
	}

	if ( isset($params['no_amp']) )
	{
	$params['__URLENCODE__'] = $params['no_amp'];
	unset($params['no_amp']);
	}

	$no_rewrite = false;
	if( isset($params['__NO_REWRITE__']) )
	{
	$no_rewrite = true;
	unset($params['__NO_REWRITE__']);
	}

	$force_rewrite = false;
	if( isset($params['__MOD_REWRITE__']) )
	{
	$force_rewrite = true;
	unset($params['__MOD_REWRITE__']);
	}

	$force_no_sid = false;
	if( isset($params['__NO_SID__']) )
	{
	$force_no_sid = true;
	unset($params['__NO_SID__']);
	}

	// append pass through variables to each link to be build
	$params = array_merge_recursive2($this->getPassThroughVariables($params), $params);

	if ($force_rewrite \|\| ($this->RewriteURLs($ssl) && !$no_rewrite))
	{
	$session =& $this->recallObject('Session');
	if( $session->NeedQueryString() && !$force_no_sid ) $params['sid'] = $this->GetSID();
	$url = $this->BuildEnv_NEW($t, $params, $pass, $pass_events);
	$ret = $this->BaseURL($prefix, $ssl).$url.$map_link;
	}
	else
	{
	unset($params['pass_category']); // we don't need to pass it when mod_rewrite is off
	$env = $this->BuildEnv($t, $params, $pass, $pass_events);
	$ret = $this->BaseURL($prefix, $ssl).$index_file.'?'.$env.$map_link;
	}

	return $ret;
	}

	/**
	* Returns variables with values that should be passed throught with this link + variable list
	*
	* @param Array $params
	* @return Array
	*/
	function getPassThroughVariables(&$params)
	{
	static $cached_pass_through = null;

	if (isset($params['no_pass_through']) && $params['no_pass_through']) {
	unset($params['no_pass_through']);
	return Array();
	}

	// because pass through is not changed during script run, then we can cache it
	if (is_null($cached_pass_through)) {

	$cached_pass_through = Array();
	$pass_through = $this->Application->GetVar('pass_through');

	if ($pass_through) {
	// names of variables to pass to each link
	$cached_pass_through['pass_through'] = $pass_through;
	$pass_through = explode(',', $pass_through);
	foreach ($pass_through as $pass_through_var) {
	$cached_pass_through[$pass_through_var] = $this->Application->GetVar($pass_through_var);
	}
	}

	}

	return $cached_pass_through;
	}


	/**
	* Returns sorted array of passed prefixes (to build url from)
	*
	* @param string $pass
	* @return Array
	*/
	function getPassInfo($pass = 'all')
	{
	$pass = trim(preg_replace('/(?<=,\|\\A)all(?=,\|\\z)/', trim($this->GetVar('passed'), ','), trim($pass, ',')), ',');

	if (!$pass) {
	return Array();
	}

	$pass_info = array_unique( explode(',', $pass) ); // array( prefix[.special], prefix[.special] ...
	sort($pass_info, SORT_STRING); // to be prefix1,prefix1.special1,prefix1.special2,prefix3.specialX

	// ensure that "m" prefix is at the beginning
	$main_index = array_search('m', $pass_info);
	if ($main_index !== false) {
	unset($pass_info[$main_index]);
	array_unshift($pass_info, 'm');
	}
	return $pass_info;
	}

	function BuildEnv_NEW($t, $params, $pass='all', $pass_events = false)
	{
	// $session =& $this->recallObject('Session');
	$force_admin = getArrayValue($params,'admin') \|\| $this->GetVar('admin');

	// if($force_admin) $sid = $this->GetSID();

	$ret = '';
	$env = '';

	$encode = false;
	if (isset($params['__URLENCODE__']))
	{
	$encode = $params['__URLENCODE__'];
	unset($params['__URLENCODE__']);
	}

	if (isset($params['__SSL__'])) {
	unset($params['__SSL__']);
	}

	$m_only = true;
	$pass_info = $this->getPassInfo($pass);
	if ($pass_info) {
	if ($pass_info[0] == 'm') array_shift($pass_info);
	$params['t'] = $t;
	foreach($pass_info as $pass_index => $pass_element)
	{
	list($prefix) = explode('.', $pass_element);
	$require_rewrite = $this->findModule('Var', $prefix) && $this->getUnitOption($prefix, 'CatalogItem');
	if ($require_rewrite) {
	// if next prefix is same as current, but with special => exclude current prefix from url
	$next_prefix = getArrayValue($pass_info, $pass_index + 1);
	if ($next_prefix) {
	$next_prefix = substr($next_prefix, 0, strlen($prefix) + 1);
	if ($prefix.'.' == $next_prefix) continue;
	}
	$a = $this->BuildModuleEnv_NEW($pass_element, $params, $pass_events);
	if ($a) {
	$ret .= '/'.$a;
	$m_only = false;
	}
	}
	else
	{
	$env .= ':'.$this->BuildModuleEnv($pass_element, $params, $pass_events);
	}
	}
	if (!$m_only) $params['pass_category'] = 1;
	$ret = $this->BuildModuleEnv_NEW('m', $params, $pass_events).$ret;
	$cat_processed = isset($params['category_processed']) && $params['category_processed'];
	if ($cat_processed) {
	unset($params['category_processed']);
	}

	if (!$m_only \|\| !$cat_processed \|\| !defined('EXP_DIR_URLS')) {
	$ret = trim($ret, '/').'.html';
	}
	else {
	$ret .= '/';
	}

	// $ret = trim($ret, '/').'/';
	if($env) $params[ENV_VAR_NAME] = ltrim($env, ':');
	}

	unset($params['pass'], $params['opener'], $params['m_event']);
	if ($force_admin) $params['admin'] = 1;

	if( getArrayValue($params,'escape') )
	{
	$ret = addslashes($ret);
	unset($params['escape']);
	}

	$ret = str_replace('%2F', '/', urlencode($ret));

	$params_str = '';
	$join_string = $encode ? '&' : '&';
	foreach ($params as $param => $value)
	{
	$params_str .= $join_string.$param.'='.$value;
	}
	$ret .= preg_replace('/^'.$join_string.'(.*)/', '?\\1', $params_str);

	if ($encode) {
	$ret = str_replace('\\', '%5C', $ret);
	}
	return $ret;
	}


	function BuildModuleEnv_NEW($prefix_special, &$params, $pass_events = false)
	{
	$event_params = Array('pass_events' => $pass_events, 'url_params' => $params);
	$event = new kEvent($prefix_special.':BuildEnv', $event_params);
	$this->HandleEvent($event);
	$params = $event->getEventParam('url_params'); // save back unprocessed parameters

	$ret = '';
	if ($event->getEventParam('env_string')) {
	$ret = trim( $event->getEventParam('env_string'), '/');
	}
	return $ret;
	}

	/**
	* Builds env part that corresponds prefix passed
	*
	* @param string $prefix_special item's prefix & [special]
	* @param Array $params url params
	* @param bool $pass_events
	*/
	function BuildModuleEnv($prefix_special, &$params, $pass_events = false)
	{
	list($prefix) = explode('.', $prefix_special);
	$query_vars = $this->getUnitOption($prefix, 'QueryString');

	//if pass events is off and event is not implicity passed
	if( !$pass_events && !isset($params[$prefix_special.'_event']) ) {
	$params[$prefix_special.'_event'] = ''; // remove event from url if requested
	//otherwise it will use value from get_var
	}

	if(!$query_vars) return '';

	$tmp_string = Array(0 => $prefix_special);
	foreach($query_vars as $index => $var_name)
	{
	//if value passed in params use it, otherwise use current from application
	$var_name = $prefix_special.'_'.$var_name;
	$tmp_string[$index] = isset( $params[$var_name] ) ? $params[$var_name] : $this->GetVar($var_name);
	if ( isset($params[$var_name]) ) unset( $params[$var_name] );
	}

	$escaped = array();
	foreach ($tmp_string as $tmp_val) {
	$escaped[] = str_replace(Array('-',':'), Array('\-','\:'), $tmp_val);
	}

	$ret = implode('-', $escaped);
	if ($this->getUnitOption($prefix, 'PortalStyleEnv') == true)
	{
	$ret = preg_replace('/^([a-zA-Z]+)-([0-9]+)-(.*)/','\\1\\2-\\3', $ret);
	}
	return $ret;
	}

	function BuildEnv($t, $params, $pass='all', $pass_events = false, $env_var = true)
	{
	$session =& $this->recallObject('Session');
	$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
	$sid = $session->NeedQueryString() && !$this->RewriteURLs($ssl) ? $this->GetSID() : '';
	// if (getArrayValue($params,'admin') == 1) $sid = $this->GetSID();

	$ret = '';
	if ($env_var) {
	$ret = ENV_VAR_NAME.'=';
	}

	$ret .= $sid.(constOn('INPORTAL_ENV') ? '-' : ':');

	$encode = false;
	if (isset($params['__URLENCODE__'])) {
	$encode = $params['__URLENCODE__'];
	unset($params['__URLENCODE__']);
	}

	if (isset($params['__SSL__'])) {
	unset($params['__SSL__']);
	}

	$env_string = '';
	$category_id = isset($params['m_cat_id']) ? $params['m_cat_id'] : $this->GetVar('m_cat_id');

	$item_id = 0;
	$pass_info = $this->getPassInfo($pass);
	if ($pass_info) {
	if ($pass_info[0] == 'm') array_shift($pass_info);
	foreach ($pass_info as $pass_element) {
	list($prefix) = explode('.', $pass_element);
	$require_rewrite = $this->findModule('Var', $prefix);
	if ($require_rewrite) {
	$item_id = isset($params[$pass_element.'_id']) ? $params[$pass_element.'_id'] : $this->GetVar($pass_element.'_id');
	}
	$env_string .= ':'.$this->BuildModuleEnv($pass_element, $params, $pass_events);
	}
	}

	if (strtolower($t) == '__default__') {
	// to put category & item templates into cache
	$filename = $this->getFilename('c', $category_id);
	if ($item_id) {
	$mod_rw_helper =& $this->Application->recallObject('ModRewriteHelper');
	$t = $mod_rw_helper->GetItemTemplate($category_id, $pass_element); // $pass_element should be the last processed element
	// $t = $this->getCache('item_templates', $category_id);
	}
	elseif ($category_id) {
	$t = $this->getCache('category_templates', $category_id);
	}
	else {
	$t = 'index';
	}
	}

	$ret .= $t.':'.$this->BuildModuleEnv('m', $params, $pass_events).$env_string;

	unset($params['pass']);
	unset($params['opener']);
	unset($params['m_event']);

	if ($this->GetVar('admin') && !isset($params['admin'])) {
	$params['admin'] = 1;
	}

	if( getArrayValue($params,'escape') )
	{
	$ret = addslashes($ret);
	unset($params['escape']);
	}

	$join_string = $encode ? '&' : '&';
	$params_str = '';
	foreach ($params as $param => $value)
	{
	$params_str .= $join_string.$param.'='.$value;
	}
	$ret .= $params_str;

	if ($encode) {
	$ret = str_replace('\\', '%5C', $ret);
	}
	return $ret;
	}

	function BaseURL($prefix='', $ssl=null)
	{
	if ($ssl === null) {
	return PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').rtrim(BASE_PATH, '/').$prefix.'/';
	}
	else {
	if ($ssl) {
	return rtrim( $this->ConfigValue('SSL_URL'), '/').$prefix.'/';
	}
	else {
	return 'http://'.DOMAIN.(defined('PORT')?':'.PORT : '').rtrim( $this->ConfigValue('Site_Path'), '/').$prefix.'/';
	}
	}
	}

	function Redirect($t='', $params=null, $prefix='', $index_file=null)
	{
	$js_redirect = getArrayValue($params, 'js_redirect');
	if (preg_match("/external:(.*)/", $t, $rets)) {
	$location = $rets[1];
	}
	else {
	if ($t == '' \|\| $t === true) $t = $this->GetVar('t');

	// pass prefixes and special from previous url
	if( isset($params['js_redirect']) ) unset($params['js_redirect']);

	if (!isset($params['pass'])) $params['pass'] = 'all';
	if ($this->GetVar('ajax') == 'yes' && $t == $this->GetVar('t')) {
	// redirects to the same template as current
	$params['ajax'] = 'yes';
	}
	$params['__URLENCODE__'] = 1;
	$location = $this->HREF($t, $prefix, $params, $index_file);
	//echo " location : $location <br>";
	}

	$a_location = $location;
	$location = "Location: $location";


	if ($this->isDebugMode() && constOn('DBG_REDIRECT')) {
	$this->Debugger->appendTrace();
	echo "<b>Debug output above!!!</b> Proceed to redirect: <a href=\"$a_location\">$a_location</a><br>";
	}
	else {
	if ($js_redirect) {
	$this->SetVar('t', 'redirect');
	$this->SetVar('redirect_to_js', addslashes($a_location) );
	$this->SetVar('redirect_to', $a_location);
	return true;
	}
	else {
	if ($this->GetVar('ajax') == 'yes' && $t != $this->GetVar('t')) {
	// redirection to other then current template during ajax request
	echo '#redirect#'.$a_location;
	}
	elseif (headers_sent() != '') {
	// some output occured -> redirect using javascript
	echo '<script type="text/javascript">window.location.href = \''.$a_location.'\';</script>';
	}
	else {
	// no output before -> redirect using HTTP header

	// header('HTTP/1.1 302 Found');
	header("$location");
	}
	}
	}

	ob_end_flush();
	// session expiration is called from session initialization,
	// that's why $this->Session may be not defined here
	if (is_object($this->Session)) {
	$this->Session->SaveData();
	}
	exit;
	}

	function Phrase($label)
	{
	return $this->Phrases->GetPhrase($label);
	}

	/**
	* Replace language tags in exclamation marks found in text
	*
	* @param string $text
	* @param bool $force_escape force escaping, not escaping of resulting string
	* @return string
	* @access public
	*/
	function ReplaceLanguageTags($text, $force_escape=null)
	{
	// !!!!!!!!
	// if( !is_object($this->Phrases) ) $this->Debugger->appendTrace();
	return $this->Phrases->ReplaceLanguageTags($text,$force_escape);
	}

	/**
	* Checks if user is logged in, and creates
	* user object if so. User object can be recalled
	* later using "u.current" prefix_special. Also you may
	* get user id by getting "u.current_id" variable.
	*
	* @access private
	*/
	function ValidateLogin()
	{
	$session =& $this->recallObject('Session');
	$user_id = $session->GetField('PortalUserId');
	if (!$user_id && $user_id != -1) $user_id = -2;
	$this->SetVar('u.current_id', $user_id);

	if (!$this->IsAdmin()) {
	// needed for "profile edit", "registration" forms ON FRONT ONLY
	$this->SetVar('u_id', $user_id);
	}

	$this->StoreVar('user_id', $user_id);

	if ($this->GetVar('expired') == 1) {
	// this parameter is set only from admin
	$user =& $this->recallObject('u.current');
	$user->SetError('ValidateLogin', 'session_expired', 'la_text_sess_expired');
	}

	if (($user_id != -2) && constOn('DBG_REQUREST_LOG') ) {
	$http_query =& $this->recallObject('HTTPQuery');
	$http_query->writeRequestLog(DBG_REQUREST_LOG);
	}

	if ($user_id != -2) {
	// normal users + root
	$this->LoadPersistentVars();
	}
	}

	/**
	* Loads current user persistent session data
	*
	*/
	function LoadPersistentVars()
	{
	$this->Session->LoadPersistentVars();
	}

	function LoadCache() {
	$cache_key = $this->GetVar('t').$this->GetVar('m_theme').$this->GetVar('m_lang').$this->IsAdmin();
	$query = sprintf("SELECT PhraseList, ConfigVariables FROM %s WHERE Template = %s",
	TABLE_PREFIX.'PhraseCache',
	$this->Conn->Qstr(md5($cache_key)));
	$res = $this->Conn->GetRow($query);

	if ($res) {
	$this->Caches['PhraseList'] = $res['PhraseList'] ? explode(',', $res['PhraseList']) : array();

	$config_ids = $res['ConfigVariables'] ? explode(',', $res['ConfigVariables']) : array();
	$config_ids = array_diff($config_ids, $this->Caches['ConfigVariables']);
	}
	else {
	$config_ids = array();
	}
	$this->Caches['ConfigVariables'] = $config_ids;
	$this->ConfigCacheIds = $config_ids;
	}

	function UpdateCache()
	{
	$update = false;
	//something changed
	$update = $update \|\| $this->Phrases->NeedsCacheUpdate();
	$update = $update \|\| (count($this->ConfigCacheIds) && $this->ConfigCacheIds != $this->Caches['ConfigVariables']);
	if ($update) {
	$cache_key = $this->GetVar('t').$this->GetVar('m_theme').$this->GetVar('m_lang').$this->IsAdmin();
	$query = sprintf("REPLACE %s (PhraseList, CacheDate, Template, ConfigVariables)
	VALUES (%s, %s, %s, %s)",
	TABLE_PREFIX.'PhraseCache',
	$this->Conn->Qstr(join(',', $this->Phrases->Ids)),
	adodb_mktime(),
	$this->Conn->Qstr(md5($cache_key)),
	$this->Conn->qstr(implode(',', array_unique($this->ConfigCacheIds))));
	$this->Conn->Query($query);
	}
	}

	function InitConfig()
	{
	if (isset($this->Caches['ConfigVariables']) && count($this->Caches['ConfigVariables']) > 0) {
	$this->ConfigHash = array_merge($this->ConfigHash, $this->Conn->GetCol(
	'SELECT VariableValue, VariableName FROM '.TABLE_PREFIX.'ConfigurationValues
	WHERE VariableId IN ('.implode(',', $this->Caches['ConfigVariables']).')', 'VariableName'));
	}
	}

	/**
	* Returns configuration option value by name
	*
	* @param string $name
	* @return string
	*/
	function ConfigValue($name)
	{
	$res = isset($this->ConfigHash[$name]) ? $this->ConfigHash[$name] : false;
	if ($res !== false) return $res;

	$res = $this->Conn->GetRow('SELECT VariableId, VariableValue FROM '.TABLE_PREFIX.'ConfigurationValues WHERE VariableName = '.$this->Conn->qstr($name));
	if ($res) {
	$this->ConfigHash[$name] = $res['VariableValue'];
	$this->ConfigCacheIds[] = $res['VariableId'];
	return $res['VariableValue'];
	}
	return false;
	}

	function UpdateConfigCache()
	{
	if ($this->ConfigCacheIds) {

	}
	}

	/**
	* Allows to process any type of event
	*
	* @param kEvent $event
	* @access public
	* @author Alex
	*/
	function HandleEvent(&$event, $params=null, $specificParams=null)
	{
	if ( isset($params) ) {
	$event = new kEvent( $params, $specificParams );
	}

	if (!isset($this->EventManager)) {
	$this->EventManager =& $this->recallObject('EventManager');
	}

	$this->EventManager->HandleEvent($event);
	}

	/**
	* Registers new class in the factory
	*
	* @param string $real_class Real name of class as in class declaration
	* @param string $file Filename in what $real_class is declared
	* @param string $pseudo_class Name under this class object will be accessed using getObject method
	* @param Array $dependecies List of classes required for this class functioning
	* @access public
	* @author Alex
	*/
	function registerClass($real_class, $file, $pseudo_class = null, $dependecies = Array() )
	{
	$this->Factory->registerClass($real_class, $file, $pseudo_class, $dependecies);
	}

	/**
	* Add $class_name to required classes list for $depended_class class.
	* All required class files are included before $depended_class file is included
	*
	* @param string $depended_class
	* @param string $class_name
	* @author Alex
	*/
	function registerDependency($depended_class, $class_name)
	{
	$this->Factory->registerDependency($depended_class, $class_name);
	}

	/**
	* Registers Hook from subprefix event to master prefix event
	*
	* @param string $hookto_prefix
	* @param string $hookto_special
	* @param string $hookto_event
	* @param string $mode
	* @param string $do_prefix
	* @param string $do_special
	* @param string $do_event
	* @param string $conditional
	* @access public
	* @todo take care of a lot parameters passed
	* @author Kostja
	*/
	function registerHook($hookto_prefix, $hookto_special, $hookto_event, $mode, $do_prefix, $do_special, $do_event, $conditional)
	{
	$event_manager =& $this->recallObject('EventManager');
	$event_manager->registerHook($hookto_prefix, $hookto_special, $hookto_event, $mode, $do_prefix, $do_special, $do_event, $conditional);
	}

	/**
	* Allows one TagProcessor tag act as other TagProcessor tag
	*
	* @param Array $tag_info
	* @author Kostja
	*/
	function registerAggregateTag($tag_info)
	{
	$aggregator =& $this->recallObject('TagsAggregator', 'kArray');
	$aggregator->SetArrayValue($tag_info['AggregateTo'], $tag_info['AggregatedTagName'], Array($tag_info['LocalPrefix'], $tag_info['LocalTagName'], getArrayValue($tag_info, 'LocalSpecial')));
	}

	/**
	* Returns object using params specified,
	* creates it if is required
	*
	* @param string $name
	* @param string $pseudo_class
	* @param Array $event_params
	* @return Object
	* @author Alex
	*/
	function &recallObject($name,$pseudo_class=null,$event_params=Array())
	{
	$result =& $this->Factory->getObject($name, $pseudo_class, $event_params);
	return $result;
	}

	/**
	* Returns object using Variable number of params,
	* all params starting with 4th are passed to object consturctor
	*
	* @param string $name
	* @param string $pseudo_class
	* @param Array $event_params
	* @return Object
	* @author Alex
	*/
	function &recallObjectP($name,$pseudo_class=null,$event_params=Array())
	{
	$func_args = func_get_args();
	$result =& ref_call_user_func_array( Array(&$this->Factory, 'getObjectP'), $func_args );
	return $result;
	}

	/**
	* Returns tag processor for prefix specified
	*
	* @param string $prefix
	* @return kDBTagProcessor
	*/
	function &recallTagProcessor($prefix)
	{
	$result =& $this->recallObject($prefix.'_TagProcessor');
	return $result;
	}

	/**
	* Checks if object with prefix passes was already created in factory
	*
	* @param string $name object presudo_class, prefix
	* @return bool
	* @author Kostja
	*/
	function hasObject($name)
	{
	return isset($this->Factory->Storage[$name]);
	}

	/**
	* Removes object from storage by given name
	*
	* @param string $name Object's name in the Storage
	* @author Kostja
	*/
	function removeObject($name)
	{
	$this->Factory->DestroyObject($name);
	}

	/**
	* Get's real class name for pseudo class,
	* includes class file and creates class
	* instance
	*
	* @param string $pseudo_class
	* @return Object
	* @access public
	* @author Alex
	*/
	function &makeClass($pseudo_class)
	{
	$func_args = func_get_args();
	$result =& ref_call_user_func_array( Array(&$this->Factory, 'makeClass'), $func_args);

	return $result;
	}

	/**
	* Checks if application is in debug mode
	*
	* @param bool $check_debugger check if kApplication debugger is initialized too, not only for defined DEBUG_MODE constant
	* @return bool
	* @author Alex
	* @access public
	*/
	function isDebugMode($check_debugger = true)
	{
	$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE;
	if($check_debugger)
	{
	$debug_mode = $debug_mode && is_object($this->Debugger);
	}
	return $debug_mode;
	}

	/**
	* Checks if it is admin
	*
	* @return bool
	* @author Alex
	*/
	function IsAdmin()
	{
	return constOn('ADMIN');
	}

	/**
	* Apply url rewriting used by mod_rewrite or not
	*
	* @param bool $ssl Force ssl link to be build
	* @return bool
	*/
	function RewriteURLs($ssl = false)
	{
	// case #1,#4:
	// we want to create https link from http mode
	// we want to create https link from https mode
	// conditions: ($ssl \|\| PROTOCOL == 'https://') && $this->ConfigValue('UseModRewriteWithSSL')

	// case #2,#3:
	// we want to create http link from https mode
	// we want to create http link from http mode
	// conditions: !$ssl && (PROTOCOL == 'https://' \|\| PROTOCOL == 'http://')

	$allow_rewriting =
	(!$ssl && (PROTOCOL == 'https://' \|\| PROTOCOL == 'http://')) // always allow mod_rewrite for http
	\|\| // or allow rewriting for redirect TO httpS or when already in httpS
	(($ssl \|\| PROTOCOL == 'https://') && $this->ConfigValue('UseModRewriteWithSSL')); // but only if it's allowed in config!
	return constOn('MOD_REWRITE') && $allow_rewriting;
	}

	/**
	* Reads unit (specified by $prefix)
	* option specified by $option
	*
	* @param string $prefix
	* @param string $option
	* @param mixed $default
	* @return string
	* @access public
	* @author Alex
	*/
	function getUnitOption($prefix, $option, $default = false)
	{
	/*if (!isset($this->UnitConfigReader)) {
	$this->UnitConfigReader =& $this->recallObject('kUnitConfigReader');
	}*/
	return $this->UnitConfigReader->getUnitOption($prefix, $option, $default);
	}

	/**
	* Set's new unit option value
	*
	* @param string $prefix
	* @param string $name
	* @param string $value
	* @author Alex
	* @access public
	*/
	function setUnitOption($prefix, $option, $value)
	{
	// $unit_config_reader =& $this->recallObject('kUnitConfigReader');
	return $this->UnitConfigReader->setUnitOption($prefix,$option,$value);
	}

	/**
	* Read all unit with $prefix options
	*
	* @param string $prefix
	* @return Array
	* @access public
	* @author Alex
	*/
	function getUnitOptions($prefix)
	{
	// $unit_config_reader =& $this->recallObject('kUnitConfigReader');
	return $this->UnitConfigReader->getUnitOptions($prefix);
	}

	/**
	* Returns true if config exists and is allowed for reading
	*
	* @param string $prefix
	* @return bool
	*/
	function prefixRegistred($prefix)
	{
	/*if (!isset($this->UnitConfigReader)) {
	$this->UnitConfigReader =& $this->recallObject('kUnitConfigReader');
	}*/
	return $this->UnitConfigReader->prefixRegistred($prefix);
	}

	/**
	* Splits any mixing of prefix and
	* special into correct ones
	*
	* @param string $prefix_special
	* @return Array
	* @access public
	* @author Alex
	*/
	function processPrefix($prefix_special)
	{
	return $this->Factory->processPrefix($prefix_special);
	}

	/**
	* Set's new event for $prefix_special
	* passed
	*
	* @param string $prefix_special
	* @param string $event_name
	* @access public
	*/
	function setEvent($prefix_special,$event_name)
	{
	$event_manager =& $this->recallObject('EventManager');
	$event_manager->setEvent($prefix_special,$event_name);
	}


	/**
	* SQL Error Handler
	*
	* @param int $code
	* @param string $msg
	* @param string $sql
	* @return bool
	* @access private
	* @author Alex
	*/
	function handleSQLError($code, $msg, $sql)
	{
	if ( isset($this->Debugger) )
	{
	$errorLevel = constOn('DBG_SQL_FAILURE') && !defined('IS_INSTALL') ? E_USER_ERROR : E_USER_WARNING;
	$this->Debugger->dumpVars($_REQUEST);
	$this->Debugger->appendTrace();

	$error_msg = '<span class="debug_error">'.$msg.' ('.$code.')</span><br><a href="javascript:$Debugger.SetClipboard(\''.htmlspecialchars($sql).'\');"><b>SQL</b></a>: '.$this->Debugger->formatSQL($sql);
	$long_id = $this->Debugger->mapLongError($error_msg);
	trigger_error( substr($msg.' ('.$code.') ['.$sql.']',0,1000).' #'.$long_id, $errorLevel);
	return true;
	}
	else
	{
	//$errorLevel = constOn('IS_INSTALL') ? E_USER_WARNING : E_USER_ERROR;
	$errorLevel = E_USER_WARNING;
	trigger_error('<b>SQL Error</b> in sql: '.$sql.', code <b>'.$code.'</b> ('.$msg.')', $errorLevel);
	/*echo '<b>xProcessing SQL</b>: '.$sql.'<br>';
	echo '<b>Error ('.$code.'):</b> '.$msg.'<br>';*/
	return $errorLevel == E_USER_ERROR ? false : true;
	}
	}

	/**
	* Default error handler
	*
	* @param int $errno
	* @param string $errstr
	* @param string $errfile
	* @param int $errline
	* @param Array $errcontext
	*/
	function handleError($errno, $errstr, $errfile = '', $errline = '', $errcontext = '')
	{
	if( constOn('SILENT_LOG') )
	{
	$fp = fopen(FULL_PATH.'/silent_log.txt','a');
	$time = adodb_date('d/m/Y H:i:s');
	fwrite($fp, '['.$time.'] #'.$errno.': '.strip_tags($errstr).' in ['.$errfile.'] on line '.$errline."\n");
	fclose($fp);
	}

	if( !$this->errorHandlers ) return true;

	$i = 0; // while (not foreach) because it is array of references in some cases
	$eh_count = count($this->errorHandlers);
	while($i < $eh_count)
	{
	if( is_array($this->errorHandlers[$i]) )
	{
	$object =& $this->errorHandlers[$i][0];
	$method = $this->errorHandlers[$i][1];
	$object->$method($errno, $errstr, $errfile, $errline, $errcontext);
	}
	else
	{
	$function = $this->errorHandlers[$i];
	$function($errno, $errstr, $errfile, $errline, $errcontext);
	}
	$i++;
	}
	}

	/**
	* Returns & blocks next ResourceId available in system
	*
	* @return int
	* @access public
	* @author Alex
	*/
	function NextResourceId()
	{
	$table_name = TABLE_PREFIX.'IdGenerator';

	$this->Conn->Query('LOCK TABLES '.$table_name.' WRITE');
	$this->Conn->Query('UPDATE '.$table_name.' SET lastid = lastid + 1');
	$id = $this->Conn->GetOne('SELECT lastid FROM '.$table_name);
	if($id === false)
	{
	$this->Conn->Query('INSERT INTO '.$table_name.' (lastid) VALUES (2)');
	$id = 2;
	}
	$this->Conn->Query('UNLOCK TABLES');
	return $id - 1;
	}

	/**
	* Returns genealogical main prefix for subtable prefix passes
	* OR prefix, that has been found in REQUEST and some how is parent of passed subtable prefix
	*
	* @param string $current_prefix
	* @return string
	* @access public
	* @author Kostja / Alex
	*/
	function GetTopmostPrefix($current_prefix)
	{
	// 1. get genealogical tree of $current_prefix
	$prefixes = Array ($current_prefix);
	while ( $parent_prefix = $this->getUnitOption($current_prefix, 'ParentPrefix') ) {
	$current_prefix = $parent_prefix;
	array_unshift($prefixes, $current_prefix);
	}

	// 2. find what if parent is passed
	$passed = explode(',', $this->GetVar('passed'));
	foreach ($prefixes as $current_prefix) {
	if (in_array($current_prefix, $passed)) {
	break;
	}
	}

	return $current_prefix;
	}

	+ /**
	+ * Triggers email event of type Admin
	+ *
	+ * @param string $email_event_name
	+ * @param int $to_user_id
	+ * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
	+ * @return unknown
	+ */
	function &EmailEventAdmin($email_event_name, $to_user_id = -1, $send_params = false)
	{
	return $this->EmailEvent($email_event_name, 1, $to_user_id, $send_params);
	}

	+ /**
	+ * Triggers email event of type User
	+ *
	+ * @param string $email_event_name
	+ * @param int $to_user_id
	+ * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
	+ * @return unknown
	+ */
	function &EmailEventUser($email_event_name, $to_user_id = -1, $send_params = false)
	{
	return $this->EmailEvent($email_event_name, 0, $to_user_id, $send_params);
	}

	+ /**
	+ * Triggers general email event
	+ *
	+ * @param string $email_event_name
	+ * @param int $email_event_type ( 0 for User, 1 for Admin)
	+ * @param int $to_user_id
	+ * @param array $send_params associative array of direct send params,
	+ * possible keys: to_email, to_name, from_email, from_name, message, message_text
	+ * @return unknown
	+ */
	function &EmailEvent($email_event_name, $email_event_type, $to_user_id = -1, $send_params = false)
	{
	- $event = new kEvent('emailevents:OnEmailEvent');
	- $event->setEventParam('EmailEventName', $email_event_name);
	- $event->setEventParam('EmailEventToUserId', $to_user_id);
	- $event->setEventParam('EmailEventType', $email_event_type);
	- if ($send_params){
	- $event->setEventParam('DirectSendParams', $send_params);
	+ $params = array(
	+ 'EmailEventName' => $email_event_name,
	+ 'EmailEventToUserId' => $to_user_id,
	+ 'EmailEventType' => $email_event_type,
	+ );
	+ if ($send_params) {
	+ $params['DirectSendParams'] = $send_params;
	}
	- $this->HandleEvent($event);
	+ $event_str = isset($send_params['use_special']) ? 'emailevents.'.$send_params['use_special'].':OnEmailEvent' : 'emailevents:OnEmailEvent';
	+ $this->HandleEvent($event, $event_str, $params);

	return $event;
	}


	function LoggedIn()
	{
	$user_id = $this->Application->RecallVar('user_id');

	$ret = $user_id > 0;
	if ($this->IsAdmin() && ($user_id == -1)) {
	$ret = true;
	}
	return $ret;
	}

	/**
	* Check current user permissions based on it's group permissions in specified category
	*
	* @param string $name permission name
	* @param int $cat_id category id, current used if not specified
	* @param int $type permission type {1 - system, 0 - per category}
	* @return int
	*/
	function CheckPermission($name, $type = 1, $cat_id = null)
	{
	$perm_helper =& $this->recallObject('PermissionsHelper');
	return $perm_helper->CheckPermission($name, $type, $cat_id);
	}

	/**
	* Set's any field of current visit
	*
	* @param string $field
	* @param mixed $value
	*/
	function setVisitField($field, $value)
	{
	$visit =& $this->recallObject('visits');
	$visit->SetDBField($field, $value);
	$visit->Update();
	}

	/**
	* Allows to check if in-portal is installed
	*
	* @return bool
	*/
	function isInstalled()
	{
	return $this->InitDone && (count($this->ModuleInfo) > 0);
	}

	/**
	* Allows to determine if module is installed & enabled
	*
	* @param string $module_name
	* @return bool
	*/
	function isModuleEnabled($module_name)
	{
	return $this->findModule('Name', $module_name) !== false;

	}

	function reportError($class, $method)
	{
	$this->Debugger->appendTrace();
	trigger_error('depricated method <b>'.$class.'->'.$method.'(...)</b>', E_USER_ERROR);
	}

	/**
	* Returns Window ID of passed prefix main prefix (in edit mode)
	*
	* @param string $prefix
	* @return mixed
	*/
	function GetTopmostWid($prefix)
	{
	$top_prefix = $this->GetTopmostPrefix($prefix);
	$mode = $this->GetVar($top_prefix.'_mode');
	return $mode != '' ? substr($mode, 1) : '';
	}

	/**
	* Get temp table name
	*
	* @param string $table
	* @param mixed $wid
	* @return string
	*/
	function GetTempName($table, $wid = '')
	{
	if (preg_match('/prefix:(.*)/', $wid, $regs)) {
	$wid = $this->GetTopmostWid($regs[1]);
	}

	return TABLE_PREFIX.'ses_'.$this->GetSID().($wid ? '_'.$wid : '').'_edit_'.$table;
	}

	function GetTempTablePrefix($wid = '')
	{
	if (preg_match('/prefix:(.*)/', $wid, $regs)) {
	$wid = $this->GetTopmostWid($regs[1]);
	}

	return TABLE_PREFIX.'ses_'.$this->GetSID().($wid ? '_'.$wid : '').'_edit_';
	}

	function IsTempTable($table)
	{
	return preg_match('/'.TABLE_PREFIX.'ses_'.$this->GetSID().'(_[\d]+){0,1}_edit_(.*)/',$table);
	}

	/**
	* Return live table name based on temp table name
	*
	* @param string $temp_table
	* @return string
	*/
	function GetLiveName($temp_table)
	{
	if( preg_match('/'.TABLE_PREFIX.'ses_'.$this->GetSID().'(_[\d]+){0,1}_edit_(.*)/',$temp_table, $rets) )
	{
	// cut wid from table end if any
	return $rets[2];
	}
	else
	{
	return $temp_table;
	}
	}

	function CheckProcessors($processors)
	{
	foreach ($processors as $a_processor)
	{
	if (!isset($this->CachedProcessors[$a_processor])) {
	$this->CachedProcessors[$a_processor] =& $this->recallObject($a_processor.'_TagProcessor');
	}
	}
	}

	function TimeZoneAdjustment($time_zone=null)
	{
	$target_zone = isset($time_zone) ? $time_zone : $this->ConfigValue('Config_Site_Time');
	return 3600 * ($target_zone - $this->ConfigValue('Config_Server_Time'));
	}

	function ApplicationDie($message = '')
	{
	$message = ob_get_clean().$message;
	if ($this->isDebugMode()) {
	$message .= $this->Debugger->printReport(true);
	}

	echo $this->UseOutputCompression() ? gzencode($message, DBG_COMPRESSION_LEVEL) : $message;
	exit;
	}


	/* moved from MyApplication */

	function getUserGroups($user_id)
	{
	switch($user_id)
	{
	case -1:
	$user_groups = $this->ConfigValue('User_LoggedInGroup');
	break;
	case -2:
	$user_groups = $this->ConfigValue('User_LoggedInGroup');
	$user_groups .= ','.$this->ConfigValue('User_GuestGroup');
	break;
	default:
	$sql = 'SELECT GroupId FROM '.TABLE_PREFIX.'UserGroup WHERE PortalUserId = '.$user_id;
	$res = $this->Conn->GetCol($sql);
	$user_groups = Array( $this->ConfigValue('User_LoggedInGroup') );
	if(is_array($res))
	{
	$user_groups = array_merge($user_groups, $res);
	}
	$user_groups = implode(',', $user_groups);
	}
	return $user_groups;
	}

	}

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.166.4.10
	\ No newline at end of property
	+1.166.4.11
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.3.52/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.3.52/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.3.52/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl (revision 7287)
	@@ -1,13 +1,13 @@
	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr>
	<td align="right" width="100%">
	<table cellpadding="0" cellspacing="0" border="0" height="23">
	<tr>
	- <inp2:m_ParseBlock name="tab" title="la_tab_General" t="stylesheets/stylesheets_edit" main_prefix="css"/>
	- <inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="stylesheets/stylesheets_edit_block" main_prefix="css"/>
	- <inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="stylesheets/stylesheets_edit_base" main_prefix="css"/>
	+ <inp2:m_ParseBlock name="tab" title="la_tab_General" t="in-portal/stylesheets/stylesheets_edit" main_prefix="css"/>
	+ <inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="in-portal/stylesheets/stylesheets_edit_block" main_prefix="css"/>
	+ <inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="in-portal/stylesheets/stylesheets_edit_base" main_prefix="css"/>
	</tr>
	</table>
	</td>
	</tr>
	</table>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.3.52/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.3
	\ No newline at end of property
	+1.3.52.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.3.52/core/admin_templates/stylesheets/stylesheets_tabs.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.3.52/core/admin_templates/stylesheets/stylesheets_tabs.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.3.52/core/admin_templates/stylesheets/stylesheets_tabs.tpl (revision 7287)
	@@ -1,13 +1,13 @@
	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr>
	<td align="right" width="100%">
	<table cellpadding="0" cellspacing="0" border="0" height="23">
	<tr>
	- <inp2:m_ParseBlock name="tab" title="la_tab_General" t="stylesheets/stylesheets_edit" main_prefix="css"/>
	- <inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="stylesheets/stylesheets_edit_block" main_prefix="css"/>
	- <inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="stylesheets/stylesheets_edit_base" main_prefix="css"/>
	+ <inp2:m_ParseBlock name="tab" title="la_tab_General" t="in-portal/stylesheets/stylesheets_edit" main_prefix="css"/>
	+ <inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="in-portal/stylesheets/stylesheets_edit_block" main_prefix="css"/>
	+ <inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="in-portal/stylesheets/stylesheets_edit_base" main_prefix="css"/>
	</tr>
	</table>
	</td>
	</tr>
	</table>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.3.52/core/admin_templates/stylesheets/stylesheets_tabs.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.3
	\ No newline at end of property
	+1.3.52.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl (revision 7287)
	@@ -1,241 +1,241 @@
	<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1" ajax="yes"/>
	<inp2:m_include t="incs/header" nobody="yes" noform="yes"/>

	<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="$Catalog.Init();">
	<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Browse!"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="catalog" module="in-portal"/>

	<!-- main kernel_form: begin -->
	<inp2:m_RenderElement name="kernel_form"/>
	<!-- ToolBar --->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
	<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
	<script type="text/javascript" src="js/nlsmenu.js"></script>
	<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>

	<script type="text/javascript" src="js/ajax.js"></script>
	<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
	<script type="text/javascript">
	var menuMgr = new NlsMenuManager("mgr");
	menuMgr.timeout = 500;
	menuMgr.flowOverFormElement = true;

	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
	var $is_catalog = true;
	var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_');
	var a_toolbar = new ToolBar();

	a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
	$Catalog.go_to_cat($Catalog.ParentCategoryID);
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-portal:homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
	$Catalog.go_to_cat(0);
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('in-portal:new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
	std_precreate_item('c', 'in-portal/categories/categories_edit');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', function() {
	var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
	var $category_id = get_hidden_field('m_cat_id');
	var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
	$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
	redirect($redirect_url);
	}
	) );

	<inp2:m_ModuleInclude template="catalog_tab" tab_init="1" skip_prefixes="m"/>


	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() {
	var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template');
	std_delete_items($Catalog.getCurrentPrefix(), $template, 1);
	} ) );


	a_toolbar.AddButton( new ToolBarSeparator('sep2') );

	a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassApprove');
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassDecline');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep3') );

	a_toolbar.AddButton( new ToolBarButton('in-portal:export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
	var $export_prefixes = new Array('l', 'p');
	if (in_array($Catalog.ActivePrefix, $export_prefixes)) {
	submit_event($Catalog.ActivePrefix, 'OnExport');
	}
	else {
	alert('<inp2:m_phrase name="la_Text_InDevelopment" escape="1"/>');
	}
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
	redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep4') );


	a_toolbar.AddButton( new ToolBarButton('in-portal:cut', '<inp2:m_phrase label="la_ToolTip_Cut" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnCut');
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-portal:copy', '<inp2:m_phrase label="la_ToolTip_Copy" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnCopy');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('in-portal:paste', '<inp2:m_phrase label="la_ToolTip_Paste" escape="1"/>', function() {
	$Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) {
	$object.resetTabs(true);
	$object.switchTab();
	} );
	}
	) );

	/*a_toolbar.AddButton( new ToolBarButton('clear_clipboard', '<inp2:m_phrase label="la_ToolTip_ClearClipboard" escape="1"/>', function() {
	if (confirm('<inp2:m_phrase name="la_text_ClearClipboardWarning" js_escape="1"/>')) {
	$Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
	$GridManager.CheckDependencies($object.ActivePrefix);
	} );
	}
	}
	) );*/

	a_toolbar.AddButton( new ToolBarSeparator('sep5') );

	a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_Move_Up" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassMoveUp');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_Move_Down" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassMoveDown');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep6') );

	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	show_viewmenu(a_toolbar, 'view');
	}
	) );

	a_toolbar.Render();

	function edit()
	{
	var $current_prefix = $Catalog.getCurrentPrefix();
	$form_name = $Catalog.queryTabRegistry('prefix', $current_prefix, 'tab_id') + '_form';
	std_edit_item($current_prefix, $Catalog.queryTabRegistry('prefix', $current_prefix, 'edit_template'));
	}
	</script>
	</td>
	</tr>
	</tbody>
	</table>
	<inp2:m_RenderElement name="kernel_form_end"/>
	<!-- main kernel_form: end -->

	<!-- category list: begin -->
	<table id="c_search_warning" width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_notop" style="display: none;">
	<tr>
	<td valign="top" class="hint_red">
	<inp2:m_phrase name="la_Warning_Filter"/>
	</td>
	</tr>
	</table>

	<inp2:m_set t="in-portal/xml/categories_list"/>
	<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
	<table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" style="border-top-width: 0px;">
	<tr bgcolor="#e0e0da" height="20">
	- <td width="100%" valign="middle">
	+ <td valign="middle">
	<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
	</td>
	<td align="right" class="search-cell">
	<table cellspacing="0" cellpadding="0" border="0">
	<tr>
	<td>Search: </td>
	<td>
	<input type="text" id="c_search_keyword" name="c_search_keyword" value="" onkeydown="search_keydown(event, 'c', 'Default', 1);" style="border: 1px solid grey;" />
	<input type="text" style="display: none;" />
	</td>
	<td id="search_buttons[c]">
	<script type="text/javascript">
	<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="c" grid="Default" ajax="1"/>
	</script>
	</td>
	</tr>
	</table>
	</td>
	</tr>
	</table>

	<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
	<inp2:m_RenderElement name="kernel_form_end"/>
	<inp2:m_set t="in-portal/catalog"/>
	<script type="text/javascript">$Catalog.registerTab('categories');</script>
	<!-- categories list: end -->

	<!-- item tabs: begin -->
	<table cellpadding="0" cellspacing="0">
	<tr>
	<inp2:m_DefineElement name="item_tab" title="">
	<td nowrap="nowrap" width="140">
	<table id="<inp2:m_param name="prefix"/>_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/>');">
	<tr>
	<td class="catalog-tab-left">
	<img src="img/spacer.gif" height="22" width="9" />
	</td>
	<td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
	<inp2:m_phrase name="$title"/> <span class="cats_stats">(<span id="<inp2:m_param name="prefix"/>_item_count">?</span>)</span>
	</td>
	<td class="catalog-tab-right">
	<img src="img/spacer.gif" height="22" width="9" />
	</td>
	<td style="background-color: #FFFFFF;">
	<img src="img/spacer.gif" height="1" width="5" />
	</td>
	</tr>
	</table>

	</td>
	</inp2:m_DefineElement>
	<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="m"/>
	</tr>
	</table>
	<!-- item tabs: end -->

	<inp2:m_ModuleInclude template="catalog_tab" tab_init="2" skip_prefixes="m"/>

	<inp2:m_include t="incs/footer" noform="yes"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.27.2.4
	\ No newline at end of property
	+1.27.2.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl (revision 7287)
	@@ -1,241 +1,241 @@
	<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1" ajax="yes"/>
	<inp2:m_include t="incs/header" nobody="yes" noform="yes"/>

	<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="$Catalog.Init();">
	<inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Browse!"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="catalog" module="in-portal"/>

	<!-- main kernel_form: begin -->
	<inp2:m_RenderElement name="kernel_form"/>
	<!-- ToolBar --->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
	<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
	<script type="text/javascript" src="js/nlsmenu.js"></script>
	<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>

	<script type="text/javascript" src="js/ajax.js"></script>
	<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
	<script type="text/javascript">
	var menuMgr = new NlsMenuManager("mgr");
	menuMgr.timeout = 500;
	menuMgr.flowOverFormElement = true;

	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
	var $is_catalog = true;
	var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_');
	var a_toolbar = new ToolBar();

	a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
	$Catalog.go_to_cat($Catalog.ParentCategoryID);
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-portal:homecat', '<inp2:m_phrase label="la_ToolTip_Home" escape="1"/>', function() {
	$Catalog.go_to_cat(0);
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('in-portal:new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
	std_precreate_item('c', 'in-portal/categories/categories_edit');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>', function() {
	var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
	var $category_id = get_hidden_field('m_cat_id');
	var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
	$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
	redirect($redirect_url);
	}
	) );

	<inp2:m_ModuleInclude template="catalog_tab" tab_init="1" skip_prefixes="m"/>


	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() {
	var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template');
	std_delete_items($Catalog.getCurrentPrefix(), $template, 1);
	} ) );


	a_toolbar.AddButton( new ToolBarSeparator('sep2') );

	a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassApprove');
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassDecline');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep3') );

	a_toolbar.AddButton( new ToolBarButton('in-portal:export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
	var $export_prefixes = new Array('l', 'p');
	if (in_array($Catalog.ActivePrefix, $export_prefixes)) {
	submit_event($Catalog.ActivePrefix, 'OnExport');
	}
	else {
	alert('<inp2:m_phrase name="la_Text_InDevelopment" escape="1"/>');
	}
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
	redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep4') );


	a_toolbar.AddButton( new ToolBarButton('in-portal:cut', '<inp2:m_phrase label="la_ToolTip_Cut" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnCut');
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-portal:copy', '<inp2:m_phrase label="la_ToolTip_Copy" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnCopy');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('in-portal:paste', '<inp2:m_phrase label="la_ToolTip_Paste" escape="1"/>', function() {
	$Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) {
	$object.resetTabs(true);
	$object.switchTab();
	} );
	}
	) );

	/*a_toolbar.AddButton( new ToolBarButton('clear_clipboard', '<inp2:m_phrase label="la_ToolTip_ClearClipboard" escape="1"/>', function() {
	if (confirm('<inp2:m_phrase name="la_text_ClearClipboardWarning" js_escape="1"/>')) {
	$Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
	$GridManager.CheckDependencies($object.ActivePrefix);
	} );
	}
	}
	) );*/

	a_toolbar.AddButton( new ToolBarSeparator('sep5') );

	a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_Move_Up" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassMoveUp');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_Move_Down" escape="1"/>', function() {
	$Catalog.submit_event(null, 'OnMassMoveDown');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep6') );

	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	show_viewmenu(a_toolbar, 'view');
	}
	) );

	a_toolbar.Render();

	function edit()
	{
	var $current_prefix = $Catalog.getCurrentPrefix();
	$form_name = $Catalog.queryTabRegistry('prefix', $current_prefix, 'tab_id') + '_form';
	std_edit_item($current_prefix, $Catalog.queryTabRegistry('prefix', $current_prefix, 'edit_template'));
	}
	</script>
	</td>
	</tr>
	</tbody>
	</table>
	<inp2:m_RenderElement name="kernel_form_end"/>
	<!-- main kernel_form: end -->

	<!-- category list: begin -->
	<table id="c_search_warning" width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_notop" style="display: none;">
	<tr>
	<td valign="top" class="hint_red">
	<inp2:m_phrase name="la_Warning_Filter"/>
	</td>
	</tr>
	</table>

	<inp2:m_set t="in-portal/xml/categories_list"/>
	<inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
	<table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" style="border-top-width: 0px;">
	<tr bgcolor="#e0e0da" height="20">
	- <td width="100%" valign="middle">
	+ <td valign="middle">
	<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
	</td>
	<td align="right" class="search-cell">
	<table cellspacing="0" cellpadding="0" border="0">
	<tr>
	<td>Search: </td>
	<td>
	<input type="text" id="c_search_keyword" name="c_search_keyword" value="" onkeydown="search_keydown(event, 'c', 'Default', 1);" style="border: 1px solid grey;" />
	<input type="text" style="display: none;" />
	</td>
	<td id="search_buttons[c]">
	<script type="text/javascript">
	<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="c" grid="Default" ajax="1"/>
	</script>
	</td>
	</tr>
	</table>
	</td>
	</tr>
	</table>

	<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
	<inp2:m_RenderElement name="kernel_form_end"/>
	<inp2:m_set t="in-portal/catalog"/>
	<script type="text/javascript">$Catalog.registerTab('categories');</script>
	<!-- categories list: end -->

	<!-- item tabs: begin -->
	<table cellpadding="0" cellspacing="0">
	<tr>
	<inp2:m_DefineElement name="item_tab" title="">
	<td nowrap="nowrap" width="140">
	<table id="<inp2:m_param name="prefix"/>_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/>');">
	<tr>
	<td class="catalog-tab-left">
	<img src="img/spacer.gif" height="22" width="9" />
	</td>
	<td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
	<inp2:m_phrase name="$title"/> <span class="cats_stats">(<span id="<inp2:m_param name="prefix"/>_item_count">?</span>)</span>
	</td>
	<td class="catalog-tab-right">
	<img src="img/spacer.gif" height="22" width="9" />
	</td>
	<td style="background-color: #FFFFFF;">
	<img src="img/spacer.gif" height="1" width="5" />
	</td>
	</tr>
	</table>

	</td>
	</inp2:m_DefineElement>
	<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="m"/>
	</tr>
	</table>
	<!-- item tabs: end -->

	<inp2:m_ModuleInclude template="catalog_tab" tab_init="2" skip_prefixes="m"/>

	<inp2:m_include t="incs/footer" noform="yes"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.27.2.4
	\ No newline at end of property
	+1.27.2.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (revision 7287)
	@@ -1,111 +1,111 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
	+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="block_styles" module="in-portal" icon="icon46_style"/>

	<!-- 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('css','<inp2:css_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('css','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('css', '<inp2:css_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('css', '<inp2:css_NextId/>');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	-
	+
	//Relations related:
	a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBlockStyle" escape="1"/>',
	function() {
	set_hidden_field('remove_specials[selectors.block]',1);
	- std_new_item('selectors.block', 'stylesheets/block_style_edit')
	+ std_new_item('selectors.block', 'in-portal/stylesheets/block_style_edit')
	} ) );
	-
	+
	function edit()
	{
	set_hidden_field('remove_specials[selectors.block]',1);
	- std_edit_temp_item('selectors.block', 'stylesheets/block_style_edit');
	+ std_edit_temp_item('selectors.block', 'in-portal/stylesheets/block_style_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('selectors.block')
	} ) );
	-
	-
	+
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
	set_hidden_field('remove_specials[selectors.block]',1);
	submit_event('selectors.block','OnMassClone');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
	set_hidden_field('remove_specials[selectors.block]',1);
	submit_event('selectors.block','OnMassResetToBase');
	}
	) );
	-
	+
	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="css" function="IsSingle"/>
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	//a_toolbar.HideButton('sep2');
	- <inp2:m_else/>
	+ <inp2:m_else/>
	<inp2:m_if prefix="css" function="IsLast"/>
	a_toolbar.DisableButton('next');
	<inp2:m_endif/>
	<inp2:m_if prefix="css" function="IsFirst"/>
	a_toolbar.DisableButton('prev');
	<inp2:m_endif/>
	<inp2:m_endif/>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_block name="grid_description_td" />
	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/></td>
	<inp2:m_blockend />

	<inp2:m_ParseBlock name="grid" PrefixSpecial="selectors.block" IdField="SelectorId" grid="BlockStyles" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
	<script type="text/javascript">
	Grids['selectors.block'].SetDependantToolbarButtons( new Array('edit','delete','clone','reset_to_base') );
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.7.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/base_style_edit.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/base_style_edit.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/base_style_edit.tpl (revision 7287)
	@@ -1,103 +1,103 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>


	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="base_style_edit" module="in-portal" icon="icon46_style"/>

	<!-- 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('selectors','<inp2:selectors_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('selectors','OnCancel');
	}
	) );
	-
	+
	a_toolbar.Render();
	-
	+
	function ValidateRequired()
	{
	var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
	'<inp2:selectors_InputName field="SelectorName"/>');
	var $ret = true;
	var $i = 0;
	var $value = '';
	while($i < $fields.length)
	{
	$value = document.getElementById( $fields[$i] ).value;
	$value = $value.replace(' ','');
	if($value.length == 0)
	{
	$ret = false;
	break;
	}
	- $i++;
	+ $i++;
	}
	return $ret;
	}
	-
	+
	function editStyle()
	{
	if( ValidateRequired() )
	{
	- openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	+ openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	}
	else
	{
	- alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	+ alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	}
	}
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:selectors_SaveWarning name="grid_save_warning"/>
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
	<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="1">
	-
	+
	<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
	-
	+
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="text" valign="top">
	<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
	<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<table width="100%">
	<tr>
	<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
	<td>
	<inp2:selectors_PrintStyle field="SelectorData"/>
	</td>
	<td><inp2:m_phrase name="la_StylePreview"/>:</td>
	<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
	<inp2:m_phrase name="la_SampleText"/>
	</td>
	</tr>
	</table>
	</td>
	<td class="error"> </td>
	</tr>
	-
	+
	</table>
	<input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/base_style_edit.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.7.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/block_style_edit.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/block_style_edit.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/block_style_edit.tpl (revision 7287)
	@@ -1,113 +1,113 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>


	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="block_style_edit" module="in-portal" icon="icon46_style"/>

	<!-- 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('selectors','<inp2:selectors_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('selectors','OnCancel');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
	submit_event('selectors','OnResetToBase');
	}
	) );
	-
	+
	a_toolbar.Render();
	-
	+
	function ValidateRequired()
	{
	var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
	'<inp2:selectors_InputName field="SelectorName"/>');
	var $ret = true;
	var $i = 0;
	var $value = '';
	while($i < $fields.length)
	{
	$value = document.getElementById( $fields[$i] ).value;
	$value = $value.replace(' ','');
	if($value.length == 0)
	{
	$ret = false;
	break;
	}
	- $i++;
	+ $i++;
	}
	return $ret;
	}
	-
	+
	function editStyle()
	{
	if( ValidateRequired() )
	{
	- openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	+ openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	}
	else
	{
	- alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	+ alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	}
	}
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:selectors_SaveWarning name="grid_save_warning"/>
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
	<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
	-
	+
	<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
	-
	+
	<inp2:m_ParseBlock name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
	-
	+
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
	-
	+
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="text" valign="top">
	<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
	<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<table width="100%">
	<tr>
	<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
	<td>
	<inp2:selectors_PrintStyle field="SelectorData"/>
	</td>
	<td><inp2:m_phrase name="la_StylePreview"/>:</td>
	<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
	<inp2:m_phrase name="la_SampleText"/>
	</td>
	</tr>
	</table>
	</td>
	<td class="error"> </td>
	</tr>
	-
	+
	</table>
	<input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/block_style_edit.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.7.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (revision 7287)
	@@ -1,111 +1,111 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
	+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="block_styles" module="in-portal" icon="icon46_style"/>

	<!-- 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('css','<inp2:css_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('css','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('css', '<inp2:css_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('css', '<inp2:css_NextId/>');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	-
	+
	//Relations related:
	a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBlockStyle" escape="1"/>',
	function() {
	set_hidden_field('remove_specials[selectors.block]',1);
	- std_new_item('selectors.block', 'stylesheets/block_style_edit')
	+ std_new_item('selectors.block', 'in-portal/stylesheets/block_style_edit')
	} ) );
	-
	+
	function edit()
	{
	set_hidden_field('remove_specials[selectors.block]',1);
	- std_edit_temp_item('selectors.block', 'stylesheets/block_style_edit');
	+ std_edit_temp_item('selectors.block', 'in-portal/stylesheets/block_style_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('selectors.block')
	} ) );
	-
	-
	+
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
	set_hidden_field('remove_specials[selectors.block]',1);
	submit_event('selectors.block','OnMassClone');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
	set_hidden_field('remove_specials[selectors.block]',1);
	submit_event('selectors.block','OnMassResetToBase');
	}
	) );
	-
	+
	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="css" function="IsSingle"/>
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	//a_toolbar.HideButton('sep2');
	- <inp2:m_else/>
	+ <inp2:m_else/>
	<inp2:m_if prefix="css" function="IsLast"/>
	a_toolbar.DisableButton('next');
	<inp2:m_endif/>
	<inp2:m_if prefix="css" function="IsFirst"/>
	a_toolbar.DisableButton('prev');
	<inp2:m_endif/>
	<inp2:m_endif/>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_block name="grid_description_td" />
	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/></td>
	<inp2:m_blockend />

	<inp2:m_ParseBlock name="grid" PrefixSpecial="selectors.block" IdField="SelectorId" grid="BlockStyles" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
	<script type="text/javascript">
	Grids['selectors.block'].SetDependantToolbarButtons( new Array('edit','delete','clone','reset_to_base') );
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.7.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/base_style_edit.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/base_style_edit.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/base_style_edit.tpl (revision 7287)
	@@ -1,103 +1,103 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>


	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="base_style_edit" module="in-portal" icon="icon46_style"/>

	<!-- 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('selectors','<inp2:selectors_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('selectors','OnCancel');
	}
	) );
	-
	+
	a_toolbar.Render();
	-
	+
	function ValidateRequired()
	{
	var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
	'<inp2:selectors_InputName field="SelectorName"/>');
	var $ret = true;
	var $i = 0;
	var $value = '';
	while($i < $fields.length)
	{
	$value = document.getElementById( $fields[$i] ).value;
	$value = $value.replace(' ','');
	if($value.length == 0)
	{
	$ret = false;
	break;
	}
	- $i++;
	+ $i++;
	}
	return $ret;
	}
	-
	+
	function editStyle()
	{
	if( ValidateRequired() )
	{
	- openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	+ openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	}
	else
	{
	- alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	+ alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	}
	}
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:selectors_SaveWarning name="grid_save_warning"/>
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
	<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="1">
	-
	+
	<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
	-
	+
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="text" valign="top">
	<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
	<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<table width="100%">
	<tr>
	<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
	<td>
	<inp2:selectors_PrintStyle field="SelectorData"/>
	</td>
	<td><inp2:m_phrase name="la_StylePreview"/>:</td>
	<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
	<inp2:m_phrase name="la_SampleText"/>
	</td>
	</tr>
	</table>
	</td>
	<td class="error"> </td>
	</tr>
	-
	+
	</table>
	<input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/base_style_edit.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.7.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/block_style_edit.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/block_style_edit.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/block_style_edit.tpl (revision 7287)
	@@ -1,113 +1,113 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>


	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="block_style_edit" module="in-portal" icon="icon46_style"/>

	<!-- 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('selectors','<inp2:selectors_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('selectors','OnCancel');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
	submit_event('selectors','OnResetToBase');
	}
	) );
	-
	+
	a_toolbar.Render();
	-
	+
	function ValidateRequired()
	{
	var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
	'<inp2:selectors_InputName field="SelectorName"/>');
	var $ret = true;
	var $i = 0;
	var $value = '';
	while($i < $fields.length)
	{
	$value = document.getElementById( $fields[$i] ).value;
	$value = $value.replace(' ','');
	if($value.length == 0)
	{
	$ret = false;
	break;
	}
	- $i++;
	+ $i++;
	}
	return $ret;
	}
	-
	+
	function editStyle()
	{
	if( ValidateRequired() )
	{
	- openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	+ openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
	}
	else
	{
	- alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	+ alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
	}
	}
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:selectors_SaveWarning name="grid_save_warning"/>
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
	<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
	<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
	-
	+
	<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
	-
	+
	<inp2:m_ParseBlock name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
	-
	+
	<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
	<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
	-
	+
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="text" valign="top">
	<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
	<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<table width="100%">
	<tr>
	<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
	<td>
	<inp2:selectors_PrintStyle field="SelectorData"/>
	</td>
	<td><inp2:m_phrase name="la_StylePreview"/>:</td>
	<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
	<inp2:m_phrase name="la_SampleText"/>
	</td>
	</tr>
	</table>
	</td>
	<td class="error"> </td>
	</tr>
	-
	+
	</table>
	<input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/block_style_edit.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.7.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.19.2/admin/users/user_list.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.19.2/admin/users/user_list.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.19.2/admin/users/user_list.php (revision 7287)
	@@ -1,319 +1,324 @@
	<?php
	##############################################################
	##In-portal ##
	##############################################################
	## In-portal ##
	## Intechnic Corporation ##
	## All Rights Reserved, 1998-2002 ##
	-## ##
	-## No portion of this code may be copied, reproduced or ##
	+## ##
	+## No portion of this code may be copied, reproduced or ##
	## otherwise redistributed without proper written ##
	## consent of Intechnic Corporation. Violation will ##
	## result in revocation of the license and support ##
	## privileges along maximum prosecution allowed by law. ##
	##############################################################

	// new startup: begin
	define('REL_PATH', 'admin/users');
	$relation_level = count( explode('/', REL_PATH) );
	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
	require_once FULL_PATH.'/kernel/startup.php';
	// new startup: end

	checkViewPermission('in-portal:user_list');

	require_login();

	$pathtolocal = $pathtoroot."kernel/";

	require_once ($pathtoroot.$admin."/include/elements.php");
	require_once ($pathtoroot."kernel/admin/include/navmenu.php");
	//require_once ($pathtolocal."admin/include/navmenu.php");
	require_once($pathtoroot.$admin."/toolbar.php");
	require_once($pathtoroot.$admin."/listview/listview.php");

	$pathtolocal = $pathtoroot;


	$objSession->SetVariable('ReturnScript', 'users/'.basename($_SERVER['PHP_SELF']) );

	/* -------------------------------------- Section configuration ------------------------------------------- */
	-$section = 'in-portal:user_list';
	-$envar = "env=" . BuildEnv();
	+$section = 'in-portal:user_list';
	+$envar = "env=" . BuildEnv();

	$SortFieldVar = "User_SortField";
	$SortOrderVar = "User_SortOrder";

	$DefaultSortField = "Login";
	$PerPageVar = "Perpage_User";
	$CurrentPageVar = "Page_UserList";
	$CurrentFilterVar = "User_View";

	$ListForm = "userlistform";
	$CheckClass = "UserChecks";

	/* ------------------------------------- Configure the toolbar ------------------------------------------- */
	$objListToolBar = new clsToolBar();

	$objListToolBar->Set("section",$section);
	$objListToolBar->Set("load_menu_func","");
	$objListToolBar->Set("CheckClass",$CheckClass);
	$objListToolBar->Set("CheckForm",$ListForm);
	-
	+
	$listImages = array();
	//$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick

	$objListToolBar->Add("new_user", "la_ToolTip_New_User",$adminURL."/users/adduser.php?$envar&new=1","swap('new_user','toolbar/tool_new_user_f2.gif');",
	"swap('new_user', 'toolbar/tool_new_user.gif');","");

	$objListToolBar->Add("user_edit","la_ToolTip_Edit","#", "if (UserChecks.itemChecked()) swap('user_edit','toolbar/tool_edit_f2.gif');",
	"if (UserChecks.itemChecked()) swap('user_edit', 'toolbar/tool_edit.gif');","if (UserChecks.itemChecked()) UserChecks.check_submit('adduser', '');",
	"tool_edit.gif",TRUE,TRUE);
	$listImages[] = "UserChecks.addImage('user_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); ";

	$objListToolBar->Add("user_del","la_ToolTip_Delete","#", "if (UserChecks.itemChecked()) swap('user_del','toolbar/tool_delete_f2.gif');",
	"if (UserChecks.itemChecked()) swap('user_del', 'toolbar/tool_delete.gif');","if (UserChecks.itemChecked()) UserChecks.check_submit('user_list', 'm_delete_user');",
	"tool_delete.gif",FALSE,TRUE);
	$listImages[] = "UserChecks.addImage('user_del','$imagesURL/toolbar/tool_delete.gif','$imagesURL/toolbar/tool_delete_f3.gif',1); ";

	$objListToolBar->Add("user_primary","la_ToolTip_PrimaryGroup","#", "if (UserChecks.itemChecked()) swap('user_primary','toolbar/tool_primary_user_group_f2.gif');",
	"if (UserChecks.itemChecked()) swap('user_primary', 'toolbar/tool_primary_user_group.gif');","if (UserChecks.itemChecked()) SelectPrimaryGroup();",
	"tool_primary_user_group.gif",FALSE,TRUE);
	$listImages[] = "UserChecks.addImage('user_primary','$imagesURL/toolbar/tool_primary_user_group.gif','$imagesURL/toolbar/tool_primary_user_group_f3.gif',1); ";

	$objListToolBar->Add("divider");

	$objListToolBar->Add("user_app","la_ToolTip_Approve","#","if (UserChecks.itemChecked()) swap('user_app','toolbar/tool_approve_f2.gif');",
	"if (UserChecks.itemChecked()) swap('user_app', 'toolbar/tool_approve.gif');","if (UserChecks.itemChecked()) UserChecks.check_submit('user_list', 'm_approve_user');",
	"tool_approve.gif",FALSE,TRUE);
	$listImages[] = "UserChecks.addImage('user_app','$imagesURL/toolbar/tool_approve.gif','$imagesURL/toolbar/tool_approve_f3.gif',1); ";

	$objListToolBar->Add("user_deny","la_ToolTip_Deny","#","if (UserChecks.itemChecked()) swap('user_deny','toolbar/tool_decline_f2.gif');",
	"if (UserChecks.itemChecked()) swap('user_deny', 'toolbar/tool_decline.gif');","if (UserChecks.itemChecked()) UserChecks.check_submit('user_list', 'm_deny_user');",
	"tool_deny.gif",FALSE,TRUE);
	$listImages[] = "UserChecks.addImage('user_deny','$imagesURL/toolbar/tool_decline.gif','$imagesURL/toolbar/tool_decline_f3.gif',1); ";

	$objListToolBar->Add("user_ban","la_ToolTip_Ban","#","if (UserChecks.itemChecked()) swap('user_ban','toolbar/tool_ban_user_f2.gif');",
	"if (UserChecks.itemChecked()) swap('user_ban', 'toolbar/tool_ban_user.gif');","if (UserChecks.itemChecked()) UserChecks.check_submit('banuser', '');",
	"tool_deny.gif",FALSE,TRUE);
	$listImages[] = "UserChecks.addImage('user_ban','$imagesURL/toolbar/tool_ban_user.gif','$imagesURL/toolbar/tool_ban_user_f3.gif',1); ";

	+
	+
	+
	$objListToolBar->Add("divider");

	$objListToolBar->Add("user_mail","la_ToolTip_SendMail","#", "if (UserChecks.itemChecked()) swap('user_mail','toolbar/tool_e-mail_f2.gif');",
	"if (UserChecks.itemChecked()) swap('user_mail', 'toolbar/tool_e-mail.gif');","if (UserChecks.itemChecked()) openEmailPopup('','sendmail',$CheckClass);",
	"tool_e-mail.gif",FALSE,TRUE);

	$listImages[] = "UserChecks.addImage('user_mail','$imagesURL/toolbar/tool_e-mail.gif','$imagesURL/toolbar/tool_e-mail_f3.gif',1); ";

	$objListToolBar->Add("user_print", "la_ToolTip_Print","#","swap('user_print','toolbar/tool_print_f2.gif');",
	"swap('user_print', 'toolbar/tool_print.gif');","window.print();","tool_print.gif");

	$objListToolBar->Add("viewmenubutton", "la_ToolTip_View","#","swap('viewmenubutton','toolbar/tool_view_f2.gif'); ",
	"swap('viewmenubutton', 'toolbar/tool_view.gif');",
	"ShowViewMenu();","tool_view.gif");

	$objListToolBar->AddToInitScript($listImages);

	/* ----------------------------------------- Set the View Filter ---------------------------------------- */

	/* bit place holders for category view menu */
	$Bit_Pending=4;
	$Bit_Disabled=2;
	$Bit_Valid=1;
	$Bit_All = 7;

	$FilterLabels = array();

	$FilterLabels[0] = admin_language("la_Text_Enabled");
	$FilterLabels[1] = admin_language("la_Text_Disabled");
	$FilterLabels[2] = admin_language("la_Text_Pending");

	/* determine current view menu settings */
	$UserView = $objConfig->Get("User_View");

	if(!is_numeric($UserView))
	-{
	+{
	$UserView = $Bit_All; //Set all bits ON
	$UserFilter = "";
	}
	if($UserView & $Bit_Valid)
	$Status[] = 1;

	if($UserView & $Bit_Disabled)
	$Status[] = 0;

	if($UserView & $Bit_Pending)
	$Status[] = 2;

	if(count($Status)>0)
	- {
	+ {
	$UserFilter = "Status IN (".implode(",",$Status).")";
	}
	else
	$UserFilter = "Status = -1";

	$order = $objConfig->Get($SortOrderVar);
	$SearchWords = $objSession->GetVariable("UserSearchWord");

	$where = '1';

	$SearchWhere = $SearchWords ? $objUsers->AdminSearchWhereClause($SearchWords) : '';
	if(strlen($SearchWhere))
	{
	$where .= " AND (".$SearchWhere.")";
	}

	if(strlen($UserFilter))
	$where .= " AND (".$UserFilter.")";

	-
	+
	/* ------------------------------------ Build the SQL statement to populate the list ---------------------------*/

	$sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
	$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y %H:%i:%s') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
	$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
	$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE $where";

	if(!strlen($objConfig->Get($SortFieldVar)))
	$objConfig->Set($SortFieldVar,$DefaultSortField);

	$orderBy = trim($objConfig->Get($SortFieldVar)." ".$objConfig->Get($SortOrderVar));

	if(strlen($orderBy))
	$sql .=" ORDER BY ".$orderBy;

	-if( GetVar('resetpage') )
	+if( GetVar('resetpage') )
	{
	$page = 1;
	$objSession->SetVariable($CurrentPageVar,1);
	}
	else
	-{
	+{
	if( GetVar('lpn') )
	- {
	+ {
	$page = GetVar('lpn');
	$objSession->SetVariable($CurrentPageVar, $page);
	}
	else
	{
	$page = $objSession->GetVariable($CurrentPageVar);
	}
	}
	//$sql .=" ".GetLimitSQL($page,(int)$objConfig->Get($PerPageVar));

	$objSession->SetVariable("HasChanges", 0);

	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
	$objListView = new clsListView($objListToolBar);
	$objListView->CurrentPageVar = $CurrentPageVar;
	$objListView->PerPageVar = $PerPageVar;
	//echo "SQL: $sql<br>";

	$objUsers->Query_Item($sql, false, 'set_first');
	$objSession->SetVariable($CurrentPageVar, 1);

	$itemcount = QueryCount($sql);
	//$title = prompt_language("la_Text_ShowingUsers")." (".$objUsers->NumItems().")";
	//removed by PSK 2004-10-21
	if(strlen($SearchWords))
	{
	$title = prompt_language("la_Text_Search_Results")." (".$itemcount.")";
	}
	else
	$title = prompt_language("la_Text_ShowingUsers")." (".$itemcount.")";
	-
	- $objListView->SetListItems($objUsers);
	+
	+ $objListView->SetListItems($objUsers);
	/* ---------------------------------------- Configure the list view ---------------------------------------- */

	$objListView->IdField = "ResourceId";
	$objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl";

	$objListView->ColumnHeaders->Add("Login",admin_language("la_prompt_Username"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"Login");
	$objListView->ColumnHeaders->Add("LastName",admin_language("la_prompt_Last_Name"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"LastName");
	$objListView->ColumnHeaders->Add("FirstName",admin_language("la_prompt_First_Name"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"FirstName");
	$objListView->ColumnHeaders->Add("Email",admin_language("la_prompt_Email"),1,0,$order,"width=\"20%\"",$SortFieldVar,$SortOrderVar,"Email");
	$objListView->ColumnHeaders->Add("GroupName",admin_language("la_prompt_PrimaryGroup"),1,0,$order,"width=\"20%\"",$SortFieldVar,$SortOrderVar,"GroupName");
	$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"u.CreatedOn");

	$objListView->ColumnHeaders->SetSort($objConfig->Get($SortFieldVar), $objConfig->Get($SortOrderVar));

	$objListView->PrintToolBar = FALSE;
	$objListView->SearchBar = TRUE;
	$objListView->SearchKeywords = $SearchWords;
	$objListView->SearchAction="m_user_search";
	$objListView->CheckboxName = "itemlist[]";
	$objListView->TotalItemCount = $itemcount;

	$objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,
	$CurrentFilterVar,$UserView,$Bit_All);

	foreach($FilterLabels as $Bit=>$Label)
	{
	$objListView->AddViewMenuFilter($Label,$Bit);
	- }
	-
	+ }
	+
	for($i=0;$i<count($objUsers->Items);$i++)
	{
	$u =& $objUsers->GetItemRefByIndex($i);
	$objListView->RowIcons[] = $u->StatusIcon();
	}
	$objListToolBar->AddToInitScript("fwLoadMenus();");

	$filter = false; // always initialize variables before use
	if($objSession->GetVariable("UserSearchWord") != '') {
	$filter = true;
	-}
	+}
	else {
	if ($UserView != $Bit_All) {
	$filter = true;
	}
	}

	$h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
	int_header($objListToolBar,NULL, $title,NULL,$h);
	if ($filter) { ?>
	<table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolbar">
	<tr>
	<td valign="top">
	<?php int_hint_red(admin_language("la_Warning_Filter")); ?>
	</td>
	</tr>
	</table>
	<?php } ?>
	<FORM method="POST" ACTION="" NAME="userlistform" ID="userlistform">
	<?php
	print $objListView->PrintList();
	?>
	<input type="hidden" name="Action" value="">
	</FORM>
	<FORM method=POST NAME="sendmail" ID="sendmail" target="sendmail" ACTION="<?php echo $adminURL."/email/sendmail.php?env=".BuildEnv(); ?>">
	<INPUT TYPE="HIDDEN" NAME="idlist" ID="idlist" VALUE="">
	<INPUT TYPE="hidden" NAME="idtype" ID="idtype" VALUE="user">
	</FORM>
	<!-- CODE FOR VIEW MENU -->
	<form ID="viewmenu" method="post" action="user_list.php?env=<?php echo BuildEnv(); ?>" name="viewmenu">
	<input type="hidden" name="fieldname" value="">
	<input type="hidden" name="varvalue" value="">
	<input type="hidden" name="varvalue2" value="">
	<input type="hidden" name="Action" value="">
	</form>

	<form ID="popup" method="post" action="user_list.php?env=<?php echo BuildEnv(); ?>" name="popup">
	<INPUT TYPE="hidden" NAME="grouplist">
	<input TYPE="hidden" NAME="Action" VALUE="m_user_primarygroup">
	<input type="hidden" NAME="userlist">
	-</FORM>
	+</FORM>
	<FORM ID="ListSearchForm" NAME="ListSearchForm" method="POST" action="<?php echo $_SERVER["PHP_SELF"]."?env=".BuildEnv(); ?>">
	<INPUT TYPE="HIDDEN" NAME="Action" VALUE="">
	<INPUT TYPE="HIDDEN" NAME="list_search">
	</FORM>
	<script src="<?php echo $adminURL; ?>/listview/listview.js"></script>
	<script>
	initSelectiorContainers();
	-<?php echo $objListToolBar->Get("CheckClass").".setImages();"; ?>
	+<?php echo $objListToolBar->Get("CheckClass").".setImages();"; ?>
	+
	+
	</script>

	<!-- END CODE-->
	<?php int_footer(); ?>

	Property changes on: branches/unlabeled/unlabeled-1.19.2/admin/users/user_list.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.19
	\ No newline at end of property
	+1.19.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/stylesheets/stylesheets_list.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/stylesheets/stylesheets_list.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/stylesheets/stylesheets_list.tpl (revision 7287)
	@@ -1,75 +1,75 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="styles_list" module="in-portal" icon="icon46_style"/>

	<!-- ToolBar --->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	//do not rename - this function is used in default grid for double click!
	function edit()
	{
	- std_edit_item('css', 'stylesheets/stylesheets_edit');
	+ std_edit_item('css', 'in-portal/stylesheets/stylesheets_edit');
	}
	-
	+
	var a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('new_style', '<inp2:m_phrase label="la_ToolTip_NewStylesheet" escape="1"/>',
	function() {
	- std_precreate_item('css', 'stylesheets/stylesheets_edit')
	+ std_precreate_item('css', 'in-portal/stylesheets/stylesheets_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('css')
	} ) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	submit_event('css','OnMassApprove');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	submit_event('css','OnMassDecline');
	}
	- ) );
	-
	+ ) );
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
	submit_event('css','OnMassClone');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	show_viewmenu(a_toolbar,'view');
	}
	) );
	-
	+
	a_toolbar.Render();
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_block name="grid_description_td" no_special=""/>
	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/></td>
	<inp2:m_blockend />

	<inp2:m_ParseBlock name="grid" PrefixSpecial="css" IdField="StylesheetId" grid="Default" menu_filters="yes"/>
	<script type="text/javascript">
	Grids['css'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','clone') );
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/stylesheets/stylesheets_list.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.8
	\ No newline at end of property
	+1.8.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.8.2/admin/import/step2.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.8.2/admin/import/step2.php (revision 7286)
	+++ branches/unlabeled/unlabeled-1.8.2/admin/import/step2.php (revision 7287)
	@@ -1,76 +1,76 @@
	-<?php
	+<?php

	// new startup: begin
	define('REL_PATH', 'admin/import');
	$relation_level = count( explode('/', REL_PATH) );
	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
	require_once FULL_PATH.'/kernel/startup.php';
	// new startup: end
	checkViewPermission('in-portal:main_import');

	$pathtolocal = $pathtoroot."kernel/";
	require_once ($pathtoroot.$admin."/include/elements.php");
	require_once ($pathtoroot."kernel/admin/include/navmenu.php");
	require_once ($pathtolocal."admin/include/navmenu.php");
	require_once($pathtoroot.$admin."/toolbar.php");
	//Set Section
	$section = "in-portal:main_import";
	-
	+
	//Set Environment Variable
	$envar = "env=" . BuildEnv();
	$var = '?env='.BuildEnv();
	-
	+
	$sec = $objSections->GetSection($section);
	$objCatToolBar = new clsToolBar();
	-
	+
	// Previous Button
	$MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
	$MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');";
	$link = $adminURL.'/import/step1.php'.$var;
	$objCatToolBar->Add('moveleft','la_ToolTip_PreviousStep', $link, $MouseOver, $MouseOut,'','tool_prev.gif');
	-
	+
	// Next Button
	$MouseOver = "if( ChoiseMade('import_form','choose') !== false ) swap('moveright','toolbar/tool_next_f2.gif');";
	$MouseOut = "if( ChoiseMade('import_form','choose') !== false ) swap('moveright', 'toolbar/tool_next.gif');";
	-
	+
	if($ro_perm)
	{
	$click_url = $adminURL."/import/step1.php".$var;
	$onClick = "if( ChoiseMade('import_form','choose') ) document.location= '$click_url'; ";
	}
	else
	{
	$application =& kApplication::Instance();
	- $click_url = $application->HREF('import_redirect', '', null, 'index.php'); // $adminURL."/import/step3.php".$var;
	+ $click_url = $application->HREF('in-portal/import_redirect', '', null, 'index.php'); // $adminURL."/import/step3.php".$var;
	$onClick = "ImportRedirect('import_form', ChoiseMade('import_form','choose'), '$click_url');";
	}
	$objCatToolBar->Add("moveright",'la_ToolTip_NextStep','#',$MouseOver,$MouseOut,$onClick,"tool_next_f3.gif");
	-
	+
	// header
	$title = admin_language("la_performing_import")." - ".admin_language("la_Step")." 2";
	int_header($objCatToolBar,NULL,$title);
	-
	+
	$objSession->SetVariable("ReturnScript", 'browse.php'); // return to catalog if import is made
	-
	+
	?>
	<form name="import_form" id="import_form" method="post" action="<?php echo $click_url; ?>">
	<input type="hidden" name="import_id" id="import_id" value="">
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">

	<?php int_subsection_title("Import Source"); ?>
	- <tr <?php echo int_table_color(); ?>>
	+ <tr <?php echo int_table_color(); ?>>
	<td><span class="text">Select the program you are importing the data from:</span></td>
	</tr>
	<tr <?php echo int_table_color(); ?>>
	<td>
	<?php
	foreach($import_scripts as $id => $iscript)
	echo '<input type="radio" name="choose" id="ch'.$id.'" value="'.$id.'" onclick="swap(\'moveright\', \'toolbar/tool_next.gif\')"'.(!$iscript['enabled'] ? ' disabled="true"' : '').'><span class="text"><label for="ch'.$id.'">'.$iscript['label'].'</label></span><br />'."\n";
	?>
	</td>
	</tr>
	</table>
	</form>
	<?php
	int_footer();
	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.8.2/admin/import/step2.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.8
	\ No newline at end of property
	+1.8.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.8.2/core/admin_templates/stylesheets/stylesheets_list.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.8.2/core/admin_templates/stylesheets/stylesheets_list.tpl (revision 7286)
	+++ branches/unlabeled/unlabeled-1.8.2/core/admin_templates/stylesheets/stylesheets_list.tpl (revision 7287)
	@@ -1,75 +1,75 @@
	<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
	<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" icon="icon46_style" title="!la_title_Stylesheets!"/>

	<inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="styles_list" module="in-portal" icon="icon46_style"/>

	<!-- ToolBar --->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	//do not rename - this function is used in default grid for double click!
	function edit()
	{
	- std_edit_item('css', 'stylesheets/stylesheets_edit');
	+ std_edit_item('css', 'in-portal/stylesheets/stylesheets_edit');
	}
	-
	+
	var a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('new_style', '<inp2:m_phrase label="la_ToolTip_NewStylesheet" escape="1"/>',
	function() {
	- std_precreate_item('css', 'stylesheets/stylesheets_edit')
	+ std_precreate_item('css', 'in-portal/stylesheets/stylesheets_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('css')
	} ) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
	submit_event('css','OnMassApprove');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
	submit_event('css','OnMassDecline');
	}
	- ) );
	-
	+ ) );
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
	submit_event('css','OnMassClone');
	}
	) );
	-
	+
	a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	-
	+
	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	show_viewmenu(a_toolbar,'view');
	}
	) );
	-
	+
	a_toolbar.Render();
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_block name="grid_description_td" no_special=""/>
	<td valign="top" class="text"><inp2:$PrefixSpecial_field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/></td>
	<inp2:m_blockend />

	<inp2:m_ParseBlock name="grid" PrefixSpecial="css" IdField="StylesheetId" grid="Default" menu_filters="yes"/>
	<script type="text/javascript">
	Grids['css'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','clone') );
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.8.2/core/admin_templates/stylesheets/stylesheets_list.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.8
	\ No newline at end of property
	+1.8.2.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