X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=657ad7f443385e80570658adbc045afc3dfd8a28;hb=bcac49dca78631687975771c6d0a76b595171664;hp=a1aba037d27d6b823280e8c3e54902a6eb54449f;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index a1aba037d..657ad7f44 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -21,24 +21,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
 /* $ModDesc: Provides user and channel +G mode */
 
-
-
-class CensorException : public ModuleException
-{
- public:
-	virtual const char* GetReason()
-	{
-		return "Could not find <censor file=\"\"> definition in your config file!";
-	}
-};
-
+/** Handles usermode +G
+ */
 class CensorUser : public ModeHandler
 {
  public:
@@ -71,6 +61,8 @@ class CensorUser : public ModeHandler
 	}
 };
 
+/** Handles channel mode +G
+ */
 class CensorChannel : public ModeHandler
 {
  public:
@@ -111,19 +103,8 @@ class ModuleCensor : public Module
 	ModuleCensor(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		/*
-		 * read the configuration file on startup.
-		 * it is perfectly valid to set <censor file> to the value of the
-		 * main config file, then append your <badword> tags to the bottom
-		 * of the main config... but rather messy. That's why the capability
-		 * of using a seperate config file is provided.
-		 *
-		 * XXX - Really, it'd be nice to scraip this kind of thing, and have something like
-		 * an include directive to include additional configuration files. Might make our lives easier. --w00t
-		 *
-		 * XXX - These module pre-date the include directive which exists since beta 5 -- Brain
+		/* Read the configuration file on startup.
 		 */
-		
 		OnRehash("");
 		cu = new CensorUser(ServerInstance);
 		cc = new CensorChannel(ServerInstance);
@@ -133,21 +114,17 @@ class ModuleCensor : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnRehash] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->Modes->InsertMode(output,"G",4);
-	}
- 
 	virtual ~ModuleCensor()
 	{
+		ServerInstance->Modes->DelMode(cu);
+		ServerInstance->Modes->DelMode(cc);
 		DELETE(cu);
 		DELETE(cc);
 	}
-	
+
 	virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
 	{
 		if ((pattern != "") && (text != ""))
@@ -160,10 +137,9 @@ class ModuleCensor : public Module
 			}
 		}
 	}
-	
+
 	// format of a config entry is <badword text="shit" replace="poo">
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		bool active = false;
 		irc::string text2 = text.c_str();
@@ -192,9 +168,9 @@ class ModuleCensor : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreMessage(user,dest,target_type,text,status);
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 	
 	virtual void OnRehash(const std::string &parameter)
@@ -203,15 +179,7 @@ class ModuleCensor : public Module
 		 * 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 Censorfile = Conf->ReadValue("censor","file",0);
-		// this automatically re-reads the configuration file into the class
-		ConfigReader* MyConf = new ConfigReader(ServerInstance, Censorfile);
-		if ((Censorfile == "") || (!MyConf->Verify()))
-		{
-			CensorException e;
-			throw(e);
-		}
+		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 		censors.clear();
 		for (int index = 0; index < MyConf->Enumerate("badword"); index++)
 		{
@@ -219,14 +187,12 @@ class ModuleCensor : public Module
 			irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
 			censors[pattern] = replace;
 		}
-		DELETE(Conf);
 		DELETE(MyConf);
 	}
 	
 	virtual Version GetVersion()
 	{
-		// This is version 2 because version 1.x is the unreleased unrealircd module
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 	
 };