X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=b436b953bb21dad3931003ba2e8cf7919c0d1f45;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=bf5596330047edbb77f9dfc4866c8e37be1d9da1;hpb=feaf72ecb48470114fbe3f3058b5f4b9622b88a5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index bf5596330..b436b953b 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,30 +1,33 @@
-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-2008 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(Server* Me)
-			: Module::Module(Me)
+		ModuleOperLevels(InspIRCd* Me)
+			: Module(Me)
 		{
-
-			Srv = Me;
-			conf = new ConfigReader;
+			conf = new ConfigReader(ServerInstance);
+			Implementation eventlist[] = { I_OnRehash, I_OnKill };
+			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual ~ModuleOperLevels()
@@ -32,27 +35,24 @@ class ModuleOperLevels : public Module
 			delete conf;
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnKill] = 1;
-		}
 
-		virtual void OnRehash(std::string parameter)
+		virtual void OnRehash(User* 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,2,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual int OnKill(userrec* source, userrec* dest, std::string reason)
+		virtual int OnKill(User* source, User* 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++)
 				{
@@ -74,9 +74,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->SNO->WriteToSnoMask('A', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): 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->WriteNumeric(481, "%s :Permission Denied - Oper %s is a higher level than you",source->nick,dest->nick);
 					return 1;
 				}
 			}
@@ -85,26 +85,5 @@ class ModuleOperLevels : public Module
 
 };
 
-class ModuleOperLevelsFactory : public ModuleFactory
-{
- public:
-        ModuleOperLevelsFactory()
-        {
-        }
-
-        ~ModuleOperLevelsFactory()
-        {
-        }
-
-        virtual Module * CreateModule(Server* Me)
-        {
-                return new ModuleOperLevels(Me);
-        }
-
-};
-
-extern "C" void * init_module( void )
-{
-        return new ModuleOperLevelsFactory;
-}
+MODULE_INIT(ModuleOperLevels)