Ticket #1430 - Mature-audience content filter (PG, PG13, R): Text based modules.

modules/boonex/ads/classes/BxAdsConfig.php

@@ -65,6 +65,7 @@ class BxAdsConfig extends BxBaseModTextConfig
             'FIELD_YEAR' => 'year',
             'FIELD_NOTES_PURCHASED' => 'notes_purchased',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_COVER' => 'covers',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_VIDEO' => 'videos',
@@ -251,6 +252,7 @@ class BxAdsConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_ads_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_ads_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_ads_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_ads_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_ads_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_ads_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_ads_txt_all_entries_by',

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

@@ -360,6 +360,7 @@
     <string name="_bx_ads_grid_action_err_edit_category"><![CDATA[Cannot edit the category.]]></string>
 
     <string name="_bx_ads_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_ads_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_ads_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_ads_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_ads_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/ads/install/sql/install.sql

@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS `bx_ads_entries` (
   `reviews_avg` float NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','awaiting','offer','sold','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -641,6 +642,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_ads', 'bx_ads_entry_price_year_view', 'bx_ads', 1, '_bx_ads_form_entry_price_year_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_ads', 'bx_ads', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_ads', 'bx_ads', 'allow_view_to', '', '', 0, 'custom', '_bx_ads_form_entry_input_sys_allow_view_to', '_bx_ads_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_ads', 'bx_ads', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_ads_form_entry_input_sys_delete_confirm', '_bx_ads_form_entry_input_delete_confirm', '_bx_ads_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_ads_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_ads', 'bx_ads', 'do_submit', '_bx_ads_form_entry_input_do_submit', '', 0, 'submit', '_bx_ads_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -687,9 +689,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_add', 'polls', 2147483647, 1, 13),
 ('bx_ads_entry_price_add', 'covers', 2147483647, 1, 14),
 ('bx_ads_entry_price_add', 'allow_view_to', 2147483647, 1, 15),
-('bx_ads_entry_price_add', 'notes_purchased', 2147483647, 1, 16),
-('bx_ads_entry_price_add', 'location', 2147483647, 1, 17),
-('bx_ads_entry_price_add', 'do_submit', 2147483647, 1, 18),
+('bx_ads_entry_price_add', 'cf', 2147483647, 1, 16),
+('bx_ads_entry_price_add', 'notes_purchased', 2147483647, 1, 17),
+('bx_ads_entry_price_add', 'location', 2147483647, 1, 18),
+('bx_ads_entry_price_add', 'do_submit', 2147483647, 1, 19),
 
 ('bx_ads_entry_price_edit', 'category_view', 2147483647, 1, 1),
 ('bx_ads_entry_price_edit', 'title', 2147483647, 1, 2),
@@ -705,9 +708,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_edit', 'polls', 2147483647, 1, 12),
 ('bx_ads_entry_price_edit', 'covers', 2147483647, 1, 13),
 ('bx_ads_entry_price_edit', 'allow_view_to', 2147483647, 1, 14),
-('bx_ads_entry_price_edit', 'notes_purchased', 2147483647, 1, 15),
-('bx_ads_entry_price_edit', 'location', 2147483647, 1, 16),
-('bx_ads_entry_price_edit', 'do_submit', 2147483647, 1, 17),
+('bx_ads_entry_price_edit', 'cf', 2147483647, 1, 15),
+('bx_ads_entry_price_edit', 'notes_purchased', 2147483647, 1, 16),
+('bx_ads_entry_price_edit', 'location', 2147483647, 1, 17),
+('bx_ads_entry_price_edit', 'do_submit', 2147483647, 1, 18),
 
 ('bx_ads_entry_price_view', 'category_view', 2147483647, 1, 1),
 ('bx_ads_entry_price_view', 'price', 2147483647, 1, 2),
@@ -730,9 +734,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_year_add', 'polls', 2147483647, 1, 14),
 ('bx_ads_entry_price_year_add', 'covers', 2147483647, 1, 15),
 ('bx_ads_entry_price_year_add', 'allow_view_to', 2147483647, 1, 16),
-('bx_ads_entry_price_year_add', 'notes_purchased', 2147483647, 1, 17),
-('bx_ads_entry_price_year_add', 'location', 2147483647, 1, 18),
-('bx_ads_entry_price_year_add', 'do_submit', 2147483647, 1, 19),
+('bx_ads_entry_price_year_add', 'cf', 2147483647, 1, 17),
+('bx_ads_entry_price_year_add', 'notes_purchased', 2147483647, 1, 18),
+('bx_ads_entry_price_year_add', 'location', 2147483647, 1, 19),
+('bx_ads_entry_price_year_add', 'do_submit', 2147483647, 1, 20),
 
 ('bx_ads_entry_price_year_edit', 'category_view', 2147483647, 1, 1),
 ('bx_ads_entry_price_year_edit', 'title', 2147483647, 1, 2),
@@ -749,9 +754,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_ads_entry_price_year_edit', 'polls', 2147483647, 1, 13),
 ('bx_ads_entry_price_year_edit', 'covers', 2147483647, 1, 14),
 ('bx_ads_entry_price_year_edit', 'allow_view_to', 2147483647, 1, 15),
-('bx_ads_entry_price_year_edit', 'notes_purchased', 2147483647, 1, 16),
-('bx_ads_entry_price_year_edit', 'location', 2147483647, 1, 17),
-('bx_ads_entry_price_year_edit', 'do_submit', 2147483647, 1, 18),
+('bx_ads_entry_price_year_edit', 'cf', 2147483647, 1, 16),
+('bx_ads_entry_price_year_edit', 'notes_purchased', 2147483647, 1, 17),
+('bx_ads_entry_price_year_edit', 'location', 2147483647, 1, 18),
+('bx_ads_entry_price_year_edit', 'do_submit', 2147483647, 1, 19),
 
 ('bx_ads_entry_price_year_view', 'category_view', 2147483647, 1, 1),
 ('bx_ads_entry_price_year_view', 'price', 2147483647, 1, 2),

modules/boonex/ads/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxAdsManageTools(oOptions) {
-    this._iSearchTimeoutId = false;
-    this._sActionsUrl = oOptions.sActionUrl;
-    this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxAdsManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxAdsManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxAdsManageTools' : oOptions.sObjName;
 }
 
-BxAdsManageTools.prototype.onChangeFilter = function(oFilter) {
-    var $this = this;
-    var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-    var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-    var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-    var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-    if(sValueSearch == _t('_sys_grid_search'))
-        sValueSearch = '';
-
-    clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxAdsManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-    if($(oButton).hasClass('bx-btn-disabled'))
-        return false;
-
-    bx_menu_popup(sMenuObject, oButton, {}, {
-        content_id: $(oButton).attr('bx_grid_action_data')
-    });
-};
-
-BxAdsManageTools.prototype.onClickDelete = function(iContentId) {
-    $('.bx-popup-applied:visible').dolPopupHide();
-
-    glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxAdsManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxAdsManageTools.prototype.constructor = BxAdsManageTools;
 
 /** @} */

modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -45,6 +45,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             'FIELD_TEXT' => 'text',
             'FIELD_TEXT_ID' => 'album-desc',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
             'FIELD_VIEWS' => 'views',
@@ -140,8 +141,8 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             'OBJECT_MENU_SNIPPET_META' => 'bx_albums_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_albums_menu_manage_tools', //manage menu in content administration tools
             'OBJECT_GRID_ADMINISTRATION' => 'bx_albums_administration',
-        	'OBJECT_GRID_COMMON' => 'bx_albums_common',
-        	'OBJECT_UPLOADERS' => array('bx_albums_simple', 'bx_albums_html5', 'bx_albums_crop'),
+            'OBJECT_GRID_COMMON' => 'bx_albums_common',
+            'OBJECT_UPLOADERS' => array('bx_albums_simple', 'bx_albums_html5', 'bx_albums_crop'),
             
             'FUNCTION_FOR_GET_ITEM_INFO' => 'getMediaInfoById',
 
@@ -194,6 +195,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_albums_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_albums_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_albums_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_albums_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_albums_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_albums_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_albums_txt_all_entries_by',

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

@@ -234,22 +234,23 @@
     <string name="_bx_albums_menu_item_title_view_entries_in_context"><![CDATA[Albums]]></string>
     <string name="_bx_albums_menu_title_entries_my"><![CDATA[My Albums Action Menu]]></string>
     <string name="_bx_albums_menu_set_title_entries_my"><![CDATA[My Albums Menu]]></string>
-	<string name="_bx_albums_menu_item_title_system_manage_my_albums"><![CDATA[My albums]]></string>
+    <string name="_bx_albums_menu_item_title_system_manage_my_albums"><![CDATA[My albums]]></string>
     <string name="_bx_albums_menu_item_title_manage_my_albums"><![CDATA[Albums]]></string>
     <string name="_bx_albums_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_albums_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
-	<string name="_bx_albums_menu_item_title_system_admt_albums"><![CDATA[Albums]]></string>
-	<string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Albums]]></string>
-	<string name="_bx_albums_menu_item_title_manage_my"><![CDATA[My Albums]]></string>
-	<string name="_bx_albums_menu_item_title_manage_all"><![CDATA[All Albums]]></string>
-        <string name="_bx_albums_menu_item_title_system_sm_items"><![CDATA[Items]]></string>
-        <string name="_bx_albums_menu_item_title_sm_items"><![CDATA[{0} items]]></string>
+    <string name="_bx_albums_menu_item_title_system_admt_albums"><![CDATA[Albums]]></string>
+    <string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Albums]]></string>
+    <string name="_bx_albums_menu_item_title_manage_my"><![CDATA[My Albums]]></string>
+    <string name="_bx_albums_menu_item_title_manage_all"><![CDATA[All Albums]]></string>
+    <string name="_bx_albums_menu_item_title_system_sm_items"><![CDATA[Items]]></string>
+    <string name="_bx_albums_menu_item_title_sm_items"><![CDATA[{0} items]]></string>
 
-	<string name="_bx_albums_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_albums_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_albums_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-        <string name="_bx_albums_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
-	<string name="_bx_albums_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_albums_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_albums_grid_column_title_adm_title"><![CDATA[Caption]]></string>
     <string name="_bx_albums_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_albums_grid_column_title_adm_author"><![CDATA[Author]]></string>

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

