and a little tweak to remote MOTD too.

[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 e6c64dcd0f1ac32c1a1aa65c780e3784369e9876..6e337a914e8854654568f2cb0d7fc2baef42e21a 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,32 +1,41 @@
-using namespace std;
+/*       +------------------------------------+
+ *       | 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"
 #include "users.h"
 #include "channels.h"
 #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(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
 
                        
-                       conf = new ConfigReader;
+                       conf = new ConfigReader(ServerInstance);
                }
 
                virtual ~ModuleOperLevels()
@@ -39,22 +48,23 @@ class ModuleOperLevels : public Module
                        List[I_OnRehash] = List[I_OnKill] = 1;
                }
 
-               virtual void OnRehash(const std::string &parameter)
+               virtual void OnRehash(userrec* user, const std::string &parameter)
                {
                        DELETE(conf);
-                       conf = new ConfigReader;
+                       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, const std::string &reason)
                {
                        long dest_level = 0,source_level = 0;
+
                        // oper killing an oper?
-                       if (*dest->oper)
+                       if (IS_OPER(dest) && IS_OPER(source))
                        {
                                for (int j =0; j < conf->Enumerate("type"); j++)
                                {
@@ -100,13 +110,12 @@ class ModuleOperLevelsFactory : public ModuleFactory
 
        virtual Module * CreateModule(InspIRCd* Me)
        {
-               log(DEBUG,"CreateModule");
                return new ModuleOperLevels(Me);
        }
 
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleOperLevelsFactory;
 }