mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Provide feedback when user creation fails

This commit is contained in:
Michael Gapczynski 2012-05-06 18:04:31 -04:00
parent 333345d201
commit e0db22cc07
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/user.php
View File

@ -117,15 +117,15 @@ class OC_User {
// Check the name for bad characters
// Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
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
if(trim($uid) == ''){
return false;
throw new Exception('A valid username must be provided');
}
// Check if user already exists
if( self::userExists($uid) ){
return false;
throw new Exception('The username is already being used');
}

8
settings/ajax/createuser.php
View File

@ -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())));
}
?>

4
settings/js/users.js
View File

@ -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');
}
}
);