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 b97f099b9d39147526a96d6c9d88c8d377472d95..8e043916906fdec702e963b6a445da5fbfd4d763 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,30 +1,48 @@
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
+static char* dummy;
+
+/** Handle channel mode +z
+ */
 class SSLMode : public ModeHandler
 {
  public:
-       SSLMode() : ModeHandler('z', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       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)
                {
                        if (!channel->IsModeSet('z'))
                        {
-                               chanuserlist userlist = Srv->GetUsers(channel);
-                               for(unsigned int i = 0; i < userlist.size(); i++)
+                               if (IS_LOCAL(source))
                                {
-                                       if(!userlist[i]->GetExt("ssl"))
+                                       CUList* userlist = channel->GetUsers();
+                                       for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
                                        {
-                                               WriteServ(source->fd, "490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
-                                               return MODEACTION_DENY;
+                                               if(!i->first->GetExt("ssl", dummy))
+                                               {
+                                                       source->WriteNumeric(490, "%s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+                                                       return MODEACTION_DENY;
+                                               }
                                        }
                                }
+                               channel->SetMode('z',true);
                                return MODEACTION_ALLOW;
                        }
                        else
@@ -34,41 +52,41 @@ class SSLMode : public ModeHandler
                }
                else
                {
-                       (channel->IsModeSet('z')) ? return MODEACTION_DENY : return MODEACTION_ALLOW;
+                       if (channel->IsModeSet('z'))
+                       {
+                               channel->SetMode('z',false);
+                               return MODEACTION_ALLOW;
+                       }
+
+                       return MODEACTION_DENY;
                }
        }
 };
 
 class ModuleSSLModes : public Module
 {
-       Server *Srv;
+       
        SSLMode* sslm;
        
  public:
-       ModuleSSLModes(Server* Me)
-               : Module::Module(Me)
+       ModuleSSLModes(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
+               
 
-               sslm = new SSLMode();
-               Srv->AddMode(sslm, 'z');
+               sslm = new SSLMode(ServerInstance);
+               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_On005Numeric] = List[I_OnUserPreJoin] = 1;
-       }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "z", 4);
-       }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if(chan && chan->IsModeSet('z'))
                {
-                       if(user->GetExt("ssl"))
+                       if(user->GetExt("ssl", dummy))
                        {
                                // Let them in
                                return 0;
@@ -76,7 +94,7 @@ class ModuleSSLModes : public Module
                        else
                        {
                                // Deny
-                               WriteServ(user->fd, "489 %s %s :Cannot join channel (+z)", user->nick, cname);
+                               user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick, cname);
                                return 1;
                        }
                }
@@ -86,36 +104,16 @@ class ModuleSSLModes : public Module
 
        virtual ~ModuleSSLModes()
        {
-               DELETE(sslm);
+               ServerInstance->Modes->DelMode(sslm);
+               delete sslm;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
 
-class ModuleSSLModesFactory : public ModuleFactory
-{
- public:
-       ModuleSSLModesFactory()
-       {
-       }
-       
-       ~ModuleSSLModesFactory()
-       {
-       }
-       
-       virtual Module* CreateModule(Server* Me)
-       {
-               return new ModuleSSLModes(Me);
-       }
-       
-};
-
+MODULE_INIT(ModuleSSLModes)
 
-extern "C" void * init_module( void )
-{
-       return new ModuleSSLModesFactory;
-}