X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=05dbd69cab610daf6eea1115080c99296ec1fc4f;hb=fed58f5c25915d60d40c0f407914ff7381902f9d;hp=008fdae5e68d08df9cfcd0799521023add63cd5e;hpb=3382adb9e9a79748b4db09bb41a296861800fa2d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 008fdae5e..05dbd69ca 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,31 +2,22 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
-
-
 class NoCTCP : public ModeHandler
 {
  public:
@@ -63,30 +54,27 @@ class ModuleNoCTCP : public Module
  public:
  
 	ModuleNoCTCP(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		nc = new NoCTCP(ServerInstance);
-		ServerInstance->AddMode(nc, 'C');
+		if (!ServerInstance->AddMode(nc, 'C'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
+		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 	}
 	
-	virtual int OnUserPreMessage(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 OnUserPreNotice(user,dest,target_type,text,status);
-	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
-	{
-		if (target_type == TYPE_CHANNEL)
+		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
 			chanrec* c = (chanrec*)dest;
 			if (c->IsModeSet('C'))
@@ -106,37 +94,14 @@ class ModuleNoCTCP : public Module
 
 	virtual ~ModuleNoCTCP()
 	{
+		ServerInstance->Modes->DelMode(nc);
 		DELETE(nc);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
-
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
-	{
-	}
-	
-	~ModuleNoCTCPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoCTCP(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP)