X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=ed110d6c96461a3c0f150057625ca1a6f1755e35;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=b5328f785293243e5fc653e05a4596523432244f;hpb=373de28c980309af655816426d9cccae08102fd7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index b5328f785..ed110d6c9 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,7 +25,7 @@ class User_d : public ModeHandler
  public:
 	User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -60,31 +60,29 @@ class ModuleDeaf : public Module
 		: Module(Me)
 	{
 		m1 = new User_d(ServerInstance);
-		if (!ServerInstance->AddMode(m1, 'd'))
+		if (!ServerInstance->Modes->AddMode(m1))
 			throw ModuleException("Could not add new modes!");
 
 		OnRehash(NULL, "");
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnBuildExemptList };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
-	}
 
-	virtual void OnRehash(userrec* user, const std::string&)
+	virtual void OnRehash(User* user, const std::string&)
 	{
 		ConfigReader* conf = new ConfigReader(ServerInstance);
 		deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
 		deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0);
 
-		DELETE(conf);
+		delete conf;
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* chan = (chanrec*)dest;
+			Channel* chan = (Channel*)dest;
 			if (chan)
 				this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
 		}
@@ -92,11 +90,11 @@ class ModuleDeaf : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* chan = (chanrec*)dest;
+			Channel* chan = (Channel*)dest;
 			if (chan)
 				this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
 		}
@@ -104,7 +102,12 @@ class ModuleDeaf : public Module
 		return 0;
 	}
 
-	virtual void BuildDeafList(MessageType message_type, chanrec* chan, userrec* sender, char status, std::string &text, CUList &exempt_list)
+	virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
+	{
+		BuildDeafList(message_type, chan, sender, status, text, exempt_list);
+	}
+
+	virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
 	{
 		CUList *ulist;
 		bool is_a_uline;
@@ -115,13 +118,13 @@ class ModuleDeaf : public Module
 		if (!deaf_bypasschars.empty())
 		{
 			is_bypasschar_avail = 1;
-			if (deaf_bypasschars.find(text[0], 0) != string::npos)
+			if (deaf_bypasschars.find(text[0], 0) != std::string::npos)
 				is_bypasschar = 1;
 		}
 		if (!deaf_bypasschars_uline.empty())
 		{
 			is_bypasschar_uline_avail = 1;
-			if (deaf_bypasschars_uline.find(text[0], 0) != string::npos)
+			if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos)
 				is_bypasschar_uline = 1;
 		}
 
@@ -173,7 +176,7 @@ class ModuleDeaf : public Module
 	virtual ~ModuleDeaf()
 	{
 		ServerInstance->Modes->DelMode(m1);
-		DELETE(m1);
+		delete m1;
 	}
 
 	virtual Version GetVersion()