diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/group.php | 14 | ||||
| -rw-r--r-- | lib/user.php | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/lib/group.php b/lib/group.php index 074e464f581..6510838ccfc 100644 --- a/lib/group.php +++ b/lib/group.php @@ -108,6 +108,10 @@ class OC_GROUP { if( !$gid ){ return false; } + // No duplicate group names + if( in_array( $gid, self::getGroups())){ + return false; + } $run = true; OC_HOOK::emit( "OC_GROUP", "pre_createGroup", array( "run" => &$run, "gid" => $gid )); @@ -167,6 +171,16 @@ class OC_GROUP { * Adds a user to a group. */ public static function addToGroup( $uid, $gid ){ + // Does the user exist? + if( !in_array( $uid, OC_USER::getUsers())){ + return false; + } + // Does the group exist? + if( !in_array( $gid, self::getGroups())){ + return false; + } + + // Go go go $run = true; OC_HOOK::emit( "OC_GROUP", "pre_addToGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid )); diff --git a/lib/user.php b/lib/user.php index 51e4ab358e1..09501e59c58 100644 --- a/lib/user.php +++ b/lib/user.php @@ -118,6 +118,11 @@ class OC_USER { if( !$uid ){ return false; } + // Check if user already exists + if( in_array( $uid, self::getUsers())){ + return false; + } + $run = true; OC_HOOK::emit( "OC_USER", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password )); |