From ebe5b201aab71cf2ead1e068889be736314fbb73 Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Wed, 3 Apr 2013 19:10:18 +0200
Subject: Migrate u_listmode.h into the core, change +b to use it

---
 src/modules/m_timedbans.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/modules/m_timedbans.cpp')

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 81b12d881..a3ee9b525 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -80,20 +80,17 @@ class CommandTban : public Command
 		bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
 		if (!isextban && !ServerInstance->IsValidMask(mask))
 			mask.append("!*@*");
-		if ((mask.length() > 250) || (!ServerInstance->IsValidMask(mask) && !isextban))
-		{
-			user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
-			return CMD_FAILURE;
-		}
+
 		setban.push_back(mask);
 		// use CallHandler to make it so that the user sets the mode
 		// themselves
 		ServerInstance->Parser->CallHandler("MODE",setban,user);
-		for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
-			if (!strcasecmp(i->data.c_str(), mask.c_str()))
-				goto found;
-		return CMD_FAILURE;
-found:
+		if (ServerInstance->Modes->GetLastParse().empty())
+		{
+			user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
+			return CMD_FAILURE;
+		}
+
 		CUList tmp;
 		T.channel = channelname;
 		T.mask = mask;
-- 
cgit v1.3.1-10-gc9f91