Fix these too!

[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 673c30536f208c17fee8a3abec9426a0f155efba..53542515ab65f4027674e078838a37aaa871d88e 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,17 +1,34 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *                              
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *      
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */     
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
 static char* dummy;
 
+/** Handle channel mode +z
+ */
 class SSLMode : public ModeHandler
 {
-       Server* Srv;
  public:
-       SSLMode(Server* s) : ModeHandler('z', 0, 0, false, MODETYPE_CHANNEL, false), Srv(s) { }
+       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)
        {
@@ -19,13 +36,16 @@ class SSLMode : public ModeHandler
                {
                        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", dummy))
+                                       CUList* userlist = channel->GetUsers();
+                                       for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
                                        {
-                                               source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
-                                               return MODEACTION_DENY;
+                                               if(!i->second->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;
+                                               }
                                        }
                                }
                                channel->SetMode('z',true);
@@ -51,30 +71,25 @@ class SSLMode : public ModeHandler
 
 class ModuleSSLModes : public Module
 {
-       Server *Srv;
+       
        SSLMode* sslm;
        
  public:
-       ModuleSSLModes(Server* Me)
+       ModuleSSLModes(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
 
-               sslm = new SSLMode(Me);
-               Srv->AddMode(sslm, 'z');
+               sslm = new SSLMode(ServerInstance);
+               ServerInstance->AddMode(sslm, 'z');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+               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(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if(chan && chan->IsModeSet('z'))
                {
@@ -96,12 +111,13 @@ class ModuleSSLModes : public Module
 
        virtual ~ModuleSSLModes()
        {
+               ServerInstance->Modes->DelMode(sslm);
                DELETE(sslm);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
@@ -117,7 +133,7 @@ class ModuleSSLModesFactory : public ModuleFactory
        {
        }
        
-       virtual Module* CreateModule(Server* Me)
+       virtual Module* CreateModule(InspIRCd* Me)
        {
                return new ModuleSSLModes(Me);
        }