Ticket #715 - Integration with Albums module.

modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -127,6 +127,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
                 'txt_media_single' => '_bx_albums_txt_media_single',
                 'txt_media_comment_single' => '_bx_albums_txt_media_comment_single',
             	'txt_media_vote_single' => '_bx_albums_txt_media_vote_single',
+            	'form_field_author' => '_bx_albums_form_entry_input_author',
             	'grid_action_err_delete' => '_bx_albums_grid_action_err_delete',
             	'grid_txt_account_manager' => '_bx_albums_grid_txt_account_manager',
 				'filter_item_active' => '_bx_albums_grid_filter_item_title_adm_active',

modules/boonex/albums/classes/BxAlbumsContentInfoMedia.php

@@ -102,7 +102,7 @@ class BxAlbumsContentInfoMedia extends BxDolContentInfo
         if(empty($sUnitTemplate))
             $sUnitTemplate = 'unit_media.html';
 
-        return $this->_oTemplate->unitMedia($aMedia, true, $sUnitTemplate);
+        return $this->_oModule->_oTemplate->unitMedia($aMedia, true, $sUnitTemplate);
     }
 
     public function getAll ($aParams = array())
@@ -110,7 +110,31 @@ class BxAlbumsContentInfoMedia extends BxDolContentInfo
         if(empty($aParams) || !is_array($aParams))
             $aParams = array('type' => 'all');
 
-        return $this->_oDb->getMediaBy($aParams);
+        return $this->_oModule->_oDb->getMediaBy($aParams);
+    }
+
+    public function getSearchableFieldsExtended ()
+    {
+        return array(
+            'author' => array(
+            	'type' => 'text_auto', 
+            	'caption' => '_bx_albums_form_entry_input_author',
+            	'values' => '' 
+            ),
+            'title' => array(
+            	'type' => 'text', 
+            	'caption' => '_bx_albums_form_entry_file_title',
+            	'values' => '' 
+            )
+        );
+    }
+
+    public function getSearchResultExtended ($aParams)
+    {
+        if(empty($aParams) || !is_array($aParams))
+            return array();
+
+        return $this->_oModule->_oDb->getMediaBy(array('type' => 'search_ids', 'search_params' => $aParams));
     }
 }
 

modules/boonex/albums/classes/BxAlbumsDb.php

@@ -90,6 +90,43 @@ class BxAlbumsDb extends BxBaseModTextDb
                 $sWhereClause .= " AND `{$CNF['TABLE_FILES2ENTRIES']}`.`id` = :id";
                 break;
 
+            case 'search_ids':
+                $aMethod['name'] = 'getColumn';
+                
+                $sSelectClause = "`{$CNF['TABLE_FILES2ENTRIES']}`.`id`";
+
+                $sWhereConditions = "1";
+                foreach($aParams['search_params'] as $sSearchParam => $aSearchParam) {
+                    $sSearchValue = "";
+                    switch ($aSearchParam['operator']) {
+                        case 'like':
+                            $sSearchValue = " LIKE " . $this->escape("%" . $aSearchParam['value'] . "%");
+                            break;
+
+                        case 'in':
+                            $sSearchValue = " IN (" . $this->implode_escape($aSearchParam['value']) . ")";
+                            break;
+
+                        default:
+                             $sSearchValue = " " . $aSearchParam['operator'] . " :" . $sSearchParam;
+                             $aMethod['params'][1][$sSearchParam] = $aSearchParam['value'];                             
+                    }
+
+                    $sWhereConditions .= " AND `{$CNF['TABLE_FILES2ENTRIES']}`.`" . $sSearchParam . "`" . $sSearchValue;
+                }
+
+                $sWhereClause .= " AND (" . $sWhereConditions . ")"; 
+
+                $sOrderClause .=  "`{$CNF['TABLE_FILES2ENTRIES']}`.`id` ASC";
+                break;
+
+            case 'all_ids':
+                $aMethod['name'] = 'getColumn';
+
+                $sSelectClause = "`{$CNF['TABLE_FILES2ENTRIES']}`.`id`";
+                $sOrderClause .=  "`{$CNF['TABLE_FILES2ENTRIES']}`.`id` ASC";
+                break;
+
             case 'all':
                 $sOrderClause .=  "`{$CNF['TABLE_FILES2ENTRIES']}`.`id` ASC";
                 break;

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

