Revert automated conversion by Special, as it (unfortunately) neglects some details...

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

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 74ccc49ba324491643d560ac967508fc83efb0e7..192a7e8a092dc27c659800c88d5fa489c4167b57 100644 (file)
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -26,39 +26,39 @@ class CommandChgident : public Command
                syntax = "<nick> <newident>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
-       
-       CmdResult Handle(const char* const* parameters, int pcnt, User *user)
+
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
 
                if (!dest)
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, parameters[0]);
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
 
-               if (!*parameters[1])
+               if (parameters[1].empty())
                {
-                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick);
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick.c_str());
                        return CMD_FAILURE;
                }
-               
-               if (strlen(parameters[1]) > IDENTMAX - 1)
+
+               if (parameters[1].length() > ServerInstance->Config->Limits.IdentMax)
                {
-                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick);
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick.c_str());
                        return CMD_FAILURE;
                }
-               
-               if (!ServerInstance->IsIdent(parameters[1]))
+
+               if (!ServerInstance->IsIdent(parameters[1].c_str()))
                {
-                       user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick);
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
-               dest->ChangeIdent(parameters[1]);
+               dest->ChangeIdent(parameters[1].c_str());
 
                if (!ServerInstance->ULine(user->server))
-                       ServerInstance->SNO->WriteToSnoMask('A', "%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
+                       ServerInstance->SNO->WriteToSnoMask('A', "%s used CHGIDENT to change %s's ident to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str());
 
                /* route it! */
                return CMD_SUCCESS;
@@ -69,8 +69,8 @@ class CommandChgident : public Command
 class ModuleChgIdent : public Module
 {
        CommandChgident* mycommand;
-       
-       
+
+
 public:
        ModuleChgIdent(InspIRCd* Me) : Module(Me)
        {
@@ -78,16 +78,16 @@ public:
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleChgIdent()
        {
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleChgIdent)