Browse Source

Merge branch 'master' of https://github.com/unaio/una

AntonLV 5 years ago
parent
commit
2dab4d0328
48 changed files with 237 additions and 21 deletions
  1. 1 1
      modules/base/general/classes/BxBaseModGeneralGridAdministration.php
  2. 35 1
      modules/base/general/classes/BxBaseModGeneralModule.php
  3. 1 1
      modules/base/profile/classes/BxBaseModProfileGridAdministration.php
  4. 1 0
      modules/boonex/accounts/install/langs/en.xml
  5. 8 1
      modules/boonex/accounts/install/sql/enable.sql
  6. 1 0
      modules/boonex/ads/install/langs/en.xml
  7. 8 1
      modules/boonex/ads/install/sql/enable.sql
  8. 1 0
      modules/boonex/albums/install/langs/en.xml
  9. 8 1
      modules/boonex/albums/install/sql/enable.sql
  10. 1 0
      modules/boonex/channels/install/langs/en.xml
  11. 7 0
      modules/boonex/channels/install/sql/enable.sql
  12. 1 0
      modules/boonex/classes/install/langs/en.xml
  13. 8 1
      modules/boonex/classes/install/sql/enable.sql
  14. 1 0
      modules/boonex/courses/install/langs/en.xml
  15. 7 0
      modules/boonex/courses/install/sql/enable.sql
  16. 1 0
      modules/boonex/events/install/langs/en.xml
  17. 7 0
      modules/boonex/events/install/sql/enable.sql
  18. 1 0
      modules/boonex/files/install/langs/en.xml
  19. 8 1
      modules/boonex/files/install/sql/enable.sql
  20. 1 0
      modules/boonex/forum/install/langs/en.xml
  21. 7 0
      modules/boonex/forum/install/sql/enable.sql
  22. 1 0
      modules/boonex/glossary/install/langs/en.xml
  23. 8 1
      modules/boonex/glossary/install/sql/enable.sql
  24. 1 0
      modules/boonex/groups/install/langs/en.xml
  25. 7 0
      modules/boonex/groups/install/sql/enable.sql
  26. 1 0
      modules/boonex/market/install/langs/en.xml
  27. 7 1
      modules/boonex/market/install/sql/enable.sql
  28. 8 1
      modules/boonex/organizations/install/sql/enable.sql
  29. 1 0
      modules/boonex/persons/install/langs/en.xml
  30. 8 2
      modules/boonex/persons/install/sql/enable.sql
  31. 1 0
      modules/boonex/photos/install/langs/en.xml
  32. 8 1
      modules/boonex/photos/install/sql/enable.sql
  33. 1 0
      modules/boonex/polls/install/langs/en.xml
  34. 8 1
      modules/boonex/polls/install/sql/enable.sql
  35. 2 0
      modules/boonex/posts/install/langs/en.xml
  36. 8 1
      modules/boonex/posts/install/sql/enable.sql
  37. 1 0
      modules/boonex/reviews/install/langs/en.xml
  38. 8 1
      modules/boonex/reviews/install/sql/enable.sql
  39. 1 0
      modules/boonex/shopify/install/langs/en.xml
  40. 8 1
      modules/boonex/shopify/install/sql/enable.sql
  41. 1 0
      modules/boonex/snipcart/install/langs/en.xml
  42. 8 1
      modules/boonex/snipcart/install/sql/enable.sql
  43. 1 0
      modules/boonex/spaces/install/langs/en.xml
  44. 7 0
      modules/boonex/spaces/install/sql/enable.sql
  45. 1 0
      modules/boonex/tasks/install/langs/en.xml
  46. 8 1
      modules/boonex/tasks/install/sql/enable.sql
  47. 1 0
      modules/boonex/videos/install/langs/en.xml
  48. 8 1
      modules/boonex/videos/install/sql/enable.sql

+ 1 - 1
modules/base/general/classes/BxBaseModGeneralGridAdministration.php

@@ -110,7 +110,7 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
 
     protected function _getActionDelete($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())
     {
-		if($this->_sManageType == BX_DOL_MANAGE_TOOLS_ADMINISTRATION && $this->_oModule->checkAllowedEditAnyEntry() !== CHECK_ACTION_RESULT_ALLOWED)
+		if($this->_sManageType == BX_DOL_MANAGE_TOOLS_ADMINISTRATION && !$this->_oModule->_isAdministrator())
 			return '';
 
     	return $this->_getActionDefault($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);

+ 35 - 1
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -1289,6 +1289,7 @@ class BxBaseModGeneralModule extends BxDolModule
         return $oMenu ? $oMenu->getCode() : false;
     }
 
