X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=1074b27bb913873056b1b0ad9a1d1309e123411c;hb=2e52ff280dca14d1598b84fab7a8c2e93fa30910;hp=88665e8b3ac59fe5b412fdde34070f052130c845;hpb=bfc97ea14213c1ee9cb34386dfc33c0c1f665aca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 88665e8b3..1074b27bb 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -66,6 +66,7 @@ class ModuleFilter : public FilterBase
 	{
 		if (filters.find(freeform) != filters.end())
 		{
+			delete (filters.find(freeform))->second;
 			filters.erase(filters.find(freeform));
 			return true;
 		}
@@ -99,15 +100,12 @@ class ModuleFilter : public FilterBase
 
 	virtual void OnRehash(const std::string &parameter)
 	{
-		// this automatically re-reads the configuration file into the class
 		ConfigReader* MyConf = new ConfigReader(ServerInstance);
-		for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
-		{
-			DELETE(n->second);
-		}
-		filters.clear();
+
 		for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
 		{
+			this->DeleteFilter(MyConf->ReadValue("keyword","pattern",index));
+
 			std::string pattern = MyConf->ReadValue("keyword","pattern",index);
 			std::string reason = MyConf->ReadValue("keyword","reason",index);
 			std::string do_action = MyConf->ReadValue("keyword","action",index);
@@ -123,6 +121,19 @@ class ModuleFilter : public FilterBase
 		}
 		DELETE(MyConf);
 	}
+
+	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	{
+		if (symbol == 's')
+		{
+			std::string sn = ServerInstance->Config->ServerName;
+			for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
+			{
+				results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
+			}
+		}
+		return 0;
+	}
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.