X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=29410962ba93d829364cf069ae762a1c2a2c7cde;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=a0b5ec1efa6e8f0a8febef525d528d8416297ad5;hpb=0b44d28a3143c7f6925a5d3956d9e982974a46de;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index a0b5ec1ef..29410962b 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -26,7 +26,7 @@ typedef std::map<irc::string,irc::string> censor_t;
 class CensorUser : public SimpleUserModeHandler
 {
  public:
-	CensorUser(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'G') { }
+	CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, 'G') { }
 };
 
 /** Handles channel mode +G
@@ -34,30 +34,24 @@ class CensorUser : public SimpleUserModeHandler
 class CensorChannel : public SimpleChannelModeHandler
 {
  public:
-	CensorChannel(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'G') { }
+	CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, 'G') { }
 };
 
 class ModuleCensor : public Module
 {
 	censor_t censors;
-	CensorUser *cu;
-	CensorChannel *cc;
+	CensorUser cu;
+	CensorChannel cc;
 
  public:
-	ModuleCensor(InspIRCd* Me)
-		: Module(Me)
+	ModuleCensor()
+		: cu(this), cc(this)
 	{
 		/* Read the configuration file on startup.
 		 */
-		OnRehash(NULL,"");
-		cu = new CensorUser(ServerInstance);
-		cc = new CensorChannel(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(cu) || !ServerInstance->Modes->AddMode(cc))
-		{
-			delete cu;
-			delete cc;
+		OnRehash(NULL);
+		if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc))
 			throw ModuleException("Could not add new modes!");
-		}
 		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
@@ -65,17 +59,15 @@ class ModuleCensor : public Module
 
 	virtual ~ModuleCensor()
 	{
-		ServerInstance->Modes->DelMode(cu);
-		ServerInstance->Modes->DelMode(cc);
-		delete cu;
-		delete cc;
+		ServerInstance->Modes->DelMode(&cu);
+		ServerInstance->Modes->DelMode(&cc);
 	}
 
 	// format of a config entry is <badword text="shit" replace="poo">
-	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		bool active = false;
 
@@ -85,14 +77,14 @@ class ModuleCensor : public Module
 		{
 			active = ((Channel*)dest)->IsModeSet('G');
 			Channel* c = (Channel*)dest;
-			if (CHANOPS_EXEMPT(ServerInstance, 'G') && c->GetStatus(user) == STATUS_OP)
+			if (CHANOPS_EXEMPT('G') && c->GetPrefixValue(user) == OP_VALUE)
 			{
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 		}
 
 		if (!active)
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		irc::string text2 = text.c_str();
 		for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
@@ -102,28 +94,28 @@ class ModuleCensor : public Module
 				if (index->second.empty())
 				{
 					user->WriteNumeric(ERR_WORDFILTERED, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str());
-					return 1;
+					return MOD_RES_DENY;
 				}
 
 				SearchAndReplace(text2, index->first, index->second);
 			}
 		}
 		text = text2.c_str();
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		/*
 		 * 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* MyConf = new ConfigReader(ServerInstance);
+		ConfigReader* MyConf = new ConfigReader;
 		censors.clear();
 
 		for (int index = 0; index < MyConf->Enumerate("badword"); index++)
@@ -138,7 +130,7 @@ class ModuleCensor : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 };