@@ -21,6 +21,7 @@ CREATE TABLE IF NOT EXISTS `bx_albums_albums` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -78,6 +79,7 @@ CREATE TABLE IF NOT EXISTS `bx_albums_files2albums` (
   `favorites` int(11) NOT NULL default '0',
   `comments` int(11) NOT NULL,
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `data` text NOT NULL,
   `exif` text NOT NULL,
   `order` int(11) NOT NULL,
@@ -395,6 +397,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_albums', 'bx_albums', 'title', '', '', 0, 'text', '_bx_albums_form_entry_input_sys_title', '_bx_albums_form_entry_input_title', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_albums_form_entry_input_title_err', 'Xss', '', 1, 0),
 ('bx_albums', 'bx_albums', 'text', '', '', 0, 'textarea', '_bx_albums_form_entry_input_sys_text', '_bx_albums_form_entry_input_text', '', 0, 0, 2, '', '', '', '', '', '', 'XssHtml', '', 1, 0),
 ('bx_albums', 'bx_albums', 'pictures', 'a:2:{i:0;s:15:"bx_albums_html5";i:1;s:22:"bx_albums_record_video";}', 'a:4:{s:16:"bx_albums_simple";s:26:"_sys_uploader_simple_title";s:15:"bx_albums_html5";s:25:"_sys_uploader_html5_title";s:22:"bx_albums_record_video";s:32:"_sys_uploader_record_video_title";s:14:"bx_albums_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_albums_form_entry_input_sys_pictures', '_bx_albums_form_entry_input_pictures', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
+('bx_albums', 'bx_albums', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_albums', 'bx_albums', 'allow_view_to', '', '', 0, 'custom', '_bx_albums_form_entry_input_sys_allow_view_to', '_bx_albums_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_albums', 'bx_albums', 'location', '', '', 0, 'location', '_sys_form_input_sys_location', '_sys_form_input_location', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_albums', 'bx_albums', 'added', '', '', 0, 'datetime', '_bx_albums_form_entry_input_sys_date_added', '_bx_albums_form_entry_input_date_added', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -407,16 +410,18 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_albums_entry_add', 'text', 2147483647, 1, 3),
 ('bx_albums_entry_add', 'pictures', 2147483647, 1, 4),
 ('bx_albums_entry_add', 'allow_view_to', 2147483647, 1, 5),
-('bx_albums_entry_add', 'location', 2147483647, 1, 6),
-('bx_albums_entry_add', 'do_submit', 2147483647, 1, 7),
+('bx_albums_entry_add', 'cf', 2147483647, 1, 6),
+('bx_albums_entry_add', 'location', 2147483647, 1, 7),
+('bx_albums_entry_add', 'do_submit', 2147483647, 1, 8),
 
 ('bx_albums_entry_edit', 'delete_confirm', 2147483647, 0, 1),
 ('bx_albums_entry_edit', 'title', 2147483647, 1, 2),
 ('bx_albums_entry_edit', 'text', 2147483647, 1, 3),
 ('bx_albums_entry_edit', 'pictures', 2147483647, 1, 4),
 ('bx_albums_entry_edit', 'allow_view_to', 2147483647, 1, 5),
-('bx_albums_entry_edit', 'location', 2147483647, 1, 6),
-('bx_albums_entry_edit', 'do_submit', 2147483647, 1, 7),
+('bx_albums_entry_edit', 'cf', 2147483647, 1, 6),
+('bx_albums_entry_edit', 'location', 2147483647, 1, 7),
+('bx_albums_entry_edit', 'do_submit', 2147483647, 1, 8),
 
 ('bx_albums_entry_add_images', 'delete_confirm', 2147483647, 0, 1),
 ('bx_albums_entry_add_images', 'title', 2147483647, 0, 2),

modules/boonex/albums/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxAlbumsManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxAlbumsManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxAlbumsManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxAlbumsManageTools' : oOptions.sObjName;
 }
 
-BxAlbumsManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxAlbumsManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxAlbumsManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxAlbumsManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxAlbumsManageTools.prototype.constructor = BxAlbumsManageTools;
 
 /** @} */

modules/boonex/classes/classes/BxClssConfig.php

@@ -46,6 +46,7 @@ class BxClssConfig extends BxBaseModTextConfig
             'FIELD_CATEGORY' => 'cat',
             'FIELD_MULTICAT' => 'multicat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_COVER' => 'covers',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_VIDEO' => 'videos',
@@ -191,6 +192,7 @@ class BxClssConfig extends BxBaseModTextConfig
                 'filter_item_active' => '_bx_classes_grid_filter_item_title_adm_active',
             	'filter_item_hidden' => '_bx_classes_grid_filter_item_title_adm_hidden',
             	'filter_item_select_one_filter1' => '_bx_classes_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_classes_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_classes_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_classes_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_classes_txt_all_entries_by',

modules/boonex/classes/classes/BxClssDb.php

@@ -57,8 +57,17 @@ class BxClssDb extends BxBaseModTextDb
 
     public function getEntriesByModule ($iModuleId)
     {
-        $sQuery = $this->prepare ("SELECT * FROM `" . $this->_oConfig->CNF['TABLE_ENTRIES'] . "` WHERE `module_id` = ? ORDER BY `order`", $iModuleId);
-        return $this->getAll($sQuery);
+        $CNF = &$this->_oConfig->CNF;
+
+        $aBindings = ['module_id' => $iModuleId];
+        
+        $sWhereClause = " AND `module_id` = :module_id";
+
+        $oCf = BxDolContentFilter::getInstance();
+        if($oCf->isEnabled())
+            $sWhereClause .= $oCf->getSQLParts($CNF['TABLE_ENTRIES'], $CNF['FIELD_CF']);
+
+        return $this->getAll("SELECT * FROM `" . $CNF['TABLE_ENTRIES'] . "` WHERE 1" . $sWhereClause . " ORDER BY `order`", $aBindings);
     }
 
     public function getEntriesModulesByContext ($iProfileConextId, $bAsPairs = false)

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

@@ -195,25 +195,26 @@
     <string name="_bx_classes_menu_item_title_view_entries_in_context"><![CDATA[Classes]]></string>
     <string name="_bx_classes_menu_title_entries_my"><![CDATA[My Classes Action Menu]]></string>
     <string name="_bx_classes_menu_set_title_entries_my"><![CDATA[My Classes Menu]]></string>
-	<string name="_bx_classes_menu_item_title_system_manage_my_classes"><![CDATA[My classes]]></string>
+    <string name="_bx_classes_menu_item_title_system_manage_my_classes"><![CDATA[My classes]]></string>
     <string name="_bx_classes_menu_item_title_manage_my_classes"><![CDATA[Classes]]></string>
     <string name="_bx_classes_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_classes_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_classes_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_classes_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
-	<string name="_bx_classes_menu_item_title_system_admt_classes"><![CDATA[Classes]]></string>
-	<string name="_bx_classes_menu_item_title_admt_classes"><![CDATA[Classes]]></string>
-	<string name="_bx_classes_menu_item_title_manage_my"><![CDATA[My Classes]]></string>
-	<string name="_bx_classes_menu_item_title_manage_all"><![CDATA[All Classes]]></string>
-	<string name="_bx_classes_menu_item_title_complete_class"><![CDATA[Mark as Completed]]></string>
-	<string name="_bx_classes_menu_item_title_sm_date_start"><![CDATA[Start Date]]></string>
-	<string name="_bx_classes_menu_item_title_sm_date_end"><![CDATA[Due Date]]></string>
+    <string name="_bx_classes_menu_item_title_system_admt_classes"><![CDATA[Classes]]></string>
+    <string name="_bx_classes_menu_item_title_admt_classes"><![CDATA[Classes]]></string>
+    <string name="_bx_classes_menu_item_title_manage_my"><![CDATA[My Classes]]></string>
+    <string name="_bx_classes_menu_item_title_manage_all"><![CDATA[All Classes]]></string>
+    <string name="_bx_classes_menu_item_title_complete_class"><![CDATA[Mark as Completed]]></string>
+    <string name="_bx_classes_menu_item_title_sm_date_start"><![CDATA[Start Date]]></string>
+    <string name="_bx_classes_menu_item_title_sm_date_end"><![CDATA[Due Date]]></string>
 
-	<string name="_bx_classes_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_classes_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_classes_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-        <string name="_bx_classes_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
-	<string name="_bx_classes_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_classes_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_classes_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
+    <string name="_bx_classes_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_classes_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_classes_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_classes_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_classes_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_classes_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_classes_grid_action_title_adm_clear_reports"><![CDATA[Сlear reports]]></string>

modules/boonex/classes/install/sql/install.sql

@@ -29,6 +29,7 @@ CREATE TABLE IF NOT EXISTS `bx_classes_classes` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -461,6 +462,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_classes', 'bx_classes_entry_view', 'bx_classes', 1, '_bx_classes_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_classes', 'bx_classes', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_classes', 'bx_classes', 'allow_view_to', '', '', 0, 'custom', '_bx_classes_form_entry_input_sys_allow_view_to', '_bx_classes_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_classes', 'bx_classes', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_classes_form_entry_input_sys_delete_confirm', '_bx_classes_form_entry_input_delete_confirm', '_bx_classes_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_classes_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_classes', 'bx_classes', 'do_publish', '_bx_classes_form_entry_input_do_publish', '', 0, 'submit', '_bx_classes_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -505,7 +507,8 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_classes_entry_add', 'avail', 2147483647, 1, 14),
 ('bx_classes_entry_add', 'cmts', 2147483647, 1, 15),
 ('bx_classes_entry_add', 'allow_view_to', 2147483647, 1, 16),
-('bx_classes_entry_add', 'do_publish', 2147483647, 1, 17),
+('bx_classes_entry_add', 'cf', 2147483647, 1, 17),
+('bx_classes_entry_add', 'do_publish', 2147483647, 1, 18),
 
 ('bx_classes_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_classes_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -526,7 +529,8 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_classes_entry_edit', 'avail', 2147483647, 1, 14),
 ('bx_classes_entry_edit', 'cmts', 2147483647, 1, 15),
 ('bx_classes_entry_edit', 'allow_view_to', 2147483647, 1, 16),
-('bx_classes_entry_edit', 'do_submit', 2147483647, 1, 17),
+('bx_classes_entry_edit', 'cf', 2147483647, 1, 17),
+('bx_classes_entry_edit', 'do_submit', 2147483647, 1, 18),
 
 ('bx_classes_entry_view', 'module_id', 2147483647, 1, 1),
 ('bx_classes_entry_view', 'completed_when', 2147483647, 1, 2),

modules/boonex/classes/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxClssManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxClssManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxClssManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxClssManageTools' : oOptions.sObjName;
 }
 
-BxClssManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxClssManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxClssManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxClssManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxClssManageTools.prototype.constructor = BxClssManageTools;
 
 /** @} */

modules/boonex/english/data/langs/system/en.xml

@@ -1533,6 +1533,7 @@
     <string name="_adm_stg_cpt_option_sys_cache_memcache_host"><![CDATA[Memcached server host]]></string>
     <string name="_adm_stg_cpt_option_sys_cache_memcache_port"><![CDATA[Memcached server port]]></string>
     <string name="_adm_stg_cpt_option_sys_captcha_default"><![CDATA[Default Сaptcha]]></string>
+    <string name="_adm_stg_cpt_option_sys_cf_enable"><![CDATA[Enable content filters]]></string>
     <string name="_adm_stg_cpt_option_sys_cf_prohibited"><![CDATA[Prohibited content]]></string>
     <string name="_adm_stg_cpt_option_sys_email_attachable_email_templates"><![CDATA[Attachable email templates list]]></string>
     <string name="_adm_stg_cpt_option_sys_db_cache_enable"><![CDATA[Enable DB cache]]></string>

modules/boonex/files/classes/BxFilesConfig.php

@@ -46,6 +46,7 @@ class BxFilesConfig extends BxBaseModTextConfig
             'FIELD_TEXT' => 'desc',
             'FIELD_TEXT_ID' => 'file-desc',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_PHOTO' => 'attachments',
             'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
@@ -163,6 +164,7 @@ class BxFilesConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_files_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_files_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_files_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_files_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_files_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_files_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_files_txt_all_entries_by',

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

@@ -190,24 +190,25 @@
     <string name="_bx_files_menu_item_title_view_entries_in_context"><![CDATA[Files]]></string>
     <string name="_bx_files_menu_title_entries_my"><![CDATA[My Files Action Menu]]></string>
     <string name="_bx_files_menu_set_title_entries_my"><![CDATA[My Files Menu]]></string>
-	<string name="_bx_files_menu_item_title_system_manage_my_files"><![CDATA[My files]]></string>
+    <string name="_bx_files_menu_item_title_system_manage_my_files"><![CDATA[My files]]></string>
     <string name="_bx_files_menu_item_title_manage_my_files"><![CDATA[Files]]></string>
     <string name="_bx_files_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_files_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_files_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_files_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
-	<string name="_bx_files_menu_item_title_system_admt_files"><![CDATA[Files]]></string>
-	<string name="_bx_files_menu_item_title_admt_files"><![CDATA[Files]]></string>
-	<string name="_bx_files_menu_item_title_manage_my"><![CDATA[My Files]]></string>
-	<string name="_bx_files_menu_item_title_manage_all"><![CDATA[All Files]]></string>
-	<string name="_bx_files_menu_item_title_system_download_file"><![CDATA[Download]]></string>
-	<string name="_bx_files_menu_item_title_download_file"><![CDATA[Download]]></string>
+    <string name="_bx_files_menu_item_title_system_admt_files"><![CDATA[Files]]></string>
+    <string name="_bx_files_menu_item_title_admt_files"><![CDATA[Files]]></string>
+    <string name="_bx_files_menu_item_title_manage_my"><![CDATA[My Files]]></string>
+    <string name="_bx_files_menu_item_title_manage_all"><![CDATA[All Files]]></string>
+    <string name="_bx_files_menu_item_title_system_download_file"><![CDATA[Download]]></string>
+    <string name="_bx_files_menu_item_title_download_file"><![CDATA[Download]]></string>
 
-	<string name="_bx_files_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_files_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_files_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-        <string name="_bx_files_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
-	<string name="_bx_files_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_files_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_files_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_files_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_files_grid_column_title_adm_author"><![CDATA[Author]]></string>
@@ -217,7 +218,7 @@
     <string name="_bx_files_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_files_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_files_grid_column_title_adm_status_admin"><![CDATA[Moderation]]></string>
-  <string name="_bx_files_grid_action_err_delete"><![CDATA[Cannot delete the selected file(s).]]></string>
+    <string name="_bx_files_grid_action_err_delete"><![CDATA[Cannot delete the selected file(s).]]></string>
     <string name="_bx_files_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 
     <string name="_bx_files_chart_growth"><![CDATA[Files: Growth]]></string>

modules/boonex/files/install/sql/install.sql

