studieren-ohne-grenzen / dashboard

app/sog/Dashboard/Authentication/LdapUserProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      *
      * @param string $user_dn The user DN for which to infer the rules
      * @param array $ownerships The owned groups for the user DN
-     * @return array The roles of the given user
+     * @return string[] The roles of the given user
      */
     private function getRoles($user_dn, $ownerships)
     {

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Zend\Ldap\Exception\LdapException;
-use Zend\Ldap\Ldap;
 
 /**
  * This class maps a requested user to its LDAP entry.

app/sog/Dashboard/LdapAdapter.php

Doc Comments +7 added lines, -7 removed lines

@@ -41,7 +41,7 @@ 
      * Returns all groups (OUs) with their common names
      *
      * @param array $fields A list of fields we want to return from the search
-     * @return bool|\Zend\Ldap\Collection
+     * @return Collection
      * @throws LdapException
      */
     public function getGroups($fields = ['cn'])
@@ -156,7 +156,7 @@ 
      * Retrieve the members of the given group
      *
      * @param string $group_ou OU of the group
-     * @return bool|Collection
+     * @return Collection
      */
     public function getOwners($group_ou)
     {
@@ -167,8 +167,8 @@ 
      * Retrieves all members for the given group CN
      *
      * @param string $group_ou The common name of the group for which we want to retrieve the members
-     * @param array $fields A list of fields we want to return from the search
-     * @return bool|\Zend\Ldap\Collection
+     * @param string[] $fields A list of fields we want to return from the search
+     * @return Collection
      * @throws LdapException
      */
     public function getMembers($group_ou, $fields = ['member'])
@@ -225,7 +225,7 @@ 
      * Returns the groups owned by the user with the given dn
      *
      * @param string $user_dn The user DN for which we want to check
-     * @return bool|Collection The groups owned by the user
+     * @return Collection The groups owned by the user
      */
     public function getOwnedGroups($user_dn)
     {
@@ -236,9 +236,9 @@ 
      * Retrieves all memberships for the given DN
      *
      * @param string $user_dn The DN for which to get the memberships
-     * @param array $fields A list of fields we want to return from the search
+     * @param string[] $fields A list of fields we want to return from the search
      * @param string $attribute The attribute which we use for filtering
-     * @return bool|\Zend\Ldap\Collection
+     * @return Collection
      * @throws LdapException
      */
     public function getMemberships($user_dn, $fields = ['cn'], $attribute = 'member')

Braces +7 added lines, -5 removed lines

@@ -32,7 +32,8 @@ 
      * @param $subtrees
      * @throws LdapException
      */
-    public function __construct($options, $subtrees) {
+    public function __construct($options, $subtrees)
+    {
         parent::__construct($options);
         $this->subtrees = $subtrees;
     }
@@ -200,10 +201,11 @@ 
             ['dn', 'uid', 'cn', 'displayName', $attribute],
             'dn'
         );
-        if ($results->count() > 0)
-            return $results->getFirst();
-        else
-            return false;
+        if ($results->count() > 0) {
+                    return $results->getFirst();
+        } else {
+                    return false;
+        }
     }
 
     /**

app/sog/Dashboard/Authentication/LdapUser.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
         $this->attributes = $attributes;
         $this->roles = $roles;
         $this->memberships = $memberships;
-        $this->ownerships = array_map(function($group) {
+        $this->ownerships = array_map(function ($group) {
             return $group['ou'][0];
         }, $ownerships);
     }

app/sog/Dashboard/GuestControllerProvider.php

Braces +8 added lines, -5 removed lines

@@ -85,7 +85,9 @@ 
             $ownedGroups = $app['ldap']->getOwnedGroups($user->getAttributes()['dn'])->toArray();
 
             $selGroup = $request->request->get('ou');
-            if (!isset($selGroup)) $selGroup = $ownedGroups[0]['ou'][0];
+            if (!isset($selGroup)) {
+                $selGroup = $ownedGroups[0]['ou'][0];
+            }
             $selGroupDN = sprintf('ou=%s,%s', $selGroup, $app['config']['ldap.subtrees']['groups']);
 
             foreach ($ownedGroups as $og) {
@@ -151,9 +153,10 @@ 
     private function retrieveGuestByMail($mail)
     {
         $info = $this->app['ldap']->getMemberByMail($mail, 'mail');
-        if (is_array($info))
-            return $info['dn'];
-        else
-            return false;
+        if (is_array($info)) {
+                    return $info['dn'];
+        } else {
+                    return false;
+        }
     }
 }
\ No newline at end of file

public/index.php

Braces +31 added lines, -11 removed lines

@@ -66,7 +66,8 @@ 
             $groupDN = sprintf('ou=%s,%s', $groupOU, $app['config']['ldap.subtrees']['groups']);
             $groupAttr = $app['ldap']->getEntry($groupDN, ['cn', 'owner']);
 
-            switch ($action) {
+            switch ($action)
+            {
                 case 'quit':
                     try {
                         if (in_array($userDN, $groupAttr['owner'])) {
@@ -113,15 +114,23 @@ 
         $groupList = [];
         foreach ($groups as $g) {
             $roles = [];
-            if (isset($g['owner']) && in_array($userDN, $g['owner'])) $roles[] = 'owner';
-            if (isset($g['member']) && in_array($userDN, $g['member'])) $roles[] = 'member';
-            if (isset($g['pending']) && in_array($userDN, $g['pending'])) $roles[] = 'pending';
+            if (isset($g['owner']) && in_array($userDN, $g['owner'])) {
+                $roles[] = 'owner';
+            }
+            if (isset($g['member']) && in_array($userDN, $g['member'])) {
+                $roles[] = 'member';
+            }
+            if (isset($g['pending']) && in_array($userDN, $g['pending'])) {
+                $roles[] = 'pending';
+            }
 
             $owners = [];
             if (isset($g['owner'])) {
                 for ($j = 0; $j < count($g['owner']); $j++) {
                     $o = $app['ldap']->getEntry($g['owner'][$j], ['cn', 'mail']);
-                    if (isset($o)) $owners[] = $o;
+                    if (isset($o)) {
+                        $owners[] = $o;
+                    }
                 }
             }
 
@@ -156,7 +165,9 @@ 
             return new \Symfony\Component\HttpFoundation\RedirectResponse('/members/Benutzerdaten');
         }
 
-        if (!isset($selGroup)) $selGroup = $ownedGroups[0]['ou'][0];
+        if (!isset($selGroup)) {
+            $selGroup = $ownedGroups[0]['ou'][0];
+        }
         $selGroupDN = sprintf('ou=%s,%s', $selGroup, $app['config']['ldap.subtrees']['groups']);
 
         $action = $request->request->get('manage-action');
@@ -179,7 +190,8 @@ 
 
                 $groupAttr = $app['ldap']->getEntry($selGroupDN, ['owner']);
 
-                switch ($action) {
+                switch ($action)
+                {
                     case 'activate':
                         try {
                             $app['ldap']->activateMember($userID);
@@ -232,11 +244,19 @@ 
         $memberList = [];
         foreach ($allUsers as $u) {
             $roles = [];
-            if (isset($groupAttr['owner']) && in_array($u['dn'], $groupAttr['owner'])) $roles[] = 'owner';
-            if (isset($groupAttr['member']) && in_array($u['dn'], $groupAttr['member'])) $roles[] = 'member';
-            if (isset($groupAttr['pending']) && in_array($u['dn'], $groupAttr['pending'])) $roles[] = 'pending';
+            if (isset($groupAttr['owner']) && in_array($u['dn'], $groupAttr['owner'])) {
+                $roles[] = 'owner';
+            }
+            if (isset($groupAttr['member']) && in_array($u['dn'], $groupAttr['member'])) {
+                $roles[] = 'member';
+            }
+            if (isset($groupAttr['pending']) && in_array($u['dn'], $groupAttr['pending'])) {
+                $roles[] = 'pending';
+            }
             // we handle inactive members like the other cases, the UI is just so similar
-            if (strstr($u['dn'], 'ou=inactive')) $roles[] = 'inactive';
+            if (strstr($u['dn'], 'ou=inactive')) {
+                $roles[] = 'inactive';
+            }
 
             $listentry = array(
                 'name' => $u['cn'][0],