More converted modules

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

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index a9764f72e6db21642d4205a533342996fb80d8ef..b7d67d9ae26edaa38a9226d8eb6fb6b3f90b3945 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -34,13 +34,14 @@ class ModuleChanProtect : public Module
        
  public:
  
-       ModuleChanProtect()
+       ModuleChanProtect(Server* Me)
+               : Module::Module(Me)
        {
        
                // here we initialise our module. Use new to create new instances of the required
                // classes.
                
-               Srv = new Server;
+               Srv = Me;
                Conf = new ConfigReader;
                
                // set up our modes. We're using listmodes and not normal extmodes here.
@@ -52,41 +53,32 @@ class ModuleChanProtect : public Module
                // read our config options (main config file)
                FirstInGetsFounder = Conf->ReadFlag("options","noservices",0);
        }
+
+       void Implements(char* List)
+       {
+               List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnExtendedMode] = List[I_OnSendList] = List[I_OnSyncChannel] = 1;
+       }
        
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=qa" + temp1;
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
+               InsertMode(output,"qa",1);
         }
 
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
+       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
        {
                // FIX: when someone gets kicked from a channel we must remove their Extensibles!
                user->Shrink("cm_founder_"+std::string(chan->name));
                user->Shrink("cm_protect_"+std::string(chan->name));
        }
 
-       virtual void OnUserPart(userrec* user, chanrec* channel)
+       virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason)
        {
                // FIX: when someone parts a channel we must remove their Extensibles!
                user->Shrink("cm_founder_"+std::string(channel->name));
                user->Shrink("cm_protect_"+std::string(channel->name));
        }
 
-       virtual void OnRehash(std::string parameter)
+       virtual void OnRehash(const std::string &parameter)
        {
                // on a rehash we delete our classes for good measure and create them again.
                delete Conf;
@@ -217,7 +209,7 @@ class ModuleChanProtect : public Module
                                return -1;
                        
                        // given user isnt even on the channel, eat the mode change
-                       if (!Srv->IsOnChannel(theuser,chan))
+                       if (!chan->HasUser(theuser))
                                return -1;
                        
                        // source is a server, or ulined, we'll let them +-q the user.
@@ -260,7 +252,7 @@ class ModuleChanProtect : public Module
                                return -1;
                        
                        // given user isnt even on the channel, eat the mode change
-                       if (!Srv->IsOnChannel(theuser,chan))
+                       if (!chan->HasUser(theuser))
                                return -1;
 
                        // source has +q, is a server, or ulined, we'll let them +-a the user.
@@ -327,7 +319,6 @@ class ModuleChanProtect : public Module
        virtual ~ModuleChanProtect()
        {
                delete Conf;
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -369,9 +360,9 @@ class ModuleChanProtectFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleChanProtect;
+               return new ModuleChanProtect(Me);
        }
        
 };