X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=6a684206f2bede7928c32a90d82527e4b1347201;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=87e8646ec47e2eb1dc1db77f23bb1dd91504f857;hpb=2d659114b7c8d91c70d327259d0be63de006ec8c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 87e8646ec..6a684206f 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -11,19 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <time.h>
-#include <map>
-#include <vector>
-#include <sstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
-
-
 inline int strtoint(const std::string &str)
 {
 	std::istringstream ss(str);
@@ -41,15 +32,15 @@ class KickRejoin : public ModeHandler
  public:
 	KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-                if (channel->IsModeSet('J'))
-                        return std::make_pair(true, channel->GetModeParameter('J'));
-                else
-                        return std::make_pair(false, parameter);
-        } 
+	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	{
+		if (channel->IsModeSet('J'))
+			return std::make_pair(true, channel->GetModeParameter('J'));
+		else
+			return std::make_pair(false, parameter);
+	} 
 
-        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
@@ -129,7 +120,7 @@ class ModuleKickNoRejoin : public Module
 public:
  
 	ModuleKickNoRejoin(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		kr = new KickRejoin(ServerInstance);
@@ -226,27 +217,4 @@ public:
 };
 
 
-class ModuleKickNoRejoinFactory : public ModuleFactory
-{
- public:
-	ModuleKickNoRejoinFactory()
-	{
-	}
-	
-	~ModuleKickNoRejoinFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleKickNoRejoin(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleKickNoRejoinFactory;
-}
-
+MODULE_INIT(ModuleKickNoRejoin)