X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=06bd91c50ff77daa0d6fd53e6eecd775c037e13f;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=bf30880533c358056b51358a7eb8b2fed2bda539;hpb=903ba4e2ebf608737e1890cfa43c3e92a9ec2cf4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index bf3088053..06bd91c50 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,102 +1,72 @@
-// operjoin module by typobox43
-
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-
-/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2005 Robin Burchell <robin+git@viroteck.net>
+ *
+ * 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"
 
 class ModuleOperjoin : public Module
 {
-	private:
-		std::string operChan;
-		ConfigReader* conf;
-		Server* Srv;
-
-		int tokenize(const string &str, std::vector<std::string> &tokens)
-		{
-			// skip delimiters at beginning.
-			string::size_type lastPos = str.find_first_not_of(",", 0);
-			// find first "non-delimiter".
-			string::size_type pos = str.find_first_of(",", lastPos);
-
-			while (string::npos != pos || 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();
-		}
+		std::vector<std::string> operChans;
+		bool override;
 
 	public:
-		ModuleOperjoin(Server* Me)
-			: Module::Module(Me)
+		void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 		{
-			Srv = Me;
-			conf = new ConfigReader;
-			operChan = conf->ReadValue("operjoin", "channel", 0);
-		}
+			ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-		void Implements(char* List)
-		{
-			List[I_OnPostOper] = List[I_OnRehash] = 1;
-		}
+			override = tag->getBool("override", false);
+			irc::commasepstream ss(tag->getString("channel"));
+			operChans.clear();
 
-		virtual void OnRehash(const std::string &parameter)
-		{
-			DELETE(conf);
-			conf = new ConfigReader;
+			for (std::string channame; ss.GetToken(channame); )
+				operChans.push_back(channame);
 		}
 
-		virtual ~ModuleOperjoin()
+		Version GetVersion() CXX11_OVERRIDE
 		{
-			DELETE(conf);
+			return Version("Allows the server administrator to force server operators to join one or more channels when logging into their server operator account.", VF_VENDOR);
 		}
 
-		virtual Version GetVersion()
+		void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 		{
-			return Version(1,0,0,1,VF_VENDOR);
-		}
+			LocalUser* localuser = IS_LOCAL(user);
+			if (!localuser)
+				return;
 
-		virtual void OnPostOper(userrec* user, const std::string &opertype)
-		{
-			if(operChan != "")
+			for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
+				if (ServerInstance->IsChannel(*i))
+					Channel::JoinUser(localuser, *i, override);
+
+			irc::commasepstream ss(localuser->oper->getConfig("autojoin"));
+			for (std::string channame; ss.GetToken(channame); )
 			{
-				std::vector<std::string> operChans;
-				tokenize(operChan,operChans);
-				for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-					chanrec::JoinUser(user, it->c_str(), false);
+				if (ServerInstance->IsChannel(channame))
+					Channel::JoinUser(localuser, channame, override);
 			}
-
 		}
-
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-		ModuleOperjoinFactory()
-		{
-		}
-
-		~ModuleOperjoinFactory()
-		{
-		}
-
-		virtual Module * CreateModule(Server* Me)
-		{
-			return new ModuleOperjoin(Me);
-		}
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)