X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=97a8b83406ad93500c0a539cdbbf6313d482a408;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=f1cc8bc6b863a814c0c137dbc9f364a687b8bd92;hpb=52acbb466b84a1cd161b1c111f855d6f0419fff3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index f1cc8bc6b..97a8b8340 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.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
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
@@ -31,30 +28,28 @@ class ModuleModesOnConnect : public Module
 	{
 		
 		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()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnPostConnect(userrec* user)
+	virtual void OnPostConnect(User* user)
 	{
 		if (!IS_LOCAL(user))
 			return;
@@ -68,32 +63,28 @@ class ModuleModesOnConnect : public Module
 				if (!ThisModes.empty())
 				{
 					std::string buf;
-					stringstream ss(ThisModes);
+					std::stringstream ss(ThisModes);
 
-					vector<string> tokens;
+					std::vector<std::string> tokens;
 
 					// split ThisUserModes into modes and mode params
 					while (ss >> buf)
 						tokens.push_back(buf);
 
-					int size = tokens.size() + 1;
-					const char** modes = new const char*[size];
-					modes[0] = user->nick;
-					modes[1] = tokens[0].c_str();
+					std::vector<std::string> modes;
+					modes.push_back(user->nick);
+					modes.push_back(tokens[0]);
 
 					if (tokens.size() > 1)
 					{
 						// process mode params
-						int i = 2;
 						for (unsigned int k = 1; k < tokens.size(); k++)
 						{
-							modes[i] = tokens[k].c_str();
-							i++;
+							modes.push_back(tokens[k]);
 						}
 					}
 
-					ServerInstance->Parser->CallHandler("MODE", modes, size, user);
-					delete [] modes;
+					ServerInstance->Parser->CallHandler("MODE", modes, user);
 				}
 				break;
 			}
@@ -101,29 +92,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" DllExport void * init_module( void )
-{
-	return new ModuleModesOnConnectFactory;
-}
-
+MODULE_INIT(ModuleModesOnConnect)