equal
deleted
inserted
replaced
23 { |
23 { |
24 user = user.lower(); |
24 user = user.lower(); |
25 autodelete<vpwentry> vpw = table()->getbyname(user); |
25 autodelete<vpwentry> vpw = table()->getbyname(user); |
26 if(!vpw) |
26 if(!vpw) |
27 RETURN(err, "User does not exist"); |
27 RETURN(err, "User does not exist"); |
28 if(!del_mailbox && !!vpw->mailbox) |
28 if(!del_mailbox && vpw->has_mailbox) |
29 RETURN(err, "User has a mailbox"); |
29 RETURN(err, "User has a mailbox"); |
30 if(!table()->del(vpw->name)) |
30 if(!table()->del(vpw->name)) |
31 RETURN(err, "Couldn't delete user from the password file"); |
31 RETURN(err, "Couldn't delete user from the password file"); |
32 if(!!vpw->mailbox && !delete_directory(vpw->mailbox)) |
32 if(!!vpw->directory && !delete_directory(vpw->directory)) |
33 RETURN(err, "Couldn't delete user's mail directory"); |
33 RETURN(err, "Couldn't delete user's directory"); |
34 RETURN(ok, "Deleted user."); |
34 RETURN(ok, "Deleted user."); |
35 } |
35 } |