X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_v.cpp;h=f744623a609db02e690313b1aff2b681c9386277;hb=075bb82c3ebdf4e77f14134ca8343631dd4cfbcd;hp=0ea887073392e22254e7291f4f921c26a55614c6;hpb=2829ce8112ead4808969808b1f3ae216aae55d05;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 0ea887073..f744623a6 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -1,9 +1,10 @@
+
 /*       +------------------------------------+
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -19,8 +20,12 @@
 #include "modules.h"
 #include "modes/cmode_v.h"
 
-ModeChannelVoice::ModeChannelVoice(InspIRCd* Instance) : ModeHandler(Instance, 'v', 1, 1, true, MODETYPE_CHANNEL, false, '+')
+ModeChannelVoice::ModeChannelVoice() : ModeHandler(NULL, 'v', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+	list = true;
+	prefix = '+';
+	levelrequired = HALFOP_VALUE;
+	m_paramtype = TR_NICK;
 }
 
 unsigned int ModeChannelVoice::GetPrefixRank()
@@ -28,12 +33,13 @@ unsigned int ModeChannelVoice::GetPrefixRank()
 	return VOICE_VALUE;
 }
 
-ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelVoice::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-	userrec* x = ServerInstance->FindNick(parameter);
+	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
-		if (channel->GetStatusFlags(x) & UCMODE_VOICE)
+		Membership* memb = channel->GetUser(x);
+		if (memb && memb->hasMode('v'))
 		{
 			return std::make_pair(true, x->nick);
 		}
@@ -45,106 +51,30 @@ ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* chan
 	return std::make_pair(false, parameter);
 }
 
-void ModeChannelVoice::RemoveMode(chanrec* channel)
-{
-	CUList* list = channel->GetVoicedUsers();
-	CUList copy;
-	char moderemove[MAXBUF];
-
-	for (CUList::iterator i = list->begin(); i != list->end(); i++)
-	{
-		userrec* n = i->first;
-		copy.insert(std::make_pair(n,n->nick));
-	}
-
-	for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
-	{
-		sprintf(moderemove,"-%c",this->GetModeChar());
-		const char* parameters[] = { channel->name, moderemove, i->first->nick };
-		ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
-	}
-}
-
-void ModeChannelVoice::RemoveMode(userrec* user)
-{
-}
-
-ModeAction ModeChannelVoice::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->AddVoice(source, parameter.c_str(), channel, status);
-	}
-	else
-	{
-		parameter = this->DelVoice(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 ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *chan,int status)
+void ModeChannelVoice::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_VOICE));
-
-			if (MOD_RESULT == ACR_DENY)
-				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
-			{
-				if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)))
-				{
-					user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, chan->name);
-					return "";
-				}
-			}
+			std::vector<std::string> parameters;
+			parameters.push_back(channel->name);
+			parameters.push_back("-v");
+			parameters.push_back(i->first->nick);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 		}
-
-		return ServerInstance->Modes->Grant(d,chan,UCMODE_VOICE);
 	}
-	return "";
 }
 
-std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *chan,int status)
+void ModeChannelVoice::RemoveMode(User*, irc::modestacker* stack)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-	if (d)
-	{
-		if (IS_LOCAL(user))
-		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE));
-
-			if (MOD_RESULT == ACR_DENY)
-				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
-			{
-				if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)))
-				{
-					user->WriteServ("482 %s %s :You are not a channel (half)operator",user->nick, chan->name);
-					return "";
-				}
-			}
-		}
+}
 
-		return ServerInstance->Modes->Revoke(d,chan,UCMODE_VOICE);
-	}
-	return "";
+ModeAction ModeChannelVoice::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+{
+	return MODEACTION_ALLOW;
 }