Updates, should be able to safely unload client modules with queries in progress...

[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 2e63e890b1ca4ad5b42a5aaef87794ae87c63d9f..b4e535d9b269505fe64c3bad2759cc778d8a17cc 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -35,12 +35,19 @@ class cmd_knock : public command_t
                this->source = "m_knock.so";
        }
        
-       void Handle (char **parameters, int pcnt, userrec *user)
+       void Handle (const char** parameters, int pcnt, userrec *user)
        {
                chanrec* c = Srv->FindChannel(parameters[0]);
+
+               if (!c)
+               {
+                       WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
+                       return;
+               }
+
                std::string line = "";
 
-               if (c->IsCustomModeSet('K'))
+               if (c->IsModeSet('K'))
                {
                        WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
                        return;
@@ -52,7 +59,7 @@ class cmd_knock : public command_t
                }
                line = line + std::string(parameters[pcnt-1]);
 
-               if (c->custom_modes[CM_INVITEONLY])
+               if (c->modes[CM_INVITEONLY])
                {
                        WriteChannelWithServ((char*)Srv->GetServerName().c_str(),c,"NOTICE %s :User %s is KNOCKing on %s (%s)",c->name,user->nick,c->name,line.c_str());
                        WriteServ(user->fd,"NOTICE %s :KNOCKing on %s",user->nick,c->name);
@@ -66,51 +73,67 @@ class cmd_knock : public command_t
        }
 };
 
+class Knock : public ModeHandler
+{
+ public:
+       Knock() : ModeHandler('K', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               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;
+       }
+};
+
 class ModuleKnock : public Module
 {
        cmd_knock* mycommand;
+       Knock* kn;
  public:
-       ModuleKnock(Server* Me)
-               : Module::Module(Me)
+       ModuleKnock(Server* Me) : Module::Module(Me)
        {
                Srv = Me;
-               Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
+               kn = new Knock();
+               Srv->AddMode(kn, 'K');
                mycommand = new cmd_knock();
                Srv->AddCommand(mycommand);
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+               List[I_On005Numeric] = 1;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
+       virtual void On005Numeric(std::string &output)
+       {
                InsertMode(output,"K",4);
-        }
+       }
 
        virtual ~ModuleKnock()
        {
+               DELETE(kn);
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'K') && (type == MT_CHANNEL))
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
-
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.