+    
     /**
      * @page service Service Calls
      * @section bx_base_general Base General
@@ -2193,7 +2194,7 @@ class BxBaseModGeneralModule extends BxDolModule
     public function checkAllowedDelete (&$aDataEntry, $isPerformAction = false)
     {
         // moderator always has access
-        if ($this->_isModerator($isPerformAction))
+        if ($this->_isAdministrator($isPerformAction))
             return CHECK_ACTION_RESULT_ALLOWED;
 
         // check ACL
@@ -2243,6 +2244,14 @@ class BxBaseModGeneralModule extends BxDolModule
     	return $this->checkAllowedEditAnyEntryForProfile($isPerformAction, $this->_iProfileId);
     }
     
+    /**
+     * @return CHECK_ACTION_RESULT_ALLOWED if access is granted or error message if access is forbidden. So make sure to make strict(===) checking.
+     */
+    public function checkAllowedDeleteAnyEntry ($isPerformAction = false)
+    {
+    	return $this->checkAllowedDeleteAnyEntryForProfile($isPerformAction, $this->_iProfileId);
+    }
+    
     /**
      * @return CHECK_ACTION_RESULT_ALLOWED if access is granted or error message if access is forbidden. So make sure to make strict(===) checking.
      */
@@ -2257,6 +2266,21 @@ class BxBaseModGeneralModule extends BxDolModule
 
     	return _t('_sys_txt_access_denied');
     }
