X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodes%2Fcmode_o.cpp;h=6e96afa67397c21039ced1537f85923fccf05cbb;hb=467b276d9d0407ec412262525c43c28d47fdae2f;hp=9da9fa4783bbb9a8d189cbc817600e31b8ef0c17;hpb=91df762e93212958db487d8517addba1a63a4ddd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 9da9fa478..6e96afa67 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,151 +1,36 @@
-/*       +------------------------------------+
- *       | 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) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 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"
 #include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modules.h"
-#include "modes/cmode_o.h"
-
-ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@', '@', TR_NICK)
-{
-}
-
-unsigned int ModeChannelOp::GetPrefixRank()
-{
-	return OP_VALUE;
-}
-
-ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
-{
-	User* x = ServerInstance->FindNick(parameter);
-	if (x)
-	{
-		Membership* memb = channel->GetUser(x);
-		if (memb && memb->hasMode('o'))
-		{
-			return std::make_pair(true, x->nick);
-		}
-		else
-		{
-			return std::make_pair(false, parameter);
-		}
-	}
-	return std::make_pair(false, parameter);
-}
-
-
-void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
-{
-	const UserMembList* clist = channel->GetUsers();
-
-	for (UserMembCIter i = clist->begin(); i != clist->end(); i++)
-	{
-		if (stack)
-			stack->Push(this->GetModeChar(), i->first->nick);
-		else
-		{
-			std::vector<std::string> parameters;
-			parameters.push_back(channel->name);
-			parameters.push_back("-o");
-			parameters.push_back(i->first->nick);
-			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
-		}
-	}
-}
+#include "builtinmodes.h"
 
-void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
+ModeChannelOp::ModeChannelOp() : PrefixMode(NULL, "op", 'o')
 {
-}
-
-ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
-{
-	int status = channel->GetPrefixValue(source);
-
-	/* Call the correct method depending on wether we're adding or removing the mode */
-	if (adding)
-	{
-		parameter = this->AddOp(source, parameter.c_str(), channel, status);
-	}
-	else
-	{
-		parameter = this->DelOp(source, parameter.c_str(), channel, status);
-	}
-	/* If the method above 'ate' the parameter by reducing it to an empty string, then
-	 * it won't matter wether we return ALLOW or DENY here, as an empty string overrides
-	 * the return value and is always MODEACTION_DENY if the mode is supposed to have
-	 * a parameter.
-	 */
-	if (parameter.length())
-		return MODEACTION_ALLOW;
-	else
-		return MODEACTION_DENY;
-}
-
-std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int status)
-{
-	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-	if (d)
-	{
-		if (IS_LOCAL(user))
-		{
-			ModResult MOD_RESULT;
-			FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, MOD_RESULT, (user,d,chan,AC_OP));
-
-			if (MOD_RESULT == MOD_RES_DENY)
-				return "";
-			if (MOD_RESULT == MOD_RES_PASSTHRU)
-			{
-				if ((status < OP_VALUE) && (!ServerInstance->ULine(user->server)))
-				{
-					user->WriteServ("482 %s %s :You're not a channel operator",user->nick.c_str(), chan->name.c_str());
-					return "";
-				}
-			}
-		}
-
-		return d->nick;
-	}
-	return "";
-}
-
-std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int status)
-{
-	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-	if (d)
-	{
-		if (IS_LOCAL(user))
-		{
-			ModResult MOD_RESULT;
-			FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, MOD_RESULT, (user,d,chan,AC_DEOP));
-
-			if (MOD_RESULT == MOD_RES_DENY)
-				return "";
-			if (MOD_RESULT == MOD_RES_PASSTHRU)
-			{
-				if ((status < OP_VALUE) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
-				{
-					user->WriteServ("482 %s %s :You are not a channel operator",user->nick.c_str(), chan->name.c_str());
-					return "";
-				}
-			}
-		}
-
-		return d->nick;
-	}
-	return "";
+	prefix = '@';
+	levelrequired = OP_VALUE;
+	prefixrank = OP_VALUE;
 }