Merge

inc/classes/BxDolCronAudit.php

@@ -12,7 +12,7 @@ class BxDolCronAudit extends BxDolCron
     public function processing()
     {
         BxDolDb::getInstance()->query(BxDolDb::getInstance()->prepare("DELETE FROM `sys_audit` WHERE FROM_UNIXTIME(`added`) < NOW() - INTERVAL ? DAY", (int)getParam("sys_audit_days_before_expire")));
-        BxDolDb::getInstance()->query("DELETE FROM `sys_audit` WHERE `id` < (SELECT MAX(`m`.`id`) FROM (SELECT `id` FROM `sys_audit` ORDER BY `id` DESC LIMIT " . (int)getParam("sys_audit_max_records") . ") `m`)");
+        BxDolDb::getInstance()->query("DELETE FROM `sys_audit` WHERE `id` < (SELECT MIN(`m`.`id`) FROM (SELECT `id` FROM `sys_audit` ORDER BY `id` DESC LIMIT " . (int)getParam("sys_audit_max_records") . ") `m`)");
     }
 }
 

inc/js/jquery.webForms.js

@@ -110,7 +110,6 @@
         $("select", this).each(function () {
             // Labels selector
             var oInput = $(this);
-            console.log(oInput);
             if (oInput.hasClass('bx-form-select-labels')) {
                 $(".bx-form-select-labels").select2ToTree();
             }

inc/profiles.inc.php

@@ -103,7 +103,7 @@ function bx_login($iId, $bRememberMe = false)
     $aUrl = parse_url(BX_DOL_URL_ROOT);
     $sPath = isset($aUrl['path']) && !empty($aUrl['path']) ? $aUrl['path'] : '/';
     $sHost = '';
-    $iCookieTime = $bRememberMe ? time() + 24*60*60*90 : 0;
+    $iCookieTime = $bRememberMe ? time() + 60 * getParam('sys_session_lifetime_in_min') : 0;
     setcookie("memberID", $iId, $iCookieTime, $sPath, $sHost);
     $_COOKIE['memberID'] = $iId;
     setcookie("memberPassword", $sPassword, $iCookieTime, $sPath, $sHost, false, true /* http only */);

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

@@ -295,7 +295,8 @@
     <string name="_bx_ads_grid_column_title_adm_author"><![CDATA[Author]]></string>
     <string name="_bx_ads_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_ads_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
-    <string name="_bx_ads_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_ads_grid_action_title_adm_more_actions"><![CDATA[Audit actions]]></string>
+    <string name="_bx_ads_grid_action_title_adm_audit_content"><![CDATA[More Actions]]></string>
     <string name="_bx_ads_grid_action_err_delete"><![CDATA[Cannot delete the selected ad(s).]]></string>
     <string name="_bx_ads_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -432,6 +432,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_ads_administration', 'single', 'edit', '_bx_ads_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_ads_administration', 'single', 'delete', '_bx_ads_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_ads_administration', 'single', 'settings', '_bx_ads_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_ads_administration', 'single', 'audit_content', '_bx_ads_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_ads_common', 'bulk', 'delete', '_bx_ads_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_ads_common', 'single', 'edit', '_bx_ads_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_ads_common', 'single', 'delete', '_bx_ads_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -236,6 +236,7 @@
     <string name="_bx_albums_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_albums_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_albums_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_albums_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_albums_grid_action_err_delete"><![CDATA[Cannot delete the selected album(s).]]></string>
     <string name="_bx_albums_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -501,6 +501,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_albums_administration', 'single', 'edit', '_bx_albums_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_albums_administration', 'single', 'delete', '_bx_albums_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_albums_administration', 'single', 'settings', '_bx_albums_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_albums_administration', 'single', 'audit_content', '_bx_albums_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_albums_common', 'bulk', 'delete', '_bx_albums_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_albums_common', 'single', 'edit', '_bx_albums_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_albums_common', 'single', 'delete', '_bx_albums_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -38,14 +38,11 @@
 	<string name="_bx_channels_form_profile_input_delete_confirm_info"><![CDATA[This action can not be undone.]]></string>
 	<string name="_bx_channels_form_profile_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete channel.]]></string>
 	
-	<string name="_bx_channels_acl_action_create_profile"><![CDATA[Create Channel]]></string>
 	<string name="_bx_channels_acl_action_delete_profile"><![CDATA[Delete Channel]]></string>
 	<string name="_bx_channels_acl_action_view_profile"><![CDATA[View Channel]]></string>
 	<string name="_bx_channels_acl_action_edit_any_profile"><![CDATA[Edit Any Channel]]></string>
   <string name="_bx_channels_acl_action_create_channel_auto"><![CDATA[Create Channel Auto]]></string>
 
-  <string name="_bx_channels_page_title_sys_create_profile"><![CDATA[Create Channel]]></string>
-	<string name="_bx_channels_page_title_create_profile"><![CDATA[Create Channel]]></string>
 	<string name="_bx_channels_page_title_sys_edit_profile"><![CDATA[Edit Channel]]></string>
 	<string name="_bx_channels_page_title_edit_profile"><![CDATA[Edit Channel]]></string>
 	<string name="_bx_channels_page_title_sys_edit_profile_cover"><![CDATA[Edit Channel Cover]]></string>
@@ -88,7 +85,6 @@
 	<string name="_bx_channels_page_block_title_entries_of_author"><![CDATA[Followed Сhannels]]></string>
 	<string name="_bx_channels_page_block_title_favorites_of_author"><![CDATA[Favorite Channels]]></string>
 	<string name="_bx_channels_page_block_title_sys_favorites_of_author"><![CDATA[Favorite Channels]]></string>
-  <string name="_bx_channels_page_block_title_create_profile"><![CDATA[Create Channel]]></string>
 	<string name="_bx_channels_page_block_title_edit_profile"><![CDATA[Edit Channel]]></string>
 	<string name="_bx_channels_page_block_title_edit_profile_cover"><![CDATA[Edit Cover]]></string>
 	<string name="_bx_channels_page_block_title_delete_profile"><![CDATA[Delete Channel]]></string>
@@ -152,8 +148,6 @@
 	<string name="_bx_channels_menu_item_title_delete_account"><![CDATA[Delete Account]]></string>
 	<string name="_bx_channels_menu_item_title_system_profile_type"><![CDATA[Channel]]></string>
 	<string name="_bx_channels_menu_item_title_profile_type"><![CDATA[Channel]]></string>
-	<string name="_bx_channels_menu_item_title_system_create_profile"><![CDATA[Channel]]></string>
-	<string name="_bx_channels_menu_item_title_create_profile"><![CDATA[Channel]]></string>
 	<string name="_bx_channels_menu_item_title_system_view_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_channels_menu_item_title_view_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_channels_menu_item_title_system_view_profile_comments"><![CDATA[Comments]]></string>
@@ -216,6 +210,8 @@
 	<string name="_bx_channels_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
 	<string name="_bx_channels_grid_action_title_adm_delete_with_content"><![CDATA[Delete With Content]]></string>
 	<string name="_bx_channels_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+  <string name="_bx_channels_grid_action_title_adm_audit_context"><![CDATA[Audit actions in context]]></string>
+  <string name="_bx_channels_grid_action_title_adm_audit_content"><![CDATA[Audit actions with content]]></string>
 	<string name="_bx_channels_grid_action_err_delete"><![CDATA[Cannot delete the selected channel(s).]]></string>
 	<string name="_bx_channels_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 	

modules/boonex/channels/install/sql/enable.sql

@@ -23,14 +23,6 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `e
 
 -- PAGES
 
--- PAGE: create profile
-
-INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_channels_create_profile', 'create-channel-profile', '_bx_channels_page_title_sys_create_profile', '_bx_channels_page_title_create_profile', 'bx_channels', 5, 128, 1, 'page.php?i=create-channel-profile', '', '', '', 0, 1, 0, '', '');
-
-INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
-('bx_channels_create_profile', 1, 'bx_channels', '_bx_channels_page_block_title_create_profile', 11, 128, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_channels\";s:6:\"method\";s:13:\"entity_create\";}', 0, 1, 1);
-
 -- PAGE: view profile
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
@@ -167,13 +159,6 @@ SET @iHomepageMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name`
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('sys_homepage', 'bx_channels', 'channels-home', '_bx_channels_menu_item_title_system_entries_home', '_bx_channels_menu_item_title_entries_home', 'page.php?i=channels-home', '', '', 'hashtag col-red2', 'bx_channels_submenu', 2147483647, 1, 1, IFNULL(@iHomepageMenuOrder, 0) + 1);
 
--- MENU: add to "add content" menu
-
-SET @iAddMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_add_content_links' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
-INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_add_content_links', 'bx_channels', 'create-channel-profile', '_bx_channels_menu_item_title_system_create_profile', '_bx_channels_menu_item_title_create_profile', 'page.php?i=create-channel-profile', '', '', 'hashtag col-red2', '', 128, 1, 1, IFNULL(@iAddMenuOrder, 0) + 1);
-
-
 -- MENU: view actions
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
@@ -234,9 +219,6 @@ INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `templat
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_channels_my', 'bx_channels', '_bx_channels_menu_set_title_entries_my', 0);
 
-INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_channels_my', 'bx_channels', 'create-channel-profile', '_bx_channels_menu_item_title_system_create_profile', '_bx_channels_menu_item_title_create_profile', 'page.php?i=create-channel-profile', '', '', 'plus', '', 2147483647, 1, 0, 0);
-
 -- MENU: module sub-menu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_channels_submenu', '_bx_channels_menu_title_submenu', 'bx_channels_submenu', 'bx_channels', 8, 0, 1, '', '');
@@ -290,10 +272,6 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- ACL
 
-INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
-('bx_channels', 'create entry', NULL, '_bx_channels_acl_action_create_profile', '', 1, 1);
-SET @iIdActionProfileCreate = LAST_INSERT_ID();
-
 INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
 ('bx_channels', 'delete entry', NULL, '_bx_channels_acl_action_delete_profile', '', 1, 1);
 SET @iIdActionProfileDelete = LAST_INSERT_ID();
@@ -322,9 +300,6 @@ SET @iPremium = 9;
 
 INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
--- profile create
-(@iAdministrator, @iIdActionProfileCreate),
-
 -- profile delete
 (@iAdministrator, @iIdActionProfileDelete),
 
@@ -388,7 +363,10 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_channels_administration', 'bulk', 'delete', '_bx_channels_grid_action_title_adm_delete', '', 0, 1, 2),
 ('bx_channels_administration', 'bulk', 'delete_with_content', '_bx_channels_grid_action_title_adm_delete_with_content', '', 0, 1, 3),
-('bx_channels_administration', 'single', 'settings', '_bx_channels_grid_action_title_adm_more_actions', 'cog', 1, 0, 2);
+('bx_channels_administration', 'single', 'settings', '_bx_channels_grid_action_title_adm_more_actions', 'cog', 1, 0, 2),
+('bx_channels_administration', 'single', 'audit_content', '_bx_channels_grid_action_title_adm_audit_content', 'search', 1, 0, 3),
+('bx_channels_administration', 'single', 'audit_profile', '_bx_channels_grid_action_title_adm_audit_context', 'search-location', 1, 0, 4);
+
 
 -- ALERTS
 

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

@@ -1414,6 +1414,7 @@
 	<string name="_adm_stg_cpt_option_sys_template_cache_minify_css_enable"><![CDATA[Enable lessening for CSS files (cache should be enabled)]]></string>
 	<string name="_adm_stg_cpt_option_sys_template_cache_minify_js_enable"><![CDATA[Enable lessening for JS files (cache should be enabled)]]></string>
 	<string name="_adm_stg_cpt_option_sys_transcoder_queue_storage"><![CDATA[Remote video transcoding (requires special setup)]]></string>
+  <string name="_adm_stg_cpt_option_sys_session_lifetime_in_min"><![CDATA[Session lifetime (min)]]></string>
 	<string name="_adm_stg_cpt_option_template"><![CDATA[Default Template]]></string>
 	<string name="_adm_stg_err_option_template"><![CDATA[Template cannot be empty and must have a valid name.]]></string>
     <string name="_adm_stg_cpt_option_use_like_operator"><![CDATA[Use operator LIKE for search (recommended for small content)]]></string>
@@ -1754,8 +1755,6 @@
   <string name="_sys_audit_action_unstick"><![CDATA[Unsticked]]></string>
   <string name="_sys_audit_action_promote"><![CDATA[Promoted]]></string>
   <string name="_sys_audit_action_unpromote"><![CDATA[Unpromoted]]></string>
-  <string name="_sys_audit_action_unpromote"><![CDATA[Unpromoted]]></string>
-  
 
   <string name="_sys_add_friend"><![CDATA[Add friend]]></string>
         <string name="_sys_add_relation"><![CDATA[Add relationship]]></string>

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

@@ -277,6 +277,8 @@
     <string name="_bx_events_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_events_grid_action_title_adm_delete_with_content"><![CDATA[Delete With Content]]></string>
     <string name="_bx_events_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+  <string name="_bx_events_grid_action_title_adm_audit_content"><![CDATA[Audit actions with content]]></string>
+  <string name="_bx_events_grid_action_title_adm_audit_context"><![CDATA[Audit actions in context]]></string>
 	<string name="_bx_events_grid_action_err_delete"><![CDATA[Cannot delete the selected event(s).]]></string>
 	<string name="_bx_events_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

modules/boonex/events/install/sql/enable.sql

@@ -493,6 +493,8 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_events_administration', 'bulk', 'delete', '_bx_events_grid_action_title_adm_delete', '', 0, 1, 2),
 ('bx_events_administration', 'bulk', 'delete_with_content', '_bx_events_grid_action_title_adm_delete_with_content', '', 0, 1, 3),
 ('bx_events_administration', 'single', 'settings', '_bx_events_grid_action_title_adm_more_actions', 'cog', 1, 0, 2),
+('bx_events_administration', 'single', 'audit_content', '_bx_events_grid_action_title_adm_audit_content', 'search', 1, 0, 3),
+('bx_events_administration', 'single', 'audit_context', '_bx_events_grid_action_title_adm_audit_context', 'search-location', 1, 0, 4),
 ('bx_events_common', 'bulk', 'delete', '_bx_events_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_events_common', 'bulk', 'delete_with_content', '_bx_events_grid_action_title_adm_delete_with_content', '', 0, 1, 2),
 ('bx_events_common', 'single', 'settings', '_bx_events_grid_action_title_adm_more_actions', 'cog', 1, 0, 1);

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

@@ -199,7 +199,8 @@
     <string name="_bx_files_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_files_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_files_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
-    <string name="_bx_files_grid_action_err_delete"><![CDATA[Cannot delete the selected file(s).]]></string>
+    <string name="_bx_files_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></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/enable.sql

@@ -440,6 +440,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_files_administration', 'single', 'edit', '_bx_files_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_files_administration', 'single', 'delete', '_bx_files_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_files_administration', 'single', 'settings', '_bx_files_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_files_administration', 'single', 'audit_content', '_bx_files_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_files_common', 'bulk', 'delete', '_bx_files_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_files_common', 'single', 'edit', '_bx_files_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_files_common', 'single', 'delete', '_bx_files_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -252,6 +252,7 @@
     <string name="_bx_forum_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_forum_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_forum_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_forum_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_forum_grid_action_title_add"><![CDATA[New discussion]]></string>
     <string name="_bx_forum_grid_action_title_show_to"><![CDATA[Show To]]></string>
     <string name="_bx_forum_grid_action_err_delete"><![CDATA[Cannot delete the selected discussion(s).]]></string>

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

@@ -398,6 +398,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_forum_administration', 'single', 'edit', '_bx_forum_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_forum_administration', 'single', 'delete', '_bx_forum_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_forum_administration', 'single', 'settings', '_bx_forum_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_forum_administration', 'single', 'audit_content', '_bx_forum_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 
 ('bx_forum_common', 'bulk', 'delete', '_bx_forum_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_forum_common', 'single', 'edit', '_bx_forum_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),

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

@@ -197,6 +197,7 @@
     <string name="_bx_glossary_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_glossary_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_glossary_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_glossary_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>  
     <string name="_bx_glossary_grid_action_err_delete"><![CDATA[Cannot delete the selected term(s).]]></string>
     <string name="_bx_glossary_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -437,6 +437,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_glossary_administration', 'single', 'edit', '_bx_glossary_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_glossary_administration', 'single', 'delete', '_bx_glossary_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_glossary_administration', 'single', 'settings', '_bx_glossary_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_glossary_administration', 'single', 'audit_content', '_bx_glossary_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_glossary_common', 'bulk', 'delete', '_bx_glossary_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_glossary_common', 'single', 'edit', '_bx_glossary_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_glossary_common', 'single', 'delete', '_bx_glossary_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -332,6 +332,7 @@
     <string name="_bx_market_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_market_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_market_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_market_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_market_grid_action_err_delete"><![CDATA[Cannot delete the selected product(s).]]></string>
     <string name="_bx_market_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -610,6 +610,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_market_administration', 'single', 'edit', '_bx_market_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_market_administration', 'single', 'delete', '_bx_market_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_market_administration', 'single', 'settings', '_bx_market_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_market_administration', 'single', 'audit_content', '_bx_market_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_market_common', 'bulk', 'delete', '_bx_market_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_market_common', 'single', 'edit', '_bx_market_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_market_common', 'single', 'delete', '_bx_market_grid_action_title_adm_delete', 'remove', 1, 1, 2),

modules/boonex/nexus/template/styles.html

@@ -43,7 +43,6 @@ html #bx-footer-wrapper {
 html #bx-sliding-menu-sys_site.bx-sliding-menu-main, 
 html #bx-sliding-menu-sys_add_content.bx-sliding-menu-main, 
 html #bx-sliding-menu-account.bx-sliding-menu-main {
-    background-color:#fff;
     height:100%;
     overflow-x:hidden;
     overflow-y:auto;

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

@@ -324,8 +324,10 @@
     <string name="_bx_orgs_grid_action_title_adm_delete_with_content"><![CDATA[Delete With Content]]></string>
     <string name="_bx_orgs_grid_action_title_adm_set_acl_level"><![CDATA[Set Membership]]></string>
     <string name="_bx_orgs_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
-	<string name="_bx_orgs_grid_action_err_delete"><![CDATA[Cannot delete the selected organization(s).]]></string>
-	<string name="_bx_orgs_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
+    <string name="_bx_orgs_grid_action_title_adm_audit_content"><![CDATA[Audit actions with profile]]></string>
+    <string name="_bx_orgs_grid_action_title_adm_audit_profile"><![CDATA[Audit profile's actions]]></string>
+    <string name="_bx_orgs_grid_action_err_delete"><![CDATA[Cannot delete the selected organization(s).]]></string>
+    <string name="_bx_orgs_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 
     <string name="_bx_orgs_chart_growth"><![CDATA[Organizations: Growth]]></string>
     <string name="_bx_orgs_chart_growth_speed"><![CDATA[Organizations: Growth Speed]]></string>

modules/boonex/organizations/install/sql/enable.sql

@@ -560,6 +560,8 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_organizations_administration', 'bulk', 'delete_with_content', '_bx_orgs_grid_action_title_adm_delete_with_content', '', 0, 1, 3),
 ('bx_organizations_administration', 'single', 'set_acl_level', '_bx_orgs_grid_action_title_adm_set_acl_level', 'certificate', 1, 0, 1),
 ('bx_organizations_administration', 'single', 'settings', '_bx_orgs_grid_action_title_adm_more_actions', 'cog', 1, 0, 2),
+('bx_organizations_administration', 'single', 'audit_content', '_bx_orgs_grid_action_title_adm_audit_content', 'search', 1, 0, 3),
+('bx_organizations_administration', 'single', 'audit_profile', '_bx_orgs_grid_action_title_adm_audit_profile', 'search-location', 1, 0, 4),
 ('bx_organizations_common', 'bulk', 'delete', '_bx_orgs_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_organizations_common', 'bulk', 'delete_with_content', '_bx_orgs_grid_action_title_adm_delete_with_content', '', 0, 1, 2),
 ('bx_organizations_common', 'single', 'settings', '_bx_orgs_grid_action_title_adm_more_actions', 'cog', 1, 0, 1);

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

@@ -204,6 +204,7 @@
     <string name="_bx_photos_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_photos_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_photos_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_photos_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_photos_grid_action_err_delete"><![CDATA[Cannot delete the selected photo(s).]]></string>
     <string name="_bx_photos_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -423,6 +423,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_photos_administration', 'single', 'edit', '_bx_photos_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_photos_administration', 'single', 'delete', '_bx_photos_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_photos_administration', 'single', 'settings', '_bx_photos_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_photos_administration', 'single', 'audit_content', '_bx_photos_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_photos_common', 'bulk', 'delete', '_bx_photos_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_photos_common', 'single', 'edit', '_bx_photos_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_photos_common', 'single', 'delete', '_bx_photos_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -199,6 +199,7 @@
     <string name="_bx_polls_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_polls_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_polls_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_polls_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_polls_grid_action_err_delete"><![CDATA[Cannot delete the selected poll(s).]]></string>
     <string name="_bx_polls_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -431,6 +431,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_polls_administration', 'single', 'edit', '_bx_polls_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_polls_administration', 'single', 'delete', '_bx_polls_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_polls_administration', 'single', 'settings', '_bx_polls_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_polls_administration', 'single', 'audit_content', '_bx_polls_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_polls_common', 'bulk', 'delete', '_bx_polls_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_polls_common', 'single', 'edit', '_bx_polls_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_polls_common', 'single', 'delete', '_bx_polls_grid_action_title_adm_delete', 'remove', 1, 1, 2),

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

@@ -15,6 +15,7 @@
 	<string name="_bx_quoteofday_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
 	<string name="_bx_quoteofday_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
 	<string name="_bx_quoteofday_grid_action_title_adm_publish"><![CDATA[Mark as Today Quote]]></string>
+  <string name="_bx_quoteofday_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
 	<string name="_bx_quoteofday_grid_action_title_adm_publish_text"><![CDATA[Item set as Today Quote]]></string>
 	
 	<string name="_bx_quoteofday_form_entry"><![CDATA[Quote of the Day]]></string>

modules/boonex/quoteofday/install/sql/enable.sql

@@ -29,8 +29,9 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_quoteofday_internal', 'single', 'edit', '_bx_quoteofday_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
-('bx_quoteofday_internal', 'single', 'publish', '_bx_quoteofday_grid_action_title_adm_publish', 'quote-right', 1, 0, 3),
 ('bx_quoteofday_internal', 'single', 'delete', '_bx_quoteofday_grid_action_title_adm_delete', 'remove', 1, 1, 2),
+('bx_quoteofday_internal', 'single', 'publish', '_bx_quoteofday_grid_action_title_adm_publish', 'quote-right', 1, 0, 3),
+('bx_quoteofday_internal', 'single', 'audit_content', '_bx_quoteofday_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_quoteofday_internal', 'bulk', 'delete', '_bx_quoteofday_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_quoteofday_internal', 'independent', 'add', '_bx_quoteofday_grid_action_title_adm_add', '', 0, 0, 1);
 

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

@@ -234,6 +234,7 @@
     <string name="_bx_albums_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_albums_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_albums_grid_action_title_adm_more_actions"><![CDATA[Больше действий]]></string>
+    <string name="_bx_albums_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_albums_grid_action_err_delete"><![CDATA[Невозможно удалить выбранный(ные) альбом(ы).]]></string>
     <string name="_bx_albums_grid_txt_account_manager"><![CDATA[Перенаправить в управление аккаунтом.]]></string>
 

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

@@ -38,14 +38,11 @@
 	<string name="_bx_channels_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
 	<string name="_bx_channels_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить канал.]]></string>
 
-	<string name="_bx_channels_acl_action_create_profile"><![CDATA[Создать канал]]></string>
 	<string name="_bx_channels_acl_action_delete_profile"><![CDATA[Удалить канал]]></string>
 	<string name="_bx_channels_acl_action_view_profile"><![CDATA[Просмотреть канал]]></string>
 	<string name="_bx_channels_acl_action_edit_any_profile"><![CDATA[Редактировать любой канал]]></string>
 	<string name="_bx_channels_acl_action_create_channel_auto"><![CDATA[Создавать канал автоматически]]></string>
 
-	<string name="_bx_channels_page_title_sys_create_profile"><![CDATA[Создать канал]]></string>
-	<string name="_bx_channels_page_title_create_profile"><![CDATA[Создать канал]]></string>
 	<string name="_bx_channels_page_title_sys_edit_profile"><![CDATA[Редактировать канал]]></string>
 	<string name="_bx_channels_page_title_edit_profile"><![CDATA[Редактировать канал]]></string>
 	<string name="_bx_channels_page_title_sys_edit_profile_cover"><![CDATA[Редактировать обложку канала]]></string>
@@ -88,7 +85,6 @@
     <string name="_bx_channels_page_block_title_entries_of_author"><![CDATA[Просматриваемые каналы]]></string>
     <string name="_bx_channels_page_block_title_favorites_of_author"><![CDATA[Избранные каналы]]></string>   
     <string name="_bx_channels_page_block_title_sys_favorites_of_author"><![CDATA[Избранные каналы]]></string>
-    <string name="_bx_channels_page_block_title_create_profile"><![CDATA[Создать канал]]></string>
     <string name="_bx_channels_page_block_title_edit_profile"><![CDATA[Редактировать канал]]></string>
     <string name="_bx_channels_page_block_title_edit_profile_cover"><![CDATA[Редактировать обложку]]></string>
     <string name="_bx_channels_page_block_title_delete_profile"><![CDATA[Удалить канал]]></string>
@@ -152,8 +148,6 @@
     <string name="_bx_channels_menu_item_title_delete_account"><![CDATA[Удалить аккаунт]]></string>
     <string name="_bx_channels_menu_item_title_system_profile_type"><![CDATA[Канал]]></string>
     <string name="_bx_channels_menu_item_title_profile_type"><![CDATA[Канал]]></string>
-    <string name="_bx_channels_menu_item_title_system_create_profile"><![CDATA[Канал]]></string>
-    <string name="_bx_channels_menu_item_title_create_profile"><![CDATA[Канал]]></string>
     <string name="_bx_channels_menu_item_title_system_view_profile_friends"><![CDATA[Друзья]]></string>
     <string name="_bx_channels_menu_item_title_view_profile_friends"><![CDATA[Друзья]]></string>
     <string name="_bx_channels_menu_item_title_system_view_profile_comments"><![CDATA[Комментарии]]></string>
@@ -213,6 +207,8 @@
     <string name="_bx_channels_grid_column_title_adm_name"><![CDATA[Название]]></string>
     <string name="_bx_channels_grid_column_title_adm_added"><![CDATA[Создание]]></string>
     <string name="_bx_channels_grid_column_title_adm_account"><![CDATA[Аккаунт]]></string>
+    <string name="_bx_channels_grid_action_title_adm_audit_context"><![CDATA[Аудит действий в контексте]]></string>
+    <string name="_bx_channels_grid_action_title_adm_audit_content"><![CDATA[Аудит действий над контентом]]></string>
     <string name="_bx_channels_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_channels_grid_action_title_adm_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_channels_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>

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

@@ -274,6 +274,8 @@
 	<string name="_bx_events_grid_column_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_events_grid_column_title_adm_name"><![CDATA[Название]]></string>
     <string name="_bx_events_grid_column_title_adm_added"><![CDATA[Создание]]></string>
+    <string name="_bx_events_grid_action_title_adm_audit_context"><![CDATA[Аудит действий в контексте]]></string>
+    <string name="_bx_events_grid_action_title_adm_audit_content"><![CDATA[Аудит действий над контентом]]></string>
     <string name="_bx_events_grid_column_title_adm_account"><![CDATA[Аккаунт]]></string>
     <string name="_bx_events_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_events_grid_action_title_adm_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>

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

@@ -198,6 +198,7 @@
     <string name="_bx_files_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_files_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_files_grid_action_title_adm_more_actions"><![CDATA[Больше действий]]></string>
+    <string name="_bx_files_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_files_grid_action_err_delete"><![CDATA[Ошибка удаления выбранных файлов]]></string>
     <string name="_bx_files_grid_txt_account_manager"><![CDATA[Перейти к управлению учетной записи]]></string>
 

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

@@ -252,6 +252,7 @@
     <string name="_bx_forum_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_forum_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_forum_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_forum_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_forum_grid_action_title_add"><![CDATA[Новое сообщение]]></string>
     <string name="_bx_forum_grid_action_title_show_to"><![CDATA[Показать]]></string>
     <string name="_bx_forum_grid_action_err_delete"><![CDATA[Невозможно удалить выбранное(ные) обсуждение(ния).]]></string>

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

@@ -199,6 +199,7 @@
     <string name="_bx_glossary_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_glossary_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_glossary_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_glossary_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_glossary_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) термин(ции).]]></string>
     <string name="_bx_glossary_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -245,6 +245,9 @@
     <string name="_bx_groups_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_groups_grid_action_title_adm_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_groups_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_groups_grid_action_title_adm_audit_context"><![CDATA[Аудит действий в контексте]]></string>
+    <string name="_bx_groups_grid_action_title_adm_audit_content"><![CDATA[Аудит действий над контентом]]></string>
+  
 	<string name="_bx_groups_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) группу(ы).]]></string>
 	<string name="_bx_groups_grid_txt_account_manager"><![CDATA[Перенаправить в управление аккаунтом.]]></string>
 

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

@@ -331,6 +331,7 @@
     <string name="_bx_market_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_market_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_market_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_market_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_market_grid_action_err_delete"><![CDATA[Невозможно удалить выбранный(ные) продукт(ы).]]></string>
     <string name="_bx_market_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
     

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

@@ -324,6 +324,8 @@
     <string name="_bx_orgs_grid_action_title_adm_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_orgs_grid_action_title_adm_set_acl_level"><![CDATA[Назначить членство]]></string>
     <string name="_bx_orgs_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_orgs_grid_action_title_adm_audit_content"><![CDATA[Аудит действий над профилем]]></string>
+    <string name="_bx_orgs_grid_action_title_adm_audit_profile"><![CDATA[Аудит действий профиля]]></string>
 	<string name="_bx_orgs_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) организацию(ции).]]></string>
 	<string name="_bx_orgs_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -284,6 +284,8 @@
     <string name="_bx_persons_grid_action_title_adm_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_persons_grid_action_title_adm_set_acl_level"><![CDATA[Назначить членство]]></string>
     <string name="_bx_persons_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_persons_grid_action_title_adm_audit_content"><![CDATA[Аудит действий над профилем]]></string>
+    <string name="_bx_persons_grid_action_title_adm_audit_profile"><![CDATA[Аудит действий профиля]]></string>
     <string name="_bx_persons_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) персону(ны).]]></string>
     <string name="_bx_persons_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -206,6 +206,7 @@
     <string name="_bx_photos_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_photos_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_photos_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_photos_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_photos_grid_action_err_delete"><![CDATA[Невозможно удалить выбранное(ные) фото.]]></string>
     <string name="_bx_photos_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -198,6 +198,7 @@
     <string name="_bx_polls_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_polls_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_polls_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_polls_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_polls_grid_action_err_delete"><![CDATA[Невозможно удалить выбранное(ные) голосование(ния).]]></string>
     <string name="_bx_polls_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -236,6 +236,7 @@
     <string name="_bx_posts_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_posts_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_posts_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_posts_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_posts_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) публикацию(ции).]]></string>
     <string name="_bx_posts_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -15,6 +15,7 @@
   <string name="_bx_quoteofday_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
   <string name="_bx_quoteofday_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
   <string name="_bx_quoteofday_grid_action_title_adm_publish"><![CDATA[Сделать Цитатой дня]]></string>
+  <string name="_bx_quoteofday_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
   <string name="_bx_quoteofday_grid_action_title_adm_publish_text"><![CDATA[Цитата дня установлена]]></string>
   
   <string name="_bx_quoteofday_form_entry"><![CDATA[Цитата дня]]></string>

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

@@ -205,6 +205,7 @@
     <string name="_bx_shopify_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_shopify_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_shopify_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_shopify_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_shopify_grid_action_err_delete"><![CDATA[Невозможно удалить выбранный(ные) товар(ы).]]></string>
     <string name="_bx_shopify_grid_txt_account_manager"><![CDATA[Перенаправить в управление аккаунтом.]]></string>
 

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

@@ -220,6 +220,7 @@
     <string name="_bx_snipcart_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_snipcart_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_snipcart_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_snipcart_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_snipcart_grid_action_err_delete"><![CDATA[Невозможно удалить выбранный(ные) товар(ы).]]></string>
     <string name="_bx_snipcart_grid_txt_account_manager"><![CDATA[Перенаправить в управление аккаунтом.]]></string>
 

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

@@ -243,8 +243,10 @@
     <string name="_bx_spaces_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_spaces_grid_action_title_adm_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_spaces_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
-	<string name="_bx_spaces_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) пространство(ы).]]></string>
-	<string name="_bx_spaces_grid_txt_account_manager"><![CDATA[Перенаправить в управление аккаунтом.]]></string>
+    <string name="_bx_spaces_grid_action_title_adm_audit_context"><![CDATA[Аудит действий в контексте]]></string>
+    <string name="_bx_spaces_grid_action_title_adm_audit_content"><![CDATA[Аудит действий над контентом]]></string>
+	  <string name="_bx_spaces_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) пространство(ы).]]></string>
+	  <string name="_bx_spaces_grid_txt_account_manager"><![CDATA[Перенаправить в управление аккаунтом.]]></string>
 
     <string name="_bx_spaces_chart_growth"><![CDATA[Пространства: Развитие]]></string>
     <string name="_bx_spaces_chart_growth_speed"><![CDATA[Пространства: Скорость развития]]></string>

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

@@ -225,6 +225,7 @@
     <string name="_bx_timeline_grid_column_title_adm_added"><![CDATA[Добавлено]]></string>
     <string name="_bx_timeline_grid_column_title_adm_author"><![CDATA[Автор]]></string>
     <string name="_bx_timeline_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
+    <string name="_bx_timeline_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_timeline_grid_action_err_delete"><![CDATA[Невозможно удалить выбранную(ные) событие(я) ленты.]]></string>
     <string name="_bx_timeline_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -201,6 +201,7 @@
     <string name="_bx_videos_grid_action_title_adm_edit"><![CDATA[Редактировать]]></string>
     <string name="_bx_videos_grid_action_title_adm_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_videos_grid_action_title_adm_more_actions"><![CDATA[Дополнительные действия]]></string>
+    <string name="_bx_videos_grid_action_title_adm_audit_content"><![CDATA[Аудит действий]]></string>
     <string name="_bx_videos_grid_action_err_delete"><![CDATA[Невозможно удалить выбранное(ные) видео.]]></string>
     <string name="_bx_videos_grid_txt_account_manager"><![CDATA[Перенаправить в Управление аккаунтом.]]></string>
 

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

@@ -765,6 +765,12 @@
     <string name="_adm_form_err_search_forms_title"><![CDATA[Введите имя, более 3 символов]]></string>
 	<string name="_adm_form_txt_all_modules"><![CDATA[Все модули]]></string>
 	<string name="_adm_form_txt_confirm_delete"><![CDATA[Вы уверены, что хотите удалить это поле? Оно будет удалено со всех дисплеев! Вместо этого можно просто отключить его.]]></string>
+  <string name="_adm_form_txt_audit_added"><![CDATA[Добавлено]]></string>
+  <string name="_adm_form_txt_audit_profile"><![CDATA[Профиль]]></string>
+  <string name="_adm_form_txt_audit_content"><![CDATA[Контент]]></string>
+  <string name="_adm_form_txt_audit_module"><![CDATA[Модуль]]></string>
+  <string name="_adm_pgt_txt_audit_context"><![CDATA[Контекст]]></string>
+  <string name="_adm_pgt_txt_audit_action"><![CDATA[Действие]]></string>
 	<string name="_adm_form_txt_displays_edit_popup"><![CDATA[Редактировать "{0}" дисплей]]></string>
 	<string name="_adm_form_txt_displays_gl_fields"><![CDATA[Поля]]></string>
 	<string name="_adm_form_txt_displays_gl_form"><![CDATA[Форма]]></string>
@@ -1110,6 +1116,7 @@
         <string name="_adm_nav_txt_block_hidden_on_tablet"><![CDATA[планшете]]></string>
         <string name="_adm_nav_txt_block_hidden_on_desktop"><![CDATA[настольном компьютере]]></string>
         <string name="_adm_nav_txt_block_hidden_on_mobile"><![CDATA[мобильное приложение]]></string>
+  <string name="_adm_page_cpt_audit"><![CDATA[Аудит]]></string>
 	<string name="_adm_page_cpt_builder_forms"><![CDATA[Формы]]></string>
 	<string name="_adm_page_cpt_builder_menus"><![CDATA[Навигация]]></string>
 	<string name="_adm_page_cpt_builder_mobile"><![CDATA[Мобильный построитель]]></string>
@@ -1262,6 +1269,7 @@
 	<string name="_adm_scs_operation_done"><![CDATA[]]></string>
 	<string name="_adm_stg_cpt_category_account"><![CDATA[Аккаунт]]></string>
 	<string name="_adm_stg_cpt_category_acl"><![CDATA[Уровни доступа]]></string>
+  <string name="_adm_stg_cpt_category_audit"><![CDATA[Аудит]]></string>
 	<string name="_adm_stg_cpt_category_notifications"><![CDATA[Оповещения]]></string>
 	<string name="_adm_stg_cpt_category_notifications_push"><![CDATA[Push - оповещения]]></string>
 	<string name="_adm_stg_cpt_category_cache"><![CDATA[Кэш]]></string>
@@ -1313,6 +1321,10 @@
 	<string name="_adm_stg_cpt_option_sys_acl_expire_notification_days"><![CDATA[За сколько дней до окончания членства оповестить пользователя об окончании (-1 = после окончания)]]></string>
 	<string name="_adm_stg_cpt_option_sys_acl_expire_notify_once"><![CDATA[Оповещать пользователей об окончании членства только одинажды (каждый день в противном случае)]]></string>
 	<string name="_adm_stg_cpt_option_sys_add_nofollow"><![CDATA[Добавить атрибут "nofollow" для внешних ссылок]]></string>
+  <string name="_adm_stg_cpt_option_sys_audit_enable"><![CDATA[Активно]]></string>
+  <string name="_adm_stg_cpt_option_sys_audit_max_records"><![CDATA[Количество записей в логе]]></string>
+  <string name="_adm_stg_cpt_option_sys_audit_days_before_expire"><![CDATA[Удалять записи в логе старше, чем (дней)]]></string>
+  <string name="_adm_stg_cpt_option_sys_audit_acl_levels"><![CDATA[Активно для уровней]]></string>
 	<string name="_adm_stg_cpt_option_sys_autoupdate_force_modified_files"><![CDATA[Инициировать автообновление, даже если какие-то файлы были модифицированы]]></string>
 	<string name="_adm_stg_cpt_option_sys_autoupdate"><![CDATA[Включить автообновление]]></string>
 	<string name="_adm_stg_cpt_option_sys_cache_memcache_host"><![CDATA[Memcached - адрес сервера]]></string>
@@ -1389,6 +1401,7 @@
 	<string name="_adm_stg_cpt_option_sys_template_cache_minify_css_enable"><![CDATA[Задействовать уменьшение для файлов CSS (кэш должен быть задействован)]]></string>
 	<string name="_adm_stg_cpt_option_sys_template_cache_minify_js_enable"><![CDATA[Задействовать уменьшение для файлов JS (кэш должен быть задействован)]]></string>
 	<string name="_adm_stg_cpt_option_sys_transcoder_queue_storage"><![CDATA[Удалённая раскодировка видео (требуется дополнительная настройка)]]></string>
+  <string name="_adm_stg_cpt_option_sys_session_lifetime_in_min"><![CDATA[Время жизни сессии (в минутах)]]></string>
 	<string name="_adm_stg_cpt_option_template"><![CDATA[Основная тема]]></string>
 	<string name="_adm_stg_err_option_template"><![CDATA[Тема не может быть пустой и должна иметь приемлемое название.]]></string>
     <string name="_adm_stg_cpt_option_use_like_operator"><![CDATA[Использовать для поиска оператор LIKE (рекомендуется для небольшого содержимого)]]></string>
@@ -1560,6 +1573,7 @@
 	<string name="_adm_txt_show_help"><![CDATA[Помощь]]></string>
 	<string name="_adm_txt_show_help_content_empty"><![CDATA[Помошь недоступна]]></string>
 	<string name="_adm_txt_uninstall"><![CDATA[Демонтировать]]></string>
+  <string name="_adm_wgt_cpt_audit"><![CDATA[Аудит]]></string>
 	<string name="_adm_wgt_cpt_builder_forms"><![CDATA[Формы]]></string>
 	<string name="_adm_wgt_cpt_builder_menus"><![CDATA[Навигация]]></string>
 	<string name="_adm_wgt_cpt_builder_pages"><![CDATA[Страницы]]></string>
@@ -1694,7 +1708,44 @@
 	<string name="_sys_acl_start"><![CDATA[Начало: ]]></string>
 	<string name="_sys_acl_expire"><![CDATA[Окончание: ]]></string>
 	<string name="_sys_acl_expire_never"><![CDATA[никогда]]></string>
-	<string name="_sys_add_friend"><![CDATA[Добавить в друзья]]></string>
+
+  <string name="_sys_audit_action_edit_content"><![CDATA[Контент изменен]]></string>
+  <string name="_sys_audit_action_add_content"><![CDATA[Контент добавлен]]></string>
+  <string name="_sys_audit_action_detete_content"><![CDATA[Контент удален]]></string>
+  <string name="_sys_audit_action_edit_comment"><![CDATA[Комментарий изменен]]></string>
+  <string name="_sys_audit_action_add_comment"><![CDATA[Комментарий добавлен]]></string>
+  <string name="_sys_audit_action_delete_comment"><![CDATA[Комментарий удален]]></string>
+  <string name="_sys_audit_action_feature"><![CDATA[Добавлен в избранные]]></string>
+  <string name="_sys_audit_action_unfeature"><![CDATA[Удален из избранных]]></string>
+  <string name="_sys_audit_action_group_to_admins"><![CDATA[Добавлен в администраторы группы]]></string>
+  <string name="_sys_audit_action_group_from_admins"><![CDATA[Удален из администраторов группы]]></string>
+  <string name="_sys_audit_action_group_join_request_accepted"><![CDATA[Запрос принят]]></string>
+  <string name="_sys_audit_action_account_change_role_to_3"><![CDATA[Добавлен в операторы]]></string>
+  <string name="_sys_audit_action_account_change_role_to_1"><![CDATA[Удален из операторов]]></string>
+  <string name="_sys_audit_action_account_unlock"><![CDATA[Разблокирован]]></string>
+  <string name="_sys_audit_action_account_reset_password"><![CDATA[Пароль сброшен]]></string>
+  <string name="_sys_audit_action_account_resend_confirmation_email"><![CDATA[Письмо с подтверждением отправлено повторно]]></string>
+  <string name="_sys_audit_action_account_deleted_with_content"><![CDATA[Удален вместе с контентом]]></string>
+  <string name="_sys_audit_action_account_deleted"><![CDATA[Удален]]></string>
+  <string name="_sys_audit_action_account_email_changed"><![CDATA[Адрес электронной почты изменен]]></string>
+  <string name="_sys_audit_action_account_activated"><![CDATA[Активирован]]></string>
+  <string name="_sys_audit_action_account_suspended"><![CDATA[Приостановлен]]></string>
+  <string name="_sys_audit_action_content_enabled"><![CDATA[Включено]]></string>
+  <string name="_sys_audit_action_content_disabled"><![CDATA[Выключено]]></string>
+  <string name="_sys_audit_action_set_membership"><![CDATA[Набор участников]]></string>
+  <string name="_sys_audit_action_set_status_approve"><![CDATA[Статус: принято]]></string>
+  <string name="_sys_audit_action_set_status_active"><![CDATA[Статус: активно]]></string>
+  <string name="_sys_audit_action_set_status_disapprove"><![CDATA[Статус: не одобрено]]></string>
+  <string name="_sys_audit_action_set_status_suspended"><![CDATA[Статус: приостановлено]]></string>
+  <string name="_sys_audit_action_report"><![CDATA[Новая жалоба]]></string>
+  <string name="_sys_audit_action_lock"><![CDATA[Заблокировно]]></string>
+  <string name="_sys_audit_action_unlock"><![CDATA[Разблокировано]]></string>
+  <string name="_sys_audit_action_stick"><![CDATA[Приклеено]]></string>
+  <string name="_sys_audit_action_unstick"><![CDATA[Отклеено]]></string>
+  <string name="_sys_audit_action_promote"><![CDATA[Продвинуно]]></string>
+  <string name="_sys_audit_action_unpromote"><![CDATA[Продвижение снято]]></string>
+
+  <string name="_sys_add_friend"><![CDATA[Добавить в друзья]]></string>
         <string name="_sys_add_relation"><![CDATA[Добавить связь]]></string>
 	<string name="_sys_adm_installed"><![CDATA[Установленные]]></string>
 	<string name="_sys_admin_apply"><![CDATA[Применить]]></string>
@@ -2290,6 +2341,7 @@
 	<string name="_sys_menu_item_title_add_content"><![CDATA[Добавить...]]></string>
 	<string name="_sys_menu_item_title_cart"><![CDATA[Корзина]]></string>
 	<string name="_sys_menu_item_title_cmts_administration"><![CDATA[Комментарии]]></string>
+  <string name="_sys_menu_item_title_audit_administration"><![CDATA[Аудит]]></string>
 	<string name="_sys_menu_item_title_cmts_item_delete"><![CDATA[Удалить]]></string>
 	<string name="_sys_menu_item_title_cmts_item_edit"><![CDATA[Редактировать]]></string>
         <string name="_sys_menu_item_title_cmts_item_quote"><![CDATA[]]></string>
@@ -2355,6 +2407,7 @@
 	<string name="_sys_menu_item_title_system_add_content"><![CDATA[Добавить Содержимое]]></string>
 	<string name="_sys_menu_item_title_system_cart"><![CDATA[Корзина]]></string>
   <string name="_sys_menu_item_title_system_cmts_administration"><![CDATA[Комментарии]]></string>
+  <string name="_sys_menu_item_title_system_audit_administration"><![CDATA[Аудит]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_delete"><![CDATA[Удалить]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_edit"><![CDATA[Редактировать]]></string>
         <string name="_sys_menu_item_title_system_cmts_item_quote"><![CDATA[Цитировать]]></string>
@@ -2527,6 +2580,7 @@
     <string name="_sys_page_block_title_chart_growth"><![CDATA[Диаграммы развития]]></string>
     <string name="_sys_page_block_title_chart_stats"><![CDATA[Содержимое]]></string>    
 	<string name="_sys_page_block_title_cmts_administration"><![CDATA[Управление комментариями]]></string>
+  <string name="_sys_page_block_title_audit_administration"><![CDATA[Аудит]]></string>
 	<string name="_sys_page_block_title_confirm_email"><![CDATA[Email - Подтверждение]]></string>
 	<string name="_sys_page_block_title_confirm_phone"><![CDATA[Телефон - Подтверждение]]></string>
 	<string name="_sys_page_block_title_create_account"><![CDATA[Присоединиться]]></string>
@@ -2545,6 +2599,7 @@
 	<string name="_sys_page_block_system_title_login_step3"><![CDATA[Вход - шаг 3]]></string>
 	<string name="_sys_page_block_system_title_login_only"><![CDATA[Вход]]></string>
 	<string name="_sys_page_block_title_system_cmts_administration"><![CDATA[Управление комментариями]]></string>
+  <string name="_sys_page_block_title_system_audit_administration"><![CDATA[Аудит]]></string>
 	<string name="_sys_page_block_title_login"><![CDATA[Вход]]></string>
 	<string name="_sys_page_block_title_login_step2"><![CDATA[Вход - шаг 2]]></string>
 	<string name="_sys_page_block_title_login_step3"><![CDATA[Вход - шаг 3]]></string>
@@ -2569,7 +2624,8 @@
 	<string name="_sys_page_title_account_settings_info"><![CDATA[Редактировать аккаунт]]></string>
 	<string name="_sys_page_title_account_settings_pwd"><![CDATA[Изменить пароль]]></string>
 	<string name="_sys_page_title_add_content"><![CDATA[Добавить содержимое]]></string>
-        <string name="_sys_page_title_cmts_administration"><![CDATA[Управление комментариями]]></string>
+  <string name="_sys_page_title_cmts_administration"><![CDATA[Управление комментариями]]></string>
+  <string name="_sys_page_title_audit_administration"><![CDATA[Аудит]]></string>
 	<string name="_sys_page_title_confirm_email"><![CDATA[Email - Подтверждение]]></string>
 	<string name="_sys_page_title_confirm_phone"><![CDATA[Телефон - Подтверждение]]></string>
 	<string name="_sys_page_title_create_account"><![CDATA[Присоединиться]]></string>
@@ -2592,6 +2648,7 @@
 	<string name="_sys_page_title_system_account_settings_pwd"><![CDATA[Изменить пароль]]></string>
 	<string name="_sys_page_title_system_add_content"><![CDATA[Добавить содержимое]]></string>
         <string name="_sys_page_title_system_cmts_administration"><![CDATA[Управление комментариями]]></string>
+  <string name="_sys_page_title_system_audit_administration"><![CDATA[Аудит]]></string>
 	<string name="_sys_page_title_system_confirm_email"><![CDATA[Email подтверждение]]></string>
 	<string name="_sys_page_title_system_confirm_phone"><![CDATA[Подтверждение телефона]]></string>
 	<string name="_sys_page_title_system_create_account"><![CDATA[Присоединиться]]></string>

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

@@ -204,6 +204,7 @@
     <string name="_bx_shopify_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_shopify_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_shopify_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_shopify_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_shopify_grid_action_err_delete"><![CDATA[Cannot delete the selected product(s).]]></string>
     <string name="_bx_shopify_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -407,6 +407,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_shopify_administration', 'single', 'edit', '_bx_shopify_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_shopify_administration', 'single', 'delete', '_bx_shopify_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_shopify_administration', 'single', 'settings', '_bx_shopify_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_shopify_administration', 'single', 'audit_content', '_bx_shopify_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 
 ('bx_shopify_common', 'bulk', 'delete', '_bx_shopify_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_shopify_common', 'single', 'edit', '_bx_shopify_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),

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

@@ -220,6 +220,7 @@
     <string name="_bx_snipcart_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_snipcart_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_snipcart_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_snipcart_grid_action_title_adm_audit_content"><![CDATA[More Actions]]></string>
     <string name="_bx_snipcart_grid_action_err_delete"><![CDATA[Cannot delete the selected product(s).]]></string>
     <string name="_bx_snipcart_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -408,6 +408,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_snipcart_administration', 'single', 'edit', '_bx_snipcart_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_snipcart_administration', 'single', 'delete', '_bx_snipcart_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_snipcart_administration', 'single', 'settings', '_bx_snipcart_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_snipcart_administration', 'single', 'audit_content', '_bx_snipcart_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 
 ('bx_snipcart_common', 'bulk', 'delete', '_bx_snipcart_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_snipcart_common', 'single', 'edit', '_bx_snipcart_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),

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

@@ -242,6 +242,8 @@
 	<string name="_bx_spaces_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
 	<string name="_bx_spaces_grid_action_title_adm_delete_with_content"><![CDATA[Delete With Content]]></string>
 	<string name="_bx_spaces_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+  <string name="_bx_spaces_grid_action_title_adm_audit_context"><![CDATA[Audit actions in context]]></string>
+  <string name="_bx_spaces_grid_action_title_adm_audit_content"><![CDATA[Audit actions with content]]></string>
 	<string name="_bx_spaces_grid_action_err_delete"><![CDATA[Cannot delete the selected space(s).]]></string>
 	<string name="_bx_spaces_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 	

modules/boonex/spaces/install/sql/enable.sql

@@ -469,6 +469,8 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_spaces_administration', 'bulk', 'delete', '_bx_spaces_grid_action_title_adm_delete', '', 0, 1, 2),
 ('bx_spaces_administration', 'bulk', 'delete_with_content', '_bx_spaces_grid_action_title_adm_delete_with_content', '', 0, 1, 3),
 ('bx_spaces_administration', 'single', 'settings', '_bx_spaces_grid_action_title_adm_more_actions', 'cog', 1, 0, 2),
+('bx_spaces_administration', 'single', 'audit_content', '_bx_spaces_grid_action_title_adm_audit_content', 'search', 1, 0, 3),
+('bx_spaces_administration', 'single', 'audit_context', '_bx_spaces_grid_action_title_adm_audit_context', 'search-location', 1, 0, 4),
 ('bx_spaces_common', 'bulk', 'delete', '_bx_spaces_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_spaces_common', 'bulk', 'delete_with_content', '_bx_spaces_grid_action_title_adm_delete_with_content', '', 0, 1, 2),
 ('bx_spaces_common', 'single', 'settings', '_bx_spaces_grid_action_title_adm_more_actions', 'cog', 1, 0, 1);

modules/boonex/timeline/classes/BxTimelineDb.php

@@ -641,8 +641,16 @@ class BxTimelineDb extends BxBaseModNotificationsDb
                 list($sMethod, $sSelectClause, $sJoinClause, $sWhereClause, $sOrderClause, $sLimitClause) = parent::_getSqlPartsEvents(array_merge($aParams, array('browse' => 'list')));
                 if(in_array($aParams['type'], array(BX_TIMELINE_TYPE_NEWS, BX_TIMELINE_TYPE_FEED, BX_BASE_MOD_NTFS_TYPE_CONNECTIONS, BX_TIMELINE_TYPE_OWNER_AND_CONNECTIONS)))
                     $sSelectClause  = "DISTINCT " . $sSelectClause;
-
-                $sWhereClause .= $this->prepareAsString("AND `{$this->_sTable}`.`id`<=? ", $aParams['from']);
+                
+                $sSqlFrom = $this->prepareAsString("AND `{$this->_sTable}`.`id`<=? ", $aParams['from']);
+                if (is_array($sWhereClause)){
+                    foreach($sWhereClause as $sKey => $sValue){
+                        $sWhereClause[$sKey] = $sValue . $sSqlFrom;
+                    }
+                }
+                else{
+                    $sWhereClause .= $sSqlFrom;
+                }
                 break;
 
             case 'ids':

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

@@ -225,6 +225,7 @@
     <string name="_bx_timeline_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_timeline_grid_column_title_adm_author"><![CDATA[Author]]></string>
     <string name="_bx_timeline_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
+    <string name="_bx_timeline_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_timeline_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 
     <string name="_bx_timeline_alert_module_timeline_common_post"><![CDATA[Timeline (post)]]></string>

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

@@ -361,8 +361,8 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_timeline_administration', 'bulk', 'delete', '_bx_timeline_grid_action_title_adm_delete', '', 0, 1, 1),
-('bx_timeline_administration', 'single', 'delete', '_bx_timeline_grid_action_title_adm_delete', 'remove', 1, 1, 2);
-
+('bx_timeline_administration', 'single', 'delete', '_bx_timeline_grid_action_title_adm_delete', 'remove', 1, 1, 2),
+('bx_timeline_administration', 'single', 'audit_content', '_bx_timeline_grid_action_title_adm_audit_content', 'search', 1, 0, 4);
 
 -- METATAGS
 INSERT INTO `sys_objects_metatags` (`object`, `table_keywords`, `table_locations`, `table_mentions`, `override_class_name`, `override_class_file`) VALUES

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

@@ -201,6 +201,7 @@
     <string name="_bx_videos_grid_action_title_adm_edit"><![CDATA[Edit]]></string>
     <string name="_bx_videos_grid_action_title_adm_delete"><![CDATA[Delete]]></string>
     <string name="_bx_videos_grid_action_title_adm_more_actions"><![CDATA[More Actions]]></string>
+    <string name="_bx_videos_grid_action_title_adm_audit_content"><![CDATA[Audit actions]]></string>
     <string name="_bx_videos_grid_action_err_delete"><![CDATA[Cannot delete the selected video(s).]]></string>
     <string name="_bx_videos_grid_txt_account_manager"><![CDATA[Redirect to manage account.]]></string>
 

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

@@ -414,6 +414,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_videos_administration', 'single', 'edit', '_bx_videos_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_videos_administration', 'single', 'delete', '_bx_videos_grid_action_title_adm_delete', 'remove', 1, 1, 2),
 ('bx_videos_administration', 'single', 'settings', '_bx_videos_grid_action_title_adm_more_actions', 'cog', 1, 0, 3),
+('bx_videos_administration', 'single', 'audit_content', '_bx_videos_grid_action_title_adm_audit_content', 'search', 1, 0, 4),
 ('bx_videos_common', 'bulk', 'delete', '_bx_videos_grid_action_title_adm_delete', '', 0, 1, 1),
 ('bx_videos_common', 'single', 'edit', '_bx_videos_grid_action_title_adm_edit', 'pencil-alt', 1, 0, 1),
 ('bx_videos_common', 'single', 'delete', '_bx_videos_grid_action_title_adm_delete', 'remove', 1, 1, 2),

samples/macros.php

@@ -36,6 +36,12 @@ function PageCompMainCode()
         'BxBaseModGeneralModule' => 'bx_base_general',
         'BxBaseServices' => 'bx_system_general',
         'BxBaseServiceAccount' => 'bx_system_general',
+        'BxBaseServiceCategory' => 'bx_system_general',
+        'BxBaseServiceLogin' => 'bx_system_general',
+        'BxBaseServiceMetatags' => 'bx_system_general',
+        'BxBaseServiceProfiles' => 'bx_system_general',
+        'BxBaseChartServices' => 'bx_system_general',
+        'BxBasePaymentsServices' => 'bx_system_general',
     );
 
     $o = BxDolModuleQuery::getInstance();

studio/template/scripts/BxBaseStudioAudit.php

@@ -78,7 +78,6 @@ class BxBaseStudioAudit extends BxDolStudioAudit
     
     protected function getSettings()
     {
-       
         $oPage = new BxTemplStudioSettings(BX_DOL_STUDIO_STG_TYPE_SYSTEM, BX_DOL_STUDIO_STG_CATEGORY_AUDIT);
         return BxDolStudioTemplate::getInstance()->parseHtmlByName('audit.html', array(
             'content' => $oPage->getPageCode(),
@@ -88,13 +87,12 @@ class BxBaseStudioAudit extends BxDolStudioAudit
 
     protected function getGrid($sObjectName)
     {
-        
         $oGrid = BxDolGrid::getObjectInstance('sys_audit_administration');
         if(!$oGrid)
             return '';
 
         $oTemplate = BxDolStudioTemplate::getInstance();
-        $oTemplate->addJs(array('BxDolAuditManageTools.js', 'BxDolGrid.js', 'jquery-ui.min.js', 'jquery.form.min.js', 'jquery-ui\jquery-ui.custom.min.js' , 'jquery-ui\jquery.ui.sortable.min.js'));
+        $oTemplate->addJs(array('BxDolAuditManageTools.js', 'BxDolGrid.js', 'jquery.form.min.js', 'jquery-ui/jquery-ui.custom.min.js' , 'jquery-ui/jquery.ui.sortable.min.js'));
         //$oForm = new BxTemplStudioFormView(array());
         $oTemplate->addCss('grid.css');
         $oTemplate->addJsTranslation(array('_sys_grid_search'));

template/scripts/BxBaseAuditGrid.php

@@ -0,0 +1,160 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaBaseView UNA Base Representation Classes
+ * @{
+ */
+
+class BxBaseAuditGrid extends BxDolAuditGrid
+{
+    protected $sJsObject = 'oBxDolAuditManageTools';
+    
+    public function __construct($aInfo, $oTemplate = false)
+    {
+        parent::__construct($aInfo, $oTemplate);
+    }
+    
+    public function getCode($isDisplayHeader = true)
+    {
+        return $this->getJsCode() . parent::getCode($isDisplayHeader);
+    }
+    
+    public function getJsCode()
+    {
+        $aParams = array(
+            'sObjName' => $this->sJsObject,
+            'aHtmlIds' => array(),
+            'oRequestParams' => array(),
+        	'sObjNameGrid' => 'sys_audit_administration'
+        );
+        return BxDolTemplate::getInstance()->_wrapInTagJsCode("var " . $this->sJsObject . " = new BxDolAuditManageTools(" . json_encode($aParams) . ");");
+    }
+    
+    protected function _getCellAdded($mixedValue, $sKey, $aField, $aRow)
+    {
+        return parent::_getCellDefault(bx_time_js($mixedValue), $sKey, $aField, $aRow);
+    }
+    
+    protected function _getCellAction ($mixedValue, $sKey, $aField, $aRow)
+    {
+        return parent::_getCellDefault(_t($aRow['action_lang_key'], $aRow['action_lang_key_params']), $sKey, $aField, $aRow);
+    }
+    
+    protected function _getCellContent ($mixedValue, $sKey, $aField, $aRow)
+    {
+        $mixedValue = '';
+        if ($aRow['content_id'] > 0 && $aRow['content_info_object'] != ''){
+            $oContentInfo = BxDolContentInfo::getObjectInstance($aRow['content_info_object']);
+            if ($oContentInfo){
+    	        $sTitle = bx_process_output($oContentInfo->getContentTitle($aRow['content_id']));
+                if ($sTitle != ''){
+                    $mixedValue =  $this->_oTemplate->parseHtmlByName('account_link.html', array(
+                        'href' => $oContentInfo->getContentLink($aRow['content_id']),
+                        'title' =>  $sTitle,
+                        'content' =>  $sTitle,
+                        'class' => 'bx-def-font-grayed'
+                    ));
+                }
+            }
+        }
+        if ($mixedValue == ''){
+            $mixedValue = bx_process_output($aRow['content_title']);
+        }
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+    
+    protected function _getCellContext ($mixedValue, $sKey, $aField, $aRow)
+    {
+        if ($aRow['context_profile_id'] > 0){
+    	    $oProfile = BxDolProfile::getInstance($aRow['context_profile_id']);
+            if ($oProfile){
+    	        $sProfile = $oProfile->getDisplayName();
+                $mixedValue =  $this->_oTemplate->parseHtmlByName('account_link.html', array(
+                    'href' => $oProfile->getUrl(),
+                    'title' => $sProfile,
+                    'content' => $sProfile,
+                    'class' => 'bx-def-font-grayed'
+                ));
+            }
+            else{
+                $mixedValue = $aRow['context_profile_title'];
+            }
+        }
+        else{
+            $mixedValue = '';
+        }
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+    
+    protected function _getCellModule ($mixedValue, $sKey, $aField, $aRow)
+    {
+        $oModule = bxDolModule::getInstance($aRow['content_module']);
+        if($oModule && $oModule instanceof iBxDolContentInfoService){
+            $mixedValue = $oModule->_aModule['title'];
+        }
+        else{
+            $mixedValue = $aRow['content_module'];
+        }
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+    
+    
+    protected function _getCellProfile ($mixedValue, $sKey, $aField, $aRow)
+    {
+        if ($aRow['profile_id'] > 0){
+    	    $oProfile = BxDolProfile::getInstance($aRow['profile_id']);
+            if ($oProfile){
+    	        $sProfile = $oProfile->getDisplayName();
+                $mixedValue =  $this->_oTemplate->parseHtmlByName('account_link.html', array(
+                    'href' => $oProfile->getUrl(),
+                    'title' => $sProfile,
+                    'content' => $sProfile,
+                    'class' => 'bx-def-font-grayed'
+                ));
+            }
+            else{
+                $mixedValue = $aRow['profile_title'];
+            }
+        }
+        else{
+            $mixedValue = '';
+        }
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+    
+    function _getFilterControls()
+    {
+        parent::_getFilterControls();
+
+        return  $this->_getFilterSelectOne($this->_sFilter1Name, $this->_sFilter1Value, $this->_aFilter1Values);
+    }
+    
+    protected function _getFilterSelectOne($sFilterName, $sFilterValue, $aFilterValues)
+    {
+        if(empty($sFilterName) || empty($aFilterValues))
+            return '';
+
+		$CNF = &$this->_oModule->_oConfig->CNF;		
+
+		foreach($aFilterValues as $sKey => $sValue)
+			$aFilterValues[$sKey] = _t($sValue);
+
+        $aInputModules = array(
+            'type' => 'select',
+            'name' => $sFilterName,
+            'attrs' => array(
+                'id' => 'bx-grid-' . $sFilterName . '-' . $this->_sObject,
+                'onChange' => 'javascript:' . $this->sJsObject . '.onChangeFilter(this)'
+            ),
+            'value' => $sFilterValue,
+            'values' => array_merge(array('' => _t($CNF['T']['filter_item_select_one_' . $sFilterName])), $aFilterValues)
+        );
+
+        $oForm = new BxTemplFormView(array());
+        return $oForm->genRow($aInputModules);
+    }
+}
+
+/** @} */

template/scripts/BxBaseAuditServices.php

@@ -0,0 +1,159 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaBaseView UNA Base Representation Classes
+ * @{
+ */
+
+/**
+ * System services related to Comments.
+ */
+class BxBaseAuditServices extends BxDol
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function serviceManageTools()
+    {
+        $oGrid = BxDolGrid::getObjectInstance('sys_audit_administration');
+        if(!$oGrid)
+            return '';
+
+        $oTemplate = BxDolTemplate::getInstance();
+        $oTemplate->addJs(array('BxDolAuditManageTools.js', 'BxDolGrid.js'));
+        $oTemplate->addJsTranslation(array('_sys_grid_search'));
+        return array(
+            'content' =>  $oGrid->getCode()
+        );
+    }
+    
+    /**
+     * Comment vote for Notifications module
+     */
+    public function serviceGetNotificationsVote($aEvent)
+    {
+        $iCmtIdUnique = (int)$aEvent['object_id'];
+
+        $aCmtInfo = BxDolCmts::getGlobalInfo($iCmtIdUnique);
+        if(empty($aCmtInfo) || !is_array($aCmtInfo))
+            return array();
+
+        $oCmts = BxDolCmts::getObjectInstance($aCmtInfo['system_name'], 0, false);
+        if(!$oCmts || !$oCmts->isEnabled())
+            return array();
+
+        $oVote = $oCmts->getVoteObject($iCmtIdUnique);
+        if(!$oVote)
+            return array();
+
+        $iCmtId = (int)$aCmtInfo['cmt_id'];
+        $sCmtUrl = $oCmts->serviceGetLink($iCmtId);
+        $sCmtCaption = strmaxtextlen($oCmts->serviceGetText($iCmtId), 20, '...');
+
+        return array(
+            'entry_sample' => $oCmts->getLanguageKey('txt_sample_single'),
+            'entry_url' => $sCmtUrl,
+            'entry_caption' => $sCmtCaption,
+            'entry_author' => $aCmtInfo['author_id'],
+            'subentry_sample' => $oCmts->getLanguageKey('txt_sample_vote_single'),
+            'lang_key' => '', //may be empty or not specified. In this case the default one from Notification module will be used.
+        );
+    }
+
+    /**
+     * Comment reaction for Notifications module
+     */
+    public function serviceGetNotificationsReaction($aEvent)
+    {
+    	$iCmtIdUnique = (int)$aEvent['object_id'];
+
+        $aCmtInfo = BxDolCmts::getGlobalInfo($iCmtIdUnique);
+        if(empty($aCmtInfo) || !is_array($aCmtInfo))
+            return array();
+
+        $oCmts = BxDolCmts::getObjectInstance($aCmtInfo['system_name'], 0, false);
+        if(!$oCmts || !$oCmts->isEnabled())
+            return array();
+
+        $oReaction = $oCmts->getReactionObject($iCmtIdUnique);
+        if(!$oReaction)
+            return array();
+        
+        $aSubentry = $oReaction->getTrackBy(array('type' => 'id', 'id' => (int)$aEvent['subobject_id']));
+        if(empty($aSubentry) || !is_array($aSubentry))
+            return array();
+
+        $aSubentrySampleParams = array();
+        $aReaction = $oReaction->getReaction($aSubentry['reaction']);
+        if(!empty($aReaction['title']))
+            $aSubentrySampleParams[] = $aReaction['title'];
+        else
+            $aSubentrySampleParams[] = '_undefined';
+
+        $iCmtId = (int)$aCmtInfo['cmt_id'];
+        $sCmtUrl = $oCmts->serviceGetLink($iCmtId);
+        $sCmtCaption = strmaxtextlen($oCmts->serviceGetText($iCmtId), 20, '...');
+
+        return array(
+            'entry_sample' => $oCmts->getLanguageKey('txt_sample_single'),
+            'entry_url' => $sCmtUrl,
+            'entry_caption' => $sCmtCaption,
+            'entry_author' => $aCmtInfo['author_id'],
+            'subentry_sample' => $oCmts->getLanguageKey('txt_sample_reaction_single'),
+            'subentry_sample_params' => $aSubentrySampleParams,
+            'lang_key' => '', //may be empty or not specified. In this case the default one from Notification module will be used.
+        );
+    }
+
+    /**
+     * Comment score -> vote up for Notifications module
+     */
+    public function serviceGetNotificationsScoreUp($aEvent)
+    {
+    	return $this->_serviceGetNotificationsScore('up', $aEvent);
+    }
+
+    /**
+     * Comment score -> vote down for Notifications module
+     */
+    public function serviceGetNotificationsScoreDown($aEvent)
+    {
+    	return $this->_serviceGetNotificationsScore('down', $aEvent);
+    }
+
+    protected function _serviceGetNotificationsScore($sType, $aEvent)
+    {
+        $iCmtIdUnique = (int)$aEvent['object_id'];
+
+        $aCmtInfo = BxDolCmts::getGlobalInfo($iCmtIdUnique);
+        if(empty($aCmtInfo) || !is_array($aCmtInfo))
+            return array();
+
+        $oCmts = BxDolCmts::getObjectInstance($aCmtInfo['system_name'], 0, false);
+        if(!$oCmts || !$oCmts->isEnabled())
+            return array();
+
+        $oScore = $oCmts->getScoreObject($iCmtIdUnique);
+        if(!$oScore)
+            return array();
+
+        $iCmtId = (int)$aCmtInfo['cmt_id'];
+        $sCmtUrl = $oCmts->serviceGetLink($iCmtId);
+        $sCmtCaption = strmaxtextlen($oCmts->serviceGetText($iCmtId), 20, '...');
+
+        return array(
+            'entry_sample' => $oCmts->getLanguageKey('txt_sample_single'),
+            'entry_url' => $sCmtUrl,
+            'entry_caption' => $sCmtCaption,
+            'entry_author' => $aCmtInfo['author_id'],
+            'subentry_sample' => $oCmts->getLanguageKey('txt_sample_score_' . $sType . '_single'),
+            'lang_key' => '', //may be empty or not specified. In this case the default one from Notification module will be used.
+        );
+    }
+}
+
+/** @} */

template/scripts/BxBaseChartServices.php

@@ -24,6 +24,22 @@ class BxBaseChartServices extends BxDol
         return CHECK_ACTION_RESULT_ALLOWED;
     }
     
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-chart Chart
+     * @subsubsection bx_system_general-get_chart_growth get_chart_growth
+     * 
+     * @code bx_srv('system', 'get_chart_growth', [], 'TemplChartServices'); @endcode
+     * @code {{~system:get_chart_growth:TemplChartServices~}} @endcode
+     * 
+     * Get growth charts.
+     * 
+     * @see BxBaseChartServices::serviceProfileMembership
+     */
+    /** 
+     * @ref bx_system_general-get_chart_growth "get_chart_growth"
+     */
     public function serviceGetChartGrowth()
     {
         $mixedResult = BxDolService::call('system', 'check_allowed_view', array(), 'TemplChartServices');
@@ -98,6 +114,22 @@ class BxBaseChartServices extends BxDol
         ));
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-chart Chart
+     * @subsubsection bx_system_general-get_chart_stats get_chart_stats
+     * 
+     * @code bx_srv('system', 'get_chart_stats', [], 'TemplChartServices'); @endcode
+     * @code {{~system:get_chart_stats:TemplChartServices~}} @endcode
+     * 
+     * Get statistics chart.
+     * 
+     * @see BxBaseChartServices::serviceGetChartStats
+     */
+    /** 
+     * @ref bx_system_general-get_chart_stats "get_chart_stats"
+     */
     public function serviceGetChartStats()
     {
         $mixedResult = BxDolService::call('system', 'check_allowed_view', array(), 'TemplChartServices');

template/scripts/BxBaseFormView.php

@@ -14,6 +14,7 @@ class BxBaseFormView extends BxDolForm
     protected static $_isCssJsAdded = false;
     protected static $_isCssJsUiAdded = false;
     protected static $_isCssJsMinicolorsAdded = false;
+    protected static $_isCssJsLabelsAdded = false;
     protected static $_isCssJsTimepickerAdded = false;
     protected static $_isCssJsAddedViewMode = false;
 
@@ -1188,15 +1189,7 @@ BLAH;
 
     protected function genCustomInputLabels ($aInput)
     {
-        $this->oTemplate->addJs(array(
-            'select2/js/select2.min.js',
-			'select2/select2-to-tree/select2totree.js',
-        ));
-
-        $this->oTemplate->addCss(array(
-        	BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'select2/css/|select2.min.css',
-			BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'select2/select2-to-tree/|select2totree.css'
-        ));
+        $this->addCssJsLabels ();
         
         $aValues = array();
         $oLabel = BxDolLabel::getInstance();
@@ -1719,6 +1712,21 @@ BLAH;
 
         self::$_isCssJsMinicolorsAdded = true;
     }
+    
+    function addCssJsLabels ()
+    {
+        if (self::$_isCssJsLabelsAdded)
+            return;       
+        
+        $this->_addJs('select2/js/select2.min.js', "'undefined' === typeof($.fn.select2)");
+        $this->_addJs('select2/js/i18n/' . BxDolLanguages::getInstance()->getCurrentLanguage() . '.js', "true");
+        $this->_addJs('select2/select2-to-tree/select2totree.js', "'undefined' === typeof($.fn.select2ToTree)");
+
+        $this->_addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'select2/css/|select2.min.css');
+        $this->_addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'select2/select2-to-tree/|select2totree.css');
+        
+        self::$_isCssJsLabelsAdded = true;
+    }
 
     function addCssJsViewMode ()
     {

template/scripts/BxBasePaymentsServices.php

@@ -22,11 +22,44 @@ class BxBasePaymentsServices extends BxDol
         return BxDolPayments::getInstance()->getPayments();
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services
+     * @subsection bx_system_general-payments Payments
+     * @subsubsection bx_system_general-get_cart_items_count get_cart_items_count
+     * 
+     * @code bx_srv('system', 'get_cart_items_count', [], 'TemplPaymentsServices'); @endcode
+     * @code {{~system:get_cart_items_count:TemplPaymentsServices~}} @endcode
+     * 
+     * Get number of items in shopping cart for currently logged in profile.
+     * 
+     * @see BxBasePaymentsServices::serviceGetChartStats
+     */
+    /** 
+     * @ref bx_system_general-get_cart_items_count "get_cart_items_count"
+     */
     public function serviceGetCartItemsCount()
     {
     	return BxDolPayments::getInstance()->getCartItemsCount();
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services
+     * @subsection bx_system_general-payments Payments
+     * @subsubsection bx_system_general-get_orders_count get_orders_count
+     * 
+     * @code bx_srv('system', 'get_orders_count', ["new"], 'TemplPaymentsServices'); @endcode
+     * @code {{~system:get_orders_count:TemplPaymentsServices["new"]~}} @endcode
+     * 
+     * Get number of order by type for currently logged in profile.
+     * @param $sType type, for example: new
+     * 
+     * @see BxBasePaymentsServices::serviceGetOrdersCount
+     */
+    /** 
+     * @ref bx_system_general-get_orders_count "get_orders_count"
+     */
     public function serviceGetOrdersCount($sType)
     {
     	return BxDolPayments::getInstance()->getOrdersCount($sType);

template/scripts/BxBaseServiceLogin.php

@@ -17,11 +17,45 @@ class BxBaseServiceLogin extends BxDol
         parent::__construct();
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-login Login
+     * @subsubsection bx_system_general-test test
+     * 
+     * @code bx_srv('system', 'test', [3], 'TemplServiceLogin'); @endcode
+     * @code {{~system:test:TemplServiceLogin[3]~}} @endcode
+     * 
+     * Test method which returns provided number multiplied by 2
+     * @param $n number 
+     * 
+     * @see BxBaseServiceLogin::serviceTest
+     */
+    /** 
+     * @ref bx_system_general-create_account_form "create_account_form"
+     */
     public function serviceTest ($n = 1)
     {
         return $n*2;
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-login Login
+     * @subsubsection bx_system_general-member_auth_code member_auth_code
+     * 
+     * @code bx_srv('system', 'member_auth_code', [], 'TemplServiceLogin'); @endcode
+     * @code {{~system:member_auth_code:TemplServiceLogin~}} @endcode
+     * 
+     * Display external login buttons such as Facebook, Twitter, etc
+     * @param $aAuthTypes optional list of external login buttons
+     * 
+     * @see BxBaseServiceLogin::serviceMemberAuthCode
+     */
+    /** 
+     * @ref bx_system_general-member_auth_code "member_auth_code"
+     */
     public function serviceMemberAuthCode($aAuthTypes = array())
     {
         if(empty($aAuthTypes) || !is_array($aAuthTypes))
@@ -75,6 +109,10 @@ class BxBaseServiceLogin extends BxDol
         ));
     }
 
+    /**
+     * Display login form without join text
+     * @see ::serviceLoginForm
+     */
     public function serviceLoginFormOnly ($sParams = '', $sForceRelocate = '')
     {
     	if(strpos($sParams, 'no_join_text') === false)
@@ -83,6 +121,27 @@ class BxBaseServiceLogin extends BxDol
     	return $this->serviceLoginForm($sParams, $sForceRelocate);
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-login Login
+     * @subsubsection bx_system_general-login_form login_form
+     * 
+     * @code bx_srv('system', 'login_form', ["no_auth_buttons"], 'TemplServiceLogin'); @endcode
+     * @code {{~system:login_form:TemplServiceLogin["no_auth_buttons"]~}} @endcode
+     * 
+     * Display login form
+     * @param $sParams optional string with additional params:
+     *          - no_join_text
+     *          - no_auth_buttons
+     *          - ajax_form
+     * @param $sForceRelocate optional URL to redirect to after login
+     * 
+     * @see BxBaseServiceLogin::serviceLoginForm
+     */
+    /** 
+     * @ref bx_system_general-login_form "login_form"
+     */
     public function serviceLoginForm ($sParams = '', $sForceRelocate = '')
     {
         if (isLogged() && 'login' == bx_get('i')) {

template/scripts/BxBaseServiceMetatags.php

@@ -20,11 +20,31 @@ class BxBaseServiceMetatags extends BxDol
     }
 
     /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-metatags Metatags
+     * @subsubsection bx_system_general-keywords_cloud keywords_cloud
+     * 
+     * @code bx_srv('system', 'keywords_cloud', ["bx_posts", "bx_posts"], 'TemplServiceMetatags'); @endcode
+     * @code {{~system:keywords_cloud:TemplServiceMetatags["bx_posts", "bx_posts"]~}} @endcode
+     * 
      * Get keywords cloud.
-     * @param $sObject metatgs object to get keywords cloud for
-     * @param $mixedSection search section to refer when keyword is clicked, set the same as $sObject to show content withing the module only, it can be one value or array of values, leave empty to show all possible content upon keyword click
-     * @param $iMaxCount number of tags in keywords cloud, by default @see BX_METATAGS_KEYWORDS_IN_CLOUD
+     * @param $sObject metatags object to get keywords cloud for
+     * @param $mixedSection search section to refer when keyword is clicked, 
+     *          set the same as $sObject to show content withing the module only, 
+     *          it can be one value or array of values, leave empty to show 
+     *          all possible content upon keyword click
+     * @param $aParams additional params:
+     *          - max_count: number of tags in keywords cloud, 
+     *                  by default BX_METATAGS_KEYWORDS_IN_CLOUD
+     *          - show_empty: show empty message or not when no data available
+     *          
      * @return tags cloud HTML string
+     * 
+     * @see BxBaseServiceMetatags::serviceKeywordsCloud
+     */
+    /** 
+     * @ref bx_system_general-keywords_cloud "keywords_cloud"
      */
     public function serviceKeywordsCloud($sObject, $mixedSection, $aParams = array())
     {

template/scripts/BxBaseServiceProfiles.php

@@ -86,6 +86,23 @@ class BxBaseServiceProfiles extends BxDol
 		return BxDolTemplate::getInstance()->parseLink(BxDolService::call($sModule, $sMethod, array($oProfile->getContentId())), $sCaption);
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-profiles Profiles
+     * @subsubsection bx_system_general-profile_membership profile_membership
+     * 
+     * @code bx_srv('system', 'profile_membership', [2], 'TemplServiceProfiles'); @endcode
+     * @code {{~system:profile_membership:TemplServiceProfiles[2]~}} @endcode
+     * 
+     * Get membership level for specified profile.
+     * @param $iProfileId profile ID
+     * 
+     * @see BxBaseServiceProfiles::serviceProfileMembership
+     */
+    /** 
+     * @ref bx_system_general-profile_membership "profile_membership"
+     */
     public function serviceProfileMembership ($iProfileId = 0)
     {
         if (!$iProfileId)
@@ -94,6 +111,22 @@ class BxBaseServiceProfiles extends BxDol
 		return BxDolAcl::getInstance()->getProfileMembership($iProfileId);
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-profiles Profiles
+     * @subsubsection bx_system_general-profile_notifications profile_notifications
+     * 
+     * @code bx_srv('system', 'profile_notifications', [], 'TemplServiceProfiles'); @endcode
+     * @code {{~system:profile_notifications:TemplServiceProfiles~}} @endcode
+     * 
+     * Get number of unread notifications for logged in profile
+     * 
+     * @see BxBaseServiceProfiles::serviceProfileNotifications
+     */
+    /** 
+     * @ref bx_system_general-profile_notifications "profile_notifications"
+     */
     public function serviceProfileNotifications ($iProfileId = 0)
     {
         if (!$iProfileId)
@@ -113,6 +146,22 @@ class BxBaseServiceProfiles extends BxDol
         return $iNum;
     }
 
+    /**
+     * @page service Service Calls
+     * @section bx_system_general System Services 
+     * @subsection bx_system_general-profiles Profiles
+     * @subsubsection bx_system_general-get_count_online_profiles get_count_online_profiles
+     * 
+     * @code bx_srv('system', 'get_count_online_profiles', [], 'TemplServiceProfiles'); @endcode
+     * @code {{~system:get_count_online_profiles:TemplServiceProfiles~}} @endcode
+     * 
+     * Get number of online profiles
+     * 
+     * @see BxBaseServiceProfiles::serviceGetCountOnlineProfiles
+     */
+    /** 
+     * @ref bx_system_general-get_count_online_profiles "get_count_online_profiles"
+     */
     public function serviceGetCountOnlineProfiles ()
     {
         $oProfilesQuery = BxDolProfileQuery::getInstance();

template/scripts/BxBaseServices.php

@@ -34,6 +34,22 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
             'ForgotPassword' => 'BxBaseServiceAccount',
 
             'CategoriesList' => 'BxBaseServiceCategory',
+
+            'Test' => 'BxBaseServiceLogin',
+            'MemberAuthCode' => 'BxBaseServiceLogin',
+            'LoginForm' => 'BxBaseServiceLogin',
+        
+            'KeywordsCloud' => 'BxBaseServiceMetatags',
+
+            'ProfileMembership' => 'BxBaseServiceProfiles',
+            'ProfileNotifications' => 'BxBaseServiceProfiles',
+            'GetCountOnlineProfiles' => 'BxBaseServiceProfiles',
+
+            'GetChartGrowth' => 'BxBaseChartServices',
+            'GetChartStats' => 'BxBaseChartServices',
+
+            'GetCartItemsCount' => 'BxBasePaymentsServices',
+            'GetOrdersCount' => 'BxBasePaymentsServices',
         );
     }
     public function serviceProfileUnit ($iContentId, $aParams = array())