Ticket #715 - Integration with Forum module.

modules/boonex/forum/classes/BxForumConfig.php

@@ -132,6 +132,7 @@ class BxForumConfig extends BxBaseModTextConfig
             	'txt_sample_single_with_article' => '_bx_forum_txt_sample_single_with_article',
             	'txt_sample_comment_single' => '_bx_forum_txt_sample_comment_single',
             	'txt_sample_vote_single' => '_bx_forum_txt_sample_vote_single',
+            	'form_field_author' => '_bx_forum_form_entry_input_author',
             	'grid_action_err_delete' => '_bx_forum_grid_action_err_delete',
             	'grid_txt_account_manager' => '_bx_forum_grid_txt_account_manager',
             	'filter_item_active' => '_bx_forum_grid_filter_item_title_adm_active',

modules/boonex/forum/install/langs/en.xml

@@ -10,7 +10,7 @@
 	<string name="_bx_forum_option_per_page_index"><![CDATA[Number of items per page on site home page]]></string>
 	<string name="_bx_forum_option_per_page_profile"><![CDATA[Number of items per page on profile page]]></string>
 	<string name="_bx_forum_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
-	<string name="_bx_forum_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+	<string name="_bx_forum_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
 	<string name="_bx_forum_option_autosubscribe_created"><![CDATA[Autosubscribe to newly created discussions]]></string>
 	<string name="_bx_forum_option_autosubscribe_replied"><![CDATA[Autosubscribe to replied discussions]]></string>
 
@@ -19,6 +19,7 @@
 	<string name="_bx_forum_form_entry_display_delete"><![CDATA[Delete discussion]]></string>
 	<string name="_bx_forum_form_entry_display_edit"><![CDATA[Edit discussion]]></string>
 	<string name="_bx_forum_form_entry_display_view"><![CDATA[View discussion]]></string>
+	<string name="_bx_forum_form_entry_input_author"><![CDATA[Author]]></string>
 	<string name="_bx_forum_form_entry_input_sys_do_submit"><![CDATA[Submit]]></string>
 	<string name="_bx_forum_form_entry_input_do_submit"><![CDATA[Submit]]></string>
 	<string name="_bx_forum_form_entry_input_sys_text"><![CDATA[Text]]></string>
@@ -144,6 +145,10 @@
 	<string name="_bx_forum_page_title_entries_search"><![CDATA[Search]]></string>
 	<string name="_bx_forum_page_block_title_entries_search_form"><![CDATA[Search]]></string>
 	<string name="_bx_forum_page_block_title_entries_search_results"><![CDATA[Search Results]]></string>
+	<string name="_bx_forum_page_block_title_search_form"><![CDATA[Search Form]]></string>
+    <string name="_bx_forum_page_block_title_search_results"><![CDATA[Search Results]]></string>
+    <string name="_bx_forum_page_block_title_search_form_cmts"><![CDATA[Comments Search Form]]></string>
+    <string name="_bx_forum_page_block_title_search_results_cmts"><![CDATA[Comments Search Results]]></string>
 
     <string name="_bx_forum_menu_title_submenu"><![CDATA[Forum Submenu]]></string>
     <string name="_bx_forum_menu_set_title_submenu"><![CDATA[Forum Submenu]]></string>
@@ -237,7 +242,10 @@
 
     <string name="_bx_forum_chart_growth"><![CDATA[Discussions: Growth]]></string>
     <string name="_bx_forum_chart_growth_speed"><![CDATA[Discussions: Growth Speed]]></string>
