(Bigger than it looks, i did this with perl inplace edit) -- commands now take an...

[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 306dbe5878450d754b693c3c1dfaa19060f2f7c7..f8129a532273f540f8ec74499aa4f1d58c18b022 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -5,30 +5,33 @@ using namespace std;
 #include "modules.h"
 #include <string>
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 
+extern InspIRCd* ServerInstance;
+
 class ModuleOperLevels : public Module
 {
 
        private:
 
-               Server* Srv;
+               
                ConfigReader* conf;
 
        public:
 
-               ModuleOperLevels(Server* Me)
+               ModuleOperLevels(InspIRCd* Me)
                        : Module::Module(Me)
                {
 
-                       Srv = Me;
+                       
                        conf = new ConfigReader;
                }
 
                virtual ~ModuleOperLevels()
                {
-                       delete conf;
+                       DELETE(conf);
                }
 
                void Implements(char* List)
@@ -38,7 +41,7 @@ class ModuleOperLevels : public Module
 
                virtual void OnRehash(const std::string &parameter)
                {
-                       delete conf;
+                       DELETE(conf);
                        conf = new ConfigReader;
                }
 
@@ -73,9 +76,9 @@ 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);
+                                       ServerInstance->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());
+                                       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;
                                }
                        }
@@ -95,7 +98,7 @@ class ModuleOperLevelsFactory : public ModuleFactory
        {
        }
 
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                log(DEBUG,"CreateModule");
                return new ModuleOperLevels(Me);