+    
+    /**
+     * @return CHECK_ACTION_RESULT_ALLOWED if access is granted or error message if access is forbidden. So make sure to make strict(===) checking.
+     */
+    public function checkAllowedDeleteAnyEntryForProfile ($isPerformAction = false, $iProfileId = false)
+    {
+        if(!$iProfileId)
+            $iProfileId = $this->_iProfileId;
+
+    	$aCheck = checkActionModule($iProfileId, 'delete any entry', $this->getName(), $isPerformAction);
+    	if($aCheck[CHECK_ACTION_RESULT] === CHECK_ACTION_RESULT_ALLOWED)
+    		return CHECK_ACTION_RESULT_ALLOWED;
+
+    	return _t('_sys_txt_access_denied');
+    }
 
     /**
      * @return CHECK_ACTION_RESULT_ALLOWED if access is granted or error message if access is forbidden. So make sure to make "true === " checking.
@@ -2590,6 +2614,16 @@ class BxBaseModGeneralModule extends BxDolModule
     {
         return CHECK_ACTION_RESULT_ALLOWED === $this->checkAllowedEditAnyEntryForProfile ($isPerformAction, $iProfileId);
     }
+    
+    public function _isAdministrator ($isPerformAction = false)
+    {
+        return $this->_isAdministratorForProfile($isPerformAction, $this->_iProfileId);
+    }
+
+    public function _isAdministratorForProfile($isPerformAction = false, $iProfileId = false)
+    {
+        return CHECK_ACTION_RESULT_ALLOWED === $this->checkAllowedDeleteAnyEntryForProfile ($isPerformAction, $iProfileId);
+    }
 
     public function _prepareAuditParams($aContentInfo, $bIsSaveData = true, $aOverrideAuditParams  = array())
     {

+ 1 - 1
modules/base/profile/classes/BxBaseModProfileGridAdministration.php

@@ -108,7 +108,7 @@ class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministrat
 
 	protected function _getActionDeleteWithContent($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())
     {
-		if($this->_sManageType == BX_DOL_MANAGE_TOOLS_ADMINISTRATION && $this->_oModule->checkAllowedEditAnyEntry() !== CHECK_ACTION_RESULT_ALLOWED)
+		if($this->_sManageType == BX_DOL_MANAGE_TOOLS_ADMINISTRATION && $this->_oModule->_isAdministrator() !== CHECK_ACTION_RESULT_ALLOWED)
 			return '';
 
     	return $this->_getActionDefault($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);

+ 1 - 0
modules/boonex/accounts/install/langs/en.xml

@@ -44,6 +44,7 @@
     <string name="_bx_accnt_menu_dashboard_manage_tools_addon_counter1_caption"><![CDATA[unconfirmed]]></string>
 
     <string name="_bx_accnt_acl_action_edit_any_account"><![CDATA[Edit Any Account]]></string>
+    <string name="_bx_accnt_acl_action_delete_any_account"><![CDATA[Delete Any Account]]></string>
 
     <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
     <string name="_bx_accnt_grid_filter_item_title_adm_select_one_filter2"><![CDATA[All]]></string>

+ 8 - 1
modules/boonex/accounts/install/sql/enable.sql

@@ -40,6 +40,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 (@sName, 'edit any entry', NULL, '_bx_accnt_acl_action_edit_any_account', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+(@sName, 'delete any entry', NULL, '_bx_accnt_acl_action_delete_any_account', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -54,7 +58,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry 
 (@iModerator, @iIdActionProfileEditAny),
-(@iAdministrator, @iIdActionProfileEditAny);
+(@iAdministrator, @iIdActionProfileEditAny),
+
+-- delete any entry 
+(@iAdministrator, @iIdActionProfileDeleteAny);
 
 
 -- GRIDS: administration

+ 1 - 0
modules/boonex/ads/install/langs/en.xml

@@ -144,6 +144,7 @@
     <string name="_bx_ads_acl_action_view_entry"><![CDATA[View Ad]]></string>
     <string name="_bx_ads_acl_action_set_thumb"><![CDATA[Set Ad Header Image]]></string>
     <string name="_bx_ads_acl_action_edit_any_entry"><![CDATA[Edit Any Ad]]></string>
+	<string name="_bx_ads_acl_action_delete_any_entry"><![CDATA[Delete Any Ad]]></string>
 
     <string name="_bx_ads_page_title_sys_create_entry"><![CDATA[New Ad]]></string>
     <string name="_bx_ads_page_title_create_entry"><![CDATA[New Ad]]></string>

+ 8 - 1
modules/boonex/ads/install/sql/enable.sql

@@ -405,6 +405,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_ads', 'edit any entry', NULL, '_bx_ads_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_ads', 'delete any entry', NULL, '_bx_ads_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -447,7 +451,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/albums/install/langs/en.xml

@@ -59,6 +59,7 @@
 	<string name="_bx_albums_acl_action_view_entry"><![CDATA[View Album]]></string>
 	<string name="_bx_albums_acl_action_set_thumb"><![CDATA[Set Album Cover]]></string>
 	<string name="_bx_albums_acl_action_edit_any_entry"><![CDATA[Edit Any Album]]></string>
+	<string name="_bx_albums_acl_action_delete_any_entry"><![CDATA[Delete Any Album]]></string>
 
 	<string name="_bx_albums_page_title_sys_create_entry"><![CDATA[New Album]]></string>
 	<string name="_bx_albums_page_title_create_entry"><![CDATA[New Album]]></string>

+ 8 - 1
modules/boonex/albums/install/sql/enable.sql

@@ -415,6 +415,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_albums', 'edit any entry', NULL, '_bx_albums_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_albums', 'delete any entry', NULL, '_bx_albums_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -457,7 +461,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/channels/install/langs/en.xml

@@ -41,6 +41,7 @@
 	<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_delete_any_profile"><![CDATA[Delete Any Channel]]></string>
   <string name="_bx_channels_acl_action_create_channel_auto"><![CDATA[Create Channel Auto]]></string>
 
 	<string name="_bx_channels_page_title_sys_edit_profile"><![CDATA[Edit Channel]]></string>

+ 7 - 0
modules/boonex/channels/install/sql/enable.sql

@@ -284,6 +284,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_channels', 'edit any entry', NULL, '_bx_channels_acl_action_edit_any_profile', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_channels', 'delete any entry', NULL, '_bx_channels_acl_action_delete_any_profile', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
+
 INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
 ('bx_channels', 'create channel auto', NULL, '_bx_channels_acl_action_create_channel_auto', '', 1, 1);
 SET @iIdActionCreateChannelAuto = LAST_INSERT_ID();
@@ -317,6 +321,9 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 (@iModerator, @iIdActionProfileEditAny),
 (@iAdministrator, @iIdActionProfileEditAny),
 
+-- any profile delete
+(@iAdministrator, @iIdActionProfileDeleteAny),
+
 -- create channel auto
 (@iAccount, @iIdActionCreateChannelAuto),
 (@iStandard, @iIdActionCreateChannelAuto),

+ 1 - 0
modules/boonex/classes/install/langs/en.xml

@@ -94,6 +94,7 @@
     <string name="_bx_classes_acl_action_view_entry"><![CDATA[View Class]]></string>
     <string name="_bx_classes_acl_action_set_thumb"><![CDATA[Set Class Header Image]]></string>
     <string name="_bx_classes_acl_action_edit_any_entry"><![CDATA[Edit Any Class]]></string>
+	<string name="_bx_classes_acl_action_delete_any_entry"><![CDATA[Delete Any Class]]></string>
 
     <string name="_bx_classes_page_title_sys_create_entry"><![CDATA[New Class]]></string>
     <string name="_bx_classes_page_title_create_entry"><![CDATA[New Class]]></string>

+ 8 - 1
modules/boonex/classes/install/sql/enable.sql

@@ -253,6 +253,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_classes', 'edit any entry', NULL, '_bx_classes_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_classes', 'delete any entry', NULL, '_bx_classes_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -295,7 +299,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/courses/install/langs/en.xml

@@ -52,6 +52,7 @@
     <string name="_bx_courses_acl_action_delete_profile"><![CDATA[Delete Course]]></string>
     <string name="_bx_courses_acl_action_view_profile"><![CDATA[View Course]]></string>
     <string name="_bx_courses_acl_action_edit_any_profile"><![CDATA[Edit Any Course]]></string>
+	<string name="_bx_courses_acl_action_delete_any_profile"><![CDATA[Delete Any Course]]></string>
     <string name="_bx_courses_acl_action_delete_invites"><![CDATA[Delete Invites]]></string>
 
     <string name="_bx_courses_page_title_sys_joined_entries"><![CDATA[Profile Courses]]></string>

+ 7 - 0
modules/boonex/courses/install/sql/enable.sql

@@ -374,6 +374,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_courses', 'edit any entry', NULL, '_bx_courses_acl_action_edit_any_profile', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_courses', 'delete any entry', NULL, '_bx_courses_acl_action_delete_any_profile', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
+
 INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
 ('bx_courses', 'delete invites', NULL, '_bx_courses_acl_action_delete_invites', '', 1, 3);
 SET @iIdActionProfileDeleteInvites = LAST_INSERT_ID();
@@ -422,6 +426,9 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 (@iModerator, @iIdActionProfileEditAny),
 (@iAdministrator, @iIdActionProfileEditAny),
 
+-- any profile delete
+(@iAdministrator, @iIdActionProfileDeleteAny),
+
 -- any invites edit
 (@iModerator, @iIdActionProfileDeleteInvites),
 (@iAdministrator, @iIdActionProfileDeleteInvites);

+ 1 - 0
modules/boonex/events/install/langs/en.xml

@@ -82,6 +82,7 @@
   <string name="_bx_events_acl_action_delete_profile"><![CDATA[Delete Event]]></string>
 	<string name="_bx_events_acl_action_view_profile"><![CDATA[View Event]]></string>
 	<string name="_bx_events_acl_action_edit_any_profile"><![CDATA[Edit Any Event]]></string>
+	<string name="_bx_events_acl_action_delete_any_profile"><![CDATA[Delete Any Event]]></string>
   <string name="_bx_events_acl_action_delete_invites"><![CDATA[Delete Invites]]></string>
 
 	<string name="_bx_events_page_title_sys_joined"><![CDATA[Profile Events]]></string>

+ 7 - 0
modules/boonex/events/install/sql/enable.sql

@@ -443,6 +443,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_events', 'edit any entry', NULL, '_bx_events_acl_action_edit_any_profile', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_events', 'delete any entry', NULL, '_bx_events_acl_action_delete_any_profile', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
+
 INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
 ('bx_events', 'delete invites', NULL, '_bx_events_acl_action_delete_invites', '', 1, 3);
 SET @iIdActionProfileDeleteInvites = LAST_INSERT_ID();
@@ -491,6 +495,9 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 (@iModerator, @iIdActionProfileEditAny),
 (@iAdministrator, @iIdActionProfileEditAny),
 
+-- any profile delete
+(@iAdministrator, @iIdActionProfileDeleteAny),
+
 -- any invites edit
 (@iModerator, @iIdActionProfileDeleteInvites),
 (@iAdministrator, @iIdActionProfileDeleteInvites);

+ 1 - 0
modules/boonex/files/install/langs/en.xml

@@ -59,6 +59,7 @@
 	<string name="_bx_files_acl_action_delete_entry"><![CDATA[Delete File]]></string>
 	<string name="_bx_files_acl_action_view_entry"><![CDATA[View File]]></string>
 	<string name="_bx_files_acl_action_edit_any_entry"><![CDATA[Edit Any File]]></string>
+	<string name="_bx_files_acl_action_delete_any_entry"><![CDATA[Delete Any File]]></string>
 
 	<string name="_bx_files_page_title_sys_create_entry"><![CDATA[Upload Files]]></string>
 	<string name="_bx_files_page_title_create_entry"><![CDATA[Upload Files]]></string>

+ 8 - 1
modules/boonex/files/install/sql/enable.sql

@@ -380,6 +380,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_files', 'edit any entry', NULL, '_bx_files_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_files', 'delete any entry', NULL, '_bx_files_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -416,7 +420,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/forum/install/langs/en.xml

@@ -93,6 +93,7 @@
 	<string name="_bx_forum_acl_action_view_entry"><![CDATA[View discussion]]></string>
 	<string name="_bx_forum_acl_action_set_thumb"><![CDATA[Set discussion's cover]]></string>
 	<string name="_bx_forum_acl_action_edit_any_entry"><![CDATA[Edit any discussion]]></string>
+	<string name="_bx_forum_acl_action_delete_any_entry"><![CDATA[Delete any discussion]]></string>
 	<string name="_bx_forum_acl_action_stick_any_entry"><![CDATA[Pin any discussion]]></string>
 	<string name="_bx_forum_acl_action_lock_any_entry"><![CDATA[Lock any discussion]]></string>
 	<string name="_bx_forum_acl_action_hide_any_entry"><![CDATA[Hide any discussion]]></string>

+ 7 - 0
modules/boonex/forum/install/sql/enable.sql

@@ -475,6 +475,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 (@sName, 'edit any entry', NULL, '_bx_forum_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+(@sName, 'delete any entry', NULL, '_bx_forum_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
 (@sName, 'stick any entry', NULL, '_bx_forum_acl_action_stick_any_entry', '', 1, 3);
 SET @iIdActionEntryStickAny = LAST_INSERT_ID();
@@ -531,6 +535,9 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 (@iModerator, @iIdActionEntryEditAny),
 (@iAdministrator, @iIdActionEntryEditAny),
 
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny),
+
 -- stick any entry
 (@iModerator, @iIdActionEntryStickAny),
 (@iAdministrator, @iIdActionEntryStickAny),

+ 1 - 0
modules/boonex/glossary/install/langs/en.xml

@@ -56,6 +56,7 @@
 	<string name="_bx_glossary_acl_action_view_entry"><![CDATA[View Term]]></string>
 	<string name="_bx_glossary_acl_action_set_thumb"><![CDATA[Set Term Thumbnail]]></string>
 	<string name="_bx_glossary_acl_action_edit_any_entry"><![CDATA[Edit Any Term]]></string>
+	<string name="_bx_glossary_acl_action_delete_any_entry"><![CDATA[Delete Any Term]]></string>
 
 	<string name="_bx_glossary_page_title_sys_create_entry"><![CDATA[New Term]]></string>
 	<string name="_bx_glossary_page_title_create_entry"><![CDATA[New Term]]></string>

+ 8 - 1
modules/boonex/glossary/install/sql/enable.sql

@@ -361,6 +361,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_glossary', 'edit any entry', NULL, '_bx_glossary_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_glossary', 'delete any entry', NULL, '_bx_glossary_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -399,7 +403,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/groups/install/langs/en.xml

@@ -75,6 +75,7 @@
 	<string name="_bx_groups_acl_action_delete_profile"><![CDATA[Delete Group]]></string>
 	<string name="_bx_groups_acl_action_view_profile"><![CDATA[View Group]]></string>
 	<string name="_bx_groups_acl_action_edit_any_profile"><![CDATA[Edit Any Group]]></string>
+	<string name="_bx_groups_acl_action_delete_any_profile"><![CDATA[Delete Any Group]]></string>
   <string name="_bx_groups_acl_action_delete_invites"><![CDATA[Delete Invites]]></string>
 
         <string name="_bx_groups_page_title_sys_entries_in_context"><![CDATA[Groups in context]]></string>

+ 7 - 0
modules/boonex/groups/install/sql/enable.sql

@@ -420,6 +420,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_groups', 'edit any entry', NULL, '_bx_groups_acl_action_edit_any_profile', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_groups', 'delete any entry', NULL, '_bx_groups_acl_action_delete_any_profile', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
+
 INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
 ('bx_groups', 'delete invites', NULL, '_bx_groups_acl_action_delete_invites', '', 1, 3);
 SET @iIdActionProfileDeleteInvites = LAST_INSERT_ID();
@@ -468,6 +472,9 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 (@iModerator, @iIdActionProfileEditAny),
 (@iAdministrator, @iIdActionProfileEditAny),
 
+-- any profile delete
+(@iAdministrator, @iIdActionProfileDeleteAny),
+
 -- any invites edit
 (@iModerator, @iIdActionProfileDeleteInvites),
 (@iAdministrator, @iIdActionProfileDeleteInvites);

+ 1 - 0
modules/boonex/market/install/langs/en.xml

@@ -121,6 +121,7 @@
 	<string name="_bx_market_acl_action_set_subentries"><![CDATA[Set Product Subproducts]]></string>
 	<string name="_bx_market_acl_action_set_thumb"><![CDATA[Set Product Thumbnail]]></string>
 	<string name="_bx_market_acl_action_edit_any_entry"><![CDATA[Edit Any Product]]></string>
+	<string name="_bx_market_acl_action_delete_any_entry"><![CDATA[Delete Any Product]]></string>
 
 	<string name="_bx_market_privacy_group_customers"><![CDATA[Customers]]></string>
 

+ 7 - 1
modules/boonex/market/install/sql/enable.sql

@@ -469,6 +469,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_market', 'edit any entry', NULL, '_bx_market_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_market', 'delete any entry', NULL, '_bx_market_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -533,8 +537,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
 
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 -- SEARCH
 SET @iSearchOrder = (SELECT IFNULL(MAX(`Order`), 0) FROM `sys_objects_search`);

+ 8 - 1
modules/boonex/organizations/install/sql/enable.sql

@@ -460,6 +460,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_organizations', 'edit any entry', NULL, '_bx_orgs_acl_action_edit_any_profile', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_organizations', 'delete any entry', NULL, '_bx_orgs_acl_action_delete_any_profile', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -502,7 +506,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- any profile edit
 (@iModerator, @iIdActionProfileEditAny),
-(@iAdministrator, @iIdActionProfileEditAny);
+(@iAdministrator, @iIdActionProfileEditAny),
+
+-- any profile delete
+(@iAdministrator, @iIdActionProfileDeleteAny);
 
 
 -- METATAGS

+ 1 - 0
modules/boonex/persons/install/langs/en.xml

@@ -87,6 +87,7 @@
 	<string name="_bx_persons_acl_action_delete_profile"><![CDATA[Delete Person's Profile]]></string>
 	<string name="_bx_persons_acl_action_view_profile"><![CDATA[View Person's Profile]]></string>
 	<string name="_bx_persons_acl_action_edit_any_profile"><![CDATA[Edit Any Person's Profile]]></string>
+	<string name="_bx_persons_acl_action_delete_any_profile"><![CDATA[Delete Any Person's Profile]]></string>
 
 	<string name="_bx_persons_page_title_sys_create_profile"><![CDATA[Create a Profile - Person]]></string>
 	<string name="_bx_persons_page_title_create_profile"><![CDATA[Create a Profile - Person]]></string>

+ 8 - 2
modules/boonex/persons/install/sql/enable.sql

@@ -393,6 +393,9 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_persons', 'edit any entry', NULL, '_bx_persons_acl_action_edit_any_profile', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_persons', 'delete any entry', NULL, '_bx_persons_acl_action_delete_any_profile', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
 
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
@@ -437,7 +440,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- any profile edit
 (@iModerator, @iIdActionProfileEditAny),
-(@iAdministrator, @iIdActionProfileEditAny);
+(@iAdministrator, @iIdActionProfileEditAny),
+
+-- any profile delete
+(@iAdministrator, @iIdActionProfileDeleteAny);
 
 -- METATAGS
 INSERT INTO `sys_objects_metatags` (`object`, `table_keywords`, `table_locations`, `table_mentions`, `override_class_name`, `override_class_file`) VALUES
@@ -482,7 +488,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon
 ('bx_persons_administration', 'bulk', 'set_acl_level', '_bx_persons_grid_action_title_adm_set_acl_level', '', 0, 0, 1),
 ('bx_persons_administration', 'bulk', 'delete', '_bx_persons_grid_action_title_adm_delete', '', 0, 1, 2),
 ('bx_persons_administration', 'bulk', 'delete_with_content', '_bx_persons_grid_action_title_adm_delete_with_content', '', 0, 1, 3),
-('bx_persons_administration', 'bulk', 'clear_reports', '_bx_forum_grid_action_title_adm_clear_reports', '', 0, 1, 4),
+('bx_persons_administration', 'bulk', 'clear_reports', '_bx_persons_grid_action_title_adm_clear_reports', '', 0, 1, 4),
 ('bx_persons_administration', 'single', 'set_acl_level', '_bx_persons_grid_action_title_adm_set_acl_level', 'certificate', 1, 0, 1),
 ('bx_persons_administration', 'single', 'settings', '_bx_persons_grid_action_title_adm_more_actions', 'cog', 1, 0, 2),
 ('bx_persons_administration', 'single', 'audit_content', '_bx_persons_grid_action_title_adm_audit_content', 'search', 1, 0, 3),

+ 1 - 0
modules/boonex/photos/install/langs/en.xml

@@ -60,6 +60,7 @@
 	<string name="_bx_photos_acl_action_view_entry"><![CDATA[View Photo]]></string>
 	<string name="_bx_photos_acl_action_set_thumb"><![CDATA[Set Photo Thumbnail]]></string>
 	<string name="_bx_photos_acl_action_edit_any_entry"><![CDATA[Edit Any Photo]]></string>
+	<string name="_bx_photos_acl_action_delete_any_entry"><![CDATA[Delete Any Photo]]></string>
 
 	<string name="_bx_photos_page_title_sys_create_entry"><![CDATA[Upload Photos]]></string>
 	<string name="_bx_photos_page_title_create_entry"><![CDATA[Upload Photos]]></string>

+ 8 - 1
modules/boonex/photos/install/sql/enable.sql

@@ -337,6 +337,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_photos', 'edit any entry', NULL, '_bx_photos_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_photos', 'delete any entry', NULL, '_bx_photos_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -379,7 +383,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/polls/install/langs/en.xml

@@ -58,6 +58,7 @@
 	<string name="_bx_polls_acl_action_vote_entry"><![CDATA[Vote Poll]]></string>
 	<string name="_bx_polls_acl_action_set_thumb"><![CDATA[Set Poll Thumbnail]]></string>
 	<string name="_bx_polls_acl_action_edit_any_entry"><![CDATA[Edit Any Poll]]></string>
+	<string name="_bx_polls_acl_action_delete_any_entry"><![CDATA[Delete Any Poll]]></string>
 
 	<string name="_bx_polls_page_title_sys_create_entry"><![CDATA[New Poll]]></string>
 	<string name="_bx_polls_page_title_create_entry"><![CDATA[New Poll]]></string>

+ 8 - 1
modules/boonex/polls/install/sql/enable.sql

@@ -344,6 +344,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_polls', 'edit any entry', NULL, '_bx_polls_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_polls', 'delete any entry', NULL, '_bx_polls_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -392,7 +396,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 2 - 0
modules/boonex/posts/install/langs/en.xml

@@ -93,6 +93,7 @@
     <string name="_bx_posts_acl_action_view_entry"><![CDATA[View Post]]></string>
     <string name="_bx_posts_acl_action_set_thumb"><![CDATA[Set Post Header Image]]></string>
     <string name="_bx_posts_acl_action_edit_any_entry"><![CDATA[Edit Any Post]]></string>
+    <string name="_bx_posts_acl_action_delete_any_entry"><![CDATA[Delete Any Account]]></string>
 
     <string name="_bx_posts_page_title_sys_create_entry"><![CDATA[New Post]]></string>
     <string name="_bx_posts_page_title_create_entry"><![CDATA[New Post]]></string>
@@ -125,6 +126,7 @@
     <string name="_bx_posts_page_block_title_entry_author"><![CDATA[Author]]></string>
     <string name="_bx_posts_page_block_title_entry_actions"><![CDATA[Actions]]></string>
     <string name="_bx_posts_page_block_title_entry_comments"><![CDATA[Comments]]></string>
+    <string name="_bx_posts_page_block_title_entry_reports"><![CDATA[Reports]]></string>
     <string name="_bx_posts_page_block_title_entry_comments_link"><![CDATA[Comments to <a href="{entry_link}">{title}</a>]]></string>
     <string name="_bx_posts_page_block_title_entry_location"><![CDATA[Location]]></string>
     <string name="_bx_posts_page_block_title_entry_attachments"><![CDATA[Attachments]]></string>

+ 8 - 1
modules/boonex/posts/install/sql/enable.sql

@@ -384,6 +384,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_posts', 'edit any entry', NULL, '_bx_posts_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_posts', 'delete any entry', NULL, '_bx_posts_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -426,7 +430,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/reviews/install/langs/en.xml

@@ -87,6 +87,7 @@
     <string name="_bx_reviews_acl_action_view_entry"><![CDATA[View Review]]></string>
     <string name="_bx_reviews_acl_action_set_thumb"><![CDATA[Set Review Header Image]]></string>
     <string name="_bx_reviews_acl_action_edit_any_entry"><![CDATA[Edit Any Review]]></string>
+	<string name="_bx_reviews_acl_action_delete_any_entry"><![CDATA[Delete Any Review]]></string>
 
     <string name="_bx_reviews_page_title_sys_create_entry"><![CDATA[New Review]]></string>
     <string name="_bx_reviews_page_title_create_entry"><![CDATA[New Review]]></string>

+ 8 - 1
modules/boonex/reviews/install/sql/enable.sql

@@ -388,6 +388,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_reviews', 'edit any entry', NULL, '_bx_reviews_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_reviews', 'delete any entry', NULL, '_bx_reviews_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -430,7 +434,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/shopify/install/langs/en.xml

@@ -58,6 +58,7 @@
 	<string name="_bx_shopify_acl_action_view_entry"><![CDATA[View Goods]]></string>
 	<string name="_bx_shopify_acl_action_set_thumb"><![CDATA[Set Goods Thumbnail]]></string>
 	<string name="_bx_shopify_acl_action_edit_any_entry"><![CDATA[Edit Any Goods]]></string>
+	<string name="_bx_shopify_acl_action_delete_any_entry"><![CDATA[Delete Any Goods]]></string>
 
 	<string name="_bx_shopify_page_title_sys_create_entry"><![CDATA[New Goods]]></string>
 	<string name="_bx_shopify_page_title_create_entry"><![CDATA[New Item]]></string>

+ 8 - 1
modules/boonex/shopify/install/sql/enable.sql

@@ -309,6 +309,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_shopify', 'edit any entry', NULL, '_bx_shopify_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_shopify', 'delete any entry', NULL, '_bx_shopify_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -351,7 +355,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/snipcart/install/langs/en.xml

@@ -75,6 +75,7 @@
 	<string name="_bx_snipcart_acl_action_view_entry"><![CDATA[View Goods]]></string>
 	<string name="_bx_snipcart_acl_action_set_thumb"><![CDATA[Set Goods Thumbnail]]></string>
 	<string name="_bx_snipcart_acl_action_edit_any_entry"><![CDATA[Edit Any Goods]]></string>
+	<string name="_bx_snipcart_acl_action_delete_any_entry"><![CDATA[Delete Any Goods]]></string>
 
 	<string name="_bx_snipcart_page_title_sys_create_entry"><![CDATA[New Goods]]></string>
 	<string name="_bx_snipcart_page_title_create_entry"><![CDATA[New Item]]></string>

+ 8 - 1
modules/boonex/snipcart/install/sql/enable.sql

@@ -312,6 +312,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_snipcart', 'edit any entry', NULL, '_bx_snipcart_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_snipcart', 'delete any entry', NULL, '_bx_snipcart_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -354,7 +358,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/spaces/install/langs/en.xml

@@ -55,6 +55,7 @@
     <string name="_bx_spaces_acl_action_delete_profile"><![CDATA[Delete Space]]></string>
     <string name="_bx_spaces_acl_action_view_profile"><![CDATA[View Space]]></string>
     <string name="_bx_spaces_acl_action_edit_any_profile"><![CDATA[Edit Any Space]]></string>
+	<string name="_bx_spaces_acl_action_delete_any_profile"><![CDATA[Delete Any Space]]></string>
     <string name="_bx_spaces_acl_action_delete_invites"><![CDATA[Delete Invites]]></string>
 	
 	<string name="_bx_spaces_page_title_sys_joined_entries"><![CDATA[Profile Spaces]]></string>

+ 7 - 0
modules/boonex/spaces/install/sql/enable.sql

@@ -377,6 +377,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_spaces', 'edit any entry', NULL, '_bx_spaces_acl_action_edit_any_profile', '', 1, 3);
 SET @iIdActionProfileEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_spaces', 'delete any entry', NULL, '_bx_spaces_acl_action_delete_any_profile', '', 1, 3);
+SET @iIdActionProfileDeleteAny = LAST_INSERT_ID();
+
 INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
 ('bx_spaces', 'delete invites', NULL, '_bx_spaces_acl_action_delete_invites', '', 1, 3);
 SET @iIdActionProfileDeleteInvites = LAST_INSERT_ID();
@@ -425,6 +429,9 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 (@iModerator, @iIdActionProfileEditAny),
 (@iAdministrator, @iIdActionProfileEditAny),
 
+-- any profile delete
+(@iAdministrator, @iIdActionProfileDeleteAny),
+
 -- any invites edit
 (@iModerator, @iIdActionProfileDeleteInvites),
 (@iAdministrator, @iIdActionProfileDeleteInvites);

+ 1 - 0
modules/boonex/tasks/install/langs/en.xml

@@ -93,6 +93,7 @@
     <string name="_bx_tasks_acl_action_view_entry"><![CDATA[View Task]]></string>
     <string name="_bx_tasks_acl_action_set_thumb"><![CDATA[Set Task Header Image]]></string>
     <string name="_bx_tasks_acl_action_edit_any_entry"><![CDATA[Edit Any Task]]></string>
+	<string name="_bx_tasks_acl_action_delete_any_entry"><![CDATA[Delete Any Task]]></string>
 
     <string name="_bx_tasks_page_title_sys_create_entry"><![CDATA[New Task]]></string>
     <string name="_bx_tasks_page_title_create_entry"><![CDATA[New Task]]></string>

+ 8 - 1
modules/boonex/tasks/install/sql/enable.sql

@@ -186,6 +186,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_tasks', 'edit any entry', NULL, '_bx_tasks_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_tasks', 'delete any entry', NULL, '_bx_tasks_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -228,7 +232,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH

+ 1 - 0
modules/boonex/videos/install/langs/en.xml

@@ -62,6 +62,7 @@
 	<string name="_bx_videos_acl_action_view_entry"><![CDATA[View Video]]></string>
 	<string name="_bx_videos_acl_action_set_thumb"><![CDATA[Set Video Thumbnail]]></string>
 	<string name="_bx_videos_acl_action_edit_any_entry"><![CDATA[Edit Any Video]]></string>
+	<string name="_bx_videos_acl_action_delete_any_entry"><![CDATA[Delete Any Video]]></string>
 
 	<string name="_bx_videos_page_title_sys_create_entry"><![CDATA[New Video]]></string>
 	<string name="_bx_videos_page_title_create_entry"><![CDATA[New Video]]></string>

+ 8 - 1
modules/boonex/videos/install/sql/enable.sql

@@ -328,6 +328,10 @@ INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`,
 ('bx_videos', 'edit any entry', NULL, '_bx_videos_acl_action_edit_any_entry', '', 1, 3);
 SET @iIdActionEntryEditAny = LAST_INSERT_ID();
 
+INSERT INTO `sys_acl_actions` (`Module`, `Name`, `AdditionalParamName`, `Title`, `Desc`, `Countable`, `DisabledForLevels`) VALUES
+('bx_videos', 'delete any entry', NULL, '_bx_videos_acl_action_delete_any_entry', '', 1, 3);
+SET @iIdActionEntryDeleteAny = LAST_INSERT_ID();
+
 SET @iUnauthenticated = 1;
 SET @iAccount = 2;
 SET @iStandard = 3;
@@ -370,7 +374,10 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- edit any entry
 (@iModerator, @iIdActionEntryEditAny),
-(@iAdministrator, @iIdActionEntryEditAny);
+(@iAdministrator, @iIdActionEntryEditAny),
+
+-- delete any entry
+(@iAdministrator, @iIdActionEntryDeleteAny);
 
 
 -- SEARCH