X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=2f5dda0ff4a55425d690c028ac979e5a26a3091a;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=42415faa2f757e471fd88baab5e021d6b7959f22;hpb=a15f95e58613619100cc1a6093fab3d0149a1e96;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 42415faa2..2f5dda0ff 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,26 +1,35 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2004 Christopher Hall <typobox43@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
 class ModuleOperjoin : public Module
 {
-	private:
 		std::string operChan;
 		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)
@@ -43,46 +52,28 @@ class ModuleOperjoin : public Module
 		}
 
 	public:
-		ModuleOperjoin(InspIRCd* Me) : Module(Me)
+		void init()
 		{
-			OnRehash(NULL, "");
-		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+			OnRehash(NULL);
+			Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+			ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		}
 
 
-		virtual void OnRehash(User* user, const std::string &parameter)
+		virtual void OnRehash(User* user)
 		{
-			ConfigReader* conf = new ConfigReader(ServerInstance);
-    
-			operChan = conf->ReadValue("operjoin", "channel", 0);
-			override = conf->ReadFlag("operjoin", "override", "0", 0);
+			ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
+
+			operChan = tag->getString("channel");
+			override = tag->getBool("override", false);
 			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;
-		}
-
-		virtual ~ModuleOperjoin()
-		{
 		}
 
 		virtual Version GetVersion()
 		{
-			return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
 		}
 
 		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
@@ -91,24 +82,23 @@ class ModuleOperjoin : public Module
 				return;
 
 			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(), override, "", false, ServerInstance->Time());
-
-			std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper);
+				if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+					Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
 
-			if (i != operTypeChans.end())
+			std::string chanList = user->oper->getConfig("autojoin");
+			if (!chanList.empty())
 			{
-				const std::vector<std::string>& list = i->second;
-				for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+				std::vector<std::string> typechans;
+				tokenize(chanList, typechans);
+				for (std::vector<std::string>::const_iterator it = typechans.begin(); it != typechans.end(); ++it)
 				{
-					if (ServerInstance->IsChannel(it->c_str()))
+					if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
 					{
-						Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+						Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
 					}
 				}
 			}
 		}
-
 };
 
 MODULE_INIT(ModuleOperjoin)