diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/createuser.php | 8 | ||||
| -rw-r--r-- | settings/js/users.js | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php index 1ed53efcf06..6714711bc87 100644 --- a/settings/ajax/createuser.php +++ b/settings/ajax/createuser.php @@ -23,7 +23,8 @@ if( in_array( $username, OC_User::getUsers())){ } // Return Success story -if( OC_User::createUser( $username, $password )){ +try { + OC_User::createUser($username, $password); foreach( $groups as $i ){ if(!OC_Group::groupExists($i)){ OC_Group::createGroup($i); @@ -31,9 +32,8 @@ if( OC_User::createUser( $username, $password )){ OC_Group::addToGroup( $username, $i ); } OC_JSON::success(array("data" => array( "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username ))))); -} -else{ - OC_JSON::error(array("data" => array( "message" => "Unable to add user" ))); +} catch (Exception $exception) { + OC_JSON::error(array("data" => array( "message" => $exception->getMessage()))); } ?> diff --git a/settings/js/users.js b/settings/js/users.js index eed93d3b303..e6eee4ce4fa 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -158,10 +158,11 @@ $(document).ready(function(){ event.preventDefault(); var username=$('#newusername').val(); if($('#content table tbody tr').filterAttr('data-uid',username).length>0){ + OC.dialogs.alert('The username is already being used', 'Error creating user'); return; } if($.trim(username) == '') { - alert('Please provide a username!'); + OC.dialogs.alert('A valid username must be provided', 'Error creating user'); return false; } var password=$('#newuserpassword').val(); @@ -177,6 +178,7 @@ $(document).ready(function(){ function(result){ if(result.status!='success'){ tr.remove(); + OC.dialogs.alert(result.data.message, 'Error creating user'); } } ); |