X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_o.cpp;h=8160a38a648afc46d893d7679d412b0bd621dcad;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=c631ec779cafacae498c3763ab601c34473fb8da;hpb=8b864c8a828d6ca97b5ec15fa7bf8fcc35027294;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index c631ec779..8160a38a6 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,21 +1,30 @@
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "hash_map.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
+#include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
-
-#include "commands.h"
 #include "modules.h"
-#include "inspstring.h"
-#include "hashcomp.h"
 #include "modes/cmode_o.h"
 
-ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@')
+ModeChannelOp::ModeChannelOp() : ModeHandler(NULL, 'o', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+	list = true;
+	prefix = '@';
+	levelrequired = OP_VALUE;
+	m_paramtype = TR_NICK;
 }
 
 unsigned int ModeChannelOp::GetPrefixRank()
@@ -23,12 +32,13 @@ unsigned int ModeChannelOp::GetPrefixRank()
 	return OP_VALUE;
 }
 
-ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-	userrec* x = ServerInstance->FindNick(parameter);
+	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
-		if (channel->GetStatus(x) == STATUS_OP)
+		Membership* memb = channel->GetUser(x);
+		if (memb && memb->hasMode('o'))
 		{
 			return std::make_pair(true, x->nick);
 		}
@@ -40,82 +50,31 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
 	return std::make_pair(false, parameter);
 }
 
-ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-{
-	int status = channel->GetStatus(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.
-	 */
-	return MODEACTION_ALLOW;
-}
-
-std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
+void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+	const UserMembList* clist = channel->GetUsers();
 
-	if (d)
+	for (UserMembCIter i = clist->begin(); i != clist->end(); i++)
 	{
-		if (IS_LOCAL(user))
+		if (stack)
+			stack->Push(this->GetModeChar(), i->first->nick);
+		else
 		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
-
-			if (MOD_RESULT == ACR_DENY)
-				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
-			{
-				if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
-				{
-					user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
-					return "";
-				}
-			}
+			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);
 		}
-
-		return ServerInstance->Modes->Grant(d,chan,UCMODE_OP);
 	}
-	return "";
 }
 
-std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
+void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-	if (d)
-	{
-		if (IS_LOCAL(user))
-		{
-			int MOD_RESULT = 0;
-			ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
-
-			ServerInstance->Log(DEBUG,"Returns %d",MOD_RESULT);
-
-			if (MOD_RESULT == ACR_DENY)
-				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
-			{
-				if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
-				{
-					user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
-					return "";
-				}
-			}
-		}
+}
 
-		return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP);
-	}
-	return "";
+ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+{
+	return MODEACTION_ALLOW;
 }