m_spanningtree Move all server-to-server command handlers into handler classes

[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 0c8975247fa3324afbf29f1e377828289dde4f75..80bb73ad4989f785cf411c7d9f70240726a76a0a 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,26 +1,33 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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 */
+#include "inspircd.h"
 
 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,70 +50,52 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin()
+               void init() CXX11_OVERRIDE
                {
                        OnRehash(NULL);
-                       Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-                       ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
 
-               virtual void OnRehash(User* user)
+               void OnRehash(User* user) CXX11_OVERRIDE
                {
-                       ConfigReader conf;
+                       ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-                       operChan = conf.ReadValue("operjoin", "channel", 0);
-                       override = conf.ReadFlag("operjoin", "override", "0", 0);
+                       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)]);
-                               }
-                       }
                }
 
-               virtual ~ModuleOperjoin()
-               {
-               }
-
-               virtual Version GetVersion()
+               Version GetVersion() CXX11_OVERRIDE
                {
                        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)
+               void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
                {
-                       if (!IS_LOCAL(user))
+                       LocalUser* localuser = IS_LOCAL(user);
+                       if (!localuser)
                                return;
 
-                       for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-                               if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
-                                       Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
-
-                       std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper->name);
+                       for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
+                               if (ServerInstance->IsChannel(*i))
+                                       Channel::JoinUser(localuser, *i, override);
 
-                       if (i != operTypeChans.end())
+                       std::string chanList = localuser->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(), ServerInstance->Config->Limits.ChanMax))
+                                       if (ServerInstance->IsChannel(*it))
                                        {
-                                               Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+                                               Channel::JoinUser(localuser, *it, override);
                                        }
                                }
                        }
                }
-
 };
 
 MODULE_INIT(ModuleOperjoin)