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

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index ca7f0c068..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,7 @@ class ModuleConnJoin : public Module
 {
 	private:
 		std::string JoinChan;
-		ConfigReader* conf;
+		std::vector<std::string> Joinchans;
 		
 
 		int tokenize(const string &str, std::vector<std::string> &tokens)
@@ -46,10 +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);
+			OnRehash(NULL, "");
+		}
+
+		Priority Prioritize()
+		{
+			return PRIORITY_LAST;
 		}
 
 		void Implements(char* List)
@@ -59,13 +63,16 @@ class ModuleConnJoin : public Module
 
 		virtual void OnRehash(userrec* user, const std::string &parameter)
 		{
+			ConfigReader* conf = new ConfigReader(ServerInstance);
+			JoinChan = conf->ReadValue("autojoin", "channel", 0);
+			Joinchans.clear();
+			if (!JoinChan.empty())
+				tokenize(JoinChan,Joinchans);
 			DELETE(conf);
-			conf = new ConfigReader(ServerInstance);
 		}
 
 		virtual ~ModuleConnJoin()
 		{
-			DELETE(conf);
 		}
 
 		virtual Version GetVersion()
@@ -75,36 +82,15 @@ class ModuleConnJoin : public Module
 
 		virtual void OnPostConnect(userrec* user)
 		{
-			if (!JoinChan.empty())
-			{
-				std::vector<std::string> Joinchans;
-				tokenize(JoinChan,Joinchans);
-				for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-			}
+			if (!IS_LOCAL(user))
+				return;
 
+			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, "", 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)