X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=d12bc193225bbade732b1dc028bc40cf77ceb86b;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=76ba00ef21d90c12edb0810f49cd5a3bce102241;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 76ba00ef2..d12bc1932 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -11,22 +11,18 @@
  * ---------------------------------------------------
  */
 
+#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 */
 
-
-
 class ModuleOperjoin : public Module
 {
 	private:
 		std::string operChan;
-		ConfigReader* conf;
-		
+		std::vector<std::string> operChans;		
 
 		int tokenize(const string &str, std::vector<std::string> &tokens)
 		{
@@ -48,12 +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);
+			OnRehash(NULL, "");
 		}
 
 		void Implements(char* List)
@@ -61,15 +54,20 @@ class ModuleOperjoin : public Module
 			List[I_OnPostOper] = List[I_OnRehash] = 1;
 		}
 
-		virtual void OnRehash(const std::string &parameter)
+		virtual void OnRehash(userrec* user, const std::string &parameter)
 		{
+			ConfigReader* conf = new ConfigReader(ServerInstance);
+
+			operChan = conf->ReadValue("operjoin", "channel", 0);
+			operChans.clear();
+			if (!operChan.empty())
+				tokenize(operChan,operChans);
+
 			DELETE(conf);
-			conf = new ConfigReader(ServerInstance);
 		}
 
 		virtual ~ModuleOperjoin()
 		{
-			DELETE(conf);
 		}
 
 		virtual Version GetVersion()
@@ -79,36 +77,14 @@ class ModuleOperjoin : public Module
 
 		virtual void OnPostOper(userrec* user, const std::string &opertype)
 		{
-			if(operChan != "")
-			{
-				std::vector<std::string> operChans;
-				tokenize(operChan,operChans);
-				for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-			}
+			if (!IS_LOCAL(user))
+				return;
 
+			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, "", ServerInstance->Time(true));
 		}
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-		ModuleOperjoinFactory()
-		{
-		}
-
-		~ModuleOperjoinFactory()
-		{
-		}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleOperjoin(Me);
-		}
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)