Index: branches/RC/core/install/install_schema.sql
===================================================================
diff -u -N -r10908 -r10923
--- branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 10908)
+++ branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 10923)
@@ -622,3 +622,13 @@
   KEY MisspelledWord (MisspelledWord),
   KEY SuggestedCorrection (SuggestedCorrection)
 );
+
+CREATE TABLE Thesaurus (
+  ThesaurusId int(11) NOT NULL auto_increment,
+  SearchTerm varchar(255) NOT NULL default '',
+  ThesaurusTerm varchar(255) NOT NULL default '',
+  ThesaurusType tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (ThesaurusId),
+  KEY ThesaurusType (ThesaurusType),
+  KEY SearchTerm (SearchTerm)
+);
\ No newline at end of file
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r10918 -r10923
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10918)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10923)
@@ -359,4 +359,14 @@
 );
 
 INSERT INTO ConfigurationValues VALUES(NULL, 'YahooApplicationId', '56QxES3V34FXHPPcrPI_6.0mjc6QIG4AnHP0OC2LZEePW0nq_uNG.kVmSKG4llurekJ.OIE-', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationAdmin VALUES('YahooApplicationId', 'la_Text_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.15, 0, 0);
\ No newline at end of file
+INSERT INTO ConfigurationAdmin VALUES('YahooApplicationId', 'la_Text_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.15, 0, 0);
+
+CREATE TABLE Thesaurus (
+  ThesaurusId int(11) NOT NULL auto_increment,
+  SearchTerm varchar(255) NOT NULL default '',
+  ThesaurusTerm varchar(255) NOT NULL default '',
+  ThesaurusType tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (ThesaurusId),
+  KEY ThesaurusType (ThesaurusType),
+  KEY SearchTerm (SearchTerm)
+);
\ No newline at end of file
Index: branches/RC/core/admin_templates/thesaurus/thesaurus_edit.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/thesaurus/thesaurus_edit.tpl	(revision 0)
+++ branches/RC/core/admin_templates/thesaurus/thesaurus_edit.tpl	(revision 10923)
@@ -0,0 +1,73 @@
+<inp2:adm_SetPopupSize width="550" height="400"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:thesaurus"  prefix="thesaurus" title_preset="spelling_dictionary_edit"/>
+
+<!-- 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('thesaurus', '<inp2:thesaurus_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('thesaurus', 'OnCancelEdit','<inp2:thesaurus_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+				 ) );
+
+			 a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+						reset_form('thesaurus', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+			 	) );
+
+				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('thesaurus', '<inp2:thesaurus_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('thesaurus', '<inp2:thesaurus_NextId/>');
+						}
+				 ) );
+
+
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="thesaurus_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="thesaurus_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="thesaurus_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:thesaurus_SaveWarning name="grid_save_warning"/>
+<inp2:thesaurus_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+<table class="edit-form">
+		<inp2:m_RenderElement name="inp_id_label" prefix="thesaurus" field="ThesaurusId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="thesaurus" field="SearchTerm" title="la_fld_SearchTerm"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="thesaurus" field="ThesaurusTerm" title="la_fld_ThesaurusTerm"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="thesaurus" field="ThesaurusType" title="la_fld_ThesaurusType"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
Index: branches/RC/admin/install/inportal_remove.sql
===================================================================
diff -u -N -r10908 -r10923
--- branches/RC/admin/install/inportal_remove.sql	(.../inportal_remove.sql)	(revision 10908)
+++ branches/RC/admin/install/inportal_remove.sql	(.../inportal_remove.sql)	(revision 10923)
@@ -238,4 +238,6 @@
 # --------------------------------------------------------
 DROP TABLE Agents
 # --------------------------------------------------------
