fix some unitialised vectors and tidy up a bit.

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

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 92f623fe1e149d60c0f19973090655cc9e8be0d6..8e043916906fdec702e963b6a445da5fbfd4d763 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.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
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
@@ -27,7 +24,7 @@ class SSLMode : public ModeHandler
  public:
        SSLMode(InspIRCd* Instance) : ModeHandler(Instance, 'z', 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)
                {
@@ -40,7 +37,7 @@ class SSLMode : public ModeHandler
                                        {
                                                if(!i->first->GetExt("ssl", dummy))
                                                {
-                                                       source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+                                                       source->WriteNumeric(490, "%s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
                                                        return MODEACTION_DENY;
                                                }
                                        }
@@ -78,16 +75,14 @@ class ModuleSSLModes : public Module
                
 
                sslm = new SSLMode(ServerInstance);
-               if (!ServerInstance->AddMode(sslm, 'z'))
+               if (!ServerInstance->Modes->AddMode(sslm))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = 1;
-       }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if(chan && chan->IsModeSet('z'))
                {
@@ -110,36 +105,15 @@ class ModuleSSLModes : public Module
        virtual ~ModuleSSLModes()
        {
                ServerInstance->Modes->DelMode(sslm);
-               DELETE(sslm);
+               delete sslm;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
 
-class ModuleSSLModesFactory : public ModuleFactory
-{
- public:
-       ModuleSSLModesFactory()
-       {
-       }
-       
-       ~ModuleSSLModesFactory()
-       {
-       }
-       
-       virtual Module* CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSSLModes(Me);
-       }
-       
-};
-
+MODULE_INIT(ModuleSSLModes)
 
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleSSLModesFactory;
-}