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 12ad69b13d812efdf7d9e89a73c949ae93ee9231..3d2f4b3444435c5152c7f98e7b222fc811a1e792 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -1,102 +1,131 @@
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+#include "inspircd.h"
 
-Server *Srv;
-        
-void handle_knock(char **parameters, int pcnt, userrec *user)
-{
-       chanrec* c = Srv->FindChannel(parameters[0]);
-       std::string line = "";
-
-       for (int i = 1; i < pcnt - 1; i++)
-       {
-               line = line + std::string(parameters[i]) + " ";
-       }
-       line = line + std::string(parameters[pcnt-1]);
+/* $ModDesc: Provides support for /KNOCK and mode +K */
 
-       if (c->IsCustomModeSet('K'))
-       {
-               WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
-               return;
-       }
-       if (c->inviteonly)
-       {
-               WriteChannelWithServ(Srv->GetServerName().c_str(),c,user,"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);
-               return;
-       }
-       else
-       {
-               WriteServ(user->fd,"480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
-               return;
-       }
-}
-
-
-class ModuleKnock : public Module
+/** Handles the /KNOCK command
+ */
+class CommandKnock : public Command
 {
  public:
-       ModuleKnock()
-       {
-               Srv = new Server;
-               
-               Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
-               Srv->AddCommand("KNOCK",handle_knock,0,2);
-       }
-       
-       virtual ~ModuleKnock()
+       CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
        {
-               delete Srv;
+               this->source = "m_knock.so";
+               syntax = "<channel> <reason>";
+               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
        
-       virtual Version GetVersion()
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
-               return Version(1,0,0,1);
+               Channel* c = ServerInstance->FindChan(parameters[0]);
+               std::string line;
+
+               if (!c)
+               {
+                       user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
+                       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);
+                       return CMD_FAILURE;
+               }
+
+               if (c->IsModeSet('K'))
+               {
+                       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->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;
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+};
+
+/** Handles channel mode +K
+ */
+class Knock : public ModeHandler
+{
+ 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)
        {
-               // check if this is our mode character...
-               if ((modechar == 'K') && (type == MT_CHANNEL))
-               {
-                       return 1;
+               if (adding)
+               {
+                       if (!channel->IsModeSet('K'))
+                       {
+                               channel->SetMode('K',true);
+                               return MODEACTION_ALLOW;
+                       }
                }
                else
                {
-                       return 0;
+                       if (channel->IsModeSet('K'))
+                       {
+                               channel->SetMode('K',false);
+                               return MODEACTION_ALLOW;
+                       }
                }
-       }
 
+               return MODEACTION_DENY;
+       }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleKnockFactory : public ModuleFactory
+class ModuleKnock : public Module
 {
+       CommandKnock* mycommand;
+       Knock* kn;
  public:
-       ModuleKnockFactory()
+       ModuleKnock(InspIRCd* Me) : Module(Me)
        {
+               kn = new Knock(ServerInstance);
+
+               if (!ServerInstance->Modes->AddMode(kn))
+                       throw ModuleException("Could not add new modes!");
+
+               mycommand = new CommandKnock(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+
        }
-       
-       ~ModuleKnockFactory()
+
+
+       virtual ~ModuleKnock()
        {
+               ServerInstance->Modes->DelMode(kn);
+               delete kn;
        }
-       
-       virtual Module * CreateModule()
+
+       virtual Version GetVersion()
        {
-               return new ModuleKnock;
+               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock)