feat: add additional module visibility for Inventory Admins an item keepers to preferences

Author: MightyMCoder

languages/en.xml

@@ -880,6 +880,7 @@
   <string name="SYS_INVENTORY_NOTIFICATION_SUBJECT_ITEMS_IMPORTED">Items have been imported into the inventory</string>
   <string name="SYS_INVENTORY_NUMBER">Number</string>
   <string name="SYS_INVENTORY_NUMBER_DESC">Number of items to be added</string>
+  <string name="SYS_INVENTORY_ONLY_FOR_ADMINS_AND_KEEPERS">Only for module administrators and item keepers</string>
   <string name="SYS_INVENTORY_PROFILE_VIEW">Profile view settings</string>
   <string name="SYS_INVENTORY_PROFILE_VIEW_DESC">The selected item fields will be displayed in the member's profile view when the "Display in profile view" option is enabled. By default, only the item name is shown. (Default: "Last Receiver")</string>
   <string name="SYS_INVENTORY_PROFILE_VIEW_ENABLED">Display in profile view</string>

modules/inventory.php

@@ -68,6 +68,8 @@
         throw new Exception('SYS_NO_RIGHTS');
     } elseif ($gSettingsManager->getInt('inventory_module_enabled') === 3 && !$gCurrentUser->isAdministratorInventory()) {
         throw new Exception('SYS_NO_RIGHTS');
+    } elseif ($gSettingsManager->getInt('inventory_module_enabled') === 4 && !InventoryPresenter::isCurrentUserKeeper() && !$gCurrentUser->isAdministratorInventory()) {
+        throw new Exception('SYS_NO_RIGHTS');
     }
 
     // when saving folders, check whether the subfolder in adm_my_files exists with the corresponding rights

src/Components/Entity/Component.php

@@ -5,6 +5,7 @@
 use Admidio\Infrastructure\Exception;
 use Admidio\Infrastructure\Database;
 use Admidio\Infrastructure\Entity\Entity;
+use Admidio\UI\Presenter\InventoryPresenter;
 
 /**
  * @brief Handle different components of Admidio (e.g. system, plugins or modules) and manage them in the database
@@ -263,7 +264,8 @@ public static function isVisible(string $componentName): bool
             case 'INVENTORY':
                 if ($gSettingsManager->getInt('inventory_module_enabled') === 1
                 || ($gSettingsManager->getInt('inventory_module_enabled') === 2 && $gValidLogin)
-                || ($gSettingsManager->getInt('inventory_module_enabled') === 3 && $gCurrentUser->isAdministratorInventory())) {
+                || ($gSettingsManager->getInt('inventory_module_enabled') === 3 && $gCurrentUser->isAdministratorInventory())
+                || ($gSettingsManager->getInt('inventory_module_enabled') === 4 && ($gCurrentUser->isAdministratorInventory() || InventoryPresenter::isCurrentUserKeeper()))) {
                     return true;
                 }
                 break;

src/UI/Presenter/InventoryPresenter.php

@@ -715,12 +715,21 @@ public static function isKeeperAuthorizedToEdit(?int $keeper = null): bool
      *
      * @return bool Returns true if the current user is a keeper, false otherwise.
      */
-    private function isCurrentUserKeeper(): bool
+    public static function isCurrentUserKeeper(): bool
     {
-        global $gCurrentUser, $gDb;
+        global $gCurrentUser, $gDb, $gCurrentOrgId;
 
         $sql = 'SELECT COUNT(*) as count FROM ' . TBL_INVENTORY_ITEM_DATA . ' WHERE ind_value = ? AND ind_inf_id = ?';
-        $params = array($gCurrentUser->getValue('usr_id'), $this->itemsData->getProperty('KEEPER', 'inf_id'));
+        // read the field id of the keeper field
+        $sqlKeeperFieldId = 'SELECT inf_id FROM ' . TBL_INVENTORY_FIELDS . ' WHERE inf_name_intern = \'KEEPER\' AND (inf_org_id = ? OR inf_org_id IS NULL) LIMIT 1';
+        $resultKeeperFieldId = $gDb->queryPrepared($sqlKeeperFieldId, array($gCurrentOrgId));
+        $rowKeeperFieldId = $resultKeeperFieldId->fetch();
+        if ($rowKeeperFieldId === false) {
+            return false;
+        }
+        $rowKeeperFieldId = $rowKeeperFieldId['inf_id'];
+
+        $params = array($gCurrentUser->getValue('usr_id'), $rowKeeperFieldId);
         $result = $gDb->queryPrepared($sql, $params);
         $row = $result->fetch();
         if ($row['count'] > 0) {

src/UI/Presenter/PreferencesPresenter.php

@@ -810,7 +810,8 @@ public function createInventoryForm(): string
             '0' => $gL10n->get('SYS_DISABLED'),
             '1' => $gL10n->get('SYS_ENABLED'),
             '2' => $gL10n->get('ORG_ONLY_FOR_REGISTERED_USER'),
-            '3' => $gL10n->get('ORG_ONLY_FOR_MODULE_ADMINISTRATOR')
+            '3' => $gL10n->get('ORG_ONLY_FOR_MODULE_ADMINISTRATOR'),
+            '4' => $gL10n->get('SYS_INVENTORY_ONLY_FOR_ADMINS_AND_KEEPERS')
         );
         $formInventory->addSelectBox(
             'inventory_module_enabled',

src/Users/Entity/User.php

@@ -1528,9 +1528,9 @@ public function isAdministratorDocumentsFiles(): bool
         return $this->checkRolesRight('rol_documents_files');
     }
 
-        /**
-     * This method checks if the current user is allowed to administrate documents and files. With this right he can
-     * create and edit folders, upload new files and set rights for other users in this module
+    /**
+     * This method checks if the current user is allowed to administrate the inventory. With this right he can
+     * administrate all inventory functionalities
      * @return bool Return **true** if the user is admin of the module otherwise **false**
      * @throws Exception
      */