Fix the cloaking module on C++98 compilers.

[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 45fcf6be85ad3345be2d2c0faacb805930ae33b6..06bd91c50ff77daa0d6fd53e6eecd775c037e13f 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,87 +1,72 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 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;             
-
-               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(InspIRCd* Me) : Module(Me)
-               {
-                       OnRehash(NULL, "");
-               }
-
-               void Implements(char* List)
-               {
-                       List[I_OnPostOper] = List[I_OnRehash] = 1;
-               }
-
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
                {
-                       ConfigReader* conf = new ConfigReader(ServerInstance);
+                       ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       override = tag->getBool("override", false);
+                       irc::commasepstream ss(tag->getString("channel"));
                        operChans.clear();
-                       if (!operChan.empty())
-                               tokenize(operChan,operChans);
 
-                       delete conf;
+                       for (std::string channame; ss.GetToken(channame); )
+                               operChans.push_back(channame);
                }
 
-               virtual ~ModuleOperjoin()
+               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 Version GetVersion()
+               void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
                {
-                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-               }
-
-               virtual void OnPostOper(userrec* user, const std::string &opertype)
-               {
-                       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()))
-                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
-               }
+                       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);
+                       }
+               }
 };
 
 MODULE_INIT(ModuleOperjoin)