Move message parsing to ProcessBuffer and fix edge cases in it.

[user/henk/code/inspircd.git] / src / modules / m_check.cpp

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index f4123466e14b3db54db964f711bdde04744752be..f820f2bd047c68550b285372e29e4083f31a8053 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -140,7 +140,7 @@ class CommandCheck : public Command
                return ret;
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
                        return CMD_SUCCESS;
@@ -168,8 +168,8 @@ 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("modes", std::string("+") + targuser->FormatModes());
+                       context.Write("realname", targuser->GetRealName());
+                       context.Write("modes", targuser->GetModeLetters());
                        context.Write("snomasks", GetSnomasks(targuser));
                        context.Write("server", targuser->server->GetName());
                        context.Write("uid", targuser->uuid);
@@ -197,12 +197,10 @@ class CommandCheck : public Command
                                        context.Write("modeperms", "user=" + umodes + " channel=" + cmodes);
 
                                        CheckContext::List opcmdlist(context, "commandperms");
-                                       for (OperInfo::PrivSet::const_iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); ++i)
-                                               opcmdlist.Add(*i);
+                                       opcmdlist.Add(oper->AllowedOperCommands.ToString());
                                        opcmdlist.Flush();
                                        CheckContext::List privlist(context, "permissions");
-                                       for (OperInfo::PrivSet::const_iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); ++i)
-                                               privlist.Add(*i);
+                                       opcmdlist.Add(oper->AllowedPrivs.ToString());
                                        privlist.Flush();
                                }
                        }
@@ -265,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->dhost.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();
@@ -283,16 +281,16 @@ class CommandCheck : public Command
                        const user_hash& users = ServerInstance->Users->GetUsers();
                        for (user_hash::const_iterator a = users.begin(); a != users.end(); ++a)
                        {
-                               if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
+                               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());
                                }
                        }
 
@@ -303,7 +301,7 @@ class CommandCheck : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos))
                        return ROUTE_OPT_UCAST(parameters[1]);