@@ -27,6 +27,7 @@ CREATE TABLE IF NOT EXISTS `bx_files_main` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -273,6 +274,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_files_upload', 'bx_files_entry_upload', 'bx_files', 0, '_bx_files_form_entry_display_add');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_files', 'bx_files', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_files', 'bx_files', 'allow_view_to', '', '', 0, 'custom', '_bx_files_form_entry_input_sys_allow_view_to', '_bx_files_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_files', 'bx_files', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_files_form_entry_input_sys_delete_confirm', '_bx_files_form_entry_input_delete_confirm', '_bx_files_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_files_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_files', 'bx_files', 'do_publish', '_bx_files_form_entry_input_do_publish', '', 0, 'submit', '_bx_files_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -288,6 +290,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 
 ('bx_files_upload', 'bx_files', 'attachments', 'a:1:{i:0;s:14:"bx_files_html5";}', 'a:2:{s:15:"bx_files_simple";s:26:"_sys_uploader_simple_title";s:14:"bx_files_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_files_form_entry_input_sys_attachments', '_bx_files_form_entry_input_attachments', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_files_form_entry_input_attachments', '', '', 1, 0),
 ('bx_files_upload', 'bx_files', 'cat', '', '#!bx_files_cats', 0, 'select', '_bx_files_form_entry_input_sys_cat', '_bx_files_form_entry_input_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_files_form_entry_input_cat_err', 'Xss', '', 1, 0),
+('bx_files_upload', 'bx_files', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_files_upload', 'bx_files', 'allow_view_to', '', '', 0, 'custom', '_bx_files_form_entry_input_sys_allow_view_to', '_bx_files_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_files_upload', 'bx_files', 'do_submit', '_bx_files_form_entry_input_do_submit', '', 0, 'submit', '_bx_files_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_files_upload', 'bx_files', 'profile_id', '0', '', 0, 'hidden', '_bx_files_form_entry_input_sys_profile_id', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0);
@@ -302,7 +305,8 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_files_entry_edit', 'data', 0, 1, 4),
 ('bx_files_entry_edit', 'attachments', 2147483647, 1, 5),
 ('bx_files_entry_edit', 'allow_view_to', 2147483647, 1, 6),
-('bx_files_entry_edit', 'do_submit', 2147483647, 1, 7),
+('bx_files_entry_edit', 'cf', 2147483647, 1, 7),
+('bx_files_entry_edit', 'do_submit', 2147483647, 1, 8),
 
 ('bx_files_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_files_entry_view', 'added', 2147483647, 1, 2),
@@ -312,7 +316,8 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_files_entry_upload', 'attachments', 2147483647, 1, 2),
 ('bx_files_entry_upload', 'cat', 2147483647, 1, 3),
 ('bx_files_entry_upload', 'allow_view_to', 2147483647, 1, 4),
-('bx_files_entry_upload', 'do_submit', 2147483647, 1, 5);
+('bx_files_entry_upload', 'cf', 2147483647, 1, 5),
+('bx_files_entry_upload', 'do_submit', 2147483647, 1, 6);
 
 -- PRE-VALUES
 INSERT INTO `sys_form_pre_lists`(`key`, `title`, `module`, `use_for_sets`) VALUES

modules/boonex/files/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxFilesManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxFilesManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxFilesManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxFilesManageTools' : oOptions.sObjName;
 }
 
-BxFilesManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxFilesManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxFilesManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxFilesManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxFilesManageTools.prototype.constructor = BxFilesManageTools;
 
 /** @} */

modules/boonex/forum/classes/BxForumConfig.php

@@ -55,6 +55,7 @@ class BxForumConfig extends BxBaseModTextConfig
             'FIELD_LR_ADDED' => 'lr_timestamp',
             'FIELD_LR_COMMENT_ID' => 'lr_comment_id',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_COVER' => 'covers',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_VIDEO' => 'videos',
@@ -212,6 +213,7 @@ class BxForumConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_forum_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_forum_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_forum_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_forum_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_forum_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_forum_menu_item_title_manage_all',
                 'txt_all_entries_in' => '_bx_forum_txt_all_entries_in',

modules/boonex/forum/classes/BxForumGrid.php

@@ -391,6 +391,11 @@ class BxForumGrid extends BxTemplGrid
         // filter out posts of suspended members
         $sJoinClause .= " INNER JOIN `sys_profiles` AS `p` ON (`p`.`id` = `{$CNF['TABLE_ENTRIES']}`.`{$CNF['FIELD_AUTHOR']}` AND `p`.`status` = 'active') ";
 
+        // filter out posts by content filter
+        $oCf = BxDolContentFilter::getInstance();
+        if($oCf->isEnabled())
+            $sWhereClause .= $oCf->getSQLParts ($CNF['TABLE_ENTRIES'], $CNF['FIELD_CF']);
+
         // filter by badges
         if(isset($this->_sFilter2Value) && $this->_sFilter2Value != ''){
             $aObjects = BxDolBadges::getInstance()->getData(['type' => 'by_module&badge', 'badge_id' => $this->_sFilter2Value, 'module' => $this->_oModule->_aModule['name']]);

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

@@ -323,6 +323,7 @@
   
 
     <string name="_bx_forum_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_forum_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_forum_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_forum_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_forum_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

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

@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS `bx_forum_discussions` (
   `resolvable` tinyint(4) NOT NULL DEFAULT '0',
   `resolved` tinyint(4) NOT NULL DEFAULT '0',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
+  `cf` int(11) NOT NULL default '1',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
   PRIMARY KEY (`id`),
@@ -431,6 +432,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_forum_search', 'bx_forum_search_full', @sName, 0, '_bx_forum_form_search_display_full');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES
+(@sName, @sName, 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 (@sName, @sName, 'allow_view_to', '', '', 0, 'custom', '_bx_forum_form_entry_input_sys_allow_view_to', '_bx_forum_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 (@sName, @sName, 'delete_confirm', 1, '', 0, 'checkbox', '_bx_forum_form_entry_input_sys_delete_confirm', '_bx_forum_form_entry_input_delete_confirm', '_bx_forum_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_forum_form_entry_input_delete_confirm_error', '', '', 1, 0),
 (@sName, @sName, 'do_submit', '_bx_forum_form_entry_input_do_submit', '', 0, 'submit', '_bx_forum_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -466,8 +468,9 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_forum_entry_add', 'polls', 2147483647, 1, 8),
 ('bx_forum_entry_add', 'covers', 2147483647, 1, 9),
 ('bx_forum_entry_add', 'allow_view_to', 2147483647, 1, 10),
-('bx_forum_entry_add', 'resolvable', 2147483647, 1, 11),
-('bx_forum_entry_add', 'do_submit', 2147483647, 1, 12),
+('bx_forum_entry_add', 'cf', 2147483647, 1, 11),
+('bx_forum_entry_add', 'resolvable', 2147483647, 1, 12),
+('bx_forum_entry_add', 'do_submit', 2147483647, 1, 13),
 
 ('bx_forum_entry_edit', 'title', 2147483647, 1, 1),
 ('bx_forum_entry_edit', 'cat', 2147483647, 1, 2),
@@ -479,8 +482,9 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_forum_entry_edit', 'polls', 2147483647, 1, 8),
 ('bx_forum_entry_edit', 'covers', 2147483647, 1, 9),
 ('bx_forum_entry_edit', 'allow_view_to', 2147483647, 1, 10),
-('bx_forum_entry_edit', 'resolvable', 2147483647, 1, 11),
-('bx_forum_entry_edit', 'do_submit', 2147483647, 1, 12),
+('bx_forum_entry_edit', 'cf', 2147483647, 1, 11),
+('bx_forum_entry_edit', 'resolvable', 2147483647, 1, 12),
+('bx_forum_entry_edit', 'do_submit', 2147483647, 1, 13),
 
 ('bx_forum_entry_view', 'title', 2147483647, 1, 1),
 ('bx_forum_entry_view', 'cat', 2147483647, 1, 2),

modules/boonex/forum/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxForumManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxForumManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxForumManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxForumManageTools' : oOptions.sObjName;
 }
 
-BxForumManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxForumManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxForumManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxForumManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxForumManageTools.prototype.constructor = BxForumManageTools;
 
 /** @} */

modules/boonex/glossary/classes/BxGlsrConfig.php

@@ -40,6 +40,7 @@ class BxGlsrConfig extends BxBaseModTextConfig
             'FIELD_TEXT_ID' => 'glossary-text',
             'FIELD_CATEGORY' => 'cat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
             'FIELD_VIEWS' => 'views',
@@ -147,6 +148,7 @@ class BxGlsrConfig extends BxBaseModTextConfig
                 'filter_item_hidden' => '_bx_glossary_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_glossary_grid_filter_item_title_adm_pending',
                 'filter_item_select_one_filter1' => '_bx_glossary_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_glossary_grid_filter_item_title_adm_select_one_filter2',
                 'menu_item_manage_my' => '_bx_glossary_menu_item_title_manage_my',
                 'menu_item_manage_all' => '_bx_glossary_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_glossary_txt_all_entries_by',

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

@@ -186,22 +186,23 @@
     <string name="_bx_glossary_menu_item_title_view_entries_in_context"><![CDATA[Glossary]]></string>
     <string name="_bx_glossary_menu_title_entries_my"><![CDATA[My Glossary Action Menu]]></string>
     <string name="_bx_glossary_menu_set_title_entries_my"><![CDATA[My Glossary Menu]]></string>
-	<string name="_bx_glossary_menu_item_title_system_manage_my_glossary"><![CDATA[My terms]]></string>
+    <string name="_bx_glossary_menu_item_title_system_manage_my_glossary"><![CDATA[My terms]]></string>
     <string name="_bx_glossary_menu_item_title_manage_my_glossary"><![CDATA[Terms]]></string>
     <string name="_bx_glossary_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_glossary_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_glossary_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_glossary_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
-	<string name="_bx_glossary_menu_item_title_system_admt_glossary"><![CDATA[Glossary]]></string>
-	<string name="_bx_glossary_menu_item_title_admt_glossary"><![CDATA[Glossary]]></string>
-	<string name="_bx_glossary_menu_item_title_manage_my"><![CDATA[My Terms]]></string>
-	<string name="_bx_glossary_menu_item_title_manage_all"><![CDATA[All Terms]]></string>
+    <string name="_bx_glossary_menu_item_title_system_admt_glossary"><![CDATA[Glossary]]></string>
+    <string name="_bx_glossary_menu_item_title_admt_glossary"><![CDATA[Glossary]]></string>
+    <string name="_bx_glossary_menu_item_title_manage_my"><![CDATA[My Terms]]></string>
+    <string name="_bx_glossary_menu_item_title_manage_all"><![CDATA[All Terms]]></string>
 
-	<string name="_bx_glossary_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_glossary_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_glossary_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-  <string name="_bx_glossary_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
-  <string name="_bx_glossary_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_glossary_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_glossary_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_glossary_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_glossary_grid_column_title_adm_author"><![CDATA[Author]]></string>

modules/boonex/glossary/install/sql/install.sql

@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `bx_glossary_terms` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -251,6 +252,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_glossary', 'bx_glossary_entry_view', 'bx_glossary', 1, '_bx_glossary_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_glossary', 'bx_glossary', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_glossary', 'bx_glossary', 'allow_view_to', '', '', 0, 'custom', '_bx_glossary_form_entry_input_sys_allow_view_to', '_bx_glossary_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_glossary', 'bx_glossary', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_glossary_form_entry_input_sys_delete_confirm', '_bx_glossary_form_entry_input_delete_confirm', '_bx_glossary_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_glossary_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_glossary', 'bx_glossary', 'do_publish', '_bx_glossary_form_entry_input_do_publish', '', 0, 'submit', '_bx_glossary_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -271,9 +273,11 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_glossary_entry_add', 'text', 2147483647, 1, 4),
 ('bx_glossary_entry_add', 'pictures', 2147483647, 1, 5),
 ('bx_glossary_entry_add', 'allow_view_to', 2147483647, 1, 6),
-('bx_glossary_entry_add', 'status_admin', 192, 1, 7),
-('bx_glossary_entry_add', 'do_submit', 2147483647, 0, 8),
-('bx_glossary_entry_add', 'do_publish', 2147483647, 1, 9),
+('bx_glossary_entry_add', 'cf', 2147483647, 1, 7),
+('bx_glossary_entry_add', 'status_admin', 192, 1, 8),
+('bx_glossary_entry_add', 'do_submit', 2147483647, 0, 9),
+('bx_glossary_entry_add', 'do_publish', 2147483647, 1, 10),
+
 ('bx_glossary_entry_delete', 'cat', 2147483647, 0, 0),
 ('bx_glossary_entry_delete', 'pictures', 2147483647, 0, 0),
 ('bx_glossary_entry_delete', 'text', 2147483647, 0, 0),
@@ -282,6 +286,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_glossary_entry_delete', 'allow_view_to', 2147483647, 0, 0),
 ('bx_glossary_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_glossary_entry_delete', 'do_submit', 2147483647, 1, 2),
+
 ('bx_glossary_entry_edit', 'do_publish', 2147483647, 0, 1),
 ('bx_glossary_entry_edit', 'delete_confirm', 2147483647, 0, 2),
 ('bx_glossary_entry_edit', 'title', 2147483647, 1, 3),
@@ -289,8 +294,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_glossary_entry_edit', 'text', 2147483647, 1, 5),
 ('bx_glossary_entry_edit', 'pictures', 2147483647, 1, 6),
 ('bx_glossary_entry_edit', 'allow_view_to', 2147483647, 1, 7),
-('bx_glossary_entry_edit', 'status_admin', 192, 1, 8),
-('bx_glossary_entry_edit', 'do_submit', 2147483647, 1, 9),
+('bx_glossary_entry_edit', 'cf', 2147483647, 1, 8),
+('bx_glossary_entry_edit', 'status_admin', 192, 1, 9),
+('bx_glossary_entry_edit', 'do_submit', 2147483647, 1, 10),
+
 ('bx_glossary_entry_view', 'pictures', 2147483647, 0, 0),
 ('bx_glossary_entry_view', 'delete_confirm', 2147483647, 0, 0),
 ('bx_glossary_entry_view', 'text', 2147483647, 0, 0),

modules/boonex/glossary/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxGlsrManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-	this._sObjName = oOptions.sObjName == undefined ? 'oBxGlsrManageTools' : oOptions.sObjName;
+function BxGlsrManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
-
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxGlsrManageTools' : oOptions.sObjName;
 }
 
-BxGlsrManageTools.prototype.onChangeFilter = function (oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxGlsrManageTools.prototype.onClickSettings = function (sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxGlsrManageTools.prototype.onClickDelete = function (iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxGlsrManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxGlsrManageTools.prototype.constructor = BxGlsrManageTools;
 
 /** @} */

modules/boonex/market/classes/BxMarketConfig.php

@@ -65,6 +65,7 @@ class BxMarketConfig extends BxBaseModTextConfig
             'FIELD_ALLOW_PURCHASE_TO' => 'allow_purchase_to',
             'FIELD_ALLOW_COMMENT_TO' => 'allow_comment_to',
             'FIELD_ALLOW_VOTE_TO' => 'allow_vote_to',
+            'FIELD_CF' => 'cf',
             'FIELD_SUBENTRIES' => 'subentries',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
@@ -210,6 +211,7 @@ class BxMarketConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_market_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_market_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_market_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_market_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_market_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_market_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_market_txt_all_entries_by',

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

@@ -308,19 +308,19 @@
     <string name="_bx_market_menu_item_title_view_entries_in_context"><![CDATA[Products]]></string>
     <string name="_bx_market_menu_title_entries_my"><![CDATA[My Products Action Menu]]></string>
     <string name="_bx_market_menu_set_title_entries_my"><![CDATA[My Products Menu]]></string>
-	<string name="_bx_market_menu_item_title_system_manage_my_products"><![CDATA[My products]]></string>
+    <string name="_bx_market_menu_item_title_system_manage_my_products"><![CDATA[My products]]></string>
     <string name="_bx_market_menu_item_title_manage_my_products"><![CDATA[Products]]></string>
     <string name="_bx_market_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_market_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_market_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_market_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
-	<string name="_bx_market_menu_item_title_system_admt_products"><![CDATA[Products]]></string>
-	<string name="_bx_market_menu_item_title_admt_products"><![CDATA[Products]]></string>
-	<string name="_bx_market_menu_item_title_manage_my"><![CDATA[My Products]]></string>
-	<string name="_bx_market_menu_item_title_manage_all"><![CDATA[All Products]]></string>
-	<string name="_bx_market_menu_item_title_system_licenses"><![CDATA[Licenses]]></string>
-	<string name="_bx_market_menu_item_title_licenses"><![CDATA[Licenses]]></string>
-	<string name="_bx_market_menu_title_snippet"><![CDATA[Snippet Actions]]></string>
+    <string name="_bx_market_menu_item_title_system_admt_products"><![CDATA[Products]]></string>
+    <string name="_bx_market_menu_item_title_admt_products"><![CDATA[Products]]></string>
+    <string name="_bx_market_menu_item_title_manage_my"><![CDATA[My Products]]></string>
+    <string name="_bx_market_menu_item_title_manage_all"><![CDATA[All Products]]></string>
+    <string name="_bx_market_menu_item_title_system_licenses"><![CDATA[Licenses]]></string>
+    <string name="_bx_market_menu_item_title_licenses"><![CDATA[Licenses]]></string>
+    <string name="_bx_market_menu_title_snippet"><![CDATA[Snippet Actions]]></string>
     <string name="_bx_market_menu_set_title_snippet"><![CDATA[Snippet Actions]]></string>
     <string name="_bx_market_menu_item_title_system_snippet_more"><![CDATA[More Actions]]></string>
     <string name="_bx_market_menu_item_title_snippet_more"><![CDATA[More Actions]]></string>
@@ -336,6 +336,7 @@
     
 
     <string name="_bx_market_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_market_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_market_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_market_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/market/install/sql/install.sql

@@ -34,6 +34,7 @@ CREATE TABLE IF NOT EXISTS `bx_market_products` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(32) NOT NULL DEFAULT '3',
   `allow_purchase_to` varchar(32) NOT NULL DEFAULT '3',
   `allow_comment_to` varchar(32) NOT NULL DEFAULT 'c',
@@ -385,6 +386,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_market', 'bx_market_entry_view_full', 'bx_market', 1, '_bx_market_form_entry_display_view_full');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_market', 'bx_market', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_market', 'bx_market', 'allow_view_to', '', '', 0, 'custom', '_bx_market_form_entry_input_sys_allow_view_to', '_bx_market_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_market', 'bx_market', 'allow_purchase_to', '', '', 0, 'custom', '_bx_market_form_entry_input_sys_allow_purchase_to', '_bx_market_form_entry_input_allow_purchase_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_market', 'bx_market', 'allow_comment_to', '', '', 0, 'custom', '_bx_market_form_entry_input_sys_allow_comment_to', '_bx_market_form_entry_input_allow_comment_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -444,16 +446,17 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_market_entry_add', 'allow_purchase_to', 2147483647, 1, 19),
 ('bx_market_entry_add', 'allow_comment_to', 2147483647, 1, 20),
 ('bx_market_entry_add', 'allow_vote_to', 2147483647, 1, 21),
-('bx_market_entry_add', 'header_end_privacy', 2147483647, 1, 22),
-('bx_market_entry_add', 'header_beg_notes', 2147483647, 1, 23),
-('bx_market_entry_add', 'notes', 2147483647, 1, 24),
-('bx_market_entry_add', 'notes_purchased', 2147483647, 1, 25),
-('bx_market_entry_add', 'header_end_notes', 2147483647, 1, 26),
-('bx_market_entry_add', 'header_beg_other', 2147483647, 1, 27),
-('bx_market_entry_add', 'location', 2147483647, 1, 28),
-('bx_market_entry_add', 'subentries', 2147483647, 1, 29),
-('bx_market_entry_add', 'header_end_other', 2147483647, 1, 30),
-('bx_market_entry_add', 'do_publish', 2147483647, 1, 31),
+('bx_market_entry_add', 'cf', 2147483647, 1, 22),
+('bx_market_entry_add', 'header_end_privacy', 2147483647, 1, 23),
+('bx_market_entry_add', 'header_beg_notes', 2147483647, 1, 24),
+('bx_market_entry_add', 'notes', 2147483647, 1, 25),
+('bx_market_entry_add', 'notes_purchased', 2147483647, 1, 26),
+('bx_market_entry_add', 'header_end_notes', 2147483647, 1, 27),
+('bx_market_entry_add', 'header_beg_other', 2147483647, 1, 28),
+('bx_market_entry_add', 'location', 2147483647, 1, 29),
+('bx_market_entry_add', 'subentries', 2147483647, 1, 30),
+('bx_market_entry_add', 'header_end_other', 2147483647, 1, 31),
+('bx_market_entry_add', 'do_publish', 2147483647, 1, 32),
 
 ('bx_market_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_market_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -479,16 +482,17 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_market_entry_edit', 'allow_purchase_to', 2147483647, 1, 19),
 ('bx_market_entry_edit', 'allow_comment_to', 2147483647, 1, 20),
 ('bx_market_entry_edit', 'allow_vote_to', 2147483647, 1, 21),
-('bx_market_entry_edit', 'header_end_privacy', 2147483647, 1, 22),
-('bx_market_entry_edit', 'header_beg_notes', 2147483647, 1, 23),
-('bx_market_entry_edit', 'notes', 2147483647, 1, 24),
-('bx_market_entry_edit', 'notes_purchased', 2147483647, 1, 25),
-('bx_market_entry_edit', 'header_end_notes', 2147483647, 1, 26),
-('bx_market_entry_edit', 'header_beg_other', 2147483647, 1, 27),
-('bx_market_entry_edit', 'location', 2147483647, 1, 28),
-('bx_market_entry_edit', 'subentries', 2147483647, 1, 29),
-('bx_market_entry_edit', 'header_end_other', 2147483647, 1, 30),
-('bx_market_entry_edit', 'do_submit', 2147483647, 1, 31),
+('bx_market_entry_edit', 'cf', 2147483647, 1, 22),
+('bx_market_entry_edit', 'header_end_privacy', 2147483647, 1, 23),
+('bx_market_entry_edit', 'header_beg_notes', 2147483647, 1, 24),
+('bx_market_entry_edit', 'notes', 2147483647, 1, 25),
+('bx_market_entry_edit', 'notes_purchased', 2147483647, 1, 26),
+('bx_market_entry_edit', 'header_end_notes', 2147483647, 1, 27),
+('bx_market_entry_edit', 'header_beg_other', 2147483647, 1, 28),
+('bx_market_entry_edit', 'location', 2147483647, 1, 29),
+('bx_market_entry_edit', 'subentries', 2147483647, 1, 30),
+('bx_market_entry_edit', 'header_end_other', 2147483647, 1, 31),
+('bx_market_entry_edit', 'do_submit', 2147483647, 1, 32),
 
 ('bx_market_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_market_entry_view', 'added', 2147483647, 1, 2),

modules/boonex/market/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxMarketManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxMarketManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxMarketManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxMarketManageTools' : oOptions.sObjName;
 }
 
-BxMarketManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxMarketManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxMarketManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxMarketManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxMarketManageTools.prototype.constructor = BxMarketManageTools;
 
 /** @} */

modules/boonex/photos/classes/BxPhotosConfig.php

@@ -44,6 +44,7 @@ class BxPhotosConfig extends BxBaseModTextConfig
             'FIELD_CATEGORY' => 'cat',
             'FIELD_DURATION' => 'duration',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
             'FIELD_FOR_STORING_FILE_ID' => 'thumb',
@@ -159,6 +160,7 @@ class BxPhotosConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_photos_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_photos_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_photos_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_photos_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_photos_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_photos_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_photos_txt_all_entries_by',

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

@@ -208,6 +208,7 @@
     <string name="_bx_photos_menu_item_title_manage_all"><![CDATA[All Photos]]></string>
 
     <string name="_bx_photos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_photos_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_photos_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_photos_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/photos/install/sql/install.sql

@@ -25,6 +25,7 @@ CREATE TABLE IF NOT EXISTS `bx_photos_entries` (
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
+  `cf` int(11) NOT NULL default '1',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
   `exif` text NOT NULL,
@@ -296,6 +297,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_photos', 'bx_photos_entry_view', 'bx_photos', 1, '_bx_photos_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_photos', 'bx_photos', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_photos', 'bx_photos', 'allow_view_to', '', '', 0, 'custom', '_bx_photos_form_entry_input_sys_allow_view_to', '_bx_photos_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_photos', 'bx_photos', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_photos_form_entry_input_sys_delete_confirm', '_bx_photos_form_entry_input_delete_confirm', '_bx_photos_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_photos_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_photos', 'bx_photos', 'do_publish', '_bx_photos_form_entry_input_do_publish', '', 0, 'submit', '_bx_photos_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -311,6 +313,7 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 
 ('bx_photos_upload', 'bx_photos', 'pictures', 'a:1:{i:0;s:15:"bx_photos_html5";}', 'a:2:{s:16:"bx_photos_simple";s:26:"_sys_uploader_simple_title";s:15:"bx_photos_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_bx_photos_form_entry_input_sys_pictures', '_bx_photos_form_entry_input_pictures', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_photos_form_entry_input_pictures_err', '', '', 1, 0),
 ('bx_photos_upload', 'bx_photos', 'cat', '', '#!bx_photos_cats', 0, 'select', '_bx_photos_form_entry_input_sys_cat', '_bx_photos_form_entry_input_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_photos_form_entry_input_cat_err', 'Xss', '', 1, 0),
+('bx_photos_upload', 'bx_photos', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_photos_upload', 'bx_photos', 'allow_view_to', '', '', 0, 'custom', '_bx_photos_form_entry_input_sys_allow_view_to', '_bx_photos_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_photos_upload', 'bx_photos', 'do_submit', '_bx_photos_form_entry_input_do_submit', '', 0, 'submit', '_bx_photos_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_photos_upload', 'bx_photos', 'profile_id', '0', '', 0, 'hidden', '_bx_photos_form_entry_input_sys_profile_id', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0);
@@ -320,7 +323,8 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_photos_entry_upload', 'pictures', 2147483647, 1, 2),
 ('bx_photos_entry_upload', 'cat', 2147483647, 1, 3),
 ('bx_photos_entry_upload', 'allow_view_to', 2147483647, 1, 4),
-('bx_photos_entry_upload', 'do_submit', 2147483647, 1, 5),
+('bx_photos_entry_upload', 'cf', 2147483647, 1, 5),
+('bx_photos_entry_upload', 'do_submit', 2147483647, 1, 6),
 
 ('bx_photos_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_photos_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -330,8 +334,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_photos_entry_edit', 'text', 2147483647, 1, 3),
 ('bx_photos_entry_edit', 'pictures', 2147483647, 1, 4),
 ('bx_photos_entry_edit', 'allow_view_to', 2147483647, 1, 5),
-('bx_photos_entry_edit', 'location', 2147483647, 1, 6),
-('bx_photos_entry_edit', 'do_submit', 2147483647, 1, 7),
+('bx_photos_entry_edit', 'cf', 2147483647, 1, 6),
+('bx_photos_entry_edit', 'location', 2147483647, 1, 7),
+('bx_photos_entry_edit', 'do_submit', 2147483647, 1, 8),
 
 ('bx_photos_entry_view', 'cat', 2147483647, 1, 2),
 ('bx_photos_entry_view', 'added', 2147483647, 1, 3),

modules/boonex/photos/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxPhotosManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxPhotosManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxPhotosManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxPhotosManageTools' : oOptions.sObjName;
 }
 
-BxPhotosManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxPhotosManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxPhotosManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxPhotosManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxPhotosManageTools.prototype.constructor = BxPhotosManageTools;
 
 /** @} */

modules/boonex/polls/classes/BxPollsConfig.php

@@ -43,6 +43,7 @@ class BxPollsConfig extends BxBaseModTextConfig
             'FIELD_CATEGORY' => 'cat',
             'FIELD_SUBENTRIES' => 'subentries',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_ANONYMOUS_VOTING' => 'anonymous',
             'FIELD_HIDDEN_RESULTS' => 'hidden_results',
             'FIELD_PHOTO' => 'pictures',
@@ -161,6 +162,7 @@ class BxPollsConfig extends BxBaseModTextConfig
                 'filter_item_hidden' => '_bx_polls_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_polls_grid_filter_item_title_adm_pending',
                 'filter_item_select_one_filter1' => '_bx_polls_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_polls_grid_filter_item_title_adm_select_one_filter2',
                 'menu_item_manage_my' => '_bx_polls_menu_item_title_manage_my',
                 'menu_item_manage_all' => '_bx_polls_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_polls_txt_all_entries_by',

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

@@ -188,25 +188,26 @@
     <string name="_bx_polls_menu_item_title_view_entries_in_context"><![CDATA[Polls]]></string>
     <string name="_bx_polls_menu_title_entries_my"><![CDATA[My Polls Action Menu]]></string>
     <string name="_bx_polls_menu_set_title_entries_my"><![CDATA[My Polls Menu]]></string>
-	<string name="_bx_polls_menu_item_title_system_manage_my_polls"><![CDATA[My polls]]></string>
+    <string name="_bx_polls_menu_item_title_system_manage_my_polls"><![CDATA[My polls]]></string>
     <string name="_bx_polls_menu_item_title_manage_my_polls"><![CDATA[Polls]]></string>
     <string name="_bx_polls_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_polls_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_polls_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_polls_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
-	<string name="_bx_polls_menu_item_title_system_admt_polls"><![CDATA[Polls]]></string>
-	<string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Polls]]></string>
-	<string name="_bx_polls_menu_item_title_manage_my"><![CDATA[My Polls]]></string>
-	<string name="_bx_polls_menu_item_title_manage_all"><![CDATA[All Polls]]></string>
-	<string name="_bx_polls_menu_item_view_subentries"><![CDATA[View Poll]]></string>
-	<string name="_bx_polls_menu_item_view_results"><![CDATA[View Results]]></string>
-	
+    <string name="_bx_polls_menu_item_title_system_admt_polls"><![CDATA[Polls]]></string>
+    <string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Polls]]></string>
+    <string name="_bx_polls_menu_item_title_manage_my"><![CDATA[My Polls]]></string>
+    <string name="_bx_polls_menu_item_title_manage_all"><![CDATA[All Polls]]></string>
+    <string name="_bx_polls_menu_item_view_subentries"><![CDATA[View Poll]]></string>
+    <string name="_bx_polls_menu_item_view_results"><![CDATA[View Results]]></string>
 
-	<string name="_bx_polls_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_polls_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_polls_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-        <string name="_bx_polls_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
-	<string name="_bx_polls_grid_column_title_adm_active"><![CDATA[Active]]></string>
+
+    <string name="_bx_polls_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
+    <string name="_bx_polls_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_polls_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_polls_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_polls_grid_column_title_adm_author"><![CDATA[Author]]></string>

modules/boonex/polls/install/sql/install.sql

@@ -21,6 +21,7 @@ CREATE TABLE IF NOT EXISTS `bx_polls_entries` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `anonymous` tinyint(4) NOT NULL DEFAULT '0',
   `hidden_results` tinyint(4) NOT NULL DEFAULT '0',
@@ -296,6 +297,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_polls', 'bx_polls_entry_view', 'bx_polls', 1, '_bx_polls_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_polls', 'bx_polls', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_polls', 'bx_polls', 'allow_view_to', '', '', 0, 'custom', '_bx_polls_form_entry_input_sys_allow_view_to', '_bx_polls_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_polls', 'bx_polls', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_polls_form_entry_input_sys_delete_confirm', '_bx_polls_form_entry_input_delete_confirm', '_bx_polls_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_polls_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_polls', 'bx_polls', 'do_publish', '_bx_polls_form_entry_input_do_publish', '', 0, 'submit', '_bx_polls_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -318,10 +320,11 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_polls_entry_add', 'subentries', 2147483647, 1, 3),
 ('bx_polls_entry_add', 'pictures', 2147483647, 1, 4),
 ('bx_polls_entry_add', 'allow_view_to', 2147483647, 1, 5),
-('bx_polls_entry_add', 'anonymous', 2147483647, 1, 6),
-('bx_polls_entry_add', 'hidden_results', 2147483647, 1, 7),
-('bx_polls_entry_add', 'location', 2147483647, 1, 8),
-('bx_polls_entry_add', 'do_publish', 2147483647, 1, 9),
+('bx_polls_entry_add', 'cf', 2147483647, 1, 6),
+('bx_polls_entry_add', 'anonymous', 2147483647, 1, 7),
+('bx_polls_entry_add', 'hidden_results', 2147483647, 1, 8),
+('bx_polls_entry_add', 'location', 2147483647, 1, 9),
+('bx_polls_entry_add', 'do_publish', 2147483647, 1, 10),
 
 ('bx_polls_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_polls_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -331,9 +334,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_polls_entry_edit', 'subentries', 2147483647, 1, 3),
 ('bx_polls_entry_edit', 'pictures', 2147483647, 1, 4),
 ('bx_polls_entry_edit', 'allow_view_to', 2147483647, 1, 5),
-('bx_polls_entry_edit', 'hidden_results', 2147483647, 1, 6),
-('bx_polls_entry_edit', 'location', 2147483647, 1, 7),
-('bx_polls_entry_edit', 'do_submit', 2147483647, 1, 8),
+('bx_polls_entry_edit', 'cf', 2147483647, 1, 6),
+('bx_polls_entry_edit', 'hidden_results', 2147483647, 1, 7),
+('bx_polls_entry_edit', 'location', 2147483647, 1, 8),
+('bx_polls_entry_edit', 'do_submit', 2147483647, 1, 9),
 
 ('bx_polls_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_polls_entry_view', 'added', 2147483647, 1, 2),

modules/boonex/polls/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxPollsManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxPollsManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxPollsManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxPollsManageTools' : oOptions.sObjName;
 }
 
-BxPollsManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxPollsManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxPollsManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxPollsManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxPollsManageTools.prototype.constructor = BxPollsManageTools;
 
 /** @} */

modules/boonex/posts/classes/BxPostsConfig.php

@@ -42,6 +42,7 @@ class BxPostsConfig extends BxBaseModTextConfig
             'FIELD_CATEGORY' => 'cat',
             'FIELD_MULTICAT' => 'multicat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_COVER' => 'covers',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_VIDEO' => 'videos',
@@ -198,6 +199,7 @@ class BxPostsConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_posts_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_posts_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_posts_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_posts_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_posts_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_posts_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_posts_txt_all_entries_by',

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

@@ -265,6 +265,7 @@
     <string name="_bx_posts_menu_item_title_manage_all"><![CDATA[All Posts]]></string>
 
     <string name="_bx_posts_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_posts_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_posts_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_posts_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_posts_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/posts/install/sql/install.sql

@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `bx_posts_posts` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `allow_comments` tinyint(4) NOT NULL DEFAULT '1',
   `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
@@ -445,6 +446,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_posts', 'bx_posts_entry_view', 'bx_posts', 1, '_bx_posts_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_posts', 'bx_posts', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_posts', 'bx_posts', 'allow_view_to', '', '', 0, 'custom', '_bx_posts_form_entry_input_sys_allow_view_to', '_bx_posts_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_posts', 'bx_posts', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_posts_form_entry_input_sys_delete_confirm', '_bx_posts_form_entry_input_delete_confirm', '_bx_posts_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_posts_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_posts', 'bx_posts', 'do_publish', '_bx_posts_form_entry_input_do_publish', '', 0, 'submit', '_bx_posts_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -483,10 +485,11 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_posts_entry_add', 'polls', 2147483647, 1, 10),
 ('bx_posts_entry_add', 'covers', 2147483647, 1, 11),
 ('bx_posts_entry_add', 'allow_view_to', 2147483647, 1, 12),
-('bx_posts_entry_add', 'location', 2147483647, 1, 13),
-('bx_posts_entry_add', 'published', 192, 1, 14),
-('bx_posts_entry_add', 'allow_comments', 192, 1, 15),
-('bx_posts_entry_add', 'do_publish', 2147483647, 1, 16),
+('bx_posts_entry_add', 'cf', 2147483647, 1, 13),
+('bx_posts_entry_add', 'location', 2147483647, 1, 14),
+('bx_posts_entry_add', 'published', 192, 1, 15),
+('bx_posts_entry_add', 'allow_comments', 192, 1, 16),
+('bx_posts_entry_add', 'do_publish', 2147483647, 1, 17),
 
 ('bx_posts_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_posts_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -504,10 +507,11 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_posts_entry_edit', 'polls', 2147483647, 1, 11),
 ('bx_posts_entry_edit', 'covers', 2147483647, 1, 12),
 ('bx_posts_entry_edit', 'allow_view_to', 2147483647, 1, 13),
-('bx_posts_entry_edit', 'location', 2147483647, 1, 14),
-('bx_posts_entry_edit', 'allow_comments', 192, 1, 15),
-('bx_posts_entry_edit', 'published', 192, 1, 16),
-('bx_posts_entry_edit', 'do_submit', 2147483647, 1, 17),
+('bx_posts_entry_edit', 'cf', 2147483647, 1, 14),
+('bx_posts_entry_edit', 'location', 2147483647, 1, 15),
+('bx_posts_entry_edit', 'allow_comments', 192, 1, 16),
+('bx_posts_entry_edit', 'published', 192, 1, 17),
+('bx_posts_entry_edit', 'do_submit', 2147483647, 1, 18),
 
 ('bx_posts_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_posts_entry_view', 'added', 2147483647, 1, 2),

modules/boonex/posts/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxPostsManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxPostsManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxPostsManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxPostsManageTools' : oOptions.sObjName;
 }
 
-BxPostsManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxPostsManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxPostsManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxPostsManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxPostsManageTools.prototype.constructor = BxPostsManageTools;
 
 /** @} */

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

@@ -360,6 +360,7 @@
     <string name="_bx_ads_grid_action_err_edit_category"><![CDATA[Невозможно отредактировать категорию.]]></string>
 
     <string name="_bx_ads_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_ads_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_ads_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_ads_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_ads_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -230,24 +230,25 @@
     <string name="_bx_albums_menu_item_title_view_entries_author"><![CDATA[Альбомы]]></string>
     <string name="_bx_albums_menu_item_title_system_view_entries_in_context"><![CDATA[Альбомы]]></string>
     <string name="_bx_albums_menu_item_title_view_entries_in_context"><![CDATA[Альбомы]]></string>
-  <string name="_bx_albums_menu_title_entries_my"><![CDATA[Мои Альбомы - Меню действий]]></string>
+    <string name="_bx_albums_menu_title_entries_my"><![CDATA[Мои Альбомы - Меню действий]]></string>
     <string name="_bx_albums_menu_set_title_entries_my"><![CDATA[Мои альбомы - Меню]]></string>
-	<string name="_bx_albums_menu_item_title_system_manage_my_albums"><![CDATA[Мои альбомы]]></string>
+    <string name="_bx_albums_menu_item_title_system_manage_my_albums"><![CDATA[Мои альбомы]]></string>
     <string name="_bx_albums_menu_item_title_manage_my_albums"><![CDATA[Альбомы]]></string>
     <string name="_bx_albums_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_albums_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
-	<string name="_bx_albums_menu_item_title_system_admt_albums"><![CDATA[Альбомы]]></string>
-	<string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Альбомы]]></string>
-	<string name="_bx_albums_menu_item_title_manage_my"><![CDATA[Мои альбомы]]></string>
-	<string name="_bx_albums_menu_item_title_manage_all"><![CDATA[Все альбомы]]></string>
-        <string name="_bx_albums_menu_item_title_system_sm_items"><![CDATA[Элементы]]></string>
-        <string name="_bx_albums_menu_item_title_sm_items"><![CDATA[элементов: {0}]]></string>
+    <string name="_bx_albums_menu_item_title_system_admt_albums"><![CDATA[Альбомы]]></string>
+    <string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Альбомы]]></string>
+    <string name="_bx_albums_menu_item_title_manage_my"><![CDATA[Мои альбомы]]></string>
+    <string name="_bx_albums_menu_item_title_manage_all"><![CDATA[Все альбомы]]></string>
+    <string name="_bx_albums_menu_item_title_system_sm_items"><![CDATA[Элементы]]></string>
+    <string name="_bx_albums_menu_item_title_sm_items"><![CDATA[элементов: {0}]]></string>
 
-	<string name="_bx_albums_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-	<string name="_bx_albums_grid_filter_item_title_adm_active"><![CDATA[Активный]]></string>
-	<string name="_bx_albums_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанный]]></string>
-        <string name="_bx_albums_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
-	<string name="_bx_albums_grid_column_title_adm_active"><![CDATA[Активный]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_active"><![CDATA[Активный]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанный]]></string>
+    <string name="_bx_albums_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
+    <string name="_bx_albums_grid_column_title_adm_active"><![CDATA[Активный]]></string>
     <string name="_bx_albums_grid_column_title_adm_title"><![CDATA[Заголовок]]></string>
     <string name="_bx_albums_grid_column_title_adm_added"><![CDATA[Добавлен]]></string>
     <string name="_bx_albums_grid_column_title_adm_author"><![CDATA[Автор]]></string>

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

@@ -209,6 +209,7 @@
   <string name="_bx_classes_menu_item_title_sm_date_end"><![CDATA[Дата отончания]]></string>
 
   <string name="_bx_classes_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+  <string name="_bx_classes_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
   <string name="_bx_classes_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
   <string name="_bx_classes_grid_filter_item_title_adm_hidden"><![CDATA[Скрытые]]></string>
   <string name="_bx_classes_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -189,24 +189,25 @@
     <string name="_bx_files_menu_item_title_view_entries_in_context"><![CDATA[Файлы]]></string>
     <string name="_bx_files_menu_title_entries_my"><![CDATA[Меню для своих файлов]]></string>
     <string name="_bx_files_menu_set_title_entries_my"><![CDATA[Меню для своих файлов]]></string>
-	<string name="_bx_files_menu_item_title_system_manage_my_files"><![CDATA[Мои файлы]]></string>
+    <string name="_bx_files_menu_item_title_system_manage_my_files"><![CDATA[Мои файлы]]></string>
     <string name="_bx_files_menu_item_title_manage_my_files"><![CDATA[Файлов]]></string>
     <string name="_bx_files_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_files_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_files_menu_item_title_system_manage_account"><![CDATA[Управление учетной записью]]></string>
     <string name="_bx_files_menu_item_title_manage_account"><![CDATA[Управление учетной записью]]></string>
-	<string name="_bx_files_menu_item_title_system_admt_files"><![CDATA[Файлы]]></string>
-	<string name="_bx_files_menu_item_title_admt_files"><![CDATA[Файлы]]></string>
-	<string name="_bx_files_menu_item_title_manage_my"><![CDATA[Мой файлы]]></string>
-	<string name="_bx_files_menu_item_title_manage_all"><![CDATA[Все файлы]]></string>
-	<string name="_bx_files_menu_item_title_system_download_file"><![CDATA[Скачать]]></string>
-	<string name="_bx_files_menu_item_title_download_file"><![CDATA[Скачать]]></string>
+    <string name="_bx_files_menu_item_title_system_admt_files"><![CDATA[Файлы]]></string>
+    <string name="_bx_files_menu_item_title_admt_files"><![CDATA[Файлы]]></string>
+    <string name="_bx_files_menu_item_title_manage_my"><![CDATA[Мой файлы]]></string>
+    <string name="_bx_files_menu_item_title_manage_all"><![CDATA[Все файлы]]></string>
+    <string name="_bx_files_menu_item_title_system_download_file"><![CDATA[Скачать]]></string>
+    <string name="_bx_files_menu_item_title_download_file"><![CDATA[Скачать]]></string>
 
-	<string name="_bx_files_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-	<string name="_bx_files_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
-	<string name="_bx_files_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
-        <string name="_bx_posts_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
-	<string name="_bx_files_grid_column_title_adm_active"><![CDATA[Активный]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_files_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
+    <string name="_bx_posts_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
+    <string name="_bx_files_grid_column_title_adm_active"><![CDATA[Активный]]></string>
     <string name="_bx_files_grid_column_title_adm_title"><![CDATA[Заголовок]]></string>
     <string name="_bx_files_grid_column_title_adm_added"><![CDATA[Добавлено]]></string>
     <string name="_bx_files_grid_column_title_adm_author"><![CDATA[Автор]]></string>

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

@@ -305,6 +305,7 @@
     <string name="_bx_forum_menu_item_title_sm_reply_text"><![CDATA[Текст ответа]]></string>
 
     <string name="_bx_forum_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_forum_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_forum_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_forum_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_forum_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -186,24 +186,25 @@
     <string name="_bx_glossary_menu_item_title_view_entries_author"><![CDATA[Глоссарий]]></string>
     <string name="_bx_glossary_menu_item_title_system_view_entries_in_context"><![CDATA[Глоссарий]]></string>
     <string name="_bx_glossary_menu_item_title_view_entries_in_context"><![CDATA[Глоссарий]]></string>
-  <string name="_bx_glossary_menu_title_entries_my"><![CDATA[Мои Глоссарий - Меню действий]]></string>
+    <string name="_bx_glossary_menu_title_entries_my"><![CDATA[Мои Глоссарий - Меню действий]]></string>
     <string name="_bx_glossary_menu_set_title_entries_my"><![CDATA[Мои Глоссарий - Меню]]></string>
-	<string name="_bx_glossary_menu_item_title_system_manage_my_posts"><![CDATA[Мои Глоссарий]]></string>
+    <string name="_bx_glossary_menu_item_title_system_manage_my_posts"><![CDATA[Мои Глоссарий]]></string>
     <string name="_bx_glossary_menu_item_title_manage_my_posts"><![CDATA[Термины]]></string>
     <string name="_bx_glossary_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_glossary_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_glossary_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_glossary_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
-	<string name="_bx_glossary_menu_item_title_system_admt_posts"><![CDATA[Глоссарий]]></string>
-	<string name="_bx_glossary_menu_item_title_admt_posts"><![CDATA[Глоссарий]]></string>
-	<string name="_bx_glossary_menu_item_title_manage_my"><![CDATA[Мои Глоссарий]]></string>
-	<string name="_bx_glossary_menu_item_title_manage_all"><![CDATA[Все Глоссарий]]></string>
+    <string name="_bx_glossary_menu_item_title_system_admt_posts"><![CDATA[Глоссарий]]></string>
+    <string name="_bx_glossary_menu_item_title_admt_posts"><![CDATA[Глоссарий]]></string>
+    <string name="_bx_glossary_menu_item_title_manage_my"><![CDATA[Мои Глоссарий]]></string>
+    <string name="_bx_glossary_menu_item_title_manage_all"><![CDATA[Все Глоссарий]]></string>
 
-	<string name="_bx_glossary_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-	<string name="_bx_glossary_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
-	<string name="_bx_glossary_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
-	<string name="_bx_glossary_grid_filter_item_title_adm_pending"><![CDATA[Ожидающие]]></string>
-	<string name="_bx_glossary_grid_column_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
+    <string name="_bx_glossary_grid_filter_item_title_adm_pending"><![CDATA[Ожидающие]]></string>
+    <string name="_bx_glossary_grid_column_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_glossary_grid_column_title_adm_title"><![CDATA[Заголовок]]></string>
     <string name="_bx_glossary_grid_column_title_adm_added"><![CDATA[Добавленные]]></string>
     <string name="_bx_glossary_grid_column_title_adm_author"><![CDATA[Автор]]></string>

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

@@ -205,14 +205,14 @@
     <string name="_bx_market_page_block_title_sys_entries_in_context"><![CDATA[Продукты в контексте]]></string>
     <string name="_bx_market_page_block_title_entries_actions"><![CDATA[Продукты - Действия]]></string>
     <string name="_bx_market_page_block_title_browse_cmts"><![CDATA[Продукты - Обзоры]]></string>
-	<string name="_bx_market_page_title_sys_manage"><![CDATA[Управление собственными продуктами]]></string>
-	<string name="_bx_market_page_title_sys_manage_administration"><![CDATA[Управление всеми продуктами]]></string>
-	<string name="_bx_market_page_title_manage"><![CDATA[Управление]]></string>
-	<string name="_bx_market_page_block_title_system_manage"><![CDATA[Управление собственными продуктами]]></string>
-	<string name="_bx_market_page_block_title_system_manage_administration"><![CDATA[Управление всеми продуктами]]></string>
-	<string name="_bx_market_page_block_title_manage"><![CDATA[Управление]]></string>    
-	<string name="_bx_market_page_block_title_popular_keywords"><![CDATA[Популярные хэштеги]]></string>
-	<string name="_bx_market_page_block_title_cats"><![CDATA[Категории продуктов]]></string>
+    <string name="_bx_market_page_title_sys_manage"><![CDATA[Управление собственными продуктами]]></string>
+    <string name="_bx_market_page_title_sys_manage_administration"><![CDATA[Управление всеми продуктами]]></string>
+    <string name="_bx_market_page_title_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_market_page_block_title_system_manage"><![CDATA[Управление собственными продуктами]]></string>
+    <string name="_bx_market_page_block_title_system_manage_administration"><![CDATA[Управление всеми продуктами]]></string>
+    <string name="_bx_market_page_block_title_manage"><![CDATA[Управление]]></string>    
+    <string name="_bx_market_page_block_title_popular_keywords"><![CDATA[Популярные хэштеги]]></string>
+    <string name="_bx_market_page_block_title_cats"><![CDATA[Категории продуктов]]></string>
     <string name="_bx_market_page_title_sys_entries_categories"><![CDATA[Категории продуктов]]></string>
     <string name="_bx_market_page_title_entries_categories"><![CDATA[Категории продуктов]]></string>
     <string name="_bx_market_page_block_title_categories_entries"><![CDATA[Продукты]]></string>
@@ -332,6 +332,7 @@
 
 
     <string name="_bx_market_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_market_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_market_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_market_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_market_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -210,6 +210,7 @@
     <string name="_bx_photos_menu_item_title_manage_all"><![CDATA[Все фото]]></string>
 
     <string name="_bx_photos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_photos_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_photos_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_photos_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_photos_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -185,9 +185,9 @@
     <string name="_bx_polls_menu_item_title_view_entries_author"><![CDATA[Голосования]]></string>
     <string name="_bx_polls_menu_item_title_system_view_entries_in_context"><![CDATA[Голосования]]></string>
     <string name="_bx_polls_menu_item_title_view_entries_in_context"><![CDATA[Голосования]]></string>
-  <string name="_bx_polls_menu_title_entries_my"><![CDATA[Мои Голосования - Меню действий]]></string>
+    <string name="_bx_polls_menu_title_entries_my"><![CDATA[Мои Голосования - Меню действий]]></string>
     <string name="_bx_polls_menu_set_title_entries_my"><![CDATA[Мои Голосования - Меню]]></string>
-	<string name="_bx_polls_menu_item_title_system_manage_my_polls"><![CDATA[Мои голосования]]></string>
+    <string name="_bx_polls_menu_item_title_system_manage_my_polls"><![CDATA[Мои голосования]]></string>
     <string name="_bx_polls_menu_item_title_manage_my_polls"><![CDATA[Голосования]]></string>
     <string name="_bx_polls_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_polls_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
@@ -201,6 +201,7 @@
     <string name="_bx_polls_menu_item_view_results"><![CDATA[Показать результаты]]></string>
 
     <string name="_bx_polls_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_polls_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_polls_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_polls_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_polls_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -256,6 +256,7 @@
     <string name="_bx_posts_menu_item_title_manage_all"><![CDATA[Все публикации]]></string>
 
     <string name="_bx_posts_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_posts_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_posts_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_posts_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_posts_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -185,9 +185,9 @@
     <string name="_bx_shopify_menu_item_title_view_entries_author"><![CDATA[Товары]]></string>
     <string name="_bx_shopify_menu_item_title_system_view_entries_in_context"><![CDATA[Товары]]></string>
     <string name="_bx_shopify_menu_item_title_view_entries_in_context"><![CDATA[Товары]]></string>
-  <string name="_bx_shopify_menu_title_entries_my"><![CDATA[Мои Товары - Меню действий]]></string>
+    <string name="_bx_shopify_menu_title_entries_my"><![CDATA[Мои Товары - Меню действий]]></string>
     <string name="_bx_shopify_menu_set_title_entries_my"><![CDATA[Мои Товары - Меню]]></string>
-	<string name="_bx_shopify_menu_item_title_system_manage_my_entries"><![CDATA[Мои товары]]></string>
+    <string name="_bx_shopify_menu_item_title_system_manage_my_entries"><![CDATA[Мои товары]]></string>
     <string name="_bx_shopify_menu_item_title_manage_my_entries"><![CDATA[Товаров]]></string>
     <string name="_bx_shopify_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_shopify_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
@@ -200,6 +200,7 @@
     <string name="_bx_shopify_menu_item_title_buy_for"><![CDATA[Купить за {price}]]></string>
 
     <string name="_bx_shopify_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_shopify_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_shopify_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_shopify_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_shopify_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -215,6 +215,7 @@
     <string name="_bx_snipcart_menu_item_title_buy_for"><![CDATA[Купить за {1}{0}]]></string>
 
     <string name="_bx_snipcart_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_snipcart_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_snipcart_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_snipcart_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_snipcart_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -237,26 +237,27 @@
     <string name="_bx_tasks_menu_item_title_view_entries_in_context"><![CDATA[Задания]]></string>
     <string name="_bx_tasks_menu_title_entries_my"><![CDATA[Мои Задания  - Меню действий]]></string>
     <string name="_bx_tasks_menu_set_title_entries_my"><![CDATA[Мои Задания Меню]]></string>
-	<string name="_bx_tasks_menu_item_title_system_manage_my_tasks"><![CDATA[Мои Задания]]></string>
+    <string name="_bx_tasks_menu_item_title_system_manage_my_tasks"><![CDATA[Мои Задания]]></string>
     <string name="_bx_tasks_menu_item_title_manage_my_tasks"><![CDATA[Задания]]></string>
     <string name="_bx_tasks_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_tasks_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_tasks_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_tasks_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
-	<string name="_bx_tasks_menu_item_title_system_admt_tasks"><![CDATA[Задания]]></string>
-	<string name="_bx_tasks_menu_item_title_admt_tasks"><![CDATA[Задания]]></string>
-	<string name="_bx_tasks_menu_item_title_manage_my"><![CDATA[Мои Задания]]></string>
-	<string name="_bx_tasks_menu_item_title_manage_all"><![CDATA[Все Задания]]></string>
-	
-	<string name="_bx_tasks_menu_item_title_system_set_completed"><![CDATA[Завершить]]></string>
-	<string name="_bx_tasks_menu_item_title_set_completed"><![CDATA[Завершить]]></string>
-	<string name="_bx_tasks_menu_item_title_system_set_uncompleted"><![CDATA[Открыть заново]]></string>
-	<string name="_bx_tasks_menu_item_title_set_uncompleted"><![CDATA[Открыть заново]]></string>
+    <string name="_bx_tasks_menu_item_title_system_admt_tasks"><![CDATA[Задания]]></string>
+    <string name="_bx_tasks_menu_item_title_admt_tasks"><![CDATA[Задания]]></string>
+    <string name="_bx_tasks_menu_item_title_manage_my"><![CDATA[Мои Задания]]></string>
+    <string name="_bx_tasks_menu_item_title_manage_all"><![CDATA[Все Задания]]></string>
+
+    <string name="_bx_tasks_menu_item_title_system_set_completed"><![CDATA[Завершить]]></string>
+    <string name="_bx_tasks_menu_item_title_set_completed"><![CDATA[Завершить]]></string>
+    <string name="_bx_tasks_menu_item_title_system_set_uncompleted"><![CDATA[Открыть заново]]></string>
+    <string name="_bx_tasks_menu_item_title_set_uncompleted"><![CDATA[Открыть заново]]></string>
 
-	<string name="_bx_tasks_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
-	<string name="_bx_tasks_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
-	<string name="_bx_tasks_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
-	<string name="_bx_tasks_grid_column_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
+    <string name="_bx_tasks_grid_column_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_tasks_grid_column_title_adm_title"><![CDATA[Заголовок]]></string>
     <string name="_bx_tasks_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_tasks_grid_column_title_adm_added"><![CDATA[Добавленные]]></string>

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

@@ -211,6 +211,7 @@
     <string name="_bx_videos_menu_item_title_manage_all"><![CDATA[Все видео]]></string>
 
     <string name="_bx_videos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_videos_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_videos_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_videos_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_videos_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>

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

@@ -1518,6 +1518,7 @@
     <string name="_adm_stg_cpt_option_sys_cache_memcache_host"><![CDATA[Memcached - адрес сервера]]></string>
     <string name="_adm_stg_cpt_option_sys_cache_memcache_port"><![CDATA[Memcached - порт сервера]]></string>
     <string name="_adm_stg_cpt_option_sys_captcha_default"><![CDATA[CAPTCHA по умолчанию]]></string>
+    <string name="_adm_stg_cpt_option_sys_cf_enable"><![CDATA[Включить контентные фильтры]]></string>
     <string name="_adm_stg_cpt_option_sys_cf_prohibited"><![CDATA[Запрещенный контент]]></string>
     <string name="_adm_stg_cpt_option_sys_email_attachable_email_templates"><![CDATA[Список присоединяемых email темплейтов]]></string>
     <string name="_adm_stg_cpt_option_sys_db_cache_enable"><![CDATA[Задействовать кэш БД]]></string>

modules/boonex/shopify/classes/BxShopifyConfig.php

@@ -44,6 +44,7 @@ class BxShopifyConfig extends BxBaseModTextConfig
             'FIELD_TEXT_ID' => 'shopify-entry-text',
             'FIELD_CATEGORY' => 'cat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_PHOTO' => '',
             'FIELD_THUMB' => '',
             'FIELD_VIEWS' => 'views',
@@ -147,6 +148,7 @@ class BxShopifyConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_shopify_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_shopify_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_shopify_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_shopify_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_shopify_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_shopify_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_shopify_txt_all_entries_by',

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

@@ -199,6 +199,7 @@
     <string name="_bx_shopify_menu_item_title_buy_for"><![CDATA[Buy for {price}]]></string>
 
     <string name="_bx_shopify_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_shopify_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_shopify_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_shopify_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_shopify_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/shopify/install/sql/install.sql

@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `bx_shopify_entries` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -219,6 +220,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_shopify_settings', 'bx_shopify_settings_edit', 'bx_shopify', 0, '_bx_shopify_form_settings_display_edit');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_shopify', 'bx_shopify', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_shopify', 'bx_shopify', 'allow_view_to', '', '', 0, 'custom', '_bx_shopify_form_entry_input_sys_allow_view_to', '_bx_shopify_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_shopify', 'bx_shopify', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_shopify_form_entry_input_sys_delete_confirm', '_bx_shopify_form_entry_input_delete_confirm', '_bx_shopify_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_shopify_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_shopify', 'bx_shopify', 'do_publish', '_bx_shopify_form_entry_input_do_publish', '', 0, 'submit', '_bx_shopify_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -239,8 +241,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_shopify_entry_add', 'title', 2147483647, 1, 2),
 ('bx_shopify_entry_add', 'cat', 2147483647, 1, 3),
 ('bx_shopify_entry_add', 'allow_view_to', 2147483647, 1, 4),
-('bx_shopify_entry_add', 'location', 2147483647, 1, 5),
-('bx_shopify_entry_add', 'do_publish', 2147483647, 1, 6),
+('bx_shopify_entry_add', 'cf', 2147483647, 1, 5),
+('bx_shopify_entry_add', 'location', 2147483647, 1, 6),
+('bx_shopify_entry_add', 'do_publish', 2147483647, 1, 7),
 
 ('bx_shopify_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_shopify_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -249,8 +252,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_shopify_entry_edit', 'title', 2147483647, 1, 2),
 ('bx_shopify_entry_edit', 'cat', 2147483647, 1, 3),
 ('bx_shopify_entry_edit', 'allow_view_to', 2147483647, 1, 4),
-('bx_shopify_entry_edit', 'location', 2147483647, 1, 5),
-('bx_shopify_entry_edit', 'do_submit', 2147483647, 1, 6),
+('bx_shopify_entry_edit', 'cf', 2147483647, 1, 5),
+('bx_shopify_entry_edit', 'location', 2147483647, 1, 6),
+('bx_shopify_entry_edit', 'do_submit', 2147483647, 1, 7),
 
 ('bx_shopify_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_shopify_entry_view', 'added', 2147483647, 1, 2),

modules/boonex/shopify/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxShopifyManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxShopifyManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxShopifyManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxShopifyManageTools' : oOptions.sObjName;
 }
 
-BxShopifyManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxShopifyManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxShopifyManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxShopifyManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxShopifyManageTools.prototype.constructor = BxShopifyManageTools;
 
 /** @} */

modules/boonex/snipcart/classes/BxSnipcartConfig.php

@@ -43,6 +43,7 @@ class BxSnipcartConfig extends BxBaseModTextConfig
             'FIELD_PRICE' => 'price',
             'FIELD_WEIGHT' => 'weight',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
             'FIELD_VIEWS' => 'views',
@@ -148,6 +149,7 @@ class BxSnipcartConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_snipcart_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_snipcart_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_snipcart_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_snipcart_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_snipcart_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_snipcart_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_snipcart_txt_all_entries_by',

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

@@ -215,6 +215,7 @@
     <string name="_bx_snipcart_menu_item_title_buy_for"><![CDATA[Buy for {1}{0}]]></string>
 
     <string name="_bx_snipcart_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_snipcart_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_snipcart_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_snipcart_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_snipcart_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/snipcart/install/sql/install.sql

@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `bx_snipcart_entries` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -272,6 +273,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_snipcart_settings', 'bx_snipcart_settings_edit', 'bx_snipcart', 0, '_bx_snipcart_form_settings_display_edit');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_snipcart', 'bx_snipcart', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_snipcart', 'bx_snipcart', 'allow_view_to', '', '', 0, 'custom', '_bx_snipcart_form_entry_input_sys_allow_view_to', '_bx_snipcart_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_snipcart', 'bx_snipcart', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_snipcart_form_entry_input_sys_delete_confirm', '_bx_snipcart_form_entry_input_delete_confirm', '_bx_snipcart_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_snipcart_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_snipcart', 'bx_snipcart', 'do_publish', '_bx_snipcart_form_entry_input_do_publish', '', 0, 'submit', '_bx_snipcart_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -300,8 +302,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_snipcart_entry_add', 'weight', 2147483647, 1, 5),
 ('bx_snipcart_entry_add', 'pictures', 2147483647, 1, 6),
 ('bx_snipcart_entry_add', 'allow_view_to', 2147483647, 1, 7),
-('bx_snipcart_entry_add', 'location', 2147483647, 1, 8),
-('bx_snipcart_entry_add', 'do_publish', 2147483647, 1, 9),
+('bx_snipcart_entry_add', 'cf', 2147483647, 1, 8),
+('bx_snipcart_entry_add', 'location', 2147483647, 1, 9),
+('bx_snipcart_entry_add', 'do_publish', 2147483647, 1, 10),
 
 ('bx_snipcart_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_snipcart_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -313,8 +316,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_snipcart_entry_edit', 'weight', 2147483647, 1, 5),
 ('bx_snipcart_entry_edit', 'pictures', 2147483647, 1, 6),
 ('bx_snipcart_entry_edit', 'allow_view_to', 2147483647, 1, 7),
-('bx_snipcart_entry_edit', 'location', 2147483647, 1, 8),
-('bx_snipcart_entry_edit', 'do_submit', 2147483647, 1, 9),
+('bx_snipcart_entry_edit', 'cf', 2147483647, 1, 8),
+('bx_snipcart_entry_edit', 'location', 2147483647, 1, 9),
+('bx_snipcart_entry_edit', 'do_submit', 2147483647, 1, 10),
 
 ('bx_snipcart_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_snipcart_entry_view', 'weight', 2147483647, 1, 2),

modules/boonex/snipcart/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxSnipcartManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxSnipcartManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxSnipcartManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxSnipcartManageTools' : oOptions.sObjName;
 }
 
-BxSnipcartManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxSnipcartManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxSnipcartManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxSnipcartManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxSnipcartManageTools.prototype.constructor = BxSnipcartManageTools;
 
 /** @} */

modules/boonex/stream/classes/BxStrmConfig.php

@@ -43,6 +43,7 @@ class BxStrmConfig extends BxBaseModTextConfig
             'FIELD_CATEGORY' => 'cat',
             'FIELD_MULTICAT' => 'multicat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_COVER' => 'covers',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_VIDEO' => 'videos',
@@ -194,6 +195,7 @@ class BxStrmConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_stream_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_stream_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_stream_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_stream_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_stream_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_stream_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_stream_txt_all_entries_by',

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

@@ -184,6 +184,7 @@
     <string name="_bx_stream_menu_item_title_manage_my_stream"><![CDATA[Streams]]></string>
 
     <string name="_bx_stream_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_stream_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_stream_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_stream_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_stream_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/stream/install/sql/install.sql

@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `bx_stream_streams` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `allow_comments` tinyint(4) NOT NULL DEFAULT '1',
   `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
@@ -278,6 +279,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_stream', 'bx_stream_entry_view', 'bx_stream', 1, '_bx_stream_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_stream', 'bx_stream', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_stream', 'bx_stream', 'allow_view_to', '', '', 0, 'custom', '_bx_stream_form_entry_input_sys_allow_view_to', '_bx_stream_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_stream', 'bx_stream', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_stream_form_entry_input_sys_delete_confirm', '_bx_stream_form_entry_input_delete_confirm', '_bx_stream_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_stream_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_stream', 'bx_stream', 'do_publish', '_bx_stream_form_entry_input_do_publish', '', 0, 'submit', '_bx_stream_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -303,9 +305,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_stream_entry_add', 'text', 2147483647, 1, 4),
 ('bx_stream_entry_add', 'covers', 2147483647, 1, 5),
 ('bx_stream_entry_add', 'allow_view_to', 2147483647, 1, 6),
-('bx_stream_entry_add', 'location', 2147483647, 1, 7),
-('bx_stream_entry_add', 'allow_comments', 192, 1, 8),
-('bx_stream_entry_add', 'do_publish', 2147483647, 1, 9),
+('bx_stream_entry_add', 'cf', 2147483647, 1, 7),
+('bx_stream_entry_add', 'location', 2147483647, 1, 8),
+('bx_stream_entry_add', 'allow_comments', 192, 1, 9),
+('bx_stream_entry_add', 'do_publish', 2147483647, 1, 10),
 
 ('bx_stream_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_stream_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -317,9 +320,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_stream_entry_edit', 'text', 2147483647, 1, 5),
 ('bx_stream_entry_edit', 'covers', 2147483647, 1, 6),
 ('bx_stream_entry_edit', 'allow_view_to', 2147483647, 1, 7),
-('bx_stream_entry_edit', 'location', 2147483647, 1, 8),
-('bx_stream_entry_edit', 'allow_comments', 192, 1, 9),
-('bx_stream_entry_edit', 'do_submit', 2147483647, 1, 10),
+('bx_stream_entry_edit', 'cf', 2147483647, 1, 8),
+('bx_stream_entry_edit', 'location', 2147483647, 1, 9),
+('bx_stream_entry_edit', 'allow_comments', 192, 1, 10),
+('bx_stream_entry_edit', 'do_submit', 2147483647, 1, 11),
 
 ('bx_stream_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_stream_entry_view', 'added', 2147483647, 1, 2),

modules/boonex/stream/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxStrmManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxStrmManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxStrmManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxStrmManageTools' : oOptions.sObjName;
 }
 
-BxStrmManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxStrmManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxStrmManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxStrmManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxStrmManageTools.prototype.constructor = BxStrmManageTools;
 
 /** @} */

modules/boonex/tasks/classes/BxTasksConfig.php

@@ -45,6 +45,7 @@ class BxTasksConfig extends BxBaseModTextConfig
             'FIELD_CATEGORY' => 'cat',
             'FIELD_MULTICAT' => 'multicat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_COVER' => 'covers',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_VIDEO' => 'videos',
@@ -199,6 +200,7 @@ class BxTasksConfig extends BxBaseModTextConfig
                 'filter_item_active' => '_bx_tasks_grid_filter_item_title_adm_active',
             	'filter_item_hidden' => '_bx_tasks_grid_filter_item_title_adm_hidden',
             	'filter_item_select_one_filter1' => '_bx_tasks_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_tasks_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_tasks_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_tasks_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_tasks_txt_all_entries_by',

modules/boonex/tasks/classes/BxTasksDb.php

@@ -45,15 +45,25 @@ class BxTasksDb extends BxBaseModTextDb
         $this->query($sQuery);
     }
 	
