Merge pull request #1147 from SaberUK/insp20+gcc6

[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 c03b3f8544938d1a32b7035c8add10e8949503a4..bd77384a604eb105d1d17fef1378f2a37c7fc2cc 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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 */
@@ -19,7 +30,8 @@ class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
-               std::vector<std::string> operChans;             
+               std::vector<std::string> operChans;
+               bool override;
 
                int tokenize(const std::string &str, std::vector<std::string> &tokens)
                {
@@ -41,24 +53,23 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(InspIRCd* Me) : Module(Me)
+               void init()
                {
-                       OnRehash(NULL, "");
-               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+                       OnRehash(NULL);
+                       Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+                       ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                }
 
 
-               virtual void OnRehash(User* user, const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
-                       ConfigReader* conf = new ConfigReader(ServerInstance);
+                       ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChan = tag->getString("channel");
+                       override = tag->getBool("override", false);
                        operChans.clear();
                        if (!operChan.empty())
                                tokenize(operChan,operChans);
-
-                       delete conf;
                }
 
                virtual ~ModuleOperjoin()
@@ -67,7 +78,7 @@ class ModuleOperjoin : public Module
 
                virtual Version GetVersion()
                {
-                       return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+                       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)
@@ -76,10 +87,23 @@ class ModuleOperjoin : public Module
                                return;
 
                        for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-                               if (ServerInstance->IsChannel(it->c_str()))
-                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
-               }
+                               if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+                                       Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
 
+                       std::string chanList = IS_OPER(user)->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->c_str(), ServerInstance->Config->Limits.ChanMax))
+                                       {
+                                               Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+                                       }
+                               }
+                       }
+               }
 };
 
 MODULE_INIT(ModuleOperjoin)