Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index b2206220df3c681e0514a32dd74450ab8372da40..f6589acffa5e0b5d42f91a42740906ed380eb2d6 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -28,19 +28,19 @@ class CommandUserip : public Command
  public:
        CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
        {
-               syntax = "<nick>{,<nick>}";
+               syntax = "<nick> [<nick>]+";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               std::string retbuf = "340 " + user->nick + " :";
+               std::string retbuf;
                int nicks = 0;
                bool checked_privs = false;
-               bool has_privs;
+               bool has_privs = false;
 
-               for (int i = 0; i < (int)parameters.size(); i++)
+               for (size_t i = 0; i < parameters.size(); i++)
                {
-                       User *u = ServerInstance->FindNick(parameters[i]);
+                       User *u = ServerInstance->FindNickOnly(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
                                // Anyone may query their own IP
@@ -52,7 +52,7 @@ class CommandUserip : public Command
                                                checked_privs = true;
                                                has_privs = user->HasPrivPermission("users/auspex");
                                                if (!has_privs)
-                                                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
+                                                       user->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
                                        }
 
                                        if (!has_privs)
@@ -70,7 +70,7 @@ class CommandUserip : public Command
                }
 
                if (nicks != 0)
-                       user->WriteServ(retbuf);
+                       user->WriteNumeric(RPL_USERIP, retbuf);
 
                return CMD_SUCCESS;
        }
@@ -85,13 +85,6 @@ class ModuleUserIP : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-               Implementation eventlist[] = { I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
                tokens["USERIP"];
@@ -99,7 +92,7 @@ class ModuleUserIP : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for USERIP command",VF_VENDOR);
+               return Version("Provides the USERIP command", VF_VENDOR);
        }
 };