WHEEEEE!!!!!

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

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index ad9331a26637b26e724c5a8747d9d92909666113..6753daae9663be6e53e441ac1e2e56b4bd81eb6f 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,37 +1,44 @@
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include <string>
+#include "helperfuncs.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 
-Server *Srv;
-
 class ModuleOperLevels : public Module
 {
 
        private:
 
+               Server* Srv;
                ConfigReader* conf;
 
        public:
 
-               ModuleOperLevels()
+               ModuleOperLevels(Server* Me)
+                       : Module::Module(Me)
                {
 
-                       Srv = new Server;
+                       Srv = Me;
                        conf = new ConfigReader;
                }
 
                virtual ~ModuleOperLevels()
                {
-                       delete Srv;
-                       delete conf;
+                       DELETE(conf);
+               }
+
+               void Implements(char* List)
+               {
+                       List[I_OnRehash] = List[I_OnKill] = 1;
                }
 
-               virtual void OnRehash()
+               virtual void OnRehash(const std::string &parameter)
                {
-                       delete conf;
+                       DELETE(conf);
                        conf = new ConfigReader;
                }
 
@@ -40,11 +47,11 @@ class ModuleOperLevels : public Module
                        return Version(1,0,0,1,VF_VENDOR);
                }
 
-               virtual int OnKill(userrec* source, userrec* dest, std::string reason)
+               virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
                {
                        long dest_level = 0,source_level = 0;
                        // oper killing an oper?
-                       if (strchr(dest->modes,'o'))
+                       if (*dest->oper)
                        {
                                for (int j =0; j < conf->Enumerate("type"); j++)
                                {
@@ -67,8 +74,8 @@ class ModuleOperLevels : public Module
                                if (dest_level > source_level)
                                {
                                        WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str());
-                                       WriteServ(dest->fd,"NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
-                                       WriteServ(source->fd,"481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
+                                       dest->WriteServ("NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
+                                       source->WriteServ("481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
                                        return 1;
                                }
                        }
@@ -80,23 +87,24 @@ class ModuleOperLevels : public Module
 class ModuleOperLevelsFactory : public ModuleFactory
 {
  public:
-        ModuleOperLevelsFactory()
-        {
-        }
+       ModuleOperLevelsFactory()
+       {
+       }
 
-        ~ModuleOperLevelsFactory()
-        {
-        }
+       ~ModuleOperLevelsFactory()
+       {
+       }
 
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperLevels;
-        }
+       virtual Module * CreateModule(Server* Me)
+       {
+               log(DEBUG,"CreateModule");
+               return new ModuleOperLevels(Me);
+       }
 
 };
 
 extern "C" void * init_module( void )
 {
-        return new ModuleOperLevelsFactory;
+       return new ModuleOperLevelsFactory;
 }