X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_filter.cpp;h=36073db3b8036c3ebb71951bf567a1838edaaafa;hb=a152c67224a6c5c8115130034ac4cd0ffaa960d5;hp=03ed814bc67ef3962097cc154f92937c5552db9b;hpb=26e22f0cad4ab6bc2f7fc3464d283d95d458909a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 03ed814bc..36073db3b 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "m_filter.h"
 
 /* $ModDesc: An advanced spam filtering module */
@@ -31,7 +29,7 @@ class ModuleFilter : public FilterBase
 
  public:
 	ModuleFilter(InspIRCd* Me)
-	: FilterBase::FilterBase(Me, "m_filter.so")
+	: FilterBase(Me, "m_filter.so")
 	{
 		OnRehash(NULL,"");
 	}
@@ -42,16 +40,15 @@ class ModuleFilter : public FilterBase
 
 	virtual FilterResult* FilterMatch(const std::string &text)
 	{
-		std::string text2 = text+" ";
 		for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
 		{
-			if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first)))
+			if (ServerInstance->MatchText(text,index->first))
 			{
 				FilterResult* fr = index->second;
 				if (index != filters.begin())
 				{
 					std::string pat = index->first;
-					filters.erase(fr);
+					filters.erase(index);
 					filters.insert(filters.begin(), std::make_pair(pat,fr));
 				}
 				return fr;
@@ -155,7 +152,7 @@ class ModuleFilterFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleFilterFactory;
 }