X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=80bb73ad4989f785cf411c7d9f70240726a76a0a;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=aa4e777729f596ce1c94fa657a1718bb2d13e21f;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index aa4e77772..80bb73ad4 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,32 +1,43 @@
-// operjoin module by typobox43
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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 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/>.
+ */
 
-using namespace std;
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
-/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
-
-extern InspIRCd* ServerInstance;
-
 class ModuleOperjoin : public Module
 {
-	private:
 		std::string operChan;
-		ConfigReader* conf;
-		
+		std::vector<std::string> operChans;
+		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 +50,52 @@ class ModuleOperjoin : public Module
 		}
 
 	public:
-		ModuleOperjoin(InspIRCd* Me)
-			: Module::Module(Me)
+		void init() CXX11_OVERRIDE
 		{
-			
-			conf = new ConfigReader;
-			operChan = conf->ReadValue("operjoin", "channel", 0);
+			OnRehash(NULL);
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnPostOper] = List[I_OnRehash] = 1;
-		}
 
-		virtual void OnRehash(const std::string &parameter)
+		void OnRehash(User* user) CXX11_OVERRIDE
 		{
-			DELETE(conf);
-			conf = new ConfigReader;
-		}
+			ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-		virtual ~ModuleOperjoin()
-		{
-			DELETE(conf);
-		}
-
-		virtual Version GetVersion()
-		{
-			return Version(1,0,0,1,VF_VENDOR);
-		}
-
-		virtual void OnPostOper(userrec* user, const std::string &opertype)
-		{
-			if(operChan != "")
-			{
-				std::vector<std::string> operChans;
+			operChan = tag->getString("channel");
+			override = tag->getBool("override", false);
+			operChans.clear();
+			if (!operChan.empty())
 				tokenize(operChan,operChans);
-				for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-			}
-
 		}
 
-};
-
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-		ModuleOperjoinFactory()
+		Version GetVersion() CXX11_OVERRIDE
 		{
+			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
 		}
 
-		~ModuleOperjoinFactory()
+		void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 		{
-		}
+			LocalUser* localuser = IS_LOCAL(user);
+			if (!localuser)
+				return;
 
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleOperjoin(Me);
+			for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
+				if (ServerInstance->IsChannel(*i))
+					Channel::JoinUser(localuser, *i, override);
+
+			std::string chanList = localuser->oper->getConfig("autojoin");
+			if (!chanList.empty())
+			{
+				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))
+					{
+						Channel::JoinUser(localuser, *it, override);
+					}
+				}
+			}
 		}
 };
 
-extern "C" void * init_module( void )
-{
-	return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)