Merge pull request #215 from heiglandreas/fixCAcl

Fix issues with ACL

Author: heiglandreas

composer.lock

@@ -31,7 +31,9 @@
  */
 namespace Phpug;
 
+use Phpug\Form\UsergroupFieldset;
 use Phpug\Service\SlackInviteFormFactory;
+use Phpug\Service\UsergroupFieldsetFactory;
 
 return array(
     'router' => array(
@@ -480,6 +482,7 @@
             'roleManager' => 'Phpug\Service\RoleManagerFactory',
             'PromoteUsergroupForm' => 'Phpug\Service\PromoteUsergroupFormFactory',
             'UsergroupFieldset'    => 'Phpug\Service\UsergroupFieldsetFactory',
+            UsergroupFieldset::class => UsergroupFieldsetFactory::class,
             'SlackInviteForm'      => \Phpug\Service\SlackInviteFormFactory::class,
             'Phpug\Service\UsergroupMessage' => 'Phpug\Service\UsergroupMessageFactory',
             'Phpug\Service\Transport' => 'Phpug\Service\TransportFactory',

src/module/Phpug/config/module.config.php

@@ -149,7 +149,7 @@ public function getRole()
             return $this->loggedInRole;
         }
 
-        if (! in_array($this->user->getDisplayName(), $this->admins[$this->user->getService()])) {
+        if (! in_array($this->user->getName(), $this->admins[$this->user->getService()])) {
             return $this->loggedInRole;
         }
 

src/module/Phpug/src/Phpug/Acl/RoleManager.php

@@ -102,7 +102,7 @@ public function assert(Acl $acl, RoleInterface $role = null, ResourceInterface $
             return false;
         }
         $service = strtolower($this->user->getService());
-        $uid     = strtolower($this->user->getDisplayName());
+        $uid     = strtolower($this->user->getName());
 
         foreach ($this->group->getContacts() as $contact) {
             if (strtolower($contact->getServiceName()) !== $service) {