-DROP TABLE SpellingDictionary
\ No newline at end of file
+DROP TABLE SpellingDictionary
+# --------------------------------------------------------
+DROP TABLE Thesaurus
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -N -r10908 -r10923
--- branches/RC/core/install/english.lang	(.../english.lang)	(revision 10908)
+++ branches/RC/core/install/english.lang	(.../english.lang)	(revision 10923)
@@ -7,7 +7,10 @@
 			<PHRASE Label="la_col_NextRunOn" Module="Core" Type="1">TmV4dCBSdW4gT24=</PHRASE>
 			<PHRASE Label="la_col_RunInterval" Module="Core" Type="1">UnVuIEludGVydmFs</PHRASE>
 			<PHRASE Label="la_col_RunMode" Module="Core" Type="1">UnVuIE1vZGU=</PHRASE>
+			<PHRASE Label="la_col_SearchTerm" Module="Core" Type="1">U2VhcmNoIFRlcm0=</PHRASE>
 			<PHRASE Label="la_col_SuggestedCorrection" Module="Core" Type="1">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
+			<PHRASE Label="la_col_ThesaurusTerm" Module="Core" Type="1">VGhlc2F1cnVzIFRlcm0=</PHRASE>
+			<PHRASE Label="la_col_ThesaurusType" Module="Core" Type="1">VGhlc2F1cnVzIFR5cGU=</PHRASE>
 			<PHRASE Label="la_config_FilenameSpecialCharReplacement" Module="Core" Type="1">RmlsZW5hbWUgU3BlY2lhbCBDaGFyIFJlcGxhY2VtZW50</PHRASE>
 			<PHRASE Label="la_fld_Event" Module="Core" Type="1">RXZlbnQ=</PHRASE>
 			<PHRASE Label="la_fld_FilenameReplacements" Module="Core" Type="1">RmlsZW5hbWUgUmVwbGFjZW1lbnRz</PHRASE>
@@ -18,7 +21,10 @@
 			<PHRASE Label="la_fld_RunInterval" Module="Core" Type="1">UnVuIEludGVydmFs</PHRASE>
 			<PHRASE Label="la_fld_RunMode" Module="Core" Type="1">UnVuIE1vZGU=</PHRASE>
 			<PHRASE Label="la_fld_RunTime" Module="Core" Type="1">UnVuIFRpbWU=</PHRASE>
+			<PHRASE Label="la_fld_SearchTerm" Module="Core" Type="1">U2VhcmNoIFRlcm0=</PHRASE>
 			<PHRASE Label="la_fld_SuggestedCorrection" Module="Core" Type="1">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
+			<PHRASE Label="la_fld_ThesaurusTerm" Module="Core" Type="1">VGhlc2F1cnVzIFRlcm0=</PHRASE>
+			<PHRASE Label="la_fld_ThesaurusType" Module="Core" Type="1">VGhlc2F1cnVzIFR5cGU=</PHRASE>
 			<PHRASE Label="la_fld_Type" Module="Core" Type="1">VHlwZQ==</PHRASE>
 			<PHRASE Label="la_opt_Active" Module="Core" Type="1">QWN0aXZl</PHRASE>
 			<PHRASE Label="la_opt_After" Module="Core" Type="1">QWZ0ZXI=</PHRASE>
@@ -36,6 +42,7 @@
 			<PHRASE Label="la_title_EditingSpellingDictionary" Module="Core" Type="1">RWRpdGluZyBTcGVsbGluZyBEaWN0aW9uYXJ5</PHRASE>
 			<PHRASE Label="la_title_NewAgent" Module="Core" Type="1">TmV3IEFnZW50</PHRASE>
 			<PHRASE Label="la_title_SpellingDictionary" Module="Core" Type="1">U3BlbGxpbmcgRGljdGlvbmFyeQ==</PHRASE>
+			<PHRASE Label="la_title_Thesaurus" Module="Core" Type="1">VGhlc2F1cnVz</PHRASE>
 		</PHRASES>
 	</LANGUAGE>
 </LANGUAGES>
