Check for existance of group- and usernames, don't mix OC_USER and OC_GROUP!

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/user.php b/lib/user.php
index 82b012f3a5c..51e4ab358e1 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -114,6 +114,11 @@ class OC_USER {
 		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )){
 			return false;
 		}
+		// No empty username
+		if( !$uid ){
+			return false;
+		}
+
 		$run = true;
 		OC_HOOK::emit( "OC_USER", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password ));
 
@@ -138,6 +143,12 @@ class OC_USER {
 		OC_HOOK::emit( "OC_USER", "pre_deleteUser", array( "run" => &$run, "uid" => $uid ));
 
 		if( $run && self::$_backend->deleteUser( $uid )){
+			// We have to delete the user from all groups
+			foreach( OC_GROUP::getUserGroups( $uid ) as $i ){
+				OC_GROUP::removeFromGroup( $uid, $i );
+			}
+
+			// Emit and exit
 			OC_HOOK::emit( "OC_USER", "post_deleteUser", array( "uid" => $uid ));
 			return true;
 		}