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

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 908eb698c..8160a38a6 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -19,8 +19,12 @@
 #include "modules.h"
 #include "modes/cmode_o.h"
 
-ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@', '@', TR_NICK)
+ModeChannelOp::ModeChannelOp() : ModeHandler(NULL, 'o', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+	list = true;
+	prefix = '@';
+	levelrequired = OP_VALUE;
+	m_paramtype = TR_NICK;
 }
 
 unsigned int ModeChannelOp::GetPrefixRank()
@@ -33,7 +37,8 @@ ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::strin
 	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
-		if (channel->GetStatusFlags(x) & UCMODE_OP)
+		Membership* memb = channel->GetUser(x);
+		if (memb && memb->hasMode('o'))
 		{
 			return std::make_pair(true, x->nick);
 		}
@@ -48,22 +53,18 @@ ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::strin
 
 void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-	CUList* clist = channel->GetOppedUsers();
-	CUList copy;
+	const UserMembList* clist = channel->GetUsers();
 
-	for (CUList::iterator i = clist->begin(); i != clist->end(); i++)
-	{
-		User* n = i->first;
-		copy.insert(std::make_pair(n,n->nick));
-	}
-
-	for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
+	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);
+			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);
 		}
 	}
@@ -75,80 +76,5 @@ void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
 
 ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* 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.
-	 */
-	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 < STATUS_OP) && (!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 ServerInstance->Modes->Grant(d,chan,UCMODE_OP);
-	}
-	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 < STATUS_OP) && (!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 ServerInstance->Modes->Revoke(d,chan,UCMODE_OP);
-	}
-	return "";
+	return MODEACTION_ALLOW;
 }