Change to use std::string::iterator rather than making a copy of the pointer and...

[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 bc4679fd709ee94c8f452f0156a814250b5ed58d..9288f6306a673cd40d26d6d959c4f2fecc479949 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,15 +1,27 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 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 "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;
 
-extern InspIRCd* ServerInstance;
-
+/** Handle channel mode +z
+ */
 class SSLMode : public ModeHandler
 {
  public:
@@ -56,30 +68,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(ServerInstance);
-               Srv->AddMode(sslm, 'z');
+               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)
-       {
-               ServerInstance->ModeGrok->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'))
                {
@@ -101,12 +108,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);
        }
 };
 
@@ -122,7 +130,7 @@ class ModuleSSLModesFactory : public ModuleFactory
        {
        }
        
-       virtual Module* CreateModule(Server* Me)
+       virtual Module* CreateModule(InspIRCd* Me)
        {
                return new ModuleSSLModes(Me);
        }