diff options
| -rw-r--r-- | include/modules.h | 4 | ||||
| -rw-r--r-- | include/users.h | 2 | ||||
| -rw-r--r-- | src/modules.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_chgname.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_setname.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.h | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/uid.cpp | 2 | ||||
| -rw-r--r-- | src/users.cpp | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/include/modules.h b/include/modules.h index 302c2e4d7..0cdb73873 100644 --- a/include/modules.h +++ b/include/modules.h @@ -216,7 +216,7 @@ enum Implementation I_OnUserPreInvite, I_OnUserInvite, I_OnUserPreMessage, I_OnUserPreNick, I_OnUserPostMessage, I_OnUserMessageBlocked, I_OnMode, I_OnDecodeMetaData, I_OnAcceptConnection, I_OnUserInit, - I_OnChangeHost, I_OnChangeName, I_OnAddLine, I_OnDelLine, I_OnExpireLine, + I_OnChangeHost, I_OnChangeRealName, I_OnAddLine, I_OnDelLine, I_OnExpireLine, I_OnUserPostNick, I_OnPreMode, I_On005Numeric, I_OnKill, I_OnLoadModule, I_OnUnloadModule, I_OnBackgroundTimer, I_OnPreCommand, I_OnCheckReady, I_OnCheckInvite, I_OnRawMode, I_OnCheckKey, I_OnCheckLimit, I_OnCheckBan, I_OnCheckChannelBan, I_OnExtBanCheck, @@ -585,7 +585,7 @@ class CoreExport Module : public classbase, public usecountbase * @param user The user who's real name is being changed * @param name The new real name being set on the user */ - virtual void OnChangeName(User* user, const std::string& real); + virtual void OnChangeRealName(User* user, const std::string& real); /** Called whenever a user's IDENT is changed. * This event triggers after the name has been set. diff --git a/include/users.h b/include/users.h index bcddab1bf..9bca1d7a6 100644 --- a/include/users.h +++ b/include/users.h @@ -710,7 +710,7 @@ class CoreExport User : public Extensible * @param real The user's new real name * @return True if the change succeeded, false if otherwise */ - bool ChangeName(const std::string& real); + bool ChangeRealName(const std::string& real); /** Change a user's nick * @param newnick The new nick. If equal to the users uuid, the nick change always succeeds. diff --git a/src/modules.cpp b/src/modules.cpp index 7e602d944..8b348d416 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -119,7 +119,7 @@ void Module::OnUserInvite(User*, User*, Channel*, time_t, unsigned int, CUList& void Module::OnPostTopicChange(User*, Channel*, const std::string&) { DetachEvent(I_OnPostTopicChange); } void Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { DetachEvent(I_OnDecodeMetaData); } void Module::OnChangeHost(User*, const std::string&) { DetachEvent(I_OnChangeHost); } -void Module::OnChangeName(User*, const std::string&) { DetachEvent(I_OnChangeName); } +void Module::OnChangeRealName(User*, const std::string&) { DetachEvent(I_OnChangeRealName); } void Module::OnChangeIdent(User*, const std::string&) { DetachEvent(I_OnChangeIdent); } void Module::OnAddLine(User*, XLine*) { DetachEvent(I_OnAddLine); } void Module::OnDelLine(User*, XLine*) { DetachEvent(I_OnDelLine); } diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index d0a4d6fdc..f6ab800be 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -29,7 +29,7 @@ class CommandChgname : public Command { allow_empty_last_param = false; flags_needed = 'o'; - syntax = "<nick> <newname>"; + syntax = "<nick> <new real name>"; TRANSLATE2(TR_NICK, TR_TEXT); } @@ -57,7 +57,7 @@ class CommandChgname : public Command if (IS_LOCAL(dest)) { - dest->ChangeName(parameters[1]); + dest->ChangeRealName(parameters[1]); ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str()); } diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index bc2b0f3d9..efe7028b7 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -29,7 +29,7 @@ class CommandSetname : public Command CommandSetname(Module* Creator) : Command(Creator,"SETNAME", 1, 1) { allow_empty_last_param = false; - syntax = "<newname>"; + syntax = "<new real name>"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE @@ -40,7 +40,7 @@ class CommandSetname : public Command return CMD_FAILURE; } - if (user->ChangeName(parameters[0])) + if (user->ChangeRealName(parameters[0])) { ServerInstance->SNO->WriteGlobalSno('a', "%s used SETNAME to change their real name to '%s'", user->nick.c_str(), parameters[0].c_str()); } diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 344a6088b..c7e55c66c 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -493,7 +493,7 @@ void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost) CmdBuilder(user, "FHOST").push(newhost).Broadcast(); } -void ModuleSpanningTree::OnChangeName(User* user, const std::string& real) +void ModuleSpanningTree::OnChangeRealName(User* user, const std::string& real) { if (user->registered != REG_ALL || !IS_LOCAL(user)) return; diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index b6374e32e..4479b0700 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -152,7 +152,7 @@ class ModuleSpanningTree : public Module, public Stats::EventListener void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE; void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE; void OnChangeHost(User* user, const std::string &newhost) CXX11_OVERRIDE; - void OnChangeName(User* user, const std::string& real) CXX11_OVERRIDE; + void OnChangeRealName(User* user, const std::string& real) CXX11_OVERRIDE; void OnChangeIdent(User* user, const std::string &ident) CXX11_OVERRIDE; void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE; void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) CXX11_OVERRIDE; diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 86933dc72..11c5ffc91 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -147,7 +147,7 @@ CmdResult CommandFIdent::HandleRemote(RemoteUser* src, Params& params) CmdResult CommandFName::HandleRemote(RemoteUser* src, Params& params) { - src->ChangeName(params[0]); + src->ChangeRealName(params[0]); return CMD_SUCCESS; } diff --git a/src/users.cpp b/src/users.cpp index 20480da07..fb4888639 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -995,7 +995,7 @@ bool User::SharesChannelWith(User *other) return false; } -bool User::ChangeName(const std::string& real) +bool User::ChangeRealName(const std::string& real) { if (!this->fullname.compare(real)) return true; @@ -1006,7 +1006,7 @@ bool User::ChangeName(const std::string& real) FIRST_MOD_RESULT(OnPreChangeRealName, MOD_RESULT, (IS_LOCAL(this), real)); if (MOD_RESULT == MOD_RES_DENY) return false; - FOREACH_MOD(OnChangeName, (this, real)); + FOREACH_MOD(OnChangeRealName, (this, real)); } this->fullname.assign(real, 0, ServerInstance->Config->Limits.MaxReal); |