X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=469bb6a2c0765770fec190dd65f2431efefb1a8a;hb=a30abe26fc803900eaf5dc4c08a31aa1d3c9c89f;hp=67512815d356a0ef8ddfef8ecfada63c567a8979;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 67512815d..469bb6a2c 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,32 +1,36 @@
-// operjoin module by typobox43
-
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
 #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;
+		std::map<std::string, std::vector<std::string> > operTypeChans; // Channels specific to an oper type.
+		bool override;
 
-		int tokenize(const string &str, std::vector<std::string> &tokens)
+		int tokenize(const std::string &str, std::vector<std::string> &tokens)
 		{
 			// skip delimiters at beginning.
-			string::size_type lastPos = str.find_first_not_of(",", 0);
+			std::string::size_type lastPos = str.find_first_not_of(",", 0);
 			// find first "non-delimiter".
-			string::size_type pos = str.find_first_of(",", lastPos);
+			std::string::size_type pos = str.find_first_of(",", lastPos);
 
-			while (string::npos != pos || string::npos != lastPos)
+			while (std::string::npos != pos || std::string::npos != lastPos)
 			{
 				// found a token, add it to the vector.
 				tokens.push_back(str.substr(lastPos, pos - lastPos));
@@ -39,67 +43,70 @@ class ModuleOperjoin : public Module
 		}
 
 	public:
-		ModuleOperjoin(InspIRCd* Me)
-			: Module::Module(Me)
+		ModuleOperjoin()
 		{
-			
-			conf = new ConfigReader(ServerInstance);
-			operChan = conf->ReadValue("operjoin", "channel", 0);
+			OnRehash(NULL);
+			Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnPostOper] = List[I_OnRehash] = 1;
-		}
 
-		virtual void OnRehash(const std::string &parameter)
+		virtual void OnRehash(User* user)
 		{
-			DELETE(conf);
-			conf = new ConfigReader(ServerInstance);
+			ConfigReader conf;
+
+			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)]);
+				}
+			}
 		}
 
 		virtual ~ModuleOperjoin()
 		{
-			DELETE(conf);
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
 		}
 
-		virtual void OnPostOper(userrec* user, const std::string &opertype)
+		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
 		{
-			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(), ServerInstance->Config->Limits.ChanMax))
+					Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-		ModuleOperjoinFactory()
-		{
-		}
+			std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper->name);
 
-		~ModuleOperjoinFactory()
-		{
+			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(), ServerInstance->Config->Limits.ChanMax))
+					{
+						Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+					}
+				}
+			}
 		}
 
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleOperjoin(Me);
-		}
 };
 
-extern "C" void * init_module( void )
-{
-	return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)