Only valid targets for encap are now server ids

[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 f0f98ea004b8a357903d2f7570bc30fccd240d0f..d764c76d784c37cd0a27cc8ff58bfb319ee48237 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,14 +21,14 @@ class ModuleOperjoin : public Module
                std::string operChan;
                std::vector<std::string> operChans;             
 
-               int tokenize(const string &str, std::vector<std::string> &tokens)
+               int tokenize(const std::string &str, std::vector<std::string> &tokens)
                {
                        // skip delimiters at beginning.
-                       string::size_type lastPos = str.find_first_not_of(",", 0);
+                       std::string::size_type lastPos = str.find_first_not_of(",", 0);
                        // find first "non-delimiter".
-                       string::size_type pos = str.find_first_of(",", lastPos);
+                       std::string::size_type pos = str.find_first_of(",", lastPos);
 
-                       while (string::npos != pos || string::npos != 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));
@@ -48,10 +48,6 @@ class ModuleOperjoin : public Module
                ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
-               void Implements(char* List)
-               {
-                       List[I_OnPostOper] = List[I_OnRehash] = 1;
-               }
 
                virtual void OnRehash(User* user, const std::string &parameter)
                {
@@ -74,14 +70,14 @@ class ModuleOperjoin : public Module
                        return Version(1,1,0,1,VF_VENDOR,API_VERSION);
                }
 
-               virtual void OnPostOper(User* user, const std::string &opertype)
+               virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
                {
                        if (!IS_LOCAL(user))
                                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, "", ServerInstance->Time(true));
+                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
                }
 
 };