X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=5290086fe4b2f321d590999e3290b189f6dae9c5;hb=102c54990c8ae10943f4f0ac36b5e80b7b900268;hp=587793acb7628f5b7eead9179da4779bf572f498;hpb=ca5af9f34d3bce42335e70572a763094064cfd4b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 587793acb..5290086fe 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,76 +1,71 @@
-// 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 {
-
-	private:
-
-		std::string operChan;
-		ConfigReader* conf;
+/*
+ * 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>
+ *
+ * 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
+{
+		std::vector<std::string> operChans;
+		bool override;
 
 	public:
+		void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+		{
+			ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-		ModuleOperjoin() {
-
-			Srv = new Server;
-			conf = new ConfigReader;
-
-			operChan = conf->ReadValue("operjoin", "channel", 0);
+			override = tag->getBool("override", false);
+			irc::commasepstream ss(tag->getString("channel"));
+			operChans.clear();
 
+			for (std::string channame; ss.GetToken(channame); )
+				operChans.push_back(channame);
 		}
 
-		virtual ~ModuleOperjoin() {
-
-			delete Srv;
-			delete conf;
-
-		}
-
-		virtual Version GetVersion() {
-
-			return Version(1,0,0,1);
-
+		Version GetVersion() CXX11_OVERRIDE
+		{
+			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 void OnOper(userrec* user) {
-
-			if(operChan != "") {
-
-				Srv->JoinUserToChannel(user,operChan,"");
-
+		void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
+		{
+			LocalUser* localuser = IS_LOCAL(user);
+			if (!localuser)
+				return;
+
+			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); )
+			{
+				if (ServerInstance->IsChannel(channame))
+					Channel::JoinUser(localuser, channame, override);
 			}
-
 		}
-
-};
-
-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)