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 be12b6be19815ea729da2b82ee12c658a1b908a7..d764c76d784c37cd0a27cc8ff58bfb319ee48237 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -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));
@@ -77,7 +77,7 @@ class ModuleOperjoin : public Module
 
                        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(true));
+                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
                }
 
 };