diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-01-05 14:17:12 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-01-05 14:17:12 +0100 |
| commit | d736eba00b274c87662bd73a3acf8288135643d6 (patch) | |
| tree | 7a23e24f95e6f5b26610d83957a4198bf5f16ed0 /include | |
| parent | a500ec70bb82151c8fcf7443b4645640233952e8 (diff) | |
Improve UserManager::QuitUser() and related code
- Make operreason optional; NULL means same as quitreason
- Remove User::quietquit, it is now handled internally in spanningtree
- Send snotice about quitting remote users from spanningtree
Diffstat (limited to 'include')
| -rw-r--r-- | include/usermanager.h | 4 | ||||
| -rw-r--r-- | include/users.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/usermanager.h b/include/usermanager.h index c6745ace6..a807cd447 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -102,10 +102,10 @@ class CoreExport UserManager /** Disconnect a user gracefully * @param user The user to remove * @param quitreason The quit reason to show to normal users - * @param operreason The quit reason to show to opers + * @param operreason The quit reason to show to opers, can be NULL if same as quitreason * @return Although this function has no return type, on exit the user provided will no longer exist. */ - void QuitUser(User *user, const std::string &quitreason, const char* operreason = ""); + void QuitUser(User* user, const std::string& quitreason, const std::string* operreason = NULL); /** Add a user to the local clone map * @param user The user to add diff --git a/include/users.h b/include/users.h index aa11a2b82..fa9d97c21 100644 --- a/include/users.h +++ b/include/users.h @@ -328,10 +328,6 @@ class CoreExport User : public Extensible */ unsigned int registered:3; - /** Whether or not to send an snotice about this user's quitting - */ - unsigned int quietquit:1; - /** If this is set to true, then all socket operations for the user * are dropped into the bit-bucket. * This value is set by QuitUser, and is not needed seperately from that call. |