Merge branch 'dev' of github.com:hashtopolis/server into dev

hashtopolis · Aug 11, 2023 · 9f48878 · 9f48878
2 parents 81a7a1a + 81b2b74
commit 9f48878
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php
@@ -855,7 +855,7 @@ public function getDB($test = false) {
     }
     else {
       global $CONN;
-      $dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'];
+      $dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8";
       $user = $CONN['user'];
       $password = $CONN['pass'];
     }

diff --git a/src/inc/apiv2/shared.inc.php b/src/inc/apiv2/shared.inc.php
@@ -674,7 +674,8 @@ protected function validateHashlistAccess(Request $request, User $user, String $
    */
   protected function validatePermissions(array $required_perms): bool {
     // Retrieve permissions from RightGroup part of the User
-    $group = Factory::getRightGroupFactory()->get($this->user->getId());
+    $group = Factory::getRightGroupFactory()->get($this->user->getRightGroupId());
+
 
     if ($group->getPermissions() == 'ALL') {
       // Special (legacy) case for administative access, enable all available permissions