\ No newline at end of file
Index: branches/RC/core/units/thesaurus/thesaurus_tp.php
===================================================================
diff -u -N
--- branches/RC/core/units/thesaurus/thesaurus_tp.php	(revision 0)
+++ branches/RC/core/units/thesaurus/thesaurus_tp.php	(revision 10923)
@@ -0,0 +1,82 @@
+<?php
+
+	class ThesaurusTagProcessor extends kDBTagProcessor {
+
+		function SubSearchLink($params)
+		{
+			$object =& $this->getObject();
+			/* @var $object kDBItem */
+
+			$params['search_type'] = 'subsearch';
+			$params['keywords'] = $object->GetDBField('ThesaurusTerm');
+			$params['narrow_search'] = 1;
+
+			return $this->Application->ProcessParsedTag('m', 'Link', $params);
+		}
+
+		function _getThesaurusRecords()
+		{
+			$keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
+			$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
+
+			$sql = 'SELECT *
+					FROM ' . $table_name . '
+					WHERE SearchTerm LIKE ' . $this->Conn->qstr($keywords).' OR SearchTerm LIKE ' . $this->Conn->qstr($keywords . '_');
+			$records = $this->Conn->Query($sql);
+
+			$new_records = Array ();
+			foreach ($records as $record) {
+				if ($record['ThesaurusType'] == THESAURUS_TYPE_USE) {
+					// expand in global scope
+					$sql = 'SELECT *
+							FROM ' . $table_name . '
+							WHERE SearchTerm = ' . $this->Conn->qstr($record['ThesaurusTerm']);
+					$use_records = $this->Conn->Query($sql);
+					if ($use_records) {
+						$new_records = array_merge($new_records, $use_records);
+					}
+				}
+
+				$new_records[] = $record;
+			}
+
+			usort($new_records, Array (&$this, '_sortThesaurus'));
+			ksort($new_records);
+
+			return $new_records;
+		}
+
+		function HasThesaurus($params)
+		{
+			$new_records = $this->_getThesaurusRecords();
+			return count($new_records) > 0;
+		}
+
+		function PrintThesaurus($params)
+		{
+			$new_records = $this->_getThesaurusRecords();
+
+			$ret = '';
+			$block_params = $this->prepareTagParams($params);
+			$block_params['name'] = $params['render_as'];
+			foreach ($new_records as $record) {
+				$block_params['term'] = $record['ThesaurusTerm'];
+
+				$url_params = Array (
+					'search_type' => 'subsearch',
+					'keywords' => $record['ThesaurusTerm'],
+					'narrow_search' => 1,
+				);
+				$block_params['url'] = $this->Application->ProcessParsedTag('m', 'Link', $url_params);
+
+				$ret .= $this->Application->ParseBlock($block_params);
+			}
+
+			return $ret;
+		}
+
+		function _sortThesaurus($record_a, $record_b)
+		{
+			return strcmp(strtolower($record_a['ThesaurusTerm']), strtolower($record_b['ThesaurusTerm']));
+		}
+	}
Index: branches/RC/core/admin_templates/thesaurus/thesaurus_list.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/thesaurus/thesaurus_list.tpl	(revision 0)
+++ branches/RC/core/admin_templates/thesaurus/thesaurus_list.tpl	(revision 10923)
@@ -0,0 +1,48 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:thesaurus" prefix="thesaurus" title_preset="thesaurus_list" />
+
+<!-- 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('thesaurus', 'thesaurus/thesaurus_edit');
+	  			}
+
+	  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('thesaurus', 'thesaurus/thesaurus_edit');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('thesaurus')
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				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>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="thesaurus" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="thesaurus" IdField="ThesaurusId" grid="Default" grid_filters="1"/>
+<script type="text/javascript">
+	Grids['thesaurus'].SetDependantToolbarButtons( new Array('edit','delete') );
+</script>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/units/thesaurus/thesaurus_config.php
===================================================================
diff -u -N
--- branches/RC/core/units/thesaurus/thesaurus_config.php	(revision 0)
+++ branches/RC/core/units/thesaurus/thesaurus_config.php	(revision 10923)
@@ -0,0 +1,85 @@
+<?php
+
+	$config = Array (
+		'Prefix' => 'thesaurus',
+		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+		'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+		'EventHandlerClass' => Array ('class' => 'ThesaurusEventHandler', 'file' => 'thesaurus_eh.php', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'ThesaurusTagProcessor', 'file' => 'thesaurus_tp.php', 'build_event' => 'OnBuild'),
+
+		'AutoLoad' => true,
+
+		'QueryString' => Array (
+			1 => 'id',
+			2 => 'Page',
+			3 => 'event',
+			4 => 'mode',
+		),
+
+		'IDField' => 'ThesaurusId',
+
+		'TableName' => TABLE_PREFIX.'Thesaurus',
+
+		'TitleField' => 'SearchTerm',
+
+		'TitlePresets' => Array (
+			'default' => Array (
+				'new_status_labels' => Array ('thesaurus' => '!la_title_AddingThesaurus!'),
+				'edit_status_labels' => Array ('thesaurus' => '!la_title_EditingThesaurus!'),
+			),
+
+			'thesaurus_list' => Array ('prefixes' => Array ('thesaurus_List'), 'format' => "!la_title_Thesaurus! (#thesaurus_recordcount#)"),
+			'thesaurus_edit' => Array ('prefixes' => Array ('thesaurus'), 'format' => "#thesaurus_status# '#thesaurus_titlefield#'"),
+		),
+
+		'PermSection' => Array('main' => 'in-portal:thesaurus'),
+
+		'Sections' => Array (
+			'in-portal:thesaurus' => Array (
+				'parent'		=>	'in-portal:site',
+				'icon'			=>	'custom',
+				'label'			=>	'la_title_Thesaurus',
+				'url'			=>	Array('t' => 'thesaurus/thesaurus_list', 'pass' => 'm'),
+				'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
+				'priority'		=>	4.2,
+				'type'			=>	stTREE,
+			),
+		),
+
+		'ListSQLs' => Array (
+			'' => '	SELECT %1$s.* %2$s FROM %1$s',
+		),
+
+		'ListSortings' => Array (
+			'' => Array (
+				'Sorting' => Array ('SearchTerm' => 'asc'),
+			)
+		),
+
+		'Fields' => Array (
+			'ThesaurusId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		    'SearchTerm' => Array ('type' => 'string', 'max_len' => 255, 'required' => 1, 'not_null' => 1, 'default' => ''),
+		    'ThesaurusTerm' => Array ('type' => 'string', 'max_len' => 255,  'required' => 1, 'not_null' => 1, 'default' => ''),
+		    'ThesaurusType' => Array (
+		    	'type' => 'int',
+		    	'formatter' => 'kOptionsFormatter', 'options' => Array (
+		    		0 => 'NT', 
+//		    		1 => 'RT', 
+//		    		2 => 'USE'
+		    	),
+		    	'not_null' => 1,  'required' => 1, 'default' => 0
+		    ),
+		),
+
+		'Grids' => Array (
+			'Default' => Array (
+				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Fields' => Array (
+					'ThesaurusId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
+					'SearchTerm' => Array ('title' => 'la_col_SearchTerm', 'filter_block' => 'grid_like_filter',),
+					'ThesaurusTerm' => Array ('title' => 'la_col_ThesaurusTerm', 'filter_block' => 'grid_like_filter',),
+					'ThesaurusType' => Array ('title' => 'la_col_ThesaurusType', 'filter_block' => 'grid_options_filter',),
+				),
+			),
+		),
+	);
\ No newline at end of file
Index: branches/RC/core/units/thesaurus/thesaurus_eh.php
===================================================================
diff -u -N
--- branches/RC/core/units/thesaurus/thesaurus_eh.php	(revision 0)
+++ branches/RC/core/units/thesaurus/thesaurus_eh.php	(revision 10923)
@@ -0,0 +1,22 @@
+<?php
+
+	class ThesaurusEventHandler extends kDBEventHandler {
+
+		/**
+		 * Shows only thesaurus terms, that matches searched keywords
+		 *
+		 * @param kEvent $event
+		 */
+		function SetCustomQuery(&$event)
+		{
+			parent::SetCustomQuery($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBList */
+
+			if (!$this->Application->IsAdmin()) {
+				$keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
+				$object->addFilter('search_filter', '%1$s.SearchTerm LIKE ' . $this->Conn->qstr($keywords).' OR %1$s.SearchTerm LIKE ' . $this->Conn->qstr($keywords . '_'));
+			}
+		}
+	}
\ No newline at end of file