X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=d12bc193225bbade732b1dc028bc40cf77ceb86b;hb=fed58f5c25915d60d40c0f407914ff7381902f9d;hp=4308068e3e83aaa57b2a36744282d183fbfc9bc4;hpb=0f6de0b18372a76ebb5d6c4ba3dc9a7a7e0a7297;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 4308068e3..d12bc1932 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
@@ -22,9 +22,7 @@ class ModuleOperjoin : public Module
 {
 	private:
 		std::string operChan;
-		std::vector<std::string> operChans;
-		ConfigReader* conf;
-		
+		std::vector<std::string> operChans;		
 
 		int tokenize(const string &str, std::vector<std::string> &tokens)
 		{
@@ -46,15 +44,9 @@ class ModuleOperjoin : public Module
 		}
 
 	public:
-		ModuleOperjoin(InspIRCd* Me)
-			: Module::Module(Me)
+		ModuleOperjoin(InspIRCd* Me) : Module(Me)
 		{
-			
-			conf = new ConfigReader(ServerInstance);
-			operChan = conf->ReadValue("operjoin", "channel", 0);
-			operChans.clear();
-			if (!operChan.empty())
-				tokenize(operChan,operChans);
+			OnRehash(NULL, "");
 		}
 
 		void Implements(char* List)
@@ -64,17 +56,18 @@ class ModuleOperjoin : public Module
 
 		virtual void OnRehash(userrec* user, const std::string &parameter)
 		{
-			DELETE(conf);
-			conf = new ConfigReader(ServerInstance);
+			ConfigReader* conf = new ConfigReader(ServerInstance);
+
 			operChan = conf->ReadValue("operjoin", "channel", 0);
 			operChans.clear();
 			if (!operChan.empty())
 				tokenize(operChan,operChans);
+
+			DELETE(conf);
 		}
 
 		virtual ~ModuleOperjoin()
 		{
-			DELETE(conf);
 		}
 
 		virtual Version GetVersion()
@@ -89,29 +82,9 @@ class ModuleOperjoin : public Module
 
 			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
 				if (ServerInstance->IsChannel(it->c_str()))
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "");
-		}
-
-};
-
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-		ModuleOperjoinFactory()
-		{
+					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
 		}
 
-		~ModuleOperjoinFactory()
-		{
-		}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleOperjoin(Me);
-		}
 };
 
-extern "C" void * init_module( void )
-{
-	return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)