X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_b.cpp;h=119660ff54aa25b713ed87c3c8db00cb8c5c4c63;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=171727bf3ac6461d027f580da993e44c68b9a2f6;hpb=4be79b163029aae7f322bd9699bb8855a96e0547;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 171727bf3..119660ff5 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -2,8 +2,8 @@
  *       | 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.
@@ -25,13 +25,14 @@
 #include "hashcomp.h"
 #include "modes/cmode_b.h"
 
-ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelBan::ModeChannelBan() : ModeHandler(NULL, 'b', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+	list = true;
 }
 
 ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-	int status = channel->GetStatus(source);
+	int status = channel->GetPrefixValue(source);
 	/* Call the correct method depending on wether we're adding or removing the mode */
 	if (adding)
 	{
@@ -49,10 +50,9 @@ ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, s
 	return MODEACTION_ALLOW;
 }
 
-void ModeChannelBan::RemoveMode(Channel* channel)
+void ModeChannelBan::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
 	BanList copy;
-	char moderemove[MAXBUF];
 
 	for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
 	{
@@ -61,13 +61,19 @@ void ModeChannelBan::RemoveMode(Channel* channel)
 
 	for (BanList::iterator i = copy.begin(); i != copy.end(); i++)
 	{
-		sprintf(moderemove,"-%c",this->GetModeChar());
-		const char* parameters[] = { channel->name, moderemove, i->data };
-		ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+		if (stack)
+		{
+			stack->Push(this->GetModeChar(), i->data);
+		}
+		else
+		{
+			std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-b"); parameters.push_back(i->data);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+		}
 	}
 }
 
-void ModeChannelBan::RemoveMode(User*)
+void ModeChannelBan::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
@@ -76,22 +82,22 @@ void ModeChannelBan::DisplayList(User* user, Channel* channel)
 	/* Display the channel banlist */
 	for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i)
 	{
-		user->WriteServ("367 %s %s %s %s %d",user->nick, channel->name, i->data, i->set_by, i->set_time);
+		user->WriteServ("367 %s %s %s %s %lu",user->nick.c_str(), channel->name.c_str(), i->data.c_str(), i->set_by.c_str(), (unsigned long)i->set_time);
 	}
-	user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
+	user->WriteServ("368 %s %s :End of channel ban list",user->nick.c_str(), channel->name.c_str());
 	return;
 }
 
 void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel)
 {
-	user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
+	user->WriteServ("368 %s %s :End of channel ban list",user->nick.c_str(), channel->name.c_str());
 }
 
 std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int)
 {
 	if ((!user) || (!chan))
 	{
-		ServerInstance->Log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
+		ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
 		dest = "";
 		return dest;
 	}
@@ -103,16 +109,16 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 		return dest;
 
 	long maxbans = chan->GetMaxBans();
-	if ((unsigned)chan->bans.size() > (unsigned)maxbans)
+	if (!IS_LOCAL(user) && ((unsigned)chan->bans.size() > (unsigned)maxbans))
 	{
-		user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
+		user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str(), maxbans);
 		dest = "";
 		return dest;
 	}
 
-	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
-	if (MOD_RESULT)
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnAddBan, MOD_RESULT, (user,chan,dest));
+	if (MOD_RESULT == MOD_RES_DENY)
 	{
 		dest = "";
 		return dest;
@@ -120,7 +126,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 
 	for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
 	{
-		if (!strcasecmp(i->data,dest.c_str()))
+		if (i->data == dest)
 		{
 			/* dont allow a user to set the same ban twice */
 			dest = "";
@@ -129,15 +135,8 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 	}
 
 	b.set_time = ServerInstance->Time();
-	strlcpy(b.data,dest.c_str(),MAXBUF);
-	if (*user->nick)
-	{
-		strlcpy(b.set_by,user->nick,NICKMAX-1);
-	}
-	else
-	{
-		strlcpy(b.set_by,ServerInstance->Config->ServerName,NICKMAX-1);
-	}
+	b.data.assign(dest, 0, MAXBUF);
+	b.set_by.assign(user->nick, 0, 64);
 	chan->bans.push_back(b);
 	return dest;
 }
@@ -146,19 +145,19 @@ ModePair ModeChannelBan::ModeSet(User*, User*, Channel* channel, const std::stri
 {
 	for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
 	{
-		if (!strcasecmp(i->data,parameter.c_str()))
+		if (!strcasecmp(i->data.c_str(), parameter.c_str()))
 		{
 			return std::make_pair(true, i->data);
 		}
 	}
-        return std::make_pair(false, parameter);
+	return std::make_pair(false, parameter);
 }
 
 std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan, int)
 {
 	if ((!user) || (!chan))
 	{
-		ServerInstance->Log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
+		ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
 		dest = "";
 		return dest;
 	}
@@ -168,11 +167,11 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
 
 	for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
 	{
-		if (!strcasecmp(i->data,dest.c_str()))
+		if (!strcasecmp(i->data.c_str(), dest.c_str()))
 		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
-			if (MOD_RESULT)
+			ModResult MOD_RESULT;
+			FIRST_MOD_RESULT(OnDelBan, MOD_RESULT, (user, chan, dest));
+			if (MOD_RESULT == MOD_RES_DENY)
 			{
 				dest = "";
 				return dest;