Review and optimize

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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index a5b8832af387894983197bf801133dd59af8527c..2dd24955916b77867da7e0abb1681b20cc173d0c 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -14,10 +14,13 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
@@ -27,9 +30,10 @@ class ModuleNoCTCP : public Module
        
  public:
  
-       ModuleNoCTCP()
+       ModuleNoCTCP(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
        }
 
@@ -48,7 +52,8 @@ class ModuleNoCTCP : public Module
                         }
                         temp2 = temp2 + temp1 + " ";
                 }
-                output = temp2.substr(0,temp2.length()-1);
+               if (temp2.length())
+                       output = temp2.substr(0,temp2.length()-1);
         }
        
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
@@ -107,12 +112,11 @@ class ModuleNoCTCP : public Module
 
        virtual ~ModuleNoCTCP()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
 };
 
@@ -128,9 +132,9 @@ class ModuleNoCTCPFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleNoCTCP;
+               return new ModuleNoCTCP(Me);
        }
        
 };