@@ -11,7 +11,7 @@
 	<string name="_bx_albums_option_per_page_browse"><![CDATA[Number of items per page]]></string>
 	<string name="_bx_albums_option_per_page_profile"><![CDATA[Number of items per page on profile page]]></string>
 	<string name="_bx_albums_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
-	<string name="_bx_albums_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+	<string name="_bx_albums_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
 
 	<string name="_bx_albums_form_entry"><![CDATA[Albums]]></string>
 	<string name="_bx_albums_form_entry_display_add"><![CDATA[Add Album]]></string>
@@ -19,6 +19,7 @@
 	<string name="_bx_albums_form_entry_display_add_images"><![CDATA[Add Images To Album]]></string>
 	<string name="_bx_albums_form_entry_display_delete"><![CDATA[Delete Album]]></string>
 	<string name="_bx_albums_form_entry_display_view"><![CDATA[View Album]]></string>
+	<string name="_bx_albums_form_entry_input_author"><![CDATA[Author]]></string>
 	<string name="_bx_albums_form_entry_input_sys_do_submit"><![CDATA[Submit]]></string>
 	<string name="_bx_albums_form_entry_input_do_submit"><![CDATA[Submit]]></string>
 	<string name="_bx_albums_form_entry_input_sys_title"><![CDATA[Caption]]></string>
@@ -120,6 +121,16 @@
 	<string name="_bx_albums_page_block_title_popular_keywords_media"><![CDATA[Popular Media Hashtags]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_media_camera"><![CDATA[Popular Cameras]]></string>
 	<string name="_bx_albums_page_block_title_my_entries"><![CDATA[My Albums]]></string>
+	<string name="_bx_albums_page_title_sys_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_albums_page_title_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_albums_page_block_title_search_form"><![CDATA[Search Form]]></string>
+    <string name="_bx_albums_page_block_title_search_results"><![CDATA[Search Results]]></string>
+    <string name="_bx_albums_page_block_title_search_form_media"><![CDATA[Images Search Form]]></string>
+    <string name="_bx_albums_page_block_title_search_results_media"><![CDATA[Images Search Results]]></string>
+    <string name="_bx_albums_page_block_title_search_form_cmts"><![CDATA[Comments Search Form]]></string>
+    <string name="_bx_albums_page_block_title_search_results_cmts"><![CDATA[Comments Search Results]]></string>
+    <string name="_bx_albums_page_block_title_search_form_media_cmts"><![CDATA[Images Comments Search Form]]></string>
+    <string name="_bx_albums_page_block_title_search_results_media_cmts"><![CDATA[Images Comments Search Results]]></string>
 
     <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[Album Actions]]></string>
     <string name="_bx_albums_menu_title_view_entry"><![CDATA[Album Actions]]></string>
