X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=21f9aae30815c48e18b50bff5318550a4429ada3;hb=05cc48f1894e40f8a34496bf54a60d8b911e6a5e;hp=d764c76d784c37cd0a27cc8ff58bfb319ee48237;hpb=29b51086b95c86f812ac35ed7d3333f060ba5a8c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index d764c76d7..21f9aae30 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -19,7 +19,8 @@ class ModuleOperjoin : public Module
 {
 	private:
 		std::string operChan;
-		std::vector<std::string> operChans;		
+		std::vector<std::string> operChans;
+		bool override;
 
 		int tokenize(const std::string &str, std::vector<std::string> &tokens)
 		{
@@ -52,8 +53,9 @@ class ModuleOperjoin : public Module
 		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ConfigReader* conf = new ConfigReader(ServerInstance);
-
+    
 			operChan = conf->ReadValue("operjoin", "channel", 0);
+			override = conf->ReadFlag("operjoin", "override", "0", 0);
 			operChans.clear();
 			if (!operChan.empty())
 				tokenize(operChan,operChans);
@@ -67,7 +69,7 @@ class ModuleOperjoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+			return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 		}
 
 		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
@@ -77,7 +79,7 @@ class ModuleOperjoin : public Module
 
 			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
 				if (ServerInstance->IsChannel(it->c_str()))
-					Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
+					Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
 		}
 
 };