summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/user.php2
-rw-r--r--settings/ajax/createuser.php7
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/user.php b/lib/user.php
index 801ab7f608d..872fff9b2d9 100644
--- 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 16b48c8a9ca..addae78517a 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -29,14 +29,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);