Remove unneeded headers from spanningtree. This was done to the rest of the source...

[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 a112040f9b96469b9f0b3edc26b577a23c877473..40e88262548e5a4513312056d1044e8c3adc25b5 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,53 +1,67 @@
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | 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 "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 
-Server *Srv;
+
 
 class ModuleOperLevels : public Module
 {
 
        private:
 
+               
                ConfigReader* conf;
 
        public:
 
-               ModuleOperLevels()
+               ModuleOperLevels(InspIRCd* Me)
+                       : Module(Me)
                {
 
-                       Srv = new Server;
-                       conf = new ConfigReader;
+                       
+                       conf = new ConfigReader(ServerInstance);
                }
 
                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(userrec* user, const std::string &parameter)
                {
-                       delete conf;
-                       conf = new ConfigReader;
+                       DELETE(conf);
+                       conf = new ConfigReader(ServerInstance);
                }
 
                virtual Version GetVersion()
                {
-                       return Version(1,0,0,1,VF_VENDOR);
+                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
                }
 
-               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 (IS_OPER(dest) && IS_OPER(source))
                        {
                                for (int j =0; j < conf->Enumerate("type"); j++)
                                {
@@ -69,9 +83,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;
                                }
                        }
@@ -83,23 +97,23 @@ class ModuleOperLevels : public Module
 class ModuleOperLevelsFactory : public ModuleFactory
 {
  public:
-        ModuleOperLevelsFactory()
-        {
-        }
+       ModuleOperLevelsFactory()
+       {
+       }
 
-        ~ModuleOperLevelsFactory()
-        {
-        }
+       ~ModuleOperLevelsFactory()
+       {
+       }
 
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperLevels;
-        }
+       virtual Module * CreateModule(InspIRCd* Me)
+       {
+               return new ModuleOperLevels(Me);
+       }
 
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
-        return new ModuleOperLevelsFactory;
+       return new ModuleOperLevelsFactory;
 }