changes

Author: sheldor1510

resources/lib/UnityPerms.php

@@ -75,6 +75,10 @@ public function checkGrantRole($uid, $group, $role)
 
         $user_role = $this->SQL->getRole($uid, $group);
 
+        if ($this->SQL->hasPerm($user_role, 'unity.admin_no_grant') && $role == 'unity.admin') {
+            return false;
+        }
+
         if ($this->SQL->hasPerm($user_role, 'unity.admin') || $this->SQL->hasPerm($user_role, 'unity.admin_no_grant')) {
             return true;
         }
@@ -104,6 +108,10 @@ public function checkRevokeRole($uid, $group, $role)
 
         $user_role = $this->SQL->getRole($uid, $group);
 
+        if ($this->SQL->hasPerm($user_role, 'unity.admin_no_grant') && $role == 'unity.admin') {
+            return false;
+        }
+
         if ($this->SQL->hasPerm($user_role, 'unity.admin') || $this->SQL->hasPerm($user_role, 'unity.admin_no_grant')) {
             return true;
         }

resources/lib/UnityUser.php

@@ -674,19 +674,26 @@ public function hasRequestedAccountDeletion()
 
     /**
      * Checks whether a user is in a group or not
+     * @param  string  $uid   uid of the user
+     * @param  string  or object $group group to check
+     * @return boolean true if user is in group, false if not
      */
 
     public function isInGroup($uid, $group)
     {
-        $group = new UnityGroup(
-            $group,
-            $this->LDAP,
-            $this->SQL,
-            $this->MAILER,
-            $this->REDIS,
-            $this->WEBHOOK
-        );
+        if (gettype($group) == "string") {
+            $group_checked = new UnityGroup(
+                $group,
+                $this->LDAP,
+                $this->SQL,
+                $this->MAILER,
+                $this->REDIS,
+                $this->WEBHOOK
+            );
+        } else {
+            $group_checked = $group;
+        }
 
-        return in_array($uid, $group->getGroupMemberUIDs());
+        return in_array($uid, $group_checked->getGroupMemberUIDs());
     }
 }