X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=918d444acc2013497ddd4875cc652cf66ab8b73a;hb=02c6ce1ad09a7471a6b03dc00bac4b843d157489;hp=2793241117a1bf8450c9a57267fe52163a2f96cd;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 279324111..918d444ac 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,11 +1,20 @@
-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 "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 
@@ -22,7 +31,7 @@ class ModuleOperLevels : public Module
 	public:
 
 		ModuleOperLevels(InspIRCd* Me)
-			: Module::Module(Me)
+			: Module(Me)
 		{
 
 			
@@ -39,7 +48,7 @@ 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(ServerInstance);
@@ -47,14 +56,15 @@ class ModuleOperLevels : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR,API_VERSION);
+			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++)
 				{
@@ -78,7 +88,7 @@ class ModuleOperLevels : public Module
 				{
 					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);
+					source->WriteServ("481 %s :Permission Denied - Oper %s is a higher level than you",source->nick,dest->nick);
 					return 1;
 				}
 			}
@@ -105,7 +115,7 @@ class ModuleOperLevelsFactory : public ModuleFactory
 
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleOperLevelsFactory;
 }