X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_v.cpp;h=752dd509b78e1836e146e4dcd668352608508ca8;hb=7892c8a0313c50d8138942ff3b112691caf05a2f;hp=87d391109229523ef25b482088d3e69e9626d234;hpb=56917208cd41b720b96d052b0b2f353b8a89b29f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 87d391109..752dd509b 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -1,104 +1,76 @@
-#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 "helperfuncs.h"
-#include "message.h"
-#include "commands.h"
 #include "modules.h"
-#include "inspstring.h"
-#include "hashcomp.h"
 #include "modes/cmode_v.h"
 
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
-
-ModeChannelVoice::ModeChannelVoice() : ModeHandler('v', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelVoice::ModeChannelVoice(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'v', 1, 1, true, MODETYPE_CHANNEL, false, '+', '%', TR_NICK)
 {
 }
 
-ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+unsigned int ModeChannelVoice::GetPrefixRank()
 {
-	int status = cstatus(source, channel);
-
-	/* 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.
-	 */
-	return MODEACTION_ALLOW;
+	return VOICE_VALUE;
 }
 
-std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *chan,int status)
+ModePair ModeChannelVoice::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-	userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
-
-	if (d)
+	User* x = ServerInstance->FindNick(parameter);
+	if (x)
 	{
-		if (IS_LOCAL(user))
+		Membership* memb = channel->GetUser(x);
+		if (memb && memb->hasMode('v'))
 		{
-			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) && (!is_uline(user->server)))
-				{
-					WriteServ(user->fd,"482 %s %s :You're not a channel (half)operator",user->nick, chan->name);
-					return "";
-				}
-			}
+			return std::make_pair(true, x->nick);
+		}
+		else
+		{
+			return std::make_pair(false, parameter);
 		}
-
-		return ModeParser::Grant(d,chan,UCMODE_VOICE);
 	}
-	return "";
+	return std::make_pair(false, parameter);
 }
 
-std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *chan,int status)
+void ModeChannelVoice::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-	userrec *d = ModeParser::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_DEVOICE));
-
-			if (MOD_RESULT == ACR_DENY)
-				return "";
-			if (MOD_RESULT == ACR_DEFAULT)
-			{
-				if ((status < STATUS_HOP) && (!is_uline(user->server)))
-				{
-					WriteServ(user->fd,"482 %s %s :You are 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 ModeParser::Revoke(d,chan,UCMODE_VOICE);
 	}
-	return "";
+}
+
+void ModeChannelVoice::RemoveMode(User*, irc::modestacker* stack)
+{
+}
+
+ModeAction ModeChannelVoice::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+{
+	return MODEACTION_ALLOW;
 }