Better check and handling of user creation

diff --git a/lib/user.php b/lib/user.php
index 63b10b5e8465c2ee4e99a078383a17ba51efeda1..df098d776b40370138674694ab698b514c2943c9 100644 (file)
--- a/lib/user.php
+++ b/lib/user.php
@@ -182,7 +182,7 @@ class OC_User {
                                $backend->createUser($uid,$password);
                                OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password ));
 
-                               return true;
+                               return self::userExists($uid);
                        }
                }
                return false;

diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index bdf7e4983ac5fd5f12674bb0db9a721de01442f3..eecc2662cde0921fa604af54bd0c6a22cf777e02 100644 (file)
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -37,14 +37,17 @@ $username = $_POST["username"];
 $password = $_POST["password"];
 
 // Does the group exist?
-if( in_array( $username, OC_User::getUsers())) {
+if(OC_User::userExists($username)) {
        OC_JSON::error(array("data" => array( "message" => "User already exists" )));
        exit();
 }
 
 // Return Success story
 try {
-       OC_User::createUser($username, $password);
+       if (!OC_User::createUser($username, $password)) {
+               OC_JSON::error(array('data' => array( 'message' => 'User creation failed for '.$username )));
+               exit();
+       }
        foreach( $groups as $i ) {
                if(!OC_Group::groupExists($i)) {
                        OC_Group::createGroup($i);