X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=b473277046c0af470fbd3afea566c89711090711;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=663a43f2fec560958eb6dea3180b0136ecc0894f;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 663a43f2f..b47327704 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -32,6 +32,7 @@ class TimedBan
 	std::string channel;
 	std::string mask;
 	time_t expire;
+	Channel* chan;
 };
 
 typedef std::vector<TimedBan> timedbans;
@@ -41,6 +42,16 @@ timedbans TimedBanList;
  */
 class CommandTban : public Command
 {
+	static bool IsBanSet(Channel* chan, const std::string& mask)
+	{
+		for (BanList::const_iterator i = chan->bans.begin(); i != chan->bans.end(); ++i)
+		{
+			if (!strcasecmp(i->data.c_str(), mask.c_str()))
+				return true;
+		}
+		return false;
+	}
+
  public:
 	CommandTban(Module* Creator) : Command(Creator,"TBAN", 3)
 	{
@@ -62,40 +73,55 @@ class CommandTban : public Command
 			user->WriteNumeric(482, "%s %s :You do not have permission to set bans on this channel",
 				user->nick.c_str(), channel->name.c_str());
 			return CMD_FAILURE;
-		}
-		if (!ServerInstance->IsValidMask(parameters[2]))
-		{
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
-			return CMD_FAILURE;
-		}
+		}		
+
 		TimedBan T;
 		std::string channelname = parameters[0];
 		long duration = ServerInstance->Duration(parameters[1]);
 		unsigned long expire = duration + ServerInstance->Time();
 		if (duration < 1)
 		{
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
+			user->WriteServ("NOTICE "+user->nick+" :Invalid ban time");
 			return CMD_FAILURE;
 		}
 		std::string mask = parameters[2];
 		std::vector<std::string> setban;
 		setban.push_back(parameters[0]);
 		setban.push_back("+b");
-		setban.push_back(parameters[2]);
-		// use CallCommandHandler to make it so that the user sets the mode
+		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;
+		}
+
+		if (IsBanSet(channel, mask))
+		{
+			user->WriteServ("NOTICE %s :Ban already set", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
+		setban.push_back(mask);
+		// use CallHandler to make it so that the user sets the mode
 		// themselves
-		ServerInstance->CallCommandHandler("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:
+		ServerInstance->Parser->CallHandler("MODE",setban,user);
+		if (!IsBanSet(channel, mask))
+			return CMD_FAILURE;
+
 		CUList tmp;
 		T.channel = channelname;
 		T.mask = mask;
 		T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
+		T.chan = channel;
 		TimedBanList.push_back(T);
-		channel->WriteAllExcept(ServerInstance->FakeClient, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration);
+
+		// If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
+		ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
+		char pfxchar = (mh && mh->name == "halfop") ? '%' : '@';
+
+		channel->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration);
 		return CMD_SUCCESS;
 	}
 
@@ -105,6 +131,22 @@ found:
 	}
 };
 
+class ChannelMatcher
+{
+	Channel* const chan;
+
+ public:
+	ChannelMatcher(Channel* ch)
+		: chan(ch)
+	{
+	}
+
+	bool operator()(const TimedBan& tb) const
+	{
+		return (tb.chan == chan);
+	}
+};
+
 class ModuleTimedBans : public Module
 {
 	CommandTban cmd;
@@ -112,15 +154,13 @@ class ModuleTimedBans : public Module
 	ModuleTimedBans()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		TimedBanList.clear();
-		Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual ~ModuleTimedBans()
+	void init()
 	{
-		TimedBanList.clear();
+		ServerInstance->Modules->AddService(cmd);
+		Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer, I_OnChannelDelete };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ModResult OnDelBan(User* source, Channel* chan, const std::string &banmask)
@@ -176,6 +216,12 @@ class ModuleTimedBans : public Module
 		}
 	}
 
+	void OnChannelDelete(Channel* chan)
+	{
+		// Remove all timed bans affecting the channel from internal bookkeeping
+		TimedBanList.erase(std::remove_if(TimedBanList.begin(), TimedBanList.end(), ChannelMatcher(chan)), TimedBanList.end());
+	}
+
 	virtual Version GetVersion()
 	{
 		return Version("Adds timed bans", VF_COMMON | VF_VENDOR);