X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=725bbec4ace2720d58e51b442a598989f0dc5352;hb=53afaa7cadcdf222dcf761441727305f79b4c557;hp=1b6bbe66d5c93cd6866afb5bdf9ed9d3cbab5e90;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 1b6bbe66d..725bbec4a 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -11,12 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <vector>
-#include "users.h"
-#include "channels.h"
 #include "inspircd.h"
-#include "modules.h"
 #include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
@@ -29,26 +24,24 @@ class ModuleModesOnConnect : public Module
 
  public:
 	ModuleModesOnConnect(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		Conf = new ConfigReader(ServerInstance);
+		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnPostConnect] = List[I_OnRehash] = 1;
-	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual ~ModuleModesOnConnect()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
 	
 	virtual Version GetVersion()
@@ -56,20 +49,18 @@ class ModuleModesOnConnect : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnPostConnect(userrec* user)
+	virtual void OnPostConnect(User* user)
 	{
 		if (!IS_LOCAL(user))
 			return;
 
-		ServerInstance->Log(DEBUG,"Post connect for mode setting");
 		for (int j = 0; j < Conf->Enumerate("connect"); j++)
 		{
 			std::string hostn = Conf->ReadValue("connect","allow",j);
 			if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
 			{
-				ServerInstance->Log(DEBUG,"Found matching connect block '%s'",hostn.c_str());
 				std::string ThisModes = Conf->ReadValue("connect","modes",j);
-				if (ThisModes != "")
+				if (!ThisModes.empty())
 				{
 					std::string buf;
 					stringstream ss(ThisModes);
@@ -81,7 +72,7 @@ class ModuleModesOnConnect : public Module
 						tokens.push_back(buf);
 
 					int size = tokens.size() + 1;
-					const char* modes[size];
+					const char** modes = new const char*[size];
 					modes[0] = user->nick;
 					modes[1] = tokens[0].c_str();
 
@@ -96,8 +87,8 @@ class ModuleModesOnConnect : public Module
 						}
 					}
 
-					ServerInstance->Log(DEBUG,"Call mode handler to set modes");
 					ServerInstance->Parser->CallHandler("MODE", modes, size, user);
+					delete [] modes;
 				}
 				break;
 			}
@@ -105,29 +96,4 @@ class ModuleModesOnConnect : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnConnectFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnConnectFactory()
-	{
-	}
-	
-	~ModuleModesOnConnectFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleModesOnConnect(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleModesOnConnectFactory;
-}
-
+MODULE_INIT(ModuleModesOnConnect)