X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=9808ab322393a627a46bbcbc7bcda041a19ef5c7;hb=6c2edc2c5ab07a1fa8c32d3fa9abd6b9149b804c;hp=732d588570df7b147563fb7ce58a9d9f603167be;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 732d58857..9808ab322 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 /*
  * Originally by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru
  */
@@ -24,7 +31,7 @@
 class OperPrefixMode : public ModeHandler
 {
 	public:
-		OperPrefixMode(InspIRCd* Instance, Module* Creator, char pfx) : ModeHandler(Creator, 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+		OperPrefixMode(Module* Creator, char pfx) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
 		{
 			list = true;
 			prefix = pfx;
@@ -39,7 +46,7 @@ class OperPrefixMode : public ModeHandler
 
 		ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 		{
-			if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server)))
+			if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
 				return MODEACTION_ALLOW;
 			else
 			{
@@ -49,27 +56,6 @@ class OperPrefixMode : public ModeHandler
 			}
 		}
 
-		ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-		{
-			User* x = ServerInstance->FindNick(parameter);
-			Membership* m = channel->GetUser(x);
-			if (x)
-			{
-				if (!m)
-				{
-					return std::make_pair(false, parameter);
-				}
-				else
-				{
-					if (m->hasMode('y'))
-						return std::make_pair(true, x->nick);
-					else
-							return std::make_pair(false, parameter);
-				}
-			}
-			return std::make_pair(false, parameter);
-		}
-
 		bool NeedsOper() { return true; }
 };
 
@@ -78,12 +64,11 @@ class ModuleOperPrefixMode : public Module
  private:
 	OperPrefixMode* opm;
  public:
-	ModuleOperPrefixMode(InspIRCd* Me) : Module(Me)
-	{
-		ConfigReader Conf(ServerInstance);
+	ModuleOperPrefixMode() 	{
+		ConfigReader Conf;
 		std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
 
-		opm = new OperPrefixMode(ServerInstance, this, pfx[0]);
+		opm = new OperPrefixMode(this, pfx[0]);
 		if ((!ServerInstance->Modes->AddMode(opm)))
 			throw ModuleException("Could not add a new mode!");
 
@@ -111,7 +96,7 @@ class ModuleOperPrefixMode : public Module
 	ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
 	{
 		/* force event propagation to its ModeHandler */
-		if (!IS_FAKE(user) && chan && (mode == 'y'))
+		if (!IS_SERVER(user) && chan && (mode == 'y'))
 			return MOD_RES_ALLOW;
 		return MOD_RES_PASSTHRU;
 	}
@@ -129,13 +114,12 @@ class ModuleOperPrefixMode : public Module
 
 	~ModuleOperPrefixMode()
 	{
-		ServerInstance->Modes->DelMode(opm);
 		delete opm;
 	}
 
 	Version GetVersion()
 	{
-		return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
 	}
 };