X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=42415faa2f757e471fd88baab5e021d6b7959f22;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=c03b3f8544938d1a32b7035c8add10e8949503a4;hpb=638381c529a2f19c699718234d689e54ad459c97;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index c03b3f854..42415faa2 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -19,7 +19,9 @@ class ModuleOperjoin : public Module
 {
 	private:
 		std::string operChan;
-		std::vector<std::string> operChans;		
+		std::vector<std::string> operChans;
+		std::map<std::string, std::vector<std::string> > operTypeChans; // Channels specific to an oper type.
+		bool override;
 
 		int tokenize(const std::string &str, std::vector<std::string> &tokens)
 		{
@@ -52,12 +54,25 @@ 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);
 
+			std::map<std::string, std::vector<std::string> >().swap(operTypeChans);
+
+			int olines = conf->Enumerate("type");
+			for (int index = 0; index < olines; ++index)
+			{
+				std::string chanList = conf->ReadValue("type", "autojoin", index);
+				if (!chanList.empty())
+				{
+					tokenize(chanList, operTypeChans[conf->ReadValue("type", "name", index)]);
+				}
+			}
+
 			delete conf;
 		}
 
@@ -77,7 +92,21 @@ 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());
+
+			std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper);
+
+			if (i != operTypeChans.end())
+			{
+				const std::vector<std::string>& list = i->second;
+				for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+				{
+					if (ServerInstance->IsChannel(it->c_str()))
+					{
+						Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+					}
+				}
+			}
 		}
 
 };