-    
+
+    <string name="_bx_forum_search_extended"><![CDATA[Discussions Search]]></string>
+    <string name="_bx_forum_search_extended_cmts"><![CDATA[Discussions Comments Search]]></string>
+
     <string name="_bx_forum_draft_saving_error"><![CDATA[Draft saving error!]]></string>
     <string name="_bx_forum_draft_saved_success"><![CDATA[Draft saved.]]></string>
     <string name="_bx_forum_err_not_found"><![CDATA[Discussion wasn't found.]]></string>

modules/boonex/forum/install/sql/disable.sql

@@ -39,6 +39,10 @@ DELETE FROM `sys_objects_privacy` WHERE `object` IN ('bx_forum_allow_view_to');
 DELETE FROM `sys_objects_search` WHERE `ObjectName` IN ('bx_forum', 'bx_forum_cmts');
 
 
+-- SEARCH EXTENDED
+DELETE FROM `sys_objects_search_extended` WHERE `module` = 'bx_forum';
+
+
 -- CONNECTIONS
 DELETE FROM `sys_objects_connection` WHERE `object` = 'bx_forum_subscribers';
 

modules/boonex/forum/install/sql/enable.sql

@@ -131,7 +131,11 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_forum_search', 1, @sName, '', '_bx_forum_page_block_title_entries_search_form', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:6:"search";}', 0, 0, 1, 0),
-('bx_forum_search', 1, @sName, '', '_bx_forum_page_block_title_entries_search_results', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_forum";s:6:"method";s:21:"browse_search_results";s:6:"params";a:1:{i:0;s:5:"table";}}', 0, 0, 1, 1);
+('bx_forum_search', 1, @sName, '', '_bx_forum_page_block_title_entries_search_results', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:8:"bx_forum";s:6:"method";s:21:"browse_search_results";s:6:"params";a:1:{i:0;s:5:"table";}}', 0, 0, 1, 1),
+('bx_forum_search', 1, @sName, '', '_bx_forum_page_block_title_search_form', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:8:"get_form";s:6:"params";a:1:{i:0;a:1:{s:6:"object";s:8:"bx_forum";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 2),
+('bx_forum_search', 1, @sName, '', '_bx_forum_page_block_title_search_results', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:11:"get_results";s:6:"params";a:1:{i:0;a:2:{s:6:"object";s:8:"bx_forum";s:10:"show_empty";b:1;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 3),
+('bx_forum_search', 1, @sName, '', '_bx_forum_page_block_title_search_form_cmts', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:8:"get_form";s:6:"params";a:1:{i:0;a:1:{s:6:"object";s:13:"bx_forum_cmts";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 4),
+('bx_forum_search', 1, @sName, '', '_bx_forum_page_block_title_search_results_cmts', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:11:"get_results";s:6:"params";a:1:{i:0;a:2:{s:6:"object";s:13:"bx_forum_cmts";s:10:"show_empty";b:1;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 5);
 
 -- PAGE: module manage own
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
@@ -418,6 +422,11 @@ INSERT INTO `sys_objects_search` (`ObjectName`, `Title`, `Order`, `ClassName`, `
 (@sName, '_bx_forum', @iSearchOrder + 1, 'BxForumSearchResult', 'modules/boonex/forum/classes/BxForumSearchResult.php'),
 ('bx_forum_cmts', '_bx_forum_cmts', @iSearchOrder + 2, 'BxForumCmtsSearchResult', 'modules/boonex/forum/classes/BxForumCmtsSearchResult.php');
 
+-- SEARCH EXTENDED
+INSERT INTO `sys_objects_search_extended` (`object`, `object_content_info`, `module`, `title`, `active`, `class_name`, `class_file`) VALUES
+('bx_forum', 'bx_forum', 'bx_forum', '_bx_forum_search_extended', 1, '', ''),
+('bx_forum_cmts', 'bx_forum_cmts', 'bx_forum', '_bx_forum_search_extended_cmts', 1, 'BxTemplSearchExtendedCmts', '');
+
 -- CONNECTIONS
 INSERT INTO `sys_objects_connection` (`object`, `table`, `type`, `override_class_name`, `override_class_file`) VALUES
 ('bx_forum_subscribers', 'bx_forum_subscribers', 'one-way', '', '');

modules/boonex/russian/data/langs/bx_forum/ru.xml

@@ -10,7 +10,7 @@
 	<string name="_bx_forum_option_per_page_index"><![CDATA[Количество элементов на главной странице сайта]]></string>
 	<string name="_bx_forum_option_per_page_profile"><![CDATA[Количество элементов на странице профиля]]></string>
 	<string name="_bx_forum_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
-	<string name="_bx_forum_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
+	<string name="_bx_forum_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
 	<string name="_bx_forum_option_autosubscribe_created"><![CDATA[Автоподписка на новые обсуждения]]></string>
 	<string name="_bx_forum_option_autosubscribe_replied"><![CDATA[Автоподписка на отвеченные обсуждения]]></string>
 
@@ -19,6 +19,7 @@
 	<string name="_bx_forum_form_entry_display_delete"><![CDATA[Удаление обсуждения]]></string>
 	<string name="_bx_forum_form_entry_display_edit"><![CDATA[Редактирование обсуждения]]></string>
 	<string name="_bx_forum_form_entry_display_view"><![CDATA[Просмотр обсуждения]]></string>
+	<string name="_bx_forum_form_entry_input_author"><![CDATA[Автор]]></string>
 	<string name="_bx_forum_form_entry_input_sys_do_submit"><![CDATA[Выполнить]]></string>
 	<string name="_bx_forum_form_entry_input_do_submit"><![CDATA[Выполнить]]></string>
 	<string name="_bx_forum_form_entry_input_sys_text"><![CDATA[Текст]]></string>
@@ -144,6 +145,10 @@
 	<string name="_bx_forum_page_title_entries_search"><![CDATA[Поиск]]></string>
 	<string name="_bx_forum_page_block_title_entries_search_form"><![CDATA[Поиск]]></string>
 	<string name="_bx_forum_page_block_title_entries_search_results"><![CDATA[Результаты поиска]]></string>
+	<string name="_bx_forum_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
+    <string name="_bx_forum_page_block_title_search_results"><![CDATA[Результаты поиска]]></string>
+    <string name="_bx_forum_page_block_title_search_form_cmts"><![CDATA[Форма поиска комментариев]]></string>
+    <string name="_bx_forum_page_block_title_search_results_cmts"><![CDATA[Результаты поиска комментариев]]></string>
 
 	<string name="_bx_forum_menu_title_submenu"><![CDATA[Форум - Подменю]]></string>
     <string name="_bx_forum_menu_set_title_submenu"><![CDATA[Форум - Подменю]]></string>
@@ -238,6 +243,9 @@
     <string name="_bx_forum_chart_growth"><![CDATA[Обсуждения: Развитие]]></string>
     <string name="_bx_forum_chart_growth_speed"><![CDATA[Обсуждения: Скорость развития]]></string>
 
+    <string name="_bx_forum_search_extended"><![CDATA[Поиск обсуждений]]></string>
+    <string name="_bx_forum_search_extended_cmts"><![CDATA[Поиск комментариев к обсуждениям]]></string>
+
     <string name="_bx_forum_draft_saving_error"><![CDATA[Ошибка сохранения черновика!]]></string>
     <string name="_bx_forum_draft_saved_success"><![CDATA[Черновик сохранён.]]></string>
     <string name="_bx_forum_err_not_found"><![CDATA[Обсуждение не найдено.]]></string>