Merge pull request #1139 from johanna-a/master

[user/henk/code/inspircd.git] / src / modules / m_operjoin.cpp

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 3609350a2dbe159e65b9fdffdc1753efc3342d53..dd80d99bafc748063d02282bd3f2f7359c32ce91 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,79 +1,69 @@
-// operjoin module by typobox43
-
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.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) 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/>.
+ */
+
+
+#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;
-
+               Version GetVersion() CXX11_OVERRIDE
+               {
+                       return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
                }
 
-               virtual Version GetVersion() {
-
-                       return Version(1,0,0,1,VF_VENDOR);
-
-               }
-
-               virtual void OnOper(userrec* user, std::string opertype) {
-
-                       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)