Remove InspIRCd* parameters and fields

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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 82b76c02b9d92b45e7f7916f26ac9ff79b1e579d..28b3b1c50d27702824b48eb85115f16bb685737f 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,52 +20,56 @@
 class CommandKnock : public Command
 {
  public:
-       CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
+       CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2)
        {
-               this->source = "m_knock.so";
                syntax = "<channel> <reason>";
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
-       
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                Channel* c = ServerInstance->FindChan(parameters[0]);
                std::string line;
 
                if (!c)
                {
-                       user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
 
                if (c->HasUser(user))
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick, c->name);
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
 
                if (c->IsModeSet('K'))
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
 
                if (!c->modes[CM_INVITEONLY])
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
 
-               for (int i = 1; i < pcnt - 1; i++)
+               for (int i = 1; i < (int)parameters.size() - 1; i++)
                {
-                       line = line + std::string(parameters[i]) + " ";
+                       line = line + parameters[i] + " ";
                }
-               line = line + std::string(parameters[pcnt-1]);
+               line = line + parameters[parameters.size()-1];
 
-               c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName,  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick, c->name, line.c_str());
-               user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick,c->name);
+               c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName,  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name.c_str(), user->nick.c_str(), c->name.c_str(), line.c_str());
+               user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Handles channel mode +K
@@ -73,36 +77,31 @@ class CommandKnock : public Command
 class Knock : public SimpleChannelModeHandler
 {
  public:
-       Knock(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'K') { }
+       Knock(Module* Creator) : SimpleChannelModeHandler(Creator, 'K') { }
 };
 
 class ModuleKnock : public Module
 {
-       CommandKnock* mycommand;
-       Knock* kn;
+       CommandKnock cmd;
+       Knock kn;
  public:
-       ModuleKnock(InspIRCd* Me) : Module(Me)
+       ModuleKnock() : cmd(this), kn(this)
        {
-               kn = new Knock(ServerInstance);
-
-               if (!ServerInstance->Modes->AddMode(kn))
+               if (!ServerInstance->Modes->AddMode(&kn))
                        throw ModuleException("Could not add new modes!");
-
-               mycommand = new CommandKnock(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
 
        }
 
 
        virtual ~ModuleKnock()
        {
-               ServerInstance->Modes->DelMode(kn);
-               delete kn;
+               ServerInstance->Modes->DelMode(&kn);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for /KNOCK and mode +K", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };