#87 - don't include some search objects in global search

inc/classes/BxDolSearch.php

@@ -62,7 +62,8 @@ class BxDolSearch extends BxDol
                    `Title` as `title`,
                    `ClassName` as `class`,
                    `ClassPath` as `file`,
-                   `ObjectName`
+                   `ObjectName`,
+                   `GlobalSearch`
             FROM `sys_objects_search`
             ORDER BY `Order` ASC', 'ObjectName'
         );
@@ -84,6 +85,9 @@ class BxDolSearch extends BxDol
     {
         $sCode = '';
         foreach ($this->aChoice as $sKey => $aValue) {
+            if (!$this->_sMetaType && !$aValue['GlobalSearch'])
+                continue;
+
         	$sClassName = 'BxTemplSearchResult';
 	        if(!empty($aValue['class'])) {
 	            $sClassName = $aValue['class'];
@@ -112,7 +116,8 @@ class BxDolSearch extends BxDol
     {
         $a = array();
         foreach ($this->aChoice as $sKey => $r)
-            $a[$sKey] = _t($r['title']);
+            if ($this->_sMetaType || $r['GlobalSearch'])
+                $a[$sKey] = _t($r['title']);
         return $a;
     }
 

install/sql/system.sql

@@ -700,6 +700,7 @@ CREATE TABLE `sys_objects_search` (
   `ObjectName` varchar(64) NOT NULL  default '',
   `Title` varchar(50) NOT NULL default '',
   `Order` int(11) NOT NULL,
+  `GlobalSearch` tinyint(4) NOT NULL DEFAULT '1',
   `ClassName` varchar(50) NOT NULL  default '',
   `ClassPath` varchar(100) NOT NULL  default '',
   PRIMARY KEY  (`ID`)

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

@@ -305,12 +305,12 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- SEARCH
 SET @iSearchOrder = (SELECT IFNULL(MAX(`Order`), 0) FROM `sys_objects_search`);
-INSERT INTO `sys_objects_search` (`ObjectName`, `Title`, `Order`, `ClassName`, `ClassPath`) VALUES
-('bx_albums', '_bx_albums', @iSearchOrder + 1, 'BxAlbumsSearchResult', 'modules/boonex/albums/classes/BxAlbumsSearchResult.php'),
-('bx_albums_cmts', '_bx_albums_cmts', @iSearchOrder + 2, 'BxAlbumsCmtsSearchResult', 'modules/boonex/albums/classes/BxAlbumsCmtsSearchResult.php'),
-('bx_albums_media', '_bx_albums_media', @iSearchOrder + 3, 'BxAlbumsSearchResultMedia', 'modules/boonex/albums/classes/BxAlbumsSearchResultMedia.php'),
-('bx_albums_media_cmts', '_bx_albums_media_cmts', @iSearchOrder + 4, 'BxAlbumsCmtsSearchResultMedia', 'modules/boonex/albums/classes/BxAlbumsCmtsSearchResultMedia.php'),
-('bx_albums_media_camera', '_bx_albums_media', @iSearchOrder + 5, 'BxAlbumsSearchResultMediaCamera', 'modules/boonex/albums/classes/BxAlbumsSearchResultMediaCamera.php');
+INSERT INTO `sys_objects_search` (`ObjectName`, `Title`, `Order`, `GlobalSearch`, `ClassName`, `ClassPath`) VALUES
+('bx_albums', '_bx_albums', @iSearchOrder + 1, 1, 'BxAlbumsSearchResult', 'modules/boonex/albums/classes/BxAlbumsSearchResult.php'),
+('bx_albums_cmts', '_bx_albums_cmts', @iSearchOrder + 2, 1, 'BxAlbumsCmtsSearchResult', 'modules/boonex/albums/classes/BxAlbumsCmtsSearchResult.php'),
+('bx_albums_media', '_bx_albums_media', @iSearchOrder + 3, 1, 'BxAlbumsSearchResultMedia', 'modules/boonex/albums/classes/BxAlbumsSearchResultMedia.php'),
+('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');
 
 -- METATAGS
 INSERT INTO `sys_objects_metatags` (`object`, `table_keywords`, `table_locations`, `table_mentions`, `override_class_name`, `override_class_file`) VALUES