remove <filter file> - This is no longer neccessary as we've had includes for quite a while now.

It's still required for m_helpop, because the helpop.conf has tags which clash with the main config's tags
(e.g. <server>, <oper>)


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5548 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 1 insertions, 24 deletions

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index f4193497d..38cd32ecd 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -42,17 +42,6 @@ class Filter : public classbase
 
 typedef std::map<std::string,Filter*> filter_t;
 
-/** Thrown by m_filter
- */
-class FilterException : public ModuleException
-{
- public:
-	virtual const char* GetReason()
-	{
-		return "Could not find <filter file=\"\"> definition in your config file!";
-	}
-};
-
 class ModuleFilter : public Module
 {
  
@@ -127,18 +116,8 @@ class ModuleFilter : public Module
 	
 	virtual void OnRehash(const std::string &parameter)
 	{
-		// reload our config file on rehash - we must destroy and re-allocate the classes
-		// to call the constructor again and re-read our data.
-		ConfigReader* Conf = new ConfigReader(ServerInstance);
-		std::string filterfile = Conf->ReadValue("filter","file",0);
 		// this automatically re-reads the configuration file into the class
-		ConfigReader* MyConf = new ConfigReader(ServerInstance, filterfile);
-		if ((filterfile == "") || (!MyConf->Verify()))
-		{
-			// bail if the user forgot to create a config file
-			FilterException e;
-			throw(e);
-		}
+		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 		for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
 		{
 			DELETE(n->second);
@@ -156,8 +135,6 @@ class ModuleFilter : public Module
 			x->action = do_action;
 			filters[pattern] = x;
 		}
-		ServerInstance->Log(DEFAULT,"m_filter: read configuration from "+filterfile);
-		DELETE(Conf);
 		DELETE(MyConf);
 	}