Skip to content
Snippets Groups Projects
Commit e0db22cc authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Provide feedback when user creation fails

parent 333345d2
Branches
No related tags found
No related merge requests found
...@@ -117,15 +117,15 @@ class OC_User { ...@@ -117,15 +117,15 @@ class OC_User {
// Check the name for bad characters // Check the name for bad characters
// Allowed are: "a-z", "A-Z", "0-9" and "_.@-" // Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )){ if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )){
return false; throw new Exception('Only the following characters are allowed in a username: "a-z", "A-Z", "0-9", and "_.@-"');
} }
// No empty username // No empty username
if(trim($uid) == ''){ if(trim($uid) == ''){
return false; throw new Exception('A valid username must be provided');
} }
// Check if user already exists // Check if user already exists
if( self::userExists($uid) ){ if( self::userExists($uid) ){
return false; throw new Exception('The username is already being used');
} }
......
...@@ -23,7 +23,8 @@ if( in_array( $username, OC_User::getUsers())){ ...@@ -23,7 +23,8 @@ if( in_array( $username, OC_User::getUsers())){
} }
// Return Success story // Return Success story
if( OC_User::createUser( $username, $password )){ try {
OC_User::createUser($username, $password);
foreach( $groups as $i ){ foreach( $groups as $i ){
if(!OC_Group::groupExists($i)){ if(!OC_Group::groupExists($i)){
OC_Group::createGroup($i); OC_Group::createGroup($i);
...@@ -31,9 +32,8 @@ if( OC_User::createUser( $username, $password )){ ...@@ -31,9 +32,8 @@ if( OC_User::createUser( $username, $password )){
OC_Group::addToGroup( $username, $i ); OC_Group::addToGroup( $username, $i );
} }
OC_JSON::success(array("data" => array( "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username ))))); OC_JSON::success(array("data" => array( "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
} } catch (Exception $exception) {
else{ OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
OC_JSON::error(array("data" => array( "message" => "Unable to add user" )));
} }
?> ?>
...@@ -158,10 +158,11 @@ $(document).ready(function(){ ...@@ -158,10 +158,11 @@ $(document).ready(function(){
event.preventDefault(); event.preventDefault();
var username=$('#newusername').val(); var username=$('#newusername').val();
if($('#content table tbody tr').filterAttr('data-uid',username).length>0){ if($('#content table tbody tr').filterAttr('data-uid',username).length>0){
OC.dialogs.alert('The username is already being used', 'Error creating user');
return; return;
} }
if($.trim(username) == '') { if($.trim(username) == '') {
alert('Please provide a username!'); OC.dialogs.alert('A valid username must be provided', 'Error creating user');
return false; return false;
} }
var password=$('#newuserpassword').val(); var password=$('#newuserpassword').val();
...@@ -177,6 +178,7 @@ $(document).ready(function(){ ...@@ -177,6 +178,7 @@ $(document).ready(function(){
function(result){ function(result){
if(result.status!='success'){ if(result.status!='success'){
tr.remove(); tr.remove();
OC.dialogs.alert(result.data.message, 'Error creating user');
} }
} }
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment