httpd connection close fixes (these need to be backported to 1.1 at some point?)...

[user/henk/code/inspircd.git] / src / modules / m_conn_umodes.cpp

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 6ba965d6161c6300bbccdd8ea683b068bd6a4932..97a8b83406ad93500c0a539cdbbf6313d482a408 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -46,7 +46,7 @@ class ModuleModesOnConnect : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
        
        virtual void OnPostConnect(User* user)
@@ -63,32 +63,28 @@ class ModuleModesOnConnect : public Module
                                if (!ThisModes.empty())
                                {
                                        std::string buf;
-                                       stringstream ss(ThisModes);
+                                       std::stringstream ss(ThisModes);
 
-                                       vector<string> tokens;
+                                       std::vector<std::string> tokens;
 
                                        // split ThisUserModes into modes and mode params
                                        while (ss >> buf)
                                                tokens.push_back(buf);
 
-                                       int size = tokens.size() + 1;
-                                       const char** modes = new const char*[size];
-                                       modes[0] = user->nick;
-                                       modes[1] = tokens[0].c_str();
+                                       std::vector<std::string> modes;
+                                       modes.push_back(user->nick);
+                                       modes.push_back(tokens[0]);
 
                                        if (tokens.size() > 1)
                                        {
                                                // process mode params
-                                               int i = 2;
                                                for (unsigned int k = 1; k < tokens.size(); k++)
                                                {
-                                                       modes[i] = tokens[k].c_str();
-                                                       i++;
+                                                       modes.push_back(tokens[k]);
                                                }
                                        }
 
-                                       ServerInstance->Parser->CallHandler("MODE", modes, size, user);
-                                       delete [] modes;
+                                       ServerInstance->Parser->CallHandler("MODE", modes, user);
                                }
                                break;
                        }