X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_b.cpp;h=0bd8d286d698540bea17d6e1e865b9482019c2bc;hb=e245dbbad7e91f232482374e9166f18782eaafa0;hp=20ff781ca274b5e67b1b19019f7fab7b2fa24a0c;hpb=be542b535c647eef610bba907af47683ee14e841;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 20ff781ca..0bd8d286d 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-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -25,17 +25,18 @@
 #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, "ban", 'b', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+	list = true;
 }
 
-ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
+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)
 	{
-		parameter = this->AddBan(source, parameter, channel, status, servermode);
+		parameter = this->AddBan(source, parameter, channel, status);
 	}
 	else
 	{
@@ -92,7 +93,7 @@ void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel)
 	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, bool servermode)
+std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int)
 {
 	if ((!user) || (!chan))
 	{
@@ -104,7 +105,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 	/* Attempt to tidy the mask */
 	ModeParser::CleanMask(dest);
 	/* If the mask was invalid, we exit */
-	if (dest == "")
+	if (dest == "" || dest.length() > 250)
 		return dest;
 
 	long maxbans = chan->GetMaxBans();
@@ -115,9 +116,9 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 		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;
@@ -135,23 +136,11 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
 
 	b.set_time = ServerInstance->Time();
 	b.data.assign(dest, 0, MAXBUF);
-	b.set_by.assign(servermode ? ServerInstance->Config->ServerName : user->nick, 0, 64);
+	b.set_by.assign(user->nick, 0, 64);
 	chan->bans.push_back(b);
 	return dest;
 }
 
-ModePair ModeChannelBan::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
-{
-	for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
-	{
-		if (!strcasecmp(i->data.c_str(), parameter.c_str()))
-		{
-			return std::make_pair(true, i->data);
-		}
-	}
-        return std::make_pair(false, parameter);
-}
-
 std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan, int)
 {
 	if ((!user) || (!chan))
@@ -161,16 +150,13 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
 		return dest;
 	}
 
-	/* 'Clean' the mask, e.g. nick -> nick!*@* */
-	ModeParser::CleanMask(dest);
-
 	for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
 	{
 		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;