diff options
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/m_check.cpp | 8 | ||||
-rw-r--r-- | src/modules/m_chgname.cpp | 2 | ||||
-rw-r--r-- | src/modules/m_gecosban.cpp | 2 | ||||
-rw-r--r-- | src/modules/m_httpd_stats.cpp | 2 | ||||
-rw-r--r-- | src/modules/m_ircv3.cpp | 2 | ||||
-rw-r--r-- | src/modules/m_rline.cpp | 4 | ||||
-rw-r--r-- | src/modules/m_spanningtree/uid.cpp | 6 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index cbb32db48..f820f2bd0 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -168,7 +168,7 @@ class CommandCheck : public Command /* /check on a user */ context.Write("nuh", targuser->GetFullHost()); context.Write("realnuh", targuser->GetFullRealHost()); - context.Write("realname", targuser->fullname); + context.Write("realname", targuser->GetRealName()); context.Write("modes", targuser->GetModeLetters()); context.Write("snomasks", GetSnomasks(targuser)); context.Write("server", targuser->server->GetName()); @@ -263,7 +263,7 @@ class CommandCheck : public Command const UserManager::CloneCounts& clonecount = ServerInstance->Users->GetCloneCounts(i->first); context.Write("member", InspIRCd::Format("%-3u %s%s (%s@%s) %s ", clonecount.global, i->second->GetAllPrefixChars().c_str(), i->first->nick.c_str(), - i->first->ident.c_str(), i->first->GetDisplayedHost().c_str(), i->first->fullname.c_str())); + i->first->ident.c_str(), i->first->GetDisplayedHost().c_str(), i->first->GetRealName().c_str())); } const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes(); @@ -284,13 +284,13 @@ class CommandCheck : public Command if (InspIRCd::Match(a->second->GetRealHost(), parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->GetDisplayedHost(), parameters[0], ascii_case_insensitive_map)) { /* host or vhost matches mask */ - context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname); + context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->GetRealName()); } /* IP address */ else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0])) { /* same IP. */ - context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname); + context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->GetRealName()); } } diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index f6ab800be..aedd75d94 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -58,7 +58,7 @@ class CommandChgname : public Command if (IS_LOCAL(dest)) { 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()); + ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->GetRealName().c_str()); } return CMD_SUCCESS; diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp index 9b449da06..ae399a81f 100644 --- a/src/modules/m_gecosban.cpp +++ b/src/modules/m_gecosban.cpp @@ -31,7 +31,7 @@ class ModuleGecosBan : public Module { if ((mask.length() > 2) && (mask[0] == 'r') && (mask[1] == ':')) { - if (InspIRCd::Match(user->fullname, mask.substr(2))) + if (InspIRCd::Match(user->GetRealName(), mask.substr(2))) return MOD_RES_DENY; } return MOD_RES_PASSTHRU; diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 818c06297..6db292eb3 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -184,7 +184,7 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener data << "<user>"; data << "<nickname>" << u->nick << "</nickname><uuid>" << u->uuid << "</uuid><realhost>" << u->GetRealHost() << "</realhost><displayhost>" << u->GetDisplayedHost() << "</displayhost><realname>" - << Sanitize(u->fullname) << "</realname><server>" << u->server->GetName() << "</server>"; + << Sanitize(u->GetRealName()) << "</realname><server>" << u->server->GetName() << "</server>"; if (u->IsAway()) data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>"; if (u->IsOper()) diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp index 543fb49a4..bbf3d7bc4 100644 --- a/src/modules/m_ircv3.cpp +++ b/src/modules/m_ircv3.cpp @@ -108,7 +108,7 @@ class ModuleIRCv3 : public Module, public AccountEventListener if (!has_account) line += "*"; - line += " :" + memb->user->fullname; + line += " :" + memb->user->GetRealName(); // If the joining user received privileges from another module then we must send them as well, // since silencing the normal join means the MODE will be silenced as well diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 64228caf7..bf6a64d84 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -63,8 +63,8 @@ class RLine : public XLine if (lu && lu->exempt) return false; - const std::string host = u->nick + "!" + u->ident + "@" + u->GetRealHost() + " " + u->fullname; - const std::string ip = u->nick + "!" + u->ident + "@" + u->GetIPString() + " " + u->fullname; + const std::string host = u->nick + "!" + u->ident + "@" + u->GetRealHost() + " " + u->GetRealName(); + const std::string ip = u->nick + "!" + u->ident + "@" + u->GetIPString() + " " + u->GetRealName(); return (regex->Matches(host) || regex->Matches(ip)); } diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 11c5ffc91..01af56fa6 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -76,7 +76,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params _new->ChangeRealHost(params[3], false); _new->ChangeDisplayedHost(params[4]); _new->ident = params[5]; - _new->fullname = params.back(); + _new->ChangeRealName(params.back()); _new->registered = REG_ALL; _new->signon = signon; _new->age = age_t; @@ -126,7 +126,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params dosend = false; if (dosend) - ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", remoteserver->GetName().c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->fullname.c_str()); + ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", remoteserver->GetName().c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->GetRealName().c_str()); FOREACH_MOD(OnPostConnect, (_new)); @@ -163,5 +163,5 @@ CommandUID::Builder::Builder(User* user) push(user->GetIPString()); push_int(user->signon); push(user->GetModeLetters(true)); - push_last(user->fullname); + push_last(user->GetRealName()); } |