@@ -142,6 +153,8 @@
     <string name="_bx_albums_menu_item_title_entries_home"><![CDATA[Albums]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_recent"><![CDATA[Latest]]></string>
     <string name="_bx_albums_menu_item_title_entries_recent"><![CDATA[Latest]]></string>
+    <string name="_bx_albums_menu_item_title_system_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_albums_menu_item_title_entries_search"><![CDATA[Search]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_albums_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_popular"><![CDATA[Popular]]></string>
@@ -184,6 +197,11 @@
     <string name="_bx_albums_chart_growth_media"><![CDATA[Images: Growth]]></string>
     <string name="_bx_albums_chart_growth_speed_media"><![CDATA[Images: Growth Speed]]></string>
 
+    <string name="_bx_albums_search_extended"><![CDATA[Albums Search]]></string>
+    <string name="_bx_albums_search_extended_media"><![CDATA[Images Search]]></string>
+    <string name="_bx_albums_search_extended_cmts"><![CDATA[Albums Comments Search]]></string>
+    <string name="_bx_albums_search_extended_media_cmts"><![CDATA[Images Comments Search]]></string>
+
     <string name="_bx_albums_txt_all_entries_by"><![CDATA[<a href="{0}">All Albums by {1} ({2})</a>]]></string>
     <string name="_bx_albums_txt_sample_single"><![CDATA[album]]></string>
     <string name="_bx_albums_txt_sample_single_with_article"><![CDATA[an album]]></string>

modules/boonex/albums/install/sql/disable.sql

@@ -8,7 +8,7 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 
 -- PAGES
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_albums';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_albums' OR `object` IN('bx_albums_create_entry', 'bx_albums_edit_entry', 'bx_albums_add_images', 'bx_albums_delete_entry', 'bx_albums_view_entry', 'bx_albums_view_entry_comments', 'bx_albums_home', 'bx_albums_popular', 'bx_albums_updated', 'bx_albums_author', 'bx_albums_view_media', 'bx_albums_popular_media');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_albums' OR `object` IN('bx_albums_create_entry', 'bx_albums_edit_entry', 'bx_albums_add_images', 'bx_albums_delete_entry', 'bx_albums_view_entry', 'bx_albums_view_entry_comments', 'bx_albums_home', 'bx_albums_popular', 'bx_albums_updated', 'bx_albums_author', 'bx_albums_view_media', 'bx_albums_popular_media', 'bx_albums_search', 'bx_albums_manage');
 
 -- MENU
 DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_albums';
@@ -25,6 +25,9 @@ DELETE FROM `sys_acl_actions` WHERE `Module` = 'bx_albums';
 -- SEARCH
 DELETE FROM `sys_objects_search` WHERE `ObjectName` IN ('bx_albums', 'bx_albums_cmts', 'bx_albums_media', 'bx_albums_media_camera', 'bx_albums_media_cmts');
 
+-- SEARCH EXTENDED
+DELETE FROM `sys_objects_search_extended` WHERE `module` = 'bx_albums';
+
 -- METATAGS
 DELETE FROM `sys_objects_metatags` WHERE `object` IN('bx_albums', 'bx_albums_media', 'bx_albums_media_camera');
 

modules/boonex/albums/install/sql/enable.sql

@@ -121,6 +121,20 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_albums_home', 2, 'bx_albums', '', '_bx_albums_page_block_title_popular_keywords_media', 11, 2147483647, 'service', 'a:4:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:14:\"keywords_cloud\";s:6:\"params\";a:2:{i:0;s:15:\"bx_albums_media\";i:1;s:15:\"bx_albums_media\";}s:5:\"class\";s:20:\"TemplServiceMetatags\";}', 1, 0, 1, 1),
 ('bx_albums_home', 2, 'bx_albums', '', '_bx_albums_page_block_title_popular_keywords_media_camera', 11, 2147483647, 'service', 'a:4:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:14:\"keywords_cloud\";s:6:\"params\";a:2:{i:0;s:22:\"bx_albums_media_camera\";i:1;s:22:\"bx_albums_media_camera\";}s:5:\"class\";s:20:\"TemplServiceMetatags\";}', 1, 0, 1, 2);
 
+-- PAGE: search for entries
+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 
+('bx_albums_search', '_bx_albums_page_title_sys_entries_search', '_bx_albums_page_title_entries_search', 'bx_albums', 11, 2147483647, 1, 'albums-search', 'page.php?i=albums-search', '', '', '', 0, 1, 0, 'BxAlbumsPageBrowse', 'modules/boonex/albums/classes/BxAlbumsPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('bx_albums_search', 2, 'bx_albums', '_bx_albums_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:9:"bx_albums";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 1),
+('bx_albums_search', 1, 'bx_albums', '_bx_albums_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:9:"bx_albums";s:10:"show_empty";b:0;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 1),
+('bx_albums_search', 3, 'bx_albums', '_bx_albums_page_block_title_search_form_media', 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:15:"bx_albums_media";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 1),
+('bx_albums_search', 1, 'bx_albums', '_bx_albums_page_block_title_search_results_media', 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:15:"bx_albums_media";s:10:"show_empty";b:0;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 2),
+('bx_albums_search', 2, 'bx_albums', '_bx_albums_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:14:"bx_albums_cmts";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 2),
+('bx_albums_search', 1, 'bx_albums', '_bx_albums_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:14:"bx_albums_cmts";s:10:"show_empty";b:0;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 3),
+('bx_albums_search', 3, 'bx_albums', '_bx_albums_page_block_title_search_form_media_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:20:"bx_albums_media_cmts";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 2),
+('bx_albums_search', 1, 'bx_albums', '_bx_albums_page_block_title_search_results_media_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:20:"bx_albums_media_cmts";s:10:"show_empty";b:0;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 4);
+
 -- 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 
 ('bx_albums_manage', '_bx_albums_page_title_sys_manage', '_bx_albums_page_title_manage', 'bx_albums', 5, 2147483647, 1, 'albums-manage', 'page.php?i=albums-manage', '', '', '', 0, 1, 0, 'BxAlbumsPageBrowse', 'modules/boonex/albums/classes/BxAlbumsPageBrowse.php');
@@ -224,7 +238,8 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_albums_submenu', 'bx_albums', 'albums-home', '_bx_albums_menu_item_title_system_entries_recent', '_bx_albums_menu_item_title_entries_recent', 'page.php?i=albums-home', '', '', '', '', 2147483647, 1, 1, 1),
 ('bx_albums_submenu', 'bx_albums', 'albums-popular', '_bx_albums_menu_item_title_system_entries_popular', '_bx_albums_menu_item_title_entries_popular', 'page.php?i=albums-popular', '', '', '', '', 2147483647, 1, 1, 2),
 ('bx_albums_submenu', 'bx_albums', 'albums-popular-media', '_bx_albums_menu_item_title_system_entries_popular_media', '_bx_albums_menu_item_title_entries_popular_media', 'page.php?i=albums-popular-media', '', '', '', '', 2147483647, 1, 1, 3),
-('bx_albums_submenu', 'bx_albums', 'albums-manage', '_bx_albums_menu_item_title_system_entries_manage', '_bx_albums_menu_item_title_entries_manage', 'page.php?i=albums-manage', '', '', '', '', 2147483646, 1, 1, 4);
+('bx_albums_submenu', 'bx_albums', 'albums-search', '_bx_albums_menu_item_title_system_entries_search', '_bx_albums_menu_item_title_entries_search', 'page.php?i=albums-search', '', '', '', '', 2147483647, 1, 1, 4),
+('bx_albums_submenu', 'bx_albums', 'albums-manage', '_bx_albums_menu_item_title_system_entries_manage', '_bx_albums_menu_item_title_entries_manage', 'page.php?i=albums-manage', '', '', '', '', 2147483646, 1, 1, 5);
 
 -- MENU: sub-menu for view entry
 
@@ -346,6 +361,13 @@ INSERT INTO `sys_objects_search` (`ObjectName`, `Title`, `Order`, `GlobalSearch`
 ('bx_albums_media_cmts', '_bx_albums_media_cmts', @iSearchOrder + 4, 1, 'BxAlbumsCmtsSearchResultMedia', 'modules/boonex/albums/classes/BxAlbumsCmtsSearchResultMedia.php'),
 ('bx_albums_media_camera', '_bx_albums_media', @iSearchOrder + 5, 0, 'BxAlbumsSearchResultMediaCamera', 'modules/boonex/albums/classes/BxAlbumsSearchResultMediaCamera.php');
 
+-- SEARCH EXTENDED
+INSERT INTO `sys_objects_search_extended` (`object`, `object_content_info`, `module`, `title`, `active`, `class_name`, `class_file`) VALUES
+('bx_albums', 'bx_albums', 'bx_albums', '_bx_albums_search_extended', 1, '', ''),
+('bx_albums_media', 'bx_albums_media', 'bx_albums', '_bx_albums_search_extended_media', 1, '', ''),
+('bx_albums_cmts', 'bx_albums_cmts', 'bx_albums', '_bx_albums_search_extended_cmts', 1, 'BxTemplSearchExtendedCmts', ''),
+('bx_albums_media_cmts', 'bx_albums_media_cmts', 'bx_albums', '_bx_albums_search_extended_media_cmts', 1, 'BxTemplSearchExtendedCmts', '');
+
 -- METATAGS
 INSERT INTO `sys_objects_metatags` (`object`, `table_keywords`, `table_locations`, `table_mentions`, `override_class_name`, `override_class_file`) VALUES
 ('bx_albums', 'bx_albums_meta_keywords', 'bx_albums_meta_locations', '', '', ''),

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

@@ -11,7 +11,7 @@
 	<string name="_bx_albums_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
 	<string name="_bx_albums_option_per_page_profile"><![CDATA[Количество элементов на странице профайла]]></string>
 	<string name="_bx_albums_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
-	<string name="_bx_albums_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
+	<string name="_bx_albums_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
 
 	<string name="_bx_albums_form_entry"><![CDATA[Альбомы]]></string>
 	<string name="_bx_albums_form_entry_display_add"><![CDATA[Добавить альбом]]></string>
@@ -19,6 +19,7 @@
 	<string name="_bx_albums_form_entry_display_add_images"><![CDATA[Добавить изображения в альбом]]></string>
 	<string name="_bx_albums_form_entry_display_delete"><![CDATA[Удалить альбом]]></string>
 	<string name="_bx_albums_form_entry_display_view"><![CDATA[Просмотреть альбом]]></string>
+	<string name="_bx_albums_form_entry_input_author"><![CDATA[Автор]]></string>
 	<string name="_bx_albums_form_entry_input_sys_do_submit"><![CDATA[Выполнить]]></string>
 	<string name="_bx_albums_form_entry_input_do_submit"><![CDATA[Выполнить]]></string>
 	<string name="_bx_albums_form_entry_input_sys_title"><![CDATA[Заголовок]]></string>
@@ -120,6 +121,16 @@
 	<string name="_bx_albums_page_block_title_popular_keywords_media"><![CDATA[Популярные Хэштеги Изображений]]></string>
     <string name="_bx_albums_page_block_title_popular_keywords_media_camera"><![CDATA[Популярные Фотокамеры]]></string>
     <string name="_bx_albums_page_block_title_my_entries"><![CDATA[Мой альбомы]]></string>
+    <string name="_bx_albums_page_title_sys_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_albums_page_title_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_albums_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
+    <string name="_bx_albums_page_block_title_search_results"><![CDATA[Результаты поиска]]></string>
+    <string name="_bx_albums_page_block_title_search_form_media"><![CDATA[Форма поиска изображений]]></string>
+    <string name="_bx_albums_page_block_title_search_results_media"><![CDATA[Результаты поиска изображений]]></string>
+    <string name="_bx_albums_page_block_title_search_form_cmts"><![CDATA[Форма поиска комментариев]]></string>
+    <string name="_bx_albums_page_block_title_search_results_cmts"><![CDATA[Результаты поиска комментариев]]></string>
+    <string name="_bx_albums_page_block_title_search_form_media_cmts"><![CDATA[Форма поиска комментариев к изображеним]]></string>
+    <string name="_bx_albums_page_block_title_search_results_media_cmts"><![CDATA[Результаты поиска комментариев к изображеним]]></string>
 
     <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[Действия для альбома]]></string>
     <string name="_bx_albums_menu_title_view_entry"><![CDATA[Действия для альбома]]></string>
@@ -142,6 +153,8 @@
     <string name="_bx_albums_menu_item_title_entries_home"><![CDATA[Альбомы]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_recent"><![CDATA[Новые альбомы]]></string>
     <string name="_bx_albums_menu_item_title_entries_recent"><![CDATA[Новые альбомы]]></string>
+    <string name="_bx_albums_menu_item_title_system_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_albums_menu_item_title_entries_search"><![CDATA[Поиск]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_manage"><![CDATA[Управление альбомами]]></string>
     <string name="_bx_albums_menu_item_title_entries_manage"><![CDATA[Управление альбомами]]></string>
     <string name="_bx_albums_menu_item_title_system_entries_popular"><![CDATA[Популярные альбомы]]></string>
@@ -184,6 +197,11 @@
     <string name="_bx_albums_chart_growth_media"><![CDATA[Изображения: Развитие]]></string>
     <string name="_bx_albums_chart_growth_speed_media"><![CDATA[Изображения: Скорость развития]]></string>
 
+    <string name="_bx_albums_search_extended"><![CDATA[Поиск альбомов]]></string>
+    <string name="_bx_albums_search_extended_media"><![CDATA[Поиск изображений]]></string>
+    <string name="_bx_albums_search_extended_cmts"><![CDATA[Поиск комментариев к альбомам]]></string>
+    <string name="_bx_albums_search_extended_media_cmts"><![CDATA[Поиск комментариев к изображениям]]></string>
+
     <string name="_bx_albums_txt_all_entries_by"><![CDATA[<a href="{0}">Все альбомы от {1} ({2})</a>]]></string>
     <string name="_bx_albums_txt_sample_single"><![CDATA[альбом]]></string>
     <string name="_bx_albums_txt_sample_single_with_article"><![CDATA[альбом]]></string>

template/scripts/BxBaseFormView.php

@@ -954,7 +954,7 @@ BLAH;
         }
 
         return $this->oTemplate->parseHtmlByName('form_field_custom_suggestions.html', array(
-            'id' => $aInput['name'] . time(),
+            'id' => $aInput['name'] . time() . mt_rand(0, 100),
             'url_get_recipients' => $aInput['ajax_get_suggestions'],
             'name' => $aInput['name'],
             'placeholder' => bx_html_attribute(isset($aInput['placeholder']) ? $aInput['placeholder'] : _t('_sys_form_paceholder_profiles_suggestions'), BX_ESCAPE_STR_QUOTE),

template/scripts/BxBaseSearchExtended.php

@@ -94,6 +94,8 @@ class BxBaseSearchExtended extends BxDolSearchExtended
             return $this->_oForm;
 
         $sForm = 'sys_search_extended_' . $this->_sObject;
+        $sFormSubmit = 'search' . $this->_sObject;
+
         $aForm = array(
             'form_attrs' => array(
                 'id' => $sForm,
@@ -107,7 +109,7 @@ class BxBaseSearchExtended extends BxDolSearchExtended
                     'key' => '',
                     'uri' => '',
                     'uri_title' => '',
-                    'submit_name' => 'search'
+                    'submit_name' => $sFormSubmit
                 ),
             ),
             'inputs' => array()
@@ -131,7 +133,7 @@ class BxBaseSearchExtended extends BxDolSearchExtended
 
         $aForm['inputs']['search'] = array(
             'type' => 'submit',
-            'name' => 'search',
+            'name' => $sFormSubmit,
             'value' => _t('_Search')
         );