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 faeeb8b55c8b64d9ef43b9b993b8cdcc6020a01c..06bd91c50ff77daa0d6fd53e6eecd775c037e13f 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,12 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   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 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>
+ *   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 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
@@ -24,56 +27,27 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
-
 class ModuleOperjoin : public Module
 {
-               std::string operChan;
                std::vector<std::string> operChans;
                bool override;
 
-               int tokenize(const std::string &str, std::vector<std::string> &tokens)
-               {
-                       // skip delimiters at beginning.
-                       std::string::size_type lastPos = str.find_first_not_of(",", 0);
-                       // find first "non-delimiter".
-                       std::string::size_type pos = str.find_first_of(",", lastPos);
-
-                       while (std::string::npos != pos || std::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();
-               }
-
        public:
-               void init() CXX11_OVERRIDE
-               {
-                       OnRehash(NULL);
-                       Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-                       ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-               }
-
-
-               void OnRehash(User* user) CXX11_OVERRIDE
+               void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
                {
                        ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin");
 
-                       operChan = tag->getString("channel");
                        override = tag->getBool("override", false);
+                       irc::commasepstream ss(tag->getString("channel"));
                        operChans.clear();
-                       if (!operChan.empty())
-                               tokenize(operChan,operChans);
+
+                       for (std::string channame; ss.GetToken(channame); )
+                               operChans.push_back(channame);
                }
 
                Version GetVersion() CXX11_OVERRIDE
                {
-                       return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
+                       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);
                }
 
                void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
@@ -83,21 +57,14 @@ class ModuleOperjoin : public Module
                                return;
 
                        for (std::vector<std::string>::const_iterator i = operChans.begin(); i != operChans.end(); ++i)
-                               if (ServerInstance->IsChannel(*i, ServerInstance->Config->Limits.ChanMax))
+                               if (ServerInstance->IsChannel(*i))
                                        Channel::JoinUser(localuser, *i, override);
 
-                       std::string chanList = localuser->oper->getConfig("autojoin");
-                       if (!chanList.empty())
+                       irc::commasepstream ss(localuser->oper->getConfig("autojoin"));
+                       for (std::string channame; ss.GetToken(channame); )
                        {
-                               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, ServerInstance->Config->Limits.ChanMax))
-                                       {
-                                               Channel::JoinUser(localuser, *it, override);
-                                       }
-                               }
+                               if (ServerInstance->IsChannel(channame))
+                                       Channel::JoinUser(localuser, channame, override);
                        }
                }
 };