X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_join.cpp;h=2d639f310fd39cda8a243d3aff296c5ac0bd3b0d;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=9a7fdca7a5ef044abfce5ea26cfe2558c41bde33;hpb=2ccf874d7e85c12278ee8ce24d750b0819eb2384;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 9a7fdca7a..2d639f310 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Forces users to join the specified channel(s) on connect */
 
@@ -22,7 +22,6 @@ class ModuleConnJoin : public Module
 {
 	private:
 		std::string JoinChan;
-		ConfigReader* conf;
 		std::vector<std::string> Joinchans;
 		
 
@@ -47,13 +46,14 @@ class ModuleConnJoin : public Module
 
 	public:
 		ModuleConnJoin(InspIRCd* Me)
-			: Module::Module(Me)
+			: Module(Me)
 		{
-			conf = new ConfigReader(ServerInstance);
-			JoinChan = conf->ReadValue("autojoin", "channel", 0);
-			Joinchans.clear();
-			if (!JoinChan.empty())
-				tokenize(JoinChan,Joinchans);
+			OnRehash(NULL, "");
+		}
+
+		Priority Prioritize()
+		{
+			return PRIORITY_LAST;
 		}
 
 		void Implements(char* List)
@@ -63,17 +63,16 @@ class ModuleConnJoin : public Module
 
 		virtual void OnRehash(userrec* user, const std::string &parameter)
 		{
-			DELETE(conf);
-			conf = new ConfigReader(ServerInstance);
+			ConfigReader* conf = new ConfigReader(ServerInstance);
 			JoinChan = conf->ReadValue("autojoin", "channel", 0);
 			Joinchans.clear();
 			if (!JoinChan.empty())
 				tokenize(JoinChan,Joinchans);
+			DELETE(conf);
 		}
 
 		virtual ~ModuleConnJoin()
 		{
-			DELETE(conf);
 		}
 
 		virtual Version GetVersion()
@@ -88,29 +87,10 @@ class ModuleConnJoin : public Module
 
 			for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
 				if (ServerInstance->IsChannel(it->c_str()))
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
+					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
 		}
 
 };
 
-class ModuleConnJoinFactory : public ModuleFactory
-{
-	public:
-		ModuleConnJoinFactory()
-		{
-		}
-
-		~ModuleConnJoinFactory()
-		{
-		}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleConnJoin(Me);
-		}
-};
 
-extern "C" void * init_module( void )
-{
-	return new ModuleConnJoinFactory;
-}
+MODULE_INIT(ModuleConnJoin)