Merge branch '4.0' into 'main'

Author: thorsten

phpmyfaq/index.php

@@ -115,7 +115,7 @@
 //
 // Set actual template set name
 //
-TwigWrapper::setTemplateSetName($faqConfig->get('layout.templateSet'));
+TwigWrapper::setTemplateSetName($faqConfig->getTemplateSet());
 
 /*
  * Initialize attachment factory

phpmyfaq/src/phpMyFAQ/Configuration.php

@@ -176,6 +176,11 @@ public function getAdminEmail(): string
         return $this->config['main.administrationMail'];
     }
 
+    public function getTemplateSet(): string
+    {
+        return $this->config['layout.templateSet'] ?? 'default';
+    }
+
     /**
      * Returns the email address of the no-reply sender
      */
@@ -371,9 +376,9 @@ public function getElasticsearch(): Client
     /**
      * Sets the Elasticsearch configuration.
      */
-    public function setElasticsearchConfig(ElasticsearchConfiguration $elasticsearchConfiguration): void
+    public function setElasticsearchConfig(ElasticsearchConfiguration $esConfiguration): void
     {
-        $this->config['core.elasticsearchConfig'] = $elasticsearchConfiguration;
+        $this->config['core.elasticsearchConfig'] = $esConfiguration;
     }
 
     /**
@@ -542,7 +547,7 @@ public function getPluginManager(): PluginManager
         return $this->config['core.pluginManager'];
     }
 
-    public function triggerEvent(string $eventName, $data = null): void
+    public function triggerEvent(string $eventName, mixed $data = null): void
     {
         $this->pluginManager->triggerEvent($eventName, $data);
     }

phpmyfaq/src/phpMyFAQ/Controller/AbstractController.php

@@ -72,7 +72,7 @@ public function __construct()
         $this->container = $this->createContainer();
         $this->configuration = $this->container->get('phpmyfaq.configuration');
         $this->currentUser = $this->container->get('phpmyfaq.user.current_user');
-        TwigWrapper::setTemplateSetName($this->configuration->get('layout.templateSet'));
+        TwigWrapper::setTemplateSetName($this->configuration->getTemplateSet());
         $this->isSecured();
     }
 

phpmyfaq/src/phpMyFAQ/Permission/MediumPermission.php

@@ -166,7 +166,7 @@ public function checkUserGroupRight(int $userId, int $rightId): bool
         );
 
         $res = $this->configuration->getDb()->query($select);
-        return $this->configuration->getDb()->numRows($res) === 1;
+        return $this->configuration->getDb()->numRows($res) !== 0;
     }
 
     /**
@@ -545,7 +545,7 @@ public function getGroupName(int $groupId): string
     /**
      * Returns an array that contains the right-IDs of all rights
      * the user $userId owns. User-rights and the rights the user
-     * owns because of a group-membership are taken into account.
+     * owns because of a group-membership is taken into account.
      *
      * @param int $userId User ID
      *
@@ -563,6 +563,19 @@ public function getAllUserRights(int $userId): array
         return array_unique(array_merge($userRights, $groupRights));
     }
 
+    /**
+     * Returns the number of user- and group-rights the user specified by
+     * user_id owns.
+     *
+     * @param CurrentUser $currentUser User object
+     */
+    public function getUserRightsCount(CurrentUser $currentUser): int
+    {
+        $userRights = $this->getAllUserRights($currentUser->getUserId());
+
+        return is_countable($userRights) ? count($userRights) : 0;
+    }
+
     /**
      * Returns an array that contains the IDs of all rights the user
      * $userId owns because of a group-membership.