converting m_d* done

[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 b974c0688091c747e1c169efc0ef9b17658ed024..82b76c02b9d92b45e7f7916f26ac9ff79b1e579d 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -27,32 +27,32 @@ class CommandKnock : public Command
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
        
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                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;
                }
 
                if (c->HasUser(user))
                {
-                       user->WriteServ("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->name);
                        return CMD_FAILURE;
                }
 
                if (c->IsModeSet('K'))
                {
-                       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, +K is set.",user->nick, c->name);
                        return CMD_FAILURE;
                }
 
                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;
                }
 
@@ -70,32 +70,10 @@ class CommandKnock : public Command
 
 /** Handles channel mode +K
  */
-class Knock : public ModeHandler
+class Knock : public SimpleChannelModeHandler
 {
  public:
-       Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('K'))
-                       {
-                               channel->SetMode('K',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('K'))
-                       {
-                               channel->SetMode('K',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       Knock(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'K') { }
 };
 
 class ModuleKnock : public Module
@@ -124,7 +102,7 @@ class ModuleKnock : public Module
 
        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);
        }
 };