No gaurantees this works AT ALL. do not use yet!!!

[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 ff350a85ef0aa10faae446525c2091e7aa2f6722..e31d41c0b8aa9fe2280469666c2baed4608a9114 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -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)
        {
                if (adding)
                {
@@ -38,7 +35,7 @@ class SSLMode : public ModeHandler
                                        CUList* userlist = channel->GetUsers();
                                        for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
                                        {
-                                               if(!i->second->GetExt("ssl", dummy))
+                                               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);
                                                        return MODEACTION_DENY;
@@ -73,7 +70,7 @@ class ModuleSSLModes : public Module
        
  public:
        ModuleSSLModes(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
 
@@ -87,7 +84,7 @@ class ModuleSSLModes : public Module
                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)
        {
                if(chan && chan->IsModeSet('z'))
                {
@@ -120,26 +117,5 @@ class ModuleSSLModes : public Module
 };
 
 
-class ModuleSSLModesFactory : public ModuleFactory
-{
- public:
-       ModuleSSLModesFactory()
-       {
-       }
-       
-       ~ModuleSSLModesFactory()
-       {
-       }
-       
-       virtual Module* CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSSLModes(Me);
-       }
-       
-};
-
+MODULE_INIT(ModuleSSLModes);
 
-extern "C" void * init_module( void )
-{
-       return new ModuleSSLModesFactory;
-}