-	public function getTasks ($iContextId = 0, $iListId = 0)
+    public function getTasks ($iContextId = 0, $iListId = 0)
     {
         $CNF = &$this->_oConfig->CNF;
 
-        $sQuery = $this->prepare ("SELECT * FROM `" . $CNF['TABLE_ENTRIES'] . "` WHERE  `" . $CNF['FIELD_ALLOW_VIEW_TO'] . "` = ? AND `" . $CNF['FIELD_TASKLIST'] . "` = ?", $iContextId, $iListId);
-        return $this->getAll($sQuery);
+        $aBindings = [
+            $CNF['FIELD_ALLOW_VIEW_TO'] => $iContextId,
+            $CNF['FIELD_TASKLIST'] => $iListId
+        ];
+
+        $sWhereClause = " AND `" . $CNF['FIELD_ALLOW_VIEW_TO'] . "` = :" . $CNF['FIELD_ALLOW_VIEW_TO'] . " AND `" . $CNF['FIELD_TASKLIST'] . "` = :" . $CNF['FIELD_TASKLIST'];
+
+        $oCf = BxDolContentFilter::getInstance();
+        if($oCf->isEnabled())
+            $sWhereClause .= $oCf->getSQLParts($CNF['TABLE_ENTRIES'], $CNF['FIELD_CF']);
+
+        return $this->getAll("SELECT * FROM `" . $CNF['TABLE_ENTRIES'] . "` WHERE 1" . $sWhereClause, $aBindings);
     }
 	
