X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=7f94b8a0d856dff4be81bcd5935556dde8c9a6bb;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=6aaa2f48e579418ea0280bfc08e707d1322a0e6a;hpb=a30abe26fc803900eaf5dc4c08a31aa1d3c9c89f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 6aaa2f48e..7f94b8a0d 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -1,35 +1,35 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
+
+#include "inspircd.h"
+
 class ModuleOperLevels : public Module
 {
 	public:
-		ModuleOperLevels()
-		{
-			Implementation eventlist[] = { I_OnRehash, I_OnKill };
-			ServerInstance->Modules->Attach(eventlist, this, 2);
-		}
-
-		virtual ~ModuleOperLevels()
-		{
-		}
-
-
-		virtual void OnRehash(User* user)
+		void init()
 		{
+			ServerInstance->Modules->Attach(I_OnKill, this);
 		}
 
 		virtual Version GetVersion()
@@ -40,10 +40,13 @@ class ModuleOperLevels : public Module
 		virtual ModResult OnKill(User* source, User* dest, const std::string &reason)
 		{
 			// oper killing an oper?
-			if (IS_OPER(dest) && IS_OPER(source))
+			if (dest->IsOper() && source->IsOper())
 			{
-				long dest_level = atol(dest->oper->getConfig("level").c_str());
-				long source_level = atol(source->oper->getConfig("level").c_str());
+				std::string level = dest->oper->getConfig("level");
+				long dest_level = atol(level.c_str());
+				level = source->oper->getConfig("level");
+				long source_level = atol(level.c_str());
+
 				if (dest_level > source_level)
 				{
 					if (IS_LOCAL(source)) ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): Reason: %s",source->nick.c_str(),source_level,dest->nick.c_str(),dest_level,reason.c_str());
@@ -54,8 +57,6 @@ class ModuleOperLevels : public Module
 			}
 			return MOD_RES_PASSTHRU;
 		}
-
 };
 
 MODULE_INIT(ModuleOperLevels)
-