and a little tweak to remote MOTD too.

[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 34e1a87338df3464581392eed9a50058f3d9b882..d880853adcbfcc6edf7e622df8cd817bc28cd776 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -11,11 +11,9 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
-#include "inspircd.h"
 #include "modules.h"
 #include "wildcard.h"
 
@@ -29,7 +27,7 @@ class ModuleModesOnConnect : public Module
 
  public:
        ModuleModesOnConnect(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                Conf = new ConfigReader(ServerInstance);
@@ -40,7 +38,7 @@ class ModuleModesOnConnect : public Module
                List[I_OnPostConnect] = List[I_OnRehash] = 1;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                DELETE(Conf);
                Conf = new ConfigReader(ServerInstance);
@@ -61,13 +59,11 @@ class ModuleModesOnConnect : public Module
                if (!IS_LOCAL(user))
                        return;
 
-               ServerInstance->Log(DEBUG,"Post connect for mode setting");
                for (int j = 0; j < Conf->Enumerate("connect"); j++)
                {
                        std::string hostn = Conf->ReadValue("connect","allow",j);
                        if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
                        {
-                               ServerInstance->Log(DEBUG,"Found matching connect block '%s'",hostn.c_str());
                                std::string ThisModes = Conf->ReadValue("connect","modes",j);
                                if (ThisModes != "")
                                {
@@ -81,7 +77,7 @@ class ModuleModesOnConnect : public Module
                                                tokens.push_back(buf);
 
                                        int size = tokens.size() + 1;
-                                       const char* modes[size];
+                                       const char** modes = new const char*[size];
                                        modes[0] = user->nick;
                                        modes[1] = tokens[0].c_str();
 
@@ -96,8 +92,8 @@ class ModuleModesOnConnect : public Module
                                                }
                                        }
 
-                                       ServerInstance->Log(DEBUG,"Call mode handler to set modes");
                                        ServerInstance->Parser->CallHandler("MODE", modes, size, user);
+                                       delete [] modes;
                                }
                                break;
                        }
@@ -126,7 +122,7 @@ class ModuleModesOnConnectFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleModesOnConnectFactory;
 }