-	public function getEntriesByDate($sDateFrom, $sDateTo, $aSQLPart = array())
+    public function getEntriesByDate($sDateFrom, $sDateTo, $aSQLPart = array())
     {
         // validate input data
         if (false === ($oDateFrom = date_create($sDateFrom, new DateTimeZone('UTC'))))

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

@@ -239,26 +239,27 @@
     <string name="_bx_tasks_menu_item_title_view_entries_in_context"><![CDATA[Tasks]]></string>
     <string name="_bx_tasks_menu_title_entries_my"><![CDATA[My Tasks Action Menu]]></string>
     <string name="_bx_tasks_menu_set_title_entries_my"><![CDATA[My Tasks Menu]]></string>
-	<string name="_bx_tasks_menu_item_title_system_manage_my_tasks"><![CDATA[My tasks]]></string>
+    <string name="_bx_tasks_menu_item_title_system_manage_my_tasks"><![CDATA[My tasks]]></string>
     <string name="_bx_tasks_menu_item_title_manage_my_tasks"><![CDATA[Tasks]]></string>
     <string name="_bx_tasks_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_tasks_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_tasks_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_tasks_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
-	<string name="_bx_tasks_menu_item_title_system_admt_tasks"><![CDATA[Tasks]]></string>
-	<string name="_bx_tasks_menu_item_title_admt_tasks"><![CDATA[Tasks]]></string>
-	<string name="_bx_tasks_menu_item_title_manage_my"><![CDATA[My Tasks]]></string>
-	<string name="_bx_tasks_menu_item_title_manage_all"><![CDATA[All Tasks]]></string>
-	
-	<string name="_bx_tasks_menu_item_title_system_set_completed"><![CDATA[Complete]]></string>
-	<string name="_bx_tasks_menu_item_title_set_completed"><![CDATA[Complete]]></string>
-	<string name="_bx_tasks_menu_item_title_system_set_uncompleted"><![CDATA[Re-open]]></string>
-	<string name="_bx_tasks_menu_item_title_set_uncompleted"><![CDATA[Re-open]]></string>
+    <string name="_bx_tasks_menu_item_title_system_admt_tasks"><![CDATA[Tasks]]></string>
+    <string name="_bx_tasks_menu_item_title_admt_tasks"><![CDATA[Tasks]]></string>
+    <string name="_bx_tasks_menu_item_title_manage_my"><![CDATA[My Tasks]]></string>
+    <string name="_bx_tasks_menu_item_title_manage_all"><![CDATA[All Tasks]]></string>
+
+    <string name="_bx_tasks_menu_item_title_system_set_completed"><![CDATA[Complete]]></string>
+    <string name="_bx_tasks_menu_item_title_set_completed"><![CDATA[Complete]]></string>
+    <string name="_bx_tasks_menu_item_title_system_set_uncompleted"><![CDATA[Re-open]]></string>
+    <string name="_bx_tasks_menu_item_title_set_uncompleted"><![CDATA[Re-open]]></string>
 
-	<string name="_bx_tasks_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
-	<string name="_bx_tasks_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
-	<string name="_bx_tasks_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
-	<string name="_bx_tasks_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_tasks_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
+    <string name="_bx_tasks_grid_column_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_tasks_grid_column_title_adm_title"><![CDATA[Title]]></string>
     <string name="_bx_tasks_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_tasks_grid_column_title_adm_added"><![CDATA[Added]]></string>

modules/boonex/tasks/install/sql/install.sql

@@ -27,6 +27,7 @@ CREATE TABLE IF NOT EXISTS `bx_tasks_tasks` (
   `tasks_list` int(11) NOT NULL,	
   `completed` tinyint(4) NOT NULL DEFAULT '0', 
   `expired` tinyint(4) NOT NULL DEFAULT '0', 
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `allow_comments` tinyint(4) NOT NULL DEFAULT '1',
   `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
@@ -362,6 +363,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_tasks', 'bx_tasks_entry_view', 'bx_tasks', 1, '_bx_tasks_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_tasks', 'bx_tasks', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'allow_view_to', '', '', 0, 'custom', '_bx_tasks_form_entry_input_sys_allow_view_to', '_bx_tasks_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_tasks_form_entry_input_sys_delete_confirm', '_bx_tasks_form_entry_input_delete_confirm', '_bx_tasks_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_tasks_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_tasks', 'bx_tasks', 'do_publish', '_bx_tasks_form_entry_input_do_publish', '', 0, 'submit', '_bx_tasks_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -408,10 +410,11 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_tasks_entry_edit', 'videos', 2147483647, 1, 7),
 ('bx_tasks_entry_edit', 'files', 2147483647, 1, 8),
 ('bx_tasks_entry_edit', 'allow_view_to', 2147483647, 1, 9),
-('bx_tasks_entry_edit', 'tasks_list', 192, 1, 10),
-('bx_tasks_entry_edit', 'initial_members', 192, 1, 11),
-('bx_tasks_entry_edit', 'due_date', 192, 1, 12),
-('bx_tasks_entry_edit', 'do_submit', 2147483647, 1, 13),
+('bx_tasks_entry_edit', 'cf', 2147483647, 1, 10),
+('bx_tasks_entry_edit', 'tasks_list', 192, 1, 11),
+('bx_tasks_entry_edit', 'initial_members', 192, 1, 12),
+('bx_tasks_entry_edit', 'due_date', 192, 1, 13),
+('bx_tasks_entry_edit', 'do_submit', 2147483647, 1, 14),
 
 ('bx_tasks_entry_view', 'cat', 2147483647, 1, 1),
 ('bx_tasks_entry_view', 'added', 2147483647, 1, 2),

modules/boonex/tasks/js/manage_tools.js

@@ -7,49 +7,14 @@
  * @{
  */
 
-function BxTasksManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxTasksManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxTasksManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxTasksManageTools' : oOptions.sObjName;
 }
 
-BxTasksManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxTasksManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxTasksManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxTasksManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxTasksManageTools.prototype.constructor = BxTasksManageTools;
 
 /** @} */

modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -93,6 +93,7 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
             'FIELD_OBJECT_ID' => 'object_id', //Note. For 'Direct Timeline Posts' ('system' db field == 0) this field contains post's author profile ID.
             'FIELD_OBJECT_OWNER_ID' => 'object_owner_id',
             'FIELD_OBJECT_PRIVACY_VIEW' => 'object_privacy_view',
+            'FIELD_CF' => 'object_cf',
             'FIELD_ADDED' => 'date',
             'FIELD_PUBLISHED' => 'published',
             'FIELD_TITLE' => 'title',

modules/boonex/timeline/classes/BxTimelineDb.php

@@ -755,6 +755,10 @@ class BxTimelineDb extends BxBaseModNotificationsDb
         //--- Apply unpublished (date in future) filter
         $sWhereClauseUnpublished = $this->prepareAsString("AND IF(`{$this->_sTable}`.`system`='0' AND `{$this->_sTable}`.`object_id` = ?, 1, `{$this->_sTable}`.`date` <= UNIX_TIMESTAMP()) ", bx_get_logged_profile_id());
 
+        //--- Apply content filter
+        $oCf = BxDolContentFilter::getInstance();
+        $sWhereClauseCf = $oCf->isEnabled() ? $oCf->getSQLParts($this->_sTable, 'object_cf') . ' ' : '';
+
         //--- Check type
         $mixedWhereSubclause = "";
         switch($aParams['type']) {
@@ -999,6 +1003,7 @@ class BxTimelineDb extends BxBaseModNotificationsDb
             'where_clause_hidden' => &$sWhereClauseHidden,
             'where_clause_muted' => &$sWhereClauseMuted,
             'where_clause_unpublished' => &$sWhereClauseUnpublished,
+            'where_clause_cf' => &$sWhereClauseCf,
             'where_subclause' => &$mixedWhereSubclause
         ));
 
@@ -1009,6 +1014,7 @@ class BxTimelineDb extends BxBaseModNotificationsDb
         $mixedWhereClause .= $sWhereClauseHidden;
         $mixedWhereClause .= $sWhereClauseMuted;
         $mixedWhereClause .= $sWhereClauseUnpublished;
+        $mixedWhereClause .= $sWhereClauseCf;
 
         if(!empty($mixedWhereSubclause)) {
             if(is_array($mixedWhereSubclause)) {

modules/boonex/timeline/install/sql/install.sql

@@ -10,6 +10,7 @@ CREATE TABLE IF NOT EXISTS `bx_timeline_events` (
   `object_id` int(11) NOT NULL default '0',
   `object_owner_id` int(11) NOT NULL default '0',
   `object_privacy_view` varchar(16) NOT NULL default '3',
+  `object_cf` int(11) NOT NULL default '1',
   `content` text NOT NULL,
   `title` varchar(255) NOT NULL,
   `description` text NOT NULL,
@@ -418,6 +419,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('bx_timeline_post', @sName, 'anonymous', '', '', 0, 'switcher', '_sys_form_input_sys_anonymous', '_sys_form_input_anonymous', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_timeline_post', @sName, 'date', '', '', 0, 'datetime', '_bx_timeline_form_post_input_sys_date', '_bx_timeline_form_post_input_date', '', 0, 0, 0, '', '', '', '', '', '', 'DateTimeUtc', '', 1, 0),
 ('bx_timeline_post', @sName, 'published', '', '', 0, 'datetime', '_bx_timeline_form_post_input_sys_date_published', '_bx_timeline_form_post_input_date_published', '_bx_timeline_form_post_input_date_published_info', 0, 0, 0, '', '', '', '', '', '', 'DateTimeUtc', '', 1, 0),
+('bx_timeline_post', @sName, 'object_cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_timeline_post', @sName, 'object_privacy_view', '', '', 0, 'custom', '_bx_timeline_form_post_input_sys_object_privacy_view', '_bx_timeline_form_post_input_object_privacy_view', '', 1, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('bx_timeline_post', @sName, 'location', '', '', 0, 'location', '_sys_form_input_sys_location', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_timeline_post', @sName, 'link', '', '', 0, 'custom', '_bx_timeline_form_post_input_sys_link', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -436,13 +438,14 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_timeline_post_add', 'attachments', 2147483647, 1, 3),
 ('bx_timeline_post_add', 'owner_id', 2147483647, 1, 4),
 ('bx_timeline_post_add', 'object_privacy_view', 2147483647, 1, 5),
-('bx_timeline_post_add', 'published', 192, 1, 6),
-('bx_timeline_post_add', 'location', 2147483647, 1, 7),
-('bx_timeline_post_add', 'link', 2147483647, 1, 8),
-('bx_timeline_post_add', 'photo', 2147483647, 1, 9),
-('bx_timeline_post_add', 'video', 2147483647, 1, 10),
-('bx_timeline_post_add', 'file', 2147483647, 1, 11),
-('bx_timeline_post_add', 'tlb_do_submit', 2147483647, 1, 12),
+('bx_timeline_post_add', 'object_cf', 2147483647, 1, 6),
+('bx_timeline_post_add', 'published', 192, 1, 7),
+('bx_timeline_post_add', 'location', 2147483647, 1, 8),
+('bx_timeline_post_add', 'link', 2147483647, 1, 9),
+('bx_timeline_post_add', 'photo', 2147483647, 1, 10),
+('bx_timeline_post_add', 'video', 2147483647, 1, 11),
+('bx_timeline_post_add', 'file', 2147483647, 1, 12),
+('bx_timeline_post_add', 'tlb_do_submit', 2147483647, 1, 13),
 
 ('bx_timeline_post_add_public', 'type', 2147483647, 1, 0),
 ('bx_timeline_post_add_public', 'action', 2147483647, 1, 1),
@@ -450,13 +453,14 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_timeline_post_add_public', 'text', 2147483647, 1, 3),
 ('bx_timeline_post_add_public', 'attachments', 2147483647, 1, 4),
 ('bx_timeline_post_add_public', 'object_privacy_view', 2147483647, 1, 5),
-('bx_timeline_post_add_public', 'published', 192, 1, 6),
-('bx_timeline_post_add_public', 'location', 2147483647, 1, 7),
-('bx_timeline_post_add_public', 'link', 2147483647, 1, 8),
-('bx_timeline_post_add_public', 'photo', 2147483647, 1, 9),
-('bx_timeline_post_add_public', 'video', 2147483647, 1, 10),
-('bx_timeline_post_add_public', 'file', 2147483647, 1, 11),
-('bx_timeline_post_add_public', 'tlb_do_submit', 2147483647, 1, 12),
+('bx_timeline_post_add_public', 'object_cf', 2147483647, 1, 6),
+('bx_timeline_post_add_public', 'published', 192, 1, 7),
+('bx_timeline_post_add_public', 'location', 2147483647, 1, 8),
+('bx_timeline_post_add_public', 'link', 2147483647, 1, 9),
+('bx_timeline_post_add_public', 'photo', 2147483647, 1, 10),
+('bx_timeline_post_add_public', 'video', 2147483647, 1, 11),
+('bx_timeline_post_add_public', 'file', 2147483647, 1, 12),
+('bx_timeline_post_add_public', 'tlb_do_submit', 2147483647, 1, 13),
 
 ('bx_timeline_post_add_profile', 'type', 2147483647, 1, 0),
 ('bx_timeline_post_add_profile', 'action', 2147483647, 1, 1),
@@ -464,13 +468,14 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_timeline_post_add_profile', 'text', 2147483647, 1, 3),
 ('bx_timeline_post_add_profile', 'attachments', 2147483647, 1, 4),
 ('bx_timeline_post_add_profile', 'object_privacy_view', 2147483647, 1, 5),
-('bx_timeline_post_add_profile', 'published', 192, 1, 6),
-('bx_timeline_post_add_profile', 'location', 2147483647, 1, 7),
-('bx_timeline_post_add_profile', 'link', 2147483647, 1, 8),
-('bx_timeline_post_add_profile', 'photo', 2147483647, 1, 9),
-('bx_timeline_post_add_profile', 'video', 2147483647, 1, 10),
-('bx_timeline_post_add_profile', 'file', 2147483647, 1, 11),
-('bx_timeline_post_add_profile', 'tlb_do_submit', 2147483647, 1, 12),
+('bx_timeline_post_add_profile', 'object_cf', 2147483647, 1, 6),
+('bx_timeline_post_add_profile', 'published', 192, 1, 7),
+('bx_timeline_post_add_profile', 'location', 2147483647, 1, 8),
+('bx_timeline_post_add_profile', 'link', 2147483647, 1, 9),
+('bx_timeline_post_add_profile', 'photo', 2147483647, 1, 10),
+('bx_timeline_post_add_profile', 'video', 2147483647, 1, 11),
+('bx_timeline_post_add_profile', 'file', 2147483647, 1, 12),
+('bx_timeline_post_add_profile', 'tlb_do_submit', 2147483647, 1, 13),
 
 ('bx_timeline_post_edit', 'type', 2147483647, 1, 1),
 ('bx_timeline_post_edit', 'action', 2147483647, 1, 2),
@@ -483,9 +488,10 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_timeline_post_edit', 'photo', 2147483647, 1, 9),
 ('bx_timeline_post_edit', 'video', 2147483647, 1, 10),
 ('bx_timeline_post_edit', 'file', 2147483647, 1, 11),
-('bx_timeline_post_edit', 'controls', 2147483647, 1, 12),
-('bx_timeline_post_edit', 'tlb_do_submit', 2147483647, 1, 13),
-('bx_timeline_post_edit', 'tlb_do_cancel', 2147483647, 1, 14);
+('bx_timeline_post_edit', 'object_cf', 2147483647, 1, 12),
+('bx_timeline_post_edit', 'controls', 2147483647, 1, 13),
+('bx_timeline_post_edit', 'tlb_do_submit', 2147483647, 1, 14),
+('bx_timeline_post_edit', 'tlb_do_cancel', 2147483647, 1, 15);
 
 -- Forms -> Attach link
 INSERT INTO `sys_objects_form` (`object`, `module`, `title`, `action`, `form_attrs`, `submit_name`, `table`, `key`, `uri`, `uri_title`, `params`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES

modules/boonex/timeline/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxTimelineManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-	this._sObjName = oOptions.sObjName == undefined ? 'BxTimelineManageTools' : oOptions.sObjName;
+function BxTimelineManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
-
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'BxTimelineManageTools' : oOptions.sObjName;
 }
 
-BxTimelineManageTools.prototype.onChangeFilter = function (oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxTimelineManageTools.prototype.onClickSettings = function (sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxTimelineManageTools.prototype.onClickDelete = function (iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxTimelineManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxTimelineManageTools.prototype.constructor = BxTimelineManageTools;
 
 /** @} */

modules/boonex/videos/classes/BxVideosConfig.php

@@ -45,6 +45,7 @@ class BxVideosConfig extends BxBaseModTextConfig
             'FIELD_MULTICAT' => 'multicat',
             'FIELD_DURATION' => 'duration',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',
             'FIELD_POSTER' => '', //'poster',
@@ -174,6 +175,7 @@ class BxVideosConfig extends BxBaseModTextConfig
                 'filter_item_hidden' => '_bx_videos_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_videos_grid_filter_item_title_adm_pending',
                 'filter_item_select_one_filter1' => '_bx_videos_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_videos_grid_filter_item_title_adm_select_one_filter2',
                 'menu_item_manage_my' => '_bx_videos_menu_item_title_manage_my',
                 'menu_item_manage_all' => '_bx_videos_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_videos_txt_all_entries_by',

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

@@ -208,7 +208,7 @@
     <string name="_bx_videos_menu_item_title_view_entries_in_context"><![CDATA[Videos]]></string>
     <string name="_bx_videos_menu_title_entries_my"><![CDATA[My Videos Action Menu]]></string>
     <string name="_bx_videos_menu_set_title_entries_my"><![CDATA[My Videos Menu]]></string>
-	<string name="_bx_videos_menu_item_title_system_manage_my_videos"><![CDATA[My videos]]></string>
+    <string name="_bx_videos_menu_item_title_system_manage_my_videos"><![CDATA[My videos]]></string>
     <string name="_bx_videos_menu_item_title_manage_my_videos"><![CDATA[Videos]]></string>
     <string name="_bx_videos_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_videos_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
@@ -220,6 +220,7 @@
     <string name="_bx_videos_menu_item_title_manage_all"><![CDATA[All Videos]]></string>
 
     <string name="_bx_videos_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_videos_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_videos_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_videos_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_videos_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/videos/install/sql/install.sql

@@ -31,6 +31,7 @@ CREATE TABLE IF NOT EXISTS `bx_videos_entries` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `status` enum('active','awaiting','failed','hidden') NOT NULL DEFAULT 'active',
   `status_admin` enum('active','hidden','pending') NOT NULL DEFAULT 'active',
@@ -339,6 +340,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_videos', 'bx_videos_entry_view', 'bx_videos', 1, '_bx_videos_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_videos', 'bx_videos', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_videos', 'bx_videos', 'allow_view_to', '', '', 0, 'custom', '_bx_videos_form_entry_input_sys_allow_view_to', '_bx_videos_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_videos', 'bx_videos', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_videos_form_entry_input_sys_delete_confirm', '_bx_videos_form_entry_input_delete_confirm', '_bx_videos_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_videos_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_videos', 'bx_videos', 'do_publish', '_bx_videos_form_entry_input_do_publish', '', 0, 'submit', '_bx_videos_form_entry_input_sys_do_publish', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -366,8 +368,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_videos_entry_add', 'videos', 2147483647, 1, 6),
 ('bx_videos_entry_add', 'pictures', 2147483647, 1, 7),
 ('bx_videos_entry_add', 'allow_view_to', 2147483647, 1, 8),
-('bx_videos_entry_add', 'location', 2147483647, 1, 9),
-('bx_videos_entry_add', 'do_publish', 2147483647, 1, 10),
+('bx_videos_entry_add', 'cf', 2147483647, 1, 9),
+('bx_videos_entry_add', 'location', 2147483647, 1, 10),
+('bx_videos_entry_add', 'do_publish', 2147483647, 1, 11),
 
 ('bx_videos_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_videos_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -380,8 +383,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_videos_entry_edit', 'videos', 2147483647, 1, 6),
 ('bx_videos_entry_edit', 'pictures', 2147483647, 1, 7),
 ('bx_videos_entry_edit', 'allow_view_to', 2147483647, 1, 8),
-('bx_videos_entry_edit', 'location', 2147483647, 1, 9),
-('bx_videos_entry_edit', 'do_submit', 2147483647, 1, 10),
+('bx_videos_entry_edit', 'cf', 2147483647, 1, 9),
+('bx_videos_entry_edit', 'location', 2147483647, 1, 10),
+('bx_videos_entry_edit', 'do_submit', 2147483647, 1, 11),
 
 ('bx_videos_entry_view', 'duration', 2147483647, 1, 1),
 ('bx_videos_entry_view', 'cat', 2147483647, 1, 2),

modules/boonex/videos/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxVideosManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxVideosManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxVideosManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxVideosManageTools' : oOptions.sObjName;
 }
 
-BxVideosManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxVideosManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxVideosManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxVideosManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxVideosManageTools.prototype.constructor = BxVideosManageTools;
 
 /** @} */