X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=549194ef7a9afd118081459eeb9e888ac74ed130;hb=73b5d276db1903256c7432e333b4db8d01d58d05;hp=02a42b9772492bfb70db0baa835a4f5db2355e5b;hpb=ec7fc489a14af54738da17a94b162a9606df4756;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 02a42b977..549194ef7 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,76 +1,114 @@
-// operjoin module by typobox43
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-/* $ModDesc: Forces opers to join a specified channel on oper-up */
-
-Server *Srv;
-
-class ModuleOperjoin : public Module {
-
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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 std::string &str, std::vector<std::string> &tokens)
+		{
+			// skip delimiters at beginning.
+			std::string::size_type lastPos = str.find_first_not_of(",", 0);
+			// find first "non-delimiter".
+			std::string::size_type pos = str.find_first_of(",", 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));
+				// skip delimiters. Note the "not_of"
+				lastPos = str.find_first_not_of(",", pos);
+				// find next "non-delimiter"
+				pos = str.find_first_of(",", lastPos);
+			}
+			return tokens.size();
+		}
 
 	public:
+		ModuleOperjoin(InspIRCd* Me) : Module(Me)
+		{
+			OnRehash(NULL, "");
+		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+		}
 
-		ModuleOperjoin() {
 
-			Srv = new Server;
-			conf = new ConfigReader;
+		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)]);
+				}
+			}
 
-		}
-
-		virtual ~ModuleOperjoin() {
-
-			delete Srv;
 			delete conf;
-
 		}
 
-		virtual Version GetVersion() {
-
-			return Version(1,0,0,1,VF_VENDOR);
-
+		virtual ~ModuleOperjoin()
+		{
 		}
 
-		virtual void OnOper(userrec* user) {
-
-			if(operChan != "") {
-
-				Srv->JoinUserToChannel(user,operChan,"");
+		virtual Version GetVersion()
+		{
+			return Version("$Id$", VF_VENDOR, API_VERSION);
+		}
 
+		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+		{
+			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(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(), ServerInstance->Config->Limits.ChanMax))
+					{
+						Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+					}
+				}
 			}
-
 		}
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
- public:
-        ModuleOperjoinFactory()
-        {
-        }
-
-        ~ModuleOperjoinFactory()
-        {
-        }
-
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperjoin;
-        }
-
-};
-
-extern "C" void * init_module( void )
-{
-        return new ModuleOperjoinFactory;
-}
-
+MODULE_INIT(ModuleOperjoin)