X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.h;h=5e74177e5073ce59ccadd902c4d1074cd518a1c7;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=9d0fff34b2e4e1f6118383b74e9b8ab3540f53b9;hpb=82a62fd8cb49481c5163a22f7659f1e91d98778a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index 9d0fff34b..5e74177e5 100644
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -15,11 +15,10 @@
 
 enum FilterFlags
 {
-	FLAG_NOOPERS,
-	FLAG_PART,
-	FLAG_QUIT,
-	FLAG_PRIVMSG,
-	FLAG_NOTICE
+	FLAG_PART = 2,
+	FLAG_QUIT = 4,
+	FLAG_PRIVMSG = 8,
+	FLAG_NOTICE = 16
 };
 
 class FilterResult : public classbase
@@ -43,8 +42,9 @@ class FilterResult : public classbase
 		this->FillFlags(flags);
 	}
 
-	int FillFlags(const std::string &flags)
+	int FillFlags(const std::string &fl)
 	{
+		flags = fl;
 		flag_no_opers = flag_part_message = flag_quit_message = flag_privmsg = flag_notice = false;
 		size_t x = 0;
 
@@ -208,7 +208,7 @@ class cmd_filter : public command_t
 
 bool FilterBase::AppliesToMe(userrec* user, FilterResult* filter, int flags)
 {
-	if ((flags & FLAG_NOOPERS) && (filter->flag_no_opers) && IS_OPER(user))
+	if ((filter->flag_no_opers) && IS_OPER(user))
 		return false;
 	if ((flags & FLAG_PRIVMSG) && (!filter->flag_privmsg))
 		return false;
@@ -341,7 +341,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
 		command_t* c = ServerInstance->Parser->GetHandler(command);
 		if (c)
 		{
-			const char* params[127];
+			const char* params[MAXPARAMETERS];
 			for (int item = 0; item < pcnt; item++)
 				params[item] = parameters[item];
 			params[replacepoint] = "Reason filtered";
@@ -359,12 +359,8 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
 				/* Are they parting, if so, kill is applicable */
 				if ((parting) && (f->action == "kill"))
 				{
-					user->SetWriteError("Filtered: "+f->reason);
-					/* This WriteServ causes the write error to be applied.
-					 * Its not safe to kill here with QuitUser in a PreCommand handler,
-					 * so we do it this way, which is safe just about anywhere.
-					 */
 					user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str());
+					userrec::QuitUser(ServerInstance, user, "Filtered: " + f->reason);
 				}
 				if (f->action == "gline")
 				{
@@ -401,28 +397,29 @@ std::string FilterBase::EncodeFilter(FilterResult* filter)
 	std::ostringstream stream;
 	std::string x = filter->freeform;
 
+	/* Hax to allow spaces in the freeform without changing the design of the irc protocol */
 	for (std::string::iterator n = x.begin(); n != x.end(); n++)
 		if (*n == ' ')
 			*n = '\7';
 
-	stream << x << " " << filter->action << " " << (filter->flags.empty() ? "-" : filter->flags) << " " << filter->gline_time << " " << filter->reason;
+	stream << x << " " << filter->action << " " << (filter->flags.empty() ? "-" : filter->flags) << " " << filter->gline_time << " :" << filter->reason;
 	return stream.str();
 }
 
 FilterResult FilterBase::DecodeFilter(const std::string &data)
 {
 	FilterResult res;
-	std::istringstream stream(data);
-
-	stream >> res.freeform;
-	stream >> res.action;
-	stream >> res.flags;
+	irc::tokenstream tokens(data);
+	tokens.GetToken(res.freeform);
+	tokens.GetToken(res.action);
+	tokens.GetToken(res.flags);
 	if (res.flags == "-")
 		res.flags = "";
 	res.FillFlags(res.flags);
-	stream >> res.gline_time;
-	res.reason = stream.str();
+	tokens.GetToken(res.gline_time);
+	tokens.GetToken(res.reason);
 
+	/* Hax to allow spaces in the freeform without changing the design of the irc protocol */
 	for (std::string::iterator n = res.freeform.begin(); n != res.freeform.end(); n++)
 		if (*n == '\7')
 			*n = ' ';