DOH! Fix my muppetry of a segfault, and fix some warnings

[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 23ee0539564629c367f216ace2c3160c69187a72..3d2f4b3444435c5152c7f98e7b222fc811a1e792 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,45 +17,51 @@
 
 /** Handles the /KNOCK command
  */
-class cmd_knock : public command_t
+class CommandKnock : public Command
 {
  public:
-       cmd_knock (InspIRCd* Instance) : command_t(Instance,"KNOCK", 0, 2)
+       CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
        {
                this->source = "m_knock.so";
                syntax = "<channel> <reason>";
+               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
        
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
-               chanrec* c = ServerInstance->FindChan(parameters[0]);
+               Channel* c = ServerInstance->FindChan(parameters[0]);
+               std::string line;
 
                if (!c)
                {
-                       user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
                        return CMD_FAILURE;
                }
 
-               std::string line;
-
-               if (c->IsModeSet('K'))
+               if (c->HasUser(user))
                {
-                       user->WriteServ("480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick, c->name);
                        return CMD_FAILURE;
                }
 
-               for (int i = 1; i < pcnt - 1; i++)
+               if (c->IsModeSet('K'))
                {
-                       line = line + std::string(parameters[i]) + " ";
+                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+                       return CMD_FAILURE;
                }
-               line = line + std::string(parameters[pcnt-1]);
 
                if (!c->modes[CM_INVITEONLY])
                {
-                       user->WriteServ("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->name);
                        return CMD_FAILURE;
                }
 
+               for (int i = 1; i < pcnt - 1; i++)
+               {
+                       line = line + std::string(parameters[i]) + " ";
+               }
+               line = line + std::string(parameters[pcnt-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);
                return CMD_SUCCESS;
@@ -69,7 +75,7 @@ class Knock : public ModeHandler
  public:
        Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -94,32 +100,31 @@ class Knock : public ModeHandler
 
 class ModuleKnock : public Module
 {
-       cmd_knock* mycommand;
+       CommandKnock* mycommand;
        Knock* kn;
  public:
        ModuleKnock(InspIRCd* Me) : Module(Me)
        {
-               
                kn = new Knock(ServerInstance);
-               if (!ServerInstance->AddMode(kn, 'K'))
+
+               if (!ServerInstance->Modes->AddMode(kn))
                        throw ModuleException("Could not add new modes!");
-               mycommand = new cmd_knock(ServerInstance);
+
+               mycommand = new CommandKnock(ServerInstance);
                ServerInstance->AddCommand(mycommand);
-       }
 
-       void Implements(char* List)
-       {
        }
 
+
        virtual ~ModuleKnock()
        {
                ServerInstance->Modes->DelMode(kn);
-               DELETE(kn);
+               delete kn;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };